Matthew Bauer
079bde2aef
Try setting enableOwnership in macOS install
...
For external hard disks where ownership is not enabled by default.
2021-08-24 19:23:18 -05:00
Ben Burdette
bd3b5329f9
print env bindings
2021-08-24 16:32:54 -06:00
Eelco Dolstra
af94b54db3
Coding style
2021-08-23 13:05:42 +02:00
Eelco Dolstra
c6b063c31a
Merge branch 'fix/subflake-follows-fix' of https://github.com/ArctarusLimited/nix
2021-08-23 12:47:09 +02:00
Eelco Dolstra
a93f72c084
Merge pull request #5160 from CertainLach/fix/invalid-characters-in-json-logger
...
Replace invalid characters in json logger
2021-08-23 11:10:55 +02:00
Eelco Dolstra
440d1ac718
Merge branch 'fix-attr-path-prefixes' of https://github.com/jtojnar/nix
2021-08-23 11:05:16 +02:00
Tom Bereknyei
d90582be33
Allow use of path and filterSource in flakes
...
As filterSource and path perform work, add paths to allowedPaths.
2021-08-22 18:45:42 -04:00
Yaroslav Bolyukin
bbb3bcb165
Replace invalid characters in json logger
...
Fixes #5159
Signed-off-by: Yaroslav Bolyukin <iam@lach.pw>
2021-08-22 00:26:22 +03:00
Jan Tojnar
2d66a31f01
nix {bundle,run}: drop broken flake attr-path prefixes
...
“packages” was probably meant to be “packages.${system}.” but that
is already listed in `getDefaultFlakeAttrPathPrefixes` in `installables`,
which is probably why no one noticed it was broken.
2021-08-21 20:17:05 +02:00
Jan Tojnar
d7b6c8f591
nix develop: Fix devShells
lookup
...
It currently fails with the following error:
error: flake 'git+file://…' does not provide attribute 'devShells.x86_64-linuxhaskell', 'packages.x86_64-linux.haskell', 'legacyPackages.x86_64-linux.haskell' or 'haskell'
2021-08-21 01:24:28 +02:00
Eelco Dolstra
7a54b10a8a
Merge pull request #5153 from Pamplemousse/clean
...
15f4d4f
Documentation follow-up
2021-08-20 11:59:16 +02:00
Matthew Kenigsberg
d7fe36116e
nix develop --phase: chdir to flake directory
...
For git+file and path flakes, chdir to flake directory so that phases
that expect to be in the flake directory can run
Fixes https://github.com/NixOS/nix/issues/3976
2021-08-19 15:42:13 -05:00
Pamplemousse
0e7bd65976
15f4d4f
Documentation follow-up
2021-08-19 09:40:47 -07:00
Domen Kožar
ffa629b2c0
Merge pull request #5150 from NixOS/install-no-rsync
...
Remove rsync usage in the installer
2021-08-19 10:13:16 +02:00
Ben Burdette
4b5f9b35f0
env to bindings
2021-08-18 21:25:26 -06:00
Ben Burdette
2272021536
more error fixes
2021-08-18 20:02:23 -06:00
Ben Burdette
e82cf13b1e
switch to fakeenvs
2021-08-18 17:53:10 -06:00
Domen Kožar
475fc109e7
Remove rsync usage in the installer
...
It's not commonly installed on systems like debian,
so avoid the bootstrapping problem by using cp and
chmod.
2021-08-18 16:50:36 +02:00
Tom Bereknyei
a82de5b31b
Enable JSON option to show flakes
...
`nix-flake show --json`
2021-08-17 23:18:19 -04:00
Ben Burdette
b6eb38016b
moving towards env in exceptions
2021-08-17 14:39:50 -06:00
Alex Zero
57b9ba0ad0
Add tests for flake follow paths
2021-08-17 15:25:55 +01:00
Alex Zero
b3c424f5a6
Fix follows paths in subordinate lockfiles
2021-08-17 15:25:42 +01:00
Eelco Dolstra
2cd1a5b8f3
Merge pull request #5134 from pszubiak/fix-pkgconfig-install-path
...
Install pkg-config files in the correct location
2021-08-16 11:56:49 +02:00
Eelco Dolstra
902b050511
Merge pull request #5135 from Mic92/ca-typo
...
fix typo in ca-error message
2021-08-16 11:55:48 +02:00
Magic_RB
8438114399
Add ignored_acls setting
...
Signed-off-by: Magic_RB <magic_rb@redalder.org>
2021-08-14 21:46:09 +02:00
Jörg Thalheim
21d0334e49
fix typo in ca-error message
2021-08-14 00:18:45 +02:00
Piotr Szubiakowski
9f13cb31e8
Install pkg-config files in the correct location
...
Use `$(libdir)` while installing .pc files looks like a more generic
solution. For example, it will work for distributions like RHEL or
Fedora where .pc files are installed in `/usr/lib64/pkgconfig`.
2021-08-13 21:08:58 +00:00
Eelco Dolstra
d581129ef9
Merge pull request #5130 from alyssais/sys_name
...
configure.ac: remove another uname check
2021-08-13 12:53:37 +02:00
Alyssa Ross
cff8fd69b6
configure.ac: remove another uname check
...
uname checks are not cross-safe.
The normalization for Cygwin doesn't need any equivalent for host_os
because nothing actually checked whether sys_name was cygwin any more.
2021-08-13 08:19:43 +00:00
Eelco Dolstra
43856b0d6d
Merge pull request #5124 from edolstra/lock-file-diff
...
Improve flake lock file diffs
2021-08-11 23:07:14 +02:00
Eelco Dolstra
3af1c28ebb
flake.lock: Update
...
Flake lock file changes:
• Updated input 'nixpkgs':
'github:NixOS/nixpkgs/f77036342e2b690c61c97202bf48f2ce13acc022' (2021-06-28)
→ 'github:NixOS/nixpkgs/f6551e1efa261568c82b76c3a582b2c2ceb1f53f' (2021-08-11)
2021-08-11 19:36:34 +02:00
Eelco Dolstra
6b8069b823
In flake lock file diffs, show the last-modified date of inputs if available
...
This is a bit more informative than just the hash.
Also, format the diffs a bit nicer.
2021-08-11 19:35:28 +02:00
Eelco Dolstra
467a6fcdc2
Merge pull request #5123 from Pamplemousse/clean
...
15f4d4f
follow up
2021-08-11 12:15:51 +02:00
Pamplemousse
0da416f820
15f4d4f
follow up
...
* libstore: `bz2` should not be linked
* libutil: `zlib.h` should not be included
Signed-off-by: Pamplemousse <xav.maso@gmail.com>
2021-08-10 16:04:53 -07:00
Domen Kožar
a6ba313a0a
Merge pull request #5115 from r-burns/darwin-host-os
...
Fix host OS detection for darwin-specific linker flag
2021-08-10 11:01:57 +02:00
Ryan Burns
d86d43c34c
Fix host OS detection for darwin-specific linker flag
2021-08-10 00:01:39 -07:00
Ben Burdette
030271184f
trying env args; but unecessary?
2021-08-09 14:30:47 -06:00
Eelco Dolstra
8943e3176d
Merge pull request #5111 from Pamplemousse/clean
...
Minor maintenance cleaning
2021-08-09 20:05:03 +02:00
Pamplemousse
2de7a1fe67
libexpr: Squash similar conditions
...
Signed-off-by: Pamplemousse <xav.maso@gmail.com>
2021-08-09 10:10:11 -07:00
Sebastian Ullrich
a0f97b1f54
Expand docstring of Store::querySubstitutablePathInfos
2021-08-09 15:58:50 +02:00
Anatole Lucet
67035ee23d
Remove curl deps in install script
2021-08-09 15:33:39 +02:00
Eelco Dolstra
27444d40cf
Merge pull request #5101 from fzakaria/faridzakaria/fix-nix-shell
...
nix-shell --pure: Let it work for any derivation
2021-08-09 14:52:11 +02:00
Eelco Dolstra
4c5ce2a345
Merge pull request #5104 from andir/refscan-race
...
Fix potential race-condition in reference scanning code
2021-08-09 14:49:24 +02:00
Eelco Dolstra
873df3ab03
Merge pull request #5106 from andir/libstore-waiter-set
...
libstore: use set instead of list for waiter list
2021-08-09 14:46:49 +02:00
Eelco Dolstra
6c50dc1faf
Merge pull request #5102 from serokell/balsoft/whitelist-flake-registry
...
Whitelist nixConfig.flake-registry
2021-08-09 14:45:12 +02:00
Andreas Rammhold
a9cb1ca32c
libstore: use set instead of list for waiter list
...
This replaces the O(n) search complexity in our insert code with a
lookup of O(log n). It also makes removing waitees easier as we can use
the extract method provided by the set class.
2021-08-08 14:05:38 +02:00
Sebastian Ullrich
12f50b6510
Short-circuit querying substituters on success
2021-08-08 13:24:13 +02:00
Andreas Rammhold
b2d3976163
Fix potential race-condition in reference scanning code
...
Previously the code ensures that the isBase32 array would only be
initialised once in a single-threaded context. If two threads happen to
call the function before the initialisation was completed both of them
would have completed the initialization step. This allowed for a
race-condition where one thread might be done with the initialization
but the other thread sets all the fields to false again. For a brief
moment the base32 detection would then produce false-negatives.
2021-08-07 19:10:25 +02:00
Alexander Bantyev
54c580b71f
Whitelist nixConfig.flake-registry
...
flake-registry should be safe to set to an aribtrary value, since it
is identical to just setting `inputs`.
2021-08-07 14:42:59 +03:00
Farid Zakaria
fbf42c55ac
nix-shell --pure: Let it work for any derivation
...
`nix-shell --pure` when applied to a non stdenv derivation doesn't seem
to clear the PATH. It expects the stdenv/setup file to do so.
This adds an explicit `unset PATH` by nix-build.cc (nix-shell) itself so
that it's not reliant on stdenv/setup anymore.
This does not break impure nix-shell since the PATH is persisted as the
variable `p` prior in the bash rcfile
fixes #5092
2021-08-06 15:30:49 -07:00