Merge branch 'master' into 2.29-maintenance

doc/manual/rl-next/c-api.md

@@ -1,19 +0,0 @@
----
-synopsis: "C API: functions for locking and loading a flake"
-issues: 10435
-prs: [12877, 13098]
----
-
-This release adds functions to the C API for handling the loading of flakes. Previously, this had to be worked around by using `builtins.getFlake`.
-C API consumers and language bindings now have access to basic locking functionality.
-
-It does not expose the full locking API, so that the implementation can evolve more freely.
-Locking is controlled with the functions, which cover the common use cases for consuming a flake:
-- `nix_flake_lock_flags_set_mode_check`
-- `nix_flake_lock_flags_set_mode_virtual`
-- `nix_flake_lock_flags_set_mode_write_as_needed`
-- `nix_flake_lock_flags_add_input_override`, which also enables `virtual`
-
-This change also introduces the new `nix-fetchers-c` library, whose single purpose for now is to manage the (`nix.conf`) settings for the built-in fetchers.
-
-More details can be found in the [C API documentation](@docroot@/c-api.md).

doc/manual/source/SUMMARY.md.in

@@ -136,6 +136,7 @@
   - [Contributing](development/contributing.md)
 - [Releases](release-notes/index.md)
 {{#include ./SUMMARY-rl-next.md}}
+  - [Release 2.29 (2025-05-14)](release-notes/rl-2.29.md)
   - [Release 2.28 (2025-04-02)](release-notes/rl-2.28.md)
   - [Release 2.27 (2025-03-03)](release-notes/rl-2.27.md)
   - [Release 2.26 (2025-01-22)](release-notes/rl-2.26.md)

doc/manual/source/release-notes/rl-2.29.md

@@ -0,0 +1,160 @@
+# Release 2.29.0 (2025-05-14)
+
+After the special backport-based release of Nix 2.28 (timed to coincide with Nixpkgs 25.05), the release process is back to normal with 2.29.
+As such, we have slightly more weeks of work from `master` (since 2.28 was branched from 2.27) than usual.
+This fact is counterbalanced by the fact that most of those changes are bug fixes rather than larger new features.
+
+- Prettified JSON output on the terminal [#12555](https://github.com/NixOS/nix/issues/12555) [#12652](https://github.com/NixOS/nix/pull/12652)
+
+  This makes the output easier to read.
+
+  Scripts are mostly unaffected because for those, stdout will be a file or a pipe, not a terminal, and for those, the old single-line behavior applies.
+
+  `--json --pretty` can be passed to enable it even if the output is not a terminal.
+  If your script creates a pseudoterminal for Nix's stdout, you can pass `--no-pretty` to disable the new behavior.
+
+- Repl: improve continuation prompt for incomplete expressions [#12846](https://github.com/NixOS/nix/pull/12846)
+
+  Improved REPL user experience by updating the continuation prompt from invisible blank spaces to a visible `" > "`, enhancing clarity when entering multi-line expressions.
+
+- REPL `:load-flake` and `:reload` now work together [#8753](https://github.com/NixOS/nix/issues/8753) [#13180](https://github.com/NixOS/nix/pull/13180)
+
+  Previously, `:reload` only reloaded the files specified with `:load` (or on the command line).
+  Now, it also works with the flakes specified with `:load-flake` (or on the command line).
+  This makes it correctly reload everything that was previously loaded, regardless of what sort of thing (plain file or flake) each item is.
+
+- Increase retry delays on HTTP 429 Too Many Requests [#13052](https://github.com/NixOS/nix/pull/13052)
+
+  When downloading Nix, the retry delay was previously set to 0.25 seconds. It has now been increased to 1 minute to better handle transient CI errors, particularly on GitHub.
+
+- S3: opt-in the STSProfileCredentialsProvider [#12646](https://github.com/NixOS/nix/pull/12646)
+
+  Added support for STS-based authentication for S3-based binary caches, i.e. enabling seamless integration with `aws sso login`.
+
+- Reduce connect timeout for http substituter [#12876](https://github.com/NixOS/nix/pull/12876)
+
+  Previously, the Nix setting `connect-timeout` had no limit. It is now set to `5s`, offering a more practical default for users self-hosting binary caches, which may occasionally become unavailable, such as during updates.
+
+
+- C API: functions for locking and loading a flake [#10435](https://github.com/NixOS/nix/issues/10435) [#12877](https://github.com/NixOS/nix/pull/12877) [#13098](https://github.com/NixOS/nix/pull/13098)
+
+  This release adds functions to the C API for handling the loading of flakes. Previously, this had to be worked around by using `builtins.getFlake`.
+  C API consumers and language bindings now have access to basic locking functionality.
+
+  It does not expose the full locking API, so that the implementation can evolve more freely.
+  Locking is controlled with the functions, which cover the common use cases for consuming a flake:
+  - `nix_flake_lock_flags_set_mode_check`
+  - `nix_flake_lock_flags_set_mode_virtual`
+  - `nix_flake_lock_flags_set_mode_write_as_needed`
+  - `nix_flake_lock_flags_add_input_override`, which also enables `virtual`
+
+  This change also introduces the new `nix-fetchers-c` library, whose single purpose for now is to manage the (`nix.conf`) settings for the built-in fetchers.
+
+  More details can be found in the [C API documentation](@docroot@/c-api.md).
+
+- No longer copy flakes that are in the nix store [#10435](https://github.com/NixOS/nix/issues/10435) [#12877](https://github.com/NixOS/nix/pull/12877) [#13098](https://github.com/NixOS/nix/pull/13098)
+
+  Previously, we would duplicate entries like `path:/nix/store/*` back into the Nix store.
+  This was prominently visible for pinned system flake registry entries in NixOS, e.g., when running `nix run nixpkgs#hello`.
+
+- Consistently preserve error messages from cached evaluation [#12762](https://github.com/NixOS/nix/issues/12762) [#12809](https://github.com/NixOS/nix/pull/12809)
+
+  In one code path, we are not returning the errors cached from prior evaluation, but instead throwing generic errors stemming from the lack of value (due to the error).
+  These generic error messages were far less informative.
+  Now we consistently return the original error message.
+
+- Faster blake3 hashing [#12676](https://github.com/NixOS/nix/pull/12676)
+
+  The implementation for blake3 hashing is now multi-threaded and used memory-mapped IO.
+  Benchmark results can be found the [pull request](https://github.com/NixOS/nix/pull/12676).
+
+- Fix progress bar for S3 binary caches and make file transfers interruptible [#12877](https://github.com/NixOS/nix/issues/12877) [#13098](https://github.com/NixOS/nix/issues/13098) [#12538](https://github.com/NixOS/nix/pull/12538)
+
+  The progress bar now correctly display upload/download progress for S3 up/downloads. S3 uploads are now interruptible.
+
+- Add host attribute of github/gitlab flakerefs to URL serialization [#12580](https://github.com/NixOS/nix/pull/12580)
+
+  Resolved an issue where `github:` or `gitlab:` URLs lost their `host` attribute when written to a lockfile, resulting in invalid URLs.
+
+- Multiple signatures support in store urls [#12976](https://github.com/NixOS/nix/pull/12976)
+
+  Added support for a `secretKeyFiles` URI parameter in Nix store URIs, allowing multiple signing key files to be specified as a comma-separated list.
+  This enables signing paths with multiple keys. This helps with [RFC #149](https://github.com/NixOS/rfcs/pull/149) to enable binary cache key rotation in the NixOS infra.
+
+  Example usage:
+
+  ```bash
+  nix copy --to "file:///tmp/store?secret-keys=/tmp/key1,/tmp/key2" \
+    "$(nix build --print-out-paths nixpkgs#hello)"
+  ```
+
+- nix flake show now skips over import-from-derivation [#4265](https://github.com/NixOS/nix/issues/4265) [#12583](https://github.com/NixOS/nix/pull/12583)
+
+  Previously, if a flake contained outputs relying on [import from derivation](@docroot@/language/import-from-derivation.md) during evaluation, `nix flake show` would fail to display the rest of the flake. The updated behavior skips such outputs, allowing the rest of the flake to be shown.
+
+- Add `nix formatter build` and `nix formatter run` commands [#13063](https://github.com/NixOS/nix/pull/13063)
+
+  `nix formatter run` is an alias for `nix fmt`. Nothing new there.
+
+  `nix formatter build` is sort of like `nix build`: it builds, links, and prints a path to the formatter program:
+
+  ```
+  $ nix formatter build
+  /nix/store/cb9w44vkhk2x4adfxwgdkkf5gjmm856j-treefmt/bin/treefmt
+  ```
+
+  Note that unlike `nix build`, this prints the full path to the program, not just the store path (in the example above that would be `/nix/store/cb9w44vkhk2x4adfxwgdkkf5gjmm856j-treefmt`).
+
+- Amend OSC 8 escape stripping for xterm-style separator [#13109](https://github.com/NixOS/nix/pull/13109)
+
+  Improve terminal escape code filtering to understand a second type of hyperlink escape codes.
+  This in particular prevents parts of GCC 14's diagnostics from being improperly filtered away.
+
+
+# Contributors
+
+
+This release was made possible by the following 40 contributors:
+
+- Farid Zakaria [**(@fzakaria)**](https://github.com/fzakaria)
+- The Tumultuous Unicorn Of Darkness [**(@TheTumultuousUnicornOfDarkness)**](https://github.com/TheTumultuousUnicornOfDarkness)
+- Robert Hensing [**(@roberth)**](https://github.com/roberth)
+- Félix [**(@picnoir)**](https://github.com/picnoir)
+- Valentin Gagarin [**(@fricklerhandwerk)**](https://github.com/fricklerhandwerk)
+- Eelco Dolstra [**(@edolstra)**](https://github.com/edolstra)
+- Vincent Breitmoser [**(@Valodim)**](https://github.com/Valodim)
+- Brian McKenna [**(@puffnfresh)**](https://github.com/puffnfresh)
+- ulucs [**(@ulucs)**](https://github.com/ulucs)
+- John Ericson [**(@Ericson2314)**](https://github.com/Ericson2314)
+- Andrey Butirsky [**(@bam80)**](https://github.com/bam80)
+- Dean De Leo [**(@whatsthecraic)**](https://github.com/whatsthecraic)
+- Las Safin [**(@L-as)**](https://github.com/L-as)
+- Sergei Zimmerman [**(@xokdvium)**](https://github.com/xokdvium)
+- Shahar "Dawn" Or [**(@mightyiam)**](https://github.com/mightyiam)
+- Ryan Hendrickson [**(@rhendric)**](https://github.com/rhendric)
+- Rodney Lorrimar [**(@rvl)**](https://github.com/rvl)
+- Erik Nygren [**(@Kirens)**](https://github.com/Kirens)
+- Cole Helbling [**(@cole-h)**](https://github.com/cole-h)
+- Martin Fischer [**(@not-my-profile)**](https://github.com/not-my-profile)
+- Graham Christensen [**(@grahamc)**](https://github.com/grahamc)
+- Vit Gottwald [**(@VitGottwald)**](https://github.com/VitGottwald)
+- silvanshade [**(@silvanshade)**](https://github.com/silvanshade)
+- Illia Bobyr [**(@ilya-bobyr)**](https://github.com/ilya-bobyr)
+- Jeremy Fleischman [**(@jfly)**](https://github.com/jfly)
+- Ruby Rose [**(@oldshensheep)**](https://github.com/oldshensheep)
+- Sergei Trofimovich [**(@trofi)**](https://github.com/trofi)
+- Tim [**(@Jaculabilis)**](https://github.com/Jaculabilis)
+- Anthony Wang [**(@anthowan)**](https://github.com/anthowan)
+- Jörg Thalheim [**(@Mic92)**](https://github.com/Mic92)
+- Sandro [**(@SuperSandro2000)**](https://github.com/SuperSandro2000)
+- tomberek [**(@tomberek)**](https://github.com/tomberek)
+- Dmitry Bogatov [**(@KAction)**](https://github.com/KAction)
+- Sizhe Zhao [**(@Prince213)**](https://github.com/Prince213)
+- jade [**(@lf-)**](https://github.com/lf-)
+- Pierre-Etienne Meunier [**(@P-E-Meunier)**](https://github.com/P-E-Meunier)
+- Alexander Romanov [**(@ajlekcahdp4)**](https://github.com/ajlekcahdp4)
+- Domagoj Mišković [**(@allrealmsoflife)**](https://github.com/allrealmsoflife)
+- Thomas Miedema [**(@thomie)**](https://github.com/thomie)
+- Yannik Sander [**(@ysndr)**](https://github.com/ysndr)
+- Philipp Otterbein
+- Dmitry Bogatov

maintainers/data/release-credits-email-to-handle.json

@@ -152,5 +152,19 @@
     "kaction@disroot.org": "KAction",
     "serenity@kaction.cc": null,
     "dev@erik.work": "Kirens",
-    "felix@alternativebit.fr": "picnoir"
+    "felix@alternativebit.fr": "picnoir",
+    "butirsky@gmail.com": "bam80",
+    "look@my.amazin.horse": "Valodim",
+    "jeremyfleischman@gmail.com": "jfly",
+    "vit.gottwald@gmail.com": "VitGottwald",
+    "a@unnamed.website": "anthowan",
+    "hello@whatsthecraic.net": "whatsthecraic",
+    "alex.rom23@mail.ru": "ajlekcahdp4",
+    "domagoj@tuta.com": "allrealmsoflife",
+    "uluc.sengil@gmail.com": "ulucs",
+    "prc.zhao@outlook.com": "Prince213",
+    "the-tumultuous-unicorn-of-darkness@gmx.com": "TheTumultuousUnicornOfDarkness",
+    "dev@rodney.id.au": "rvl",
+    "pe@pijul.org": "P-E-Meunier",
+    "yannik@floxdev.com": "ysndr"
 }

maintainers/data/release-credits-handle-to-name.json

@@ -133,5 +133,18 @@
     "oldshensheep": "Ruby Rose",
     "KAction": "Dmitry Bogatov",
     "thomie": "Thomas Miedema",
-    "Kirens": "Erik Nygren"
+    "Kirens": "Erik Nygren",
+    "Prince213": "Sizhe Zhao",
+    "anthowan": "Anthony Wang",
+    "jfly": "Jeremy Fleischman",
+    "VitGottwald": "Vit Gottwald",
+    "bam80": "Andrey Butirsky",
+    "ulucs": null,
+    "P-E-Meunier": "Pierre-Etienne Meunier",
+    "ysndr": "Yannik Sander",
+    "TheTumultuousUnicornOfDarkness": "The Tumultuous Unicorn Of Darkness",
+    "ajlekcahdp4": "Alexander Romanov",
+    "Valodim": "Vincent Breitmoser",
+    "rvl": "Rodney Lorrimar",
+    "whatsthecraic": "Dean De Leo"
 }

maintainers/flake-module.nix

@@ -360,7 +360,6 @@
               ''^src/libutil/linux/namespaces\.cc$''
               ''^src/libutil/logging\.cc$''
               ''^src/libutil/include/nix/util/logging\.hh$''
-              ''^src/libutil/include/nix/util/lru-cache\.hh$''
               ''^src/libutil/memory-source-accessor\.cc$''
               ''^src/libutil/include/nix/util/memory-source-accessor\.hh$''
               ''^src/libutil/include/nix/util/pool\.hh$''

src/libstore/store-api.cc

@@ -571,7 +571,7 @@ bool Store::isValidPath(const StorePath & storePath)
 {
     {
         auto state_(state.lock());
-        auto res = state_->pathInfoCache.get(std::string(storePath.to_string()));
+        auto res = state_->pathInfoCache.get(storePath.to_string());
         if (res && res->isKnownNow()) {
             stats.narInfoReadAverted++;
             return res->didExist();
@@ -583,7 +583,7 @@ bool Store::isValidPath(const StorePath & storePath)
         if (res.first != NarInfoDiskCache::oUnknown) {
             stats.narInfoReadAverted++;
             auto state_(state.lock());
-            state_->pathInfoCache.upsert(std::string(storePath.to_string()),
+            state_->pathInfoCache.upsert(storePath.to_string(),
                 res.first == NarInfoDiskCache::oInvalid ? PathInfoCacheValue{} : PathInfoCacheValue { .value = res.second });
             return res.first == NarInfoDiskCache::oValid;
         }
@@ -642,7 +642,7 @@ std::optional<std::shared_ptr<const ValidPathInfo>> Store::queryPathInfoFromClie
     auto hashPart = std::string(storePath.hashPart());
 
     {
-        auto res = state.lock()->pathInfoCache.get(std::string(storePath.to_string()));
+        auto res = state.lock()->pathInfoCache.get(storePath.to_string());
         if (res && res->isKnownNow()) {
             stats.narInfoReadAverted++;
             if (res->didExist())
@@ -658,7 +658,7 @@ std::optional<std::shared_ptr<const ValidPathInfo>> Store::queryPathInfoFromClie
             stats.narInfoReadAverted++;
             {
                 auto state_(state.lock());
-                state_->pathInfoCache.upsert(std::string(storePath.to_string()),
+                state_->pathInfoCache.upsert(storePath.to_string(),
                     res.first == NarInfoDiskCache::oInvalid ? PathInfoCacheValue{} : PathInfoCacheValue{ .value = res.second });
                 if (res.first == NarInfoDiskCache::oInvalid ||
                     !goodStorePath(storePath, res.second->path))
@@ -702,7 +702,7 @@ void Store::queryPathInfo(const StorePath & storePath,
 
                 {
                     auto state_(state.lock());
-                    state_->pathInfoCache.upsert(std::string(storePath.to_string()), PathInfoCacheValue { .value = info });
+                    state_->pathInfoCache.upsert(storePath.to_string(), PathInfoCacheValue { .value = info });
                 }
 
                 if (!info || !goodStorePath(storePath, info->path)) {

src/libutil/include/nix/util/lru-cache.hh

@@ -11,7 +11,7 @@ namespace nix {
 /**
  * A simple least-recently used cache. Not thread-safe.
  */
-template<typename Key, typename Value>
+template<typename Key, typename Value, typename Compare = std::less<>>
 class LRUCache
 {
 private:
@@ -22,24 +22,32 @@ private:
     // and LRU.
     struct LRUIterator;
 
-    using Data = std::map<Key, std::pair<LRUIterator, Value>>;
+    using Data = std::map<Key, std::pair<LRUIterator, Value>, Compare>;
     using LRU = std::list<typename Data::iterator>;
 
-    struct LRUIterator { typename LRU::iterator it; };
+    struct LRUIterator
+    {
+        typename LRU::iterator it;
+    };
 
     Data data;
     LRU lru;
 
 public:
 
-    LRUCache(size_t capacity) : capacity(capacity) { }
+    LRUCache(size_t capacity)
+        : capacity(capacity)
+    {
+    }
 
     /**
      * Insert or upsert an item in the cache.
      */
-    void upsert(const Key & key, const Value & value)
+    template<typename K>
+    void upsert(const K & key, const Value & value)
     {
-        if (capacity == 0) return;
+        if (capacity == 0)
+            return;
 
         erase(key);
 
@@ -61,10 +69,12 @@ public:
         i->second.first.it = j;
     }
 
-    bool erase(const Key & key)
+    template<typename K>
+    bool erase(const K & key)
     {
         auto i = data.find(key);
-        if (i == data.end()) return false;
+        if (i == data.end())
+            return false;
         lru.erase(i->second.first.it);
         data.erase(i);
         return true;
@@ -74,27 +84,33 @@ public:
      * Look up an item in the cache. If it exists, it becomes the most
      * recently used item.
      * */
-    std::optional<Value> get(const Key & key)
+    template<typename K>
+    std::optional<Value> get(const K & key)
     {
         auto i = data.find(key);
-        if (i == data.end()) return {};
+        if (i == data.end())
+            return {};
 
         /**
          * Move this item to the back of the LRU list.
+         *
+         * Think of std::list iterators as stable pointers to the list node,
+         * which never get invalidated. Thus, we can reuse the same lru list
+         * element and just splice it to the back of the list without the need
+         * to update its value in the key -> list iterator map.
          */
-        lru.erase(i->second.first.it);
-        auto j = lru.insert(lru.end(), i);
-        i->second.first.it = j;
+        auto & [it, value] = i->second;
+        lru.splice(/*pos=*/lru.end(), /*other=*/lru, it.it);
 
-        return i->second.second;
+        return value;
     }
 
-    size_t size() const
+    size_t size() const noexcept
     {
         return data.size();
     }
 
-    void clear()
+    void clear() noexcept
     {
         data.clear();
         lru.clear();