12389 commits

This branch

This branch

All branches

Author	SHA1	Message	Date
Eelco Dolstra	f959ce3e03	Merge remote-tracking branch 'origin/master' into lazy-trees	2022-06-23 17:24:44 +02:00
Eelco Dolstra	3c57db1a0f	Merge pull request #6710 from edolstra/embedded-sandbox-shell ... Embed the sandbox shell into the statically linked 'nix' binary	2022-06-23 15:34:16 +02:00
Eelco Dolstra	0b2ea0023c	Fix typo	2022-06-23 14:22:11 +02:00
Théophane Hufschmitt	027f6a735f	Merge pull request #6673 from asymmetric/warn ... libstore: improve warning message on missing sig	2022-06-23 06:42:48 +02:00
Eelco Dolstra	925b975224	Embed the sandbox shell into the statically linked 'nix' binary ... With this, Nix will write a copy of the sandbox shell to /bin/sh in the sandbox rather than bind-mounting it from the host filesystem. This makes /bin/sh work out of the box with nix-static, i.e. you no longer get /nix/store/qa36xhc5gpf42l3z1a8m1lysi40l9p7s-bootstrap-stage4-stdenv-linux/setup: ./configure: /bin/sh: bad interpreter: No such file or directory	2022-06-23 04:08:28 +02:00
Eelco Dolstra	eafa2721ca	Merge pull request #6709 from edolstra/fix-static-build-hook ... Fix build-remote in nix-static	2022-06-23 02:12:55 +02:00
Eelco Dolstra	1e55ee2961	getSelfExe(): Support macOS	2022-06-23 01:32:46 +02:00
Eelco Dolstra	184f4e40de	Remove NIX_LIBEXEC_DIR	2022-06-23 01:32:46 +02:00
Eelco Dolstra	d3176ce076	Fix build-remote in nix-static ... 'build-remote' is now executed via /proc/self/exe so it always works.	2022-06-23 01:32:46 +02:00
Eelco Dolstra	3c48c4b4f7	Merge pull request #6708 from edolstra/run-static-tests ... Enable tests for nix-static	2022-06-23 00:11:23 +02:00
Eelco Dolstra	958b8d1e35	Merge pull request #6707 from edolstra/fix-incremental-static ... Fix incremental static builds	2022-06-22 23:50:24 +02:00
Eelco Dolstra	8bbbb6e737	Enable/fix tests in nix-static ... pkgsStatic is apparently considered a cross environment, so checkPhase and installCheckPhase are disabled even when we ask for them.	2022-06-22 23:33:15 +02:00
Eelco Dolstra	696121fe1d	Fix incremental static builds ... $? refers to the object files that are newer, so the resulting file would lack all the older object files.	2022-06-22 17:53:58 +02:00
Eelco Dolstra	f6cf644e5f	Style	2022-06-22 15:35:52 +02:00
Eelco Dolstra	bbe7187db9	Merge pull request #6695 from afishhh/search-fix-exclude ... Fix arity of `--exclude` flag in `nix search`	2022-06-21 16:12:04 +02:00
Théophane Hufschmitt	16c6c6c963	Merge pull request #6676 from virusdave/dnicponski/scratch/swap_homedir_check_master ... Verify this if `$HOME` exists, it is owned by current user in `getHome()`	2022-06-20 21:17:22 +02:00
Fishhh	df21173b70	Add another test for --exclude in nix search	2022-06-20 19:21:45 +02:00
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
Dave Nicponski	ca2be509b9	Verify $HOME is owned by current user in getHome(), if it exists. ... Useful because a default `sudo` on darwin doesn't clear `$HOME`, so things like `sudo nix-channel --list` will surprisingly return the USER'S channels, rather than `root`'s. Other counterintuitive outcomes can be seen in this PR description: https://github.com/NixOS/nix/pull/6622	2022-06-17 17:42:08 -04:00
Eelco Dolstra	fd51cdcdd7	Merge remote-tracking branch 'origin/master' into lazy-trees	2022-06-17 13:39:03 +02:00
Théophane Hufschmitt	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
Lorenzo Manacorda	475249db8a	libstore: improve warning message on missing sig ... Clarifies that the substitute will be ignored/skipped.	2022-06-15 17:34:28 +02:00
Théophane Hufschmitt	63df0fda94	Merge pull request #6615 from WhyNotHugo/man-improvements ... Add disambiguation to man page	2022-06-15 10:41:52 +02:00
Eelco Dolstra	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	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	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	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	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	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	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	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 in `nix-build.cc`.	2022-06-11 15:17:35 +02:00
Théophane Hufschmitt	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	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	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
Eelco Dolstra	5f1340219b	Add builtins.patch ... This replaces the 'patches' argument to builtins.fetchTree with something more generic. So instead of 'builtins.fetchTree { patches = ... }' you can do 'builtins.patch { src = builtins.fetchTree { ... }; patchFiles = ... }'.	2022-06-10 13:10:22 +02:00
Naïm Favier	da8f8668ca	libfetchers/git: add missing --git-dir flags	2022-06-10 12:57:13 +02:00
Eelco Dolstra	2b30df7b46	PatchingInputAccessor: Allow empty lines in patches	2022-06-10 12:44:50 +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	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
Jonpez2	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
Eelco Dolstra	baee9fe7a2	Fix bad exception reported by @layus	2022-06-09 21:33:13 +02:00
Eelco Dolstra	dbe7fcebff	Merge remote-tracking branch 'origin/master' into lazy-trees	2022-06-09 21:27:16 +02: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