1
0
Fork 1
mirror of https://github.com/NixOS/nixpkgs.git synced 2024-09-11 15:08:33 +01:00

Merge pull request #20046 from copumpkin/omg-test

Remove obsolete versions of db
This commit is contained in:
Daniel Peebles 2016-11-01 08:16:55 -04:00 committed by GitHub
commit 1fa9d99776
5 changed files with 3 additions and 32 deletions

View file

@ -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" ]; };
})

View file

@ -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" ]; };
})

View file

@ -1,8 +0,0 @@
{ stdenv, fetchurl, ... } @ args:
import ./generic.nix (args // rec {
version = "4.7.25";
sha256 = "0gi667v9cw22c03hddd6xd6374l0pczsd56b7pba25c9sdnxjkzi";
branch = "4.7";
drvArgs = { hardeningDisable = [ "format" ]; };
})

View file

@ -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 ];
};
};
}

View file

@ -5519,7 +5519,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 {
@ -6500,7 +6500,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
};
@ -6714,9 +6714,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 { };
db5 = db53;
db53 = callPackage ../development/libraries/db/db-5.3.nix { };