Merge pull request #87731 from jtojnar/update-no-build-src
This commit is contained in:
commit
a762c0e304
7
.github/CODEOWNERS
vendored
7
.github/CODEOWNERS
vendored
|
@ -55,6 +55,13 @@
|
||||||
# NixOS integration test driver
|
# NixOS integration test driver
|
||||||
/nixos/lib/test-driver @tfc
|
/nixos/lib/test-driver @tfc
|
||||||
|
|
||||||
|
# Updaters
|
||||||
|
## update.nix
|
||||||
|
/maintainers/scripts/update.nix @jtojnar
|
||||||
|
/maintainers/scripts/update.py @jtojnar
|
||||||
|
## common-updater-scripts
|
||||||
|
/pkgs/common-updater/scripts/update-source-version @jtojnar
|
||||||
|
|
||||||
# Python-related code and docs
|
# Python-related code and docs
|
||||||
/maintainers/scripts/update-python-libraries @FRidh
|
/maintainers/scripts/update-python-libraries @FRidh
|
||||||
/pkgs/top-level/python-packages.nix @FRidh @jonringer
|
/pkgs/top-level/python-packages.nix @FRidh @jonringer
|
||||||
|
|
|
@ -9,6 +9,10 @@
|
||||||
# TODO: add assert statements
|
# TODO: add assert statements
|
||||||
|
|
||||||
let
|
let
|
||||||
|
pkgs = import ./../../default.nix (if include-overlays then { } else { overlays = []; });
|
||||||
|
|
||||||
|
inherit (pkgs) lib;
|
||||||
|
|
||||||
/* Remove duplicate elements from the list based on some extracted value. O(n^2) complexity.
|
/* Remove duplicate elements from the list based on some extracted value. O(n^2) complexity.
|
||||||
*/
|
*/
|
||||||
nubOn = f: list:
|
nubOn = f: list:
|
||||||
|
@ -16,43 +20,44 @@ let
|
||||||
[]
|
[]
|
||||||
else
|
else
|
||||||
let
|
let
|
||||||
x = pkgs.lib.head list;
|
x = lib.head list;
|
||||||
xs = pkgs.lib.filter (p: f x != f p) (pkgs.lib.drop 1 list);
|
xs = lib.filter (p: f x != f p) (lib.drop 1 list);
|
||||||
in
|
in
|
||||||
[x] ++ nubOn f xs;
|
[x] ++ nubOn f xs;
|
||||||
|
|
||||||
pkgs = import ./../../default.nix (if include-overlays then { } else { overlays = []; });
|
packagesWithPath = relativePath: cond: return: pathContent:
|
||||||
|
let
|
||||||
|
result = builtins.tryEval pathContent;
|
||||||
|
|
||||||
packagesWith = cond: return: set:
|
dedupResults = lst: nubOn (pkg: pkg.updateScript) (lib.concatLists lst);
|
||||||
nubOn (pkg: pkg.updateScript)
|
in
|
||||||
(pkgs.lib.flatten
|
if result.success then
|
||||||
(pkgs.lib.mapAttrsToList
|
let
|
||||||
(name: pkg:
|
pathContent = result.value;
|
||||||
let
|
in
|
||||||
result = builtins.tryEval (
|
if lib.isDerivation pathContent then
|
||||||
if pkgs.lib.isDerivation pkg && cond name pkg
|
lib.optional (cond relativePath pathContent) (return relativePath pathContent)
|
||||||
then [(return name pkg)]
|
else if lib.isAttrs pathContent then
|
||||||
else if pkg.recurseForDerivations or false || pkg.recurseForRelease or false
|
# If user explicitly points to an attrSet or it is marked for recursion, we recur.
|
||||||
then packagesWith cond return pkg
|
if relativePath == [] || pathContent.recurseForDerivations or false || pathContent.recurseForRelease or false then
|
||||||
else []
|
dedupResults (lib.mapAttrsToList (name: elem: packagesWithPath (relativePath ++ [name]) cond return elem) pathContent)
|
||||||
);
|
else []
|
||||||
in
|
else if lib.isList pathContent then
|
||||||
if result.success then result.value
|
dedupResults (lib.imap0 (i: elem: packagesWithPath (relativePath ++ [i]) cond return elem) pathContent)
|
||||||
else []
|
else []
|
||||||
)
|
else [];
|
||||||
set
|
|
||||||
)
|
packagesWith = packagesWithPath [];
|
||||||
);
|
|
||||||
|
|
||||||
packagesWithUpdateScriptAndMaintainer = maintainer':
|
packagesWithUpdateScriptAndMaintainer = maintainer':
|
||||||
let
|
let
|
||||||
maintainer =
|
maintainer =
|
||||||
if ! builtins.hasAttr maintainer' pkgs.lib.maintainers then
|
if ! builtins.hasAttr maintainer' lib.maintainers then
|
||||||
builtins.throw "Maintainer with name `${maintainer'} does not exist in `maintainers/maintainer-list.nix`."
|
builtins.throw "Maintainer with name `${maintainer'} does not exist in `maintainers/maintainer-list.nix`."
|
||||||
else
|
else
|
||||||
builtins.getAttr maintainer' pkgs.lib.maintainers;
|
builtins.getAttr maintainer' lib.maintainers;
|
||||||
in
|
in
|
||||||
packagesWith (name: pkg: builtins.hasAttr "updateScript" pkg &&
|
packagesWith (relativePath: pkg: builtins.hasAttr "updateScript" pkg &&
|
||||||
(if builtins.hasAttr "maintainers" pkg.meta
|
(if builtins.hasAttr "maintainers" pkg.meta
|
||||||
then (if builtins.isList pkg.meta.maintainers
|
then (if builtins.isList pkg.meta.maintainers
|
||||||
then builtins.elem maintainer pkg.meta.maintainers
|
then builtins.elem maintainer pkg.meta.maintainers
|
||||||
|
@ -61,23 +66,23 @@ let
|
||||||
else false
|
else false
|
||||||
)
|
)
|
||||||
)
|
)
|
||||||
(name: pkg: pkg)
|
(relativePath: pkg: pkg)
|
||||||
pkgs;
|
pkgs;
|
||||||
|
|
||||||
packagesWithUpdateScript = path:
|
packagesWithUpdateScript = path:
|
||||||
let
|
let
|
||||||
attrSet = pkgs.lib.attrByPath (pkgs.lib.splitString "." path) null pkgs;
|
pathContent = lib.attrByPath (lib.splitString "." path) null pkgs;
|
||||||
in
|
in
|
||||||
if attrSet == null then
|
if pathContent == null then
|
||||||
builtins.throw "Attribute path `${path}` does not exists."
|
builtins.throw "Attribute path `${path}` does not exists."
|
||||||
else
|
else
|
||||||
packagesWith (name: pkg: builtins.hasAttr "updateScript" pkg)
|
packagesWith (relativePath: pkg: builtins.hasAttr "updateScript" pkg)
|
||||||
(name: pkg: pkg)
|
(relativePath: pkg: pkg)
|
||||||
attrSet;
|
pathContent;
|
||||||
|
|
||||||
packageByName = name:
|
packageByName = name:
|
||||||
let
|
let
|
||||||
package = pkgs.lib.attrByPath (pkgs.lib.splitString "." name) null pkgs;
|
package = lib.attrByPath (lib.splitString "." name) null pkgs;
|
||||||
in
|
in
|
||||||
if package == null then
|
if package == null then
|
||||||
builtins.throw "Package with an attribute name `${name}` does not exists."
|
builtins.throw "Package with an attribute name `${name}` does not exists."
|
||||||
|
@ -125,15 +130,15 @@ let
|
||||||
|
|
||||||
packageData = package: {
|
packageData = package: {
|
||||||
name = package.name;
|
name = package.name;
|
||||||
pname = pkgs.lib.getName package;
|
pname = lib.getName package;
|
||||||
updateScript = map builtins.toString (pkgs.lib.toList package.updateScript);
|
updateScript = map builtins.toString (lib.toList package.updateScript);
|
||||||
};
|
};
|
||||||
|
|
||||||
packagesJson = pkgs.writeText "packages.json" (builtins.toJSON (map packageData packages));
|
packagesJson = pkgs.writeText "packages.json" (builtins.toJSON (map packageData packages));
|
||||||
|
|
||||||
optionalArgs =
|
optionalArgs =
|
||||||
pkgs.lib.optional (max-workers != null) "--max-workers=${max-workers}"
|
lib.optional (max-workers != null) "--max-workers=${max-workers}"
|
||||||
++ pkgs.lib.optional (keep-going == "true") "--keep-going";
|
++ lib.optional (keep-going == "true") "--keep-going";
|
||||||
|
|
||||||
args = [ packagesJson ] ++ optionalArgs;
|
args = [ packagesJson ] ++ optionalArgs;
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue