Merge pull request #11055 from NixOS/packaging-for-nixpkgs

Indirections for packaging meson-based granular build for Nixpkgs
2024-09-19 10:50:24 -04:00 · 2024-07-07 21:33:01 +02:00 · 2024-07-07 21:33:01 +02:00 · a9592077fb
parent fd4b17ab2c bea54d116e
commit a9592077fb
22 changed files with 43 additions and 65 deletions
--- a/packaging/dependencies.nix
+++ b/packaging/dependencies.nix
@ -14,9 +14,16 @@
 let
  inherit (pkgs) lib;

+  root = ../.;
+
+  # Nixpkgs implements this by returning a subpath into the fetched Nix sources.
+  resolvePath = p: p;
+
+  # Indirection for Nixpkgs to override when package.nix files are vendored
+  filesetToSource = lib.fileset.toSource;
+
  localSourceLayer = finalAttrs: prevAttrs:
    let
-      root = ../.;
      workDirPath =
        # Ideally we'd pick finalAttrs.workDir, but for now `mkDerivation` has
        # the requirement that everything except passthru and meta must be
@ -40,6 +47,7 @@ let
 in
 scope: {
  inherit stdenv versionSuffix;
+  version = lib.fileContents ../.version + versionSuffix;

  libseccomp = pkgs.libseccomp.overrideAttrs (_: rec {
    version = "2.5.5";
@ -103,5 +111,7 @@ scope: {
    meta.platforms = lib.platforms.all;
  });

+  inherit resolvePath filesetToSource;
+
  mkMesonDerivation = f: stdenv.mkDerivation (lib.extends localSourceLayer f);
 }
--- 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,12 @@

 # Configuration Options

-, versionSuffix ? ""
+, version
+, resolvePath
 }:

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

 mkMesonDerivation (finalAttrs: {
@ -86,7 +85,7 @@ mkMesonDerivation (finalAttrs: {
      run = runCommand "${finalAttrs.pname}-run" {
      } ''
        PATH="${lib.makeBinPath [ finalAttrs.finalPackage ]}:$PATH"
-        export _NIX_TEST_UNIT_DATA=${./data}
+        export _NIX_TEST_UNIT_DATA=${resolvePath ./data}
        nix-expr-tests
        touch $out
      '';
--- a/tests/unit/libfetchers/package.nix
+++ b/tests/unit/libfetchers/package.nix
@ -16,13 +16,12 @@

 # Configuration Options

-, versionSuffix ? ""
+, version
+, resolvePath
 }:

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

 mkMesonDerivation (finalAttrs: {
@ -84,7 +83,7 @@ mkMesonDerivation (finalAttrs: {
      run = runCommand "${finalAttrs.pname}-run" {
      } ''
        PATH="${lib.makeBinPath [ finalAttrs.finalPackage ]}:$PATH"
-        export _NIX_TEST_UNIT_DATA=${./data}
+        export _NIX_TEST_UNIT_DATA=${resolvePath ./data}
        nix-fetchers-tests
        touch $out
      '';
--- a/tests/unit/libflake/package.nix
+++ b/tests/unit/libflake/package.nix
@ -16,13 +16,12 @@

 # Configuration Options

-, versionSuffix ? ""
+, version
+, resolvePath
 }:

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

 mkMesonDerivation (finalAttrs: {
@ -84,7 +83,7 @@ mkMesonDerivation (finalAttrs: {
      run = runCommand "${finalAttrs.pname}-run" {
      } ''
        PATH="${lib.makeBinPath [ finalAttrs.finalPackage ]}:$PATH"
-        export _NIX_TEST_UNIT_DATA=${./data}
+        export _NIX_TEST_UNIT_DATA=${resolvePath ./data}
        nix-flake-tests
        touch $out
      '';
--- 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,12 @@

 # Configuration Options

-, versionSuffix ? ""
+, version
+, filesetToSource
 }:

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

 mkMesonDerivation (finalAttrs: {
@ -88,7 +87,7 @@ mkMesonDerivation (finalAttrs: {
      run = let
        # Some data is shared with the functional tests: they create it,
        # we consume it.
-        data = lib.fileset.toSource {
+        data = filesetToSource {
          root = ../..;
          fileset = lib.fileset.unions [
            ./data
--- 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: {