wroclaw-git-backups/nix
1
0
Fork 0
mirror of https://github.com/NixOS/nix synced 2025-06-25 02:21:16 +02:00
Code Activity
19691 commits 244 branches 205 tags 158 MiB
Commit graph

19691 commits

This branch
This branch
All branches
Author SHA1 Message Date
Jörg Thalheim
4d4a91ab8d
Merge pull request #13101 from NixOS/mergify/bp/2.28-maintenance/pr-13100 
allocate SimpleLogger before forking (backport #13100)
 2025-04-28 09:48:32 +02:00
Philipp Otterbein
9ba32a2981 allocate SimpleLogger before forking 
(cherry picked from commit 4e95f662db)
 2025-04-28 07:02:02 +00:00
mergify[bot]
323e840d17
Merge pull request #13097 from NixOS/mergify/bp/2.28-maintenance/pr-13094 
libutil: Add missing format arguments to UsageError ctor (backport #13094)
 2025-04-25 14:04:08 +00:00
Sergei Zimmerman
1c9e94789e libutil: Add missing format arguments to UsageError ctor 
Once again found by an automated migration to `std::format`.
I've tested that boost::format works fine with `std::string_view`
arguments.

(cherry picked from commit 9fff868e39)
 2025-04-25 13:22:58 +00:00
Eelco Dolstra
e20b0d7b29
Merge pull request #13090 from NixOS/mergify/bp/2.28-maintenance/pr-13082 
Actually ignore system/user registries during locking (2nd attempt) (backport #13082)
 2025-04-25 14:13:27 +02:00
Jörg Thalheim
709f05989d tests/flakes: add regression test for resolving user flakes 
(cherry picked from commit 6405d6822d)
 2025-04-25 13:32:13 +02:00
Eelco Dolstra
dfbb52e6bd lockFlake(): Allow registry lookups for the top-level flake 
Fixes #13050.

(cherry picked from commit 68de26d38a)
 2025-04-25 13:31:24 +02:00
mergify[bot]
5a7cdc4373
Merge pull request #13092 from NixOS/mergify/bp/2.28-maintenance/pr-13086 
libutil: Fix invalid boost format string in infinite symlink recursion error (backport #13086)
 2025-04-25 10:48:47 +00:00
mergify[bot]
357a0f639c
Merge pull request #13089 from NixOS/mergify/bp/2.28-maintenance/pr-13087 
libutil: Use correct argument to Error format ctor (backport #13087)
 2025-04-25 10:01:27 +00:00
Sergei Zimmerman
10350537b1 libutil: Fix invalid boost format string in infinite symlink recursion error 
Found while working on an automated migration to `std::format`.

(cherry picked from commit bfb357c40b)
 2025-04-25 09:21:22 +00:00
Sergei Zimmerman
b179259d6f libutil: Use correct argument to Error format ctor 
It seems that the intention was to format a number in base 8 (as
suggested by the %o format specifier), but `perms` is a `std::string`
and not a number. Looks like `rawMode` is the correct thing to use here.

(cherry picked from commit 1b5c8aac12)
 2025-04-25 09:19:52 +00:00
mergify[bot]
3019007eb5
Merge pull request #13083 from NixOS/mergify/bp/2.28-maintenance/pr-13079 
nix-cli: restore binary-dist artifact to Hydra static builds (backport #13079)
 2025-04-24 18:03:30 +00:00
Cole Helbling
6390b8b7cf nix-cli: restore binary-dist artifact to Hydra static builds 
(cherry picked from commit e1b68244ad)
 2025-04-24 17:30:39 +00:00
Jörg Thalheim
8686ba906f
Merge pull request #13077 from NixOS/mergify/bp/2.28-maintenance/pr-13076 
Revert "Actually ignore system/user registries during locking" (backport #13076)
 2025-04-24 14:07:10 +02:00
Jörg Thalheim
04fcc879e6 Revert "Actually ignore system/user registries during locking" 
This reverts commit 77d4316353.

(cherry picked from commit 3b5f0d9fb3)
 2025-04-24 11:34:57 +00:00
mergify[bot]
4da3fada6e
Merge pull request #13072 from NixOS/mergify/bp/2.28-maintenance/pr-13067 
Move libflake/flake/* to libflake (backport #13067)
 2025-04-23 19:39:27 +00:00
Eelco Dolstra
5a2ee1b952 Move libflake/flake/* to libflake 
(cherry picked from commit bc67e47298)
 2025-04-23 19:06:03 +00:00
mergify[bot]
06cc94432e
Merge pull request #13071 from NixOS/mergify/bp/2.28-maintenance/pr-13070 
Don't build MonitorFdHup test on Windows (backport #13070)
 2025-04-23 18:50:06 +00:00
Eelco Dolstra
d3c79e2b13 Don't build MonitorFdHup on Windows 
https://hydra.nixos.org/build/295398462
(cherry picked from commit a9b6213221)
 2025-04-23 18:23:51 +00:00
mergify[bot]
70921714cb
Merge pull request #13064 from NixOS/mergify/bp/2.28-maintenance/pr-13010 
~flake.lock:~ Update Nixpkgs (partial backport #13010)
 2025-04-23 15:09:17 +00:00
John Ericson
f666ec3837 Explain the use of "2" in the overlay 
Co-authored-by: Robert Hensing <roberth@users.noreply.github.com>
(cherry picked from commit ef36806898)
 2025-04-23 16:42:02 +02:00
Robert Hensing
ba22a85a35 Fix pkgs.nixVersions and installTests 
... by moving our stuff out of the way from upstream's
`nixComponents` and `nixDependencies` attrsets.

(I prefer not to use overlays, but let's make it work this way
first)

(cherry picked from commit b257ea94e3)
 2025-04-23 16:42:02 +02:00
Eelco Dolstra
e555207048 Bump version 2025-04-17 14:00:34 +02:00
mergify[bot]
8a7b8dce5f
Merge pull request #13033 from NixOS/mergify/bp/2.28-maintenance/pr-13032 
Improve derivation "advanced attrs" test, fix almost-bug (backport #13032)
 2025-04-15 19:06:26 +00:00
John Ericson
29ae14114e Remove stray assignment side affect in lambda 
This was almost a bug! It wasn't simply because another assignment would
clobber it later.

(cherry picked from commit 32409dd7d7)
 2025-04-15 14:25:16 -04:00
John Ericson
30d900b313 Derivation "advanced attrs" test: Ensure fields are set to distinct values 
We had fields set to the same values before in our test data. This is
not a problem per-se, but does mean we wouldn't catch certain mixups.
Now, the fields are set to distinct values (where possible), which makes
the test more robust.

(cherry picked from commit a0b2b75f59)
 2025-04-15 14:25:13 -04:00
John Ericson
5f0ddd7467
Merge pull request #13028 from NixOS/mergify/bp/2.28-maintenance/pr-13022 
Test derivation options with content-addressing too (backport #13022)
 2025-04-15 12:11:55 -04:00
John Ericson
f19184191e Test derivation options with content-addressing too 
Now, both the unit and functional tests relating to derivation options
are tested both ways -- with input addressing and content-addressing
derivations.

(cherry picked from commit 307dbe9914)
 2025-04-15 11:25:07 -04:00
John Ericson
37bcd29e5f Use the same variable for content addressing in functional tests 
`CONTENT_ADDRESSED` -> `NIX_TESTS_CA_BY_DEFAULT`

(cherry picked from commit 7acc229c8f)
 2025-04-15 11:19:45 -04:00
Eelco Dolstra
5ecbf6b9dc
Merge pull request #13029 from NixOS/mergify/bp/2.28-maintenance/pr-13026 
Fix issue #13018, `sourceInfo` strict in `outputs` (backport #13026)
 2025-04-15 14:24:59 +02:00
Jörg Thalheim
f233a99cc8
Merge pull request #13027 from NixOS/mergify/bp/2.28-maintenance/pr-12603 
libstore: curl retry: reset content-encoding and don't use string after move (backport #12603)
 2025-04-15 14:00:13 +02:00
Robert Hensing
818fc68db6 fix: Evaluate flake parent source without evaluating its outputs 
This requires that we refer to the `sourceInfo` instead of the
`result`. However, `sourceInfo` does not create a chain of basedir
resolution, so we add that back with `flakeDir`.

(cherry picked from commit 2109a5a206)
 2025-04-15 11:52:46 +00:00
Robert Hensing
671364748c call-flake.nix: allNodes.${key} -> allNodes.${key}.result 
(cherry picked from commit 9de9410f29)
 2025-04-15 11:52:45 +00:00
Robert Hensing
9a969e29cf call-flake.nix: refactor: Bring mapAttrs into scope 
(cherry picked from commit 674375b021)
 2025-04-15 11:52:45 +00:00
Philipp Otterbein
a603401cdd libstore: curl retry: reset content-encoding and don't use string after move 
(cherry picked from commit b129fc8237)
 2025-04-15 11:22:25 +00:00
Eelco Dolstra
3e895be4e4
Merge pull request #13021 from NixOS/mergify/bp/2.28-maintenance/pr-13019 
Mention BLAKE3 in the Nix 2.27 release notes (backport #13019)
 2025-04-14 16:13:07 +02:00
Eelco Dolstra
b1a1f4bd2f Mention BLAKE3 in the Nix 2.27 release notes 
(cherry picked from commit c0ed07755a)
 2025-04-14 13:47:57 +00:00
Jörg Thalheim
f18180a045
Merge pull request #13011 from NixOS/mergify/bp/2.28-maintenance/pr-13009 
Fix typo in string context docs (backport #13009)
 2025-04-14 12:41:39 +02:00
Anthony Wang
9156550493 Fix typo in string context docs 
(cherry picked from commit f64b8957c7)
 2025-04-12 23:58:45 +00:00
mergify[bot]
011f6e06a2
Merge pull request #13006 from NixOS/mergify/bp/2.28-maintenance/pr-12538 
libstore S3: fix progress bar and make file transfers interruptible (backport #12538)
 2025-04-11 22:54:15 +00:00
Philipp Otterbein
61bb405839 add isInterrupted() call and replace some checkInterrupt() occurrences 
(cherry picked from commit 49f757c24a)
 2025-04-11 22:15:12 +00:00
Philipp Otterbein
c53bd8905b libstore: same progress bar behavior for PUT and POST requests 
- no differentiation between uploads and downloads in CLI

(cherry picked from commit db297d3dda)
 2025-04-11 22:15:12 +00:00
Philipp Otterbein
beab9eb978 libstore S3: fix progress bar and make file transfers interruptible 
(cherry picked from commit 9da01e69f9)
 2025-04-11 22:15:11 +00:00
mergify[bot]
4d990f1459
Merge pull request #12989 from NixOS/mergify/bp/2.28-maintenance/pr-12986 
Fix another machine config parsing bug (backport #12986)
 2025-04-09 20:51:33 +00:00
John Ericson
f9c262c3d5 Fix another machine config parsing bug 
We were ignorning the result of `trim`, and after my last change we were
also trimmming too early.

(cherry picked from commit b74b0f4e1c)
 2025-04-09 20:13:30 +00:00
mergify[bot]
bb8af4ceb7
Merge pull request #12985 from NixOS/mergify/bp/2.28-maintenance/pr-12984 
Fix `;` and `#` bug in machine file parsing (backport #12984)
 2025-04-09 19:04:07 +00:00
John Ericson
2892b758b3 Fix ; and # bug in machine file parsing 
Comments go to the end of the line, not merely the next ; *or* \n. Fix
by splitting on `;` *within* lines, and test.

(cherry picked from commit f8b13cce19)
 2025-04-09 18:27:16 +00:00
mergify[bot]
e191b93a0e
Merge pull request #12983 from NixOS/mergify/bp/2.28-maintenance/pr-12699 
tests/functional/flakes: Add test case for subflake locking (backport #12699)
 2025-04-09 17:54:32 +00:00
Rodney Lorrimar
080950b0fe 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.

(cherry picked from commit 1bc82d1c86)
 2025-04-09 17:20:31 +00:00
mergify[bot]
6d98cef93f
Merge pull request #12982 from NixOS/mergify/bp/2.28-maintenance/pr-12979 
Actually ignore system/user registries during locking (backport #12979)
 2025-04-09 17:07:38 +00:00