mirror of
https://github.com/ilyakooo0/nixpkgs.git
synced 2024-12-26 21:33:03 +03:00
adns: dropped obsolete versions and static-only feature
svn path=/nixpkgs/trunk/; revision=27890
This commit is contained in:
parent
9387a99a19
commit
903c9189c4
@ -1,9 +0,0 @@
|
|||||||
{ stdenv, fetchurl, version ? "1.1", static }:
|
|
||||||
|
|
||||||
assert version == "1.1";
|
|
||||||
|
|
||||||
import ./default.nix
|
|
||||||
{
|
|
||||||
inherit stdenv fetchurl static version;
|
|
||||||
versionHash = "02plci50c7svbq15284z40c5aglydzh2zp68dj4lnigaxr6vm5vn";
|
|
||||||
}
|
|
@ -1,9 +0,0 @@
|
|||||||
{ stdenv, fetchurl, version ? "1.2", static }:
|
|
||||||
|
|
||||||
assert version == "1.2";
|
|
||||||
|
|
||||||
import ./default.nix
|
|
||||||
{
|
|
||||||
inherit stdenv fetchurl static version;
|
|
||||||
versionHash = "0jn03hz6q4r6x40cxc94n38mxxj45f73xqisi0sh7zmvixh3qhi2";
|
|
||||||
}
|
|
@ -1,9 +0,0 @@
|
|||||||
{ stdenv, fetchurl, version ? "1.3", static }:
|
|
||||||
|
|
||||||
assert version == "1.3";
|
|
||||||
|
|
||||||
import ./default.nix
|
|
||||||
{
|
|
||||||
inherit stdenv fetchurl static version;
|
|
||||||
versionHash = "05hd7qspvlsac9bqzx86r5a1wv7x1zdmqx6pi3ddk094m0n4bqn6";
|
|
||||||
}
|
|
@ -1,9 +0,0 @@
|
|||||||
{ stdenv, fetchurl, version ? "1.4", static }:
|
|
||||||
|
|
||||||
assert version == "1.4";
|
|
||||||
|
|
||||||
import ./default.nix
|
|
||||||
{
|
|
||||||
inherit stdenv fetchurl static version;
|
|
||||||
versionHash = "1zm99i9fd5gfijd144ajngn6x73563355im79sqdi98pj6ir4yvi";
|
|
||||||
}
|
|
@ -1,31 +1,29 @@
|
|||||||
{ stdenv, fetchurl, version, versionHash, static }:
|
{ stdenv, fetchurl }:
|
||||||
|
|
||||||
stdenv.mkDerivation
|
let
|
||||||
{
|
version = "1.4";
|
||||||
|
in
|
||||||
|
stdenv.mkDerivation {
|
||||||
name = "adns-${version}";
|
name = "adns-${version}";
|
||||||
meta =
|
|
||||||
{
|
|
||||||
homepage = "http://www.chiark.greenend.org.uk/~ian/adns/";
|
|
||||||
description = "Asynchronous DNS Resolver Library";
|
|
||||||
license = "LGPL-v2";
|
|
||||||
};
|
|
||||||
src = fetchurl
|
|
||||||
{
|
|
||||||
urls =
|
|
||||||
[ "http://www.chiark.greenend.org.uk/~ian/adns/ftp/adns-${version}.tar.gz"
|
|
||||||
"ftp://ftp.chiark.greenend.org.uk/users/ian/adns/adns-${version}.tar.gz"
|
|
||||||
"mirror://gnu/adns/adns-${version}.tar.gz"
|
|
||||||
];
|
|
||||||
sha256 = "${versionHash}";
|
|
||||||
};
|
|
||||||
configureFlags = if static then "--disable-dynamic" else "--enable-dynamic";
|
|
||||||
CPPFLAGS = "-DNDEBUG";
|
|
||||||
CFLAGS = "-O3";
|
|
||||||
|
|
||||||
# FIXME: The test suite fails on NixOS in a chroot. See
|
src = fetchurl {
|
||||||
|
urls = [
|
||||||
|
"http://www.chiark.greenend.org.uk/~ian/adns/ftp/adns-${version}.tar.gz"
|
||||||
|
"ftp://ftp.chiark.greenend.org.uk/users/ian/adns/adns-${version}.tar.gz"
|
||||||
|
"mirror://gnu/adns/adns-${version}.tar.gz"
|
||||||
|
];
|
||||||
|
sha256 = "1zm99i9fd5gfijd144ajngn6x73563355im79sqdi98pj6ir4yvi";
|
||||||
|
};
|
||||||
|
|
||||||
# http://thread.gmane.org/gmane.linux.distributions.nixos/1328 for details.
|
# http://thread.gmane.org/gmane.linux.distributions.nixos/1328 for details.
|
||||||
doCheck = false;
|
doCheck = false;
|
||||||
|
|
||||||
# adns doesn't understand the automatic --disable-shared from the Cygwin stdenv.
|
meta = {
|
||||||
cygwinConfigureEnableShared = true;
|
homepage = "http://www.chiark.greenend.org.uk/~ian/adns/";
|
||||||
|
description = "Asynchronous DNS Resolver Library";
|
||||||
|
license = "LGPL-v2";
|
||||||
|
|
||||||
|
platforms = stdenv.lib.platforms.unix;
|
||||||
|
maintainers = [ stdenv.lib.maintainers.simons ];
|
||||||
|
};
|
||||||
}
|
}
|
||||||
|
@ -2879,10 +2879,7 @@ let
|
|||||||
|
|
||||||
acl = callPackage ../development/libraries/acl { };
|
acl = callPackage ../development/libraries/acl { };
|
||||||
|
|
||||||
adns = import ../development/libraries/adns/1.4.nix {
|
adns = callPackage ../development/libraries/adns { };
|
||||||
inherit stdenv fetchurl;
|
|
||||||
static = getConfig [ "adns" "static" ] (stdenv ? isStatic || stdenv ? isDietLibC);
|
|
||||||
};
|
|
||||||
|
|
||||||
agg = callPackage ../development/libraries/agg { };
|
agg = callPackage ../development/libraries/agg { };
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user