Commit graph

10 commits

Author SHA1 Message Date
Daniël de Kok 85f96822a0 treewide: fix cargoSha256/cargoHash
Rust 1.50.0 incorporated a Cargo change (rust-lang/cargo#8937) in
which cargo vendor erroneously changed permissions of vendored
crates. This was fixed in Rust
1.51.0 (rust-lang/cargo#9131). Unfortunately, this means that all
cargoSha256/cargoHashes produced during the Rust 1.50.0 cycle are
potentially broken.

This change updates cargoSha256/cargoHash tree-wide.

Fixes #121994.
2021-05-08 00:36:37 -07:00
Sandro 8bad34a0f1
Merge pull request #115361 from SuperSandro2000/fix-collection24 2021-03-08 02:23:48 +01:00
Sandro Jäckel c878b14107
zz: remove emojis from description 2021-03-08 02:01:17 +01:00
sternenseemann 3ceb217e21 zz: unstable-2021-01-26 -> unstable-2021-03-07
Picking from current master for these fixes:

* makes module resolving via ZZ_MODULES_PATH deterministic
* no longer tries to write to /nix/store failing compilation
2021-03-07 15:42:46 +01:00
Mario Rodas 9c5389e47a
Merge pull request #110771 from sternenseemann/zz
zz: install modules shipped with compiler
2021-01-27 07:58:51 -05:00
sternenseemann 9a8bd5a0fa zz: 0.1 -> unstable-2021-01-26 2021-01-26 13:26:18 +01:00
sternenseemann 4aa937d2e2 zz: install modules shipped with the compiler
Previously zz wouldn't be able to compile anything using standard
modules like mem or log out of the box.

To fix this we copy the modules directory included in the source to
$out/share/zz/modules and add an entry to ZZ_MODULE_PATHS in the wrapper
around zz.

We also remove a search path entry which used to reference /build
because it used CARGO_MANIFEST_DIR at build time. The default search
path now includes:

* /nix/store/modules
* $out/share/zz/modules
* $(pwd)/modules

Patching out /nix/store/modules would be kind of cumbersome as it is a
multi-line entry, but it probably does no harm and fine to leave in.

An issue arising by this PR might be that the added search path entry
may take priority over an user specified location even though we use
--suffix. This is because zz internally uses a HashSet which has no
guaranteed iteration order. This may lead to unexpected behavior for
users wo previously provided custom versions of the standard modules via
ZZ_MODULE_PATHS. However, this is an issue in upstream issue as well
where ZZ_MODULE_PATHS may or may not take priority over the compiled in
search path, so this issue should probably be resolved upstream (I'll
file a report or PR).
2021-01-25 14:25:42 +01:00
sternenseemann 190173e05b zz: adjust upstream URLs 2021-01-25 14:03:26 +01:00
Mario Rodas 23a75a4465
zz: 2020-03-02 -> 0.1 2020-05-28 04:20:00 -05:00
Mario Rodas 6f8dcc3c5e
zz: init at 2020-03-02 2020-03-04 04:20:00 -05:00