diff options
author | github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> | 2024-03-07 00:10:05 +0000 |
---|---|---|
committer | GitHub <noreply@github.com> | 2024-03-07 00:10:05 +0000 |
commit | 8534fb2f533b5c7705788d01a8483b8c98f72b32 (patch) | |
tree | 4b38f13257108080d658e42cc4593921acc1bd62 /maintainers/scripts | |
parent | 58f663052a4917a7ad39fe14cc4bc0b0d9586078 (diff) | |
parent | b4210fae558ab876e98b9f255b93223cd6184c58 (diff) |
Merge master into haskell-updates
Diffstat (limited to 'maintainers/scripts')
-rw-r--r-- | maintainers/scripts/eval-release.nix | 7 | ||||
-rw-r--r-- | maintainers/scripts/find-tarballs.nix | 19 | ||||
-rwxr-xr-x | maintainers/scripts/kde/generate-sources.py | 2 |
3 files changed, 19 insertions, 9 deletions
diff --git a/maintainers/scripts/eval-release.nix b/maintainers/scripts/eval-release.nix index 4f0ca2465025..10acfe328447 100644 --- a/maintainers/scripts/eval-release.nix +++ b/maintainers/scripts/eval-release.nix @@ -1,9 +1,8 @@ -# Evaluate `release.nix' like Hydra would. Too bad nix-instantiate -# can't to do this. - -with import ../../lib; +# Evaluate `release.nix' like Hydra would. Too bad nix-instantiate can't to do this. let + inherit (import ../../lib) isDerivation mapAttrs; + trace = if builtins.getEnv "VERBOSE" == "1" then builtins.trace else (x: y: y); rel = removeAttrs (import ../../pkgs/top-level/release.nix { }) [ "tarball" "unstable" "xbursttools" ]; diff --git a/maintainers/scripts/find-tarballs.nix b/maintainers/scripts/find-tarballs.nix index c47b5168abd9..cae4bec201ce 100644 --- a/maintainers/scripts/find-tarballs.nix +++ b/maintainers/scripts/find-tarballs.nix @@ -1,11 +1,22 @@ # This expression returns a list of all fetchurl calls used by ‘expr’. -with import ../.. { }; -with lib; - -{ expr }: +{ expr, lib ? import ../../lib }: let + inherit (lib) + addErrorContext + attrNames + concatLists + const + filter + genericClosure + isAttrs + isDerivation + isList + mapAttrsToList + optional + optionals + ; root = expr; diff --git a/maintainers/scripts/kde/generate-sources.py b/maintainers/scripts/kde/generate-sources.py index e9f8c41ef4d7..380213ee6907 100755 --- a/maintainers/scripts/kde/generate-sources.py +++ b/maintainers/scripts/kde/generate-sources.py @@ -101,7 +101,7 @@ def main(set: str, version: str, nixpkgs: pathlib.Path): set_dir.mkdir(parents=True, exist_ok=True) with (set_dir / "default.nix").open("w") as fd: - fd.write(ROOT_TEMPLATE.render(packages=results.keys()) + "\n") + fd.write(ROOT_TEMPLATE.render(packages=sorted(results.keys())) + "\n") sources_dir = generated_dir / "sources" sources_dir.mkdir(parents=True, exist_ok=True) |