diff --git a/pkgs/development/compilers/ccl/default.nix b/pkgs/development/compilers/ccl/default.nix index 54628fa509d..7678c066df2 100644 --- a/pkgs/development/compilers/ccl/default.nix +++ b/pkgs/development/compilers/ccl/default.nix @@ -5,13 +5,13 @@ let ]; in rec { - version = "1.4"; + version = "1.8"; name = "ccl-${version}"; /* There are also MacOS and FreeBSD and Windows versions */ src = a.fetchurl { url = "ftp://ftp.clozure.com/pub/release/${version}/${name}-linuxx86.tar.gz"; - sha256 = "1z4x4kxjj2ligb2vfrx5mjww20gdkxbvgw1ax5l9c8ha802bfyg8"; + sha256 = "1dgg6a8i2csa6xidsq66hbw7zx62gm2178hpkp88yyzgxylszp01"; }; inherit buildInputs; diff --git a/pkgs/development/compilers/ecl/default.nix b/pkgs/development/compilers/ecl/default.nix index c08fc3ee585..fb801b6b844 100644 --- a/pkgs/development/compilers/ecl/default.nix +++ b/pkgs/development/compilers/ecl/default.nix @@ -3,16 +3,23 @@ , ...} @ x: builderDefsPackage (a : let - s = import ./src-for-default.nix; propagatedBuildInputs = with a; [ gmp mpfr ]; buildInputs = [ gmp libffi mpfr ]; in rec { - src = a.fetchUrlFromSrcInfo s; + mainVersion = "12.7"; + revision = "1"; + version = "${mainVersion}.${revision}"; + + name = "ecl-${version}"; + + src = a.fetchurl { + url = "mirror://sourceforge/project/ecls/ecls/${mainVersion}/${name}.tar.gz"; + sha256 = "0k8ww142g3bybvvnlijqsbidl8clbs1pb4ympk2ds07z5swvy2ap"; + }; - inherit (s) name; inherit buildInputs propagatedBuildInputs; configureFlags = [ "--enable-threads" diff --git a/pkgs/development/compilers/ecl/src-for-default.nix b/pkgs/development/compilers/ecl/src-for-default.nix deleted file mode 100644 index 1baaf4bbec4..00000000000 --- a/pkgs/development/compilers/ecl/src-for-default.nix +++ /dev/null @@ -1,7 +0,0 @@ -rec { - version="12.2.1"; - name="ecl-12.2.1"; - hash="dbb3f83c27f3d2565ca22c1c6b4ab497bbfdd0d0a7b09dee76338f378621f091"; - url="http://downloads.sourceforge.net/project/ecls/ecls/12.2/ecl-${version}.tgz"; - advertisedUrl="http://downloads.sourceforge.net/project/ecls/ecls/12.2/ecl-12.2.1.tgz"; -} diff --git a/pkgs/development/compilers/ecl/src-info-for-default.nix b/pkgs/development/compilers/ecl/src-info-for-default.nix deleted file mode 100644 index 1f5f3270f53..00000000000 --- a/pkgs/development/compilers/ecl/src-info-for-default.nix +++ /dev/null @@ -1,6 +0,0 @@ -{ - downloadPage = "http://sourceforge.net/projects/ecls/files/"; - baseName = "ecl"; - choiceCommand = "head -1 | sed -e 's@/download@@;'\"$skipRedirectSF\""; - sourceRegexp = ".*[.](tar.gz|tgz|tbz2|tar.bz2)"; -} diff --git a/pkgs/misc/emulators/wine/default.nix b/pkgs/misc/emulators/wine/default.nix index b35660daf5e..a59bce94ab5 100644 --- a/pkgs/misc/emulators/wine/default.nix +++ b/pkgs/misc/emulators/wine/default.nix @@ -7,11 +7,11 @@ assert stdenv.isLinux; assert stdenv.gcc.gcc != null; stdenv.mkDerivation rec { - name = "wine-1.5.10"; + name = "wine-1.5.15"; src = fetchurl { url = "mirror://sourceforge/wine/${name}.tar.bz2"; - sha256 = "04wydwc8q49bw8brlklx2nbgr453lx7bbfass5zn88xbz997lppk"; + sha256 = "0m4lnqq4aniczp6m67m2n2ijz9h8z83ka3y30kyxkidv0j16jhi6"; }; gecko = fetchurl { diff --git a/pkgs/servers/dns/bind/default.nix b/pkgs/servers/dns/bind/default.nix index 2e1af8a2cbc..54fa398a8e9 100644 --- a/pkgs/servers/dns/bind/default.nix +++ b/pkgs/servers/dns/bind/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchurl, openssl, libtool, perl, libxml2 }: -let version = "9.7.6-P3"; in +let version = "9.9.2"; in stdenv.mkDerivation rec { @@ -8,7 +8,7 @@ stdenv.mkDerivation rec { src = fetchurl { url = "http://ftp.isc.org/isc/bind9/${version}/${name}.tar.gz"; - sha256 = "0xx23dcy9rbky8ar89pg3s07njqy7667sfrnbqc334pvd2qxanjx"; + sha256 = "0j4v01ch4xkgnsnngmh6bpapzi53n4k79gbbhmxf44nmk2qk0rby"; }; patchPhase = '' diff --git a/pkgs/servers/http/apache-httpd/2.4.nix b/pkgs/servers/http/apache-httpd/2.4.nix index 44fa145b605..507ced85998 100644 --- a/pkgs/servers/http/apache-httpd/2.4.nix +++ b/pkgs/servers/http/apache-httpd/2.4.nix @@ -24,7 +24,7 @@ stdenv.mkDerivation rec { buildInputs = [perl] ++ optional ldapSupport openldap ++ # there is no --with-ldap flag - optional libxml2Support libxml2; # there is --with-libxml2, but it doesn't work + optional libxml2Support libxml2; # Required for ‘pthread_cancel’. NIX_LDFLAGS = "-lgcc_s"; @@ -38,9 +38,13 @@ stdenv.mkDerivation rec { --disable-debugger-mode --enable-mods-shared=all --enable-mpms-shared=all + --enable-cern-meta + --enable-imagemap + --enable-cgi ${optionalString proxySupport "--enable-proxy"} ${optionalString sslSupport "--enable-ssl --with-ssl=${openssl}"} ${optionalString luaSupport "--enable-lua --with-lua=${lua5}"} + ${optionalString libxml2Support "--with-libxml2=${libxml2}/include/libxml2"} ''; postInstall = '' diff --git a/pkgs/servers/squid/squids.nix b/pkgs/servers/squid/squids.nix index 3e5e4ebbe6f..b349ab617ac 100644 --- a/pkgs/servers/squid/squids.nix +++ b/pkgs/servers/squid/squids.nix @@ -30,16 +30,16 @@ rec { configureFlags = ["--enable-ipv6"]; }; - squid32Beta = squid30.merge rec { - name = "squid-3.2.0.16"; + squid32 = squid30.merge rec { + name = "squid-3.2.2"; src = args.fetchurl { url = "http://www.squid-cache.org/Versions/v3/3.2/${name}.tar.bz2"; - sha256 = "2431f4f9372e4e1a9c5fca5a4fa0c4bb0761ce3e044642ea9362bb1580a36d25"; + sha256 = "13jlx3d6rqq7ajxs8bgn8a0mh932jhq6aa8032q205nxnhqs0l4l"; }; configureFlags = ["--enable-ipv6"]; buildInputs = [openldap pam db4 cyrus_sasl libcap expat libxml2 libtool openssl]; }; - latest = squid32Beta; + latest = squid32; } diff --git a/pkgs/tools/package-management/nix/unstable.nix b/pkgs/tools/package-management/nix/unstable.nix index dfe6e491c37..72af812efc9 100644 --- a/pkgs/tools/package-management/nix/unstable.nix +++ b/pkgs/tools/package-management/nix/unstable.nix @@ -5,11 +5,11 @@ }: stdenv.mkDerivation rec { - name = "nix-1.2pre2910_b674665"; + name = "nix-1.2pre2950_ac238d6"; src = fetchurl { - url = "http://hydra.nixos.org/build/3031673/download/4/${name}.tar.bz2"; - sha256 = "fa9849f69a262547856190fe1a24e6d6bd15344fe2ef0a0e54c35ab172074a22"; + url = "http://hydra.nixos.org/build/3185460/download/4/${name}.tar.bz2"; + sha256 = "a8aacdf4d459142843848d35a4d51304aaa1e41ca0a6dfdfc287748aa3ca7231"; }; buildNativeInputs = [ perl pkgconfig ];