Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

bat: 0.15.4 -> 0.16.0 #99429

Merged
merged 2 commits into from Oct 4, 2020
Merged

bat: 0.15.4 -> 0.16.0 #99429

merged 2 commits into from Oct 4, 2020

Conversation

@zowoq
Copy link
Contributor

@zowoq zowoq commented Oct 3, 2020

https://github.com/sharkdp/bat/releases/tag/v0.16.0

Motivation for this change
Things done
  • Tested using sandboxing (nix.useSandbox on NixOS, or option sandbox in nix.conf on non-NixOS linux)
  • Built on platform(s)
    • NixOS
    • macOS
    • other Linux distributions
  • Tested via one or more NixOS test(s) if existing and applicable for the change (look inside nixos/tests)
  • Tested compilation of all pkgs that depend on this change using nix-shell -p nixpkgs-review --run "nixpkgs-review wip"
  • Tested execution of all binary files (usually in ./result/bin/)
  • Determined the impact on package closure size (by running nix path-info -S before and after)
  • Ensured that relevant documentation is up to date
  • Fits CONTRIBUTING.md.

Broken on darwin:

error: failed to run custom build command for `onig_sys v69.5.1`

nativeBuildInputs = [ pkgconfig installShellFiles makeWrapper ];
nativeBuildInputs = [ pkg-config installShellFiles makeWrapper ];

buildInputs = stdenv.lib.optionals stdenv.isDarwin [ Security libiconv ];

This comment has been minimized.

@marsam

marsam Oct 3, 2020
Contributor

you can fix the darwin build with:

  # Remove after https://github.com/NixOS/nixpkgs/pull/97000 lands into master
  preConfigure = stdenv.lib.optionalString stdenv.isDarwin ''
    unset SDKROOT
  '';

This comment has been minimized.

@zowoq

zowoq Oct 3, 2020
Author Contributor

Thanks!

@zowoq zowoq marked this pull request as ready for review Oct 3, 2020
@marsam
marsam approved these changes Oct 4, 2020
@marsam marsam merged commit 5cf596c into NixOS:master Oct 4, 2020
18 of 19 checks passed
18 of 19 checks passed
@github-actions
action
Details
@ofborg
bat, bat.passthru.tests on x86_64-darwin
Details
@ofborg
bat, bat.passthru.tests on aarch64-linux No attempt
Details
@ofborg
Evaluation Performance Report Evaluator Performance Report
Details
@github-actions
Wait for ofborg
Details
@ofborg
bat, bat.passthru.tests on x86_64-linux Success
Details
@ofborg
grahamcofborg-eval ^.^!
Details
@ofborg
grahamcofborg-eval-check-maintainers matching changed paths to changed attrs...
Details
@ofborg
grahamcofborg-eval-check-meta config.nix: checkMeta = true
Details
@ofborg
grahamcofborg-eval-darwin nix-instantiate --arg nixpkgs { outPath=./.; revCount=999999; shortRev="02594b3"; rev="02594b3aed2d0cbdeb81bb48902d411f05244a61"; } ./pkgs/t
Details
@ofborg
grahamcofborg-eval-lib-tests nix-build --arg pkgs import ./. {} ./lib/tests/release.nix
Details
@ofborg
grahamcofborg-eval-nixos nix-instantiate --arg nixpkgs { outPath=./.; revCount=999999; shortRev="02594b3"; rev="02594b3aed2d0cbdeb81bb48902d411f05244a61"; } ./nixos/
Details
@ofborg
grahamcofborg-eval-nixos-manual nix-instantiate --arg nixpkgs { outPath=./.; revCount=999999; shortRev="02594b3"; rev="02594b3aed2d0cbdeb81bb48902d411f05244a61"; } ./nixos/
Details
@ofborg
grahamcofborg-eval-nixos-options nix-instantiate --arg nixpkgs { outPath=./.; revCount=999999; shortRev="02594b3"; rev="02594b3aed2d0cbdeb81bb48902d411f05244a61"; } ./nixos/
Details
@ofborg
grahamcofborg-eval-nixpkgs-manual nix-instantiate --arg nixpkgs { outPath=./.; revCount=999999; shortRev="02594b3"; rev="02594b3aed2d0cbdeb81bb48902d411f05244a61"; } ./pkgs/t
Details
@ofborg
grahamcofborg-eval-nixpkgs-tarball nix-instantiate --arg nixpkgs { outPath=./.; revCount=999999; shortRev="02594b3"; rev="02594b3aed2d0cbdeb81bb48902d411f05244a61"; } ./pkgs/t
Details
@ofborg
grahamcofborg-eval-nixpkgs-unstable-jobset nix-instantiate --arg nixpkgs { outPath=./.; revCount=999999; shortRev="02594b3"; rev="02594b3aed2d0cbdeb81bb48902d411f05244a61"; } ./pkgs/t
Details
@ofborg
grahamcofborg-eval-package-list nix-env -qa --json --file .
Details
@ofborg
grahamcofborg-eval-package-list-no-aliases nix-env -qa --json --file . --arg config { allowAliases = false; }
Details
@zowoq zowoq deleted the zowoq:bat branch Oct 4, 2020
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Linked issues

Successfully merging this pull request may close these issues.

None yet

2 participants