scriptis/lix
0
0
Fork 0
forked from lix-project/lix
Code Pull requests Activity
6919 commits 30 branches 6 tags 84 MiB
Commit graph

6919 commits

This branch
This branch
All branches
Author SHA1 Message Date
Eelco Dolstra e7e7a03baf
nix flake deps: Remove --json flag for now 
It doesn't produce valid JSON at the moment (but a concatenation of
JSON objects). Anyway we probably should merge this command info 'nix
flake info'.
 2019-05-28 13:22:11 +02:00
Eelco Dolstra fdf06ce72f
printFlakeInfo/printNonFlakeInfo: Factor out commonality 2019-05-28 13:21:06 +02:00
Eelco Dolstra 25e497bf9c
nix flake info/deps: Stop progress bar before printing output 2019-05-28 13:14:27 +02:00
Eelco Dolstra dda4f7167b
Remove redundant resolvedRef fields since they're already in SourceInfo 2019-05-28 13:12:43 +02:00
Eelco Dolstra 4846304541
Rename contentHash -> narHash for consistency 2019-05-28 13:08:40 +02:00
Eelco Dolstra 894e007445
Move hash into SourceInfo and rename to narHash to avoid ambiguity 2019-05-28 13:07:15 +02:00
Eelco Dolstra 6d7efcfaeb
Store SourceInfo in Flake and NonFlake 
This deduplicates some shared fields. Factoring out the commonality is
useful in places like makeFlakeValue().
 2019-05-28 13:06:43 +02:00
Eelco Dolstra de36cf3db9
Merge branch 'nonFlakeRequiresTest' of https://github.com/CSVdB/nix into flakes 2019-05-28 12:05:11 +02:00
Nick Van den Broeck 4d030a8d96 Added nonFlakeRequires test 
Fixes #2888
 2019-05-28 10:51:45 +02:00
Eelco Dolstra 2950014535
Merge pull request #2895 from CSVdB/fixRelativePaths 
Fixed relative path parsing
 2019-05-28 10:24:43 +02:00
Nick Van den Broeck 6fb7545fa1 Fixed relative path parsing 
Fixed #2821
 2019-05-28 10:17:28 +02:00
Eelco Dolstra 638c56caed
Remove outdated fetchGit test 
It's no longer an error if we can't update our clone.
 2019-05-26 15:59:50 +02:00
Eelco Dolstra 981f686259
Merge pull request #2890 from NixOS/offline-flakes 
Offline flakes
 2019-05-25 10:25:39 +02:00
Eelco Dolstra 90fe1dfd2f Register flake source trees as GC roots 
This ensures that flakes don't get garbage-collected, which is
important to get nix-channel-like behaviour.

For example, running

  $ nix build hydra:

will create a GC root

  ~/.cache/nix/flake-closures/hydra -> /nix/store/xarfiqcwa4w8r4qpz1a769xxs8c3phgn-flake-closure

where the contents/references of the linked file in the store are the
flake source trees used by the 'hydra' flake:

  /nix/store/n6d5f5lkpfjbmkyby0nlg8y1wbkmbc7i-source
  /nix/store/vbkg4zy1qd29fnhflsv9k2j9jnbqd5m2-source
  /nix/store/z46xni7d47s5wk694359mq9ay353ar94-source

Note that this in itself is not enough to allow offline use; the
fetcher for the flakeref (e.g. fetchGit or downloadCached) must not
fail if it cannot fetch the latest version of the file, so long as it
knows a cached version.

Issue #2868.
 2019-05-23 23:53:25 +02:00
Eelco Dolstra 6b77bfc28d FlakeRef::to_string(): Check round trip 2019-05-23 23:39:58 +02:00
Eelco Dolstra 6e984431dd fetchGit: Don't barf if we can't update our Git clone 
Instead print a warning that we're continuing with the most recently
fetched version.
 2019-05-23 23:38:40 +02:00
Eelco Dolstra 013f4928c8 Fix tests 
https://hydra.nixos.org/eval/1521131
 2019-05-23 16:36:12 +02:00
Eelco Dolstra 2f162feb0f
Merge pull request #2886 from NixOS/fetch-registry 
Use online global registry
 2019-05-23 09:27:04 +02:00
Eelco Dolstra a4ba6e5590 Add a test for the registry GC root 2019-05-22 23:52:29 +02:00
Eelco Dolstra f0d6d67af9 Prevent the global registry from being GC'ed 
Issue #2868.
 2019-05-22 23:43:58 +02:00
Eelco Dolstra df3f5a78d5 Refactor downloadCached() interface 2019-05-22 23:36:29 +02:00
Eelco Dolstra 66f1d7ee95 Fetch the flake registry from the NixOS/flake-registry repo 2019-05-22 22:56:46 +02:00
Eelco Dolstra 55a0451e51
Merge pull request #2884 from NixOS/check-epoch 
Check the flake epoch
 2019-05-22 18:49:12 +02:00
Eelco Dolstra 7c7105e0f8 flake-registry: tweag/nix -> NixOS/nix 2019-05-22 14:52:57 +02:00
Eelco Dolstra e414bde6f9 Check the flake epoch 
Closes #2883.
 2019-05-22 14:31:40 +02:00
Eelco Dolstra 3cecf3f39c
Merge pull request #2877 from NixOS/improve-flake-command 
FlakeCommand improvements
 2019-05-22 14:08:52 +02:00
Eelco Dolstra 3e8ef9eb22 nix flake deps: Print flake dependencies 2019-05-22 14:04:18 +02:00
Eelco Dolstra 70136a9bf4 Move flake-related flags into a separate class 
Also, rename --dont-save-lock-file to --no-save-lock-file and change
noRegistries to useRegistries.
 2019-05-22 14:04:18 +02:00
Eelco Dolstra bc0fb109a9 Add some tests 2019-05-22 14:04:18 +02:00
Eelco Dolstra 2468672e30 Improve FlakeCommand 
It now handles commonality like calling getFlake() and resolving
relative local flake refs.

Fixes #2822.
 2019-05-22 14:03:28 +02:00
Eelco Dolstra 8e5c86befc
Merge pull request #2881 from NixOS/misc-fixes 
Improve lockfile warnings
 2019-05-21 17:22:51 +02:00
Eelco Dolstra 5990b86391 Use warn(), tweak messages 2019-05-21 15:03:54 +02:00
Eelco Dolstra 20a1a65d37 Only rewrite the lockfile if it changed 
This removes spurious warnings about failure to write the lockfile.
 2019-05-21 14:55:43 +02:00
Eelco Dolstra 818c8da5b8 Merge branch 'fixLockFile' of https://github.com/CSVdB/nix into flakes 2019-05-21 13:46:19 +02:00
Nick Van den Broeck ef6ae61503 Lockfile handling in resolveFlake is fixed 2019-05-17 14:50:10 +02:00
Nick Van den Broeck 98f20dee41 Give errors in resolveFlake 
If DontUpdate but the lockfile isn't correct
 2019-05-16 15:02:25 +02:00
Nick Van den Broeck d9ad3723d5 Fixed issue 65 
lockfile updating
 2019-05-16 15:02:05 +02:00
Eelco Dolstra b531695331
Merge pull request #96 from tweag/support-chroot-store 
Make flakes work with 'nix build --store ...'
 2019-05-16 10:51:40 +02:00
Eelco Dolstra 666fac2ba3
Merge pull request #97 from tweag/flake-docs 
Start of flake documentation
 2019-05-16 10:51:16 +02:00
Eelco Dolstra b0fc5bcee9 Start of flake documentation 
Imported from https://gist.github.com/edolstra/40da6e3a4d4ee8fd019395365e0772e7.

The goal is to turn this into an RFC eventually and later to integrate
it into the manual.
 2019-05-15 20:58:47 +02:00
Eelco Dolstra 0f5032c5a4 Merge remote-tracking branch 'origin/master' into flakes 2019-05-15 20:51:29 +02:00
Eelco Dolstra 8f6c72faee
Merge pull request #2810 from NixOS/print-build-logs 
nix: Add --print-build-logs flag
 2019-05-15 20:38:38 +02:00
Eelco Dolstra 66b8a62101 nix: Add --print-build-logs flag 
This causes 'nix' to print build log output to stderr rather than
showing the last log line in the progress bar. Log lines are prefixed
by the name of the derivation (minus the version string), e.g.

  binutils> make[1]: Leaving directory '/build/binutils-2.31.1'
  binutils-wrapper> unpacking sources
  binutils-wrapper> patching sources
  ...
  binutils-wrapper> Using dynamic linker: '/nix/store/kr51dlsj9v5cr4n8700jliyz8v5b2q7q-bootstrap-stage0-glibc/lib/ld-linux-x86-64.so.2'
  bootstrap-stage2-gcc-wrapper> unpacking sources
  ...
  linux-headers> unpacking sources
  linux-headers> unpacking source archive /nix/store/8javli69jhj3bkql2c35gsj5vl91p382-linux-4.19.16.tar.xz
 2019-05-15 17:33:56 +02:00
Eelco Dolstra 5c34d66538 Make flakes work with 'nix build --store ...' 
It was getting confused between logical and real store paths.

Also, make fetchGit and fetchMercurial update allowedPaths properly.

(Maybe the evaluator, rather than the caller of the evaluator, should
apply toRealPath(), but that's a bigger change.)
 2019-05-15 15:38:24 +02:00
Eelco Dolstra b6eb8a2d7e
nix-profile: Add all channels to $NIX_PATH 
Fixes #2709.
 2019-05-15 14:30:09 +02:00
Eelco Dolstra 3fd5425f94
Fix shellcheck error 
https://hydra.nixos.org/build/93359951
 2019-05-15 13:13:14 +02:00
Eelco Dolstra 38b87dea62
Merge pull request #91 from tweag/disable-some-tests 
Disable tests introduced by PR #82
 2019-05-15 09:05:47 +02:00
Eelco Dolstra 696a98af5a
Disable tests introduced by PR #82 
This PR was not intended to be merged until those tests were actually
passing. So disable them for now to unbreak the flakes branch.

https://hydra.nixos.org/eval/1519271
 2019-05-15 09:03:46 +02:00
Eelco Dolstra 10f68923c6
Merge remote-tracking branch 'tweag/fixmes' into flakes 2019-05-15 08:57:04 +02:00
Nick Van den Broeck 4c9ebd20d7 One FIXME was already fixed 2019-05-15 08:10:46 +02:00