linux: remove modDirVersionArg argument

It's redundant with `argsOverride.modDirVersion`.
This commit is contained in:
Naïm Favier 2022-12-20 14:15:04 +01:00
parent fc346c5e62
commit cf568d20d5
No known key found for this signature in database
GPG key ID: 95AFCE8211908325
8 changed files with 8 additions and 16 deletions

View file

@ -1,4 +1,4 @@
{ lib, buildPackages, fetchurl, perl, buildLinux, nixosTests, modDirVersionArg ? null, ... } @ args:
{ lib, buildPackages, fetchurl, perl, buildLinux, nixosTests, ... } @ args:
with lib;
@ -16,4 +16,3 @@ buildLinux (args // rec {
sha256 = "102c9h0byr9v4bxzkdh7mnw1grm47ji6lf6l1gjlwah7f46j6ap3";
};
} // (args.argsOverride or {}))
// lib.optionalAttrs (modDirVersionArg != null) { modDirVersion = modDirVersionArg; } # legacy

View file

@ -1,4 +1,4 @@
{ lib, buildPackages, fetchurl, perl, buildLinux, nixosTests, modDirVersionArg ? null, ... } @ args:
{ lib, buildPackages, fetchurl, perl, buildLinux, nixosTests, ... } @ args:
with lib;
@ -16,4 +16,3 @@ buildLinux (args // rec {
sha256 = "02mjb16xxfj984vibpxvhjl84y5yg0jgzjccjdxnn8db4k9aa2vf";
};
} // (args.argsOverride or {}))
// lib.optionalAttrs (modDirVersionArg != null) { modDirVersion = modDirVersionArg; } # legacy

View file

@ -1,4 +1,4 @@
{ lib, buildPackages, fetchurl, perl, buildLinux, nixosTests, modDirVersionArg ? null, ... } @ args:
{ lib, buildPackages, fetchurl, perl, buildLinux, nixosTests, ... } @ args:
with lib;
@ -16,4 +16,3 @@ buildLinux (args // rec {
sha256 = "19yfi5vknxnw0cb8274q3pb5zjs6ny04n16m8xjdfdmznrbvza8v";
};
} // (args.argsOverride or {}))
// lib.optionalAttrs (modDirVersionArg != null) { modDirVersion = modDirVersionArg; } # legacy

View file

@ -1,4 +1,4 @@
{ lib, buildPackages, fetchurl, perl, buildLinux, nixosTests, modDirVersionArg ? null, ... } @ args:
{ lib, buildPackages, fetchurl, perl, buildLinux, nixosTests, ... } @ args:
with lib;
@ -16,4 +16,3 @@ buildLinux (args // rec {
sha256 = "1wvzfhzqq9dps508wmp2gblfz93ipppnjzqm0n8pi1acq11hhna0";
};
} // (args.argsOverride or { }))
// lib.optionalAttrs (modDirVersionArg != null) { modDirVersion = modDirVersionArg; } # legacy

View file

@ -1,4 +1,4 @@
{ lib, buildPackages, fetchurl, perl, buildLinux, nixosTests, modDirVersionArg ? null, ... } @ args:
{ lib, buildPackages, fetchurl, perl, buildLinux, nixosTests, ... } @ args:
with lib;
@ -16,4 +16,3 @@ buildLinux (args // rec {
sha256 = "14q5gy48j78vwnqivrgpdhj778n2jq5l7yiw5na1rwqmfh1wbvsy";
};
} // (args.argsOverride or {}))
// lib.optionalAttrs (modDirVersionArg != null) { modDirVersion = modDirVersionArg; } # legacy

View file

@ -1,4 +1,4 @@
{ lib, buildPackages, fetchurl, perl, buildLinux, nixosTests, modDirVersionArg ? null, ... } @ args:
{ lib, buildPackages, fetchurl, perl, buildLinux, nixosTests, ... } @ args:
with lib;
@ -16,4 +16,3 @@ buildLinux (args // rec {
sha256 = "191dlxcmbx8vy6z2k04jq2kr6hwnaknsnsyycvqnjmvmdf6i3lq8";
};
} // (args.argsOverride or { }))
// lib.optionalAttrs (modDirVersionArg != null) { modDirVersion = modDirVersionArg; } # legacy

View file

@ -1,4 +1,4 @@
{ lib, buildPackages, fetchurl, perl, buildLinux, nixosTests, modDirVersionArg ? null, ... } @ args:
{ lib, buildPackages, fetchurl, perl, buildLinux, nixosTests, ... } @ args:
with lib;
@ -16,4 +16,3 @@ buildLinux (args // rec {
sha256 = "sha256-LKHxcFGkMPb+0RluSVJxdQcXGs/ZfZZXchJQJwOyXes=";
};
} // (args.argsOverride or { }))
// lib.optionalAttrs (modDirVersionArg != null) { modDirVersion = modDirVersionArg; } # legacy

View file

@ -1,4 +1,4 @@
{ lib, buildPackages, fetchurl, perl, buildLinux, nixosTests, modDirVersionArg ? null, ... } @ args:
{ lib, buildPackages, fetchurl, perl, buildLinux, nixosTests, ... } @ args:
with lib;
@ -18,4 +18,3 @@ buildLinux (args // rec {
extraMeta.hydraPlatforms = [];
} // (args.argsOverride or {}))
// lib.optionalAttrs (modDirVersionArg != null) { modDirVersion = modDirVersionArg; } # legacy