From a9345a51c58de2d5ef89386fb39661f3b9f78af9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?= Date: Fri, 7 Jan 2011 11:33:04 +0000 Subject: [PATCH] Updating bind svn path=/nixpkgs/trunk/; revision=25457 --- pkgs/servers/dns/bind/9.5.0.nix | 19 ------------------- pkgs/servers/dns/bind/default.nix | 26 ++++++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 4 ++-- 3 files changed, 28 insertions(+), 21 deletions(-) delete mode 100644 pkgs/servers/dns/bind/9.5.0.nix create mode 100644 pkgs/servers/dns/bind/default.nix diff --git a/pkgs/servers/dns/bind/9.5.0.nix b/pkgs/servers/dns/bind/9.5.0.nix deleted file mode 100644 index b6361864d10..00000000000 --- a/pkgs/servers/dns/bind/9.5.0.nix +++ /dev/null @@ -1,19 +0,0 @@ - -args : with args; -rec { - src = fetchurl { - url = http://ftp.isc.org/isc/bind9/9.5.0/bind-9.5.0.tar.gz; - sha256 = "0qfxipj6v9hs9plx388ysnyvpkiamgxpsq8xqzw9hliag4nc1d7v"; - }; - - buildInputs = [openssl libtool]; - configureFlags = ["--with-libtool" "--with-openssl=${openssl}"]; - - /* doConfigure should be specified separately */ - phaseNames = ["doConfigure" "doMakeInstall"]; - - name = "bind-9.5.0"; - meta = { - description = "ISC BIND: a domain name server"; - }; -} diff --git a/pkgs/servers/dns/bind/default.nix b/pkgs/servers/dns/bind/default.nix new file mode 100644 index 00000000000..2ec924366a0 --- /dev/null +++ b/pkgs/servers/dns/bind/default.nix @@ -0,0 +1,26 @@ +{ stdenv, fetchurl, openssl, libtool, perl, libxml2 }: + +let + version = "9.7.2-P3"; +in +stdenv.mkDerivation rec { + + name = "bind-${version}"; + + src = fetchurl { + url = "http://ftp.isc.org/isc/bind9/${version}/${name}.tar.gz"; + sha256 = "0zpvmgs75lisw746wccm2r428dmd4vv5s1pc512lyrmycr3mz56d"; + }; + + buildInputs = [ openssl libtool perl libxml2 ]; + + /* Why --with-libtool? */ + configureFlags = [ "--with-libtool" "--with-openssl=${openssl}" ]; + + meta = { + homepage = http://www.isc.org/software/bind; + description = "ISC BIND: a domain name server"; + maintainers = with stdenv.lib.maintainers; [viric]; + platforms = with stdenv.lib.platforms; linux; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index eb89317a287..ccb19781ad8 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -4346,8 +4346,8 @@ let sabnzbd = callPackage ../servers/sabnzbd { }; - bind = builderDefsPackage (import ../servers/dns/bind/9.5.0.nix) { - inherit openssl libtool; + bind = callPackage ../servers/dns/bind/default.nix { + inherit openssl libtool perl; }; dico = callPackage ../servers/dico { };