alois31/lix
0
0
Fork 0
forked from lix-project/lix
Code Pull requests Activity
11798 commits 2 branches 2 tags 74 MiB
Commit graph

11798 commits

This branch
This branch
All branches
Author SHA1 Message Date
John Ericson 8abb627002 Merge branch 'path-info' into ca-drv-exotic 2022-04-19 22:02:33 +00:00
John Ericson 2c21cb6720 Fill in missing comparison operators for content addresses 2022-03-25 22:40:40 +00:00
John Ericson ff2a8ccfe1 Merge branch 'path-info' into ca-drv-exotic 2022-03-25 19:40:52 +00:00
John Ericson 0dc2974930 Merge remote-tracking branch 'upstream/master' into path-info 2022-03-25 19:25:08 +00:00
Eelco Dolstra 1844172dd1
Merge pull request #6314 from edolstra/experimental-primop 
Only provide builtins is the corresponding experimental feature is enabled
 2022-03-25 16:16:31 +01:00
Eelco Dolstra 16cf1e6089
Merge pull request #6311 from edolstra/return-wanted-paths 
Make buildPathsWithResults() only return info on wanted outputs
 2022-03-25 15:44:39 +01:00
Eelco Dolstra fc35b11a7c Fix mismatched tag warning on clang 2022-03-25 15:22:22 +01:00
Eelco Dolstra 8c363eb3eb Document getFlake 
Fixes #5523.
 2022-03-25 14:19:55 +01:00
Eelco Dolstra 86b05ccd54 Only provide builtin.{getFlake,fetchClosure} is the corresponding experimental feature is enabled 
This allows writing fallback code like

  if builtins ? fetchClosure then
    builtins.fetchClose { ... }
  else
    builtins.storePath ...
 2022-03-25 14:04:18 +01:00
Eelco Dolstra 55bc524019
Merge pull request #6051 from Ma27/fix-empty-nix-log 
`nix log` should also work if the log didn't provide any output
 2022-03-25 10:35:10 +01:00
Eelco Dolstra 377782ecae
Merge pull request #6292 from polykernel/permissive-spacing-repl 
nix: allow whitespace characters before command in repl
 2022-03-25 10:24:06 +01:00
Eelco Dolstra 50c229ad9a
Use wantOutput 
Co-authored-by: John Ericson <git@JohnEricson.me>
 2022-03-25 08:02:49 +01:00
polykernel cbcb69a39c nix: allow whitespace characters before command in repl 
Before this change, processLine always uses the first character
as the start of the line. This cause whitespaces to matter at the
beginning of the line whereas it does not matter anywhere else.

This commit trims leading white spaces of the string line so that
subsequent operations can be performed on the string without explicitly
tracking starting and ending indices of the string.
 2022-03-24 21:33:29 -04:00
Eelco Dolstra 187dc080a2 tests/build.sh: Test that 'nix build' only prints wanted outputs 2022-03-24 23:36:14 +01:00
Eelco Dolstra 540d7e33d8 Retry substitution after an incomplete closure only once 
This avoids an infinite loop in the final test in
tests/binary-cache.sh. I think this was only not triggered previously
by accident (because we were clearing wantedOutputs in between).
 2022-03-24 23:25:12 +01:00
Eelco Dolstra fe5509df9a Only return wanted outputs 2022-03-24 23:24:48 +01:00
Eelco Dolstra 09796c0263 Random cleanup 2022-03-24 23:24:10 +01:00
Eelco Dolstra 175c78591b Random cleanup 2022-03-24 23:09:43 +01:00
Maximilian Bosch d02e34ef06
Implement regression test for empty logs loaded via nix log 2022-03-24 22:31:52 +01:00
Maximilian Bosch c85467a1b6
Revert "TarArchive: Small refactoring" 
This reverts commit 50a35860ee.

With this change Nix fails to open bzip2 logfiles that were created from
builds with no stdout/stderr.
 2022-03-24 22:30:46 +01:00
Eelco Dolstra d9cfd853e5
Merge pull request #6302 from edolstra/fetch-closure 
Add builtins.fetchClosure
 2022-03-24 22:13:57 +01:00
Eelco Dolstra f902f3c2cb Add experimental feature 'fetch-closure' 2022-03-24 21:33:33 +01:00
Eelco Dolstra e5f7029ba4 nix store make-content-addressed: Support --from / --to 2022-03-24 21:33:33 +01:00
Eelco Dolstra 98658ae9d2 Document fetchClosure 2022-03-24 21:33:33 +01:00
Eelco Dolstra 28186b7044 Add a test for fetchClosure and 'nix store make-content-addressed' 2022-03-24 21:33:33 +01:00
Eelco Dolstra 4120930ac1 fetchClosure: Only allow some "safe" store types 2022-03-24 21:33:33 +01:00
Eelco Dolstra 7ffda0af6e fetchClosure: Skip makeContentAddressed() if toPath is already valid 2022-03-24 21:33:33 +01:00
Eelco Dolstra 5acaf13d35 Rename 'nix store make-content-addressable' to 'nix store make-content-addressed' 2022-03-24 21:33:33 +01:00
Eelco Dolstra f18607549c Fix makeContentAddressed() on self-references 
LocalStore::addToStore() since
79ae9e4558 expects a regular NAR hash,
rather than a NAR hash modulo self-references. Fixes #6300.

Also, makeContentAddressed() now rewrites the entire closure (so 'nix
store make-content-addressable' no longer needs '-r'). See #6301.
 2022-03-24 21:33:33 +01:00
Eelco Dolstra 545c2d0d8c fetchClosure: Allow a path to be rewritten to CA on the fly 
The advantage is that the resulting closure doesn't need to be signed,
so you don't need to configure any binary cache keys on the client.
 2022-03-24 21:33:33 +01:00
Eelco Dolstra 7f6fe8ca1d Rename 2022-03-24 21:33:33 +01:00
Eelco Dolstra 41659418cf fetchClosure: Require a CA path in pure mode 2022-03-24 21:33:33 +01:00
Eelco Dolstra f4bafc412f Add builtins.fetchClosure 
This allows closures to be imported at evaluation time, without
requiring the user to configure substituters. E.g.

  builtins.fetchClosure {
    storePath = /nix/store/f89g6yi63m1ywfxj96whv5sxsm74w5ka-python3.9-sqlparse-0.4.2;
    from = "https://cache.ngi0.nixos.org";
  }
 2022-03-24 21:33:33 +01:00
Eelco Dolstra c9148f4ece
Merge pull request #6285 from flokli/add-tmpfile 
nix-daemon.conf.in: add tmpfiles file to create nix/daemon-socket directory
 2022-03-24 21:24:53 +01:00
Eelco Dolstra d67fe90375
Merge pull request #6305 from flox/genericClosure_doc 
docs: genericClosure
 2022-03-24 14:02:58 +01:00
Eelco Dolstra 97734fea1b
Merge pull request #6308 from NixOS/consisten-use-of-url-uri-5872 
Fix flake profile use of originalUrl vs. originalUri
 2022-03-24 14:02:33 +01:00
Eelco Dolstra 721481e092
Merge pull request #6307 from edolstra/cp-symlinks 
install-multi-user.sh: Preserve symlinks
 2022-03-24 13:22:24 +01:00
Tom Bereknyei 0736f3651d docs: genericClosure 2022-03-24 08:03:59 -04:00
Eelco Dolstra bb0c4b9f25 install-multi-user.sh: Preserve symlinks 
We need to pass -P to ensure that symlinks are copied correctly. Fixes #6303.
 2022-03-24 12:48:59 +01:00
Rok Garbas 4546a007a4
Fix flake profile use of originalUrl vs. originalUri 
Fixes #5872
 2022-03-24 12:28:38 +01:00
Eelco Dolstra 284cb0aad7
Merge pull request #6306 from trofi/add-lexer-locations 
lexer: add error location to lexer errors
 2022-03-24 10:07:40 +01:00
Sergei Trofimovich 9174d884d7 lexer: add error location to lexer errors 
Before the change lexter errors did not report the location:

    $ nix build -f. mc
    error: path has a trailing slash
    (use '--show-trace' to show detailed location information)

Note that it's not clear what file generates the error.

After the change location is reported:

    $ src/nix/nix --extra-experimental-features nix-command build -f ~/nm mc
    error: path has a trailing slash

           at .../pkgs/development/libraries/glib/default.nix:54:18:

               53|   };
               54|   src = /tmp/foo/;
                 |                  ^
               55|
    (use '--show-trace' to show detailed location information)

Here we see both problematic file and the string itself.
 2022-03-24 08:16:14 +00:00
Florian Klink 67af5f7eda scripts/install-systemd-multi-user.sh: install /etc/tmpfiles.d/nix-daemon.conf, too 
While `create_directories()` from install-multi-user.sh seems to already
create parts of the directory structure, it's marked as deprecated, and
it won't hurt also copying over the tmpfiles config and have it execute
once.
 2022-03-23 13:51:38 +01:00
Domen Kožar 98ce1a21b7
Merge pull request #6144 from toonn/doc-macos-uninstall 
doc: Add detailed uninstall section for macOS
 2022-03-23 08:53:48 +01:00
Eelco Dolstra d5d4d98042
Merge pull request #6298 from kayhide/nix-edit-support-kakoune 
nix edit: support kakoune
 2022-03-22 16:56:35 +01:00
Hideaki Kawai 3b776cb0a7 nix edit: support kakoune 2022-03-22 23:18:02 +09:00
Eelco Dolstra 8434869632
Merge pull request #6296 from edolstra/fix-profile-manifest 
Don't hide repeated values while generating manifest.nix
 2022-03-22 14:09:25 +01:00
Eelco Dolstra a0259a21a4 Don't hide repeated values while generating manifest.nix 
Fixes #6243.
 2022-03-22 13:18:56 +01:00
Eelco Dolstra 732296ddc0 printValue(): <REPEAT> -> «repeated» 
This ensures that it doesn't get parsed as a valid Nix expression.
 2022-03-22 13:00:27 +01:00
Eelco Dolstra 63f564ccf2
Merge pull request #6294 from edolstra/filter-manifest 
buildProfile(): Ignore manifest.{nix,json}
 2022-03-22 11:28:16 +01:00