diff options
| author | Matthew Bauer <mjbauer95@gmail.com> | 2019-04-20 19:31:35 -0400 |
|---|---|---|
| committer | Matthew Bauer <mjbauer95@gmail.com> | 2019-04-20 19:31:35 -0400 |
| commit | 799fa4d4044018f2e3a4f258942ae6d34a8d5c4d (patch) | |
| tree | 7646d01d9bce514d8fd4a89a9bb6e086204c884e /pkgs/top-level | |
| parent | cc6b56d38122c1b62e5fe6783f1467171f743822 (diff) | |
| parent | 9f203b3ac074a17f077fa19e8b5f86df11f39866 (diff) | |
| download | nixpkgs-799fa4d4044018f2e3a4f258942ae6d34a8d5c4d.tar nixpkgs-799fa4d4044018f2e3a4f258942ae6d34a8d5c4d.tar.gz nixpkgs-799fa4d4044018f2e3a4f258942ae6d34a8d5c4d.tar.bz2 nixpkgs-799fa4d4044018f2e3a4f258942ae6d34a8d5c4d.tar.lz nixpkgs-799fa4d4044018f2e3a4f258942ae6d34a8d5c4d.tar.xz nixpkgs-799fa4d4044018f2e3a4f258942ae6d34a8d5c4d.tar.zst nixpkgs-799fa4d4044018f2e3a4f258942ae6d34a8d5c4d.zip | |
Merge remote-tracking branch 'origin/master' into staging
Diffstat (limited to 'pkgs/top-level')
| -rw-r--r-- | pkgs/top-level/all-packages.nix | 4 | ||||
| -rw-r--r-- | pkgs/top-level/impure.nix | 4 | ||||
| -rw-r--r-- | pkgs/top-level/release-cross.nix | 1 |
3 files changed, 7 insertions, 2 deletions
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 7297a4ae9f6..ad0db570774 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -1328,6 +1328,8 @@ in deja-dup = callPackage ../applications/backup/deja-dup { }; + dejsonlz4 = callPackage ../tools/compression/dejsonlz4 { }; + desync = callPackage ../applications/networking/sync/desync { }; devmem2 = callPackage ../os-specific/linux/devmem2 { }; @@ -23351,6 +23353,8 @@ in terragrunt = callPackage ../applications/networking/cluster/terragrunt {}; + tilt = callPackage ../applications/networking/cluster/tilt {}; + tetex = callPackage ../tools/typesetting/tex/tetex { libpng = libpng12; }; tetra-gtk-theme = callPackage ../misc/themes/tetra { }; diff --git a/pkgs/top-level/impure.nix b/pkgs/top-level/impure.nix index b0532ceb5db..da288f15d2e 100644 --- a/pkgs/top-level/impure.nix +++ b/pkgs/top-level/impure.nix @@ -72,6 +72,8 @@ in else overlays homeOverlaysDir else [] +, crossOverlays ? [] + , ... } @ args: @@ -80,7 +82,7 @@ in assert args ? localSystem -> !(args ? system || args ? platform); import ./. (builtins.removeAttrs args [ "system" "platform" ] // { - inherit config overlays crossSystem; + inherit config overlays crossSystem crossOverlays; # Fallback: Assume we are building packages on the current (build, in GNU # Autotools parlance) system. localSystem = (if args ? localSystem then {} diff --git a/pkgs/top-level/release-cross.nix b/pkgs/top-level/release-cross.nix index f4210fcfc72..af400aee871 100644 --- a/pkgs/top-level/release-cross.nix +++ b/pkgs/top-level/release-cross.nix @@ -147,7 +147,6 @@ in aarch64-embedded = mapTestOnCross lib.systems.examples.aarch64-embedded embedded; i686-embedded = mapTestOnCross lib.systems.examples.i686-embedded embedded; x86_64-embedded = mapTestOnCross lib.systems.examples.x86_64-embedded embedded; - alpha-embedded = mapTestOnCross lib.systems.examples.alpha-embedded embedded; /* Cross-built bootstrap tools for every supported platform */ bootstrapTools = let |