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.

Sign up for GitHub

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

Jump to bottom

haskellPackages.hasktags: remove dontCheck #47111

Merged
merged 1 commit into from Oct 15, 2018
Merged

haskellPackages.hasktags: remove dontCheck #47111

merged 1 commit into from Oct 15, 2018

Conversation

jhenahan
Copy link
Contributor

MarcWeber/hasktags#52 has been closed and a new version (0.71.1) has been released. Will need to wait for the Hackage update before this can be merged, but then it should be AOK.

Motivation for this change

Cleaning up exceptions in configuration-common.nix.

Things done
  • Tested using sandboxing (nix.useSandbox on NixOS, or option 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/)
  • Determined the impact on package closure size (by running nix path-info -S before and after)
  • Fits CONTRIBUTING.md.

@basvandijk
Copy link
Member

Could you target the haskell-updates branch instead of master? Then it will be merged together with the Hackage update.

@basvandijk
Copy link
Member

BTW in case you don't know how to do this from an existing PR: press the "Edit" button beside the title and use the "base" combobox.

@jhenahan jhenahan changed the base branch from master to haskell-updates September 21, 2018 12:55
@jhenahan
Copy link
Contributor Author

Done!

@basvandijk
Copy link
Member

Also make sure to rebase your commit on haskell-updates and force push that to patch-4 to ensure you're pushing 1 commit instead of the 132 you have now.

@jhenahan
Copy link
Contributor Author

Should be all squared, now.

@GrahamcOfBorg
Copy link

Failure on x86_64-darwin (full log)

Attempted: haskellPackages.hasktags

Partial log (click to expand)

### Failure in: 6:16.hs:0:these were not found
tests/Test.hs:39
expected: ["t2","t3","t4","t5"]
 but got: []
Cases: 156  Tried: 156  Errors: 0  Failures: 1
Test suite testsuite: FAIL
Test suite logged to: dist/test/hasktags-0.70.1-testsuite.log
0 of 1 test suites (0 of 1 test cases) passed.
builder for '/nix/store/pcy1yb2xd05wxsvyv3z7v9raws6cm3f7-hasktags-0.70.1.drv' failed with exit code 1
error: build of '/nix/store/pcy1yb2xd05wxsvyv3z7v9raws6cm3f7-hasktags-0.70.1.drv' failed

@GrahamcOfBorg
Copy link

Failure on x86_64-linux (full log)

Attempted: haskellPackages.hasktags

Partial log (click to expand)

### Failure in: 21:16.hs:0:these were not found
tests/Test.hs:39
expected: ["t2","t3","t4","t5"]
 but got: []
Cases: 156  Tried: 156  Errors: 0  Failures: 1
Test suite testsuite: FAIL
Test suite logged to: dist/test/hasktags-0.70.1-testsuite.log
0 of 1 test suites (0 of 1 test cases) passed.
builder for '/nix/store/x0lljz9qj0gbmj7r09ban8pldrf1flw0-hasktags-0.70.1.drv' failed with exit code 1
error: build of '/nix/store/x0lljz9qj0gbmj7r09ban8pldrf1flw0-hasktags-0.70.1.drv' failed

ryantm
ryantm reviewed Sep 21, 2018
View reviewed changes
Copy link
Member

@ryantm ryantm left a comment

Choose a reason for hiding this comment

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

Looks like the new version isn't on the haskell-updates branch yet, so we should still wait to merge.

@peti peti force-pushed the haskell-updates branch 4 times, most recently from 7b3d3e0 to f705ee2 Compare September 24, 2018 19:19
@peti peti force-pushed the haskell-updates branch 4 times, most recently from b6e6a8b to 478eff0 Compare October 8, 2018 16:38
@infinisil
Copy link
Member

Will build fine with current haskell-updates, for reference, assuming your upstream is named upstream, this is how to update this branch:

git fetch upstream
git reset --hard upstream/haskell-updates
git cherry-pick 231a2b3eba214d037538e2eccd367f3cc1fbfe47

@peti peti force-pushed the haskell-updates branch 3 times, most recently from 0ca4f8e to 7247873 Compare October 14, 2018 14:18
peti
peti requested changes Oct 14, 2018
View reviewed changes
Copy link
Member

@peti peti left a comment

Choose a reason for hiding this comment

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

Please don't edit hackage-packages.nix. See the comment at the top of the file.

@infinisil
Copy link
Member

@peti Again, it seems that this user has some git trouble, they only meant to include the last commit

@peti
Copy link
Member

peti commented Oct 15, 2018

It seems that this user has some git trouble, they only meant to include the last commit

Whatever caused this change, it needs to be fixed before we can merge this PR.

@peti peti force-pushed the haskell-updates branch 4 times, most recently from c4033e2 to fe91334 Compare October 15, 2018 10:39
@jhenahan
haskellPackages.hasktags: remove dontCheck
94943d8 
MarcWeber/hasktags#52 has been closed and a new version (0.71.1) has been released.
@jhenahan
Copy link
Contributor Author

jhenahan commented Oct 15, 2018 •
edited

Fixed. No idea how that other commit snuck in, I thought I had a clean rebase.

@ryantm
Copy link
Member

ryantm commented Oct 15, 2018

@GrahamcOfBorg build haskellPackages.hasktags

@GrahamcOfBorg
Copy link

Success on x86_64-darwin (full log)

Attempted: haskellPackages.hasktags

Partial log (click to expand)

Warning: The directory
/nix/store/3qmdslrs6anbxvvzs5dkqs94p0kmsk06-hasktags-0.71.2/bin is not in the
system search path.
post-installation fixup
strip is /nix/store/53nysl8bqwxihwzs1pgwka20nf8mbvlp-cctools-binutils-darwin/bin/strip
stripping (with command strip and flags -S) in /nix/store/3qmdslrs6anbxvvzs5dkqs94p0kmsk06-hasktags-0.71.2/lib  /nix/store/3qmdslrs6anbxvvzs5dkqs94p0kmsk06-hasktags-0.71.2/bin
patching script interpreter paths in /nix/store/3qmdslrs6anbxvvzs5dkqs94p0kmsk06-hasktags-0.71.2
strip is /nix/store/53nysl8bqwxihwzs1pgwka20nf8mbvlp-cctools-binutils-darwin/bin/strip
patching script interpreter paths in /nix/store/m2w0gp5ins7vqixd01m774xh40h7pa2b-hasktags-0.71.2-doc
/nix/store/3qmdslrs6anbxvvzs5dkqs94p0kmsk06-hasktags-0.71.2

@GrahamcOfBorg
Copy link

Success on x86_64-linux (full log)

Attempted: haskellPackages.hasktags

Partial log (click to expand)

strip is /nix/store/vcc4svb8gy29g4pam2zja6llkbcwsyiq-binutils-2.30/bin/strip
stripping (with command strip and flags -S) in /nix/store/n50l8paa0jdlgp806mzrgqj759y4wdd0-hasktags-0.71.2/lib  /nix/store/n50l8paa0jdlgp806mzrgqj759y4wdd0-hasktags-0.71.2/bin
patching script interpreter paths in /nix/store/n50l8paa0jdlgp806mzrgqj759y4wdd0-hasktags-0.71.2
checking for references to /build in /nix/store/n50l8paa0jdlgp806mzrgqj759y4wdd0-hasktags-0.71.2...
wrong ELF type
shrinking RPATHs of ELF executables and libraries in /nix/store/f00l2zkqjny6n359qkrfr2bh2vg3l0s3-hasktags-0.71.2-doc
strip is /nix/store/vcc4svb8gy29g4pam2zja6llkbcwsyiq-binutils-2.30/bin/strip
patching script interpreter paths in /nix/store/f00l2zkqjny6n359qkrfr2bh2vg3l0s3-hasktags-0.71.2-doc
checking for references to /build in /nix/store/f00l2zkqjny6n359qkrfr2bh2vg3l0s3-hasktags-0.71.2-doc...
/nix/store/n50l8paa0jdlgp806mzrgqj759y4wdd0-hasktags-0.71.2

@GrahamcOfBorg
Copy link

Success on aarch64-linux (full log)

Attempted: haskellPackages.hasktags

Partial log (click to expand)

strip is /nix/store/p9akxn2sfy4wkhqdqa3li97pc6jaz3r1-binutils-2.30/bin/strip
stripping (with command strip and flags -S) in /nix/store/7vcbnhiajlapx5cm20kx4f3h9b49wacw-hasktags-0.71.2/lib  /nix/store/7vcbnhiajlapx5cm20kx4f3h9b49wacw-hasktags-0.71.2/bin
patching script interpreter paths in /nix/store/7vcbnhiajlapx5cm20kx4f3h9b49wacw-hasktags-0.71.2
checking for references to /build in /nix/store/7vcbnhiajlapx5cm20kx4f3h9b49wacw-hasktags-0.71.2...
wrong ELF type
shrinking RPATHs of ELF executables and libraries in /nix/store/k37qpqym5bm50kljd4b53f9g9gb9iami-hasktags-0.71.2-doc
strip is /nix/store/p9akxn2sfy4wkhqdqa3li97pc6jaz3r1-binutils-2.30/bin/strip
patching script interpreter paths in /nix/store/k37qpqym5bm50kljd4b53f9g9gb9iami-hasktags-0.71.2-doc
checking for references to /build in /nix/store/k37qpqym5bm50kljd4b53f9g9gb9iami-hasktags-0.71.2-doc...
/nix/store/7vcbnhiajlapx5cm20kx4f3h9b49wacw-hasktags-0.71.2

@ryantm ryantm merged commit 4ca324c into NixOS:haskell-updates Oct 15, 2018
@ryantm
Copy link
Member

ryantm commented Oct 15, 2018

Thanks!

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@ryantm ryantm ryantm left review comments

@peti peti peti requested changes

@basvandijk basvandijk Awaiting requested review from basvandijk

@FRidh FRidh Awaiting requested review from FRidh

Assignees
No one assigned
Labels
6.topic: haskell 8.has: clean-up 8.has: package (new) 10.rebuild-darwin: 1-10 10.rebuild-linux: 1-10
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
6 participants
@jhenahan @basvandijk @ryantm @GrahamcOfBorg @infinisil @peti