regnat
43d5c5f87b
Make nix flake show display the devShells
2021-07-13 17:25:27 +02:00
regnat
037c86ee04
nix develop: Search in devShells.${system} by default
...
Make `nix develop .#foo` search `.#devShells.${system}.foo` first
2021-07-13 17:25:27 +02:00
Eelco Dolstra
eb4788954d
Merge pull request #5006 from illustris/nscd
...
fixed-output derivations: fix incorrect responses for getpwuid
2021-07-13 17:20:37 +02:00
illustris
7bc17a903b
fixed output derivations: fix incorrect responses for getpwuid
...
Passing nscd socket into the build environment causes unexpected behavior in programs that make getpwuid and other related calls.
relevant threads:
- https://github.com/NixOS/nix/issues/4991
- https://discourse.nixos.org/t/haunted-nix-build-breaks-isolation/13869
2021-07-13 15:34:14 +05:30
Eelco Dolstra
099df07e1e
Merge pull request #5000 from nielsegberts/master
...
toString also coerces a set with an outPath attribute to a string
2021-07-12 17:35:32 +02:00
Eelco Dolstra
02dff9e529
Style
2021-07-12 17:32:23 +02:00
Eelco Dolstra
e06c272c12
Merge branch 'structured-attrs-shell' of https://github.com/Ma27/nix
2021-07-12 17:13:05 +02:00
04cd2da84c
Merge branch 'master' into structured-attrs-shell
...
Conflicts:
src/nix/develop.cc
src/nix/get-env.sh
tests/shell.nix
2021-07-12 15:49:39 +02:00
Eelco Dolstra
91d2e8d5ad
Error -> UsageError
2021-07-12 15:04:46 +02:00
Eelco Dolstra
8d97030bfd
Merge branch 'days' of https://github.com/nielsegberts/nix
2021-07-12 15:02:24 +02:00
Niels Egberts
2cf14db857
Throw on unexpected input for --delete-older-than
...
'--delete-older-than 10' deletes the generations older than a single day, and '--delete-older-than 12m' deletes all generations older than 12 days.
This changes makes it throw on those invalid inputs, and gives an example of a valid input.
2021-07-11 11:24:43 +01:00
Niels Egberts
ae0ed53b09
toString also coerces a set with an outPath attribute to a string
...
nix-repl> builtins.toString { outPath = "somestring"; }
"somestring"
2021-07-09 21:50:10 +01:00
Eelco Dolstra
ceda58d112
Formatting
2021-07-09 14:03:51 +02:00
Eelco Dolstra
07790fdddf
ref: Add equality operators
2021-07-09 14:03:48 +02:00
Eelco Dolstra
9cf991f421
Merge pull request #4998 from edolstra/nix-print-dev-env-json
...
nix print-dev-env: Add --json flag
2021-07-09 13:55:44 +02:00
Eelco Dolstra
86fb01c4be
nix print-dev-env: Add --json flag
2021-07-09 12:10:48 +02:00
Eelco Dolstra
223e0569ff
Merge pull request #4997 from edolstra/nix-develop-arrays
...
nix develop: Make bash environment parsing more robust
2021-07-09 11:16:31 +02:00
Eelco Dolstra
e50408bd31
nix develop: Add a test for bash functions
2021-07-09 01:18:44 +02:00
Eelco Dolstra
9fc7da1e08
Add test for #4992
2021-07-09 01:18:44 +02:00
Eelco Dolstra
5f6375a816
nix develop: Filter some bash magic variables
2021-07-09 01:18:44 +02:00
Eelco Dolstra
b1f1347ade
nix develop: Don't parse bash environment with regexes
...
Instead have get-env.sh dump the bash environment as JSON. This should
be a lot less error-prone.
Fixes #4992 .
2021-07-09 01:18:37 +02:00
Eelco Dolstra
b1cfe8f984
nix develop: Add a test for arrays
2021-07-09 00:32:55 +02:00
Eelco Dolstra
d2b8b23ae9
Merge pull request #4995 from NixOS/fetchgit-name-attribute
...
Fix the `name` attribute in builtins.fetchGit
2021-07-09 00:32:13 +02:00
regnat
a654c1d81c
Restore the possibility to use a name parameter in fetchGit
...
Accidentally broken by 7e5c79a2d2
2021-07-08 14:57:48 +02:00
Eelco Dolstra
8648143120
Merge pull request #4988 from NixOS/fetchgit-name-attribute
...
Add a name attribute to the fetchers
2021-07-08 14:33:49 +02:00
regnat
7e5c79a2d2
Forbid the name attribute for fetchTree
...
We need to support it for the “old” fetch* functions for backwards
compatibility, but we don’t need it for fetchTree (as it’s a new
function).
Given that changing the `name` messes-up the content hashing, we can
just forbid passing a custom `name` argument to it
2021-07-08 13:53:52 +02:00
Eelco Dolstra
2172e60f7a
Merge pull request #4935 from alyssais/host_os
...
Apply OS checks to host platform, not build
2021-07-08 12:40:54 +02:00
Eelco Dolstra
156666de3d
Merge pull request #4969 from serokell/balsoft/fix-nixConfig-flake-registry
...
flake.nixConfig: fix flake-registry config settings
2021-07-08 12:35:08 +02:00
Eelco Dolstra
6060ea1b0e
Add tests/dummy
2021-07-07 11:30:35 +02:00
Eelco Dolstra
02dd6bb610
tests/check.sh: Fix a race
...
Fixes this random failure:
error: hash mismatch in fixed-output derivation '/tmp/nix-shell.EUgAVU/nix-test/tests/check/store/sfps3l3c5n7dabpx34kigxnfhmrwk2h6-dummy.drv':
specified: sha256-47DEQpj8HBSa+/TImW+5JCeuQeRkm5NMpJWZG3hSuFU=
got: sha256-0qhPS4tlCTfsj3PNi+LHSt1akRumTfJ0WO2CKdqASiY=
which happens because multiple tests were writing to ./dummy.
2021-07-07 10:48:47 +02:00
Eelco Dolstra
2c853e2a58
Merge branch 'master' of github.com:NixOS/nix
2021-07-07 10:03:04 +02:00
Eelco Dolstra
3b3e6bb1e5
Style tweaks
2021-07-07 10:02:55 +02:00
Eelco Dolstra
e37ecd1282
Merge branch 'balsoft/registry' of https://github.com/serokell/nix
2021-07-07 09:57:15 +02:00
regnat
2c8240677e
allow fetchFromGitHub to take a name argument
2021-07-06 08:43:19 +02:00
regnat
e4b082a52b
allow fetchMercurial to take a name argument
2021-07-06 08:43:06 +02:00
regnat
a487a652ed
allow fetchTarball to take a name argument
2021-07-06 08:42:47 +02:00
regnat
83615fcf8f
Allow fetchGit to take a name argument
...
Fix #3388
2021-07-06 08:41:52 +02:00
Eelco Dolstra
e700ecb901
Merge pull request #4986 from jkeifer/master
...
Fix wrong hash var for aarch64-darwin binary
2021-07-05 21:51:04 +02:00
Eelco Dolstra
0a8845720e
Merge pull request #4980 from Ma27/file-attr-completion
...
libcmd/installables: implement completion for Nix expressions passed via `-f`
2021-07-05 21:50:15 +02:00
3c5f69bb60
completeInstallable: also match for already typed prefixes
2021-07-05 21:37:33 +02:00
Jarrett Keifer
c8a80e4dbe
Fix wrong hash var for aarch64-darwin binary
2021-07-05 07:48:53 -07:00
Eelco Dolstra
1f93084149
Merge pull request #4978 from NixOS/scp-uris
...
Allow scp-style uris in `fetchgit`
2021-07-05 14:07:04 +02:00
Eelco Dolstra
f1ecd30bd5
Merge pull request #4773 from alyssais/dl
...
doc: builtins: use a definition list
2021-07-05 14:03:15 +02:00
Eelco Dolstra
d65342d226
Merge pull request #4873 from jtojnar/fish-completion
...
Add a fish completion script
2021-07-05 14:02:04 +02:00
Eelco Dolstra
cee426cc01
Merge pull request #4938 from tomcur/store-uri-parsing
...
Improve machine store URI parsing
2021-07-05 14:00:35 +02:00
Eelco Dolstra
24bc935462
Merge branch 'disable_gc' of https://github.com/Pamplemousse/nix
2021-07-05 13:53:52 +02:00
Eelco Dolstra
c053aecff4
Merge pull request #4983 from manveru/fix-devShell-env
...
Fix devShell handling of env values including @ and %
2021-07-05 13:22:32 +02:00
Michael Fellinger
087c5f5325
Fix devShell handling of env values including @ and %
2021-07-05 12:05:06 +02:00
70cb2ffacc
libcmd/installables: implement completion for Nix expressions passed via -f
2021-07-03 14:19:10 +02:00
Domen Kožar
f9d72855ae
Merge pull request #4967 from Pamplemousse/specific_errors
...
Prefer to throw specific errors
2021-07-03 10:34:56 +02:00
