From e41d2a83063eb634bb06cd346ffd38c7e73be821 Mon Sep 17 00:00:00 2001 From: Dan Peebles Date: Tue, 1 Nov 2016 03:06:57 +0000 Subject: [PATCH 1/3] db44: remove outdated version --- pkgs/development/libraries/db/db-4.4.nix | 9 --------- pkgs/top-level/all-packages.nix | 1 - 2 files changed, 10 deletions(-) delete mode 100644 pkgs/development/libraries/db/db-4.4.nix diff --git a/pkgs/development/libraries/db/db-4.4.nix b/pkgs/development/libraries/db/db-4.4.nix deleted file mode 100644 index 00875d73f418..000000000000 --- a/pkgs/development/libraries/db/db-4.4.nix +++ /dev/null @@ -1,9 +0,0 @@ -{ stdenv, fetchurl, ... } @ args: - -import ./generic.nix (args // rec { - version = "4.4.20"; - extraPatches = [ ./cygwin-4.4.patch ]; - sha256 = "0y9vsq8dkarx1mhhip1vaciz6imbbyv37c1dm8b20l7p064bg2i9"; - branch = "4.4"; - drvArgs = { hardeningDisable = [ "format" ]; }; -}) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 9583121c019a..2e259f1b4c6d 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -6712,7 +6712,6 @@ in # bsd-like license db = db5; db4 = db48; - db44 = callPackage ../development/libraries/db/db-4.4.nix { }; db45 = callPackage ../development/libraries/db/db-4.5.nix { }; db47 = callPackage ../development/libraries/db/db-4.7.nix { }; db48 = callPackage ../development/libraries/db/db-4.8.nix { }; From 89915f82062085585b04f23ccc7edf94bf30b6a4 Mon Sep 17 00:00:00 2001 From: Dan Peebles Date: Tue, 1 Nov 2016 03:10:13 +0000 Subject: [PATCH 2/3] db45: remove outdated version --- pkgs/development/libraries/db/db-4.5.nix | 9 --------- pkgs/misc/my-env/default.nix | 2 +- pkgs/top-level/all-packages.nix | 1 - 3 files changed, 1 insertion(+), 11 deletions(-) delete mode 100644 pkgs/development/libraries/db/db-4.5.nix diff --git a/pkgs/development/libraries/db/db-4.5.nix b/pkgs/development/libraries/db/db-4.5.nix deleted file mode 100644 index 84b5ea67420a..000000000000 --- a/pkgs/development/libraries/db/db-4.5.nix +++ /dev/null @@ -1,9 +0,0 @@ -{ stdenv, fetchurl, ... } @ args: - -import ./generic.nix (args // rec { - version = "4.5.20"; - extraPatches = [ ./cygwin-4.5.patch ./register-race-fix.patch ]; - sha256 = "0bd81k0qv5i8w5gbddrvld45xi9k1gvmcrfm0393v0lrm37dab7m"; - branch = "4.5"; - drvArgs = { hardeningDisable = [ "format" ]; }; -}) diff --git a/pkgs/misc/my-env/default.nix b/pkgs/misc/my-env/default.nix index 5e94f6f7771c..ffdaf3949aea 100644 --- a/pkgs/misc/my-env/default.nix +++ b/pkgs/misc/my-env/default.nix @@ -41,7 +41,7 @@ # this is the example we will be using nixEnv = complicatedMyEnv { name = "nix"; - buildInputs = [ libtool stdenv perl curl bzip2 openssl db45 autoconf automake zlib ]; + buildInputs = [ libtool stdenv perl curl bzip2 openssl db5 autoconf automake zlib ]; }; }; } diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 2e259f1b4c6d..b84d70e7889f 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -6712,7 +6712,6 @@ in # bsd-like license db = db5; db4 = db48; - db45 = callPackage ../development/libraries/db/db-4.5.nix { }; db47 = callPackage ../development/libraries/db/db-4.7.nix { }; db48 = callPackage ../development/libraries/db/db-4.8.nix { }; db5 = db53; From 50874525d1d252138ae8df9290cba128bbd70218 Mon Sep 17 00:00:00 2001 From: Dan Peebles Date: Tue, 1 Nov 2016 03:18:01 +0000 Subject: [PATCH 3/3] db47: remove outdated version --- pkgs/development/libraries/db/db-4.7.nix | 8 -------- pkgs/top-level/all-packages.nix | 5 ++--- 2 files changed, 2 insertions(+), 11 deletions(-) delete mode 100644 pkgs/development/libraries/db/db-4.7.nix diff --git a/pkgs/development/libraries/db/db-4.7.nix b/pkgs/development/libraries/db/db-4.7.nix deleted file mode 100644 index 6016d112d517..000000000000 --- a/pkgs/development/libraries/db/db-4.7.nix +++ /dev/null @@ -1,8 +0,0 @@ -{ stdenv, fetchurl, ... } @ args: - -import ./generic.nix (args // rec { - version = "4.7.25"; - sha256 = "0gi667v9cw22c03hddd6xd6374l0pczsd56b7pba25c9sdnxjkzi"; - branch = "4.7"; - drvArgs = { hardeningDisable = [ "format" ]; }; -}) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index b84d70e7889f..ebe8acbe9e84 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -5517,7 +5517,7 @@ in python3Packages = python35Packages; python26 = callPackage ../development/interpreters/python/cpython/2.6 { - db = db47; + db = db4; self = python26; }; python27 = callPackage ../development/interpreters/python/cpython/2.7 { @@ -6498,7 +6498,7 @@ in aprutil = callPackage ../development/libraries/apr-util { bdbSupport = true; - db = if stdenv.isFreeBSD then db47 else db; + db = if stdenv.isFreeBSD then db4 else db; # XXX: only the db_185 interface was available through # apr with db58 on freebsd (nov 2015), for unknown reasons }; @@ -6712,7 +6712,6 @@ in # bsd-like license db = db5; db4 = db48; - db47 = callPackage ../development/libraries/db/db-4.7.nix { }; db48 = callPackage ../development/libraries/db/db-4.8.nix { }; db5 = db53; db53 = callPackage ../development/libraries/db/db-5.3.nix { };