mirror of
https://github.com/privatevoid-net/nix-super.git
synced 2024-11-10 08:16:15 +02:00
Merge pull request #11055 from NixOS/packaging-for-nixpkgs
Indirections for packaging meson-based granular build for Nixpkgs
This commit is contained in:
commit
a9592077fb
22 changed files with 43 additions and 65 deletions
|
@ -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);
|
||||
}
|
||||
|
|
|
@ -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 =
|
||||
|
|
|
@ -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
|
||||
|
|
|
@ -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: {
|
||||
|
|
|
@ -11,13 +11,11 @@
|
|||
|
||||
# Configuration Options
|
||||
|
||||
, versionSuffix ? ""
|
||||
, version
|
||||
}:
|
||||
|
||||
let
|
||||
inherit (lib) fileset;
|
||||
|
||||
version = lib.fileContents ./.version + versionSuffix;
|
||||
in
|
||||
|
||||
mkMesonDerivation (finalAttrs: {
|
||||
|
|
|
@ -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: {
|
||||
|
|
|
@ -15,13 +15,11 @@
|
|||
|
||||
# Configuration Options
|
||||
|
||||
, versionSuffix ? ""
|
||||
, version
|
||||
}:
|
||||
|
||||
let
|
||||
inherit (lib) fileset;
|
||||
|
||||
version = lib.fileContents ./.version + versionSuffix;
|
||||
in
|
||||
|
||||
mkMesonDerivation (finalAttrs: {
|
||||
|
|
|
@ -17,13 +17,11 @@
|
|||
|
||||
# Configuration Options
|
||||
|
||||
, versionSuffix ? ""
|
||||
, version
|
||||
}:
|
||||
|
||||
let
|
||||
inherit (lib) fileset;
|
||||
|
||||
version = lib.fileContents ./.version + versionSuffix;
|
||||
in
|
||||
|
||||
mkMesonDerivation (finalAttrs: {
|
||||
|
|
|
@ -14,13 +14,11 @@
|
|||
|
||||
# Configuration Options
|
||||
|
||||
, versionSuffix ? ""
|
||||
, version
|
||||
}:
|
||||
|
||||
let
|
||||
inherit (lib) fileset;
|
||||
|
||||
version = lib.fileContents ./.version + versionSuffix;
|
||||
in
|
||||
|
||||
mkMesonDerivation (finalAttrs: {
|
||||
|
|
|
@ -12,13 +12,11 @@
|
|||
|
||||
# Configuration Options
|
||||
|
||||
, versionSuffix ? ""
|
||||
, version
|
||||
}:
|
||||
|
||||
let
|
||||
inherit (lib) fileset;
|
||||
|
||||
version = lib.fileContents ./.version + versionSuffix;
|
||||
in
|
||||
|
||||
mkMesonDerivation (finalAttrs: {
|
||||
|
|
|
@ -20,15 +20,13 @@
|
|||
|
||||
# Configuration Options
|
||||
|
||||
, versionSuffix ? ""
|
||||
, version
|
||||
|
||||
, embeddedSandboxShell ? stdenv.hostPlatform.isStatic
|
||||
}:
|
||||
|
||||
let
|
||||
inherit (lib) fileset;
|
||||
|
||||
version = lib.fileContents ./.version + versionSuffix;
|
||||
in
|
||||
|
||||
mkMesonDerivation (finalAttrs: {
|
||||
|
|
|
@ -11,13 +11,11 @@
|
|||
|
||||
# Configuration Options
|
||||
|
||||
, versionSuffix ? ""
|
||||
, version
|
||||
}:
|
||||
|
||||
let
|
||||
inherit (lib) fileset;
|
||||
|
||||
version = lib.fileContents ./.version + versionSuffix;
|
||||
in
|
||||
|
||||
mkMesonDerivation (finalAttrs: {
|
||||
|
|
|
@ -17,13 +17,11 @@
|
|||
|
||||
# Configuration Options
|
||||
|
||||
, versionSuffix ? ""
|
||||
, version
|
||||
}:
|
||||
|
||||
let
|
||||
inherit (lib) fileset;
|
||||
|
||||
version = lib.fileContents ./.version + versionSuffix;
|
||||
in
|
||||
|
||||
mkMesonDerivation (finalAttrs: {
|
||||
|
|
|
@ -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 ([
|
||||
|
|
|
@ -14,13 +14,11 @@
|
|||
|
||||
# Configuration Options
|
||||
|
||||
, versionSuffix ? ""
|
||||
, version
|
||||
}:
|
||||
|
||||
let
|
||||
inherit (lib) fileset;
|
||||
|
||||
version = lib.fileContents ./.version + versionSuffix;
|
||||
in
|
||||
|
||||
mkMesonDerivation (finalAttrs: {
|
||||
|
|
|
@ -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
|
||||
'';
|
||||
|
|
|
@ -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
|
||||
'';
|
||||
|
|
|
@ -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
|
||||
'';
|
||||
|
|
|
@ -14,13 +14,11 @@
|
|||
|
||||
# Configuration Options
|
||||
|
||||
, versionSuffix ? ""
|
||||
, version
|
||||
}:
|
||||
|
||||
let
|
||||
inherit (lib) fileset;
|
||||
|
||||
version = lib.fileContents ./.version + versionSuffix;
|
||||
in
|
||||
|
||||
mkMesonDerivation (finalAttrs: {
|
||||
|
|
|
@ -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
|
||||
|
|
|
@ -13,13 +13,11 @@
|
|||
|
||||
# Configuration Options
|
||||
|
||||
, versionSuffix ? ""
|
||||
, version
|
||||
}:
|
||||
|
||||
let
|
||||
inherit (lib) fileset;
|
||||
|
||||
version = lib.fileContents ./.version + versionSuffix;
|
||||
in
|
||||
|
||||
mkMesonDerivation (finalAttrs: {
|
||||
|
|
|
@ -17,13 +17,11 @@
|
|||
|
||||
# Configuration Options
|
||||
|
||||
, versionSuffix ? ""
|
||||
, version
|
||||
}:
|
||||
|
||||
let
|
||||
inherit (lib) fileset;
|
||||
|
||||
version = lib.fileContents ./.version + versionSuffix;
|
||||
in
|
||||
|
||||
mkMesonDerivation (finalAttrs: {
|
||||
|
|
Loading…
Reference in a new issue