kloenk/lix
0
0
Fork 0
forked from lix-project/lix
Code Pull requests Activity
11087 commits 2 branches 2 tags 71 MiB
Commit graph

11087 commits

This branch
This branch
All branches
Author SHA1 Message Date
Eelco Dolstra 4b2b151131 nix path-info -r: Don't duplicate the root paths 
This fixes

  $ nix path-info -r $(type -P ls)
  /nix/store/vfilzcp8a467w3p0mp54ybq6bdzb8w49-coreutils-8.32
  /nix/store/5d821pjgzb90lw4zbg6xwxs7llm335wr-libunistring-0.9.10
  ...
  /nix/store/mrv4y369nw6hg4pw8d9p9bfdxj9pjw0x-acl-2.3.0
  /nix/store/vfilzcp8a467w3p0mp54ybq6bdzb8w49-coreutils-8.32

Also, output the paths in topologically sorted order like we used to.
 2021-09-27 12:47:39 +02:00
Eelco Dolstra a15e65eef0 run(): Move 2021-09-27 11:12:06 +02:00
Eelco Dolstra 283e7da470
Merge pull request #5292 from edolstra/update-lowdown 
Update lowdown
 2021-09-27 11:10:05 +02:00
Eelco Dolstra 32669a6bc9 Use separate lowdown 
Overriding the lowdown in nixpkgs can break nixUnstable.
 2021-09-27 10:31:13 +02:00
Eelco Dolstra a0bb5c4130
Merge pull request #4573 from oxalica/fix/git-init-spam 
Explicitly set default branch name for git to suppress "git hint"
 2021-09-24 17:17:04 +02:00
oxalica 81b8e910a0
Explicitly set initial branch name for git 2021-09-24 22:09:49 +08:00
Eelco Dolstra aedbc7b683 Use latest lowdown 
This improves list rendering
(https://github.com/kristapsdz/lowdown/issues/73).
 2021-09-24 15:22:51 +02:00
Eelco Dolstra 58856e86f6 flake.lock: Update 
Flake lock file changes:

• Updated input 'lowdown-src':
    'github:kristapsdz/lowdown/b4483d0ef85990f54b864158ab786b4a5b3904fa' (2021-08-06)
  → 'github:kristapsdz/lowdown/0b85e777f3cdacf4210f0d624a0ceec8df612e05' (2021-09-23)
 2021-09-24 15:21:22 +02:00
Eelco Dolstra 362d8f925e
Merge pull request #5253 from edolstra/flake-ifd 
Don't allow IFD in flakes by default
 2021-09-24 10:48:23 +02:00
Eelco Dolstra 87de086e1a
Merge pull request #5290 from edolstra/ssh-nologin 
SSHStore / LegacySSHStore: Show better error if the remote's stdout is polluted
 2021-09-23 23:14:30 +02:00
Eelco Dolstra ea9df6fe51 Shut down write side before draining the read side 
This is important if the remote side *does* execute
nix-store/nix-daemon successfully, but stdout is polluted
(e.g. because the remote user's bashrc script prints something to
stdout). In that case we have to shutdown the write side to force the
remote nix process to exit.
 2021-09-23 18:01:04 +02:00
Eelco Dolstra 994348e9e0 SSHStore / LegacySSHStore: Show a better error message if the remote is "nologin" 
Instead of

  error: serialised integer 7161674624452356180 is too large for type 'j'

we now get

  error: 'nix-store --serve' protocol mismatch from 'sshtest@localhost', got 'This account is currently not available.'

Fixes https://github.com/NixOS/nixpkgs/issues/37287.
 2021-09-23 17:50:29 +02:00
Eelco Dolstra 60642aa5e2 Remove risky char * 2021-09-23 12:07:50 +02:00
Eelco Dolstra 198fa786a1 Add some more instrumentation 2021-09-23 11:42:33 +02:00
Eelco Dolstra 1359c2c19a
Merge pull request #5284 from edolstra/revert-4922 
Revert "Merge pull request #4922 from nrdxp/default-submodules"
 2021-09-23 11:13:10 +02:00
Eelco Dolstra d1bf7431bb Revert "Merge pull request #4922 from nrdxp/default-submodules" 
This reverts commit 6678e98411, reversing
changes made to 90b2dd570c.
 2021-09-22 17:25:25 +02:00
Eelco Dolstra 8623a5b595 Disable IFD selectively 
It's now disabled by default for the following:

* 'nix search' (this was already implied by read-only mode)
* 'nix flake show'
* 'nix flake check', but only on the hydraJobs output
 2021-09-22 17:15:07 +02:00
Eelco Dolstra d8c10028d9 Make setDefault() typed 2021-09-22 14:15:35 +02:00
Eelco Dolstra 8fdb1d057a Quiet 2021-09-22 14:12:31 +02:00
Eelco Dolstra ff28fffce2 Don't cache realiseContext() errors 
Errors that depend on the configuration (such as whether
allow-import-from-derivation is set) should not be cached.
 2021-09-22 14:00:56 +02:00
Eelco Dolstra bcd73ebf60 Add missing #include 
Fixes #5282.
 2021-09-22 12:14:50 +02:00
Eelco Dolstra 3c1cd09109
Merge pull request #5281 from abathur/install_macos_monterey 
fix install on macOS monterey
 2021-09-22 10:58:02 +02:00
Travis A. Everett 033081aec2 fix install on macOS monterey 2021-09-21 13:38:29 -05:00
Eelco Dolstra c81f9761cc
Merge pull request #5279 from edolstra/restrict-path-inputs 
Fix relative path input handling
 2021-09-21 14:52:30 +02:00
Eelco Dolstra 60cc975d22 Set input parent at construction time 2021-09-21 14:07:16 +02:00
Eelco Dolstra 06557299b3 Allow relative paths anywhere into the parent's store path 2021-09-21 13:45:11 +02:00
Eelco Dolstra 5cbb9c5406 path fetcher: Fix relative path check 2021-09-21 13:19:26 +02:00
Eelco Dolstra be69a98d2c
Merge pull request #5277 from NixOS/regnat/ci-better-cache-usage 
flake: Use the real nixUnstable from nixpkgs
 2021-09-20 15:48:32 +02:00
regnat 81ed6ee201 flake: Use the real nixUnstable from nixpkgs 
Don’t let it pick our overriden lowdown as that would cause it not to be
cached in cache.nixos.org
 2021-09-20 14:37:09 +02:00
Eelco Dolstra 2933d3c588
Merge pull request #5266 from gkleen/fix/s3-cache-scheme 
Fix scheme query parameter for s3 cache
 2021-09-20 12:16:53 +02:00
Gregor Kleen fd67a0f927 Fix scheme argument to s3 cache 2021-09-17 10:45:19 +02:00
Eelco Dolstra 37cc50f2c8
Merge pull request #5263 from greedy/fix-5261 
Include subpath in flake fingerprint
 2021-09-17 08:10:47 +02:00
Geoff Reedy cbe9ddfd1a Include subpath in flake fingerprint 
Without this, flakes within the same tree and same lock data will have
the same fingerprint and the eval cache for one flake will be
incorrectly used for another.
 2021-09-16 15:58:21 -06:00
Eelco Dolstra 1ec4efa6c8
Merge pull request #5257 from edolstra/dirty-lock-file 
If we can't write a lock file, pretend the top-level flake is dirty
 2021-09-15 20:18:23 +02:00
Eelco Dolstra c17f3c5e69 Merge branch 'mh/fix-chroot-eval' of https://github.com/obsidiansystems/nix 2021-09-15 18:37:58 +02:00
Eelco Dolstra 027344ce7e If we can't write a lock file, pretend the top-level flake is dirty 
Alternative to #4639. You can still read flake.lock, but at least in
reproducible workflows like NixOS configurations where you require a
non-dirty tree, evaluation will fail because there is no rev.
 2021-09-15 18:31:42 +02:00
Eelco Dolstra 991cc53386 Revert "Disallow reading flake.lock" 
This reverts commit e5596113f7.
 2021-09-15 18:30:37 +02:00
Eelco Dolstra d2c8eed344
Merge pull request #5251 from emilazy/darwin-sandbox-rosetta-2 
sandbox: allow Rosetta 2 on Darwin
 2021-09-15 09:11:26 +02:00
Emily 56025ad3b1 sandbox: allow Rosetta 2 on Darwin 
This allows sandboxed x86_64-darwin builds on aarch64-darwin.
 2021-09-15 02:02:03 +01:00
Eelco Dolstra fda4efff87 Rename unnecessary git@ 2021-09-14 22:53:31 +02:00
Eelco Dolstra 5ee3ee1a6b
Merge pull request #5249 from edolstra/nix-profile 
Add missing 'nix profile' subcommands
 2021-09-14 22:27:19 +02:00
Eelco Dolstra 2c751c0c00
Merge pull request #5250 from edolstra/censor-flake-lock 
Disallow reading flake.lock
 2021-09-14 22:27:02 +02:00
Eelco Dolstra e5596113f7 Disallow reading flake.lock 
With --no-write-lock-file, it's possible that flake.lock is out of
sync with the actual inputs used by the evaluation. So doing fromJSON
(readFile ./flake.lock) will give wrong results.

Fixes #4639.
 2021-09-14 21:09:11 +02:00
Eelco Dolstra b41968f15a nix profile history: Show profile date 2021-09-14 20:47:33 +02:00
Eelco Dolstra 4b738fc7a9 Add 'nix profile wipe-history' command 2021-09-14 20:35:41 +02:00
Eelco Dolstra f359b9981b Generations -> profile versions 2021-09-14 19:57:45 +02:00
Eelco Dolstra 229ad612b8 Fix quotes 2021-09-14 19:48:16 +02:00
Eelco Dolstra 817562e694 Add "nix profile rollback" command 2021-09-14 19:32:33 +02:00
Eelco Dolstra 1fbaf36729 nix flake show --json: Add type info 
For extensibility, every leaf node is now an object that contains at
least a type field (e.g. "type": "derivation").
 2021-09-14 17:18:29 +02:00
Eelco Dolstra f3259af73e Merge branch 'tomberek/show_json' of https://github.com/tomberek/nix 2021-09-14 16:58:35 +02:00