guiwf/lix
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
7,326 Commits 37 Branches 40 Tags
90df25ef7eb5157868a744906eaf6401430bb93d
Commit Graph
4328 Commits
Author SHA1 Message Date
Eelco Dolstra 90df25ef7e Fix build 2019-10-10 15:07:50 +02:00
Eelco Dolstra e99bb91217 Merge remote-tracking branch 'origin/master' into flakes 2019-10-10 12:54:37 +02:00
Eelco Dolstra c3aaf3b8da nix-env: Ignore failures creating ~/.nix-profile and ~/.nix-defexpr 
https://hydra.nixos.org/build/102803093
 2019-10-10 09:14:05 +02:00
Eelco Dolstra bda64a2b0f Doh 
https://hydra.nixos.org/build/102803044
 2019-10-10 00:12:30 +02:00
Eelco Dolstra 20eec802ff Force per-user group to a known value 2019-10-09 23:35:02 +02:00
Eelco Dolstra d7bae5680f Go back to 755 permission on per-user directories 
700 is pointless since the store is world-readable anyway. And
per-user/root/channels must be world-readable.
 2019-10-09 23:35:02 +02:00
Eelco Dolstra c9159f86cc nix-env: Create ~/.nix-defexpr automatically 2019-10-09 23:35:02 +02:00
Eelco Dolstra 9348f9291e nix-env: Create ~/.nix-profile automatically 2019-10-09 23:35:01 +02:00
Eelco Dolstra 5a303093dc Remove world-writability from per-user directories 
'nix-daemon' now creates subdirectories for users when they first
connect.

Fixes #509 (CVE-2019-17365).
Should also fix #3127.
 2019-10-09 23:34:48 +02:00
Eelco Dolstra 4331eeb13d Filter ANSI escape sequences in -L output 
Otherwise, builds like NixOS VM tests may leave the terminal in a
weird state and do resets.
 2019-10-09 23:25:06 +02:00
Eelco Dolstra 55bba8e4f5 Make std::uncaught_exception warning less noisy 2019-10-09 23:04:11 +02:00
Eelco Dolstra 926d3e5bb0 Fix Bison 2.4 warning 2019-10-09 22:57:37 +02:00
Eelco Dolstra 99b73fb507 OCD performance fix: {find,count}+insert => insert 2019-10-09 16:06:29 +02:00
Eelco Dolstra e6e61f0a54 getSourceExpr(): Handle channels 
Fixes #1892.
Fixes #1865.
Fixes #3119.
 2019-10-09 15:36:51 +02:00
Eelco DolstraandGitHub 08ad9714e1 Merge pull request #3132 from matthewbauer/handle-sandbox-shell 
Handle empty sandbox_shell
 2019-10-09 14:52:51 +02:00
Eelco Dolstra 7c74f075f4 nix search: Don't quietly ignore errors 2019-10-09 14:46:58 +02:00
Eelco Dolstra 64d8872900 nix-build: Fix compilation 2019-10-09 14:46:44 +02:00
Matthew Bauer 199e888785 Handle empty sandbox_shell 
Previously, SANDBOX_SHELL was set to empty when unavailable. This
caused issues when actually generating the sandbox. Instead, just set
SANDBOX_SHELL when --with-sandbox-shell= is non-empty. Alternative
implementation to https://github.com/NixOS/nix/pull/3038.
 2019-10-08 23:12:54 -04:00
Matthew Bauer 65f6d5db6f Don’t source bashrc in pure mode 
Pure mode should not try to source the user’s bashrc file. These may
have many impurities that the user does not expect to get into their
shell.

Fixes #3090
 2019-10-08 22:41:59 -04:00
Eelco Dolstra a0bd088d84 Move addRegistrOverrides 2019-10-08 17:00:55 +02:00
Eelco Dolstra 21304c11f9 uri -> url for consistency 2019-10-08 17:00:55 +02:00
Emilio Karakey d24bfe29a1 deleted comment 2019-10-07 18:28:10 -05:00
Eelco Dolstra a15f9b37eb fetchGit: Support Git trees without any commits 
Fixes

  $ nix build
  fatal: bad revision 'HEAD'
  error: program 'git' failed with exit code 128

on a new flake. It is now detected as a dirty tree with revCount = 0.
 2019-10-07 15:44:32 +02:00
Sam Doshi 6f6cb5e388 nix search: remove verbose example 2019-10-07 11:40:42 +01:00
Eelco Dolstra a323b7826c Merge remote-tracking branch 'origin/master' into flakes 2019-10-04 17:26:32 +02:00
Eelco Dolstra 93b1ce1ac5 Revert "std::uncaught_exception() -> std::uncaught_exceptions()" 
This reverts commit 6b83174fff because
it doesn't work on macOS yet.

https://hydra.nixos.org/build/102617587
 2019-10-04 16:34:59 +02:00
Eelco Dolstra 90d6018509 Fix aborts when using builtins.getFlake 
In that case, 'self' could refer to a value on the stack, so accessing
'self.rev' would abort.
 2019-10-02 22:08:19 +02:00
Eelco Dolstra 15e70c662e Fix indentation 2019-10-02 16:26:15 +02:00
Eelco Dolstra 780c1a8f27 nix dev-shell: Ignore $NIX_LOG_FD 2019-10-02 10:52:56 +02:00
Eelco Dolstraandzimbatm 168a887916 Fix fetchTarball with chroot stores 
Fixes #2405.
 2019-10-01 07:51:06 +00:00
Domen KožarandGitHub 2d2769f68c Merge pull request #2338 from bobvanderlinden/pr-cannot-delete-alive-why 
mention `nix-store --query --roots` when a path cannot be deleted
 2019-09-30 14:06:52 +02:00
Eelco Dolstra 9b9de3a5e3 nix dev-shell: Improve environment handling 
Only variables that were marked as exported are exported in the dev
shell. Also, we no longer try to parse the function section of the env
file, fixing

  $ nix dev-shell
  error: shell environment '/nix/store/h7ama3kahb8lypf4nvjx34z06g9ncw4h-nixops-1.7pre20190926.4c7acbb-env' has unexpected line '/^[a-z]?"""/ {'
 2019-09-27 17:01:25 +02:00
Eelco Dolstra 15b888c9a5 cmatch -> smatch 2019-09-27 15:31:09 +02:00
Eelco Dolstra 454e3a541a Fix sorting of non-flake input attributes 2019-09-26 17:51:51 +02:00
Eelco Dolstra c32bba7489 Shut up some warnings 2019-09-24 17:28:18 +02:00
Eelco DolstraandGitHub 5038e1bec4 Merge pull request #3103 from bhipple/fix/spelling 
Fix spelling in comment
 2019-09-23 10:46:40 +02:00
Eelco DolstraandGitHub 02b4632e77 Merge pull request #3104 from zimbatm/no-show-trace-forwarding 
libstore: don't forward --show-trace
 2019-09-23 10:44:42 +02:00
Eelco Dolstra 3a022d4599 Shut up some warnings 
(cherry picked from commit 99e8e58f2d)
 2019-09-22 21:57:05 +02:00
Eelco Dolstra bd79c1f6f6 Don't catch exceptions by value 
(cherry picked from commit 893be6f5e3)
 2019-09-22 21:56:56 +02:00
Eelco Dolstra 382aa05ff7 nix flake info --json: Get rid of duplicate getFlake() call 
Also fix some gcc warnings.
 2019-09-22 21:53:01 +02:00
Eelco Dolstra 893be6f5e3 Don't catch exceptions by value 2019-09-22 21:29:33 +02:00
zimbatm e63c9e73e3 libstore: don't forward --show-trace 2019-09-22 10:57:20 +00:00
Benjamin Hipple c6a542f22a Fix spelling in comment 2019-09-21 18:53:15 -04:00
Eelco Dolstra 14d3f45009 Simplify 2019-09-20 16:06:49 +02:00
Eelco Dolstra 5a0e98d1e5 Use '#' instead of ':' to separate flakeref and attrpath 
This is less ambiguous.
 2019-09-20 16:01:40 +02:00
Eelco Dolstra 5961c94097 Flake alias -> id 2019-09-20 14:46:37 +02:00
Eelco Dolstra 68e0f23edc Add flags to disallow dirty Git trees and to turn off warnings 2019-09-20 14:29:49 +02:00
Eelco Dolstra 99e8e58f2d Shut up some warnings 2019-09-20 13:48:53 +02:00
Eelco Dolstra 5573365dff nix flake check: Validate nixosConfigurations outputs 2019-09-19 20:15:42 +02:00
Eelco Dolstra aeb7148afd Some effort to minimize flake dependencies 
For example, if the top-level flake depends on
"nixpkgs/release-19.03", and one of its dependencies depends on
"nixpkgs", then the latter will be mapped to "nixpkgs/release-19.03",
rather than whatever the default branch of "nixpkgs" is. Thus you get
only one "nixpkgs" dependency rather than two.

This currently only works in a breadth-first way, so the other way
around (i.e. if the top-level flake depends on "nixpkgs", and a
dependency depends on "nixpkgs/release-19.03") still results in two
"nixpkgs" dependencies.
 2019-09-18 23:59:45 +02:00