public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Revert "Merge branch 'staging-next'"

Browse Source 
This reverts commit 41af38f372, reversing
changes made to f0fec244ca.

Let's delay this.  We have some serious regressions.
This commit is contained in:
Vladimír Čunát
2019-09-21 20:05:09 +02:00
parent 6be720b3a7
commit f8a8fc6c7c
90 changed files with 367 additions and 428 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
pkgs/top-level/aliases.nix
View File

@@ -189,6 +189,7 @@ 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

24
pkgs/top-level/all-packages.nix
View File

@@ -1966,7 +1966,7 @@ in
libkrb5 = null;
systemd = null;
jemalloc = null;
libmysqlclient = null;
mysql = null;
postgresql = null;
libdbi = null;
net_snmp = null;
@@ -11710,7 +11710,7 @@ in
libdbi = callPackage ../development/libraries/libdbi { };
libdbiDriversBase = libdbiDrivers.override {
libmysqlclient = null;
mysql = null;
sqlite = null;
};
@@ -12428,8 +12428,9 @@ in
libwhereami = callPackage ../development/libraries/libwhereami { };
giflib = giflib_5_1;
giflib_4_1 = callPackage ../development/libraries/giflib/4.1.nix { };
giflib = callPackage ../development/libraries/giflib { };
giflib_5_1 = callPackage ../development/libraries/giflib/5.1.nix { };
libunarr = callPackage ../development/libraries/libunarr { };
@@ -13138,7 +13139,7 @@ in
cups = if stdenv.isLinux then cups else null;
# XXX: mariadb doesn't built on fbsd as of nov 2015
libmysqlclient = if (!stdenv.isFreeBSD) then libmysqlclient else null;
mysql = if (!stdenv.isFreeBSD) then mysql else null;
inherit (pkgs.darwin) libobjc;
inherit (pkgs.darwin.apple_sdk.frameworks) ApplicationServices OpenGL Cocoa AGL;
@@ -13897,7 +13898,7 @@ in
unixODBC = callPackage ../development/libraries/unixODBC { };
unixODBCDrivers = recurseIntoAttrs (callPackages ../development/libraries/unixODBCDrivers { });
unixODBCDrivers = recurseIntoAttrs (callPackages ../development/libraries/unixODBCDrivers {});
ustr = callPackage ../development/libraries/ustr { };
@@ -14885,17 +14886,8 @@ in
rpcbind = callPackage ../servers/rpcbind { };
libmysqlclient = libmysqlclient_3_1;
libmysqlclient_3_1 = mariadb-connector-c_3_1;
mariadb-connector-c = mariadb-connector-c_3_1;
mariadb-connector-c_3_1 = callPackage ../servers/sql/mariadb/connector-c/3_1.nix { };
mariadb-galera = mariadb-galera_25;
mariadb-galera_25 = callPackage ../servers/sql/mariadb/galera/25.nix {
asio = asio_1_10;
};
mariadb = callPackage ../servers/sql/mariadb {
asio = asio_1_10;
# As per mariadb's cmake, "static jemalloc_pic.a can only be used up to jemalloc 4".
# https://jira.mariadb.org/browse/MDEV-15034
jemalloc = jemalloc450.override ({ disableInitExecTls = true; });
@@ -24163,7 +24155,7 @@ in
mnemonicode = callPackage ../misc/mnemonicode { };
mysql-workbench = callPackage ../applications/misc/mysql-workbench (let mysql = mysql57; in {
gdal = gdal.override {libmysqlclient = mysql // {lib = {dev = mysql;};};};
gdal = gdal.override {mysql = mysql // {lib = {dev = mysql;};};};
mysql = mysql;
pcre = pcre-cpp;
});