diff options
| author | Léo Gaspard <leo@gaspard.io> | 2020-04-20 13:41:47 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-04-20 13:41:47 +0200 |
| commit | 203955fa0c65301ff985e8b16a8d9f36db9cfbb0 (patch) | |
| tree | 3ec26789cd1f73a2279b4eb3d4e51c7919a42d20 /pkgs/top-level | |
| parent | 5e76bf706bfabad18d1405ff2f0ac60b3cdf1ebf (diff) | |
| parent | 1b89bffcf47dc1e271bea128635e33efd9481b93 (diff) | |
| download | nixlib-203955fa0c65301ff985e8b16a8d9f36db9cfbb0.tar nixlib-203955fa0c65301ff985e8b16a8d9f36db9cfbb0.tar.gz nixlib-203955fa0c65301ff985e8b16a8d9f36db9cfbb0.tar.bz2 nixlib-203955fa0c65301ff985e8b16a8d9f36db9cfbb0.tar.lz nixlib-203955fa0c65301ff985e8b16a8d9f36db9cfbb0.tar.xz nixlib-203955fa0c65301ff985e8b16a8d9f36db9cfbb0.tar.zst nixlib-203955fa0c65301ff985e8b16a8d9f36db9cfbb0.zip | |
Merge pull request #82714 from delroth/s3tc
libtxc_dxtn{,_s2tc}: remove from nixpkgs + hardware.opengl optionsDiffstat (limited to 'pkgs/top-level')
| -rw-r--r-- | pkgs/top-level/aliases.nix | 2 | ||||
| -rw-r--r-- | pkgs/top-level/all-packages.nix | 4 |
2 files changed, 2 insertions, 4 deletions
diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index 4714ec9e93ee..9ad282149aa6 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -245,6 +245,8 @@ mapAliases ({ librecad2 = librecad; # backwards compatibility alias, added 2015-10 libsysfs = sysfsutils; # added 2018-04-25 libtidy = html-tidy; # added 2014-12-21 + libtxc_dxtn = throw "removed 2020-03-16, now integrated in Mesa"; + libtxc_dxtn_s2tc = throw "removed 2020-03-16, now integrated in Mesa"; libudev = udev; # added 2018-04-25 libsexy = throw "libsexy has been removed from nixpkgs, as it's abandoned and no package needed it."; # 2019-12-10 links = links2; # added 2016-01-31 diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 8b70d77e16c5..4181f6470fe0 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -13278,10 +13278,6 @@ in libtsm = callPackage ../development/libraries/libtsm { }; - libtxc_dxtn = callPackage ../development/libraries/libtxc_dxtn { }; - - libtxc_dxtn_s2tc = callPackage ../development/libraries/libtxc_dxtn_s2tc { }; - libgeotiff = callPackage ../development/libraries/libgeotiff { }; libu2f-host = callPackage ../development/libraries/libu2f-host { }; |