10355 commits

This branch

This branch

All branches

Author	SHA1	Message	Date
Thomas Churchman	e3d11f9a9c	Improve machine store URI parsing	2021-06-23 22:09:22 +01:00
Eelco Dolstra	323e5450a1	Merge branch 'update-nix_path-url' of https://github.com/kini/nix	2021-06-23 15:34:06 +02:00
Eelco Dolstra	0a535dd5ac	Merge pull request #4839 from NixOS/ca/gracefully-handle-duplicate-realisations ... Gracefully handle duplicate realisations	2021-06-23 11:50:18 +02:00
Eelco Dolstra	f9f773b332	Merge pull request #4908 from NixOS/ca/fix-nix-develop ... Make `nix develop` work with CA derivations	2021-06-23 11:27:58 +02:00
regnat	c878cee895	Assert that compatible realisations have the same dependencies ... Should always hold, but that’s not necessarily obvious, so better enforce it	2021-06-23 11:27:16 +02:00
regnat	16fb7d8d95	Display the diverging paths in case of a realisation mismatch	2021-06-23 11:27:16 +02:00
regnat	40f925b2da	Fix indentation	2021-06-23 11:27:16 +02:00
regnat	d32cf0c17a	Gracefully ignore a substituter if it holds an incompatible realisation	2021-06-23 11:27:16 +02:00
regnat	b8f7177a7b	Properly fail when trying to register an incoherent realisation	2021-06-23 11:27:14 +02:00
Eelco Dolstra	7945055c63	Merge pull request #4842 from NixOS/ca/fix-nix-shell ... Make `nix-shell` support content-addressed derivations	2021-06-23 11:26:22 +02:00
regnat	a5df669bc6	Add a test for the “two glibc” issue	2021-06-23 11:18:31 +02:00
Eelco Dolstra	4a5aa1dbf6	Merge pull request #4838 from NixOS/ca/recursively-substitute-realisations ... Recursively substitute the realisations	2021-06-23 10:33:25 +02:00
Eelco Dolstra	2ab7c821f3	Merge pull request #4911 from matthewbauer/fix-zsh-completion ... Fix zsh completion script	2021-06-23 10:07:36 +02:00
Eelco Dolstra	26d2c62225	Merge pull request #4906 from NixOS/collect-garbage-ca ... Make `computeFSClosure` ca-aware	2021-06-23 10:07:08 +02:00
Eelco Dolstra	d9a43d3137	Merge pull request #4905 from NixOS/ca-derivations-machine-feature ... Add a ca-derivations required machine feature	2021-06-23 10:05:53 +02:00
Eelco Dolstra	3e4126b67c	Merge pull request #4926 from NixOS/ca/build-remote-signal-6 ... Fix the remote build of CA derivations	2021-06-23 10:04:35 +02:00
Eelco Dolstra	4f9508c3b5	Merge pull request #4836 from NixOS/ca/track-drvoutput-dependencies-2-le-retour ... Track the dependencies of CA realisations	2021-06-23 10:03:31 +02:00
regnat	ed0e21a88d	Fix indentation	2021-06-23 08:16:34 +02:00
regnat	7c96a76dd7	Reformat the sql statements	2021-06-23 08:16:34 +02:00
Théophane Hufschmitt	8d09a4f9a0	Remove a useless string split ... Co-authored-by: Eelco Dolstra <edolstra@gmail.com>	2021-06-23 08:16:34 +02:00
Théophane Hufschmitt	c13d7d0b97	Pass more values by reference ... Rather than copying them around everywhere Co-authored-by: Eelco Dolstra <edolstra@gmail.com>	2021-06-23 08:16:34 +02:00
regnat	3b58dbb356	nix-shell: Replace resolving failure error by an assertion ... This shouldn’t happen in practice, so better make it explicit	2021-06-22 11:29:55 +02:00
Domen Kožar	4b23bf797a	Merge pull request #4930 from domenkozar/perl-binding-aarch64-darwin ... perlBindings: fix build on aarch64-darwin	2021-06-22 10:43:00 +02:00
Domen Kožar	9676c9f6a3	perlBindings: fix build on aarch64-darwin	2021-06-21 19:40:51 +02:00
regnat	dcabb46124	Shorten a stupidly long sql query name	2021-06-21 16:28:06 +02:00
Eelco Dolstra	610baf359a	Merge pull request #4833 from NixOS/ca/json-realisations-in-worker-protocol ... Always send the realisations as JSON	2021-06-21 16:12:17 +02:00
Eelco Dolstra	24e7353232	Merge pull request #4928 from NixOS/ca/remove-existing-invalid-store-path ... Remove a possible existing store path when building CA derivations	2021-06-21 16:09:21 +02:00
Eelco Dolstra	55b4623d21	Merge pull request #4929 from NixOS/only-symlink-wanted-outputs ... Only symlink the requested outputs in `nix build`	2021-06-21 16:07:33 +02:00
Théophane Hufschmitt	ce674cb2cf	Properly set the output env variables ... Co-authored-by: John Ericson <git@JohnEricson.me>	2021-06-21 15:52:01 +02:00
regnat	608434722b	Only symlink the requested outputs in nix build ... Fix #4925	2021-06-21 15:47:47 +02:00
regnat	3784c66a46	Remove a possible existing store path when building CA derivations ... In case a previous interrupted build left a garbage path laying around, remove it before trying to move the path to its final location. Fix #4858	2021-06-21 15:29:15 +02:00
regnat	498677cbed	Fix the remote build of CA derivations ... Make sure that the derivation we send to the remote builder is exactly the one that we want to build locally so that the output ids are exactly the same Fix #4845	2021-06-21 14:18:33 +02:00
Eelco Dolstra	db3de0727e	Merge pull request #4923 from edolstra/uds-store-root-param ... UDSRemoteStore: Support the 'root' store parameter	2021-06-21 10:19:57 +02:00
Eelco Dolstra	4202a3bc4e	UDSRemoteStore: Support the 'root' store parameter ... Useful when we're using a daemon with a chroot store, e.g. $ NIX_DAEMON_SOCKET_PATH=/tmp/chroot/nix/var/nix/daemon-socket/socket nix-daemon --store /tmp/chroot Then the client can now connect with $ nix build --store unix:///tmp/chroot/nix/var/nix/daemon-socket/socket?root=/tmp/chroot nixpkgs#hello	2021-06-18 17:04:11 +02:00
regnat	a3ce88725b	Add a test for the gc with CA derivations ... Also add a small architecture to easily run CA-enabled tests	2021-06-15 12:11:31 +02:00
Eelco Dolstra	e6150de90d	nix develop: Filter out NIX_REMOTE ... When recursive Nix is enabled, NIX_REMOTE is set to unix:///build/.nix-socket, which doesn't work outside of the sandbox.	2021-06-15 12:06:01 +02:00
Matthew Bauer	79674c6cdb	Fix zsh completion script ... Installed site-functions need to be run directly, not via compdef.	2021-06-12 23:50:26 -05:00
regnat	96d7170e12	Don’t check the deriver field on computeFSClosure ... That doesn’t really make sense with CA derivations (and wasn’t even really correct before because of FO derivations, though that probably didn’t matter much in practice)	2021-06-12 12:24:53 +02:00
regnat	2cf591a134	Make nix develop work with CA derivations ... Fix #4823	2021-06-11 13:35:13 +02:00
regnat	56605b4688	Make nix-shell support content-addressed derivations ... Resolve the derivation before trying to load its environment − essentially reproducing what the build loop does − so that we can effectively access our dependencies (and not just their placeholders). Fix #4821	2021-06-11 13:32:49 +02:00
regnat	7ac038fa4b	Make computeFSClosure ca-aware ... Fix #4820 by preventing nix-collect garbage from crashing if `keep-outputs` or `keep-derivations` is true	2021-06-11 09:26:49 +02:00
regnat	7c077d2a0f	Add a ca-derivations required machine feature ... Make ca-derivations require a `ca-derivations` machine feature, and ca-aware builders expose it. That way, a network of builders can mix ca-aware and non-ca-aware machines, and the scheduler will send them in the right place.	2021-06-11 09:12:53 +02:00
Eelco Dolstra	8e6ee1b9e9	Merge pull request #4889 from puckipedia/fix-atomic-sunos ... configure.ac: fix use of unread LIBS variable	2021-06-04 14:18:35 +02:00
Puck Meerburg	196b77b686	configure.ac: fix use of unread LIBS variable ... This fixes both the SunOS/Solaris check, and the libatomic check, which reference $LIBS, which has not been used since automake was stripped out of the code.	2021-06-04 11:25:36 +00:00
Keshav Kini	f35f9af787	Improve explanation of NIX_PATH prefix syntax ... The previous wording seemed to imply that the "channel:" syntax would resolve to a github archive URL, which is not the case.	2021-06-03 17:59:39 -07:00
Eelco Dolstra	bb06640971	Merge pull request #4871 from chuahou/master ... Install zsh completion script	2021-06-02 13:32:15 +02:00
Eelco Dolstra	f1b604f603	Merge pull request #4879 from keke-cute/fix-optional-namespace ... Fix error: 'optional' in namespace 'std' does not name a template type	2021-06-02 13:30:54 +02:00
keke	50dc88a56c	fix error: 'optional' in namespace 'std' does not name a template type	2021-06-02 18:09:03 +08:00
Domen Kožar	7c3cb8506f	flake.lock: Update ... Flake input changes: * Updated 'nixpkgs': 'github:NixOS/nixpkgs/3a2e0c36e79cecaf196cbea23e75e74710140ea4' -> 'github:NixOS/nixpkgs/bb8a5e54845012ed1375ffd5f317d2fdf434b20e'	2021-06-02 11:58:46 +02:00
Eelco Dolstra	cc9aa8d4b1	Merge pull request #4878 from NixOS/flake-check-keep-going ... Let nix flake check keep going when keep-going is set	2021-06-02 11:31:19 +02:00