lunaphied/lix
0
0
Fork 0
forked from lix-project/lix
Code Pull requests Activity
6729 commits 2 branches 3 tags 72 MiB
Commit graph

6729 commits

This branch
This branch
All branches
Author SHA1 Message Date
Eelco Dolstra cdcdf3e798
Merge pull request #2812 from matthewbauer/fix-nix-scripts 
Sync NIX_PROFILES between single-user and multi-user modes
 2019-05-21 13:28:28 +02:00
Eelco Dolstra 14c877b4ab fetchGit -> fetchTarball 
(cherry picked from commit cbfdea6857)
 2019-05-17 22:28:03 +02:00
Vladimír Čunát c0559a1d60
docs: describe $IN_NIX_SHELL values (#2796) 
See commit 1bffd83e1a
 2019-05-17 09:50:42 +02:00
Matthew Bauer 92f461e4f4 Don’t set NIX_REMOTE=daemon in daemon profile 
This is now autodetected. There is no need to put it in the profile.
 2019-05-15 22:24:24 -04:00
Matthew Bauer 7c20ee448f Sync NIX_PROFILES between single-user and multi-user modes 
When we are in single user mode, we still want to have access to
profiles. This way things in Nixpkgs that rely on them getting set
accurately are done in both cases. The point where I hit this is with
using aspell which looks in NIX_PROFILES:

https://github.com/NixOS/nixpkgs/blob/master/pkgs/development/libraries/aspell/default.nix

Before this patch, NIX_PROFILES was never set in single user mode!
This corrects that.
 2019-05-15 22:04:39 -04: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 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 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 Dolstra 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 7c6391ddc7
nix-shell: Don't absolutize '-p' expressions 
This prevents spurious syscalls like

  25011 lstat("/home/eelco/with import <nixpkgs> { }; (pkgs.runCommandCC or pkgs.runCommand) \"shell\" { buildInputs = [ (hello) ]; } \"\"", 0x7ffe9c67f580) = -1 ENOENT (No such file or directory)
 2019-05-08 14:29:36 +02:00
Graham Christensen 5713772568
Merge pull request #2594 from LnL7/darwin-10.12.6 
installer: update macOS version check to 10.12.2
 2019-05-08 07:16:06 -04:00
Eelco Dolstra 71eb76a0d4
Merge pull request #2765 from nh2/manual-nixpkgs-word 
manual: "Nix Package collection" -> "Nixpkgs package collection".
 2019-05-08 10:19:59 +02:00
Eelco Dolstra 92caa60c49
Merge branch 'repl/ctrlc' of https://github.com/xbreak/nix 2019-05-08 10:18:45 +02:00
Eelco Dolstra 3e940bbf2d
Merge pull request #2790 from samueldr/fix/minor-comment-NIX_ROOT_FINDER 
findRootsNoTemp: fixes comment about findRuntimeRoots
 2019-05-08 10:13:09 +02:00
Will Dietz a834861876
fix hashfile test that wasn't failing due to eval laziness 
See:
7becb1bf1c (r33450554)
 2019-05-08 10:04:54 +02:00
Eelco Dolstra 7becb1bf1c
Merge pull request #2792 from JohnAZoidberg/builtins-hash-file 
Add builtins.hashFile
 2019-05-07 13:26:59 +02:00
Daniel Schaefer 3f192ac80c Add builtins.hashFile 
For text files it is possible to do it like so:
`builtins.hashString "sha256" (builtins.readFile /tmp/a)`
but that doesn't work for binary files.

With builtins.hashFile any kind of file can be conveniently hashed.
 2019-05-03 17:23:36 +02:00
Eelco Dolstra f9a2ea4486
Fix "Bad system call" running i686-linux binaries on x86_64-linux 
To determine which seccomp filters to install, we were incorrectly
using settings.thisSystem, which doesn't denote the actual system when
--system is used.

Fixes #2791.
 2019-05-03 10:48:33 +02:00
Eelco Dolstra 989cb37777
Merge pull request #2679 from bjornfor/offline-install 
install script: don't abort when "nix-channel --update" fails
 2019-05-01 15:48:39 +02:00
Samuel Dionne-Riel cbc7d9a412 findRootsNoTemp: fixes comment about findRuntimeRoots 
The NIX_ROOT_FINDER environment variable was removed in
3c46fe62b8 when porting from perl to C.
 2019-04-30 22:43:24 -04:00
Domen Kožar 83f2b110ce
Merge pull request #2750 from nh2/max-jobs-0-docs 
docs: Mention `--max-jobs 0` to build remotely only
 2019-04-29 12:44:54 +07:00
Eelco Dolstra f22540464f
Merge pull request #2775 from LnL7/darwin-sandbox-hash-rewrite 
build: only skip hash rewriting for sandboxing on linux
 2019-04-24 10:45:45 +02:00
Daiderd Jordan b614e0e53d
build: only skip hash rewriting for sandboxing on linux 
The sandbox on darwin, and possibly other future platforms, doesn't have
enough isolation to redirect outputs without hash rewriting.
 2019-04-17 23:41:23 +02:00
Eelco Dolstra 5112a33fb1
Fix release script 2019-04-15 19:17:17 +02:00
Niklas Hambüchen 288f93cec0 manual: "Nix Package collection" -> "Nixpkgs package collection". 
Makes difference between Nix and Nixpkgs clearer to avoid
some common confusion this sentence on IRC.

Also disambiguate an "it" reference.
 2019-04-14 03:20:57 +02:00
Eelco Dolstra bb6e6923f2 Add environment variable NIX_SHOW_SYMBOLS for dumping the symbol table 2019-04-11 23:04:13 +02:00
Eelco Dolstra 41ba5135e0 primeCache(): Barf if builds are needed but not allowed 
Fixes #2753.
 2019-04-01 21:09:49 +02:00
Eelco Dolstra 2bc6304793 getMachines(): Cache result 2019-04-01 21:09:35 +02:00
Eelco Dolstra 2f59b30251 Use Nixpkgs 19.03 2019-04-01 21:09:25 +02:00
Niklas Hambüchen caa76c369a docs: Mention --max-jobs 0 to build remotely only 2019-03-31 03:57:45 +02:00
Eelco Dolstra f32fbf952d Fix Bison 3.3 warning 2019-03-27 21:09:31 +01:00
Eelco Dolstra e489f5cabf Update eval-okay-types.exp to match #1828 2019-03-27 21:07:04 +01:00
Graham Christensen 6e9e34ea1f
Merge pull request #2744 from veprbl/patch-8 
manual: mention the "channel:" shorthand for NIX_PATH
 2019-03-25 21:49:48 -04:00
Dmitry Kalinkin 75ec68f93a
manual: mention the "channel:" shorthand for NIX_PATH 
Bumped to 15.09 because older channels, when downloaded from
nixos.org, require firefox to be accessed via `pkgs.firefox`
 2019-03-25 20:55:28 -04:00
Eelco Dolstra 5c05c238e6
Merge pull request #1828 from zimbatm/isPath 
Add isPath primop
 2019-03-25 19:58:11 +01:00
Will Dietz 63e7fc5096
perl/configure.ac: fix for new version location too 2019-03-25 09:18:30 +01:00
Will Dietz 1f9c8cd68b
configure.ac: update for new version file location 2019-03-25 09:18:30 +01:00
Will Dietz 42e2d5e7b7
store-api.hh: add missing include for unordered_map 2019-03-25 09:18:30 +01:00