cafkafk/nixpkgs
cafkafk/nixpkgs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 2

adns: dropped obsolete versions and static-only feature

Browse source 
svn path=/nixpkgs/trunk/; revision=27890
This commit is contained in:
Peter Simons 2011-07-21 20:58:34 +00:00
parent 9387a99a19
commit 903c9189c4
6 changed files with 23 additions and 64 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
pkgs/development/libraries/adns/1.1.nix
View file

@ -1,9 +0,0 @@
{ stdenv, fetchurl, version ? "1.1", static }:
assert version == "1.1";
import ./default.nix
{
inherit stdenv fetchurl static version;
versionHash = "02plci50c7svbq15284z40c5aglydzh2zp68dj4lnigaxr6vm5vn";
}

9
pkgs/development/libraries/adns/1.2.nix
View file

@ -1,9 +0,0 @@
{ stdenv, fetchurl, version ? "1.2", static }:
assert version == "1.2";
import ./default.nix
{
inherit stdenv fetchurl static version;
versionHash = "0jn03hz6q4r6x40cxc94n38mxxj45f73xqisi0sh7zmvixh3qhi2";
}

9
pkgs/development/libraries/adns/1.3.nix
View file

@ -1,9 +0,0 @@
{ stdenv, fetchurl, version ? "1.3", static }:
assert version == "1.3";
import ./default.nix
{
inherit stdenv fetchurl static version;
versionHash = "05hd7qspvlsac9bqzx86r5a1wv7x1zdmqx6pi3ddk094m0n4bqn6";
}

9
pkgs/development/libraries/adns/1.4.nix
View file

@ -1,9 +0,0 @@
{ stdenv, fetchurl, version ? "1.4", static }:
assert version == "1.4";
import ./default.nix
{
inherit stdenv fetchurl static version;
versionHash = "1zm99i9fd5gfijd144ajngn6x73563355im79sqdi98pj6ir4yvi";
}

46
pkgs/development/libraries/adns/default.nix
View file

@ -1,31 +1,29 @@
{ stdenv, fetchurl, version, versionHash, static }:
{ stdenv, fetchurl }:
stdenv.mkDerivation
{
let
version = "1.4";
in
stdenv.mkDerivation {
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.
doCheck = false;
# adns doesn't understand the automatic --disable-shared from the Cygwin stdenv.
cygwinConfigureEnableShared = true;
meta = {
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 ];
};
}

5
pkgs/top-level/all-packages.nix
View file

@ -2879,10 +2879,7 @@ let
acl = callPackage ../development/libraries/acl { };
adns = import ../development/libraries/adns/1.4.nix {
inherit stdenv fetchurl;
static = getConfig [ "adns" "static" ] (stdenv ? isStatic || stdenv ? isDietLibC);
};
adns = callPackage ../development/libraries/adns { };
agg = callPackage ../development/libraries/agg { };