Eelco Dolstra
1c832d6050
Merge remote-tracking branch 'origin/master' into nix-copy-gc
2024-11-04 14:52:56 +01:00
Bryan Honof
c800f3fa93
chore: run formatters
2024-11-04 14:41:40 +01:00
Bryan Honof
affd2dbc6c
test(functional): add tests for new environment operation flags
2024-11-04 14:41:33 +01:00
Eelco Dolstra
3fdd7d035d
Fix Meson build
2024-11-04 14:31:52 +01:00
Eelco Dolstra
f274e8f49d
Tagging release 2.24.10
...
-----BEGIN PGP SIGNATURE-----
iQFHBAABCAAxFiEEtUHVUwEnDgvPFcpdgXC0cm1xmN4FAmcjZagTHGVkb2xzdHJh
QGdtYWlsLmNvbQAKCRCBcLRybXGY3pllB/9wf/jONQEx7rUenXZ47+DPZugf+5ax
+/hWF1bPMMJafPJxP4BFuZFYrm8sRHwAYH32R/zFRcG3NJxJaPuiGtL1eHcbeB7K
B9/Kj6dXJdKgYSegwNrtjVspGHHixwUCXC2gnARanR25yuTowumbIa53R1Kq1Q3t
6pUl7FgQeHQ8gJUyWVG12YJjx9x84u5MVbToe4rBbBM16z7pTik3OB5+SurRx1t5
SpMeZu1tlF6EOj1jMy1wEHox++VwQopJFxsET3YALvbdqDrdbeWT3BzwJob+ELVh
Hs+Y6BtMvO8YXl3jJTiZ/8g0x6LzSzGpKGSBZr9Nd9i9GEpDskIVRaKo
=l5w4
-----END PGP SIGNATURE-----
Merge tag '2.24.10' into detsys-main
Tagging release 2.24.10
2024-11-04 14:06:34 +01:00
Bryan Honof
0b790b4849
feat: add flag set-env-var to MixEnvironment
2024-11-04 14:02:29 +01:00
Eelco Dolstra
655bfa6b59
Merge pull request #11797 from nix-windows/windows-build/eval-error
...
Fix compilation of eval under Windows
2024-11-04 13:37:16 +01:00
Brian McKenna
d711c7e965
Fix compilation of eval under Windows
2024-11-04 19:32:41 +11:00
Brian McKenna
8ae5610c11
Set minimum Windows API to Windows 8
...
Anything less won't compile because we're using
GetCurrentThreadStackLimits from Windows 8.
2024-11-04 19:23:23 +11: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
915cbe656e
Merge pull request #11795 from nix-windows/windows-build/nix-build-tmpdir-env-fix
...
Fix compilation of nix-build on Windows
2024-11-03 20:44:06 -05:00
Brian McKenna
7b7e8a3307
Fix compilation of nix-build on Windows
2024-11-04 11:53:49 +11:00
John Ericson
dd5a50d80e
Merge pull request #11792 from obsidiansystems/no-copy-functional-tests
...
No longer copy functional tests to the build dir
2024-11-03 17:40:32 -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
Robert Hensing
efe2e42235
Merge pull request #11793 from fricklerhandwerk/add-link-string-context
...
docs: add links to string context documentation
2024-11-03 19:10:24 +01:00
Valentin Gagarin
14c8b08c86
docs: add links to string context documentation
...
operators are an everyday thing in the Nix language, and this page will
hopefully be consulted by many users.
string contexts are quite exotic, and not linking to the detailed
explanation will require readers to figure out manually what this is
about, or worse, skim over and run into problems later.
2024-11-03 12:42:32 +01: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
Michael
55fe4ee4f3
doc/manual: Add 'Debugging Nix' section ( #11637 )
...
* doc/manual: Add 'Debugging Nix' section
This commit adds a new 'Debugging Nix' section to the Nix manual. It provides instructions on how to build Nix with debug symbols and how to debug the Nix binary using debuggers like `lldb`.
Co-authored-by: Jörg Thalheim <Mic92@users.noreply.github.com>
Co-authored-by: Valentin Gagarin <valentin.gagarin@tweag.io>
2024-11-01 19:42:34 +00:00
Eelco Dolstra
f314e35b37
Simplify "final" inputs
...
We now just check that the fetcher doesn't change any attributes in
the input, and return all the original attributes (i.e. discarding any
new attributes and keeping any attributes that the fetcher didn't
keep).
2024-11-01 16:37:39 +01:00
Eelco Dolstra
5f3b40dfcc
Merge pull request #42 from DeterminateSystems/eelcodolstra/fh-425-give-determinate-nix-its-own-version-number
...
Show Determinate Nix version number
2024-11-01 16:04:25 +01:00
Eelco Dolstra
3a4a97aa55
Set the Determinate version number to 0.0.1
2024-11-01 16:03:58 +01:00
Eelco Dolstra
5c49d0b5d2
Handle final handling for old lock files with improper narHash fields
...
This fixes the error
'{"__final":true,"lastModified":1686592866,"narHash":"sha256-riGg89eWhXJcPNrQGcSwTEEm7CGxWC06oSX44hajeMw","owner":"nixos","repo":"nixpkgs","rev":"0eeebd64de89e4163f4d3cf34ffe925a5cf67a05","type":"github"}' resulted in different input
'{"__final":true,"lastModified":1686592866,"narHash":"sha256-riGg89eWhXJcPNrQGcSwTEEm7CGxWC06oSX44hajeMw=","owner":"nixos","repo":"nixpkgs","rev":"0eeebd64de89e4163f4d3cf34ffe925a5cf67a05","type":"github"}'
in flake-regressions/tests/nix-community/patsh/0.2.1 (note the lack of
a trailing '=' in the NAR hash in the lock file).
2024-11-01 15:34:48 +01:00
Eelco Dolstra
4fcd458512
Merge remote-tracking branch 'origin/master' into flake-substitution
2024-11-01 15:13:46 +01:00
Bjørn Forsman
020dbac0e0
doc/rl-2.19: add entry for always-allow-substitutes option ( #11775 )
...
* doc/rl-2.19: add entry for always-allow-substitutes option
Fixes https://github.com/NixOS/nix/issues/9427 .
2024-11-01 10:55:33 +00:00
Jörg Thalheim
2e5759e377
Merge pull request #11776 from NixOS/push-porpmpmkzuus
...
fix: make sure directory exists before using `ln`
2024-11-01 11:18:53 +01:00
Valentin Gagarin
c91c1cd3fd
Merge pull request #11400 from fricklerhandwerk/checklist-security-release
...
maintainers: add checklist for security releases
2024-10-31 18:35:44 +01:00
Valentin Gagarin
9bb153acb2
maintainers: add checklist for security releases
...
Co-Authored-By: Robert Hensing <robert@roberthensing.nl
Co-authored-by: Dan Baker <daniel.n.baker@gmail.com>
2024-10-31 18:34:19 +01:00
Pol Dellaiera
5f71ebb956
fix: make sure directory exists before using ln
2024-10-31 16:25:18 +01:00
Jörg Thalheim
0f59c2102e
Merge pull request #11770 from Jaculabilis/shellcheck
...
Expand shellcheck coverage in functional tests
2024-10-31 15:48:57 +01: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
Eelco Dolstra
e84063c540
.version-determinate: Use semver
...
Co-authored-by: Cole Helbling <cole.helbling@determinate.systems>
2024-10-31 12:08:17 +01:00
Emil Petersen
78aedda6bd
Update content-address.md ( #11771 )
...
Correct a few typos. Make explicit that FSO acronym refers to File System Object.
2024-10-30 23:31:03 +00:00
Eelco Dolstra
597fcc98e1
Merge remote-tracking branch 'nix-ghsa-wf4c-57rh-9pjg/advisory-fix-1-2.24' into 2.24-maintenance
2024-10-30 21:44:39 +01:00
Eelco Dolstra
7362987182
Merge remote-tracking branch 'nix-ghsa-wf4c-57rh-9pjg/advisory-fix-1'
2024-10-30 21:40:14 +01:00
Eelco Dolstra
a7a0767df7
Rename final -> __final
2024-10-30 20:54:07 +01:00
Eelco Dolstra
707cbad5f8
Show Determinate Nix version number
...
`nix --version` will now show `nix (Determinate Nix 1.0) 2.24.10`.
2024-10-30 18:46:59 +01:00
Eelco Dolstra
c1c38bb2b7
Merge pull request #41 from DeterminateSystems/eelcodolstra/fh-422-create-determinate-nix-manual
...
Add Determinate Nix release notes to the manual
2024-10-30 17:10:40 +01:00
Eelco Dolstra
a2994430eb
Merge pull request #39 from DeterminateSystems/sync-2.24.9
...
Sync with upstream 2.24.9
2024-10-30 17:10:17 +01:00
Tim Van Baak
a75b082a28
Expand shellcheck coverage in functional tests
...
Ref NixOS/nix#10795
2024-10-30 08:27:06 -07:00
Eelco Dolstra
cddc42b1cb
Merge pull request #40 from DeterminateSystems/fix-eval
...
Disable mingw32 jobs
2024-10-30 16:23:22 +01:00
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
82abed901f
Merge pull request #11769 from DeterminateSystems/fix-release-notes
...
Fix 2.24 release notes
2024-10-30 16:12:43 +01:00
Eelco Dolstra
2d61e3c783
Add Determinate Nix release notes to the manual
2024-10-30 15:50:27 +01:00
Eelco Dolstra
f9180f12c4
release notes: 2.24.9
2024-10-30 15:32:37 +01:00
Jörg Thalheim
a8e600e386
Merge pull request #11641 from a-h/patch-1
...
docs: update distributed-builds.md
2024-10-30 14:17:07 +01:00
Eelco Dolstra
f36f4a4f52
Disable some Hydra jobs that we don't care about at the moment
2024-10-30 13:30:39 +01:00
Adrian Hesketh
9491abdfec
docs: update distributed-builds.md
2024-10-30 13:28:13 +01:00
Eelco Dolstra
21ddd181fe
Disable mingw32 jobs
...
This gets rid of an evaluation error in
devShells.aarch64-linux.x86_64-w64-mingw32.
3222692304
2024-10-30 12:53:05 +01:00
Robert Hensing
12e31ab77d
Merge pull request #11766 from NixOS/refactor-import
...
Refactor `import`
2024-10-30 04:19:08 +01:00
