nordic-dev.net/nix
nordic-dev.net/nix
2
0
Fork 0
mirror of https://github.com/NixOS/nix.git synced 2024-11-21 14:22:29 +00:00
Code Issues Packages Projects Releases Wiki Activity
18,792 Commits 198 Branches 183 Tags 242 MiB
master
Commit Graph

544 Commits

Author SHA1 Message Date
Eelco Dolstra
b767987942
Merge pull request #11926 from DeterminateSystems/split-flake-tests 
Break up tests/functional/flakes/flakes.sh
 2024-11-20 23:41:09 +01:00
Eelco Dolstra
e122acef97 Fix VM test 2024-11-20 23:03:31 +01:00
Eelco Dolstra
671df02bf7 shellcheck 2024-11-20 23:03:31 +01:00
Eelco Dolstra
d002324f1b Merge remote-tracking branch 'origin/master' into nix-copy-gc 2024-11-20 21:05:52 +01:00
Eelco Dolstra
6832ee5d6f Move non-flake input tests into a separate file 2024-11-20 19:51:04 +01:00
Eelco Dolstra
4cafea7c7b Add a utility function for creating/registering a simple flake 2024-11-20 18:51:23 +01:00
Eelco Dolstra
e1cb905aca Move --commit-lock-file-summary tests into a separate file 2024-11-20 18:42:33 +01:00
Eelco Dolstra
fd2df5f02f Rename nonFlakeDir -> scriptDir 2024-11-20 18:23:20 +01:00
Eelco Dolstra
5533b0c735 Move shebang flake tests into a separate test 2024-11-20 18:08:31 +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
Eelco Dolstra
f29e7867a9 Revert "Merge pull request #11826 from DeterminateSystems/revert-11804" 
This reverts commit aeffdeffc8, reversing
changes made to 723fdeb4f1.
 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
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
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
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
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
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
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
Eelco Dolstra
7f6d006beb nix copy: Add --out-link 2024-10-08 16:35:53 +02:00
Eelco Dolstra
76f75e7691 nix copy: Add --profile flag 
This allows `nix copy` to atomically copy a store path and point a
profile to it, without the risk that the store path might be GC'ed in
between. This is useful for instance when deploying a new NixOS system
profile from a remote store.
 2024-10-08 15:28:49 +02:00