John Ericson
bd85d3666d
Merge commit ' 470e27ce80' into progress-bar
2023-03-11 17:12:08 -05:00
John Ericson
37e74bb69b
Merge commit ' 734019ce56' into progress-bar
2023-03-11 17:11:20 -05:00
John Ericson
835ffa02e1
Merge commit ' 8ad485ea89' into progress-bar
2023-03-11 17:10:43 -05:00
John Ericson
d3b5b49ece
Merge commit ' 1c1a7074da' into progress-bar
2023-03-11 17:09:17 -05:00
John Ericson
57145cf9b4
Merge commit ' a2ace54fe4' into progress-bar
2023-03-11 17:05:41 -05:00
John Ericson
b2ca890195
Merge commit ' b09baf690b' into progress-bar
2023-03-11 17:05:33 -05:00
John Ericson
5109b5e467
Merge commit ' 6636202356' into progress-bar
2023-03-11 17:04:22 -05:00
John Ericson
38949e6be4
Merge commit ' df552ff53e' into progress-bar
2023-03-11 17:03:54 -05:00
John Ericson
a314196904
Merge commit ' df11e75d0e' into progress-bar
2023-03-11 17:02:27 -05:00
John Ericson
2f5a4df00c
Merge commit ' 46d86e06ba' into progress-bar
2023-03-11 17:02:16 -05:00
John Ericson
c70a6c81bb
Merge commit ' 971382cab0' into progress-bar
2023-03-11 17:01:56 -05:00
John Ericson
fece09cad9
Merge commit ' 5fcf7f04a9' into progress-bar
2023-03-11 17:01:09 -05:00
John Ericson
e73dcf2cdd
Merge commit ' 8388d2c7c6' into progress-bar
2023-03-11 16:59:40 -05:00
John Ericson
68e32b7728
Merge commit ' f4c869977c' into progress-bar
2023-03-11 16:58:03 -05:00
John Ericson
f34aa7522b
Merge commit ' 96670ed216' into progress-bar
2023-03-11 16:57:47 -05:00
Eelco Dolstra
470e27ce80
Merge pull request #6482 from edolstra/json-utils
...
Move json stuff out of util.cc
2022-05-04 11:58:20 +02:00
Eelco Dolstra
107613ad2b
Fix compiler warning
2022-05-04 11:31:39 +02:00
Eelco Dolstra
3e87c8e62b
Move json stuff out of util.cc
2022-05-04 11:22:06 +02:00
Alain Zscheile
1385b20078
Get rid of most .at calls ( #6393 )
...
Use one of `get` or `getOr` instead which will either return a null-pointer (with a nicer error message) or a default value when the key is missing.
2022-05-04 07:44:32 +02:00
Eelco Dolstra
9489b4b7ef
Merge pull request #6449 from edolstra/outputs-spec
...
Allow selecting derivation outputs
2022-05-03 15:38:47 +02:00
Eelco Dolstra
a3c6c5b1c7
nix profile: Support overriding outputs
2022-05-03 15:00:34 +02:00
Eelco Dolstra
4a79cba511
Allow selecting derivation outputs using 'installable!outputs'
...
E.g. 'nixpkgs#glibc^dev,static' or 'nixpkgs#glibc^*'.
2022-05-03 13:43:52 +02:00
Eelco Dolstra
404c222444
Merge pull request #6426 from edolstra/respect-outputs-to-install
...
nix: Respect meta.outputsToInstall, and use all outputs by default
2022-05-03 13:43:22 +02:00
Théophane Hufschmitt
cae7473884
Merge pull request #6465 from layus/fix-test-crashes
...
tests: Distinguish crashes from expected failures
2022-05-03 11:11:37 +02:00
Guillaume Maudoux
275f8561eb
tests/lang: Distinguish crashes from expected failures
2022-05-02 15:12:50 +02:00
Guillaume Maudoux
4845886bed
Revert "tests: Distinguish crashes from expected failures"
...
This reverts commit 143b73f52d
2022-05-02 14:22:00 +02:00
Eelco Dolstra
61289ceee3
Style fixes
2022-05-02 13:37:53 +02:00
Eelco Dolstra
564faa6b4e
Merge pull request #6470 from Ma27/git-followup
...
libfetchers/git: fix every occasion of a permission error
2022-05-02 13:33:08 +02:00
Eelco Dolstra
a26be9f3b8
Merge pull request #4638 from orbekk/read_head
...
Resolve reference for remote git repositories (makes fetchGit work with non-'master' branch)
2022-05-02 13:31:30 +02:00
Eelco Dolstra
dde71899dd
tests: Don't create tests/result
...
https://hydra.nixos.org/log/lns780srkka4dv7r69mn4zfy6fdij4yr-nix-2.9.0pre20220428_4bb111c.drv
2022-05-02 09:38:51 +02:00
Maximilian Bosch
1849e6a1f6
libfetchers/git: fix every occasion of a permission error
...
I'm afraid I missed a few problematic `git(1)`-calls while implementing
PR #6440 , sorry for that! Upon investigating what went wrong, I realized
that I only tested against the "cached"-case by accident because my
git-checkout with my system's flake was apparently cached during my
debugging.
I managed to trigger the original issue again by running:
$ git commit --allow-empty -m "tmp"
$ sudo nixos-rebuild switch --flake .# -L --builders ''
Since `repoDir` points to the checkout that's potentially owned by
another user, I decided to add `--git-dir` to each call affecting
`repoDir`.
Since the `tmpDir` for the temporary submodule-checkout is created by
Nix itself, it doesn't seem to be an issue.
Sorry for that, it should be fine now.
2022-04-30 15:56:12 +02:00
Kjetil Orbekk
9bf296c970
Extract git reference parsing to a shared library
...
These utility functions can be shared between the git and github fetchers.
2022-04-29 18:46:21 -04:00
Kjetil Orbekk
c21afd684c
Update nix flake documentation of ref handling
...
Update the documentation about how `ref` is resolved if it is not
specified.
Add a note about special handling of local workdirs with `git+file`.
2022-04-29 18:46:21 -04:00
Kjetil Orbekk
1203e48926
Store cached head in cached git repo
...
The previous head caching implementation stored two paths in the local
cache; one for the cached git repo and another textfile containing the
resolved HEAD ref. This commit instead stores the resolved HEAD by
setting the HEAD ref in the local cache appropriately.
2022-04-29 18:46:21 -04:00
Kjetil Orbekk
de54e1cd3f
Refactor fetching of dirty workdir
...
Extract the handling of a local dirty workdir to a helper function.
2022-04-29 18:46:17 -04:00
Kjetil Orbekk
05a3fbac5a
Test fetchGit with non-'master' remote repo
2022-04-29 18:42:31 -04:00
Kjetil Orbekk
401e60f289
Resolve reference for remote repository
...
Resolves the HEAD reference from the remote repository instead
of assuming "master".
2022-04-29 18:42:28 -04:00
Guillaume Maudoux
143b73f52d
tests: Distinguish crashes from expected failures
2022-04-29 11:14:08 +02:00
Eelco Dolstra
4bb111c8d4
Merge pull request #6461 from edolstra/libcxx
...
Fix libcxx build
2022-04-28 15:11:49 +02:00
Eelco Dolstra
70a30dbc00
Fix libcxx build
...
Fixes #6458 .
2022-04-28 14:37:05 +02:00
Eelco Dolstra
cb5361628d
Add libcxxStdenv devshell
2022-04-28 14:36:48 +02:00
Eelco Dolstra
d77d813017
Shut up clang warning
2022-04-28 14:24:17 +02:00
Eelco Dolstra
660835da69
Merge pull request #6459 from edolstra/fix-out-paths
...
Fix passing $OUT_PATHS to the post-build hook
2022-04-28 14:05:29 +02:00
Eelco Dolstra
4a9623b129
Fix passing $OUT_PATHS to the post-build hook
...
Fixes #6446 .
2022-04-28 13:36:01 +02:00
Eelco Dolstra
35393dc2c6
Merge pull request #6444 from midchildan/feat/zsh-runhelp
...
feat: add integration with zsh's run-help
2022-04-26 21:26:33 +02:00
midchildan
68d51ae012
refactor: don't hardcode nix subcommands in run-help-nix
2022-04-27 01:56:10 +09:00
Eelco Dolstra
717298c749
Bump eval cache schema version
2022-04-26 17:17:51 +02:00
Eelco Dolstra
13d8400ac5
Remove obsolete FIXME
2022-04-26 17:17:27 +02:00
Eelco Dolstra
6e0a2b971b
Add a test for outputsToInstall
2022-04-26 17:17:27 +02:00
Eelco Dolstra
1ddabe1a01
nix: Respect meta.outputsToInstall, and use all outputs by default
...
'nix profile install' will now install all outputs listed in the
package's meta.outputsToInstall attribute, or all outputs if that
attribute doesn't exist. This makes it behave consistently with
nix-env. Fixes #6385 .
Furthermore, for consistency, all other 'nix' commands do this as
well. E.g. 'nix build' will build and symlink the outputs in
meta.outputsToInstall, defaulting to all outputs. Previously, it only
built/symlinked the first output. Note that this means that selecting
a specific output using attrpath selection (e.g. 'nix build
nixpkgs#libxml2.dev') no longer works. A subsequent PR will add a way
to specify the desired outputs explicitly.
2022-04-26 17:17:27 +02:00
