NixOS/nix
NixOS/nix
1
0
Fork 0
mirror of https://github.com/NixOS/nix synced 2024-09-19 10:50:24 -04:00
Code Activity

packaging: Pass version directly

Browse source
This commit is contained in:
Robert Hensing 2024-07-06 17:36:31 +02:00
parent efd5f50f5e
commit 0729f0a113
22 changed files with 25 additions and 60 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
packaging/dependencies.nix
View file

@ -40,6 +40,7 @@ let
in in
scope: { scope: {
inherit stdenv versionSuffix; inherit stdenv versionSuffix;
version = lib.fileContents ../.version + versionSuffix;
libseccomp = pkgs.libseccomp.overrideAttrs (_: rec { libseccomp = pkgs.libseccomp.overrideAttrs (_: rec {
version = "2.5.5"; version = "2.5.5";

4
src/external-api-docs/package.nix
View file

@ -7,7 +7,7 @@
# Configuration Options # Configuration Options
, versionSuffix ? "" , version
}: }:
let let
@ -16,7 +16,7 @@ in
mkMesonDerivation (finalAttrs: { mkMesonDerivation (finalAttrs: {
pname = "nix-external-api-docs"; pname = "nix-external-api-docs";
version = lib.fileContents ./.version + versionSuffix; inherit version;
workDir = ./.; workDir = ./.;
fileset = fileset =

4
src/internal-api-docs/package.nix
View file

@ -7,7 +7,7 @@
# Configuration Options # Configuration Options
, versionSuffix ? "" , version
}: }:
let let
@ -16,7 +16,7 @@ in
mkMesonDerivation (finalAttrs: { mkMesonDerivation (finalAttrs: {
pname = "nix-internal-api-docs"; pname = "nix-internal-api-docs";
version = lib.fileContents ./.version + versionSuffix; inherit version;
workDir = ./.; workDir = ./.;
fileset = let fileset = let

4
src/libcmd/package.nix
View file

@ -20,7 +20,7 @@
# Configuration Options # Configuration Options
, versionSuffix ? "" , version
# Whether to enable Markdown rendering in the Nix binary. # Whether to enable Markdown rendering in the Nix binary.
, enableMarkdown ? !stdenv.hostPlatform.isWindows , enableMarkdown ? !stdenv.hostPlatform.isWindows
@ -36,8 +36,6 @@
let let
inherit (lib) fileset; inherit (lib) fileset;
version = lib.fileContents ./.version + versionSuffix;
in in
mkMesonDerivation (finalAttrs: { mkMesonDerivation (finalAttrs: {

4
src/libexpr-c/package.nix
View file

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

4
src/libexpr/package.nix
View file

@ -20,7 +20,7 @@
# Configuration Options # Configuration Options
, versionSuffix ? "" , version
# Whether to use garbage collection for the Nix language evaluator. # Whether to use garbage collection for the Nix language evaluator.
# #
@ -36,8 +36,6 @@
let let
inherit (lib) fileset; inherit (lib) fileset;
version = lib.fileContents ./.version + versionSuffix;
in in
mkMesonDerivation (finalAttrs: { mkMesonDerivation (finalAttrs: {

4
src/libfetchers/package.nix
View file

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

4
src/libflake/package.nix
View file

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

4
src/libmain/package.nix
View file

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

4
src/libstore-c/package.nix
View file

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

4
src/libstore/package.nix
View file

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

4
src/libutil-c/package.nix
View file

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

4
src/libutil/package.nix
View file

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

4
src/perl/package.nix
View file

@ -8,7 +8,7 @@
, pkg-config , pkg-config
, nix-store , nix-store
, darwin , darwin
, versionSuffix ? "" , version
, curl , curl
, bzip2 , bzip2
, libsodium , libsodium
@ -20,7 +20,7 @@ in
perl.pkgs.toPerlModule (mkMesonDerivation (finalAttrs: { perl.pkgs.toPerlModule (mkMesonDerivation (finalAttrs: {
pname = "nix-perl"; pname = "nix-perl";
version = lib.fileContents ./.version + versionSuffix; inherit version;
workDir = ./.; workDir = ./.;
fileset = fileset.unions ([ fileset = fileset.unions ([

4
tests/unit/libexpr-support/package.nix
View file

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

4
tests/unit/libexpr/package.nix
View file

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

4
tests/unit/libfetchers/package.nix
View file

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

4
tests/unit/libflake/package.nix
View file

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

4
tests/unit/libstore-support/package.nix
View file

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

4
tests/unit/libstore/package.nix
View file

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

4
tests/unit/libutil-support/package.nix
View file

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

4
tests/unit/libutil/package.nix
View file

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