guiwf/lix
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
6,894 Commits 37 Branches 40 Tags
3cecf3f39c5c580ed6d0c5f0bcbb09dcc53dfae4
Commit Graph
6894 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Eelco DolstraandGitHub 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 DolstraandGitHub 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 DolstraandGitHub 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 DolstraandGitHub 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 DolstraandGitHub 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 DolstraandGitHub 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
Nick Van den BroeckandGitHub 74389370c6 Merge pull request #82 from tweag/failing-test 
Add a couple of currently failing tests
 2019-05-13 09:16:34 +02:00
Eelco DolstraandGitHub 5f6840fbb4 Merge pull request #2802 from LnL7/fix-needs-hashrewrite 
build: move needsHashRewrite initialization to startBuilder
 2019-05-13 08:53:48 +02:00
Eelco DolstraandGitHub d5c95e2b14 Merge pull request #2798 from grahamc/diff-hook 
build: run diff-hook under --check and document diff-hook
 2019-05-12 23:18:36 +02:00
Graham Christensen f1b8e9efe7 runProgram: Uncomment chdir support 2019-05-12 17:03:01 -04:00
Daiderd Jordan ce02fc74b2 build: make needsHashRewrite a method 2019-05-12 22:56:27 +02:00
Graham Christensen 73b797c207 handleDiffHook: stop passing allowVfork 2019-05-12 13:44:22 -04:00
Graham Christensen a5efe61786 Clarify where output from the diff hook goes. 2019-05-12 13:23:30 -04:00
Graham Christensen b4a05edbfe runProgram: support gid, uid, chdir 2019-05-12 13:17:27 -04:00
Graham Christensen dde8eeb39a chdir, setgroups 2019-05-12 13:17:26 -04:00
Graham Christensen 6df61db060 diff hook: execute as the build user, and pass the temp dir 2019-05-12 13:17:26 -04:00
Graham Christensen c78686e411 build: run diff-hook under --check and document diff-hook 2019-05-12 13:17:24 -04:00
Daiderd Jordan d75bdb5793 build: add test for sandboxed --check 2019-05-12 16:46:21 +02:00
Daiderd Jordan ff6867ab94 build: move needsHashRewrite initialization to startBuilder 
The value of useChroot is not set yet in the constructor, resulting in
hash rewriting being enabled in certain cases where it should not be.

Fixes #2801
 2019-05-12 15:53:40 +02:00
Eelco Dolstra 156e3a9daa nix dev-shell: Ignore SSL_CERT_FILE 2019-05-11 01:50:28 +02:00
Eelco Dolstra 5a80cccc70 Hack to fix tests.evalNixpkgs 2019-05-11 01:48:33 +02:00
Eelco Dolstra 68b17ef731 Update flake.lock 2019-05-09 15:08:09 +02:00
Eelco Dolstra 3a4b744d9c Merge remote-tracking branch 'tweag/content-hashes' into flakes 2019-05-09 15:05:14 +02:00
Nick Van den Broeck d209bdcd08 Fixed issue #47 
Content hashes
 2019-05-09 14:27:55 +02:00
Eelco Dolstra 391e1f511d Add test for indirect flake dependencies 
I.e. flake3 depends on flake2 which depends on flake1. Currently this
fails with

  error: indirect flake reference 'flake1' is not allowed

because we're not propagating lockfiles downwards properly.
 2019-05-09 13:59:50 +02:00
Eelco Dolstra a746dc64d2 Add currently failing test for #81 2019-05-09 13:55:33 +02:00
Eelco Dolstra cead210e66 Add patchelf to the flake registry 2019-05-08 22:40:21 +02:00
Eelco Dolstra 8fc1c3f413 Fix assertion failure in FlakeRef::to_string() 
Fixes

  $ nix build
  nix: src/libexpr/primops/flakeref.cc:169: std::__cxx11::string nix::FlakeRef::to_string() const: Assertion `!rev' failed.
  Aborted

e.g. when flake.nix doesn't exist.

Also use gitRev().
 2019-05-08 22:09:18 +02:00
Eelco Dolstra 455aa8d9ea Add newline at end of lockfile 
Suggested by @grahamc.
 2019-05-08 18:28:01 +02:00
Eelco Dolstra cb5ebc5c11 nix dev-shell: Keep $TERM 2019-05-08 17:07:35 +02:00
Eelco Dolstra 2bc55aba1e Merge remote-tracking branch 'origin/master' into flakes 2019-05-08 14:30:27 +02:00