wroclaw-git-backups/nix
1
0
Fork 0
mirror of https://github.com/NixOS/nix synced 2025-06-28 13:41:15 +02:00
Code Activity
18234 commits 245 branches 205 tags 160 MiB
Commit graph

461 commits

Author SHA1 Message Date
Eelco Dolstra
828f8e197e Merge remote-tracking branch 'origin/2.24-maintenance' into sync-2.24.9 2024-10-30 16:20:34 +01:00
Eelco Dolstra
d8d38c4257 Tagging release 2.24.9 
-----BEGIN PGP SIGNATURE-----
 
 iQFHBAABCAAxFiEEtUHVUwEnDgvPFcpdgXC0cm1xmN4FAmb3K78THGVkb2xzdHJh
 QGdtYWlsLmNvbQAKCRCBcLRybXGY3t5xB/4mKlFd8hka45CuQrGN6lJrIs76kvn5
 mXDLWpHTOyipUZN1ZKACUPlKD/8cP8sHwd3/fILlwKAOurgWCd/+QwAPltT01r/w
 T02E4haXGLmWwdZ+uPcm/lBdZVq8IZ1oU/9+EFKsbaYpa4O4kZPHe3joPr4ebVlO
 zXndiR5FDSSEg05qAXr62KndgydTf/xtjEEv6jONzMaO1MCK6OAHIKCZg2ybsV/S
 5ayfUESRFwGg4/BbzSEkEO0wl8mgwo6PbD0BI83FSC9W1gaR2ImadjA9GPKBkS1o
 8Rj/KrP55JZkQExEQWquptEMlKoDdruQUelXXBBeqnXErG2bORV+Z7xG
 =SUre
 -----END PGP SIGNATURE-----

Merge tag '2.24.9' into sync-2.24.9

Tagging release 2.24.9
 2024-10-29 16:04:00 +01:00
Eelco Dolstra
ffcc42faf4 Revert flake-schemas for now 2024-10-29 15:18:48 +01:00
Jörg Thalheim
0e9b04a66e 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

(cherry picked from commit 2105574702)
 2024-10-22 12:13:47 +00:00
Eelco Dolstra
57ace600af Add a test 
(cherry picked from commit a7b9877da9)
 2024-10-14 12:51:03 +00:00
Eelco Dolstra
751907dc8a Git fetcher: Ignore .gitmodules entries that are not submodules 
Fixes #10739.

(cherry picked from commit 9d24080090)
 2024-09-12 16:16:36 +00:00
Eelco Dolstra
2e1cb495c1 Typo 
(cherry picked from commit 4cfa59fdb3)
 2024-09-10 09:51:50 +02:00
Eelco Dolstra
e25410c788 Test that deserializing regular files / symlinks is exclusive 
(cherry picked from commit 52ba3cc5ea)
 2024-09-10 09:51:50 +02:00
Eelco Dolstra
25510ba66f RestoreSink::createDirectory(): Use append() 
On macOS, `mkdir("x/')` behaves differently than `mkdir("x")` if `x` is
a dangling symlink (the formed succeed while the latter fails). So make
sure we always strip the trailing slash.

(cherry picked from commit 9fcb588dd8)
 2024-09-10 09:51:50 +02:00
Eelco Dolstra
d9b60b3902 Fix test on macOS 
(cherry picked from commit 21dcbd7e83)
 2024-09-10 09:51:50 +02:00
Eelco Dolstra
a041688133 Test that deserializing NARs with names with equal Unicode normal forms fails on macOS 
The test is based on the one by @puckipedia but with the file names
swapped to make them sorted.

(cherry picked from commit 7a765a6aaf)
 2024-09-10 09:51:50 +02:00
Eelco Dolstra
1288970496 Detect NAR directory entries that collide with another path after case-hacking 
The test was made by @puckipedia.

(cherry picked from commit 3557587381)
 2024-09-10 09:51:50 +02:00
Eelco Dolstra
0cfc9bf133 More tests 
(cherry picked from commit 77c090cdbd)
 2024-09-10 09:51:50 +02:00
Eelco Dolstra
f160d3ac68 Test that nix-store --restore fails if the output already exists 
This restores the behaviour from before the std::filesystem
refactorings.

(cherry picked from commit da1ad28912)
 2024-09-10 09:51:50 +02:00
Eelco Dolstra
6187ee468f Add test case for NARs with duplicate directory entries 
This test was made by @puckipedia.

(cherry picked from commit 83d5b32803)
 2024-09-10 09:51:50 +02:00
Eelco Dolstra
27a36255bf Merge remote-tracking branch 'detsys-priv/detsys-main' into sync-2.24.2 2024-08-08 16:57:22 +02:00
Eelco Dolstra
bbd2c17f58
Merge pull request #30 from DeterminateSystems/stable-nix-command 
Remove the `nix-command` experimental feature
 2024-08-08 16:07:49 +02:00
Eelco Dolstra
c1d27763c6 Merge commit 'b24757f08a' into sync-2.24.2 2024-08-08 15:34:12 +02:00
Valentin Gagarin
db5bacb637
reword documentation on nix-path config option (#7772) 
* docs: unify documentation on search paths

- put all the information on search path semantics into `builtins.findFile`
- put all the information on determining the value of `builtins.nixPath` into the
  `nix-path` setting

  maybe `builtins.nixPath` is a better place for this, but those bits
  can still be moved around now that it's all next to each other.
- link to the syntax page for lookup paths from all places that are
  concerned with it
- add or clarify examples
- add a test verifying a claim from documentation
 2024-07-31 21:41:26 +02:00
Eelco Dolstra
0b96c586e0
Merge pull request #11195 from DeterminateSystems/tarball-roots 
Improve handling of tarballs that don't consist of a single top-level directory
 2024-07-29 16:58:59 +02:00
Eelco Dolstra
7c18b4d060 Don't dereference top-level regular files 
Since this yielded an empty directory as far back as Nix 2.3, we don't
really need special handling for executables vs non-executables.
 2024-07-29 14:34:02 +02:00
Robert Hensing
861bd102a6
Merge pull request #11167 from NixOS/repl-test-rejiggle 
Fix repl test for `buildReadlineNoMarkdown`
 2024-07-27 00:55:57 +02:00
Eelco Dolstra
06b686b62d Handle tarballs that don't consist of a single top-level directory 
Fixes #4785 (top-level directories are no longer merged into one).

Fixes #10983 (top-level non-directories are no longer discarded).
 2024-07-26 20:24:58 +02:00
Robert Hensing
6ec123ad6b
Merge pull request #11131 from rhendric/rhendric/pipe-operators 
libexpr: experimental pipe operators
 2024-07-25 16:58:43 +02:00
Robert Hensing
76f04b4146
Merge pull request #11111 from NixOS/grep-safety-AGAIN 
Grep newline safety
 2024-07-25 16:30:33 +02:00
Robert Hensing
baa28159d3
Update tests/functional/test-infra.sh 
Co-authored-by: John Ericson <John.Ericson@Obsidian.Systems>
 2024-07-25 15:38:02 +02:00
John Ericson
36252fed6b
Merge pull request #11176 from obsidiansystems/flake-test-group 
Put flake functional tests in their own group
 2024-07-25 02:41:11 -04:00
Robert Hensing
6662c9012d
Merge pull request #11177 from obsidiansystems/skip-exit-code 
Change skipped test error code from 99 to 77
 2024-07-25 06:59:18 +02:00
John Ericson
90f7f2139e
Merge pull request #11115 from NixOS/doc-derivation 
Document builtins.derivation
 2024-07-25 00:21:53 -04:00
John Ericson
dcbe2453f5 Change skipped test error code from 99 to 77 
Meson uses a venerable GNU convention described in
https://www.gnu.org/software/automake/manual/html_node/Scripts_002dbased-Testsuites.html
in which:

> When no test protocol is in use, an exit status of 0 from a test
> script will denote a success, an exit status of 77 a skipped test, an
> exit status of 99 a hard error, and any other exit status will denote
> a failure.

77 is thus what we want, not 99.
 2024-07-24 22:36:43 -04:00
John Ericson
f4915af71c Put flake functional tests in their own group 
This is a nice thing to have, and it made it easier to work on the
Meson-ifcation of these functional tests too.
 2024-07-24 22:31:37 -04:00
Valentin Gagarin
e062021314
fix NIX_PATH for real (#11079) 
* fix NIX_PATH overriding

- test restricted evaluation
- test precedence for setting the search path

Co-authored-by: Robert Hensing <robert@roberthensing.nl>
Co-authored-by: John Ericson <git@JohnEricson.me>
 2024-07-24 21:17:15 +00:00
Ryan Hendrickson
e086d5d899 libexpr: experimental pipe operators 2024-07-24 13:17:28 -04:00
Robert Hensing
6e680a6644 tests/functional/repl: Improve failure reporting 2024-07-24 12:48:38 +02:00
Robert Hensing
c4ae9bb45b tests/functional/repl: Normalize final prompt 2024-07-24 12:48:38 +02:00
Robert Hensing
ca2cc26e12 tests/functional/repl: Improve precision and readability 
... as well as match buildReadlineNoMarkdown.

Unfortunately it doesn't support long inputs or multiline inputs
for now.
This needs to make better use of the interacter interface.
 2024-07-24 12:48:38 +02:00
Robert Hensing
4457cebe05
Update comment in tests//vars-and-functions.sh 
Co-authored-by: tomberek <tomberek@users.noreply.github.com>
 2024-07-23 10:24:18 +02:00
Eelco Dolstra
babfd0cd99
Merge pull request #11150 from hercules-ci/issue-11141-broken-sp-corrector 
Fix issue #11141 broken stack pointer corrector
 2024-07-22 19:59:46 +02:00
Robert Hensing
f2e0cecf34 tests/functional/lang-gc: Disable for now 2024-07-22 17:46:08 +02:00
Eelco Dolstra
d08bb025e1
Merge pull request #11043 from hercules-ci/assert-eq 
`assert`: Report why values aren't equal
 2024-07-22 17:34:28 +02:00
Eelco Dolstra
40f80e1b5c
Merge pull request #11142 from detroyejr/fix-alias-flags 
Allow flag aliases
 2024-07-22 15:53:41 +02:00
Robert Hensing
380becf0db Fix #11141 broken sp corrector 2024-07-22 14:52:08 +02:00
Robert Hensing
584f8cb065
Merge pull request #11120 from tweag/early-string-cutoff 
parser: Remove empty multiline string parts earlier
 2024-07-20 19:10:50 +02:00
detroyejr
d54dfbf879 addFlag: test that alias flags are allowed 2024-07-19 15:56:54 -04:00
Silvan Mosberger
0c91bb97e5 parser: Remove empty multiline string parts earlier 
Makes parsing more consistent and is a super minor optimisation

Co-authored-by: Robert Hensing <roberth@users.noreply.github.com>
 2024-07-19 00:43:44 +02:00
Eelco Dolstra
1e1a8e8ad1
Merge pull request #11058 from hercules-ci/more-nix-shell 
Make `#!nix-shell` arguments and options relative to script
 2024-07-17 21:52:34 +02:00
Eelco Dolstra
b23da1ceca
Merge pull request #11100 from NixOS/pretty-print-idempotent 
Pretty print idempotently
 2024-07-17 21:35:27 +02:00
Eelco Dolstra
05751de32b
Merge pull request #10931 from hercules-ci/test-run-and-shell-envs 
Test the `run` and `shell` envs for stray variables
 2024-07-17 21:21:14 +02:00
Robert Hensing
da3eff60bc printList: Force item before determining whether to print multi-line 2024-07-17 13:42:05 +02:00
Robert Hensing
a0635a80b2 printAttrs: Force item before determining whether to print multi-line 2024-07-17 13:42:05 +02:00