diff options
| author | Malte Brandy <malte.brandy@maralorn.de> | 2021-05-09 02:18:56 +0200 |
|---|---|---|
| committer | Malte Brandy <malte.brandy@maralorn.de> | 2021-05-09 02:18:56 +0200 |
| commit | e60afba5d127d16da8ec9330712ca64a1114e9c8 (patch) | |
| tree | febc6308ecd4b03412cb98b883339a67c4cfa6e3 /maintainers/scripts | |
| parent | 7333f7ae5326d635ffebae6a00d1d26fd7e0ae6c (diff) | |
| parent | 7c4e0e3a90e099e0e171ba98440cdc59b60ac5c1 (diff) | |
| download | nixpkgs-e60afba5d127d16da8ec9330712ca64a1114e9c8.tar nixpkgs-e60afba5d127d16da8ec9330712ca64a1114e9c8.tar.gz nixpkgs-e60afba5d127d16da8ec9330712ca64a1114e9c8.tar.bz2 nixpkgs-e60afba5d127d16da8ec9330712ca64a1114e9c8.tar.lz nixpkgs-e60afba5d127d16da8ec9330712ca64a1114e9c8.tar.xz nixpkgs-e60afba5d127d16da8ec9330712ca64a1114e9c8.tar.zst nixpkgs-e60afba5d127d16da8ec9330712ca64a1114e9c8.zip | |
Merge branch 'master' into haskell-updates
Diffstat (limited to 'maintainers/scripts')
| -rw-r--r-- | maintainers/scripts/build.nix | 12 | ||||
| -rw-r--r-- | maintainers/scripts/check-hydra-by-maintainer.nix | 1 |
2 files changed, 11 insertions, 2 deletions
diff --git a/maintainers/scripts/build.nix b/maintainers/scripts/build.nix index bc4355d0aa8..ca401700b4a 100644 --- a/maintainers/scripts/build.nix +++ b/maintainers/scripts/build.nix @@ -1,10 +1,18 @@ -{ maintainer }: +{ maintainer +, localSystem ? { system = args.system or builtins.currentSystem; } +, system ? localSystem.system +, crossSystem ? localSystem +, ... +}@args: # based on update.nix # nix-build build.nix --argstr maintainer <yourname> +# to build for aarch64-linux using boot.binfmt.emulatedSystems: +# nix-build build.nix --argstr maintainer <yourname> --argstr system aarch64-linux + let - pkgs = import ./../../default.nix {}; + pkgs = import ./../../default.nix (removeAttrs args [ "maintainer" ]); maintainer_ = pkgs.lib.maintainers.${maintainer}; packagesWith = cond: return: set: (pkgs.lib.flatten diff --git a/maintainers/scripts/check-hydra-by-maintainer.nix b/maintainers/scripts/check-hydra-by-maintainer.nix index cecf65ec66d..326aae47f8c 100644 --- a/maintainers/scripts/check-hydra-by-maintainer.nix +++ b/maintainers/scripts/check-hydra-by-maintainer.nix @@ -48,6 +48,7 @@ let in pkgs.stdenv.mkDerivation { name = "nixpkgs-update-script"; + buildInputs = [ pkgs.hydra-check ]; buildCommand = '' echo "" echo "----------------------------------------------------------------" |