diff options
| author | Vladimír Čunát <v@cunat.cz> | 2019-09-15 13:09:56 +0200 |
|---|---|---|
| committer | Vladimír Čunát <v@cunat.cz> | 2019-09-15 13:09:56 +0200 |
| commit | 9f8a7d26798ced69f3185a59383bbb3db6b06bde (patch) | |
| tree | 28f7989183b690ecafdb0360c0fee406aac88bcc /pkgs/top-level/aliases.nix | |
| parent | 6b2aa16ec1926f7027ad03ebf2b9b43370cb5e54 (diff) | |
| parent | 447d625edc3a488deee1c9b2e5890dd974e55ee3 (diff) | |
| download | nixpkgs-9f8a7d26798ced69f3185a59383bbb3db6b06bde.tar nixpkgs-9f8a7d26798ced69f3185a59383bbb3db6b06bde.tar.gz nixpkgs-9f8a7d26798ced69f3185a59383bbb3db6b06bde.tar.bz2 nixpkgs-9f8a7d26798ced69f3185a59383bbb3db6b06bde.tar.lz nixpkgs-9f8a7d26798ced69f3185a59383bbb3db6b06bde.tar.xz nixpkgs-9f8a7d26798ced69f3185a59383bbb3db6b06bde.tar.zst nixpkgs-9f8a7d26798ced69f3185a59383bbb3db6b06bde.zip | |
Merge branch 'staging' into staging-next
This brings openssl CVE fixes, and I can't see anything too risky in there, so let's merge these two staging iterations together.
Diffstat (limited to 'pkgs/top-level/aliases.nix')
| -rw-r--r-- | pkgs/top-level/aliases.nix | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index 74159f02d07..fa3875fbe46 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -188,7 +188,6 @@ mapAliases ({ libintlOrEmpty = stdenv.lib.optional (!stdenv.isLinux || stdenv.hostPlatform.libc != "glibc") gettext; # added 2018-03-14 libjson_rpc_cpp = libjson-rpc-cpp; # added 2017-02-28 liblapackWithoutAtlas = liblapack; # added 2018-11-05 - libmysql = mysql.connector-c; # added # 2017-12-28, this was a misnomer refering to libmysqlclient libqrencode = qrencode; # added 2019-01-01 librecad2 = librecad; # backwards compatibility alias, added 2015-10 libsysfs = sysfsutils; # added 2018-04-25 |