nixos/nix
1
1
Fork 0
mirror of https://github.com/NixOS/nix.git synced 2025-11-22 02:09:36 +01:00
Code Activity
20935 commits 185 branches 219 tags 186 MiB
Commit graph

3057 commits

Author SHA1 Message Date
Robert Hensing
b86a76044e Unexpose config headers (low hanging fruit only) 
- Some headers were completely redundant and have been removed.
- Other headers have been turned private.
- Unnecessary meson.build code has been removed.
- libutil-tests now has a private config header, where previously
  it had none. This removes the need to expose a package version
  macro publicly.
 2025-03-28 15:17:54 +00:00
Jörg Thalheim
ca165f09c0
Merge pull request #12583 from ulucs/ulucs/skip-ifds 
`nix flake show`: Skip IFDs instead of throwing
 2025-03-27 11:40:49 +01:00
Jörg Thalheim
b050db951b test/ca-fd-leak: fix clang-tidy lints 2025-03-27 11:24:28 +01:00
Uluc Sengil
fcf5966488 skip ifds in nix flake show instead of throwing 2025-03-27 11:16:35 +01:00
Sergei Trofimovich
cadfed692c tests/functional/check-refs.nix: format newly added test 
(cherry picked from commit 4d72e0f73b)
 2025-03-25 15:49:31 +00:00
Sergei Trofimovich
c2cffe6249 tests/functional/check-refs.sh: guard test12 against too old nix daemon 
Otherwise without the change the test fails on nix-2.26 as:

    error: derivation contains an illegal reference specifier 'dev'

Note: the error message does not match intended change.
(cherry picked from commit 1e7c7244cf)
 2025-03-25 15:49:31 +00:00
Robert Hensing
6f54b90f36 test illegal reference specifier error message 
(cherry picked from commit f4def47c89)
 2025-03-25 15:49:31 +00:00
Sergei Trofimovich
4d72e0f73b tests/functional/check-refs.nix: format newly added test 2025-03-25 06:12:19 +00:00
Sergei Trofimovich
1e7c7244cf tests/functional/check-refs.sh: guard test12 against too old nix daemon 
Otherwise without the change the test fails on nix-2.26 as:

    error: derivation contains an illegal reference specifier 'dev'

Note: the error message does not match intended change.
 2025-03-25 06:12:19 +00:00
Robert Hensing
f4def47c89 test illegal reference specifier error message 2025-03-25 06:12:19 +00:00
Eelco Dolstra
dab0ff4f9e Tagging release 2.27.1 
-----BEGIN PGP SIGNATURE-----
 
 iQFHBAABCAAxFiEEtUHVUwEnDgvPFcpdgXC0cm1xmN4FAmfheacTHGVkb2xzdHJh
 QGdtYWlsLmNvbQAKCRCBcLRybXGY3kt2B/4tQvs6iDXA12d409ClHbVQjr1d0FLP
 rv8RxZ7Z4+Jaw8r2ra/I+gpr9juI5ULyEJWqfES72hTvbYPjH1Grsrrjak1tx57E
 +STs21oEPojE8LXsFH1oZamGPPIIpyQdxCvTgZs1N6cqUfCRQ3Jx97X6E6SIGJDR
 VqBM4ruSXCY57yT36HqwYydTkxzZHiNP5wwABGfSb7u9pYW5x3r8W7+fQ3udTnCw
 kCRhA5vnfxIQSlxu4j7dJqSCGzOIPnhYB19bXDV4aPhl4sn3pkBCdMZxPBlCWSwx
 it0ngMITf+TeiMpVl2TtvMBOHtlGrbhusbyKcsqzFYULGyGOC9ngTAY3
 =/JzB
 -----END PGP SIGNATURE-----

Merge tag '2.27.1' into detsys-main

Tagging release 2.27.1
 2025-03-24 21:28:03 +01:00
mergify[bot]
07321575ca
Merge pull request #12716 from Mic92/fix-script 
tests/functional: use script flags compatible with macOS
 2025-03-24 16:51:27 +00:00
Jörg Thalheim
f02c57dbfa tests/functional: use script flags compatible with macOS 
Co-authored-by: John Ericson <git@JohnEricson.me>
 2025-03-24 16:38:20 +01:00
Sergei Zimmerman
d371aadb2b
tests/functional: Add regression test for broken :sh in repl 
Can't really test `:u` because it needs <nixpkgs>.
 2025-03-23 22:13:40 +00:00
Shahar "Dawn" Or
3f56dd9927 stack overflow is EvalBaseError 
(cherry picked from commit 23c7a45a05)
 2025-03-21 14:13:40 +00:00
Shahar "Dawn" Or
23c7a45a05 stack overflow is EvalBaseError 2025-03-20 17:43:20 +00:00
Rodney Lorrimar
1bc82d1c86
tests/functional/flakes: Add test case for subflake locking 
This adds a test case where the lockfile of a relative path flake
dependency is updated.

It was reported by a user here: https://discourse.nixos.org/t/updating-local-subflakes-inputs-when-building-root-flake/61682

I think this test case relates to issue #7730.

Because the issue is not resolved, this test case would fail without
the `|| true` clause.
 2025-03-20 13:28:05 +08:00
Robert Hensing
fe00dfbd56 nix-cli: Add --json --pretty / --no-pretty 
Default: istty(stdout)

This refactors `nix develop` internals a bit to use the `json` type
more. The assertion now operates in the in-memory json instead of
re-parsing it. While this is technically a weaker guarantee, we
should be able to rely on the library to get this right. It's its
most essential purpose.
 2025-03-14 12:39:13 +00:00
Eelco Dolstra
25ba7c55d3 Merge remote-tracking branch 'origin/2.26-maintenance' into sync-with-2.26 2025-03-05 18:01:03 +01:00
John Ericson
f4f28cdd0e Revert "Revert "Revert "Adapt scheduler to work with dynamic derivations""" 
The bug reappeared after all, and the fix introduced a different bug. I
just reverted on 2.27 first, in #12576, but upon further introspection
and discussion with @roberth, with preparing for and travelling to
Planet Nix I will not be able to fix it on `master` soon enough for a
revert to not be warranted here in the meantime also.

This reverts commit c98525235f.
 2025-03-02 15:34:21 -05:00
John Ericson
f636ced7d2 Revert "Revert "Revert "Adapt scheduler to work with dynamic derivations""" 
The bug reappeared after all, and the fix introduced a different bug. We
want to release 2.27 imminently so there is no time to do a proper fix,
which appears to require a larger reworking. Hopefully we will have it
for 2.28, however.

This reverts commit c98525235f.
 2025-02-27 13:42:57 -05:00
Eelco Dolstra
1293388039
Merge pull request #12544 from xokdvium/debugger-use-after-free 
libexpr: Fix use-after-free of StaticEnv::up
 2025-02-27 16:55:49 +01:00
Eelco Dolstra
827f760ad7
Fix test 
We didn't backport `nix flake prefetch --out-link`.
 2025-02-24 23:00:07 +01:00
Eelco Dolstra
6749d26dbb Merge remote-tracking branch 'origin/2.26-maintenance' into detsys-main 2025-02-24 22:41:22 +01:00
Eelco Dolstra
91508de315 nix flake archive: Recurse into relative path inputs 
We can't ignore them entirely, since we do want to archive their
transitive inputs.

Fixes #12438.

(cherry picked from commit 14c9755462)
 2025-02-24 21:30:45 +00:00
Eelco Dolstra
14c9755462 nix flake archive: Recurse into relative path inputs 
We can't ignore them entirely, since we do want to archive their
transitive inputs.

Fixes #12438.
 2025-02-24 22:10:02 +01:00
Eelco Dolstra
d670380bd9 nix flake archive: Skip relative path inputs 
Fixes #12438.

(cherry picked from commit b4dfeafed5)
 2025-02-24 14:49:11 +00:00
Eelco Dolstra
b4dfeafed5 nix flake archive: Skip relative path inputs 
Fixes #12438.
 2025-02-24 15:30:30 +01:00
Sergei Zimmerman
0d5004508f tests/functional: Add flake-based regression for debugger use-after-free 
This is the simplest reproducer I have. It would be great to find
a repro without flakes, but I guess this should be ok for now.
 2025-02-21 14:36:39 +00:00
Eelco Dolstra
641733fd26 Add test 2025-02-19 12:47:28 +01:00
Robert Hensing
fd062585ac tests: Fix installTests 
(cherry picked from commit 2b5365bcf7)
 2025-02-19 01:04:04 +01:00
Robert Hensing
b175e5bb6d Write just ./.version on all components 
This way it's easier to get right. See previous commit.

(cherry picked from commit 3556f6bf4c)
 2025-02-19 01:04:04 +01:00
Eelco Dolstra
ed4aeb4875 Fix hydraJobs.tests.functional_user 2025-02-19 00:26:06 +01:00
Eelco Dolstra
4055239936 Tagging release 2.26.2 
-----BEGIN PGP SIGNATURE-----
 
 iQFHBAABCAAxFiEEtUHVUwEnDgvPFcpdgXC0cm1xmN4FAmetA5oTHGVkb2xzdHJh
 QGdtYWlsLmNvbQAKCRCBcLRybXGY3g2pB/9JAFyjmaXuccbMTO/6x9qwsWuuXNLk
 OQWzfbdUekvsihZZSFZg1r7KqqXHCi64f0nxLPsJ/0oeDWZktJ5KnbV630nuUlDj
 ulLCpKdvhWFa8dVx9LiziGwQw4KLx8PjOfwThtQ4DqCWxWEmu6lKkijag9cE+ai4
 3mw9YtUjBRxlXyhYLzWz3whLbv37c/m+R8iGS8xm8W260pmei6D0beOIPdfXYBQF
 PzPlPORyI08A06uqyA3z7bTxzmSMnzvu0QInCPCKSHzFUnTZPHUYuYStFl28NrZS
 fXKK59L0G7QEfdTRAmqQkdHdtPj2RlYFiMN0kQiNLflvKfGGWdi/kvdx
 =rRix
 -----END PGP SIGNATURE-----

Merge tag '2.26.2' into sync-2.26.2

Tagging release 2.26.2
 2025-02-18 19:57:51 +01:00
Eelco Dolstra
f02a7b880e startDaemon(): Detect if the daemon crashes before creating the socket 
This avoids timeouts like those seen in
https://github.com/NixOS/nix/actions/runs/13376958708/job/37358120348?pr=6962.

(cherry picked from commit 11c42cb2e1)
 2025-02-18 16:39:48 +00:00
John Ericson
5facd492ad
Merge pull request #12499 from DeterminateSystems/detect-daemon-crash 
startDaemon(): Detect if the daemon crashes before creating the socket
 2025-02-18 11:38:16 -05:00
Robert Hensing
2b5365bcf7 tests: Fix installTests 2025-02-18 15:55:19 +01:00
Eelco Dolstra
11c42cb2e1 startDaemon(): Detect if the daemon crashes before creating the socket 
This avoids timeouts like those seen in
https://github.com/NixOS/nix/actions/runs/13376958708/job/37358120348?pr=6962.
 2025-02-18 11:57:45 +01:00
Robert Hensing
3556f6bf4c Write just ./.version on all components 
This way it's easier to get right. See previous commit.
 2025-02-18 11:41:35 +01:00
Robert Hensing
c5fcb1bd50 Fix a few warnings 2025-02-17 19:29:01 +01:00
Eelco Dolstra
54388893bc dep-built-drv-2.sh: Don't fail with "cannot create symlink" 2025-02-17 11:57:21 +01:00
John Ericson
222a57c9ca More interesting dynamic derivations example 
Co-authored-by: Samuel Ainsworth <skainsworth@gmail.com>
 2025-02-16 18:00:34 -05:00
Robert Hensing
07f853b295
Merge pull request #9415 from NixOS/fix-dynamic-derivations 
Revert "Revert "Adapt scheduler to work with dynamic derivations
 2025-02-16 23:59:39 +01:00
Leandro Reina
b2d352e6a3 Add inputs.self.lfs 2025-02-13 17:59:27 +01:00
Eelco Dolstra
228dac401a Merge remote-tracking branch 'origin/master' into lazy-flake-commands 2025-02-13 15:39:26 +01:00
Robert Hensing
693a38ae2e
Merge pull request #10153 from b-camacho/lfs 
git-lfs support
 2025-02-13 14:25:30 +01:00
Robert Hensing
eb91014928
Merge pull request #12443 from DeterminateSystems/prefetch-out-link 
nix flake prefetch: Add --out-link option
 2025-02-12 22:22:04 +01:00
Eelco Dolstra
17d46041b8 Add test 2025-02-12 22:05:38 +01:00
Eelco Dolstra
83306bb841 copyPathToStore(): Preserve symlinks 
E.g. in a derivation attribute `foo = ./bar`, if ./bar is a symlink,
we should copy the symlink to the store, not its target. This restores
the behaviour of Nix <= 2.19.

(cherry picked from commit 26b87e78b5)
 2025-02-11 21:51:39 +00:00
Eelco Dolstra
26b87e78b5 copyPathToStore(): Preserve symlinks 
E.g. in a derivation attribute `foo = ./bar`, if ./bar is a symlink,
we should copy the symlink to the store, not its target. This restores
the behaviour of Nix <= 2.19.
 2025-02-11 20:58:48 +01:00