nixos/nix
1
1
Fork 0
mirror of https://github.com/NixOS/nix.git synced 2025-12-03 07:31:00 +01:00
Code Activity
21446 commits 189 branches 219 tags 174 MiB
Commit graph

21446 commits

This branch
This branch
All branches
Author SHA1 Message Date
Sergei Zimmerman
cf0e563f38 libutil: Make AutoDelete non-copyable and non-movable 
This is a good precaution, since we don't want to delete
directories twice accidentally.

(cherry picked from commit 40e3f5c0a4)
 2025-12-01 02:48:07 +00:00
Sergei Zimmerman
fb79e6a7a1 libutil: Propagate error code in createSymlink 
(cherry picked from commit bf7c53f2d3)
 2025-12-01 02:48:07 +00:00
Sergei Zimmerman
3e50cadbe6 libstore: Actually correctly call remove in case rename fails 
(cherry picked from commit 1cc337bb5f)
 2025-12-01 02:48:07 +00:00
Sergei Zimmerman
6c4dc93d9b libstore: Use makeTempPath in optimizePath_ 
This was intended to be cherry-picked in 6aed9d877c,
but was left hanging. This is actually important for fixing [^]. emilazy let me know
of this bad cherry-pick and its significance.

[^]: https://github.com/NixOS/nix/issues/7273

Originally fixed by Lily Ballard <lily@ballards.net> in https://gerrit.lix.systems/c/lix/+/2100.

(cherry picked from commit d888846b68)
 2025-12-01 02:48:07 +00:00
internal-nix-ci[bot]
bd0522c15b
Merge pull request #14673 from NixOS/backport-14672-to-2.32-maintenance 
[Backport 2.32-maintenance] libfetchers: Fix fetchGit with ref = "HEAD"
 2025-11-30 02:13:00 +00:00
Sergei Zimmerman
1d1d553083 libfetchers: Fix fetchGit with ref = "HEAD" 
This seems to have been broken in ee9fa0d360.
Adding the HEAD:HEAD refspec looks like the correct solution.

Suggested-by: hxtmdev on github
(cherry picked from commit 18f3598d57)
 2025-11-30 01:42:07 +00:00
Taeer Bar-Yam
ca5f35fcf7
Merge pull request #14646 from NixOS/fix-14642-2.32 
[Backport 2.32-maintenance] Fix dynamic attributes that are simple string expressions
 2025-11-25 17:39:55 -05:00
Sergei Zimmerman
1e190d840a
Revert "libexpr: introduce arena to hold ExprString strings" 
This reverts commit eab467ecfb.

Simpler to revert the offending patch that lead to dynamic attributes
regression than to fix it.
 2025-11-26 00:39:36 +03:00
Taeer Bar-Yam
d56115eeb4
tests: add tests for dynamic attribute in let and inherit 
Without a follow-up revert these tests will fail.

Co-authored-by: Sergei Zimmerman <sergei@zimmerman.foo>
Co-authored-by: piegames <git@piegames.de>

(cherry picked from commit 0c0a41a81a)
 2025-11-26 00:29:27 +03:00
John Ericson
0167a50133
Merge pull request #14572 from NixOS/segfault-nonexistent-drv 
treewide: Add Store::requireStoreObjectAccessor, simplify uses of get…
 2025-11-15 08:38:24 -05:00
Sergei Zimmerman
379564981a
treewide: Add Store::requireStoreObjectAccessor, simplify uses of getFSAccessor 
This is a simple wrapper around getFSAccessor that throws an InvalidPath
error. This simplifies usage in callsites that only care about getting
a non-null accessor.

(cherry picked from commit 0c32fb3fa2)
 2025-11-15 14:44:52 +03:00
Eelco Dolstra
450cceb5ad Bump version 2025-11-13 17:14:05 +01:00
internal-nix-ci[bot]
a5f9651163
Merge pull request #14558 from NixOS/backport-14551-to-2.32-maintenance 
[Backport 2.32-maintenance] Remove static data from headers
 2025-11-13 16:01:23 +00:00
David McFarland
4a8b515260 Remove static data from headers 
We don't want to duplicate any of these across libraries, which is what
happens when the platform doesn't support unique symbols.

(cherry picked from commit 1b5af49fd0)
 2025-11-13 15:26:49 +00:00
internal-nix-ci[bot]
d7fc293353
Merge pull request #14534 from NixOS/backport-14531-to-2.32-maintenance 
[Backport 2.32-maintenance] Restore isAllowed check in ChrootLinuxDerivationBuilder
 2025-11-10 20:47:31 +00:00
Sergei Zimmerman
46a43dede9 Restore isAllowed check in ChrootLinuxDerivationBuilder 
This early return was lost in d4ef822add.

By doing some
https://en.wikipedia.org/wiki/Non-virtual_interface_pattern, we can
ensure that we don't make this mistake again --- implementations are no
longer responsible for implementing the caching/memoization mechanism.

(cherry picked from commit 496e43ec72)
 2025-11-10 20:15:50 +00:00
internal-nix-ci[bot]
5b8c24fb31
Merge pull request #14524 from NixOS/backport-14515-to-2.32-maintenance 
[Backport 2.32-maintenance] libexpr: Don't use nix::dirOf in prim_dirOf (fix 2.23 regression)
 2025-11-09 18:14:03 +00:00
Sergei Zimmerman
be250f00b9 libexpr: Don't use nix::dirOf in prim_dirOf 
This gets us back to pre-2.23 behavior of this primop.
Done by inlining the code of `nix::dirOf` from 2.2-maintenance.

(cherry picked from commit a33fccf55a)
 2025-11-09 17:43:04 +00:00
Sergei Zimmerman
b591265a05 tests/functional: Add tests for builtins.dirOf 
These will change in the next commit to fix the silent regression from 2.23
in the handling of multiple subsequent path separators.

(cherry picked from commit 86f090837b)
 2025-11-09 17:43:04 +00:00
internal-nix-ci[bot]
70b7c059fd
Merge pull request #14511 from NixOS/backport-14509-to-2.32-maintenance 
[Backport 2.32-maintenance] build: Disable libstdc++ TBB backend to avoid unnecessary dependency
 2025-11-07 22:04:04 +00:00
Jörg Thalheim
287b54b49c build: Disable libstdc++ TBB backend to avoid unnecessary dependency 
boost::concurrent_flat_map (used in libutil and libstore) includes the
C++17 <execution> header. GCC's libstdc++ implements parallel algorithms
using Intel TBB as the backend, which creates a link-time dependency on
libtbb even though we don't actually use any parallel algorithms.

Disable the TBB backend for libstdc++ by setting
_GLIBCXX_USE_TBB_PAR_BACKEND=0. This makes parallel algorithms fall back
to serial execution, which is acceptable since we don't use them anyway.

This only affects libstdc++ (GCC's standard library); other standard
libraries like libc++ (LLVM) are unaffected.

(cherry picked from commit 2f3ec16793)
 2025-11-07 21:33:37 +00:00
Eelco Dolstra
441aba4823 Bump version 2025-11-07 10:41:17 +01:00
Eelco Dolstra
aa657c1679 Revert "Merge pull request #14382 from NixOS/backport-14364-to-2.32-maintenance" 
This reverts commit 5c9481de19,
reversing changes made to
291e8ab6bd. This is a behaviour change
that should be avoided on maintenance branches.
 2025-11-06 22:10:42 +01:00
internal-nix-ci[bot]
a4fb83a239
Merge pull request #14498 from NixOS/backport-14491-to-2.32-maintenance 
[Backport 2.32-maintenance] Don't crash on flakerefs containing newlines
 2025-11-06 19:38:36 +00:00
Eelco Dolstra
47ba375285 Don't crash on flakerefs containing newlines 
Fixes #14311.

(cherry picked from commit c1317017e9)
 2025-11-06 19:18:16 +00:00
internal-nix-ci[bot]
5c9e22d75a
Merge pull request #14485 from NixOS/backport-14482-to-2.32-maintenance 
[Backport 2.32-maintenance] nix flake check: Remove incorrect assertion
 2025-11-05 20:23:17 +00:00
Eelco Dolstra
e6d823e46d nix flake check: Remove incorrect assertion 
The assumption that no unknown paths can be returned is incorrect. It
can happen if a derivation has outputs that are substitutable, but
that have references that cannot be substituted (i.e. an incomplete
closure in the binary cache). This can easily happen with
magic-nix-cache.

(cherry picked from commit a828cf777a)
 2025-11-05 19:51:29 +00:00
internal-nix-ci[bot]
038cc7913b
Merge pull request #14461 from NixOS/backport-14450-to-2.32-maintenance 
[Backport 2.32-maintenance] flake: Update, nixos-25.05-small -> nixos-25.05
 2025-11-03 17:43:37 +00:00
Robert Hensing
828bf74cd0 Apply updated nixfmt 
(cherry picked from commit 81a2809a52)
 2025-11-03 17:08:34 +00:00
Robert Hensing
ec122cbfda flake: Update, nixos-25.05-small -> nixos-25.05 
Flake lock file updates:

• Updated input 'nixpkgs':
    'github:NixOS/nixpkgs/d98ce345cdab58477ca61855540999c86577d19d?narHash=sha256-O2CIn7HjZwEGqBrwu9EU76zlmA5dbmna7jL1XUmAId8%3D' (2025-08-26)
  → 'github:NixOS/nixpkgs/daf6dc47aa4b44791372d6139ab7b25269184d55?narHash=sha256-wxX7u6D2rpkJLWkZ2E932SIvDJW8%2BON/0Yy8%2Ba5vsDU%3D' (2025-10-27)

(cherry picked from commit 233bd250d1)
 2025-11-03 17:08:34 +00:00
internal-nix-ci[bot]
e1ff27324b
Merge pull request #14438 from NixOS/backport-14434-to-2.32-maintenance 
[Backport 2.32-maintenance] libstore: Improve store-reference back-compat with IPv6 ZoneId literals
 2025-11-01 00:18:55 +00:00
Sergei Zimmerman
7b41563055 libstore: Improve store-reference back-compat with IPv6 ZoneId literals 
This restores the pre-2.31 handling of ZoneID identifiers in store references.
It's the only place we reasonably care about this back-compat.

(cherry picked from commit 8dbc2475f7)
 2025-10-31 23:50:22 +00:00
internal-nix-ci[bot]
7f9b9c3638
Merge pull request #14436 from NixOS/backport-14431-to-2.32-maintenance 
[Backport 2.32-maintenance] libfetchers: Restore plain git inputs recognition
 2025-10-31 23:25:25 +00:00
Sergei Zimmerman
ed09f1b4d9 libfetchers: Restore plain git inputs recognition 
Accidentally broken in dbc235cc62.
Adds a bit of tests for this, even though this protocol is mostly deprecated
everywhere.

(cherry picked from commit ade3d5d746)
 2025-10-31 23:01:54 +00:00
internal-nix-ci[bot]
fc6811cb51
Merge pull request #14435 from NixOS/backport-14432-to-2.32-maintenance 
[Backport 2.32-maintenance] meson: Also split version string at '+' for Darwin
 2025-10-31 22:24:18 +00:00
Sergei Zimmerman
a24df3d4e5 meson: Also split version string at '+' for Darwin 
(cherry picked from commit 1ca6e9ef54)
 2025-10-31 21:47:27 +00:00
internal-nix-ci[bot]
e6003b5c4f
Merge pull request #14430 from NixOS/backport-14137-to-2.32-maintenance 
[Backport 2.32-maintenance] fix(libstore/build/derivation-goal): don't assert on partially valid outputs
 2025-10-31 20:59:43 +00:00
Bernardo Meurer Costa
f566957dc4
fix(libstore/build/derivation-goal): don't assert on partially valid outputs 
Fixes: #14130
(cherry picked from commit 9eecee3d4e)
 2025-10-31 23:30:03 +03:00
internal-nix-ci[bot]
f434a3e3c6
Merge pull request #14413 from NixOS/backport-14410-to-2.32-maintenance 
[Backport 2.32-maintenance] zsh/completion: put compdef on first line
 2025-10-29 16:17:24 +00:00
bryango
939f81c2e6 zsh/completion: put compdef on first line 
Some zsh setups (including mine) do not load the
completion if `#compdef` is not on the first line.

So we move the `# shellcheck` comment to the
second line to avoid this issue.

(cherry picked from commit 956fffdd6f)
 2025-10-29 15:58:06 +00:00
internal-nix-ci[bot]
758dacacf4
Merge pull request #14409 from NixOS/backport-14289-to-2.32-maintenance 
[Backport 2.32-maintenance] Fix issue #14287
 2025-10-29 08:29:01 +00:00
John Ericson
9e4177bc67 Fix issue #14287 
The test added in the previous commit now passes.

Co-authored-by: Eelco Dolstra <edolstra@gmail.com>
(cherry picked from commit de192794c9)
 2025-10-29 07:59:08 +00:00
John Ericson
328a3bbbd0 Regression test for issue #14287 
This will currently fail, until the bug is fixed.

Co-Authored-By: Sergei Zimmerman <sergei@zimmerman.foo>
(cherry picked from commit 246dbe1c05)
 2025-10-29 07:59:08 +00:00
internal-nix-ci[bot]
5c9481de19
Merge pull request #14382 from NixOS/backport-14364-to-2.32-maintenance 
[Backport 2.32-maintenance] diff-closures: print sizes with dynamic unit
 2025-10-27 20:52:05 +00:00
Marcel
ebadea0734 treewide: replace manual MiB calculations with renderSize 
(cherry picked from commit 584a8e8a00)
 2025-10-27 19:43:40 +00:00
Marcel
7d7ca3fe96 refactor(libutil): remove showBytes() in favor of renderSize() 
The `showBytes()` function was redundant with `renderSize()` as the
latter automatically selects the appropriate unit (KiB, MiB, GiB, etc.)
based on the value, whereas `showBytes()` always formatted as MiB
regardless of size.

Co-authored-by: Bernardo Meurer Costa <beme@anthropic.com>
(cherry picked from commit f234633e27)
 2025-10-27 19:43:40 +00:00
Marcel
3a92f83e75 diff-closures: print sizes with dynamic unit 
(cherry picked from commit 9d4d10954a)
 2025-10-27 19:43:40 +00:00
Eelco Dolstra
291e8ab6bd
Merge pull request #14372 from NixOS/backport-14362-to-2.32-maintenance 
[Backport 2.32-maintenance] libexpr: Speed up BindingsBuilder::finishSizeIfNecessary
 2025-10-27 16:41:28 +01:00
Eelco Dolstra
19441dd317 Bump version 2025-10-27 16:36:00 +01:00
internal-nix-ci[bot]
71ec2cf62d
Merge pull request #14371 from NixOS/backport-14340-to-2.32-maintenance 
[Backport 2.32-maintenance] nix-2.32 needs boost-1.87+ for `try_emplace_and_cvisit`
 2025-10-27 15:01:12 +00:00