diff options
| author | Frederik Rietdijk <freddyrietdijk@fridh.nl> | 2018-09-23 09:31:28 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-09-23 09:31:28 +0200 |
| commit | 56853dc6d83a861050bbc02041dbe65f7b1b6f63 (patch) | |
| tree | 70fdf276f8d889018a3ec9fc573e01fa961d289c /pkgs/top-level | |
| parent | 343ac4d2fc6029ef6a2451d31890903f6afe79f2 (diff) | |
| parent | 92158a4b2cda39ab3990682aa23644462e1a5860 (diff) | |
| download | nixlib-56853dc6d83a861050bbc02041dbe65f7b1b6f63.tar nixlib-56853dc6d83a861050bbc02041dbe65f7b1b6f63.tar.gz nixlib-56853dc6d83a861050bbc02041dbe65f7b1b6f63.tar.bz2 nixlib-56853dc6d83a861050bbc02041dbe65f7b1b6f63.tar.lz nixlib-56853dc6d83a861050bbc02041dbe65f7b1b6f63.tar.xz nixlib-56853dc6d83a861050bbc02041dbe65f7b1b6f63.tar.zst nixlib-56853dc6d83a861050bbc02041dbe65f7b1b6f63.zip | |
Merge pull request #45941 from NixOS/staging-next
Staging next
Diffstat (limited to 'pkgs/top-level')
| -rw-r--r-- | pkgs/top-level/all-packages.nix | 11 |
1 files changed, 3 insertions, 8 deletions
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 6478ccb7741d..8e9b5aa8b49c 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -1980,11 +1980,8 @@ with pkgs; cool-retro-term = libsForQt5.callPackage ../applications/misc/cool-retro-term { }; - coreutils = callPackage ../tools/misc/coreutils { - aclSupport = stdenv.isLinux; - attrSupport = stdenv.isLinux; - }; - + coreutils = callPackage ../tools/misc/coreutils { }; + coreutils-full = coreutils.override { minimal = false; }; coreutils-prefixed = coreutils.override { withPrefix = true; singleBinary = false; }; corkscrew = callPackage ../tools/networking/corkscrew { }; @@ -11595,10 +11592,8 @@ with pkgs; introspectionSupport = true; }); - poppler_min = poppler_0_61.override { # TODO: maybe reduce even more + poppler_min = poppler.override { # TODO: maybe reduce even more # this is currently only used by texlive.bin. - # pinned to 0.61 because texlive 2017 doesn't build w/poppler 0.64 - # TODO: review poppler version for texlive 2018 minimal = true; suffix = "min"; }; |