Eelco Dolstra
58645a78ab
builtins.break: Return argument when debugging is not enabled
2022-05-05 17:17:03 +02:00
Eelco Dolstra
dd8b91eebc
Style fixes
...
In particular, use std::make_shared and enumerate(). Also renamed some
fields to fit naming conventions.
2022-05-05 17:17:03 +02:00
Eelco Dolstra
f4102de84b
Merge pull request #6489 from alexshpilkin/fix-6488
...
nix: Add forgotten null check in AttrCursor::getListOfStrings()
2022-05-05 16:16:56 +02:00
Théophane Hufschmitt
4c5aa8520c
Make sure that nix build works in --impure mode
...
Regression test for <https://github.com/NixOS/nix/issues/6488 >
2022-05-05 14:53:59 +02:00
Eelco Dolstra
f2a15091c2
Merge pull request #6492 from thkoch2001/patch-2
...
Change json example to be original
2022-05-05 12:58:11 +02:00
thkoch2001
7388cd55bf
Change json example to be original
...
Closes : #3391
2022-05-05 12:39:23 +03:00
Travis A. Everett
240124f7b1
darwin-install: fix break from bad vimrc
...
It looks like the `--noplugin` flag added in #5489 wasn't enough to
skirt this class of vim-init error, so this is swing 2 at a full fix.
Fixes #6462 .
2022-05-04 19:26:03 -05:00
234038a824
Merge remote-tracking branch 'nixos/master'
2022-05-04 23:28:25 +02:00
7044e48bf6
Revert "Merge branch 'pr/mopleen/5625'"
...
This reverts commit 351e70ea681d6c4bdd3e
2022-05-04 23:18:35 +02:00
Alexander Shpilkin
b3ed32d0fd
Add forgotten null check
2022-05-04 22:13:49 +03:00
Théophane Hufschmitt
e68676e6c8
Fix the parsing of the sourcehut refs file
...
Since a26be9f3b8https://git-scm.com/book/en/v2/Git-Internals-Transfer-Protocols#_the_dumb_protocol
2022-05-04 14:38:59 +02:00
Eelco Dolstra
c98648bef0
Merge remote-tracking branch 'origin/master' into debug-exploratory-PR
2022-05-04 14:10:21 +02: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
Ben Burdette
c81ffa692e
remove 'libnix'
2022-04-29 11:35:50 -06:00
Ben Burdette
c941803861
spacing
2022-04-29 11:27:38 -06:00
Ben Burdette
172a83d22a
line endings
2022-04-29 11:24:54 -06:00
Ben Burdette
ca6cba8b81
fix 'suggestions' error
2022-04-29 10:51:10 -06:00
Ben Burdette
2a5632c70d
incorporate PosIdx changes, symbol changes.
2022-04-29 10:02:17 -06:00
Guillaume Maudoux
9ff892aad4
Add release notes for error traces revamp
2022-04-29 11:24:48 +02:00
Guillaume Maudoux
143b73f52d
tests: Distinguish crashes from expected failures
2022-04-29 11:14:08 +02:00
Guillaume Maudoux
e93b59fbc5
Merge remote-tracking branch 'origin/master' into coerce-string
2022-04-29 00:12:25 +02:00
Ben Burdette
6e19947993
Merge branch 'master' into debug-merge-master
2022-04-28 12:32:57 -06: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
Guillaume Maudoux
f6baa4d188
fixup! fix errors case and wording
2022-04-28 13:18:19 +02:00
