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

sharutils: simplify substituteInPlace syntax to be Nix 1.11.8 compatible #31676

Merged
merged 1 commit into from Nov 15, 2017

Conversation

grahamc
Copy link
Member

@grahamc grahamc commented Nov 15, 2017

Motivation for this change

This expression isn't parsable by Nix 1.11.8 (16.09) and I think this change makes it nicer to read too?

cc @copumpkin

Things done
  • Tested using sandboxing (nix.useSandbox on NixOS, or option build-use-sandbox in nix.conf on non-NixOS)
  • 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 nox --run "nox-review wip"
  • Tested execution of all binary files (usually in ./result/bin/)
  • Fits CONTRIBUTING.md.

@grahamc
Copy link
Member Author

grahamc commented Nov 15, 2017

@GrahamcOfBorg build sharutils

Copy link

@GrahamcOfBorg GrahamcOfBorg left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Success for system: x86_64-linux


  0     0    0     0    0     0      0      0 --:--:-- --:--:-- --:--:--     0
  5 5521k    5  287k    0     0   287k      0  0:00:19 --:--:--  0:00:19  536k
100 5521k  100 5521k    0     0  5521k      0  0:00:01  0:00:01 --:--:-- 4290k

fetching path ‘/nix/store/d2xfak7ipf7jqmd2wn2xx315pb0l0p12-sharutils-4.15.2’...

*** Downloading ‘https://cache.nixos.org/nar/08yqcl576pfcrxmlwsk0hgc03kbb7l0igr8w10l42vcm75s25zl8.nar.xz’ (signed by ‘cache.nixos.org-1’) to ‘/nix/store/d2xfak7ipf7jqmd2wn2xx315pb0l0p12-sharutils-4.15.2’...
  % Total    % Received % Xferd  Average Speed   Time    Time     Time  Current
                                 Dload  Upload   Total   Spent    Left  Speed

  0     0    0     0    0     0      0      0 --:--:-- --:--:-- --:--:--     0
  0     0    0     0    0     0      0      0 --:--:-- --:--:-- --:--:--     0
100  239k  100  239k    0     0   239k      0  0:00:01  0:00:01 --:--:--  164k

/nix/store/d2xfak7ipf7jqmd2wn2xx315pb0l0p12-sharutils-4.15.2

Copy link

@GrahamcOfBorg GrahamcOfBorg left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Success for system: x86_64-darwin

/nix/store/ixmzd9gjxabflbzgbjvz7lcpxr1c8anb-sharutils-4.15.2

@copumpkin
Copy link
Member

Looks good, thanks!

@copumpkin copumpkin merged commit 267be2b into NixOS:master Nov 15, 2017
@grahamc grahamc deleted the sharutils branch November 15, 2017 13:48
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

3 participants