1
0
Fork 0
mirror of https://github.com/NixOS/nix synced 2025-07-01 12:37:59 +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:
Robert Hensing 2024-07-07 21:33:01 +02:00 committed by GitHub
commit a9592077fb
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
22 changed files with 43 additions and 65 deletions

View file

@ -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 =

View file

@ -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

View file

@ -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: {

View file

@ -11,13 +11,11 @@
# Configuration Options
, versionSuffix ? ""
, version
}:
let
inherit (lib) fileset;
version = lib.fileContents ./.version + versionSuffix;
in
mkMesonDerivation (finalAttrs: {

View file

@ -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: {

View file

@ -15,13 +15,11 @@
# Configuration Options
, versionSuffix ? ""
, version
}:
let
inherit (lib) fileset;
version = lib.fileContents ./.version + versionSuffix;
in
mkMesonDerivation (finalAttrs: {

View file

@ -17,13 +17,11 @@
# Configuration Options
, versionSuffix ? ""
, version
}:
let
inherit (lib) fileset;
version = lib.fileContents ./.version + versionSuffix;
in
mkMesonDerivation (finalAttrs: {

View file

@ -14,13 +14,11 @@
# Configuration Options
, versionSuffix ? ""
, version
}:
let
inherit (lib) fileset;
version = lib.fileContents ./.version + versionSuffix;
in
mkMesonDerivation (finalAttrs: {

View file

@ -12,13 +12,11 @@
# Configuration Options
, versionSuffix ? ""
, version
}:
let
inherit (lib) fileset;
version = lib.fileContents ./.version + versionSuffix;
in
mkMesonDerivation (finalAttrs: {

View file

@ -20,15 +20,13 @@
# Configuration Options
, versionSuffix ? ""
, version
, embeddedSandboxShell ? stdenv.hostPlatform.isStatic
}:
let
inherit (lib) fileset;
version = lib.fileContents ./.version + versionSuffix;
in
mkMesonDerivation (finalAttrs: {

View file

@ -11,13 +11,11 @@
# Configuration Options
, versionSuffix ? ""
, version
}:
let
inherit (lib) fileset;
version = lib.fileContents ./.version + versionSuffix;
in
mkMesonDerivation (finalAttrs: {

View file

@ -17,13 +17,11 @@
# Configuration Options
, versionSuffix ? ""
, version
}:
let
inherit (lib) fileset;
version = lib.fileContents ./.version + versionSuffix;
in
mkMesonDerivation (finalAttrs: {

View file

@ -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 ([