packaging: Pass version directly

2024-11-22 06:42:28 +00:00 · 2024-07-06 17:36:31 +02:00 · 2024-07-06 17:36:31 +02:00 · 0729f0a113
commit 0729f0a113
parent efd5f50f5e
22 changed files with 25 additions and 60 deletions
--- a/packaging/dependencies.nix
+++ b/packaging/dependencies.nix
@ -40,6 +40,7 @@ let
 in
 scope: {
  inherit stdenv versionSuffix;
+  version = lib.fileContents ../.version + versionSuffix;

  libseccomp = pkgs.libseccomp.overrideAttrs (_: rec {
    version = "2.5.5";
--- a/src/external-api-docs/package.nix
+++ b/src/external-api-docs/package.nix
@ -7,7 +7,7 @@

 # Configuration Options

-, versionSuffix ? ""
+, version
 }:

 let
@ -16,7 +16,7 @@ in

 mkMesonDerivation (finalAttrs: {
  pname = "nix-external-api-docs";
-  version = lib.fileContents ./.version + versionSuffix;
+  inherit version;

  workDir = ./.;
  fileset =
--- a/src/internal-api-docs/package.nix
+++ b/src/internal-api-docs/package.nix
@ -7,7 +7,7 @@

 # Configuration Options

-, versionSuffix ? ""
+, version
 }:

 let
@ -16,7 +16,7 @@ in

 mkMesonDerivation (finalAttrs: {
  pname = "nix-internal-api-docs";
-  version = lib.fileContents ./.version + versionSuffix;
+  inherit version;

  workDir = ./.;
  fileset = let
--- a/src/libcmd/package.nix
+++ b/src/libcmd/package.nix
@ -20,7 +20,7 @@

 # Configuration Options

-, versionSuffix ? ""
+, version

 # Whether to enable Markdown rendering in the Nix binary.
 , enableMarkdown ? !stdenv.hostPlatform.isWindows
@ -36,8 +36,6 @@

 let
  inherit (lib) fileset;
-
-  version = lib.fileContents ./.version + versionSuffix;
 in

 mkMesonDerivation (finalAttrs: {
--- a/src/libexpr-c/package.nix
+++ b/src/libexpr-c/package.nix
@ -11,13 +11,11 @@

 # Configuration Options

-, versionSuffix ? ""
+, version
 }:

 let
  inherit (lib) fileset;
-
-  version = lib.fileContents ./.version + versionSuffix;
 in

 mkMesonDerivation (finalAttrs: {
--- a/src/libexpr/package.nix
+++ b/src/libexpr/package.nix
@ -20,7 +20,7 @@

 # Configuration Options

-, versionSuffix ? ""
+, version

 # Whether to use garbage collection for the Nix language evaluator.
 #
@ -36,8 +36,6 @@

 let
  inherit (lib) fileset;
-
-  version = lib.fileContents ./.version + versionSuffix;
 in

 mkMesonDerivation (finalAttrs: {
--- a/src/libfetchers/package.nix
+++ b/src/libfetchers/package.nix
@ -15,13 +15,11 @@

 # Configuration Options

-, versionSuffix ? ""
+, version
 }:

 let
  inherit (lib) fileset;
-
-  version = lib.fileContents ./.version + versionSuffix;
 in

 mkMesonDerivation (finalAttrs: {
--- a/src/libflake/package.nix
+++ b/src/libflake/package.nix
@ -17,13 +17,11 @@

 # Configuration Options

-, versionSuffix ? ""
+, version
 }:

 let
  inherit (lib) fileset;
-
-  version = lib.fileContents ./.version + versionSuffix;
 in

 mkMesonDerivation (finalAttrs: {
--- a/src/libmain/package.nix
+++ b/src/libmain/package.nix
@ -14,13 +14,11 @@

 # Configuration Options

-, versionSuffix ? ""
+, version
 }:

 let
  inherit (lib) fileset;
-
-  version = lib.fileContents ./.version + versionSuffix;
 in

 mkMesonDerivation (finalAttrs: {
--- a/src/libstore-c/package.nix
+++ b/src/libstore-c/package.nix
@ -12,13 +12,11 @@

 # Configuration Options

-, versionSuffix ? ""
+, version
 }:

 let
  inherit (lib) fileset;
-
-  version = lib.fileContents ./.version + versionSuffix;
 in

 mkMesonDerivation (finalAttrs: {
--- a/src/libstore/package.nix
+++ b/src/libstore/package.nix
@ -20,15 +20,13 @@

 # Configuration Options

-, versionSuffix ? ""
+, version

 , embeddedSandboxShell ? stdenv.hostPlatform.isStatic
 }:

 let
  inherit (lib) fileset;
-
-  version = lib.fileContents ./.version + versionSuffix;
 in

 mkMesonDerivation (finalAttrs: {
--- a/src/libutil-c/package.nix
+++ b/src/libutil-c/package.nix
@ -11,13 +11,11 @@

 # Configuration Options

-, versionSuffix ? ""
+, version
 }:

 let
  inherit (lib) fileset;
-
-  version = lib.fileContents ./.version + versionSuffix;
 in

 mkMesonDerivation (finalAttrs: {
--- a/src/libutil/package.nix
+++ b/src/libutil/package.nix
@ -17,13 +17,11 @@

 # Configuration Options

-, versionSuffix ? ""
+, version
 }:

 let
  inherit (lib) fileset;
-
-  version = lib.fileContents ./.version + versionSuffix;
 in

 mkMesonDerivation (finalAttrs: {
--- a/src/perl/package.nix
+++ b/src/perl/package.nix
@ -8,7 +8,7 @@
 , pkg-config
 , nix-store
 , darwin
-, versionSuffix ? ""
+, version
 , curl
 , bzip2
 , libsodium
@ -20,7 +20,7 @@ in

 perl.pkgs.toPerlModule (mkMesonDerivation (finalAttrs: {
  pname = "nix-perl";
-  version = lib.fileContents ./.version + versionSuffix;
+  inherit version;

  workDir = ./.;
  fileset = fileset.unions ([
--- a/tests/unit/libexpr-support/package.nix
+++ b/tests/unit/libexpr-support/package.nix
@ -14,13 +14,11 @@

 # Configuration Options

-, versionSuffix ? ""
+, version
 }:

 let
  inherit (lib) fileset;
-
-  version = lib.fileContents ./.version + versionSuffix;
 in

 mkMesonDerivation (finalAttrs: {
--- a/tests/unit/libexpr/package.nix
+++ b/tests/unit/libexpr/package.nix
@ -17,13 +17,11 @@

 # Configuration Options

-, versionSuffix ? ""
+, version
 }:

 let
  inherit (lib) fileset;
-
-  version = lib.fileContents ./.version + versionSuffix;
 in

 mkMesonDerivation (finalAttrs: {
--- a/tests/unit/libfetchers/package.nix
+++ b/tests/unit/libfetchers/package.nix
@ -16,13 +16,11 @@

 # Configuration Options

-, versionSuffix ? ""
+, version
 }:

 let
  inherit (lib) fileset;
-
-  version = lib.fileContents ./.version + versionSuffix;
 in

 mkMesonDerivation (finalAttrs: {
--- a/tests/unit/libflake/package.nix
+++ b/tests/unit/libflake/package.nix
@ -16,13 +16,11 @@

 # Configuration Options

-, versionSuffix ? ""
+, version
 }:

 let
  inherit (lib) fileset;
-
-  version = lib.fileContents ./.version + versionSuffix;
 in

 mkMesonDerivation (finalAttrs: {
--- a/tests/unit/libstore-support/package.nix
+++ b/tests/unit/libstore-support/package.nix
@ -14,13 +14,11 @@

 # Configuration Options

-, versionSuffix ? ""
+, version
 }:

 let
  inherit (lib) fileset;
-
-  version = lib.fileContents ./.version + versionSuffix;
 in

 mkMesonDerivation (finalAttrs: {
--- a/tests/unit/libstore/package.nix
+++ b/tests/unit/libstore/package.nix
@ -18,13 +18,11 @@

 # Configuration Options

-, versionSuffix ? ""
+, version
 }:

 let
  inherit (lib) fileset;
-
-  version = lib.fileContents ./.version + versionSuffix;
 in

 mkMesonDerivation (finalAttrs: {
--- a/tests/unit/libutil-support/package.nix
+++ b/tests/unit/libutil-support/package.nix
@ -13,13 +13,11 @@

 # Configuration Options

-, versionSuffix ? ""
+, version
 }:

 let
  inherit (lib) fileset;
-
-  version = lib.fileContents ./.version + versionSuffix;
 in

 mkMesonDerivation (finalAttrs: {
--- a/tests/unit/libutil/package.nix
+++ b/tests/unit/libutil/package.nix
@ -17,13 +17,11 @@

 # Configuration Options

-, versionSuffix ? ""
+, version
 }:

 let
  inherit (lib) fileset;
-
-  version = lib.fileContents ./.version + versionSuffix;
 in

 mkMesonDerivation (finalAttrs: {