Bump version

Merge pull request #11267 from NixOS/backport-11244-to-2.24-maintenance
[Backport 2.24-maintenance] allow to c api with older c versions
2024-08-08 15:02:48 +02:00 · 2024-08-08 01:43:24 +02:00 · 2024-08-07 23:12:17 +00:00 · 2024-08-06 11:20:31 +02:00 · 2024-08-06 08:33:46 +00:00 · 2024-08-01 17:56:18 +02:00
6 changed files with 19 additions and 9 deletions
--- a/.version
+++ b/.version
@@ -1 +1 @@
-2.24.0
+2.24.2
--- a/flake.nix
+++ b/flake.nix
@@ -24,7 +24,7 @@
    let
      inherit (nixpkgs) lib;

-      officialRelease = false;
+      officialRelease = true;

      version = lib.fileContents ./.version + versionSuffix;
      versionSuffix =
--- a/src/libexpr-c/nix_api_expr.h
+++ b/src/libexpr-c/nix_api_expr.h
@@ -14,6 +14,16 @@
 #include "nix_api_util.h"
 #include <stddef.h>

+#ifndef __has_c_attribute
+#  define __has_c_attribute(x) 0
+#endif
+
+#if __has_c_attribute(deprecated)
+#  define NIX_DEPRECATED(msg) [[deprecated(msg)]]
+#else
+#  define NIX_DEPRECATED(msg)
+#endif
+
 #ifdef __cplusplus
 extern "C" {
 #endif
@@ -45,7 +55,7 @@ typedef struct EvalState EvalState; // nix::EvalState
 * @see nix_value_incref, nix_value_decref
 */
 typedef struct nix_value nix_value;
-[[deprecated("use nix_value instead")]] typedef nix_value Value;
+NIX_DEPRECATED("use nix_value instead") typedef nix_value Value;

 // Function prototypes
 /**
--- a/src/libstore/build/substitution-goal.cc
+++ b/src/libstore/build/substitution-goal.cc
@@ -145,8 +145,10 @@ Goal::Co PathSubstitutionGoal::init()
    /* None left.  Terminate this goal and let someone else deal
       with it. */

-    worker.failedSubstitutions++;
-    worker.updateProgress();
+    if (substituterFailed) {
+        worker.failedSubstitutions++;
+        worker.updateProgress();
+    }

    /* Hack: don't indicate failure if there were no substituters.
       In that case the calling derivation should just do a
@@ -158,7 +160,7 @@ Goal::Co PathSubstitutionGoal::init()
 }


-Goal::Co PathSubstitutionGoal::tryToRun(StorePath subPath, nix::ref<Store> sub, std::shared_ptr<const ValidPathInfo> info, bool& substituterFailed)
+Goal::Co PathSubstitutionGoal::tryToRun(StorePath subPath, nix::ref<Store> sub, std::shared_ptr<const ValidPathInfo> info, bool & substituterFailed)
 {
    trace("all references realised");

--- a/src/libstore/build/substitution-goal.hh
+++ b/src/libstore/build/substitution-goal.hh
@@ -66,7 +66,7 @@ public:
     */
    Co init() override;
    Co gotInfo();
-    Co tryToRun(StorePath subPath, nix::ref<Store> sub, std::shared_ptr<const ValidPathInfo> info, bool& substituterFailed);
+    Co tryToRun(StorePath subPath, nix::ref<Store> sub, std::shared_ptr<const ValidPathInfo> info, bool & substituterFailed);
    Co finished();

    /**
--- a/src/libstore/s3-binary-cache-store.cc
+++ b/src/libstore/s3-binary-cache-store.cc
@@ -220,8 +220,6 @@ std::string S3BinaryCacheStoreConfig::doc()

 struct S3BinaryCacheStoreImpl : virtual S3BinaryCacheStoreConfig, public virtual S3BinaryCacheStore
 {
-    std::string bucketName;
-
    Stats stats;

    S3Helper s3Helper;
Author	SHA1	Message	Date
Eelco Dolstra	4036c3aafb	Bump version	2024-08-08 15:02:48 +02:00
Robert Hensing	935bf1157d	Merge pull request #11267 from NixOS/backport-11244-to-2.24-maintenance [Backport 2.24-maintenance] allow to c api with older c versions	2024-08-08 01:43:24 +02:00
Jörg Thalheim	b1941c9f8a	allow to c api with older c versions In the FFI world we have many tools that are not gcc/clang and therefore not always support the latest C standard. This fixes support with cffi i.e. used in https://github.com/tweag/python-nix (cherry picked from commit `739418504c`)	2024-08-07 23:12:17 +00:00
Eelco Dolstra	40832b0a95	Merge pull request #11262 from NixOS/backport-11257-to-2.24-maintenance [Backport 2.24-maintenance] PathSubstitutionGoal: Fix spurious "failed" count in the progress bar	2024-08-06 11:20:31 +02:00
Eelco Dolstra	fa78d7f72f	PathSubstitutionGoal: Fix spurious "failed" count in the progress bar It is not an error if queryPathInfo() indicates that a path does not exist in the substituter. Fixes #11198. This was broken in `846869da0e`. (cherry picked from commit `0a00bd07b2`)	2024-08-06 08:33:46 +00:00
Eelco Dolstra	2382a52c84	Merge pull request #11239 from NixOS/backport-11237-to-2.24-maintenance [Backport 2.24-maintenance] Fix the S3 store	2024-08-01 17:56:18 +02:00
Eelco Dolstra	fe6a7c805c	Fix the S3 store It was failing with: error: AWS error fetching 'nix-cache-info': The specified bucket does not exist because `S3BinaryCacheStoreImpl` had a `bucketName` field that shadowed the inherited `bucketName from `S3BinaryCacheStoreConfig`. (cherry picked from commit `9b5b7b7963`)	2024-08-01 15:46:45 +00:00
Eelco Dolstra	0a167ffd1f	Bump version	2024-08-01 10:41:11 +02:00
Eelco Dolstra	206e32e2d7	Mark release	2024-07-31 23:37:43 +02:00
@@ -1 +1 @@
 .24.0
 .24.2