Jörg Thalheim
aeffdeffc8
Merge pull request #11826 from DeterminateSystems/revert-11804
...
Revert "Merge pull request #11804 from obsidiansystems/remove-old-make"
2024-11-08 12:04:55 +01:00
Eelco Dolstra
723fdeb4f1
Merge pull request #11832 from DeterminateSystems/fix-remote-build-test
...
Fix tests.remoteBuilds_local_nix_2_18
2024-11-07 22:56:28 +01:00
Eelco Dolstra
5471d2a454
Fix tests.remoteBuilds_local_nix_2_18
...
This was broken since a03bb4455c
because
Nix 2.18 does not support broken $SHELL settings. So don't try a
broken $SHELL on old Nix versions. (It's a mystery though why
tests.remoteBuilds_local_nix_2_13 and tests.remoteBuilds_local_nix_2_3
didn't fail...)
https://hydra.nixos.org/build/277366807
2024-11-07 20:48:11 +01:00
Eelco Dolstra
0ed5af164f
Merge pull request #11831 from DeterminateSystems/fix-nix-copy-test
...
Fix 'nix copy' VM test
2024-11-07 20:43:01 +01:00
Eelco Dolstra
ea6dc8ebf1
Fix 'nix copy' VM test
...
This was broken because the root password wasn't getting set correctly.
https://hydra.nixos.org/build/277366631
2024-11-07 20:10:57 +01:00
Eelco Dolstra
47bffe20e4
Revert "Merge pull request #10980 from kjeremy/flake-show-description"
...
This reverts commit 1c5ad159d6
, reversing
changes made to 67de193277
.
This reverts commit ce4e4a158e
, reversing
changes made to 43e82c9446
.
2024-11-07 18:12:04 +01:00
Eelco Dolstra
67d231c046
Revert "Merge pull request #11804 from obsidiansystems/remove-old-make"
...
This reverts commit 619eeb658a
, reversing
changes made to 1af94bf471
.
2024-11-07 13:46:37 +01:00
John Ericson
f7591bc6ed
Make config.nix
shims
...
As requested in https://github.com/NixOS/nix/pull/11792#discussion_r1827034428
2024-11-06 16:09:18 -05:00
John Ericson
e70c9bb06a
Remove old build system
2024-11-06 16:09:18 -05:00
Robert Hensing
c6c8d2af65
refact: Remove unused arguments
2024-11-06 19:45:19 +01:00
Robert Hensing
3112e59734
ProgressBar::ask: Accept EOF as a no
...
This may occur when stderr is a tty but stdin is empty.
E.g.
$ nix build </dev/null
error: unexpected EOF reading a line
These stdio handles are how some non-interactive sandboxes behave,
including the Nix build sandbox and Hercules CI Effects.
2024-11-06 19:45:19 +01:00
Brian McKenna
a9c417dbab
msys2: use ls.exe instead of coreutils.exe for coreutils directory
2024-11-06 00:18:59 +11:00
John Ericson
142f55457b
Test against tests using Meson-built Nix
2024-11-04 12:17:44 -05:00
John Ericson
f018a0b0c8
Make functional tests on NixOS use Meson not Make
...
Co-authored-by: Robert Hensing <roberth@users.noreply.github.com>
2024-11-04 10:39:09 -05:00
Bryan Honof
affd2dbc6c
test(functional): add tests for new environment operation flags
2024-11-04 14:41:33 +01:00
Bryan Honof
0b790b4849
feat: add flag set-env-var
to MixEnvironment
2024-11-04 14:02:29 +01:00
John Ericson
30f4f21887
Merge pull request #11794 from nix-windows/windows-functional/nul-character
...
Rename nul.nar because nul is a special name in Windows
2024-11-03 20:45:35 -05:00
John Ericson
9d2ed0a7d3
No longer copy functional tests to the build dir
...
This should make `_NIX_TEST_ACCEPT=1` work again, fixing #11369 .
Progress on #2503
2024-11-03 16:42:38 -05:00
Brian McKenna
190d0d661e
Rename nul.nar because nul is a special name in Windows
...
For example, we can't even clone the repository on Windows!
error: invalid path 'tests/functional/nul.nar'
fatal: unable to checkout working tree
2024-11-03 17:02:47 +11:00
Tim Van Baak
39fe52a126
Replace shebang with shellcheck directive
2024-10-31 06:46:58 -07:00
Tim Van Baak
a530939fe4
Add check for one nix-build-* directory
2024-10-31 06:46:33 -07:00
Tim Van Baak
a75b082a28
Expand shellcheck coverage in functional tests
...
Ref NixOS/nix#10795
2024-10-30 08:27:06 -07:00
Robert Hensing
3db75b0060
Merge pull request #11729 from emhamm/nix-tests-help-only-if-docu
...
nix/tests: run test help.sh only if nix is built with documentation
2024-10-23 19:41:44 +02:00
Eelco Dolstra
75016c26f9
Add a test for chroot stores
2024-10-22 22:23:40 +02:00
Eelco Dolstra
e09666d314
Fix test name
2024-10-22 22:05:48 +02:00
Marian Hammer
85b0cd320a
nix/tests: run test help.sh only if nix is built with documentation
...
tests/functional/help.sh calls nix-* commands with option --help
if nix is built without documentation the option --help throws an error
because the man page it wants to display is missing
2024-10-22 14:15:56 +02:00
Jörg Thalheim
2105574702
fix env-vars beeing written to /tmp
...
This overall seems like insecure tmp file handling to me. Because other
users could replace files in /tmp with a symlink and make the nix-shell
override other files.
fixes https://github.com/NixOS/nix/issues/11470
2024-10-22 08:21:18 +00:00
John Ericson
e65510da56
Move unit tests to the location Meson expects them to be
...
Everything that is a separate subproject should live in the subprojects
directory.
Progress on #2503
This reverts commit 451f8a8c19
.
2024-10-17 15:42:16 -04:00
Eelco Dolstra
facc502bc8
Merge pull request #11695 from DeterminateSystems/override-lastModified
...
path fetcher: Allow the lastModified attribute to be overriden again
2024-10-16 18:03:29 +02:00
Eelco Dolstra
de1289229f
Merge pull request #11669 from obsidiansystems/doc-source-rename
...
Make the subproject dir `src` again
2024-10-16 17:30:40 +02:00
Eelco Dolstra
781ff7672e
Add test
2024-10-16 17:18:07 +02:00
Robert Hensing
806a91f7bf
Merge pull request #11688 from roberth/meson-tidy
...
Clean up the `package.nix` files
2024-10-14 17:40:46 +02:00
John Ericson
eb7d7780b1
Rename doc/manual{src -> source}
...
This is needed to avoid this
https://github.com/mesonbuild/meson/issues/13774 when we go back to
making our subproject directory `src`.
2024-10-14 11:21:24 -04:00
Eelco Dolstra
d5c45952ac
Merge pull request #11690 from DeterminateSystems/non-contiguous-tarballs
...
Handle tarballs where directory entries are not contiguous
2024-10-14 14:50:31 +02:00
Eelco Dolstra
a7b9877da9
Add a test
2024-10-14 14:10:36 +02:00
Robert Hensing
15e3e1543b
packaging: Add mkMeson{Library,Executable}
...
and:
- move pkg-config out of mkMesonDerivation, for components that don't
produce any executable code
2024-10-13 23:17:54 +02:00
Robert Hensing
0aef34b790
packaging: Add mesonLayer
...
... and remove a few unused arguments.
This adds pkg-config to a two or three packages that don't use it,
but we shouldn't let that bother us. It's like our personal stdenv.
2024-10-13 22:39:53 +02:00
Eelco Dolstra
0500fba56a
builtins.fetchurl: Fix segfault on s3:// URLs
...
Also, add an activity to show that we're downloading an s3:// file.
Fixes #11674 .
2024-10-11 14:32:34 +02:00
Eelco Dolstra
4202d4fc81
Merge pull request #11664 from DeterminateSystems/show-sandbox-setup-error
...
Propagate errors from early sandbox initialization to the parent
2024-10-10 17:01:37 +02:00
Eelco Dolstra
0be70469dc
Propagate errors from early sandbox initialization to the parent
...
This should help with issues like
https://github.com/DeterminateSystems/nix-installer/issues/1227 , which
currently just print "unable to start build process".
2024-10-09 20:53:43 +02:00
John Ericson
0db8ff820b
More comment rewording as requested
...
Co-Authored-By: Robert Hensing <robert@roberthensing.nl>
2024-10-09 11:07:15 -04:00
John Ericson
57a478572d
Rename baseNativeBuildInputs
...
as requested
Co-Authored-By: Robert Hensing <robert@roberthensing.nl>
2024-10-09 11:07:12 -04:00
Robert Hensing
26c3fc11ea
Merge pull request #11609 from yannham/fix/nar-test-zfs
...
Fix NAR tests on Linux+ZFS+normalize
2024-10-07 16:16:15 +02:00
Robert Hensing
011fa9e085
tests/functional/nars.sh: Fail test if touch fails, comment
...
Co-authored-by: Jörg Thalheim <Mic92@users.noreply.github.com>
2024-10-07 14:54:35 +02:00
Eelco Dolstra
4dc7946acd
Merge pull request #11610 from Mic92/ssl-fix
...
fix passing CA files into builtins:fetchurl sandbox
2024-10-07 14:41:32 +02:00
Eelco Dolstra
15e5684884
experimental-features.hh: Don't include json-utils.hh
...
This caused nlohmann/json.hpp to leak into a lot of compilation units,
which is slow (when not using precompiled headers).
Cuts build time from 46m24s to 42m5s (real time with -j24: 2m42s to
2m24s).
2024-10-04 15:59:35 +02:00
Eelco Dolstra
f5a2f2a8f8
Merge pull request #11560 from rhendric/rhendric/deprecate-cursed-or
...
libexpr: deprecate the bogus "or"-as-variable
2024-10-02 19:11:56 +02:00
tomberek
14f029dbe8
Merge pull request #11489 from bryanhonof/bryanhonof.warn-on-malformed-uri-query
...
fix: warn on malformed URI query parameter
2024-09-30 12:14:40 -04:00
Yann Hamdaoui
f8268cbe16
Fix NAR tests on Linux+ZFS+normalize
...
A test added recently checks that when trying to deserialize a NAR with
two files that Unicode-normalize to the same result either succeeds on
Linux, or fails with an "already exists" error on Darwin. However,
failing with an "already exists" error can in fact also happen on Linux,
when using ZFS with the proper utf8 and Unicode normalization options
set.
This commit fixes the issue by not assuming the behavior from the
current system, but just by blindly checking that either one of the two
aforementioned possibilities happen, whether on Darwin or on Linux.
Additionally, we check that the Unicode normalization behaviour of
nix-store is the same as the host file system.
2024-09-30 16:29:51 +02:00
Bryan Honof
5150a962f5
test(functional/flakes): add dubious-query
...
Co-authored-by: Jörg Thalheim <Mic92@users.noreply.github.com>
2024-09-30 14:44:06 +02:00