arcuru/lix
0
0
Fork 0
forked from lix-project/lix
Code Pull requests Activity
7733 commits 22 branches 2 tags 65 MiB
Commit graph

7733 commits

This branch
This branch
All branches
Author SHA1 Message Date
Eelco Dolstra 2242be83c6
Merge pull request #3329 from mayflower/attrs-chown 
structured-attrs: chown .attrs.* files to builder
 2020-01-23 18:24:44 +01:00
Robin Gloster f8dbde0813
structured-attrs: chown .attrs.* files to builder 
Otherwise `chmod .`'ing the build directory doesn't work anymore, which
is done in nixpkgs if sourceRoot is set to '.'.
 2020-01-23 17:38:07 +01:00
Eelco Dolstra b430a81a1f Fix coverage build 
https://hydra.nixos.org/build/110757285
 2020-01-22 21:58:07 +01:00
Eelco Dolstra 9a5ca802c7 clang fixes 
https://hydra.nixos.org/build/110757171
 2020-01-22 21:26:19 +01:00
Eelco Dolstra d506bd587a Fix clang warning 2020-01-22 21:20:01 +01:00
Eelco Dolstra 872a22fa23 resolveFlake -> lockFlake 
"resolve" is ambiguous (also used for registry resolution).
 2020-01-22 20:59:59 +01:00
Eelco Dolstra b5c9dbc84f Fix --override-flake and add a test 2020-01-22 20:00:58 +01:00
Eelco Dolstra 90d55ed275 Fix 'nix flake update' 2020-01-22 19:28:27 +01:00
Eelco Dolstra 32f31a8c63 nix flake info: Don't show empty descriptions 2020-01-22 17:20:21 +01:00
Eelco Dolstra 543288b649 Doh 2020-01-22 16:18:17 +01:00
Eelco Dolstra ad6e55d777 Fix GitHub test 2020-01-22 00:25:17 +01:00
Eelco Dolstra b33b94748c Convert fetchMercurial to a input type 
This enables Mercurial flakes. It also fixes a bug in pure mode where
you could use a branch/tag name rather than a revision.
 2020-01-21 23:49:32 +01:00
Eelco Dolstra 9f4d8c6170 Pluggable fetchers 
Flakes are now fetched using an extensible mechanism. Also lots of
other flake cleanups.
 2020-01-21 22:56:04 +01:00
Eelco Dolstra 1bf9eb21b7 absPath(): Use std::optional 2020-01-21 22:39:43 +01:00
Eelco Dolstra 6fadb3fc03 Merge remote-tracking branch 'origin/master' into flakes 2020-01-21 21:18:52 +01:00
Eelco Dolstra aef635da78 Fix derivation computation with __structuredAttrs and multiple outputs 
Fixes

  error: derivation '/nix/store/klivma7r7h5lndb99f7xxmlh5whyayvg-zlib-1.2.11.drv' has incorrect output '/nix/store/fv98nnx5ykgbq8sqabilkgkbc4169q05-zlib-1.2.11-dev', should be '/nix/store/adm7pilzlj3z5k249s8b4wv3scprhzi1-zlib-1.2.11-dev'
 2020-01-21 21:14:13 +01:00
Eelco Dolstra 8b09105db3
Merge pull request #3316 from LnL7/fix-secure-drv-outputs 
build: remove warning when in sandboxing test mode
 2020-01-14 08:43:37 +01:00
Eelco Dolstra e74b221a25
Merge pull request #3318 from bhipple/doc/relnotes-2.3 
doc: touchup release notes for 2.3
 2020-01-14 08:43:10 +01:00
Benjamin Hipple 5d24e18e29 doc: touchup release notes for 2.3 
- At the top of the release notes, we announce sandboxing is now enabled by default,
then at the bottom it says it's now disabled when missing kernel support. These
can be merged into one point for clarity.

- The point about `max-jobs` defaulting to 1 appears unrelated to sandboxing.
 2020-01-14 00:14:03 -05:00
Daiderd Jordan 8b3217f832
build: remove warning when in sandboxing test mode 
Introduced in 66fccd5832, but somehow
breaks the secure-drv-outputs test.
 2020-01-13 22:09:18 +01:00
Eelco Dolstra c3181e21e7 Tweak error message 2020-01-13 21:52:03 +01:00
Eelco Dolstra bfaa4db7bd Merge branch 'assert-show-expression' of https://github.com/LnL7/nix 2020-01-13 21:49:55 +01:00
John Ericson d64ab5131c unbreak build without pch 2020-01-13 21:45:33 +01:00
Eelco Dolstra c86c71c2b1 Test PRECOMPILE_HEADERS=0 2020-01-13 21:44:35 +01:00
Eelco Dolstra 835e541144 Fix build 
https://hydra.nixos.org/eval/1564374
 2020-01-13 21:34:54 +01:00
Eelco Dolstra 30c9ca3b05 Fix Nixpkgs dependency 2020-01-13 21:11:56 +01:00
Daiderd Jordan 307bcb9a8e
libexpr: show expression in assertion errors 
Includes the expression of the condition in the assertion message if
the assertion failed, making assertions much easier to debug. eg.

    error: assertion (withPython -> (python2Packages != null)) failed at pkgs/tools/security/nmap/default.nix:11:1
 2020-01-11 15:45:41 +01:00
Eelco Dolstra 6f046fa39e
Merge pull request #3308 from trusktr/patch-1 
Add a link to official channels in the docs.
 2020-01-10 01:03:41 +01:00
Eelco Dolstra 72a50756bb
Merge pull request #3307 from yorickvP/yorickvp/nlohmann-fromJSON 
builtins.fromJSON: use nlohmann/json parser instead of custom parser
 2020-01-10 01:03:07 +01:00
Joe Pea 3895e78794
Add link to official channels in nix-channel command ref 2020-01-09 14:20:08 -08:00
Joe Pea 7ccfa7ca4f
Add a link to official channels in the Channels chapter. 2020-01-09 14:15:19 -08:00
Yorick a350d0beb0
json-to-value: use unique_ptr instead of raw pointers 2020-01-09 22:46:41 +01:00
Yorick f1fac0b5c3
builtins.fromJSON: use nlohmann/json parser instead of custom parser 2020-01-09 17:38:27 +01:00
Eelco Dolstra 04bbfa692f
Merge pull request #3305 from knl/interpret-u-escapes-in-JSON-strings 
Add support for unicode escape sequences in fromJSON
 2020-01-07 01:04:16 +01:00
Nikola Knezevic 52a8f9295b Add support for \u escape in fromJSON 
As fromTOML supports \u and \U escapes, bring fromJSON on par. As JSON defaults
to UTF-8 encoding (every JSON parser must support UTF-8), this change parses the
`\u hex hex hex hex` sequence (\u followed by 4 hexadecimal digits) into an
UTF-8 representation.

Add a test to verify correct parsing, using all escape sequences from json.org.
 2020-01-07 00:09:58 +01:00
Nikola Knezevic cb2d348d48 Remove redundant check in parseJSONString 2020-01-07 00:09:58 +01:00
Eelco Dolstra bc22a7ee6a Fix use of uninitialized store path 
Fixes 'building of '/nix/store/00000000000000000000000000000000-': ...'.
 2020-01-06 22:20:10 +01:00
Eelco Dolstra e2988f48a1
Merge pull request #3303 from LnL7/darwin-sandbox 
build: fix sandboxing on darwin
 2020-01-06 20:56:35 +01:00
Eelco Dolstra 62f712c8ae Update flake.lock 2020-01-06 12:51:15 +01:00
Eelco Dolstra 1dc29df1d3 Merge remote-tracking branch 'origin/master' into flakes 2020-01-06 12:43:07 +01:00
Daiderd Jordan 66fccd5832
build: fix sandboxing on darwin 
Starting ba87b08f85 getEnv now returns an
std::optional which means these getEnv() != "" conditions no longer happen
if the variables are not defined.
 2020-01-05 20:23:52 +01:00
Eelco Dolstra 0486e87791
Merge pull request #3302 from LnL7/darwin-repair-with-sandbox 
build: fix path repairing with the darwin sandbox
 2020-01-05 16:26:17 +01:00
Eelco Dolstra cb90e382b5 Hide FunctionCallTrace constructor/destructor 
This prevents them from being inlined. On gcc 9, this reduces the
stack size needed for

  nix-instantiate '<nixpkgs>' -A texlive.combined.scheme-full --dry-run

from 12.9 MiB to 4.8 MiB.
 2020-01-05 16:21:34 +01:00
Daiderd Jordan 7d448bc966
build: fix path repairing when hash rewriting is required 
Handle store path repairing on darwin when sandboxing is enabled. Unlike
on linux sandboxing on darwin still requires hash rewriting.
 2020-01-04 20:25:25 +01:00
Daiderd Jordan b33fefcb92
build: recover store path when replacing fails 
This shouldn't happen in normal circumstances, but just in case
attempt to move the temporary path back if possible.
 2020-01-04 20:24:27 +01:00
Eelco Dolstra 0de33cc81b
Merge pull request #3298 from edef1c/passasfile-noprefix 
passAsFile: leave out the hash prefix
 2020-01-03 12:43:06 +01:00
edef c65a6fa86a passAsFile: leave out the hash prefix 
Having a colon in the path may cause issues, and having the hash
function indicated isn't actually necessary. We now verify the path 
format in the tests to prevent regressions.
 2020-01-02 23:56:06 +00:00
Eelco Dolstra 3ad4a332eb
Merge pull request #3297 from edef1c/passasfile-hash 
passAsFile: hash the attribute name instead of numbering sequentially
 2020-01-03 00:08:23 +01:00
Puck Meerburg 515c0a263e passAsFile: hash the attribute name instead of numbering sequentially 
This makes the paths consistent without relying on ordering.

Co-authored-by: edef <edef@edef.eu>
 2020-01-02 22:56:03 +00:00
Eelco Dolstra 3469062e76
Merge pull request #3296 from grahamc/export-reference-graph 
exportReferencesGraph: support working
 2020-01-02 11:04:03 +01:00