Branch: refs/heads/1.11-maintenance
Home: https://github.com/NixOS/nix
Commit: 26f7e8305b332af073275e0b378fc7277d2befc7
https://github.com/NixOS/nix/commit/26f7e8305b332af073275e0b378fc7277d2befc7
Author: Eelco Dolstra <edols...@gmail.com>
Date: 2017-05-01 (Mon, 01 May 2017)
Changed paths:
M src/libutil/hash.cc
Log Message:
-----------
Fix hash computation when importing NARs greater than 4 GiB
This caused "nix-store --import" to compute an incorrect hash on NARs
that don't fit in an unsigned int. The import would succeed, but
"nix-store --verify-path" or subsequent exports would detect an
incorrect hash.
A deeper issue is that the export/import format does not contain a
hash, so we can't detect such issues early.
Also, I learned that -Wall does not warn about this.
(cherry picked from commit 41c4558afe04d1cad0d0ef3b18a1a8155b40b06e)
Commit: a10bd3355a53efb786bdff10ce52b7ac069bee45
https://github.com/NixOS/nix/commit/a10bd3355a53efb786bdff10ce52b7ac069bee45
Author: Guillaume Maudoux <layus...@gmail.com>
Date: 2017-05-01 (Mon, 01 May 2017)
Changed paths:
M src/libexpr/lexer.l
M tests/lang/eval-okay-ind-string.exp
M tests/lang/eval-okay-ind-string.nix
Log Message:
-----------
Fix lexer to support `$'` in multiline strings.
(cherry picked from commit a4744254250e170f1b858e46a8b1c7904a030a2b)
Commit: a8d13e66ee936703ce24b0f26a6c4c50239a552c
https://github.com/NixOS/nix/commit/a8d13e66ee936703ce24b0f26a6c4c50239a552c
Author: Guillaume Maudoux <layus...@gmail.com>
Date: 2017-05-01 (Mon, 01 May 2017)
Changed paths:
M src/libexpr/lexer.l
Log Message:
-----------
lexer: remove catch-all rules hiding real errors
With catch-all rules, we hide potential errors.
It turns out that a4744254 made one cath-all useless. Flex detected that
is was impossible to reach.
The other is more subtle, as it can only trigger on unfinished escapes
in unfinished strings, which only occurs at EOF.
(cherry picked from commit a143014d738758b5558efb73fee9f351cd00cbda)
Compare: https://github.com/NixOS/nix/compare/5d59ec86d4cf...a8d13e66ee93_______________________________________________
nix-commits mailing list
nix-comm...@lists.science.uu.nl
https://mailman.science.uu.nl/mailman/listinfo/nix-commits
