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

xmlsort: init at 1.01 #99606

Merged
merged 1 commit into from Oct 5, 2020
Merged

xmlsort: init at 1.01 #99606

merged 1 commit into from Oct 5, 2020

Conversation

@peterhoeg
Copy link
Member

@peterhoeg peterhoeg commented Oct 5, 2020

Motivation for this change

I needed this.

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.
@peterhoeg peterhoeg requested a review from stigtsp as a code owner Oct 5, 2020
@peterhoeg
Copy link
Member Author

@peterhoeg peterhoeg commented Oct 5, 2020

Cc @volth

@peterhoeg
Copy link
Member Author

@peterhoeg peterhoeg commented Oct 5, 2020

This is slightly off-topic @volth, but are you including all packages defined in perl-packages.nix into your automatic update jobs?

@peterhoeg peterhoeg merged commit 6802848 into NixOS:master Oct 5, 2020
19 checks passed
19 checks passed
@github-actions[bot]
tests tests
Details
@github-actions[bot]
action
Details
@ofborg[bot]
xmlsort, xmlsort.passthru.tests on aarch64-linux No attempt
Details
@ofborg[bot]
Evaluation Performance Report Evaluator Performance Report
Details
@github-actions[bot]
Wait for ofborg
Details
@ofborg[bot]
grahamcofborg-eval ^.^!
Details
@ofborg[bot]
grahamcofborg-eval-check-maintainers matching changed paths to changed attrs...
Details
@ofborg[bot]
grahamcofborg-eval-check-meta config.nix: checkMeta = true
Details
@ofborg[bot]
grahamcofborg-eval-darwin nix-instantiate --arg nixpkgs { outPath=./.; revCount=999999; shortRev="bc5d2cf"; rev="bc5d2cf39273e59480de4806118d15433b03b835"; } ./pkgs/t
Details
@ofborg[bot]
grahamcofborg-eval-lib-tests nix-build --arg pkgs import ./. {} ./lib/tests/release.nix
Details
@ofborg[bot]
grahamcofborg-eval-nixos nix-instantiate --arg nixpkgs { outPath=./.; revCount=999999; shortRev="bc5d2cf"; rev="bc5d2cf39273e59480de4806118d15433b03b835"; } ./nixos/
Details
@ofborg[bot]
grahamcofborg-eval-nixos-manual nix-instantiate --arg nixpkgs { outPath=./.; revCount=999999; shortRev="bc5d2cf"; rev="bc5d2cf39273e59480de4806118d15433b03b835"; } ./nixos/
Details
@ofborg[bot]
grahamcofborg-eval-nixos-options nix-instantiate --arg nixpkgs { outPath=./.; revCount=999999; shortRev="bc5d2cf"; rev="bc5d2cf39273e59480de4806118d15433b03b835"; } ./nixos/
Details
@ofborg[bot]
grahamcofborg-eval-nixpkgs-manual nix-instantiate --arg nixpkgs { outPath=./.; revCount=999999; shortRev="bc5d2cf"; rev="bc5d2cf39273e59480de4806118d15433b03b835"; } ./pkgs/t
Details
@ofborg[bot]
grahamcofborg-eval-nixpkgs-tarball nix-instantiate --arg nixpkgs { outPath=./.; revCount=999999; shortRev="bc5d2cf"; rev="bc5d2cf39273e59480de4806118d15433b03b835"; } ./pkgs/t
Details
@ofborg[bot]
grahamcofborg-eval-nixpkgs-unstable-jobset nix-instantiate --arg nixpkgs { outPath=./.; revCount=999999; shortRev="bc5d2cf"; rev="bc5d2cf39273e59480de4806118d15433b03b835"; } ./pkgs/t
Details
@ofborg[bot]
grahamcofborg-eval-package-list nix-env -qa --json --file .
Details
@ofborg[bot]
grahamcofborg-eval-package-list-no-aliases nix-env -qa --json --file . --arg config { allowAliases = false; }
Details
@ofborg[bot]
xmlsort, xmlsort.passthru.tests on x86_64-linux Success
Details
@peterhoeg peterhoeg deleted the p/xmlsort branch Oct 5, 2020
@stigtsp
Copy link
Member

@stigtsp stigtsp commented Oct 5, 2020

@peterhoeg Fails on darwin x64, shortenPerlShebang $out/bin/xmlsort is likely needed.

$ bin/xmlsort 
zsh: /nix/store/gh8lgp7kc6fbr6hk57m58lkin92sjsmp-perl5.32.0-XML-Filter-Sort-1.01/bin/xmlsort: bad interpreter: /nix/store/rqpmnkzxh5kgiykg9ff9v9n467g3i2r1-perl-5.32.0/bin/perl -w -I/nix/store/rqpmnkzxh5kgiykg9ff9v9n467g3i2r1-perl-5.32.0/: exec format error

@peterhoeg
Copy link
Member Author

@peterhoeg peterhoeg commented Oct 5, 2020

@stigtsp
Copy link
Member

@stigtsp stigtsp commented Oct 5, 2020

Nicely spotted, fixed.

The commit to master e6b6f21 does not appear to have fixed this issue on darwin. Can you open a PR for this instead?

$ nix-build -A perlPackages.XMLFilterSort

Appending installation info to /nix/store/jfqr7q5innmd71dw8gsrknb3p9hiqqrp-perl5.32.0-XML-Filter-Sort-1.01/lib/perl5/5.32.0/darwin-thread-multi-2level/perllocal.pod
/nix/store/8h5awvnjzp0rgkby7s8fgzqg011mpzh7-stdenv-darwin/setup: line 89: shortenPerlShebang: command not found
builder for '/nix/store/4a3x3spyd4nissq7s8g1mr6flbmk8yrs-perl5.32.0-XML-Filter-Sort-1.01.drv' failed with exit code 127
error: build of '/nix/store/4a3x3spyd4nissq7s8g1mr6flbmk8yrs-perl5.32.0-XML-Filter-Sort-1.01.drv' failed

@peterhoeg peterhoeg mentioned this pull request Oct 5, 2020
10 tasks
@stigtsp
Copy link
Member

@stigtsp stigtsp commented Oct 5, 2020

Some minor nitpicking:

  • The commit message xmlsort: init at 1.01 should probably have been perlPackages.XMLFilterSort: init at 1.01. I find it useful to be able to to parse the commit messages (for Perl modules) sometimes.

  • There is no meta provided for this derivation.

@stigtsp
Copy link
Member

@stigtsp stigtsp commented Oct 5, 2020

[..] shortening step on Darwin automatically for everything in $out/bin ?

That's a good idea, was thinking to also check if including perlPreHook = stdenv.lib.optionalString stdenv.isDarwin "export LD=$CC"; would also work.

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