Skip to content

Commit

Permalink
Revert "pkgsStatic: Add warning saying this is a provisional backport"
Browse files Browse the repository at this point in the history
This reverts commit 3c1049f.

This broke tarball on release-18.09

  * https://hydra.nixos.org/build/85858044/
  * https://hydra.nixos.org/build/85858044/nixlog/1
  • Loading branch information
samueldr committed Dec 14, 2018
1 parent d6d3a12 commit ea863cd
Showing 1 changed file with 2 additions and 2 deletions.
4 changes: 2 additions & 2 deletions pkgs/top-level/stage.nix
Expand Up @@ -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 = {
Expand All @@ -170,7 +170,7 @@ let
or lib.systems.parse.abis.musl;
};
};
}));
});
};

# The complete chain of package set builders, applied from top to bottom.
Expand Down

2 comments on commit ea863cd

@Ericson2314
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks for reverting!

@Ericson2314
Copy link
Member

@Ericson2314 Ericson2314 commented on ea863cd Dec 14, 2018

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Again, sorry about this.

Please sign in to comment.