Eelco Dolstra
313106d549
Fix clang warnings
2019-11-26 21:07:44 +01:00
Eelco Dolstra
425991883a
Merge pull request #3141 from xbreak/nocafile
...
Downloader: Log configured CA file
2019-11-26 20:52:25 +01:00
Eelco Dolstra
7c8d7c17f8
Merge pull request #3144 from matthewbauer/fix-sandbox-fallback
...
Fix sandbox fallback settings
2019-11-26 20:51:52 +01:00
Eelco Dolstra
0be8d7784f
Typo
2019-11-26 20:33:46 +01:00
Eelco Dolstra
73efc1e8e7
Merge branch 'document-dry-run-option' of https://github.com/Ma27/nix
2019-11-26 20:32:50 +01:00
Eelco Dolstra
ec5e7b44ff
Simplify
2019-11-26 20:26:22 +01:00
Eelco Dolstra
96e1c39bb7
Merge branch 'repair-bad-links' of https://github.com/chkno/nix
2019-11-26 20:21:48 +01:00
Eelco Dolstra
872740cf60
Merge pull request #3238 from puckipedia/attrset-overrides-dynamic
...
Ensure enough space in attrset bindings
2019-11-26 20:14:55 +01:00
Eelco Dolstra
c13193017f
Disallow empty store path names
...
Fixes #3239 .
2019-11-26 20:12:15 +01:00
Eelco Dolstra
89db9353d7
Doh
2019-11-26 20:08:25 +01:00
Eelco Dolstra
1ec6e6e11e
Add feature to disable URL literals
...
E.g.
$ nix-build '<nixpkgs>' -A hello --experimental-features no-url-literals
error: URL literals are disabled, at /nix/store/vsjamkzh15r3c779q2711az826hqgvzr-nixpkgs-20.03pre194957.bef773ed53f/nixpkgs/pkgs/top-level/all-packages.nix:1236:11
Helps with implementing https://github.com/NixOS/rfcs/pull/45 .
2019-11-26 19:48:34 +01:00
Eelco Dolstra
fc62caa4a5
Merge pull request #3242 from raboof/documentBuiltinsPlaceholder
...
Document builtins.placeholder
2019-11-25 22:05:52 +01:00
Arnout Engelen
4e70652ee3
Document builtins.placeholder
2019-11-25 18:00:05 +01:00
cdadbf7708
Add testcase for attrset using __overrides and dynamic attrs
2019-11-25 13:03:54 +00:00
cd55f91ad2
Ensure enough space in attrset bindings when using both __overrides and dynamic attributes
2019-11-25 12:37:14 +00:00
Eelco Dolstra
d12d69ea1a
Turn NIX_PATH into a config setting
...
This allows it to be set in nix.conf.
2019-11-22 23:07:35 +01:00
Eelco Dolstra
ec9dd9a5ae
Provide a default value for NIX_PATH
2019-11-22 22:08:51 +01:00
Eelco Dolstra
1c3ccba0f5
Remove $NIX_USER_PROFILE_DIR
...
This is not used anywhere.
2019-11-22 16:27:48 +01:00
Eelco Dolstra
ba87b08f85
getEnv(): Return std::optional
...
This allows distinguishing between an empty value and no value.
2019-11-22 16:18:13 +01:00
Chuck
3e2c77d001
Check for and repair bad .links entries
...
A corrupt entry in .links prevents adding a fixed version of that file
to the store in any path. The user experience is that corruption
present in the store 'spreads' to new paths added to the store:
(With store optimisation enabled)
1. A file in the store gets corrupted somehow (eg: filesystem bug).
2. The user tries to add a thing to the store which contains a good copy
of the corrupted file.
3. The file being added to the store is hashed, found to match the bad
.links entry, and is replaced by a link to the bad .links entry.
(The .links entry's hash is not verified during add -- this would
impose a substantial performance burden.)
4. The user observes that the thing in the store that is supposed to be
a copy of what they were trying to add is not a correct copy -- some
files have different contents! Running "nix-store --verify
--check-contents --repair" does not fix the problem.
This change makes "nix-store --verify --check-contents --repair" fix
this problem. Bad .links entries are simply removed, allowing future
attempts to insert a good copy of the file to succeed.
2019-11-15 11:55:36 -08:00
Eelco Dolstra
fd900c45b5
Merge pull request #3220 from nh2/manual-nix-shell-p-expr
...
manual: nix-shell: Elaborate on using `-p` with expressions
2019-11-14 11:25:47 +01:00
Eelco Dolstra
0352c1a4f8
Typo
2019-11-13 17:18:17 +01:00
Eelco Dolstra
804910fb0e
Merge pull request #3213 from singron/fetchurl_test
...
Replace $TMPDIR with $TEST_ROOT in tests/fetchurl.sh
2019-11-11 12:15:59 +01:00
Eelco Dolstra
5ee23c35b9
Merge pull request #3219 from Ericson2314/semicolons
...
Fix extra semicolons warnings
2019-11-11 12:13:51 +01:00
John Ericson
8669db1dcc
Clean up semicolon and comma
...
Thanks @bhipple for catching!
2019-11-10 16:21:59 -05:00
Niklas Hambüchen
07294e988c
manual: nix-shell: Elaborate on using -p with expressions.
...
This documents the outcome of the change in
https://github.com/NixOS/nix/issues/454 :
> We can also automatically add parentheses in the generated
> `buildInputs`, so you can type `nix-shell -p "expr"`
> instead of `"(expr").
2019-11-10 17:29:13 +01:00
John Ericson
4c34054673
Remove unneeded semicolons
2019-11-10 11:24:47 -05:00
John Ericson
96e6e680c1
Fix extra ; warnings involving MakeError
2019-11-10 11:24:47 -05:00
Domen Kožar
1f174226d1
Merge pull request #3218 from kolloch/patch-1
...
De-duplicate struct PrimOp forward declaration
2019-11-10 15:28:18 +01:00
Peter Kolloch
2ba9f22715
De-duplicate struct PrimOp forward declaration
2019-11-10 10:02:22 +01:00
Eric Culp
6c041e8413
Replace $TMPDIR with $TEST_ROOT in tests/fetchurl.sh
...
$TMPDIR isn't necessarily set and would cause this test to fail.
2019-11-08 12:08:10 -08:00
Eelco Dolstra
d1db7fa952
Merge pull request #3211 from zimbatm/gitignore-precompiled-headers
...
gitignore /precompiled-headers.h.gch
2019-11-08 16:23:57 +01:00
a08f353922
gitignore /precompiled-headers.h.?ch
2019-11-08 14:48:52 +00:00
Eelco Dolstra
0d6774468c
Move editorFor srom libutil to nix
...
libutil should not depend on libexpr.
2019-11-08 15:13:32 +01:00
Eelco Dolstra
48f0a76372
Fix installerScript job
...
https://hydra.nixos.org/build/105961653
2019-11-07 18:31:16 +01:00
Eelco Dolstra
4145cd2da0
Use upstream nlohmann_json
2019-11-07 18:23:17 +01:00
Eelco Dolstra
e5bf81256c
Fix Perl bindings
2019-11-07 12:18:37 +01:00
Eelco Dolstra
6d2605500f
Fix macOS build
2019-11-07 11:53:28 +01:00
Eelco Dolstra
99af822004
Disable the evalNixOS test
...
It also OOMs.
https://hydra.nixos.org/build/105942679
2019-11-07 10:14:00 +01:00
Eelco Dolstra
04bf9acd22
Remove #include
2019-11-07 10:12:35 +01:00
Eelco Dolstra
f5b7991e59
Revert "autoconf: Allow overriding CFLAGS/CXXFLAGS from outside."
...
This reverts commit 717e821b99
2019-11-07 10:12:35 +01:00
Eelco Dolstra
5ff4d77f55
Precompile headers
...
This cuts 'make install -j6' on my laptop from 170s to 134s.
2019-11-07 10:12:35 +01:00
52ffe2797a
doc: Document --dry-run option for nix-build
2019-11-07 00:11:57 +01:00
Eelco Dolstra
39a2e166dd
Cleanup
2019-11-06 16:53:02 +01:00
Eelco Dolstra
35732a95bc
Disable the evalNixpkgs test
...
It constantly OOMs.
https://hydra.nixos.org/build/105784912
2019-11-06 10:36:06 +01:00
Eelco Dolstra
7614a127a0
Fix binaryTarball test
2019-11-06 10:35:50 +01:00
Eelco Dolstra
69326f3637
Recursive Nix: Handle concurrent client connections
2019-11-06 00:55:03 +01:00
Eelco Dolstra
c119ab9db0
Enable recursive Nix using a feature
...
Derivations that want to use recursion should now set
requiredSystemFeatures = [ "recursive-nix" ];
to make the daemon socket appear.
Also, Nix should be configured with "experimental-features =
recursive-nix".
2019-11-06 00:55:03 +01:00
Eelco Dolstra
2af9561316
Add a test for recursive Nix
2019-11-06 00:55:03 +01:00
Eelco Dolstra
c921074c19
RestrictedStore: Implement addToStore()
2019-11-06 00:55:03 +01:00
