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

Carnix: 0.6 -> 0.7 #39003

Merged
merged 3 commits into from
Apr 19, 2018
Merged

Carnix: 0.6 -> 0.7 #39003

merged 3 commits into from
Apr 19, 2018

Conversation

P-E-Meunier
Copy link
Contributor

Motivation for this change

Carnix 0.7 improves support for workspaces, environment variables, and introduces the external cargo command cargo generate-nixfile.

The src field for workspaces, in the generated code, is now split between an src field, pointing to the root of the workspace, and a member field, specifying the remainder of the path. This fixes issues with members pointing to each other, and to the root.

Also, environment variables generated by build scripts are now handled properly.

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.

@GrahamcOfBorg GrahamcOfBorg added 6.topic: rust 10.rebuild-darwin: 0 This PR does not cause any packages to rebuild on Darwin 10.rebuild-linux: 1-10 labels Apr 16, 2018
@matthewbauer
Copy link
Member

@GrahamcOfBorg build carnix

@GrahamcOfBorg
Copy link

Success on x86_64-linux (full log)

Attempted: carnix

Partial log (click to expand)

installing
post-installation fixup
shrinking RPATHs of ELF executables and libraries in /nix/store/vg503p9xl1xcxmbm26flxq5svc0ds014-rust_carnix-0.7.2
shrinking /nix/store/vg503p9xl1xcxmbm26flxq5svc0ds014-rust_carnix-0.7.2/bin/cargo-generate-nixfile
shrinking /nix/store/vg503p9xl1xcxmbm26flxq5svc0ds014-rust_carnix-0.7.2/bin/carnix
strip is /nix/store/j75dgadrff2d1fyc4fczmcgqkid2imdx-binutils-2.30/bin/strip
stripping (with command strip and flags -S) in /nix/store/vg503p9xl1xcxmbm26flxq5svc0ds014-rust_carnix-0.7.2/lib  /nix/store/vg503p9xl1xcxmbm26flxq5svc0ds014-rust_carnix-0.7.2/bin
patching script interpreter paths in /nix/store/vg503p9xl1xcxmbm26flxq5svc0ds014-rust_carnix-0.7.2
checking for references to /build in /nix/store/vg503p9xl1xcxmbm26flxq5svc0ds014-rust_carnix-0.7.2...
/nix/store/vg503p9xl1xcxmbm26flxq5svc0ds014-rust_carnix-0.7.2

@GrahamcOfBorg
Copy link

Success on x86_64-darwin (full log)

Attempted: carnix

Partial log (click to expand)

Building carnix (src/main.rs)
Running rustc --crate-name carnix src/main.rs --crate-type bin -C opt-level=3 -C codegen-units=1 --out-dir target/bin --emit=dep-info,link -L dependency=target/deps -L native=/nix/store/iyvs8jz75cchjd7v511656k3dhqlarf9-sqlite-3.22.0/lib -l sqlite3 --extern clap=/nix/store/xbr097nkj799cz011qzd3zn67siw498j-rust_clap-2.31.2/lib/libclap-93b27c1e83.rlib --extern env_logger=/nix/store/ykfy4v9da23j602b45jc3na6zrxbz891-rust_env_logger-0.5.7/lib/libenv_logger-d5a2a2f50a.rlib --extern error_chain=/nix/store/xizylh16cglgbs1c4wc2jsaispyn831p-rust_error-chain-0.11.0/lib/liberror_chain-9edf4fc64c.rlib --extern itertools=/nix/store/5plvm3y8sw2zqzlzsanyavxxn5jbf5lf-rust_itertools-0.7.8/lib/libitertools-7bbf32d486.rlib --extern log=/nix/store/r0hgi523a7avigv04k97w8fg0l1h10q5-rust_log-0.4.1/lib/liblog-d690254ac7.rlib --extern nom=/nix/store/6s8vy9f8cvaapw34drvz8g7a2qqkz1k2-rust_nom-3.2.1/lib/libnom-737c32097a.rlib --extern regex=/nix/store/y1qlxr4g6ybyczq3rq6ncd43px946k7l-rust_regex-0.2.10/lib/libregex-626d6b5dce.rlib --extern rusqlite=/nix/store/v2cs6bx0i3kwl13cflfwjkyhdr33zv5v-rust_rusqlite-0.13.0/lib/librusqlite-c104bca35d.rlib --extern serde=/nix/store/36ly2i538dlj1wz3c42i2v6d0l8irjbd-rust_serde-1.0.38/lib/libserde-d1dd023aa4.rlib --extern serde_derive=/nix/store/wz6xa7xplf7jwfzy44my5qyj1gmv2h1w-rust_serde_derive-1.0.38/lib/libserde_derive-ec8d328432.dylib --extern serde_json=/nix/store/k4ag483gc31aa61wayky9zps0n3vf13i-rust_serde_json-1.0.14/lib/libserde_json-94c8e22b41.rlib --extern tempdir=/nix/store/rv4lny6fps7xdjsxi2ncipyl9z5gaw3n-rust_tempdir-0.3.7/lib/libtempdir-5e8cf65370.rlib --extern toml=/nix/store/9190a37287lp6g5ibkyydq8k7hlwbffr-rust_toml-0.4.6/lib/libtoml-320b2ff11c.rlib --cap-lints allow -L native=/nix/store/iyvs8jz75cchjd7v511656k3dhqlarf9-sqlite-3.22.0/lib -l sqlite3 --color always
warning: redundant linker flag specified for library `sqlite3`

installing
post-installation fixup
strip is /nix/store/kdff2gim6417493yha769kh00n63lnrw-cctools-binutils-darwin/bin/strip
stripping (with command strip and flags -S) in /nix/store/ka4zibx9hby46g5dpzs29ypm45k0fxi7-rust_carnix-0.7.2/lib  /nix/store/ka4zibx9hby46g5dpzs29ypm45k0fxi7-rust_carnix-0.7.2/bin
patching script interpreter paths in /nix/store/ka4zibx9hby46g5dpzs29ypm45k0fxi7-rust_carnix-0.7.2
/nix/store/ka4zibx9hby46g5dpzs29ypm45k0fxi7-rust_carnix-0.7.2

@GrahamcOfBorg
Copy link

Success on aarch64-linux (full log)

Attempted: carnix

Partial log (click to expand)

installing
post-installation fixup
shrinking RPATHs of ELF executables and libraries in /nix/store/qgyncq3aaj7jqgpd1sg1b8drk4i1xfwx-rust_carnix-0.7.2
shrinking /nix/store/qgyncq3aaj7jqgpd1sg1b8drk4i1xfwx-rust_carnix-0.7.2/bin/carnix
shrinking /nix/store/qgyncq3aaj7jqgpd1sg1b8drk4i1xfwx-rust_carnix-0.7.2/bin/cargo-generate-nixfile
strip is /nix/store/j7d4mr0ikv974ig7yzhknpsq288js4bs-binutils-2.30/bin/strip
stripping (with command strip and flags -S) in /nix/store/qgyncq3aaj7jqgpd1sg1b8drk4i1xfwx-rust_carnix-0.7.2/lib  /nix/store/qgyncq3aaj7jqgpd1sg1b8drk4i1xfwx-rust_carnix-0.7.2/bin
patching script interpreter paths in /nix/store/qgyncq3aaj7jqgpd1sg1b8drk4i1xfwx-rust_carnix-0.7.2
checking for references to /build in /nix/store/qgyncq3aaj7jqgpd1sg1b8drk4i1xfwx-rust_carnix-0.7.2...
/nix/store/qgyncq3aaj7jqgpd1sg1b8drk4i1xfwx-rust_carnix-0.7.2

@matthewbauer matthewbauer merged commit bb4a8eb into NixOS:master Apr 19, 2018
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
6.topic: rust 10.rebuild-darwin: 0 This PR does not cause any packages to rebuild on Darwin 10.rebuild-linux: 1-10
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants