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
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
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
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
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
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
regnat
838f862f4f
doc: Wrap at 80 characters
2021-06-02 11:26:04 +02:00
Théophane Hufschmitt
7565308d04
Fix a documentation typo
...
Co-authored-by: Eelco Dolstra <edolstra@gmail.com>
2021-06-02 11:25:47 +02:00
regnat
7d651f5c3f
throw_ -> reportError
...
This function might or might not throw depending on the value of
`keepGoing`, so naming it `throw_` was a bit confusing
2021-06-02 11:24:31 +02:00
regnat
d12b12a15b
Let nix flake check
keep going when keep-going is set
...
When the `keep-going` option is set to `true`, make `nix flake check`
continue as much as it can before failing.
The UI isn’t perfect as-it-is as all the lines currently start with a
mostly useless `error (ignored): error:` prefix, but I’m not sure what
the best output would be, so I’ll leave it as-it-is for the time being
(This is a bit hijacking the `keep-going` flag as it’s supposed to be a
build-time only thing. But I think it’s faire to reuse it here).
Fix https://github.com/NixOS/nix/issues/4450
2021-06-02 11:13:12 +02:00
Chua Hou
aedb5c7301
Install zsh completion script
2021-06-02 00:44:03 +08:00
regnat
5985b8b527
Check the CA hash when importing stuff in the local store
...
When adding a path to the local store (via `LocalStore::addToStore`),
ensure that the `ca` field of the provided `ValidPathInfo` does indeed
correspond to the content of the path.
Otherwise any untrusted user (or any binary cache) can add arbitrary
content-addressed paths to the store (as content-addressed paths don’t
need a signature).
2021-06-01 15:09:24 +02:00
Eelco Dolstra
48396d940e
Merge pull request #4866 from alyssais/libdl
...
Only link with libdl on Linux
2021-06-01 11:50:50 +02:00
Eelco Dolstra
b8fbfc80fd
Merge pull request #4864 from jeremyschlatter/fix-typo
...
Fix typo in documentation
2021-06-01 11:49:46 +02:00
Eelco Dolstra
f357cea40e
Run autoupdate
2021-06-01 11:42:38 +02:00
Eelco Dolstra
83f694762e
Merge branch 'aarch64-darwin' of https://github.com/Kloenk/nixos-nix
2021-06-01 11:35:13 +02:00
Eelco Dolstra
caef6f4314
Merge pull request #4734 from p01arst0rm/fix-s3-ifdef
...
unified macro style for ENABLE_S3
2021-06-01 11:30:21 +02:00
Alyssa Ross
c57ab17687
Only link with libdl on Linux
...
Linux is (as far as I know) the only mainstream operating system that
requires linking with libdl for dlopen. On BSD, libdl doesn't exist,
so on non-FreeBSD BSDs linking will currently fail. On macOS, it's
apparently just a symlink to libSystem (macOS libc), presumably
present for compatibility with things that assume Linux.
So the right thing to do here is to only add -ldl on Linux, not to add
it for everything that isn't FreeBSD.
2021-06-01 08:05:21 +00:00
Finn Behrens
9f1a7f9d37
Include aarch64-darwin in installer
...
Co-authored-by: Matthew Bauer <mjbauer95@gmail.com>
2021-06-01 09:48:35 +02:00
Finn Behrens
1fefe808f6
enable aarch64-darwin build
...
disable lowdown sandbox on aarch64-darwin
2021-06-01 09:45:14 +02:00
Jeremy Schlatter
f674f7f434
Fix typo in documentation
2021-06-01 00:05:34 -07:00
Eelco Dolstra
e8f585be70
Merge pull request #4855 from timothyklim/master
...
Add .tar.zst support for TarballInputScheme
2021-05-31 10:38:04 +02:00
Domen Kožar
1f390922d0
Build for aarch64-darwin
2021-05-29 19:40:56 +02:00
Timothy Klim
4da9ec772c
Add .tar.zst support for TarballInputScheme
2021-05-29 16:03:26 +07:00
Eelco Dolstra
b10256af51
Merge pull request #4849 from NixOS/ca/fix-nix-store--export
...
Make the Nar hash non modulo
2021-05-28 10:48:36 +02:00
Eelco Dolstra
cf1d4299a8
Merge pull request #4853 from Synthetica9/no-freenode
...
Throw freenode down the memory hole
2021-05-28 10:47:15 +02:00
Patrick Hilhorst
822e338e5c
throw freenode down the memory hole
2021-05-27 21:48:39 +02:00
regnat
1f3ff0d193
Aso track the output path of the realisation dependencies
2021-05-26 17:09:21 +02:00
regnat
cb46d70794
Add a db migration script
2021-05-26 16:59:09 +02:00
regnat
63ebfc73c5
Make copyPaths
copy the whole realisations closure
...
Otherwise registering the realisations on the remote side might fail as
it now expects a complete closure
2021-05-26 16:59:09 +02:00
regnat
8c30acc3e8
Properly track the drvoutput references when building
2021-05-26 16:59:09 +02:00