John Ericson
39fd4705ac
Factor out the dev shell
...
It had gotten rather big. Hopefully we'll eventually have some generic
infra for a "multi-package dev shell" and not need so much code for
this, but until then it's better in a separate file.
2024-11-04 15:14:20 -05:00
John Ericson
b4c05a18b4
Merge pull request #11802 from obsidiansystems/special-build-jobs-meson
...
`hydraJobs.build{NoGc,ReadlineNoMarkdown}` build using Meson
2024-11-04 14:53:23 -05:00
John Ericson
42b5421d5a
hydraJobs.build{NoGc,ReadlineNoMarkdown} build using Meson
...
Getting ready for the complete switch-over
Progress on #2503
2024-11-04 13:53:23 -05:00
Robert Hensing
baea2b9eec
Merge pull request #11800 from obsidiansystems/test-against-using-meson
...
Test against tests using Meson-built Nix
2024-11-04 19:52:53 +01:00
John Ericson
9fdbefe45c
Merge pull request #11796 from nix-windows/windows-build/minimum-sdk
...
Set minimum Windows API to Windows 8
2024-11-04 13:21:50 -05:00
John Ericson
62ef9fa03c
Remove redundant pkgs.pkgs
...
Co-authored-by: Robert Hensing <roberth@users.noreply.github.com>
2024-11-04 13:07:26 -05:00
John Ericson
142f55457b
Test against tests using Meson-built Nix
2024-11-04 12:17:44 -05:00
John Ericson
e1181d51ef
Merge pull request #11798 from obsidiansystems/meson-for-nixos-functional-tests
...
Meson for nixos functional tests
2024-11-04 11:18:11 -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
John Ericson
f07aee934a
Update docs in line of build system changes
2024-11-04 10:35:11 -05:00
Robert Hensing
c4f56cb995
Merge pull request #11494 from bryanhonof/bryanhonof.feat-mixenvironment-set-env
...
Add flag `set-env-var` to `MixEnvironment`, and rename old ones
2024-11-04 15:23:17 +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
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
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
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
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
Tim Van Baak
a75b082a28
Expand shellcheck coverage in functional tests
...
Ref NixOS/nix#10795
2024-10-30 08:27:06 -07: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
Adrian Hesketh
9491abdfec
docs: update distributed-builds.md
2024-10-30 13:28:13 +01:00
Robert Hensing
12e31ab77d
Merge pull request #11766 from NixOS/refactor-import
...
Refactor `import`
2024-10-30 04:19:08 +01:00
Robert Hensing
64744503cc
Tidy
2024-10-30 01:08:01 +01:00
Robert Hensing
760be5fe1e
refact: Extract derivationToValue
2024-10-30 01:06:51 +01:00
Robert Hensing
5f691206ba
refact: Extract scopedImport
2024-10-30 01:06:45 +01:00
John Ericson
63f9159953
Merge pull request #11751 from artemist/nix-utimensat
...
Add support for `utimensat` as an alternative to `lutimes`
2024-10-28 00:32:01 +01:00
Eelco Dolstra
059bdb5a64
Merge pull request #11750 from artemist/nix-openbsd
...
Fix building on OpenBSD
2024-10-27 12:51:38 +01:00
Artemis Tosini
d023202811
Add support for utimensat as an alternative to lutimes
...
OpenBSD doesn't support `lutimes`, but does support `utimensat` which
subsumes it. In fact, all the BSDs, Linux, and newer macOS all support
it. So lets make this our first choice for the implementation.
In addition, let's get rid of the `lutimes` `ENOSYS` special case. The
Linux manpage says
> ENOSYS
>
> The kernel does not support this call; Linux 2.6.22 or later is
> required.
which I think is the origin of this check, but that's a very old version
of Linux at this point. The code can be simplified a lot of we drop
support for it here (as we've done elsewhere, anyways).
Co-Authored-By: John Ericson <John.Ericson@Obsidian.Systems>
2024-10-26 18:02:24 +00:00
