Fishhh
4ade8a5f25
Fix arity of --exclude flag in nix search
...
Due to incorrectly using the Handler(vector<string>*) constructor the
`--exclude` flag would swallow all proceeding arguments instead of just
one.
2022-06-20 18:00:32 +02:00
Théophane Hufschmitt and GitHub
7e301fd74e
Merge pull request #6620 from maralorn/fix-print-missing
...
respect print-missing variable in new-style build command
2022-06-16 13:23:15 +02:00
Théophane Hufschmitt and GitHub
63df0fda94
Merge pull request #6615 from WhyNotHugo/man-improvements
...
Add disambiguation to man page
2022-06-15 10:41:52 +02:00
Eelco Dolstra and GitHub
3720a4f6cf
Merge pull request #6662 from tweag/stiky-non-flake-overrides
...
flake.cc: Make non-flake overrides sticky
2022-06-14 19:47:11 +02:00
Hugo Osvaldo Barrera
fd7f795750
Add disambiguation to man page
...
This should help future lost newcomers like myself understand where to
find the docs for both of these commands and how they differ.
2022-06-14 18:13:35 +02:00
Alexander Bantyev
d82a3dc70d
flake.cc: Make non-flake overrides sticky
...
Overrides for inputs with flake=false were non-sticky, since they
changed the `original` in `flake.lock`. This fixes it, by using the same
locked original for both flake and non-flake inputs.
2022-06-13 20:49:16 +04:00
Eelco Dolstra and GitHub
9f58df4c91
Merge pull request #6619 from Jonpez2/patch-1
...
Add security.csm to ignored-acls
2022-06-13 16:23:13 +02:00
Eelco Dolstra and GitHub
798efdf10b
Merge pull request #6027 from Ma27/pure-repl
...
repl: `--option pure-eval true` actually enables pure eval mode
2022-06-13 16:11:46 +02:00
Eelco Dolstra and GitHub
2fef24f528
Merge pull request #6634 from lovesegfault/fix-getgrouplist
...
fix(libstore/lock): support users that belong to more than 10 groups
2022-06-13 15:45:09 +02:00
Eelco Dolstra and GitHub
9a26a01475
Merge pull request #6639 from Artturin/checkse
...
install-multi-user: check if selinux is enabled and if it is then abort
2022-06-13 15:42:43 +02:00
Eelco Dolstra and GitHub
95eccfd5db
Merge pull request #6648 from andersk/missing-rethrow
...
Add missing rethrows in conditional exception handlers
2022-06-13 15:37:38 +02:00
Théophane Hufschmitt and GitHub
03226aa053
Merge pull request #6651 from ncfavier/nix-build-stop-logger
...
nix-build: stop logger when appropriate
2022-06-13 10:43:14 +02:00
Théophane Hufschmitt and GitHub
84c4666467
Merge pull request #6653 from Misterio77/readd-sourcehut-regex-matching
...
fix sourcehut brach/tag resolving regression
2022-06-13 08:57:34 +02:00
Gabriel Fontes
9f6b4639c2
fix sourcehut brach/tag resolving regression
...
nixos/nix#6290 introduced a regex pattern to account for tags when
resolving sourcehut refs. nixos/nix#4638 reafactored the code,
accidentally treating the pattern as a regular string, causing all
non-HEAD ref resolving to break.
This fixes the regression and adds more test cases to avoid future
breakage.
2022-06-11 16:52:20 -03:00
Naïm Favier
502d7d9092
nix-build: stop logger when appropriate
...
Reverts b944b588fa
2022-06-11 15:17:35 +02:00
Théophane Hufschmitt and GitHub
37fc4d73bb
Merge pull request #6646 from YorikSar/file-impure-doc
...
Mention that -f implies --impure for eval in docs
2022-06-11 08:48:16 +02:00
Anders Kaseorg
754cd53faf
Add missing rethrows in conditional exception handlers
...
Signed-off-by: Anders Kaseorg <andersk@mit.edu >
2022-06-10 10:52:41 -07:00
Yuriy Taraday
65d09fce22
Mention that -f implies --impure for eval in docs
...
Right now this is not mentioned anywhere and it is unexpected.
2022-06-10 19:16:17 +04:00
Théophane Hufschmitt and GitHub
45ebaab665
Merge pull request #6643 from ncfavier/fix-git-again
...
libfetchers/git: add missing `--git-dir` flags
2022-06-10 14:33:32 +02:00
Théophane Hufschmitt and GitHub
e557f86490
Merge pull request #6641 from NixOS/fix-docker-ci-job
...
Correctly get the nix version in the docker job
2022-06-10 13:36:30 +02:00
Naïm Favier
da8f8668ca
libfetchers/git: add missing --git-dir flags
2022-06-10 12:57:13 +02:00
Théophane Hufschmitt
460117a238
Correctly get the nix version in the docker job
...
`defaultPackage` doesn't exist anymore, so we can't use it.
Instead just use the new CLI which should be more robust to these
changes
Fix #6640
2022-06-10 12:09:09 +02:00
Théophane Hufschmitt and GitHub
17e54a602e
Merge pull request #6637 from sidkshatriya/small-move-optimization-2
...
nix-env: A small std::move() optimization
2022-06-10 10:28:37 +02:00
3f5f84258d
Update docker.nix
...
Co-authored-by: Eelco Dolstra <edolstra@gmail.com >
2022-06-10 09:17:28 +01:00
Artturin
bd3a17d00c
install-multi-user: check if selinux is enabled and if it is then abort
2022-06-10 05:12:03 +03:00
Sidharth Kshatriya
7868405d58
nix-env: A small std::move() optimization
...
Avoids doing a O(n) copy of Strings i.e. std::list<std::string>
2022-06-09 20:01:01 +05:30
Eelco Dolstra and GitHub
1bc17ae617
Merge pull request #6635 from sidkshatriya/small-move-optimization
...
nix-store: small std::move() optimization
2022-06-09 13:48:48 +02:00
Sidharth Kshatriya
3efea3d28a
nix-store: small std::move() optimization
2022-06-09 16:25:26 +05:30
Bernardo Meurer
931930feb1
fix(libstore/lock): support users that belong to more than 10 groups
...
The manpage for `getgrouplist` says:
> If the number of groups of which user is a member is less than or
> equal to *ngroups, then the value *ngroups is returned.
>
> If the user is a member of more than *ngroups groups, then
> getgrouplist() returns -1. In this case, the value returned in
> *ngroups can be used to resize the buffer passed to a further
> call getgrouplist().
In our original code, however, we allocated a list of size `10` and, if
`getgrouplist` returned `-1` threw an exception. In practice, this
caused the code to fail for any user belonging to more than 10 groups.
While unusual for single-user systems, large companies commonly have a
huge number of POSIX groups users belong to, causing this issue to crop
up and make multi-user Nix unusable in such settings.
The fix is relatively simple, when `getgrouplist` fails, it stores the
real number of GIDs in `ngroups`, so we must resize our list and retry.
Only then, if it errors once more, we can raise an exception.
This should be backported to, at least, 2.9.x.
2022-06-08 13:45:41 -04:00
Eelco Dolstra and GitHub
12e86c0735
Merge pull request #6630 from edolstra/boost-dylib
...
Remove ${boost}/lib from the RPATH
2022-06-08 17:55:21 +02:00
7b968af930
Update docker.nix
...
Co-authored-by: Cole Helbling <cole.e.helbling@outlook.com >
2022-06-08 17:41:31 +02:00
Eelco Dolstra
4a3f217bde
Remove ${boost}/lib from the RPATH
2022-06-08 15:51:35 +02:00
Théophane Hufschmitt and GitHub
694b12052a
Merge pull request #6624 from NixOS/new-flake-style
...
flake.nix: Convert to new naming convention
2022-06-08 13:34:09 +02:00
Eelco Dolstra and GitHub
e88892dc21
Merge pull request #6627 from asymmetric/key-comment
...
Fix missing ` in key manual
2022-06-08 12:10:52 +02:00
Lorenzo Manacorda
814ddfa5f5
Fix missing ` in key manual
2022-06-08 11:46:50 +02:00
Jonpez2 and GitHub
a7d25d339d
Add security.csm to the default ignore list
2022-06-08 09:32:14 +01:00
Eelco Dolstra and GitHub
b2dea231cf
Merge pull request #6618 from afishhh/search-exclude
...
Add `-e`/`--exclude` flag to `nix search`
2022-06-07 19:01:36 +02:00
Fishhh
9ae22b1fde
Use grep -c instead of grep|wc -l in some nix search tests
2022-06-07 18:25:59 +02:00
Fishhh
0338cf5539
Add tests for --exclude flag in nix search
2022-06-07 18:25:52 +02:00
Fishhh
e009367c8d
Remove redundant std::moves in calls to hiliteMatches
2022-06-07 18:25:52 +02:00
Fishhh
b42358b9be
Add --exclude flag to nix search
...
If a package's attribute path, description or name contains matches for any of the
regexes specified via `-e` or `--exclude` that package is excluded from
the final output.
2022-06-07 18:25:48 +02:00
Eelco Dolstra and GitHub
8977cdee6a
Merge pull request #6598 from cole-h/update-flake-for-real
...
flake: update to 22.05
2022-06-07 15:13:16 +02:00
Eelco Dolstra
faf80fa920
Convert to new flake style
...
https://github.com/NixOS/nix/issues/5532
2022-06-07 14:36:23 +02:00
Eelco Dolstra
0f8754cd30
Fix 22.05 eval warnings
2022-06-07 14:27:10 +02:00
Eelco Dolstra
5a9d83aa59
Disable cross builds on platforms other than x86_64-linux
...
Needed because evaluation was broken on x86_64-darwin.
2022-06-07 14:27:06 +02:00
Eelco Dolstra and GitHub
739c358c68
Merge pull request #6602 from cw789/patch-2
...
Explain exactly what nix-upgrade nix does
2022-06-07 13:08:56 +02:00
Malte Brandy
bf2f25e3d8
respect print-missing variable in new-style build command
...
Currently nix-build prints the "printMissing" information by default,
nix build doesn’t.
People generally don‘t notice this because the standard log-format of
nix build would not display the printMissing
output long enough to perceive the information.
This addresses https://github.com/NixOS/nix/issues/6561
2022-06-06 21:15:31 +02:00
Jonpez2 and GitHub
0cd560c95d
Add security.csm to ignored-acls
...
The security.csm ACL is, as far as I know, never reasonable to remove, so let's add it to the ignore-list in the vanilla nix image. This makes this image usable on GKE.
2022-06-06 16:56:42 +01:00
Fishhh
d137ceccef
Fix incorrect comment in hiliteMatches
2022-06-05 20:30:18 +02:00
Eelco Dolstra and GitHub
1dd7253133
Merge pull request #6603 from abathur/installer_fix_vi_swapfile
...
darwin-install: work around existing vim swap files
2022-06-03 08:51:48 +02:00
Fishhh