Author: simons
Date: Thu Jul 21 20:58:34 2011
New Revision: 27890
URL: https://svn.nixos.org/websvn/nix/?rev=27890&sc=1
Log:
adns: dropped obsolete versions and static-only feature
Deleted:
nixpkgs/trunk/pkgs/development/libraries/adns/1.1.nix
nixpkgs/trunk/pkgs/development/libraries/adns/1.2.nix
nixpkgs/trunk/pkgs/development/libraries/adns/1.3.nix
nixpkgs/trunk/pkgs/development/libraries/adns/1.4.nix
Modified:
nixpkgs/trunk/pkgs/development/libraries/adns/default.nix
nixpkgs/trunk/pkgs/top-level/all-packages.nix
Modified: nixpkgs/trunk/pkgs/development/libraries/adns/default.nix
==============================================================================
--- nixpkgs/trunk/pkgs/development/libraries/adns/default.nix Thu Jul 21
20:14:17 2011 (r27889)
+++ nixpkgs/trunk/pkgs/development/libraries/adns/default.nix Thu Jul 21
20:58:34 2011 (r27890)
@@ -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}";
+
+ 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";
};
- configureFlags = if static then "--disable-dynamic" else "--enable-dynamic";
- CPPFLAGS = "-DNDEBUG";
- CFLAGS = "-O3";
- # FIXME: The test suite fails on NixOS in a chroot. See
# 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 ];
+ };
}
Modified: nixpkgs/trunk/pkgs/top-level/all-packages.nix
==============================================================================
--- nixpkgs/trunk/pkgs/top-level/all-packages.nix Thu Jul 21 20:14:17
2011 (r27889)
+++ nixpkgs/trunk/pkgs/top-level/all-packages.nix Thu Jul 21 20:58:34
2011 (r27890)
@@ -2879,10 +2879,7 @@
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 { };
_______________________________________________
nix-commits mailing list
[email protected]
http://mail.cs.uu.nl/mailman/listinfo/nix-commits
