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

catch: add separate derivation for the catch2 branch #41488

Closed
wants to merge 1 commit into from
Closed

catch: add separate derivation for the catch2 branch #41488

wants to merge 1 commit into from

Conversation

acowley
Copy link
Contributor

@acowley acowley commented Jun 5, 2018

Motivation for this change

The catch package issues releases for both v1 and v2 branches.

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/)
  • Fits CONTRIBUTING.md.

@xeji
Copy link
Contributor

xeji commented Jun 5, 2018

Why is it necessary to have both v1 and v2 in nixpkgs?

/cc @edwtjo @knedlsepp

@knedlsepp
Copy link
Member

knedlsepp commented Jun 5, 2018 •
edited

I don't think there's very much value in keeping both of them. As far as I can tell only cpp-gsl and libjson-rpc-cpp depend on catch. Both of them should work with Catch2. I'd say keep only catch2.

@acowley
Copy link
Contributor Author

acowley commented Jun 6, 2018

They're still tagging 1.x releases, so presumably there's some value in the distinction. I do not know anything about the package, though, so I'm happy to change the PR to replace the old derivation if that's the consensus. I'll let this sit for a day or two in case anyone else would share an opinion.

@acowley
Copy link
Contributor Author

acowley commented Jun 13, 2018

I've rebased and changed the patch so it replaces the old catch. I also verified that I could locally build cpp-gsl and libjson-rpc-cpp.

@xeji
Copy link
Contributor

xeji commented Jun 13, 2018

@GrahamcOfBorg build catch cpp-gsl libjson-rpc-cpp

@GrahamcOfBorg
Copy link

Failure on x86_64-darwin (full log)

Attempted: catch, cpp-gsl

The following builds were skipped because they don't evaluate on x86_64-darwin: libjson-rpc-cpp

Partial log (click to expand)


Total Test time (real) =   1.03 sec

The following tests FAILED:
          8 - ApprovalTests (Failed)
Errors while running CTest
make: *** [Makefile:119: test] Error 8
builder for '/nix/store/1mwk1ds0fd8x87gqfqqss14cpcwgdfzd-catch-2.2.3.drv' failed with exit code 2
cannot build derivation '/nix/store/hcf5qg5jz6g9aild47n6gkbhf3d29api-GSL-unstable-2017-02-15.drv': 1 dependencies couldn't be built
error: build of '/nix/store/1mwk1ds0fd8x87gqfqqss14cpcwgdfzd-catch-2.2.3.drv', '/nix/store/hcf5qg5jz6g9aild47n6gkbhf3d29api-GSL-unstable-2017-02-15.drv' failed

@GrahamcOfBorg
Copy link

Failure on aarch64-linux (full log)

Attempted: catch, cpp-gsl, libjson-rpc-cpp

Partial log (click to expand)

                ~~~~~^~~~~~~~
cc1plus: all warnings being treated as errors
make[2]: *** [CMakeFiles/SelfTest.dir/build.make:1090: CMakeFiles/SelfTest.dir/include/internal/catch_tostring.cpp.o] Error 1
make[2]: *** Waiting for unfinished jobs....
make[1]: *** [CMakeFiles/Makefile2:836: CMakeFiles/SelfTest.dir/all] Error 2
make: *** [Makefile:141: all] Error 2
builder for '/nix/store/d44am7420cmcfl7gy5lp0mjvjx366vav-catch-2.2.3.drv' failed with exit code 2
cannot build derivation '/nix/store/84qc0jgmh2k94qm04pznqqm5fq387k87-GSL-unstable-2017-02-15.drv': 1 dependencies couldn't be built
cannot build derivation '/nix/store/hd9kqi36h5ijjay19dvvwq03i9k0wv3v-libjson-rpc-cpp-0.7.0.drv': 1 dependencies couldn't be built
error: build of '/nix/store/84qc0jgmh2k94qm04pznqqm5fq387k87-GSL-unstable-2017-02-15.drv', '/nix/store/d44am7420cmcfl7gy5lp0mjvjx366vav-catch-2.2.3.drv', '/nix/store/hd9kqi36h5ijjay19dvvwq03i9k0wv3v-libjson-rpc-cpp-0.7.0.drv' failed

@xeji
Copy link
Contributor

xeji commented Jun 13, 2018

This is a regression, catch1 builds on all three platforms.

@GrahamcOfBorg
Copy link

Success on x86_64-linux (full log)

Attempted: catch, cpp-gsl, libjson-rpc-cpp

Partial log (click to expand)

shrinking /nix/store/8kqpzlpyzzknnbkckwwqm4n7ky6ial2f-libjson-rpc-cpp-0.7.0/lib/libjsonrpccpp-common.so.0.7.0
shrinking /nix/store/8kqpzlpyzzknnbkckwwqm4n7ky6ial2f-libjson-rpc-cpp-0.7.0/lib/libjsonrpccpp-server.so.0.7.0
gzipping man pages under /nix/store/8kqpzlpyzzknnbkckwwqm4n7ky6ial2f-libjson-rpc-cpp-0.7.0/share/man/
strip is /nix/store/21ymadblbmsbb2bk4q7gl4kjasp8zmgd-binutils-2.30/bin/strip
stripping (with command strip and flags -S) in /nix/store/8kqpzlpyzzknnbkckwwqm4n7ky6ial2f-libjson-rpc-cpp-0.7.0/lib  /nix/store/8kqpzlpyzzknnbkckwwqm4n7ky6ial2f-libjson-rpc-cpp-0.7.0/bin
patching script interpreter paths in /nix/store/8kqpzlpyzzknnbkckwwqm4n7ky6ial2f-libjson-rpc-cpp-0.7.0
/nix/store/pl6izm18158ami9i4qxr2hrap224qfml-catch-2.2.3
checking for references to /build in /nix/store/8kqpzlpyzzknnbkckwwqm4n7ky6ial2f-libjson-rpc-cpp-0.7.0...
/nix/store/dky3nrbgqgkg80wwibwry1g7hp95f256-GSL-unstable-2017-02-15
/nix/store/8kqpzlpyzzknnbkckwwqm4n7ky6ial2f-libjson-rpc-cpp-0.7.0

@acowley
Copy link
Contributor Author

acowley commented Jun 13, 2018

I'm afraid I'm not going to be able to put any more time into this. Perhaps keeping the original approach of keeping catch-1.x around is the right thing after all, or somebody can try to get a patch upstreamed.

@acowley acowley closed this Jun 13, 2018
@acowley acowley deleted the catch2 branch January 27, 2019 19:09
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
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
4 participants
@acowley @xeji @knedlsepp @GrahamcOfBorg