Eelco Dolstra
d002324f1b
Merge remote-tracking branch 'origin/master' into nix-copy-gc
2024-11-20 21:05:52 +01:00
Eelco Dolstra
af07f33d37
resolveLookupPathPath(): Return a SourcePath instead of a string
...
Cherry-picked from lazy-trees.
2024-11-19 18:03:31 +01:00
Robert Hensing
6b0aceedc5
Merge pull request #11902 from roberth/fix-issue-11892
...
Fix issue #11892
2024-11-18 22:20:01 +01:00
Robert Hensing
c4b95dbdd1
Fix issue 11892
...
It seems that I copied the expression for baseDir thoughtlessly and
did not come back to it.
- `baseDir` was only used in the `fromArgs` branch.
- `fromArgs` is true when `packages` is true.
2024-11-18 21:04:04 +01:00
Eelco Dolstra
428af8c66f
tests/functional/flakes/develop.sh: Don't hang
...
The bash shell started by `nix develop` waited forever for stdin
input.
Fixes #11827 .
2024-11-18 16:28:12 +01:00
Robert Hensing
d8d59298e5
Merge pull request #9854 from the-sun-will-rise-tomorrow/docker-user
...
docker: Allow building for non-root user
2024-11-18 14:55:51 +01:00
WxNzEMof
11d3b017cf
tests/nixos: add more thorough nix-docker tests
2024-11-11 22:56:46 +00:00
WxNzEMof
1cfb226b72
tests/nixos: add nix-docker test
2024-11-11 22:54:36 +00:00
Eelco Dolstra
f29e7867a9
Revert "Merge pull request #11826 from DeterminateSystems/revert-11804"
...
This reverts commit aeffdeffc8723fdeb4f1
2024-11-11 15:21:34 +01:00
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 a03bb4455chttps://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 1c5ad159d667de193277ce4e4a158e43e82c9446
2024-11-07 18:12:04 +01:00
Eelco Dolstra
67d231c046
Revert "Merge pull request #11804 from obsidiansystems/remove-old-make"
...
This reverts commit 619eeb658a1af94bf471
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
Eelco Dolstra
cb0eaccaa9
Merge remote-tracking branch 'origin/master' into nix-copy-gc
2024-11-04 15:49:49 +01:00
Eelco Dolstra
1c832d6050
Merge remote-tracking branch 'origin/master' into nix-copy-gc
2024-11-04 14:52:56 +01: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
