From ea863cd334be044aee28e77ff4446f16063ec30e Mon Sep 17 00:00:00 2001 From: Samuel Dionne-Riel Date: Thu, 13 Dec 2018 22:34:58 -0500 Subject: [PATCH] Revert "pkgsStatic: Add warning saying this is a provisional backport" This reverts commit 3c1049fbefb33aeb3a72905710f647bf92fa5b44. This broke tarball on release-18.09 * https://hydra.nixos.org/build/85858044/ * https://hydra.nixos.org/build/85858044/nixlog/1 --- pkgs/top-level/stage.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/top-level/stage.nix b/pkgs/top-level/stage.nix index 129f40e73020..9018a20d6c53 100644 --- a/pkgs/top-level/stage.nix +++ b/pkgs/top-level/stage.nix @@ -157,7 +157,7 @@ let # Fully static packages. # Currently uses Musl on Linux (couldn’t get static glibc to work). - pkgsStatic = lib.warn "This a provisional API backported from master for convenience." (nixpkgsFun ({ + pkgsStatic = nixpkgsFun ({ crossOverlays = [ (import ./static.nix) ]; } // lib.optionalAttrs stdenv.hostPlatform.isLinux { crossSystem = { @@ -170,7 +170,7 @@ let or lib.systems.parse.abis.musl; }; }; - })); + }); }; # The complete chain of package set builders, applied from top to bottom.