diff options
author | Will Dietz <w@wdtz.org> | 2020-02-03 17:39:27 -0600 |
---|---|---|
committer | GitHub <noreply@github.com> | 2020-02-03 17:39:27 -0600 |
commit | ccdfbcd63c50d8314e9e507acdfdde03de6d800f (patch) | |
tree | fc3fe540a8584fe265af12030fbfed17dd0772b5 | |
parent | d18b1ee9985368d6acc16cc51f1bf90d2b269aee (diff) | |
parent | 67ab3bab8112e63ee23f6bcd83601ecad690e734 (diff) | |
download | nixlib-ccdfbcd63c50d8314e9e507acdfdde03de6d800f.tar nixlib-ccdfbcd63c50d8314e9e507acdfdde03de6d800f.tar.gz nixlib-ccdfbcd63c50d8314e9e507acdfdde03de6d800f.tar.bz2 nixlib-ccdfbcd63c50d8314e9e507acdfdde03de6d800f.tar.lz nixlib-ccdfbcd63c50d8314e9e507acdfdde03de6d800f.tar.xz nixlib-ccdfbcd63c50d8314e9e507acdfdde03de6d800f.tar.zst nixlib-ccdfbcd63c50d8314e9e507acdfdde03de6d800f.zip |
Merge pull request #78661 from dtzWill/fix/matrique-alias-for-spectral
matrique: move to aliases.nix, not primary attribute name
-rw-r--r-- | pkgs/top-level/aliases.nix | 1 | ||||
-rw-r--r-- | pkgs/top-level/all-packages.nix | 3 |
2 files changed, 1 insertions, 3 deletions
diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index 6b4fb1f9f746..d746093d650e 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -237,6 +237,7 @@ mapAliases ({ man_db = man-db; # added 2016-05 manpages = man-pages; # added 2015-12-06 mariadb-client = hiPrio mariadb.client; #added 2019.07.28 + matrique = spectral; # added 2020-01-27 mbedtls_1_3 = throw "mbedtls_1_3 is end of life, see https://tls.mbed.org/kb/how-to/upgrade-2.0"; # added 2019-12-08 mess = mame; # added 2019-10-30 mcomix = throw "mcomix has been removed from nixpkgs, as it's unmaintained"; # added 2019-12-10 diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 25f44009f305..a8bf22e01c74 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -20378,9 +20378,6 @@ in mm-common = callPackage ../development/libraries/mm-common { }; - # Renamed - matrique = spectral; - mpc-qt = libsForQt5.callPackage ../applications/video/mpc-qt { }; mplayer = callPackage ../applications/video/mplayer ({ |