Eelco Dolstra
d343c03edb
Temporary compatibility hack
2019-10-08 20:05:16 +02: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
Eelco Dolstra
519aa479d7
Remove outdated flakes design doc
2019-10-08 17:00:47 +02:00
Eelco Dolstra
33b3a0e477
Merge pull request #3123 from ekarakey/flakes
...
deleted comment
2019-10-08 11:09:34 +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
Eelco Dolstra
ce2c755d2a
Add a "dev" output to the 'nix' package
...
This is to ensure that references like 'nix.dev' in dwarffs work
regardless of whether we're using the 'nix' package from this overlay
or from Nixpkgs.
2019-10-07 14:02:52 +02:00
Eelco Dolstra
a323b7826c
Merge remote-tracking branch 'origin/master' into flakes
2019-10-04 17:26:32 +02:00
Eelco Dolstra
21e2088c1b
nix-perl -> nix.perl-bindings
2019-10-04 17:25:59 +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
204291f059
Merge release.nix, shell.nix and release-common.nix into flake.nix
...
Also provide a Nixpkgs overlay, memoize Nixpkgs evaluation and fit the
githubFlakes test.
2019-10-04 10:45:33 +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 Dolstra
4e60c5ec65
Merge pull request #3112 from zimbatm/fetchTarball-with-chroot
...
Fix fetchTarball with chroot stores
2019-10-01 11:33:57 +02:00
Eelco Dolstra
168a887916
Fix fetchTarball with chroot stores
...
Fixes #2405 .
2019-10-01 07:51:06 +00:00
Domen Kožar
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
Domen Kožar
043365c2fb
Merge pull request #3080 from Infinisil/tryEval-docs
...
docs: Note that tryEval doesn't do deep evaluation
2019-09-30 14:03:16 +02:00
Domen Kožar
a3bb929798
Merge pull request #3106 from JosephLucas/patch-1
...
Update garbage-collection.xml readability
2019-09-30 14:02:26 +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
Joseph Lucas
10bfc5c0d0
Update garbage-collection.xml readability
...
1. remove a typo space
2. Simplify negative style by using affirmative style
2019-09-23 13:18:59 +00:00
Eelco Dolstra
5038e1bec4
Merge pull request #3103 from bhipple/fix/spelling
...
Fix spelling in comment
2019-09-23 10:46:40 +02:00
Eelco Dolstra
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
7f9a0033c7
Merge pull request #3097 from zimbatm/show-traces
...
function-trace: always show the trace
2019-09-19 00:16:55 +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
zimbatm
619cc4af85
function-trace: always show the trace
...
If the user invokes nix with --trace-function-calls it means that they
want to see the trace.
2019-09-18 23:23:21 +02:00
Eelco Dolstra
c67407172d
Record original flakerefs in the lock file again
...
If 'input.<name>.uri' changes, then the entry in the lockfile for
input <name> should be considered stale.
Also print some messages when lock file entries are added/updated.
2019-09-18 21:57:57 +02:00
Eelco Dolstra
092ee24627
Merge remote-tracking branch 'origin/master' into flakes
2019-09-18 12:02:50 +02:00
Eelco Dolstra
c6a0f4c393
Merge pull request #3094 from alexfmpe/fix-builtins-order
...
Move 'builtins.splitVersion' to position respecting alphabetical order
2019-09-18 09:47:39 +02:00
Alexandre Esteves
9533d85ce0
Move 'builtins.splitVersion' to position respecting alphabetical order
2019-09-17 23:40:49 +01:00
Eelco Dolstra
6b83174fff
std::uncaught_exception() -> std::uncaught_exceptions()
...
The former is deprecated in C++17. Fixes a clang warning.
2019-09-13 20:05:44 +02:00
Eelco Dolstra
a25c022af3
Merge remote-tracking branch 'origin/master' into flakes
2019-09-13 19:52:03 +02:00
Eelco Dolstra
cf4c31c872
Merge pull request #3089 from jtanguy/docs-fetchgit
...
Improve the fetchGit documentation examples
2019-09-11 16:01:09 +02:00
Julien Tanguy
ae244af242
docs: Use the explicit ref for fetchGit with a tag
...
With the merge of #2582 , the syntax "tags/1.9" for refs does not work
anymore.
However, the new syntax "refs/tags/1.9" seems to support annotated tags,
such as "refs/tags/2.0".
Closes #2385 .
2019-09-11 14:18:47 +02:00