From 1ea903a74a0bec86c02e2837d324e6d4fa23dcbd Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Wed, 29 Dec 2010 10:38:44 +0000 Subject: [PATCH 001/970] gui: wrap 'gui' module to ensure that it has a valid $TK_LIBRARY path svn path=/nixpkgs/branches/stdenv-updates/; revision=25318 --- .../version-management/git-and-tools/git/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/applications/version-management/git-and-tools/git/default.nix b/pkgs/applications/version-management/git-and-tools/git/default.nix index 4824f39a527..5ed6275caf7 100644 --- a/pkgs/applications/version-management/git-and-tools/git/default.nix +++ b/pkgs/applications/version-management/git-and-tools/git/default.nix @@ -84,7 +84,7 @@ stdenv.mkDerivation rec { + (if guiSupport then '' # Wrap Tcl/Tk programs - for prog in bin/gitk libexec/git-core/git-gui + for prog in bin/gitk bin/git do wrapProgram "$out/$prog" \ --set TK_LIBRARY "${tk}/lib/${tk.libPrefix}" \ From cff72e7a835bcff90bccf92be164a1d4bc263a2f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= Date: Fri, 25 Feb 2011 15:28:11 +0000 Subject: [PATCH 002/970] stdenv: Emit `phase-started' and `phase-succeeded' events. These markers follow the format of those of `nix-store --print-build-trace', which allows extraction of, say, phase durations in a similar way. svn path=/nixpkgs/branches/stdenv-updates/; revision=26115 --- pkgs/stdenv/generic/setup.sh | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/pkgs/stdenv/generic/setup.sh b/pkgs/stdenv/generic/setup.sh index ba06666ca89..4c772dcb478 100644 --- a/pkgs/stdenv/generic/setup.sh +++ b/pkgs/stdenv/generic/setup.sh @@ -814,6 +814,9 @@ genericBuild() { if test "$curPhase" = fixupPhase -a -n "$dontFixup"; then continue; fi if test "$curPhase" = distPhase -a -z "$doDist"; then continue; fi + echo + echo "@ phase-started $out $curPhase" + showPhaseHeader "$curPhase" dumpVars @@ -825,6 +828,9 @@ genericBuild() { cd "${sourceRoot:-.}" fi + echo + echo "@ phase-succeeded $out $curPhase" + stopNest done From ce63b61a909583c99da309d9cc224f37816eec82 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= Date: Fri, 25 Feb 2011 15:28:17 +0000 Subject: [PATCH 003/970] GNU libc 2.13. svn path=/nixpkgs/branches/stdenv-updates/; revision=26116 --- .../{glibc-2.12 => glibc-2.13}/builder.sh | 0 .../{glibc-2.12 => glibc-2.13}/common.nix | 6 +++--- .../{glibc-2.12 => glibc-2.13}/default.nix | 0 .../libraries/{glibc-2.12 => glibc-2.13}/info.nix | 0 .../{glibc-2.12 => glibc-2.13}/locales-builder.sh | 0 .../{glibc-2.12 => glibc-2.13}/locales.nix | 0 .../nix-locale-archive.patch | 0 .../nss-skip-unavail.patch | 0 .../{glibc-2.12 => glibc-2.13}/rpcgen-path.patch | 0 pkgs/top-level/all-packages.nix | 14 +++++++------- 10 files changed, 10 insertions(+), 10 deletions(-) rename pkgs/development/libraries/{glibc-2.12 => glibc-2.13}/builder.sh (100%) rename pkgs/development/libraries/{glibc-2.12 => glibc-2.13}/common.nix (97%) rename pkgs/development/libraries/{glibc-2.12 => glibc-2.13}/default.nix (100%) rename pkgs/development/libraries/{glibc-2.12 => glibc-2.13}/info.nix (100%) rename pkgs/development/libraries/{glibc-2.12 => glibc-2.13}/locales-builder.sh (100%) rename pkgs/development/libraries/{glibc-2.12 => glibc-2.13}/locales.nix (100%) rename pkgs/development/libraries/{glibc-2.12 => glibc-2.13}/nix-locale-archive.patch (100%) rename pkgs/development/libraries/{glibc-2.12 => glibc-2.13}/nss-skip-unavail.patch (100%) rename pkgs/development/libraries/{glibc-2.12 => glibc-2.13}/rpcgen-path.patch (100%) diff --git a/pkgs/development/libraries/glibc-2.12/builder.sh b/pkgs/development/libraries/glibc-2.13/builder.sh similarity index 100% rename from pkgs/development/libraries/glibc-2.12/builder.sh rename to pkgs/development/libraries/glibc-2.13/builder.sh diff --git a/pkgs/development/libraries/glibc-2.12/common.nix b/pkgs/development/libraries/glibc-2.13/common.nix similarity index 97% rename from pkgs/development/libraries/glibc-2.12/common.nix rename to pkgs/development/libraries/glibc-2.13/common.nix index 0ffc8d7a0e8..460deb1019b 100644 --- a/pkgs/development/libraries/glibc-2.12/common.nix +++ b/pkgs/development/libraries/glibc-2.13/common.nix @@ -11,7 +11,7 @@ cross : let # For GNU/Hurd, see below. - version = if hurdHeaders != null then "20100512" else "2.12.2"; + version = if hurdHeaders != null then "20100512" else "2.13"; needsPortsNative = stdenv.isMips || stdenv.isArm; needsPortsCross = cross.arch == "mips" || cross.arch == "arm"; @@ -20,7 +20,7 @@ let else needsPortsCross; srcPorts = fetchurl { - # These should work equally well for 2.12.2 + # These should work equally well for 2.13 url = "mirror://gnu/glibc/glibc-ports-2.12.1.tar.bz2"; sha256 = "041ix0nq7nc5r7jf80jsdlw4idah2mjp5nf7khybhc4cs1kc31ir"; }; @@ -147,7 +147,7 @@ stdenv.mkDerivation ({ } else fetchurl { url = "mirror://gnu/glibc/glibc-${version}.tar.bz2"; - sha256 = "05hjz816a2hmzc44gxxi9vrdx6l9f23az794zj45xsxr94yfpy12"; + sha256 = "1cnv319ysc8nkwpqw6f6ymb6b8hbl0nyvyx48sddkrj50lmcjwq1"; }; # `fetchurl' is a function and thus should not be passed to the diff --git a/pkgs/development/libraries/glibc-2.12/default.nix b/pkgs/development/libraries/glibc-2.13/default.nix similarity index 100% rename from pkgs/development/libraries/glibc-2.12/default.nix rename to pkgs/development/libraries/glibc-2.13/default.nix diff --git a/pkgs/development/libraries/glibc-2.12/info.nix b/pkgs/development/libraries/glibc-2.13/info.nix similarity index 100% rename from pkgs/development/libraries/glibc-2.12/info.nix rename to pkgs/development/libraries/glibc-2.13/info.nix diff --git a/pkgs/development/libraries/glibc-2.12/locales-builder.sh b/pkgs/development/libraries/glibc-2.13/locales-builder.sh similarity index 100% rename from pkgs/development/libraries/glibc-2.12/locales-builder.sh rename to pkgs/development/libraries/glibc-2.13/locales-builder.sh diff --git a/pkgs/development/libraries/glibc-2.12/locales.nix b/pkgs/development/libraries/glibc-2.13/locales.nix similarity index 100% rename from pkgs/development/libraries/glibc-2.12/locales.nix rename to pkgs/development/libraries/glibc-2.13/locales.nix diff --git a/pkgs/development/libraries/glibc-2.12/nix-locale-archive.patch b/pkgs/development/libraries/glibc-2.13/nix-locale-archive.patch similarity index 100% rename from pkgs/development/libraries/glibc-2.12/nix-locale-archive.patch rename to pkgs/development/libraries/glibc-2.13/nix-locale-archive.patch diff --git a/pkgs/development/libraries/glibc-2.12/nss-skip-unavail.patch b/pkgs/development/libraries/glibc-2.13/nss-skip-unavail.patch similarity index 100% rename from pkgs/development/libraries/glibc-2.12/nss-skip-unavail.patch rename to pkgs/development/libraries/glibc-2.13/nss-skip-unavail.patch diff --git a/pkgs/development/libraries/glibc-2.12/rpcgen-path.patch b/pkgs/development/libraries/glibc-2.13/rpcgen-path.patch similarity index 100% rename from pkgs/development/libraries/glibc-2.12/rpcgen-path.patch rename to pkgs/development/libraries/glibc-2.13/rpcgen-path.patch diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index c8588aa435f..1823eab018e 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -2970,7 +2970,7 @@ let glfw = callPackage ../development/libraries/glfw { }; - glibc = glibc212; + glibc = glibc213; glibc25 = callPackage ../development/libraries/glibc-2.5 { kernelHeaders = linuxHeaders; @@ -2994,15 +2994,15 @@ let installLocales = getPkgConfig "glibc" "locales" false; }); - glibc212 = (callPackage ../development/libraries/glibc-2.12 { + glibc213 = (callPackage ../development/libraries/glibc-2.13 { kernelHeaders = linuxHeaders; installLocales = getPkgConfig "glibc" "locales" false; machHeaders = null; hurdHeaders = null; gccCross = null; - }) // (if crossSystem != null then { hostDrv = glibc212Cross; } else {}); + }) // (if crossSystem != null then { hostDrv = glibc213Cross; } else {}); - glibc212Cross = forceBuildDrv (makeOverridable (import ../development/libraries/glibc-2.12) + glibc213Cross = forceBuildDrv (makeOverridable (import ../development/libraries/glibc-2.13) (let crossGNU = (crossSystem != null && crossSystem.config == "i586-pc-gnu"); in ({ inherit stdenv fetchurl; @@ -3017,7 +3017,7 @@ let then { inherit machHeaders hurdHeaders mig fetchgit; } else { })))); - glibcCross = glibc212Cross; + glibcCross = glibc213Cross; # We can choose: libcCrossChooser = name : if (name == "glibc") then glibcCross @@ -3038,9 +3038,9 @@ let installLocales = getPkgConfig "glibc" "locales" false; }; - glibcLocales = callPackage ../development/libraries/glibc-2.12/locales.nix { }; + glibcLocales = callPackage ../development/libraries/glibc-2.13/locales.nix { }; - glibcInfo = callPackage ../development/libraries/glibc-2.12/info.nix { }; + glibcInfo = callPackage ../development/libraries/glibc-2.13/info.nix { }; glibc_multi = runCommand "${glibc.name}-multi" From 99a303b0dc70108ac22d38d3d9199fe5598f0277 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= Date: Fri, 25 Feb 2011 15:28:22 +0000 Subject: [PATCH 004/970] GNU Coreutils 8.10. svn path=/nixpkgs/branches/stdenv-updates/; revision=26117 --- pkgs/tools/misc/coreutils/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/misc/coreutils/default.nix b/pkgs/tools/misc/coreutils/default.nix index 21ce9215017..65d5cb6c8f9 100644 --- a/pkgs/tools/misc/coreutils/default.nix +++ b/pkgs/tools/misc/coreutils/default.nix @@ -3,11 +3,11 @@ assert aclSupport -> acl != null; stdenv.mkDerivation rec { - name = "coreutils-8.7"; + name = "coreutils-8.10"; src = fetchurl { url = "mirror://gnu/coreutils/${name}.tar.gz"; - sha256 = "11ykd7glys6lcfb2mwgmkqmmffv1pan70j6sl9vcjpnlf9dvk7bw"; + sha256 = "11fr0hkdk9h7a5ggpp3hj45ryvq3gc8ri2kksbgn7v8rjmp1x1jb"; }; buildNativeInputs = [ perl ]; From c1cfa5855610ffb36b146fb41df59574964f80bf Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= Date: Fri, 25 Feb 2011 15:28:26 +0000 Subject: [PATCH 005/970] GNU Readline 6.2. svn path=/nixpkgs/branches/stdenv-updates/; revision=26118 --- pkgs/development/libraries/readline/readline6.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/readline/readline6.nix b/pkgs/development/libraries/readline/readline6.nix index 18118abedd9..b927e804200 100644 --- a/pkgs/development/libraries/readline/readline6.nix +++ b/pkgs/development/libraries/readline/readline6.nix @@ -1,11 +1,11 @@ { fetchurl, stdenv, ncurses }: stdenv.mkDerivation rec { - name = "readline-6.1"; + name = "readline-6.2"; src = fetchurl { url = "mirror://gnu/readline/${name}.tar.gz"; - sha256 = "0sd97zqdh4fc0zzgzpskkczwa2fmb0s89qdyndb6vkbcq04gdjph"; + sha256 = "10ckm2bd2rkxhvdmj7nmbsylmihw0abwcsnxf8y27305183rd9kr"; }; propagatedBuildInputs = [ncurses]; From 0f1ba30626862bb4bf4b5e0fce50e6fda996e4a3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= Date: Fri, 25 Feb 2011 15:28:29 +0000 Subject: [PATCH 006/970] GNU Bash 4.2. svn path=/nixpkgs/branches/stdenv-updates/; revision=26119 --- pkgs/shells/bash/bash-patches.nix | 2 -- pkgs/shells/bash/default.nix | 7 ++++--- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/pkgs/shells/bash/bash-patches.nix b/pkgs/shells/bash/bash-patches.nix index d22435744cc..b8019fb3350 100644 --- a/pkgs/shells/bash/bash-patches.nix +++ b/pkgs/shells/bash/bash-patches.nix @@ -1,6 +1,4 @@ # Automatically generated by `update-patch-set.sh'; do not edit. patch: [ -(patch "001" "0y02cbfnc5s3dnwr4fw2nz43f3b826f5084mk7qd0lzq12hpzr56") -(patch "002" "1y3qzw6lx16vnb8hrw3zx01z25k773cbmgysvs3vvcw6w6fj4bij") ] diff --git a/pkgs/shells/bash/default.nix b/pkgs/shells/bash/default.nix index f29d4354a06..5de0a2fae7d 100644 --- a/pkgs/shells/bash/default.nix +++ b/pkgs/shells/bash/default.nix @@ -3,7 +3,7 @@ assert interactive -> readline != null; let - realName = "bash-4.1"; + realName = "bash-4.2"; baseConfigureFlags = if interactive then "--with-installed-readline" else "--disable-readline"; in @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { src = fetchurl { url = "mirror://gnu/bash/${realName}.tar.gz"; - sha256 = "1np1ggp1lv8idwfx3mcxl9rhadqdf4h3x4isa3dk8v9wm0j72qiz"; + sha256 = "1n5kbblp5ykbz5q8aq88lsif2z0gnvddg9babk33024wxiwi2ym2"; }; NIX_CFLAGS_COMPILE = '' @@ -30,7 +30,7 @@ stdenv.mkDerivation rec { let patch = nr: sha256: fetchurl { - url = "mirror://gnu/bash/bash-4.1-patches/bash41-${nr}"; + url = "mirror://gnu/bash/bash-4.2-patches/bash42-${nr}"; inherit sha256; }; in @@ -80,6 +80,7 @@ stdenv.mkDerivation rec { license = "GPLv3+"; maintainers = [ stdenv.lib.maintainers.ludo ]; + platforms = stdenv.lib.platforms.all; }; passthru = { From 65c78a322252fc4ddb51348f2d2fb9d1a292ba2f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?= Date: Wed, 9 Mar 2011 20:10:47 +0000 Subject: [PATCH 007/970] Adding a manpage gzipping stage in the fixupPhase. This should go unnoticed, but for the less disk space used. svn path=/nixpkgs/branches/stdenv-updates/; revision=26241 --- pkgs/stdenv/generic/setup.sh | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/pkgs/stdenv/generic/setup.sh b/pkgs/stdenv/generic/setup.sh index 4c772dcb478..575e6046473 100644 --- a/pkgs/stdenv/generic/setup.sh +++ b/pkgs/stdenv/generic/setup.sh @@ -719,6 +719,12 @@ fixupPhase() { done; fi + if test -z "$dontBzipMan"; then + for f in $out/share/man/*/*; do + gzip -c $f > $f.gz && rm $f + done + fi + # TODO: strip _only_ ELF executables, and return || fail here... if test -z "$dontStrip"; then stripDebugList=${stripDebugList:-lib lib64 libexec bin sbin} From c06046e5ef1b2f0a5b0fe243b72a257eaa9033ad Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?= Date: Wed, 9 Mar 2011 22:17:18 +0000 Subject: [PATCH 008/970] Improving a bit the manpage gzip code. I decided to gzip hard links and soft links, as nix-store --optimise can care better later. svn path=/nixpkgs/branches/stdenv-updates/; revision=26242 --- pkgs/stdenv/generic/setup.sh | 14 +++++++++++--- 1 file changed, 11 insertions(+), 3 deletions(-) diff --git a/pkgs/stdenv/generic/setup.sh b/pkgs/stdenv/generic/setup.sh index 575e6046473..321e2673cad 100644 --- a/pkgs/stdenv/generic/setup.sh +++ b/pkgs/stdenv/generic/setup.sh @@ -719,10 +719,18 @@ fixupPhase() { done; fi - if test -z "$dontBzipMan"; then - for f in $out/share/man/*/*; do - gzip -c $f > $f.gz && rm $f + if test -z "$dontGzipMan"; then + GLOBIGNORE=.:..:*.gz:*.bz2 + for f in $out/share/man/*/* $out/share/man/*/*/*; do + if test -f $f; then + if gzip -c $f > $f.gz; then + rm $f + else + rm $f.gz + fi + fi done + unset GLOBIGNORE fi # TODO: strip _only_ ELF executables, and return || fail here... From f227549863feca39e320b7679ac73cfba927d62d Mon Sep 17 00:00:00 2001 From: "Yury G. Kudryashov" Date: Tue, 15 Mar 2011 09:24:43 +0000 Subject: [PATCH 009/970] Remove tabs svn path=/nixpkgs/branches/stdenv-updates/; revision=26310 --- pkgs/stdenv/generic/default.nix | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/pkgs/stdenv/generic/default.nix b/pkgs/stdenv/generic/default.nix index c4d6a3666d0..c01f0da93ee 100644 --- a/pkgs/stdenv/generic/default.nix +++ b/pkgs/stdenv/generic/default.nix @@ -91,8 +91,8 @@ let # Utility flags to test the type of platform. isDarwin = result.system == "i686-darwin" - || result.system == "powerpc-darwin" - || result.system == "x86_64-darwin"; + || result.system == "powerpc-darwin" + || result.system == "x86_64-darwin"; isLinux = result.system == "i686-linux" || result.system == "x86_64-linux" || result.system == "powerpc-linux" @@ -100,14 +100,14 @@ let || result.system == "mips64-linux"; isSunOS = result.system == "i386-sunos"; isCygwin = result.system == "i686-cygwin"; - isFreeBSD = result.system == "i686-freebsd" - || result.system == "x86_64-freebsd"; - isOpenBSD = result.system == "i686-openbsd" - || result.system == "x86_64-openbsd"; - isBSD = result.system == "i686-freebsd" - || result.system == "x86_64-freebsd" - || result.system == "i686-openbsd" - || result.system == "x86_64-openbsd"; + isFreeBSD = result.system == "i686-freebsd" + || result.system == "x86_64-freebsd"; + isOpenBSD = result.system == "i686-openbsd" + || result.system == "x86_64-openbsd"; + isBSD = result.system == "i686-freebsd" + || result.system == "x86_64-freebsd" + || result.system == "i686-openbsd" + || result.system == "x86_64-openbsd"; isi686 = result.system == "i686-linux" || result.system == "i686-darwin" || result.system == "i686-freebsd" From 3e71355377c0719bac49c3e3cf35dc93e6bc0dd3 Mon Sep 17 00:00:00 2001 From: "Yury G. Kudryashov" Date: Tue, 15 Mar 2011 09:24:47 +0000 Subject: [PATCH 010/970] Add two 'remove' functions svn path=/nixpkgs/branches/stdenv-updates/; revision=26311 --- pkgs/lib/lists.nix | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/pkgs/lib/lists.nix b/pkgs/lib/lists.nix index 36fa236304d..d1cdf5b68ab 100644 --- a/pkgs/lib/lists.nix +++ b/pkgs/lib/lists.nix @@ -50,6 +50,11 @@ rec { filter = pred: list: fold (x: y: if pred x then [x] ++ y else y) [] list; + # Remove elements 'e' from a list. Useful for buildInputs + remove = e: filter (x: x != e); + + # Given two lists, removes all elements of the first list from the second list + removeList = l: filter (x: elem x l); # Return true if `list' has an element `x': elem = x: list: fold (a: bs: x == a || bs) false list; From d887437d8e7efb173a4527635a5add612401283c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= Date: Wed, 23 Mar 2011 14:51:17 +0000 Subject: [PATCH 011/970] GCC 4.5: Use `install-strip' instead of `-Wl,--strip-debug'; add `gcc45_debug'. svn path=/nixpkgs/branches/stdenv-updates/; revision=26467 --- pkgs/development/compilers/gcc-4.5/builder.sh | 4 ++-- pkgs/development/compilers/gcc-4.5/default.nix | 11 ++++++++++- pkgs/top-level/all-packages.nix | 14 ++++++++++++++ 3 files changed, 26 insertions(+), 3 deletions(-) diff --git a/pkgs/development/compilers/gcc-4.5/builder.sh b/pkgs/development/compilers/gcc-4.5/builder.sh index aedd5b46b12..e684fbc951e 100644 --- a/pkgs/development/compilers/gcc-4.5/builder.sh +++ b/pkgs/development/compilers/gcc-4.5/builder.sh @@ -47,7 +47,7 @@ if test "$noSysDirs" = "1"; then fi extraFlags="-g0 -O2 -I$NIX_FIXINC_DUMMY $extraFlags" - extraLDFlags="--strip-debug -L$glibc_libdir -rpath $glibc_libdir $extraLDFlags" + extraLDFlags="-L$glibc_libdir -rpath $glibc_libdir $extraLDFlags" EXTRA_FLAGS="$extraFlags" for i in $extraLDFlags; do @@ -90,7 +90,7 @@ if test "$noSysDirs" = "1"; then glibc_libdir="$(cat $NIX_GCC_CROSS/nix-support/orig-libc)/lib" extraFlags="-g0 -O2 -I$NIX_FIXINC_DUMMY_CROSS $extraFlags" - extraLDFlags="--strip-debug -L$glibc_libdir -rpath $glibc_libdir $extraLDFlags" + extraLDFlags="-L$glibc_libdir -rpath $glibc_libdir $extraLDFlags" EXTRA_TARGET_CFLAGS="$extraFlags" for i in $extraLDFlags; do diff --git a/pkgs/development/compilers/gcc-4.5/default.nix b/pkgs/development/compilers/gcc-4.5/default.nix index 19efa57af8e..6145050e9f0 100644 --- a/pkgs/development/compilers/gcc-4.5/default.nix +++ b/pkgs/development/compilers/gcc-4.5/default.nix @@ -26,6 +26,7 @@ , crossStageStatic ? true , gnat ? null , libpthread ? null, libpthreadCross ? null # required for GNU/Hurd +, stripped ? true }: assert langTreelang -> bison != null && flex != null; @@ -259,6 +260,11 @@ stdenv.mkDerivation ({ targetConfig = if (cross != null) then cross.config else null; + installTargets = + if stripped + then "install-strip" + else "install"; + crossAttrs = { AR = "${stdenv.cross.config}-ar"; LD = "${stdenv.cross.config}-ld"; @@ -364,7 +370,8 @@ stdenv.mkDerivation ({ meta = { homepage = http://gcc.gnu.org/; license = "GPLv3+"; # runtime support libraries are typically LGPLv3+ - description = "GNU Compiler Collection, version ${version}"; + description = "GNU Compiler Collection, version ${version}" + + (if stripped then "" else " (with debugging info)"); longDescription = '' The GNU Compiler Collection includes compiler front ends for C, C++, @@ -392,6 +399,8 @@ stdenv.mkDerivation ({ installTargets = "install-gcc install-target-libgcc"; } +// optionalAttrs (!stripped) { dontStrip = true; NIX_STRIP_DEBUG = false; } + // optionalAttrs langVhdl rec { name = "ghdl-0.29"; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 1823eab018e..dd88d0e3813 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -1670,6 +1670,20 @@ let profiledCompiler = if stdenv.system == "armv5tel-linux" then false else true; })); + # A non-stripped version of GCC. + gcc45_debug = lowPrio (wrapGCC (callPackage ../development/compilers/gcc-4.5 { + stripped = false; + + inherit noSysDirs; + cross = null; + libcCross = null; + binutilsCross = null; + + # bootstrapping a profiled compiler does not work in the sheevaplug: + # http://gcc.gnu.org/bugzilla/show_bug.cgi?id=43944 + profiledCompiler = if stdenv.system == "armv5tel-linux" then false else true; + })); + gccApple = wrapGCC ( (if stdenv.system == "i686-darwin" then import ../development/compilers/gcc-apple else import ../development/compilers/gcc-apple64) { inherit fetchurl stdenv noSysDirs; From 2e8c8087347da018b0b490d102670fef2d99849c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= Date: Wed, 23 Mar 2011 14:51:21 +0000 Subject: [PATCH 012/970] Make `update-gcc.sh' more robust. svn path=/nixpkgs/branches/stdenv-updates/; revision=26468 --- pkgs/development/compilers/gcc-4.4/update-gcc.sh | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/pkgs/development/compilers/gcc-4.4/update-gcc.sh b/pkgs/development/compilers/gcc-4.4/update-gcc.sh index c93035296fc..1fb5a0c6e5b 100755 --- a/pkgs/development/compilers/gcc-4.4/update-gcc.sh +++ b/pkgs/development/compilers/gcc-4.4/update-gcc.sh @@ -36,11 +36,13 @@ do file="gcc-${component}-${version}.tar.bz2" url="${dir}/${file}" - path_and_hash="$(nix-prefetch-url "$url" 2>&1 | grep -E '^(hash|path) is')" - path="$(echo $path_and_hash | sed -e's/^.*path is \([^ ]\+\).*$/\1/g')" - hash="$(echo $path_and_hash | sed -e's/^.*hash is \([^ ]\+\).*$/\1/g')" + rm -f "${file}" - rm -f "${url}.sig" + wget "$url" + hash="$(nix-hash --flat --type sha256 "$file")" + path="$(nix-store --add-fixed sha256 "$file")" + + rm -f "${file}" "${file}.sig" wget "${url}.sig" gpg --verify "${file}.sig" "${path}" rm "${file}.sig" From d701519f5aafbd1a2eb60b72d946d2edf78bad8f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= Date: Wed, 23 Mar 2011 14:51:25 +0000 Subject: [PATCH 013/970] GCC 4.5.2. svn path=/nixpkgs/branches/stdenv-updates/; revision=26469 --- pkgs/development/compilers/gcc-4.5/default.nix | 2 +- pkgs/development/compilers/gcc-4.5/sources.nix | 14 +++++++------- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/pkgs/development/compilers/gcc-4.5/default.nix b/pkgs/development/compilers/gcc-4.5/default.nix index 6145050e9f0..abe6186ef96 100644 --- a/pkgs/development/compilers/gcc-4.5/default.nix +++ b/pkgs/development/compilers/gcc-4.5/default.nix @@ -42,7 +42,7 @@ assert libelf != null -> zlib != null; with stdenv.lib; with builtins; -let version = "4.5.1"; +let version = "4.5.2"; javaEcj = fetchurl { # The `$(top_srcdir)/ecj.jar' file is automatically picked up at # `configure' time. diff --git a/pkgs/development/compilers/gcc-4.5/sources.nix b/pkgs/development/compilers/gcc-4.5/sources.nix index 6059e03880b..6e702f79ed0 100644 --- a/pkgs/development/compilers/gcc-4.5/sources.nix +++ b/pkgs/development/compilers/gcc-4.5/sources.nix @@ -1,26 +1,26 @@ /* Automatically generated by `update-gcc.sh', do not edit. - For GCC 4.5.1. */ + For GCC 4.5.2. */ { fetchurl, optional, version, langC, langCC, langFortran, langJava, langAda }: -assert version == "4.5.1"; +assert version == "4.5.2"; optional /* langC */ true (fetchurl { url = "mirror://gcc/releases/gcc-${version}/gcc-core-${version}.tar.bz2"; - sha256 = "0sjjw3qfcpdk0fs5d2rhl0xqcaclg86ifbq45dbk9ca072l3fyxm"; + sha256 = "d1099165702ccdfd65f2411ed8d1015452190fe6bc7b87baf124794e5c8e7464"; }) ++ optional langCC (fetchurl { url = "mirror://gcc/releases/gcc-${version}/gcc-g++-${version}.tar.bz2"; - sha256 = "0j6ffb96b3r75hrjshg52llv21ax7r8jdx44hhj0maiisnl9wd55"; + sha256 = "fdd45dc9158d1d5a1c2ef0054b353d5f403e29ec360c1f8e058dc7e4531fe83b"; }) ++ optional langFortran (fetchurl { url = "mirror://gcc/releases/gcc-${version}/gcc-fortran-${version}.tar.bz2"; - sha256 = "0xgwjc3h5fc5c100bnw24c35255il33lj5qbgpxf0zl8di2q13aw"; + sha256 = "19c3c8a4b23c880a369d3229ef65406fde6af47f5127d494a87f19e1de3d9a13"; }) ++ optional langJava (fetchurl { url = "mirror://gcc/releases/gcc-${version}/gcc-java-${version}.tar.bz2"; - sha256 = "0mh37q4ibg05h1hdh39pkj1hycvdg6i79m4698knw7pppm14ax8q"; + sha256 = "c120e2dc39dd707a3d5461744b879e41f5e642661d7b8a023fc620b24bb7a2ab"; }) ++ optional langAda (fetchurl { url = "mirror://gcc/releases/gcc-${version}/gcc-ada-${version}.tar.bz2"; - sha256 = "11chdbl7h046lnl83k79vj7dvgxz6kq7cnmwx94z644vaiflg153"; + sha256 = "7ed5bb26b72dfbfaf533d09e3d34df96305c09f57f5da67939087fb2726cc771"; }) ++ [] From fff1ca83d51d8f58be4154f787b3b56893c8d732 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= Date: Thu, 24 Mar 2011 22:36:09 +0000 Subject: [PATCH 014/970] GCC 4.5.2: Attempt to fix compilation of libstdc++. svn path=/nixpkgs/branches/stdenv-updates/; revision=26499 --- .../development/compilers/gcc-4.5/default.nix | 2 +- .../compilers/gcc-4.5/pr45894.patch | 23 +++++++++++++++++++ 2 files changed, 24 insertions(+), 1 deletion(-) create mode 100644 pkgs/development/compilers/gcc-4.5/pr45894.patch diff --git a/pkgs/development/compilers/gcc-4.5/default.nix b/pkgs/development/compilers/gcc-4.5/default.nix index abe6186ef96..2e840e90fbe 100644 --- a/pkgs/development/compilers/gcc-4.5/default.nix +++ b/pkgs/development/compilers/gcc-4.5/default.nix @@ -137,7 +137,7 @@ stdenv.mkDerivation ({ }; patches = - [ ] + [ ./pr45894.patch ] ++ optional (cross != null) ./libstdc++-target.patch ++ optional noSysDirs ./no-sys-dirs.patch # The GNAT Makefiles did not pay attention to CFLAGS_FOR_TARGET for its diff --git a/pkgs/development/compilers/gcc-4.5/pr45894.patch b/pkgs/development/compilers/gcc-4.5/pr45894.patch new file mode 100644 index 00000000000..b6263faffc1 --- /dev/null +++ b/pkgs/development/compilers/gcc-4.5/pr45894.patch @@ -0,0 +1,23 @@ +See for details. + +Without this, compilation of GCC itself fails: + + ./../../../gcc-4.5.2/libstdc++-v3/src/pool_allocator.cc -fPIC -DPIC -o .libs/pool_allocator.o + In file included from ../../../../gcc-4.5.2/libstdc++-v3/src/pool_allocator.cc:31:0: + /tmp/nix-build-7d6ii7c1hqf0vzhxklbmnpbmzhq7glgr-gcc-4.5.2.drv-0/build/i686-pc-linux-gnu/libstdc++-v3/include/ext/pool_allocator.h: In constructor '__gnu_cxx::__pool_alloc<_Tp>::__pool_alloc() [with _Tp = char]': + ../../../../gcc-4.5.2/libstdc++-v3/src/pool_allocator.cc:171:18: instantiated from here + /tmp/nix-build-7d6ii7c1hqf0vzhxklbmnpbmzhq7glgr-gcc-4.5.2.drv-0/build/i686-pc-linux-gnu/libstdc++-v3/include/ext/pool_allocator.h:140:30: internal compiler error: Segmentation fault + Please submit a full bug report, + +--- gcc-4_5-branch/gcc/cp/tree.c 2010/11/11 20:40:32 166620 ++++ gcc-4_5-branch/gcc/cp/tree.c 2010/11/11 20:41:34 166621 +@@ -72,7 +72,8 @@ + == REFERENCE_TYPE) + return lvalue_p_1 (TREE_OPERAND (ref, 0)); + +- if (TREE_CODE (TREE_TYPE (ref)) == REFERENCE_TYPE) ++ if (TREE_TYPE (ref) ++ && TREE_CODE (TREE_TYPE (ref)) == REFERENCE_TYPE) + { + /* unnamed rvalue references are rvalues */ + if (TYPE_REF_IS_RVALUE (TREE_TYPE (ref)) From 570fed8e1fd807e5d38765384f3a40c6331d8137 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= Date: Fri, 25 Mar 2011 09:15:27 +0000 Subject: [PATCH 015/970] Revert "GCC 4.5.2: Attempt to fix compilation of libstdc++." This reverts r26499. svn path=/nixpkgs/branches/stdenv-updates/; revision=26504 --- .../development/compilers/gcc-4.5/default.nix | 2 +- .../compilers/gcc-4.5/pr45894.patch | 23 ------------------- 2 files changed, 1 insertion(+), 24 deletions(-) delete mode 100644 pkgs/development/compilers/gcc-4.5/pr45894.patch diff --git a/pkgs/development/compilers/gcc-4.5/default.nix b/pkgs/development/compilers/gcc-4.5/default.nix index 2e840e90fbe..abe6186ef96 100644 --- a/pkgs/development/compilers/gcc-4.5/default.nix +++ b/pkgs/development/compilers/gcc-4.5/default.nix @@ -137,7 +137,7 @@ stdenv.mkDerivation ({ }; patches = - [ ./pr45894.patch ] + [ ] ++ optional (cross != null) ./libstdc++-target.patch ++ optional noSysDirs ./no-sys-dirs.patch # The GNAT Makefiles did not pay attention to CFLAGS_FOR_TARGET for its diff --git a/pkgs/development/compilers/gcc-4.5/pr45894.patch b/pkgs/development/compilers/gcc-4.5/pr45894.patch deleted file mode 100644 index b6263faffc1..00000000000 --- a/pkgs/development/compilers/gcc-4.5/pr45894.patch +++ /dev/null @@ -1,23 +0,0 @@ -See for details. - -Without this, compilation of GCC itself fails: - - ./../../../gcc-4.5.2/libstdc++-v3/src/pool_allocator.cc -fPIC -DPIC -o .libs/pool_allocator.o - In file included from ../../../../gcc-4.5.2/libstdc++-v3/src/pool_allocator.cc:31:0: - /tmp/nix-build-7d6ii7c1hqf0vzhxklbmnpbmzhq7glgr-gcc-4.5.2.drv-0/build/i686-pc-linux-gnu/libstdc++-v3/include/ext/pool_allocator.h: In constructor '__gnu_cxx::__pool_alloc<_Tp>::__pool_alloc() [with _Tp = char]': - ../../../../gcc-4.5.2/libstdc++-v3/src/pool_allocator.cc:171:18: instantiated from here - /tmp/nix-build-7d6ii7c1hqf0vzhxklbmnpbmzhq7glgr-gcc-4.5.2.drv-0/build/i686-pc-linux-gnu/libstdc++-v3/include/ext/pool_allocator.h:140:30: internal compiler error: Segmentation fault - Please submit a full bug report, - ---- gcc-4_5-branch/gcc/cp/tree.c 2010/11/11 20:40:32 166620 -+++ gcc-4_5-branch/gcc/cp/tree.c 2010/11/11 20:41:34 166621 -@@ -72,7 +72,8 @@ - == REFERENCE_TYPE) - return lvalue_p_1 (TREE_OPERAND (ref, 0)); - -- if (TREE_CODE (TREE_TYPE (ref)) == REFERENCE_TYPE) -+ if (TREE_TYPE (ref) -+ && TREE_CODE (TREE_TYPE (ref)) == REFERENCE_TYPE) - { - /* unnamed rvalue references are rvalues */ - if (TYPE_REF_IS_RVALUE (TREE_TYPE (ref)) From 3e68d94b22f7240c2112e7574be8d40074f07ccd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= Date: Mon, 28 Mar 2011 16:11:12 +0000 Subject: [PATCH 016/970] Add `release-small.nix'. svn path=/nixpkgs/branches/stdenv-updates/; revision=26578 --- pkgs/top-level/release-small.nix | 224 +++++++++++++++++++++++++++++++ 1 file changed, 224 insertions(+) create mode 100644 pkgs/top-level/release-small.nix diff --git a/pkgs/top-level/release-small.nix b/pkgs/top-level/release-small.nix new file mode 100644 index 00000000000..68a287bbf5e --- /dev/null +++ b/pkgs/top-level/release-small.nix @@ -0,0 +1,224 @@ +/* A small release file, with few packages to be built. The aim is to reduce + the load on Hydra when testing the `stdenv-updates' branch. + + + This file will be evaluated by hydra with a call like this: + hydra_eval_jobs --gc-roots-dir \ + /nix/var/nix/gcroots/per-user/hydra/hydra-roots --argstr \ + system i686-linux --argstr system x86_64-linux --arg \ + nixpkgs "{outPath = ./}" .... release.nix + + Hydra can be installed with "nix-env -i hydra". */ +with (import ./release-lib.nix); + +{ + + tarball = import ./make-tarball.nix; + +} // (mapTestOn (rec { + + aspell = all; + at = linux; + aterm242fixes = all; + aterm25 = all; + aterm28 = all; + autoconf = all; + automake110x = all; + automake111x = all; + automake19x = all; + avahi = allBut "i686-cygwin"; # Cygwin builds fail + bash = all; + bashInteractive = all; + bc = all; + binutils = linux; + bind = linux; + bison24 = all; + boostFull = all; + bsdiff = all; + bzip2 = all; + classpath = linux; + cmake = all; + coreutils = all; + cpio = all; + cron = linux; + dhcp = linux; + diffutils = all; + e2fsprogs = linux; + emacs23 = gtkSupported; + enscript = all; + file = all; + findutils = all; + flex = all; + flex2535 = all; + gcc = all; + gcc33 = linux; + gcc34 = linux; + gcc41 = linux; + gcc42 = linux; + gcc43_multi = ["x86_64-linux"]; + gcc44 = linux; + gcj44 = linux; + ghdl = linux; + glibc = linux; + glibcLocales = linux; + gnat44 = linux; + gnugrep = all; + gnum4 = all; + gnumake = all; + gnupatch = all; + gnupg = linux; + gnuplot = allBut "i686-cygwin"; + gnused = all; + gnutar = all; + gnutls = linux; + grub = linux; + grub2 = linux; + gsl = linux; + guile = linux; # tests fail on Cygwin + gw6c = linux; + gzip = all; + hal = linux; + hal_info = linux; + hddtemp = linux; + hdparm = linux; + hello = all; + host = linux; + iana_etc = linux; + icecat3Xul = linux; + icewm = linux; + idutils = all; + ifplugd = linux; + inetutils = linux; + iputils = linux; + jnettop = linux; + jwhois = linux; + kbd = linux; + keen4 = ["i686-linux"]; + kvm = linux; + qemu = linux; + qemu_kvm = linux; + less = all; + lftp = all; + libtool = all; + libtool_2 = all; + libxml2 = all; + libxslt = all; + lout = linux; + lsh = linux; + lsof = linux; + ltrace = linux; + lvm2 = linux; + lynx = linux; + lzma = linux; + man = linux; + manpages = linux; + mc = all; + mcabber = linux; + mcron = linux; + mdadm = linux; + mesa = mesaPlatforms; + midori = linux; + mingetty = linux; + mk = linux; + mktemp = all; + module_init_tools = linux; + mono = linux; + monotone = linux; + mpg321 = linux; + mutt = linux; + mysql = linux; + mysql51 = linux; + ncat = linux; + netcat = all; + nfsUtils = linux; + nix = all; + nixUnstable = all; + nixSqlite = all; + nss_ldap = linux; + nssmdns = linux; + ntfs3g = linux; + ntp = linux; + openssh = linux; + openssl = all; + pam_console = linux; + pam_login = linux; + pam_unix2 = linux; + pan = gtkSupported; + par2cmdline = all; + pciutils = linux; + pdf2xml = all; + perl = all; + pkgconfig = all; + pmccabe = linux; + policykit = linux; + portmap = linux; + procps = linux; + pwdutils = linux; + python = allBut "i686-cygwin"; + pythonFull = linux; + readline = all; + rlwrap = all; + rpm = linux; + rsync = linux; + screen = linux ++ darwin; + scrot = linux; + sdparm = linux; + sharutils = all; + sloccount = allBut "i686-cygwin"; + smartmontools = all; + splashutils = linux; + sqlite = allBut "i686-cygwin"; + squid = linux; + ssmtp = linux; + stdenv = prio 175 all; + strace = linux; + su = linux; + sudo = linux; + sysklogd = linux; + syslinux = ["i686-linux"]; + sysvinit = linux; + sysvtools = linux; + tcl = linux; + tcpdump = linux; + tetex = linux; + texLive = linux; + texLiveBeamer = linux; + texLiveExtra = linux; + texinfo = all; + time = linux; + tinycc = ["i686-linux"]; + udev = linux; + uml = ["i686-linux"]; + unrar = linux; + unzip = all; + upstart = linux; + usbutils = linux; + utillinux = linux; + utillinuxCurses = linux; + w3m = all; + webkit = linux; + wget = all; + which = all; + wicd = linux; + wireshark = linux; + wirelesstools = linux; + wpa_supplicant = linux; + xfsprogs = linux; + xkeyboard_config = linux; + zile = linux; + zip = all; + + dbus = { + libs = linux; + tools = linux; + }; + + emacs23Packages = { + bbdb = linux; + cedet = linux; + ecb = linux; + emacsw3m = linux; + emms = linux; + nxml = all; + }; +} )) From 312680ff5089785b86756a7709aac2e0b3c92e7e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= Date: Mon, 28 Mar 2011 16:11:16 +0000 Subject: [PATCH 017/970] GCC 4.5.2: Don't use the `install-strip' target, which wasn't available. svn path=/nixpkgs/branches/stdenv-updates/; revision=26579 --- pkgs/development/compilers/gcc-4.5/default.nix | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/pkgs/development/compilers/gcc-4.5/default.nix b/pkgs/development/compilers/gcc-4.5/default.nix index abe6186ef96..1acbb82702b 100644 --- a/pkgs/development/compilers/gcc-4.5/default.nix +++ b/pkgs/development/compilers/gcc-4.5/default.nix @@ -260,11 +260,6 @@ stdenv.mkDerivation ({ targetConfig = if (cross != null) then cross.config else null; - installTargets = - if stripped - then "install-strip" - else "install"; - crossAttrs = { AR = "${stdenv.cross.config}-ar"; LD = "${stdenv.cross.config}-ld"; @@ -399,6 +394,8 @@ stdenv.mkDerivation ({ installTargets = "install-gcc install-target-libgcc"; } +# GCC 4.5.2 doesn't support the `install-strip' target, so let `stdenv' do +# the stripping by default. // optionalAttrs (!stripped) { dontStrip = true; NIX_STRIP_DEBUG = false; } // optionalAttrs langVhdl rec { From 9a9a6cd27e0fe6ade0d7f88d809d48cec2712952 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= Date: Tue, 29 Mar 2011 08:22:10 +0000 Subject: [PATCH 018/970] GCC 4.5: Remove explicit "-g0 -O2". svn path=/nixpkgs/branches/stdenv-updates/; revision=26589 --- pkgs/development/compilers/gcc-4.5/builder.sh | 6 +++--- pkgs/development/compilers/gcc-4.5/default.nix | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/development/compilers/gcc-4.5/builder.sh b/pkgs/development/compilers/gcc-4.5/builder.sh index e684fbc951e..e1e56c8574a 100644 --- a/pkgs/development/compilers/gcc-4.5/builder.sh +++ b/pkgs/development/compilers/gcc-4.5/builder.sh @@ -46,7 +46,7 @@ if test "$noSysDirs" = "1"; then export NIX_FIXINC_DUMMY=/usr/include fi - extraFlags="-g0 -O2 -I$NIX_FIXINC_DUMMY $extraFlags" + extraFlags="-I$NIX_FIXINC_DUMMY $extraFlags" extraLDFlags="-L$glibc_libdir -rpath $glibc_libdir $extraLDFlags" EXTRA_FLAGS="$extraFlags" @@ -63,7 +63,7 @@ if test "$noSysDirs" = "1"; then unset LIBRARY_PATH unset CPATH if test -z "$crossStageStatic"; then - EXTRA_TARGET_CFLAGS="-g0 -O2 -B${libcCross}/lib -idirafter ${libcCross}/include" + EXTRA_TARGET_CFLAGS="-B${libcCross}/lib -idirafter ${libcCross}/include" EXTRA_TARGET_LDFLAGS="-Wl,-L${libcCross}/lib" fi else @@ -89,7 +89,7 @@ if test "$noSysDirs" = "1"; then # The path to the Glibc binaries such as `crti.o'. glibc_libdir="$(cat $NIX_GCC_CROSS/nix-support/orig-libc)/lib" - extraFlags="-g0 -O2 -I$NIX_FIXINC_DUMMY_CROSS $extraFlags" + extraFlags="-I$NIX_FIXINC_DUMMY_CROSS $extraFlags" extraLDFlags="-L$glibc_libdir -rpath $glibc_libdir $extraLDFlags" EXTRA_TARGET_CFLAGS="$extraFlags" diff --git a/pkgs/development/compilers/gcc-4.5/default.nix b/pkgs/development/compilers/gcc-4.5/default.nix index 1acbb82702b..9d4aeaf01e1 100644 --- a/pkgs/development/compilers/gcc-4.5/default.nix +++ b/pkgs/development/compilers/gcc-4.5/default.nix @@ -347,7 +347,7 @@ stdenv.mkDerivation ({ EXTRA_TARGET_CFLAGS = if cross != null && libcCross != null - then "-g0 -O2 -idirafter ${libcCross}/include" + then "-idirafter ${libcCross}/include" else null; EXTRA_TARGET_LDFLAGS = From 4a9c8df2de2035c82b7ccfcebd6a0c4cf768b086 Mon Sep 17 00:00:00 2001 From: Shea Levy Date: Wed, 6 Apr 2011 05:21:05 +0000 Subject: [PATCH 019/970] Bump cloog-ppl to 0.15.11 This is so ppl can be bumped to 0.11, so that when stdenv-updates is merged we can go back to only having one version of ppl Tested by nix-build -A gcc44: gcc-4.4 was the first to use graphite optimizations, and obviously stdenv had to be rebuilt to compile gcc-4.4 svn path=/nixpkgs/branches/stdenv-updates/; revision=26706 --- pkgs/development/libraries/cloog-ppl/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/cloog-ppl/default.nix b/pkgs/development/libraries/cloog-ppl/default.nix index ca662d30eb0..d0e4083788b 100644 --- a/pkgs/development/libraries/cloog-ppl/default.nix +++ b/pkgs/development/libraries/cloog-ppl/default.nix @@ -12,11 +12,11 @@ let in stdenv.mkDerivation rec { - name = "cloog-ppl-0.15.9"; + name = "cloog-ppl-0.15.11"; src = fetchurl { url = "mirror://gcc/infrastructure/${name}.tar.gz"; - sha256 = "19a2n75k3d3n8llng25f2g88lpvd4zn0lm073rkndjw6l6yd8m4c"; + sha256 = "0psdm0bn5gx60glfh955x5b3b23zqrd92idmjr0b00dlnb839mkw"; }; propagatedBuildInputs = [ ppl ]; From 8aa7d7b1ac1cd47bd8d649488ccea6057e3f574c Mon Sep 17 00:00:00 2001 From: Shea Levy Date: Wed, 6 Apr 2011 05:22:10 +0000 Subject: [PATCH 020/970] Bump ppl to 0.11 This is so we only have one version of ppl when stdenv-updates is merged Tested by nix-build -A gcc4.4, for the reasons detailed in previous commit svn path=/nixpkgs/branches/stdenv-updates/; revision=26707 --- pkgs/development/libraries/ppl/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/libraries/ppl/default.nix b/pkgs/development/libraries/ppl/default.nix index 677d578e242..d8ffde644de 100644 --- a/pkgs/development/libraries/ppl/default.nix +++ b/pkgs/development/libraries/ppl/default.nix @@ -1,15 +1,15 @@ { fetchurl, stdenv, gmpxx, perl, gnum4, static ? false }: let - version = "0.10.2"; - staticFlags = if static then " --enable-static --disable-shared" else ""; + version = "0.11"; + staticFlags = if static then " --enable-static --disable-shared --disable-watchdog" else ""; in stdenv.mkDerivation rec { name = "ppl-${version}"; src = fetchurl { url = "mirror://gcc/infrastructure/ppl-${version}.tar.gz"; - sha256 = "0lly44sac4jd72klnhhil3wha15vak76r6gy88sh0zjsaww9hf6h"; + sha256 = "0xqwyaj232gi0pgm6z2rihk6p8l1rngbbibnhmcrbq4jq550clrl"; }; buildNativeInputs = [ perl gnum4 ]; From d00b3037661eee1662100139dc301a0680fb198e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= Date: Tue, 3 May 2011 22:38:52 +0000 Subject: [PATCH 021/970] GMP: Use `--enable-fat' instead of tinkering with `config.guess'. svn path=/nixpkgs/branches/stdenv-updates/; revision=27126 --- pkgs/development/libraries/gmp/default.nix | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/pkgs/development/libraries/gmp/default.nix b/pkgs/development/libraries/gmp/default.nix index 338debaa81e..1b079c05158 100644 --- a/pkgs/development/libraries/gmp/default.nix +++ b/pkgs/development/libraries/gmp/default.nix @@ -1,7 +1,8 @@ {stdenv, fetchurl, m4, cxx ? true, static ? false}: let - staticFlags = if static then " --enable-static --disable-shared" else ""; + staticFlags = stdenv.lib.optionals static + [ "--enable-static" "--disable-shared" ]; in stdenv.mkDerivation rec { @@ -14,12 +15,12 @@ stdenv.mkDerivation rec { buildNativeInputs = [m4]; - # Prevent the build system from using sub-architecture-specific - # instructions (e.g., SSE2 on i686). - preConfigure = "ln -sf configfsf.guess config.guess"; + configureFlags = + # Build a "fat binary", with routines for several sub-architectures (x86). + [ "--enable-fat" ] - configureFlags = if cxx then "--enable-cxx" else "--disable-cxx" + - staticFlags; + ++ (if cxx then [ "--enable-cxx" ] else [ "--disable-cxx" ]) + ++ staticFlags; dontDisableStatic = if static then true else false; From 1a43ce8e08e1e294dc1f39a7f5bef2fe9d088711 Mon Sep 17 00:00:00 2001 From: Shea Levy Date: Thu, 28 Jul 2011 20:28:37 +0000 Subject: [PATCH 022/970] Add a substituteAllInPlace() function to stdenv svn path=/nixpkgs/branches/stdenv-updates/; revision=27993 --- pkgs/stdenv/generic/setup.sh | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/pkgs/stdenv/generic/setup.sh b/pkgs/stdenv/generic/setup.sh index 321e2673cad..66be3875413 100644 --- a/pkgs/stdenv/generic/setup.sh +++ b/pkgs/stdenv/generic/setup.sh @@ -386,6 +386,13 @@ substituteAll() { } +substituteAllInPlace() { + local fileName="$1" + shift + substituteAll "$fileName" "$fileName" "$@" +} + + ###################################################################### # What follows is the generic builder. From 1eb378d0c4ae62e806286f2ebdfce972a50a9b9d Mon Sep 17 00:00:00 2001 From: Shea Levy Date: Thu, 28 Jul 2011 20:33:20 +0000 Subject: [PATCH 023/970] Document substituteAllInPlace svn path=/nixpkgs/branches/stdenv-updates/; revision=27994 --- doc/stdenv.xml | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/doc/stdenv.xml b/doc/stdenv.xml index 7e04cf20fe7..9c9b61cd1dc 100644 --- a/doc/stdenv.xml +++ b/doc/stdenv.xml @@ -1062,7 +1062,16 @@ echo @foo@ That is, no substitution is performed for undefined variables. - + + + substituteAllInPlace + file + Like substituteAll, but performs + the substitutions in place on the file + file. + + + stripHash path From e861fb2bcde5413c90c52d2db3b9fcea468bef0e Mon Sep 17 00:00:00 2001 From: Shea Levy Date: Mon, 1 Aug 2011 04:53:21 +0000 Subject: [PATCH 024/970] Remove unzip 5.52, make unzip 6.0 default As per TODO in all-packages.nix comments svn path=/nixpkgs/branches/stdenv-updates/; revision=28101 --- pkgs/tools/archivers/unzip/5.52.nix | 18 ------------------ .../archivers/unzip/{6.0.nix => default.nix} | 0 pkgs/top-level/all-packages.nix | 7 +------ 3 files changed, 1 insertion(+), 24 deletions(-) delete mode 100644 pkgs/tools/archivers/unzip/5.52.nix rename pkgs/tools/archivers/unzip/{6.0.nix => default.nix} (100%) diff --git a/pkgs/tools/archivers/unzip/5.52.nix b/pkgs/tools/archivers/unzip/5.52.nix deleted file mode 100644 index c72def3731a..00000000000 --- a/pkgs/tools/archivers/unzip/5.52.nix +++ /dev/null @@ -1,18 +0,0 @@ -{stdenv, fetchurl}: - -stdenv.mkDerivation { - name = "unzip-5.52"; - - src = fetchurl { - url = http://nixos.org/tarballs/unzip552.tar.gz; - md5 = "9d23919999d6eac9217d1f41472034a9"; - }; - - buildPhase = "make -f unix/Makefile generic"; - - installPhase = "make -f unix/Makefile prefix=$out install"; - - meta = { - homepage = http://www.info-zip.org; - }; -} diff --git a/pkgs/tools/archivers/unzip/6.0.nix b/pkgs/tools/archivers/unzip/default.nix similarity index 100% rename from pkgs/tools/archivers/unzip/6.0.nix rename to pkgs/tools/archivers/unzip/default.nix diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index dd88d0e3813..917926aa365 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -1346,12 +1346,7 @@ let unshield = callPackage ../tools/archivers/unshield { }; - unzip = unzip552; - - # TODO: remove in the next stdenv update. - unzip552 = callPackage ../tools/archivers/unzip/5.52.nix { }; - - unzip60 = callPackage ../tools/archivers/unzip/6.0.nix { }; + unzip = callPackage ../tools/archivers/unzip { }; uptimed = callPackage ../tools/system/uptimed { }; From 05a530fd10d7b846a47e8bc4b9a4d21fef20e3e8 Mon Sep 17 00:00:00 2001 From: David Guibert Date: Tue, 16 Aug 2011 18:20:59 +0000 Subject: [PATCH 025/970] module-init-tools: 3.4 -> 3.16 svn path=/nixpkgs/branches/stdenv-updates/; revision=28621 --- pkgs/build-support/kernel/modules-closure.sh | 1 + .../linux/module-init-tools/default.nix | 12 +- .../linux/module-init-tools/module-dir.patch | 311 +++++++++--------- 3 files changed, 167 insertions(+), 157 deletions(-) diff --git a/pkgs/build-support/kernel/modules-closure.sh b/pkgs/build-support/kernel/modules-closure.sh index af1faa7708c..a1e790a9c72 100644 --- a/pkgs/build-support/kernel/modules-closure.sh +++ b/pkgs/build-support/kernel/modules-closure.sh @@ -26,6 +26,7 @@ ensureDir $out/lib/modules/"$version" for module in $closure; do target=$(echo $module | sed "s^/nix/store/.*/lib/modules/^$out/lib/modules/^") if test -e "$target"; then continue; fi + if test \! -e "$module"; then continue; fi # XXX: to avoid error with "cp builtin builtin" mkdir -p $(dirname $target) echo $module cp $module $target diff --git a/pkgs/os-specific/linux/module-init-tools/default.nix b/pkgs/os-specific/linux/module-init-tools/default.nix index 5fdfedc3e2f..003ee1263f8 100644 --- a/pkgs/os-specific/linux/module-init-tools/default.nix +++ b/pkgs/os-specific/linux/module-init-tools/default.nix @@ -1,24 +1,24 @@ {stdenv, fetchurl}: stdenv.mkDerivation { - name = "module-init-tools-3.4"; + name = "module-init-tools-3.16"; src = [ (fetchurl { - url = mirror://kernel/linux/utils/kernel/module-init-tools/module-init-tools-3.4.tar.bz2; - sha256 = "11rxcdr915skc1m6dcavavw8dhcsy24wpi56sw1m4akj2frs3iwn"; + url = mirror://kernel/linux/utils/kernel/module-init-tools/module-init-tools-3.16.tar.bz2; + sha256 = "0jxnz9ahfic79rp93l5wxcbgh4pkv85mwnjlbv1gz3jawv5cvwp1"; }) # Upstream forgot to include the generated manpages. Thankfully # the Gentoo people fixed this for us :-) (fetchurl { - url = mirror://gentoo/distfiles/module-init-tools-3.4-manpages.tar.bz2; - sha256 = "0jid24girjhr30mrdckylkcz11v4in46nshhrqv18yaxm6506v6j"; + url = mirror://gentoo/distfiles/module-init-tools-3.16-man.tar.bz2; + sha256 = "1j1nzi87kgsh4scl645fhwhjvljxj83cmdasa4n4p5krhasgw358"; }) ]; patches = [./module-dir.patch]; - + postInstall = "rm $out/sbin/insmod.static"; # don't need it # We don't want bash (and therefore glibc) in the closure of the diff --git a/pkgs/os-specific/linux/module-init-tools/module-dir.patch b/pkgs/os-specific/linux/module-init-tools/module-dir.patch index cda28c14527..95c7559604d 100644 --- a/pkgs/os-specific/linux/module-init-tools/module-dir.patch +++ b/pkgs/os-specific/linux/module-init-tools/module-dir.patch @@ -1,152 +1,161 @@ -diff -rc module-init-tools-3.4-orig/depmod.c module-init-tools-3.4/depmod.c -*** module-init-tools-3.4-orig/depmod.c 2007-10-07 23:51:46.000000000 +0200 ---- module-init-tools-3.4/depmod.c 2008-08-11 12:03:14.000000000 +0200 -*************** -*** 1066,1071 **** ---- 1066,1072 ---- - *system_map = NULL; - struct module *list = NULL; - int i; -+ char *module_dir; - const char *config = NULL; - struct module_search *search = NULL; - struct module_overrides *overrides = NULL; -*************** -*** 1148,1157 **** - if (optind == argc) - all = 1; - - dirname = NOFAIL(malloc(strlen(basedir) -! + strlen(MODULE_DIR) - + strlen(version) + 1)); -! sprintf(dirname, "%s%s%s", basedir, MODULE_DIR, version); - - if (maybe_all) { - if (!doing_stdout && !depfile_out_of_date(dirname)) ---- 1149,1162 ---- - if (optind == argc) - all = 1; - -+ if((module_dir = getenv("MODULE_DIR")) == NULL) { -+ module_dir = "/lib/modules/"; -+ } -+ - dirname = NOFAIL(malloc(strlen(basedir) -! + strlen(module_dir) - + strlen(version) + 1)); -! sprintf(dirname, "%s%s%s", basedir, module_dir, version); - - if (maybe_all) { - if (!doing_stdout && !depfile_out_of_date(dirname)) -Only in module-init-tools-3.4/: depmod.c~ -Only in module-init-tools-3.4/: depmod.c.rej -diff -rc module-init-tools-3.4-orig/modinfo.c module-init-tools-3.4/modinfo.c -*** module-init-tools-3.4-orig/modinfo.c 2007-10-07 23:51:46.000000000 +0200 ---- module-init-tools-3.4/modinfo.c 2008-08-11 12:07:55.000000000 +0200 -*************** -*** 18,27 **** - #define streq(a,b) (strcmp((a),(b)) == 0) - #define strstarts(a,start) (strncmp((a),(start), strlen(start)) == 0) - -- #ifndef MODULE_DIR -- #define MODULE_DIR "/lib/modules" -- #endif -- - static int elf_endian; - static int my_endian; - ---- 18,23 ---- -*************** -*** 278,283 **** ---- 274,280 ---- - char *data; - struct utsname buf; - char *depname, *p; +commit cf2c95edb7918bc658f6cae93793c1949fc9cb6e +Author: David Guibert +Date: Fri Aug 5 14:20:12 2011 +0200 + + introduce module-dir + +diff --git a/depmod.c b/depmod.c +index a1d2f8c..9362a35 100644 +--- a/depmod.c ++++ b/depmod.c +@@ -48,9 +48,6 @@ + + #include "testing.h" + +-#ifndef MODULE_DIR +-#define MODULE_DIR "/lib/modules/" +-#endif + + #ifndef MODULE_BUILTIN_KEY + #define MODULE_BUILTIN_KEY "built-in" +@@ -1516,6 +1513,7 @@ static int parse_config_file(const char *filename, + char *line; + unsigned int linenum = 0; + FILE *cfile; + char *module_dir; - - data = grab_file(name, size); - if (data) { -*************** -*** 290,301 **** - return NULL; - } - - /* Search for it in modules.dep. */ - if (kernel) { -! asprintf(&depname, "%s/%s/modules.dep", MODULE_DIR, kernel); - } else { - uname(&buf); -! asprintf(&depname, "%s/%s/modules.dep", MODULE_DIR, - buf.release); - } - data = grab_file(depname, size); ---- 287,302 ---- - return NULL; - } - -+ if((module_dir = getenv("MODULE_DIR")) == NULL) { -+ module_dir = "/lib/modules"; -+ } -+ - /* Search for it in modules.dep. */ - if (kernel) { -! asprintf(&depname, "%s/%s/modules.dep", module_dir, kernel); - } else { - uname(&buf); -! asprintf(&depname, "%s/%s/modules.dep", module_dir, - buf.release); - } - data = grab_file(depname, size); -Only in module-init-tools-3.4/: modinfo.c~ -Only in module-init-tools-3.4/: modinfo.c.rej -diff -rc module-init-tools-3.4-orig/modprobe.c module-init-tools-3.4/modprobe.c -*** module-init-tools-3.4-orig/modprobe.c 2007-10-07 23:57:23.000000000 +0200 ---- module-init-tools-3.4/modprobe.c 2008-08-11 12:06:54.000000000 +0200 -*************** -*** 55,64 **** - char filename[0]; - }; - -- #ifndef MODULE_DIR -- #define MODULE_DIR "/lib/modules" -- #endif -- - typedef void (*errfn_t)(const char *fmt, ...); - - /* Do we use syslog or stderr for messages? */ ---- 55,60 ---- -*************** -*** 1433,1438 **** ---- 1429,1435 ---- - char *newname = NULL; - char *aliasfilename, *symfilename; - errfn_t error = fatal; -+ char *module_dir = NULL; - int flags = O_NONBLOCK|O_EXCL; - - /* Prepend options from environment. */ -*************** -*** 1559,1566 **** - if (argc < optind + 1 && !dump_only && !list_only && !remove) - print_usage(argv[0]); - -! dirname = NOFAIL(malloc(strlen(buf.release) + sizeof(MODULE_DIR) + 1)); -! sprintf(dirname, "%s/%s", MODULE_DIR, buf.release); - aliasfilename = NOFAIL(malloc(strlen(dirname) - + sizeof("/modules.alias"))); - sprintf(aliasfilename, "%s/modules.alias", dirname); ---- 1556,1567 ---- - if (argc < optind + 1 && !dump_only && !list_only && !remove) - print_usage(argv[0]); - -! if((module_dir = getenv("MODULE_DIR")) == NULL) { -! module_dir = "/lib/modules"; -! } -! -! dirname = NOFAIL(malloc(strlen(buf.release) + strlen(module_dir) + 2)); -! sprintf(dirname, "%s/%s", module_dir, buf.release); - aliasfilename = NOFAIL(malloc(strlen(dirname) - + sizeof("/modules.alias"))); - sprintf(aliasfilename, "%s/modules.alias", dirname); -Only in module-init-tools-3.4/: modprobe.c~ -Only in module-init-tools-3.4/: modprobe.c.rej + + cfile = fopen(filename, "r"); + if (!cfile) { +@@ -1525,6 +1523,10 @@ static int parse_config_file(const char *filename, + return 0; + } + ++ if((module_dir = getenv("MODULE_DIR")) == NULL) { ++ module_dir = "/lib/modules/"; ++ } ++ + while ((line = getline_wrapped(cfile, &linenum)) != NULL) { + char *ptr = line; + char *cmd, *modname; +@@ -1550,7 +1552,7 @@ static int parse_config_file(const char *filename, + continue; + } + nofail_asprintf(&dirname, "%s%s%s/%s", basedir, +- MODULE_DIR, kernelversion, search_path); ++ module_dir, kernelversion, search_path); + len = strlen(dirname); + *search = add_search(dirname, len, *search); + free(dirname); +@@ -1565,7 +1567,7 @@ static int parse_config_file(const char *filename, + continue; + + nofail_asprintf(&pathname, "%s%s%s/%s/%s.ko", basedir, +- MODULE_DIR, kernelversion, subdir, modname); ++ module_dir, kernelversion, subdir, modname); + + *overrides = add_override(pathname, *overrides); + free(pathname); +@@ -1737,6 +1739,7 @@ int main(int argc, char *argv[]) + char *basedir = "", *dirname, *version; + char *system_map = NULL, *module_symvers = NULL; + int i; ++ char *module_dir; + const char *config = NULL; + + if (native_endianness() == 0) +@@ -1832,7 +1835,11 @@ int main(int argc, char *argv[]) + if (optind == argc) + all = 1; + +- nofail_asprintf(&dirname, "%s%s%s", basedir, MODULE_DIR, version); ++ if((module_dir = getenv("MODULE_DIR")) == NULL) { ++ module_dir = "/lib/modules/"; ++ } ++ ++ nofail_asprintf(&dirname, "%s%s%s", basedir, module_dir, version); + + if (maybe_all) { + if (!doing_stdout && !depfile_out_of_date(dirname)) +@@ -1850,7 +1857,7 @@ int main(int argc, char *argv[]) + size_t len; + + nofail_asprintf(&dirname, "%s%s%s/updates", basedir, +- MODULE_DIR, version); ++ module_dir, version); + len = strlen(dirname); + search = add_search(dirname, len, search); + } +diff --git a/modinfo.c b/modinfo.c +index 1dd8469..67b1041 100644 +--- a/modinfo.c ++++ b/modinfo.c +@@ -19,9 +19,6 @@ + #include "zlibsupport.h" + #include "testing.h" + +-#ifndef MODULE_DIR +-#define MODULE_DIR "/lib/modules" +-#endif + + struct param + { +@@ -193,6 +190,11 @@ static struct elf_file *grab_module(const char *name, + struct utsname buf; + char *depname, *p, *moddir; + struct elf_file *module; ++ char *module_dir; ++ ++ if((module_dir = getenv("MODULE_DIR")) == NULL) { ++ module_dir = "/lib/modules/"; ++ } + + if (strchr(name, '.') || strchr(name, '/')) { + module = grab_elf_file(name); +@@ -207,9 +209,9 @@ static struct elf_file *grab_module(const char *name, + kernel = buf.release; + } + if (strlen(basedir)) +- nofail_asprintf(&moddir, "%s/%s/%s", basedir, MODULE_DIR, kernel); ++ nofail_asprintf(&moddir, "%s/%s/%s", basedir, module_dir, kernel); + else +- nofail_asprintf(&moddir, "%s/%s", MODULE_DIR, kernel); ++ nofail_asprintf(&moddir, "%s/%s", module_dir, kernel); + + /* Search for it in modules.dep. */ + nofail_asprintf(&depname, "%s/%s", moddir, "modules.dep"); +diff --git a/modprobe.c b/modprobe.c +index 5464f45..d9fbf9d 100644 +--- a/modprobe.c ++++ b/modprobe.c +@@ -86,10 +86,6 @@ typedef enum + + } modprobe_flags_t; + +-#ifndef MODULE_DIR +-#define MODULE_DIR "/lib/modules" +-#endif +- + /** + * print_usage - output the prefered program usage + * +@@ -2136,6 +2132,7 @@ int main(int argc, char *argv[]) + struct modprobe_conf conf = {}; + + recursion_depth = 0; ++ char *module_dir = NULL; + + /* Prepend options from environment. */ + argv = merge_args(getenv("MODPROBE_OPTIONS"), argv, &argc); +@@ -2233,7 +2230,11 @@ int main(int argc, char *argv[]) + if (argc < optind + 1 && !dump_config && !list_only) + print_usage(argv[0]); + +- nofail_asprintf(&dirname, "%s%s/%s", basedir, MODULE_DIR, buf.release); ++ if((module_dir = getenv("MODULE_DIR")) == NULL) { ++ module_dir = "/lib/modules"; ++ } ++ ++ nofail_asprintf(&dirname, "%s%s/%s", basedir, module_dir, buf.release); + + /* Old-style -t xxx wildcard? Only with -l. */ + if (list_only) { From 565cdcc3e15baeca1dc0fd8a16d48456d97f98c6 Mon Sep 17 00:00:00 2001 From: David Guibert Date: Tue, 16 Aug 2011 18:21:05 +0000 Subject: [PATCH 026/970] unzip: add support for file greater than 2 GB (unix only) svn path=/nixpkgs/branches/stdenv-updates/; revision=28622 --- pkgs/tools/archivers/unzip/default.nix | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/pkgs/tools/archivers/unzip/default.nix b/pkgs/tools/archivers/unzip/default.nix index 803832f52d8..7aaa84d9ac9 100644 --- a/pkgs/tools/archivers/unzip/default.nix +++ b/pkgs/tools/archivers/unzip/default.nix @@ -16,6 +16,10 @@ stdenv.mkDerivation { buildFlags = "generic D_USE_BZ2=-DUSE_BZIP2 L_BZ2=-lbz2"; + preConfigure = '' + sed -i -e 's@CF="-O3 -Wall -I. -DASM_CRC $(LOC)"@CF="-O3 -Wall -I. -DASM_CRC -DLARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64 $(LOC)"@' unix/Makefile + ''; + installFlags = "prefix=$(out)"; meta = { From 5d62c65d6e085481a36c857e8b86f88d80b1c565 Mon Sep 17 00:00:00 2001 From: "Yury G. Kudryashov" Date: Thu, 18 Aug 2011 22:46:08 +0000 Subject: [PATCH 027/970] Remove empty directory svn path=/nixpkgs/branches/stdenv-updates/; revision=28670 From fc41aa50f46bef612cadf7fbf0a9ed248d6c2b92 Mon Sep 17 00:00:00 2001 From: Shea Levy Date: Wed, 24 Aug 2011 19:33:42 +0000 Subject: [PATCH 028/970] Whoops, missed a commit, now merged through r28791 svn path=/nixpkgs/branches/stdenv-updates/; revision=28793 --- pkgs/development/libraries/gdbm/default.nix | 40 ++++++++++++++----- pkgs/development/libraries/gdbm/install.patch | 29 -------------- pkgs/top-level/all-packages.nix | 37 ++++++++--------- 3 files changed, 46 insertions(+), 60 deletions(-) delete mode 100644 pkgs/development/libraries/gdbm/install.patch diff --git a/pkgs/development/libraries/gdbm/default.nix b/pkgs/development/libraries/gdbm/default.nix index 448fd04edd8..807e6a6a2a8 100644 --- a/pkgs/development/libraries/gdbm/default.nix +++ b/pkgs/development/libraries/gdbm/default.nix @@ -1,22 +1,40 @@ -{ stdenv, fetchurl, automake }: +{ stdenv, fetchurl }: stdenv.mkDerivation rec { - name = "gdbm-1.8.3"; + name = "gdbm-1.9.1"; + src = fetchurl { url = "mirror://gnu/gdbm/${name}.tar.gz"; - sha256 = "1j8x51xc71di1fx23sl22n5ghlqxl9a57sxri82l12z2l8w06d6c"; + sha256 = "1vcs39nhvwyicjfx4qc17k54n22azla5yjr9yachcavp6wk8a9b0"; }; - patches = [ ./install.patch ]; - - # The fuloong2f is not supported by gdbm 1.8.3 still - preConfigure = '' - cp ${automake}/share/automake*/config.{sub,guess} . - ''; + doCheck = true; meta = { - description = "GNU DBM key/value database library"; + description = "GNU dbm key/value database library"; + + longDescription = + '' GNU dbm (or GDBM, for short) is a library of database functions that + use extensible hashing and work similar to the standard UNIX dbm. + These routines are provided to a programmer needing to create and + manipulate a hashed database. + + The basic use of GDBM is to store key/data pairs in a data file. + Each key must be unique and each key is paired with only one data + item. + + The library provides primitives for storing key/data pairs, + searching and retrieving the data by its key and deleting a key + along with its data. It also support sequential iteration over all + key/data pairs in a database. + + For compatibility with programs using old UNIX dbm function, the + package also provides traditional dbm and ndbm interfaces. + ''; + homepage = http://www.gnu.org/software/gdbm/; - license = "GPLv2+"; + license = "GPLv3+"; + platforms = stdenv.lib.platforms.all; + maintainers = [ stdenv.lib.maintainers.ludo ]; }; } diff --git a/pkgs/development/libraries/gdbm/install.patch b/pkgs/development/libraries/gdbm/install.patch deleted file mode 100644 index 81afe020b7b..00000000000 --- a/pkgs/development/libraries/gdbm/install.patch +++ /dev/null @@ -1,29 +0,0 @@ ---- gdbm-1.8.3/Makefile.in 2002-10-08 18:09:12.000000000 +0200 -+++ gdbm-1.8.3/Makefile.in 2008-04-07 01:15:58.000000000 +0200 -@@ -131,11 +131,11 @@ install: libgdbm.la gdbm.h gdbm.info - $(INSTALL_ROOT)$(includedir) $(INSTALL_ROOT)$(man3dir) \ - $(INSTALL_ROOT)$(infodir) - $(LIBTOOL) $(INSTALL) -c libgdbm.la $(INSTALL_ROOT)$(libdir)/libgdbm.la -- $(INSTALL_DATA) -o $(BINOWN) -g $(BINGRP) gdbm.h \ -+ $(INSTALL_DATA) gdbm.h \ - $(INSTALL_ROOT)$(includedir)/gdbm.h -- $(INSTALL_DATA) -o $(BINOWN) -g $(BINGRP) $(srcdir)/gdbm.3 \ -+ $(INSTALL_DATA) $(srcdir)/gdbm.3 \ - $(INSTALL_ROOT)$(man3dir)/gdbm.3 -- $(INSTALL_DATA) -o $(BINOWN) -g $(BINGRP) $(srcdir)/gdbm.info \ -+ $(INSTALL_DATA) $(srcdir)/gdbm.info \ - $(INSTALL_ROOT)$(infodir)/gdbm.info - - install-compat: -@@ -143,9 +143,9 @@ install-compat: - $(INSTALL_ROOT)$(includedir) - $(LIBTOOL) $(INSTALL) -c libgdbm_compat.la \ - $(INSTALL_ROOT)$(libdir)/libgdbm_compat.la -- $(INSTALL_DATA) -o $(BINOWN) -g $(BINGRP) $(srcdir)/dbm.h \ -+ $(INSTALL_DATA)) $(srcdir)/dbm.h \ - $(INSTALL_ROOT)$(includedir)/dbm.h -- $(INSTALL_DATA) -o $(BINOWN) -g $(BINGRP) $(srcdir)/ndbm.h \ -+ $(INSTALL_DATA)) $(srcdir)/ndbm.h \ - $(INSTALL_ROOT)$(includedir)/ndbm.h - - #libgdbm.a: $(OBJS) gdbm.h diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 264391bd328..dad141528d0 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -179,9 +179,6 @@ let # inside the set for derivations. recurseIntoAttrs = attrs: attrs // {recurseForDerivations = true;}; - # Return the first available value in the order: pkg.val, val, or default. - getPkgConfig = pkg : val : default : (getConfig [ pkg val ] (getConfig [ val ] default)); - builderDefs = lib.composedArgsAndFun (import ../build-support/builder-defs/builder-defs.nix) { inherit stringsWithDeps lib stdenv writeScript fetchurl fetchmtn fetchgit; @@ -3317,19 +3314,19 @@ let glibc29 = callPackage ../development/libraries/glibc-2.9 { kernelHeaders = linuxHeaders; - installLocales = getPkgConfig "glibc" "locales" false; + installLocales = getConfig [ "glibc" "locales" ] false; }; glibc29Cross = forceBuildDrv (makeOverridable (import ../development/libraries/glibc-2.9) { inherit stdenv fetchurl; gccCross = gccCrossStageStatic; kernelHeaders = linuxHeadersCross; - installLocales = getPkgConfig "glibc" "locales" false; + installLocales = getConfig [ "glibc" "locales" ] false; }); glibc213 = (callPackage ../development/libraries/glibc-2.13 { kernelHeaders = linuxHeaders; - installLocales = getPkgConfig "glibc" "locales" false; + installLocales = getConfig [ "glibc" "locales" ] false; machHeaders = null; hurdHeaders = null; gccCross = null; @@ -3341,7 +3338,7 @@ let inherit stdenv fetchurl; gccCross = gccCrossStageStatic; kernelHeaders = if crossGNU then hurdHeaders else linuxHeadersCross; - installLocales = getPkgConfig "glibc" "locales" false; + installLocales = getConfig [ "glibc" "locales" ] false; } // @@ -3362,7 +3359,7 @@ let eglibc = callPackage ../development/libraries/eglibc { kernelHeaders = linuxHeaders; - installLocales = getPkgConfig "glibc" "locales" false; + installLocales = getConfig [ "glibc" "locales" ] false; }; glibcLocales = callPackage ../development/libraries/glibc-2.13/locales.nix { }; @@ -3789,7 +3786,7 @@ let libimobiledevice = callPackage ../development/libraries/libimobiledevice { }; libiodbc = callPackage ../development/libraries/libiodbc { - useGTK = getPkgConfig "libiodbc" "gtk" false; + useGTK = getConfig [ "libiodbc" "gtk" ] false; }; libktorrent = newScope pkgs.kde4 ../development/libraries/libktorrent { }; @@ -6346,11 +6343,11 @@ let }; emacsSnapshot = lowPrio (callPackage ../applications/editors/emacs-snapshot { - xawSupport = getPkgConfig "emacs" "xawSupport" false; - xaw3dSupport = getPkgConfig "emacs" "xaw3dSupport" false; - gtkGUI = getPkgConfig "emacs" "gtkSupport" true; - xftSupport = getPkgConfig "emacs" "xftSupport" true; - dbusSupport = getPkgConfig "emacs" "dbusSupport" true; + xawSupport = getConfig [ "emacs" "xawSupport" ] false; + xaw3dSupport = getConfig [ "emacs" "xaw3dSupport" ] false; + gtkGUI = getConfig [ "emacs" "gtkSupport" ] true; + xftSupport = getConfig [ "emacs" "xftSupport" ] true; + dbusSupport = getConfig [ "emacs" "dbusSupport" ] true; }); emacsPackages = emacs: self: let callPackage = newScope self; in rec { @@ -7271,7 +7268,7 @@ let # KDE support is not working yet. inherit (kde3) kdelibs kdebase; - withKde = getPkgConfig "taskJuggler" "kde" false; + withKde = getConfig [ "taskJuggler" "kde" ] false; }; tesseract = callPackage ../applications/graphics/tesseract { }; @@ -8153,7 +8150,7 @@ let ghostscript = callPackage ../misc/ghostscript { x11Support = false; - cupsSupport = getPkgConfig "ghostscript" "cups" true; + cupsSupport = getConfig [ "ghostscript" "cups" ] true; gnuFork = getConfig [ "ghostscript" "gnu" ] true; }; @@ -8194,13 +8191,13 @@ let nix = nixStable; nixStable = callPackage ../tools/package-management/nix { - storeDir = getPkgConfig "nix" "storeDir" "/nix/store"; - stateDir = getPkgConfig "nix" "stateDir" "/nix/var"; + storeDir = getConfig [ "nix" "storeDir" ] "/nix/store"; + stateDir = getConfig [ "nix" "stateDir" ] "/nix/var"; }; nixUnstable = callPackage ../tools/package-management/nix/unstable.nix { - storeDir = getPkgConfig "nix" "storeDir" "/nix/store"; - stateDir = getPkgConfig "nix" "stateDir" "/nix/var"; + storeDir = getConfig [ "nix" "storeDir" ] "/nix/store"; + stateDir = getConfig [ "nix" "stateDir" ] "/nix/var"; }; nixSqlite = nixUnstable; From 1bbbb2eafc20d1e0b2e79f8d1678cd411b3f8fcb Mon Sep 17 00:00:00 2001 From: "Yury G. Kudryashov" Date: Wed, 24 Aug 2011 20:11:18 +0000 Subject: [PATCH 029/970] Remove obsolete version of `gnupdate'. Revision 26483 from trunk. Somehow missed during merge. svn path=/nixpkgs/branches/stdenv-updates/; revision=28794 --- maintainers/scripts/gnu/gnupdate.scm | 712 --------------------------- 1 file changed, 712 deletions(-) delete mode 100644 maintainers/scripts/gnu/gnupdate.scm diff --git a/maintainers/scripts/gnu/gnupdate.scm b/maintainers/scripts/gnu/gnupdate.scm deleted file mode 100644 index 3cf6e7cfaba..00000000000 --- a/maintainers/scripts/gnu/gnupdate.scm +++ /dev/null @@ -1,712 +0,0 @@ -;;; GNUpdate -- Update GNU packages in Nixpkgs. -*- coding: utf-8; -*- -;;; Copyright (C) 2010 Ludovic Courtès -;;; -;;; This program is free software: you can redistribute it and/or modify -;;; it under the terms of the GNU General Public License as published by -;;; the Free Software Foundation, either version 3 of the License, or -;;; (at your option) any later version. -;;; -;;; This program is distributed in the hope that it will be useful, -;;; but WITHOUT ANY WARRANTY; without even the implied warranty of -;;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -;;; GNU General Public License for more details. -;;; -;;; You should have received a copy of the GNU General Public License -;;; along with this program. If not, see . - -(cond-expand (guile-2 #t) - (else (error "GNU Guile 2.0 is required"))) - -(use-modules (sxml ssax) - (ice-9 popen) - (ice-9 match) - (ice-9 rdelim) - (ice-9 regex) - (ice-9 vlist) - (srfi srfi-1) - (srfi srfi-9) - (srfi srfi-11) - (srfi srfi-37) - (system foreign) - (rnrs bytevectors)) - - -;;; -;;; SNix. -;;; - -(define-record-type - (make-location file line column) - location? - (file location-file) - (line location-line) - (column location-column)) - -(define (->loc line column path) - (and line column path - (make-location path (string->number line) (string->number column)))) - -;; XXX: Hack to add missing exports from `(sxml ssax)' as of 1.9.10. -(let ((ssax (resolve-module '(sxml ssax)))) - (for-each (lambda (sym) - (module-add! (current-module) sym - (module-variable ssax sym))) - '(ssax:warn ssax:skip-pi nl))) - -;; Nix object types visible in the XML output of `nix-instantiate' and -;; mapping to S-expressions (we map to sexps, not records, so that we -;; can do pattern matching): -;; -;; at (at varpat attrspat) -;; attr (attribute loc name value) -;; attrs (attribute-set attributes) -;; attrspat (attribute-set-pattern patterns) -;; bool #f|#t -;; derivation (derivation drv-path out-path attributes) -;; ellipsis '... -;; expr (snix loc body ...) -;; function (function loc at|attrspat|varpat) -;; int int -;; list list -;; null 'null -;; path string -;; string string -;; unevaluated 'unevaluated -;; varpat (varpat name) -;; -;; Initially ATTRIBUTES in `derivation' and `attribute-set' was a promise; -;; however, handling `repeated' nodes makes it impossible to do anything -;; lazily because the whole SXML tree has to be traversed to maintain the -;; list of known derivations. - -(define (xml-element->snix elem attributes body derivations) - ;; Return an SNix element corresponding to XML element ELEM. - - (define (loc) - (->loc (assq-ref attributes 'line) - (assq-ref attributes 'column) - (assq-ref attributes 'path))) - - (case elem - ((at) - (values `(at ,(car body) ,(cadr body)) derivations)) - ((attr) - (let ((name (assq-ref attributes 'name))) - (cond ((null? body) - (values `(attribute-pattern ,name) derivations)) - ((and (pair? body) (null? (cdr body))) - (values `(attribute ,(loc) ,name ,(car body)) - derivations)) - (else - (error "invalid attribute body" name (loc) body))))) - ((attrs) - (values `(attribute-set ,(reverse body)) derivations)) - ((attrspat) - (values `(attribute-set-pattern ,body) derivations)) - ((bool) - (values (string-ci=? "true" (assq-ref attributes 'value)) - derivations)) - ((derivation) - (let ((drv-path (assq-ref attributes 'drvPath)) - (out-path (assq-ref attributes 'outPath))) - (if (equal? body '(repeated)) - (let ((body (vhash-assoc drv-path derivations))) - (if (pair? body) - (values `(derivation ,drv-path ,out-path ,(cdr body)) - derivations) - (error "no previous occurrence of derivation" - drv-path))) - (values `(derivation ,drv-path ,out-path ,body) - (vhash-cons drv-path body derivations))))) - ((ellipsis) - (values '... derivations)) - ((expr) - (values `(snix ,(loc) ,@body) derivations)) - ((function) - (values `(function ,(loc) ,body) derivations)) - ((int) - (values (string->number (assq-ref attributes 'value)) - derivations)) - ((list) - (values body derivations)) - ((null) - (values 'null derivations)) - ((path) - (values (assq-ref attributes 'value) derivations)) - ((repeated) - (values 'repeated derivations)) - ((string) - (values (assq-ref attributes 'value) derivations)) - ((unevaluated) - (values 'unevaluated derivations)) - ((varpat) - (values `(varpat ,(assq-ref attributes 'name)) derivations)) - (else (error "unhandled Nix XML element" elem)))) - -(define xml->snix - ;; Return the SNix represention of TREE, an SXML tree as returned by - ;; parsing the XML output of `nix-instantiate' on Nixpkgs. - (let ((parse - (ssax:make-parser NEW-LEVEL-SEED - (lambda (elem-gi attributes namespaces expected-content - seed) - (cons '() (cdr seed))) - - FINISH-ELEMENT - (lambda (elem-gi attributes namespaces parent-seed - seed) - (let ((snix (car seed)) - (derivations (cdr seed))) - (let-values (((snix derivations) - (xml-element->snix elem-gi - attributes - snix - derivations))) - (cons (cons snix (car parent-seed)) - derivations)))) - - CHAR-DATA-HANDLER - (lambda (string1 string2 seed) - ;; Discard inter-node strings, which are blanks. - seed)))) - (lambda (port) - ;; Discard the second value returned by the parser (the derivation - ;; vhash). - (caar (parse port (cons '() vlist-null)))))) - -(define (call-with-package snix proc) - (match snix - (('attribute _ (and attribute-name (? string?)) - ('derivation _ _ body)) - ;; Ugly pattern matching. - (let ((meta - (any (lambda (attr) - (match attr - (('attribute _ "meta" ('attribute-set metas)) metas) - (_ #f))) - body)) - (package-name - (any (lambda (attr) - (match attr - (('attribute _ "name" (and name (? string?))) - name) - (_ #f))) - body)) - (location - (any (lambda (attr) - (match attr - (('attribute loc "name" (? string?)) - loc) - (_ #f))) - body)) - (src - (any (lambda (attr) - (match attr - (('attribute _ "src" src) - src) - (_ #f))) - body))) - (proc attribute-name package-name location meta src))))) - -(define (call-with-src snix proc) - ;; Assume SNIX contains the SNix expression for the value of an `src' - ;; attribute, as returned by `call-with-package', and call PROC with the - ;; relevant SRC information, or #f if SNIX doesn't match. - (match snix - (('derivation _ _ body) - (let ((name - (any (lambda (attr) - (match attr - (('attribute _ "name" (and name (? string?))) - name) - (_ #f))) - body)) - (output-hash - (any (lambda (attr) - (match attr - (('attribute _ "outputHash" (and hash (? string?))) - hash) - (_ #f))) - body)) - (urls - (any (lambda (attr) - (match attr - (('attribute _ "urls" (and urls (? pair?))) - urls) - (_ #f))) - body))) - (proc name output-hash urls))) - (_ (proc #f #f #f)))) - -(define (src->values snix) - (call-with-src snix values)) - -(define (open-nixpkgs nixpkgs) - (let ((script (string-append nixpkgs - "/maintainers/scripts/eval-release.nix"))) - (open-pipe* OPEN_READ "nix-instantiate" - "--strict" "--eval-only" "--xml" - script))) - -(define (nix-prefetch-url url) - ;; Download URL in the Nix store and return the base32-encoded SHA256 hash - ;; of the file at URL - (let* ((pipe (open-pipe* OPEN_READ "nix-prefetch-url" url)) - (hash (read-line pipe))) - (close-pipe pipe) - (if (eof-object? hash) - (values #f #f) - (let* ((pipe (open-pipe* OPEN_READ "nix-store" "--print-fixed-path" - "sha256" hash (basename url))) - (path (read-line pipe))) - (if (eof-object? path) - (values #f #f) - (values (string-trim-both hash) (string-trim-both path))))))) - -(define (update-nix-expression file - old-version old-hash - new-version new-hash) - ;; Modify FILE in-place. Ugly: we call out to sed(1). - (let ((cmd (format #f "sed -i \"~a\" -e 's/~A/~a/g ; s/~A/~A/g'" - file - (regexp-quote old-version) new-version - old-hash - (or new-hash "new hash not available, check the log")))) - (format #t "running `~A'...~%" cmd) - (system cmd))) - - -;;; -;;; FTP client. -;;; - -(define-record-type - (%make-ftp-connection socket addrinfo) - ftp-connection? - (socket ftp-connection-socket) - (addrinfo ftp-connection-addrinfo)) - -(define %ftp-ready-rx - (make-regexp "^([0-9]{3}) (.+)$")) - -(define (%ftp-listen port) - (let loop ((line (read-line port))) - (cond ((eof-object? line) (values line #f)) - ((regexp-exec %ftp-ready-rx line) - => - (lambda (match) - (values (string->number (match:substring match 1)) - (match:substring match 2)))) - (else - (loop (read-line port)))))) - -(define (%ftp-command command expected-code port) - (format port "~A~A~A" command (string #\return) (string #\newline)) - (let-values (((code message) (%ftp-listen port))) - (if (eqv? code expected-code) - message - (throw 'ftp-error port command code message)))) - -(define (%ftp-login user pass port) - (let ((command (string-append "USER " user (string #\newline)))) - (display command port) - (let-values (((code message) (%ftp-listen port))) - (case code - ((230) #t) - ((331) (%ftp-command (string-append "PASS " pass) 230 port)) - (else (throw 'ftp-error port command code message)))))) - -(define (ftp-open host) - (catch 'getaddrinfo-error - (lambda () - (let* ((ai (car (getaddrinfo host "ftp"))) - (s (socket (addrinfo:fam ai) (addrinfo:socktype ai) - (addrinfo:protocol ai)))) - (connect s (addrinfo:addr ai)) - (setvbuf s _IOLBF) - (let-values (((code message) (%ftp-listen s))) - (if (eqv? code 220) - (begin - ;(%ftp-command "OPTS UTF8 ON" 200 s) - (%ftp-login "anonymous" "ludo@example.com" s) - (%make-ftp-connection s ai)) - (begin - (format (current-error-port) "FTP to `~a' failed: ~A: ~A~%" - host code message) - (close s) - #f))))) - (lambda (key errcode) - (format (current-error-port) "failed to resolve `~a': ~a~%" - host (gai-strerror errcode)) - #f))) - -(define (ftp-close conn) - (close (ftp-connection-socket conn))) - -(define (ftp-chdir conn dir) - (%ftp-command (string-append "CWD " dir) 250 - (ftp-connection-socket conn))) - -(define (ftp-pasv conn) - (define %pasv-rx - (make-regexp "([0-9]+),([0-9]+),([0-9]+),([0-9]+),([0-9]+),([0-9]+)")) - - (let ((message (%ftp-command "PASV" 227 (ftp-connection-socket conn)))) - (cond ((regexp-exec %pasv-rx message) - => - (lambda (match) - (+ (* (string->number (match:substring match 5)) 256) - (string->number (match:substring match 6))))) - (else - (throw 'ftp-error conn "PASV" 227 message))))) - - -(define* (ftp-list conn #:optional directory) - (define (address-with-port sa port) - (let ((fam (sockaddr:fam sa)) - (addr (sockaddr:addr sa))) - (cond ((= fam AF_INET) - (make-socket-address fam addr port)) - ((= fam AF_INET6) - (make-socket-address fam addr port - (sockaddr:flowinfo sa) - (sockaddr:scopeid sa))) - (else #f)))) - - (if directory - (ftp-chdir conn directory)) - - (let* ((port (ftp-pasv conn)) - (ai (ftp-connection-addrinfo conn)) - (s (socket (addrinfo:fam ai) (addrinfo:socktype ai) - (addrinfo:protocol ai)))) - (connect s (address-with-port (addrinfo:addr ai) port)) - (setvbuf s _IOLBF) - - (dynamic-wind - (lambda () #t) - (lambda () - (%ftp-command "LIST" 150 (ftp-connection-socket conn)) - - (let loop ((line (read-line s)) - (result '())) - (cond ((eof-object? line) (reverse result)) - ((regexp-exec %ftp-ready-rx line) - => - (lambda (match) - (let ((code (string->number (match:substring match 1)))) - (if (= 126 code) - (reverse result) - (throw 'ftp-error conn "LIST" code))))) - (else - (loop (read-line s) - (let ((file (car (reverse (string-tokenize line))))) - (cons file result))))))) - (lambda () - (close s) - (let-values (((code message) (%ftp-listen (ftp-connection-socket conn)))) - (or (eqv? code 226) - (throw 'ftp-error conn "LIST" code message))))))) - - -;;; -;;; GNU. -;;; - -(define %ignored-package-attributes - ;; Attribute name of packages to be ignored. - '("bash" "bashReal" "bashInteractive" ;; the full versioned name is incorrect - "autoconf213" - "automake17x" - "automake19x" - "automake110x" - "automake" ;; = 1.10.x - "bison1875" - "bison23" - "bison" ;; = 2.3 - "emacs22" - "emacsSnapshot" - "gcc295" - "gcc33" - "gcc34" - "gcc40" - "gcc41" - "gcc42" - "gcc43" - "glibc25" - "glibc27" - "glibc29" - "guile_1_9" - )) - -(define (gnu? package) - ;; Return true if PACKAGE (a snix expression) is a GNU package (according - ;; to a simple heuristic.) Otherwise return #f. - (match package - (('attribute _ attribute-name ('derivation _ _ body)) - (any (lambda (attr) - (match attr - (('attribute _ "meta" ('attribute-set metas)) - (any (lambda (attr) - (match attr - (('attribute _ "description" value) - (string-prefix? "GNU" value)) - (('attribute _ "homepage" value) - (string-contains value "www.gnu.org")) - (_ #f))) - metas)) - (_ #f))) - body)) - (_ #f))) - -(define (gnu-packages packages) - (fold (lambda (package gnu) - (match package - (('attribute _ "emacs23Packages" emacs-packages) - ;; XXX: Should prepend `emacs23Packages.' to attribute names. - (append (gnu-packages emacs-packages) gnu)) - (('attribute _ attribute-name ('derivation _ _ body)) - (if (member attribute-name %ignored-package-attributes) - gnu - (if (gnu? package) - (cons package gnu) - gnu))) - (_ gnu))) - '() - packages)) - -(define (ftp-server/directory project) - (define quirks - '(("commoncpp2" "ftp.gnu.org" "/gnu/commoncpp" #f) - ("libgcrypt" "ftp.gnupg.org" "/gcrypt" #t) - ("libgpg-error" "ftp.gnupg.org" "/gcrypt" #t) - ("gnupg" "ftp.gnupg.org" "/gcrypt" #t) - ("gnu-ghostscript" "ftp.gnu.org" "/ghostscript" #f) - ("GNUnet" "ftp.gnu.org" "/gnu/gnunet" #f) - ("mit-scheme" "ftp.gnu.org" "/gnu/mit-scheme/stable.pkg") - ("icecat" "ftp.gnu.org" "/gnu/gnuzilla" #f) - ("TeXmacs" "ftp.texmacs.org" "/TeXmacs/targz" #f))) - - (let ((quirk (assoc project quirks))) - (match quirk - ((_ server directory subdir?) - (values server (if (not subdir?) - directory - (string-append directory "/" project)))) - (else - (values "ftp.gnu.org" (string-append "/gnu/" project)))))) - -(define (nixpkgs->gnu-name project) - (define quirks - '(("gcc-wrapper" . "gcc") - ("ghostscript" . "gnu-ghostscript") ;; ../ghostscript/gnu-ghoscript-X.Y.tar.gz - ("gnum4" . "m4") - ("gnugrep" . "grep") - ("gnused" . "sed") - ("gnutar" . "tar") - ("gnunet" . "GNUnet") ;; ftp.gnu.org/gnu/gnunet/GNUnet-x.y.tar.gz - ("mitscheme" . "mit-scheme") - ("texmacs" . "TeXmacs"))) - - (or (assoc-ref quirks project) project)) - -(define (releases project) - ;; TODO: Handle project release trees like that of IceCat and MyServer. - (define release-rx - (make-regexp (string-append "^" project "-[0-9].*\\.tar\\."))) - - (catch #t - (lambda () - (let-values (((server directory) (ftp-server/directory project))) - (let* ((conn (ftp-open server)) - (files (ftp-list conn directory))) - (ftp-close conn) - (map (lambda (tarball) - (let ((end (string-contains tarball ".tar"))) - (substring tarball 0 end))) - - ;; Filter out signatures, deltas, and files which are potentially - ;; not releases of PROJECT (e.g., in /gnu/guile, filter out - ;; guile-oops and guile-www). - (filter (lambda (file) - (and (not (string-suffix? ".sig" file)) - (regexp-exec release-rx file))) - files))))) - (lambda (key subr message . args) - (format (current-error-port) - "failed to get release list for `~A': ~A ~A~%" - project message args) - '()))) - -(define version-string>? - (let ((strverscmp - (let ((sym (or (dynamic-func "strverscmp" (dynamic-link)) - (error "could not find `strverscmp' (from GNU libc)")))) - (make-foreign-function int sym (list '* '*)))) - (string->null-terminated-utf8 - (lambda (s) - (let* ((utf8 (string->utf8 s)) - (len (bytevector-length utf8)) - (nts (make-bytevector (+ len 1)))) - (bytevector-copy! utf8 0 nts 0 len) - (bytevector-u8-set! nts len 0) - nts)))) - (lambda (a b) - (let ((a (bytevector->foreign (string->null-terminated-utf8 a))) - (b (bytevector->foreign (string->null-terminated-utf8 b)))) - (> (strverscmp a b) 0))))) - -(define (latest-release project) - ;; Return "FOO-X.Y" or #f. - (let ((releases (releases project))) - (and (not (null? releases)) - (fold (lambda (release latest) - (if (version-string>? release latest) - release - latest)) - "" - releases)))) - -(define (package/version name+version) - (let ((hyphen (string-rindex name+version #\-))) - (if (not hyphen) - (values name+version #f) - (let ((name (substring name+version 0 hyphen)) - (version (substring name+version (+ hyphen 1) - (string-length name+version)))) - (values name version))))) - -(define (file-extension file) - (let ((dot (string-rindex file #\.))) - (and dot (substring file (+ 1 dot) (string-length file))))) - -(define (packages-to-update gnu-packages) - (fold (lambda (pkg result) - (call-with-package pkg - (lambda (attribute name+version location meta src) - (let-values (((name old-version) - (package/version name+version))) - (let ((latest (latest-release (nixpkgs->gnu-name name)))) - (cond ((not latest) - (format #t "~A [unknown latest version]~%" - name+version) - result) - ((string=? name+version latest) - (format #t "~A [up to date]~%" name+version) - result) - (else - (let-values (((project new-version) - (package/version latest)) - ((old-name old-hash old-urls) - (src->values src))) - (format #t "~A -> ~A [~A]~%" name+version latest - (and (pair? old-urls) (car old-urls))) - (let* ((url (and (pair? old-urls) - (car old-urls))) - (new-hash (fetch-gnu project new-version - (if url - (file-extension url) - "gz")))) - (cons (list name attribute - old-version old-hash - new-version new-hash - location) - result)))))))))) - '() - gnu-packages)) - -(define (fetch-gnu project version archive-type) - (let-values (((server directory) - (ftp-server/directory project))) - (let* ((base (string-append project "-" version ".tar." archive-type)) - (url (string-append "ftp://" server "/" directory "/" base)) - (sig (string-append base ".sig")) - (sig-url (string-append url ".sig"))) - (let-values (((hash path) (nix-prefetch-url url))) - (pk 'prefetch-url url hash path) - (and hash path - (begin - (false-if-exception (delete-file sig)) - (system* "wget" sig-url) - (if (file-exists? sig) - (let ((ret (system* "gpg" "--verify" sig path))) - (false-if-exception (delete-file sig)) - (if (and ret (= 0 (status:exit-val ret))) - hash - (begin - (format (current-error-port) - "signature verification failed for `~a'~%" - base) - (format (current-error-port) - "(could be because the public key is not in your keyring)~%") - #f))) - (begin - (format (current-error-port) - "no signature for `~a'~%" base) - hash)))))))) - - -;;; -;;; Main program. -;;; - -(define %options - ;; Specifications of the command-line options. - (list (option '(#\h "help") #f #f - (lambda (opt name arg result) - (format #t "Usage: gnupdate [OPTIONS...]~%") - (format #t "GNUpdate -- update Nix expressions of GNU packages in Nixpkgs~%") - (format #t "~%") - (format #t " -x, --xml=FILE Read XML output of `nix-instantiate'~%") - (format #t " from FILE.~%") - (format #t " -d, --dry-run Don't actually update Nix expressions~%") - (format #t " -h, --help Give this help list.~%~%") - (format #t "Report bugs to ~%") - (exit 0))) - (option '(#\d "dry-run") #f #f - (lambda (opt name arg result) - (alist-cons 'dry-run #t result))) - - (option '(#\x "xml") #t #f - (lambda (opt name arg result) - (alist-cons 'xml-file arg result))))) - -(define-public (main . args) - ;; Assume Nixpkgs is under $NIXPKGS or ~/src/nixpkgs. - (let* ((opts (args-fold args %options - (lambda (opt name arg result) - (error "unrecognized option `~A'" name)) - (lambda (operand result) - (error "extraneous argument `~A'" operand)) - '())) - (home (getenv "HOME")) - (path (or (getenv "NIXPKGS") - (string-append home "/src/nixpkgs"))) - (snix (begin - (format (current-error-port) "parsing XML...~%") - (xml->snix - (or (and=> (assoc-ref opts 'xml-file) open-input-file) - (open-nixpkgs path))))) - (packages (match snix - (('snix _ ('attribute-set attributes)) - attributes) - (else #f))) - (gnu (gnu-packages packages)) - (updates (packages-to-update gnu))) - (format #t "~%~A packages to update...~%" (length updates)) - (for-each (lambda (update) - (match update - ((name attribute - old-version old-hash - new-version new-hash - location) - (if (assoc-ref opts 'dry-run) - (format #t "`~a' would be updated from ~a to ~a (~a -> ~a)~%" - name old-version new-version - old-hash new-hash) - (update-nix-expression (location-file location) - old-version old-hash - new-version new-hash))) - (_ #f))) - updates) - #t)) From f1362ffb938c2fef526fee2095b9907373c7286f Mon Sep 17 00:00:00 2001 From: "Yury G. Kudryashov" Date: Wed, 24 Aug 2011 20:22:23 +0000 Subject: [PATCH 030/970] Another merge miss svn path=/nixpkgs/branches/stdenv-updates/; revision=28795 --- .../networking/browsers/rekonq/source.nix | 28 ------------------- 1 file changed, 28 deletions(-) delete mode 100644 pkgs/applications/networking/browsers/rekonq/source.nix diff --git a/pkgs/applications/networking/browsers/rekonq/source.nix b/pkgs/applications/networking/browsers/rekonq/source.nix deleted file mode 100644 index 5faeddaaf2a..00000000000 --- a/pkgs/applications/networking/browsers/rekonq/source.nix +++ /dev/null @@ -1,28 +0,0 @@ -{ fetchurl, fetchgit }: - -builtins.listToAttrs -[ - { - name = "0.4.90"; - value = rec { - name = "rekonq-0.4.90"; - src = fetchurl { - url = "http://kde-apps.org/CONTENT/content-files/94258-${name}.tar.bz2"; - name = "${name}.tar.bz2"; - sha256 = "1dmdx54asv0b4xzc8p5nadn92l8pks9cl1y9j8a46lsslwsjw3ws"; - }; - }; - } - - { - name = "scm"; - value = { - name = "rekonq-0.4.0-20100514"; - src = fetchgit { - url = git://gitorious.org/rekonq/mainline.git; - rev = "6b4f4d69a3c599bc958ccddc5f7ac1c8648a7042"; - sha256 = "1qcwf7rsrnsbnq62cl44r48bmavc2nysi2wqhy1jxmj2ndwvsxy1"; - }; - }; - } -] From f6bfeb3fce1dd949de73a4b91112f31c3d853369 Mon Sep 17 00:00:00 2001 From: "Yury G. Kudryashov" Date: Wed, 24 Aug 2011 20:22:27 +0000 Subject: [PATCH 031/970] Apply glibc-elf-localscope patch from OpenSUSE This fixes a lot of crashes in KDE background processes svn path=/nixpkgs/branches/stdenv-updates/; revision=28796 --- .../glibc-2.12/glibc-elf-localscope.patch | 82 +++++++++++++++++++ .../libraries/glibc-2.13/common.nix | 2 + 2 files changed, 84 insertions(+) create mode 100644 pkgs/development/libraries/glibc-2.12/glibc-elf-localscope.patch diff --git a/pkgs/development/libraries/glibc-2.12/glibc-elf-localscope.patch b/pkgs/development/libraries/glibc-2.12/glibc-elf-localscope.patch new file mode 100644 index 00000000000..98f7f81087b --- /dev/null +++ b/pkgs/development/libraries/glibc-2.12/glibc-elf-localscope.patch @@ -0,0 +1,82 @@ +diff -ru a/elf/dl-close.c b/elf/dl-close.c +--- a/elf/dl-close.c 2011-02-04 00:35:03.000000000 +0100 ++++ b/elf/dl-close.c 2011-02-22 02:16:12.367883000 +0100 +@@ -180,24 +186,28 @@ + /* Signal the object is still needed. */ + l->l_idx = IDX_STILL_USED; + ++#define mark_used(dmap) \ ++ do { \ ++ if ((dmap)->l_idx != IDX_STILL_USED) \ ++ { \ ++ assert ((dmap)->l_idx >= 0 && (dmap)->l_idx < nloaded); \ ++ \ ++ if (!used[(dmap)->l_idx]) \ ++ { \ ++ used[(dmap)->l_idx] = 1; \ ++ if ((dmap)->l_idx - 1 < done_index) \ ++ done_index = (dmap)->l_idx - 1; \ ++ } \ ++ } \ ++ } while (0) ++ + /* Mark all dependencies as used. */ + if (l->l_initfini != NULL) + { + struct link_map **lp = &l->l_initfini[1]; + while (*lp != NULL) + { +- if ((*lp)->l_idx != IDX_STILL_USED) +- { +- assert ((*lp)->l_idx >= 0 && (*lp)->l_idx < nloaded); +- +- if (!used[(*lp)->l_idx]) +- { +- used[(*lp)->l_idx] = 1; +- if ((*lp)->l_idx - 1 < done_index) +- done_index = (*lp)->l_idx - 1; +- } +- } +- ++ mark_used(*lp); + ++lp; + } + } +@@ -206,19 +216,25 @@ + for (unsigned int j = 0; j < l->l_reldeps->act; ++j) + { + struct link_map *jmap = l->l_reldeps->list[j]; +- +- if (jmap->l_idx != IDX_STILL_USED) +- { +- assert (jmap->l_idx >= 0 && jmap->l_idx < nloaded); +- +- if (!used[jmap->l_idx]) +- { +- used[jmap->l_idx] = 1; +- if (jmap->l_idx - 1 < done_index) +- done_index = jmap->l_idx - 1; +- } +- } ++ mark_used(jmap); + } ++ /* And the same for owners of our scopes; normally, our last ++ scope provider would render us unused, but this can be ++ prevented by the NODELETE flag. */ ++ if (__builtin_expect(l->l_type == lt_loaded ++ && (l->l_flags_1 & DF_1_NODELETE), 0)) ++ for (size_t cnt = 0; l->l_scope[cnt] != NULL; ++cnt) ++ /* This relies on l_scope[] entries being always set either ++ to its own l_symbolic_searchlist address, or some map's ++ l_searchlist address. */ ++ if (l->l_scope[cnt] != &l->l_symbolic_searchlist) ++ { ++ struct link_map *ls = (struct link_map *) ++ ((char *) l->l_scope[cnt] ++ - offsetof (struct link_map, l_searchlist)); ++ assert (ls->l_ns == nsid); ++ mark_used(ls); ++ } + } + + /* Sort the entries. */ diff --git a/pkgs/development/libraries/glibc-2.13/common.nix b/pkgs/development/libraries/glibc-2.13/common.nix index 460deb1019b..c6ea06cc117 100644 --- a/pkgs/development/libraries/glibc-2.13/common.nix +++ b/pkgs/development/libraries/glibc-2.13/common.nix @@ -74,6 +74,8 @@ stdenv.mkDerivation ({ /* Allow nixos and nix handle the locale-archive. */ ./nix-locale-archive.patch + /* Without this patch many KDE binaries crash. */ + ./glibc-elf-localscope.patch ]; postPatch = '' From 8e7e316ae1547c6af3fa07a40a213a70d0ef031f Mon Sep 17 00:00:00 2001 From: "Yury G. Kudryashov" Date: Wed, 24 Aug 2011 20:32:46 +0000 Subject: [PATCH 032/970] Oops, wrong local merge svn path=/nixpkgs/branches/stdenv-updates/; revision=28797 --- .../{glibc-2.12 => glibc-2.13}/glibc-elf-localscope.patch | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename pkgs/development/libraries/{glibc-2.12 => glibc-2.13}/glibc-elf-localscope.patch (100%) diff --git a/pkgs/development/libraries/glibc-2.12/glibc-elf-localscope.patch b/pkgs/development/libraries/glibc-2.13/glibc-elf-localscope.patch similarity index 100% rename from pkgs/development/libraries/glibc-2.12/glibc-elf-localscope.patch rename to pkgs/development/libraries/glibc-2.13/glibc-elf-localscope.patch From 2b619dd126ca1ef8d5847e3ea0dc84eb0c2f2a5d Mon Sep 17 00:00:00 2001 From: "Yury G. Kudryashov" Date: Wed, 24 Aug 2011 21:15:58 +0000 Subject: [PATCH 033/970] Merge with trunk (trivial svn merge URL/trunk) svn path=/nixpkgs/branches/stdenv-updates/; revision=28799 --- pkgs/top-level/release.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/top-level/release.nix b/pkgs/top-level/release.nix index 7c415fa445b..49c2279a649 100644 --- a/pkgs/top-level/release.nix +++ b/pkgs/top-level/release.nix @@ -566,7 +566,7 @@ with (import ./release-lib.nix); xwininfo = linux; }; - xfce4 = { + xfce = { gtk_xfce_engine = linux; mousepad = linux; ristretto = linux; From d11c7b604f17d6f23a4162add908ae8575ca4167 Mon Sep 17 00:00:00 2001 From: Shea Levy Date: Sun, 28 Aug 2011 18:41:51 +0000 Subject: [PATCH 034/970] gcc-4.{4,5,6}: Remove Treelang, bison, and flex Treelang was dropped in gcc 4.4 and bison and flex are not needed for anything else svn path=/nixpkgs/branches/stdenv-updates/; revision=28858 --- pkgs/development/compilers/gcc-4.4/default.nix | 9 ++------- pkgs/development/compilers/gcc-4.5/default.nix | 9 ++------- pkgs/development/compilers/gcc-4.6/default.nix | 9 ++------- 3 files changed, 6 insertions(+), 21 deletions(-) diff --git a/pkgs/development/compilers/gcc-4.4/default.nix b/pkgs/development/compilers/gcc-4.4/default.nix index 6c2897c56c4..b08cf5bb8cf 100644 --- a/pkgs/development/compilers/gcc-4.4/default.nix +++ b/pkgs/development/compilers/gcc-4.4/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, noSysDirs -, langC ? true, langCC ? true, langFortran ? false, langTreelang ? false +, langC ? true, langCC ? true, langFortran ? false , langJava ? false , langAda ? false , langVhdl ? false @@ -9,7 +9,6 @@ , texinfo ? null , gmp, mpfr, gettext, which , ppl ? null, cloogppl ? null # used by the Graphite optimization framework -, bison ? null, flex ? null , zlib ? null, boehmgc ? null , zip ? null, unzip ? null, pkgconfig ? null, gtk ? null, libart_lgpl ? null , libX11 ? null, libXt ? null, libSM ? null, libICE ? null, libXtst ? null @@ -25,7 +24,6 @@ , gnat ? null }: -assert langTreelang -> bison != null && flex != null; assert langJava -> zip != null && unzip != null && zlib != null && boehmgc != null; assert langAda -> gnatboot != null; @@ -131,7 +129,6 @@ stdenv.mkDerivation ({ buildInputs = [ gmp mpfr gettext ] ++ (optional (ppl != null) ppl) ++ (optional (cloogppl != null) cloogppl) - ++ (optionals langTreelang [bison flex]) ++ (optional (zlib != null) zlib) ++ (optional (boehmgc != null) boehmgc) ++ (optionals langJava [zip unzip]) @@ -160,7 +157,6 @@ stdenv.mkDerivation ({ ++ optional langCC "c++" ++ optional langFortran "fortran" ++ optional langJava "java" - ++ optional langTreelang "treelang" ++ optional langAda "ada" ++ optional langVhdl "vhdl" ) @@ -209,7 +205,6 @@ stdenv.mkDerivation ({ ++ optional langCC "c++" ++ optional langFortran "fortran" ++ optional langJava "java" - ++ optional langTreelang "treelang" ++ optional langAda "ada" ++ optional langVhdl "vhdl" ) @@ -244,7 +239,7 @@ stdenv.mkDerivation ({ ++ optionals javaAwtGtk [ gmp mpfr ]))); - passthru = { inherit langC langCC langAda langFortran langTreelang langVhdl + passthru = { inherit langC langCC langAda langFortran langVhdl enableMultilib version; }; # ghdl does not build fine with parallel building diff --git a/pkgs/development/compilers/gcc-4.5/default.nix b/pkgs/development/compilers/gcc-4.5/default.nix index 9d4aeaf01e1..8d3aa658ab3 100644 --- a/pkgs/development/compilers/gcc-4.5/default.nix +++ b/pkgs/development/compilers/gcc-4.5/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, noSysDirs -, langC ? true, langCC ? true, langFortran ? false, langTreelang ? false +, langC ? true, langCC ? true, langFortran ? false , langJava ? false , langAda ? false , langVhdl ? false @@ -11,7 +11,6 @@ , gmp, mpfr, mpc, gettext, which , libelf # optional, for link-time optimizations (LTO) , ppl ? null, cloogppl ? null # optional, for the Graphite optimization framework -, bison ? null, flex ? null , zlib ? null, boehmgc ? null , zip ? null, unzip ? null, pkgconfig ? null, gtk ? null, libart_lgpl ? null , libX11 ? null, libXt ? null, libSM ? null, libICE ? null, libXtst ? null @@ -29,7 +28,6 @@ , stripped ? true }: -assert langTreelang -> bison != null && flex != null; assert langJava -> zip != null && unzip != null && zlib != null && boehmgc != null && perl != null; # for `--enable-java-home' @@ -203,7 +201,6 @@ stdenv.mkDerivation ({ buildInputs = [ gmp mpfr mpc libelf gettext ] ++ (optional (ppl != null) ppl) ++ (optional (cloogppl != null) cloogppl) - ++ (optionals langTreelang [bison flex]) ++ (optional (zlib != null) zlib) ++ (optional (boehmgc != null) boehmgc) ++ (optionals langJava [zip unzip]) @@ -245,7 +242,6 @@ stdenv.mkDerivation ({ ++ optional langCC "c++" ++ optional langFortran "fortran" ++ optional langJava "java" - ++ optional langTreelang "treelang" ++ optional langAda "ada" ++ optional langVhdl "vhdl" ) @@ -292,7 +288,6 @@ stdenv.mkDerivation ({ ++ optional langCC "c++" ++ optional langFortran "fortran" ++ optional langJava "java" - ++ optional langTreelang "treelang" ++ optional langAda "ada" ++ optional langVhdl "vhdl" ) @@ -357,7 +352,7 @@ stdenv.mkDerivation ({ " -L${libpthreadCross}/lib -Wl,${libpthreadCross.TARGET_LDFLAGS}") else null; - passthru = { inherit langC langCC langAda langFortran langTreelang langVhdl + passthru = { inherit langC langCC langAda langFortran langVhdl enableMultilib version; }; enableParallelBuilding = true; diff --git a/pkgs/development/compilers/gcc-4.6/default.nix b/pkgs/development/compilers/gcc-4.6/default.nix index 6b484a09877..c28b885c680 100644 --- a/pkgs/development/compilers/gcc-4.6/default.nix +++ b/pkgs/development/compilers/gcc-4.6/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, noSysDirs -, langC ? true, langCC ? true, langFortran ? false, langTreelang ? false +, langC ? true, langCC ? true, langFortran ? false , langJava ? false , langAda ? false , langVhdl ? false @@ -12,7 +12,6 @@ , gmp, mpfr, mpc, gettext, which , libelf # optional, for link-time optimizations (LTO) , ppl ? null, cloogppl ? null, cloog ? null # optional, for the Graphite optimization framework. Cannot pass both cloog and cloogppl -, bison ? null, flex ? null , zlib ? null, boehmgc ? null , zip ? null, unzip ? null, pkgconfig ? null, gtk ? null, libart_lgpl ? null , libX11 ? null, libXt ? null, libSM ? null, libICE ? null, libXtst ? null @@ -30,7 +29,6 @@ , stripped ? true }: -assert langTreelang -> bison != null && flex != null; assert langJava -> zip != null && unzip != null && zlib != null && boehmgc != null && perl != null; # for `--enable-java-home' @@ -209,7 +207,6 @@ stdenv.mkDerivation ({ ++ (optional (ppl != null) ppl) ++ (optional (cloogppl != null) cloogppl) ++ (optional (cloog != null) cloog) - ++ (optionals langTreelang [bison flex]) ++ (optional (zlib != null) zlib) ++ (optionals langJava [ boehmgc zip unzip ]) ++ (optionals javaAwtGtk [gtk pkgconfig libart_lgpl] ++ xlibs) @@ -252,7 +249,6 @@ stdenv.mkDerivation ({ ++ optional langCC "c++" ++ optional langFortran "fortran" ++ optional langJava "java" - ++ optional langTreelang "treelang" ++ optional langAda "ada" ++ optional langVhdl "vhdl" ++ optional langGo "go" @@ -306,7 +302,6 @@ stdenv.mkDerivation ({ ++ optional langCC "c++" ++ optional langFortran "fortran" ++ optional langJava "java" - ++ optional langTreelang "treelang" ++ optional langAda "ada" ++ optional langVhdl "vhdl" ++ optional langGo "go" @@ -372,7 +367,7 @@ stdenv.mkDerivation ({ " -L${libpthreadCross}/lib -Wl,${libpthreadCross.TARGET_LDFLAGS}") else null; - passthru = { inherit langC langCC langAda langFortran langTreelang langVhdl + passthru = { inherit langC langCC langAda langFortran langVhdl langGo enableMultilib version; }; enableParallelBuilding = true; From 9c37762551a5edba9d13f04082245d288ab3f4dc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?= Date: Thu, 1 Sep 2011 13:24:51 +0000 Subject: [PATCH 035/970] util-linux-ng failed to build without zlib. svn path=/nixpkgs/branches/stdenv-updates/; revision=28955 --- pkgs/os-specific/linux/util-linux-ng/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/util-linux-ng/default.nix b/pkgs/os-specific/linux/util-linux-ng/default.nix index 4e62be4ff32..ba9ae72b73a 100644 --- a/pkgs/os-specific/linux/util-linux-ng/default.nix +++ b/pkgs/os-specific/linux/util-linux-ng/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, ncurses ? null, perl ? null }: +{ stdenv, fetchurl, zlib, ncurses ? null, perl ? null }: stdenv.mkDerivation rec { name = "util-linux-ng-2.18"; @@ -19,6 +19,6 @@ stdenv.mkDerivation rec { ${if ncurses == null then "--without-ncurses" else ""} ''; - buildInputs = stdenv.lib.optional (ncurses != null) ncurses + buildInputs = [ zlib ] ++ stdenv.lib.optional (ncurses != null) ncurses ++ stdenv.lib.optional (perl != null) perl; } From bff99fe8b52c5a0c19bc298b86549a470c578fb3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?= Date: Thu, 1 Sep 2011 14:28:13 +0000 Subject: [PATCH 036/970] Making gcc 4.6 that of stdenv. svn path=/nixpkgs/branches/stdenv-updates/; revision=28958 --- pkgs/stdenv/linux/default.nix | 7 +++++-- pkgs/top-level/all-packages.nix | 2 +- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/pkgs/stdenv/linux/default.nix b/pkgs/stdenv/linux/default.nix index ce10399eb5d..315c0895d20 100644 --- a/pkgs/stdenv/linux/default.nix +++ b/pkgs/stdenv/linux/default.nix @@ -218,10 +218,13 @@ rec { static = true; }; }; - cloogppl = stdenvLinuxBoot3Pkgs.cloogppl.override { - inherit ppl; + cloog = stdenvLinuxBoot3Pkgs.cloog.override { + isl = stdenvLinuxBoot3Pkgs.isl.override { + static = true; + }; static = true; }; + cloogppl = null; }); # 8) Construct a fourth stdenv identical to the second, except that diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 3fec298e6ae..4dbc58aa27d 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -1642,7 +1642,7 @@ let gambit = callPackage ../development/compilers/gambit { }; - gcc = gcc45; + gcc = gcc46; gcc295 = wrapGCC (import ../development/compilers/gcc-2.95 { inherit fetchurl stdenv noSysDirs; From befe2926a864f66963a2f62fd52a60549fc305cf Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?= Date: Thu, 1 Sep 2011 17:37:50 +0000 Subject: [PATCH 037/970] Binutils 2.21 tarball is away from the mirrors. I guess we should take 2.21a. svn path=/nixpkgs/branches/stdenv-updates/; revision=28959 --- pkgs/development/tools/misc/binutils/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/misc/binutils/default.nix b/pkgs/development/tools/misc/binutils/default.nix index 679a10a517d..c937176f74a 100644 --- a/pkgs/development/tools/misc/binutils/default.nix +++ b/pkgs/development/tools/misc/binutils/default.nix @@ -1,14 +1,14 @@ { stdenv, fetchurl, noSysDirs, zlib, cross ? null, gold ? false, bison ? null, flex2535 ? null, bc ? null, dejagnu ? null }: let - basename = "binutils-2.21"; + basename = "binutils-2.21a"; in stdenv.mkDerivation rec { name = basename + stdenv.lib.optionalString (cross != null) "-${cross.config}"; src = fetchurl { url = "mirror://gnu/binutils/${basename}.tar.bz2"; - sha256 = "1iyhc42zfa0j2gaxy4zvpk47sdqj4rqvib0mb8597ss8yidyrav0"; + sha256 = "0m7nmd7gc9d9md43wbrv65hz6lbi2crqwryzpigv19ray1lzmv6d"; }; patches = [ From 58fedb26b45afe15a19f620bc6e5cd2b12a6195c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?= Date: Thu, 1 Sep 2011 17:38:05 +0000 Subject: [PATCH 038/970] (binutils in the previous commit) I meant 2.21.1a svn path=/nixpkgs/branches/stdenv-updates/; revision=28960 --- pkgs/development/tools/misc/binutils/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/tools/misc/binutils/default.nix b/pkgs/development/tools/misc/binutils/default.nix index c937176f74a..508acd0199a 100644 --- a/pkgs/development/tools/misc/binutils/default.nix +++ b/pkgs/development/tools/misc/binutils/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchurl, noSysDirs, zlib, cross ? null, gold ? false, bison ? null, flex2535 ? null, bc ? null, dejagnu ? null }: let - basename = "binutils-2.21a"; + basename = "binutils-2.21.1a"; in stdenv.mkDerivation rec { name = basename + stdenv.lib.optionalString (cross != null) "-${cross.config}"; From 006c7c854a95db3497b61c3f80ba58ed29ed5d85 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?= Date: Thu, 1 Sep 2011 17:38:55 +0000 Subject: [PATCH 039/970] Adding a patch for libxcrypt that could make it build for gcc 4.6. Untested; I only looked at the hydra log. svn path=/nixpkgs/branches/stdenv-updates/; revision=28961 --- .../libraries/libxcrypt/default.nix | 3 +++ .../libraries/libxcrypt/gcc46.patch | 18 ++++++++++++++++++ 2 files changed, 21 insertions(+) create mode 100644 pkgs/development/libraries/libxcrypt/gcc46.patch diff --git a/pkgs/development/libraries/libxcrypt/default.nix b/pkgs/development/libraries/libxcrypt/default.nix index aea9e53eef6..b2c9a2c9cf5 100644 --- a/pkgs/development/libraries/libxcrypt/default.nix +++ b/pkgs/development/libraries/libxcrypt/default.nix @@ -11,4 +11,7 @@ stdenv.mkDerivation { url = ftp://ftp.suse.com/pub/people/kukuk/libxcrypt/libxcrypt-3.0.2.tar.bz2; sha256 = "15l2xvhi3r3b40x4665c101ikylh5xsbpw03gnszypfjgn1jkcii"; }; + + patches = [ ./gcc46.patch ]; + } diff --git a/pkgs/development/libraries/libxcrypt/gcc46.patch b/pkgs/development/libraries/libxcrypt/gcc46.patch new file mode 100644 index 00000000000..0664f96aa68 --- /dev/null +++ b/pkgs/development/libraries/libxcrypt/gcc46.patch @@ -0,0 +1,18 @@ +For gcc 4.6 to build this. Otherwise it says 's unused variable', and it's built +with -Werror. + +diff --git a/src/cert.c b/src/cert.c +index 28c7b11..34570a4 100644 +--- a/src/cert.c ++++ b/src/cert.c +@@ -87,9 +87,7 @@ char *cp; + int i,j,t; + + for(i=0;i<8;i++){ +- int s; +- +- s = scanf("%2x",&t); ++ scanf("%2x",&t); + if(feof(stdin)) + good_bye(); + for(j=0; j<8 ; j++) { From 306b85df733c571fde3bfdab32dae3b6429298bc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?= Date: Thu, 1 Sep 2011 19:26:19 +0000 Subject: [PATCH 040/970] Updating the glibc ports to 2.13. This should fix https://bugs.gentoo.org/show_bug.cgi?id=356599 (that I found bootstrapping this stdenv in armv5tel) svn path=/nixpkgs/branches/stdenv-updates/; revision=28967 --- pkgs/development/libraries/glibc-2.13/common.nix | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/pkgs/development/libraries/glibc-2.13/common.nix b/pkgs/development/libraries/glibc-2.13/common.nix index c6ea06cc117..15941c2a43b 100644 --- a/pkgs/development/libraries/glibc-2.13/common.nix +++ b/pkgs/development/libraries/glibc-2.13/common.nix @@ -20,9 +20,8 @@ let else needsPortsCross; srcPorts = fetchurl { - # These should work equally well for 2.13 - url = "mirror://gnu/glibc/glibc-ports-2.12.1.tar.bz2"; - sha256 = "041ix0nq7nc5r7jf80jsdlw4idah2mjp5nf7khybhc4cs1kc31ir"; + url = "mirror://gnu/glibc/glibc-ports-2.13.tar.bz2"; + sha256 = "0npffql62m1xba15l1wkaqf2p0l2bvb33720gx28764jmq0la75i"; }; in From 8715ac105ba2cd54db8f2dcab200963d76c89913 Mon Sep 17 00:00:00 2001 From: Shea Levy Date: Sun, 11 Sep 2011 18:58:24 +0000 Subject: [PATCH 041/970] GNU Coreutils 8.13 svn path=/nixpkgs/branches/stdenv-updates/; revision=29191 --- pkgs/tools/misc/coreutils/default.nix | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/tools/misc/coreutils/default.nix b/pkgs/tools/misc/coreutils/default.nix index 4db9df46721..f21f97a18a2 100644 --- a/pkgs/tools/misc/coreutils/default.nix +++ b/pkgs/tools/misc/coreutils/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, perl, gmp ? null +{ stdenv, fetchurl, perl, xz, gmp ? null , aclSupport ? false, acl ? null , selinuxSupport? false, libselinux ? null, libsepol ? null }: @@ -6,14 +6,14 @@ assert aclSupport -> acl != null; assert selinuxSupport -> ( (libselinux != null) && (libsepol != null) ); stdenv.mkDerivation (rec { - name = "coreutils-8.10"; + name = "coreutils-8.13"; src = fetchurl { - url = "mirror://gnu/coreutils/${name}.tar.gz"; - sha256 = "11fr0hkdk9h7a5ggpp3hj45ryvq3gc8ri2kksbgn7v8rjmp1x1jb"; + url = "mirror://gnu/coreutils/${name}.tar.xz"; + sha256 = "06xc4jfkr5h8pc6wq14ncihapf5chcwvvcjvpwkby1ngw0xbxz8b"; }; - buildNativeInputs = [ perl ]; + buildNativeInputs = [ perl xz ]; buildInputs = [ gmp ] ++ stdenv.lib.optional aclSupport acl ++ stdenv.lib.optional selinuxSupport libselinux From 99863cb87b3231e6bfef139a7b54c35f6aa63a16 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?= Date: Wed, 21 Sep 2011 06:18:23 +0000 Subject: [PATCH 042/970] Making bison 2.4 and 2.5 cross build (I hope), and setting the main bison as 2.5. Let's see what builds and what not. svn path=/nixpkgs/branches/stdenv-updates/; revision=29406 --- pkgs/development/tools/parsing/bison/bison-2.4.nix | 3 ++- pkgs/development/tools/parsing/bison/bison-2.5.nix | 3 ++- pkgs/top-level/all-packages.nix | 2 +- 3 files changed, 5 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/parsing/bison/bison-2.4.nix b/pkgs/development/tools/parsing/bison/bison-2.4.nix index 61ce9b895db..8fda9e3a087 100644 --- a/pkgs/development/tools/parsing/bison/bison-2.4.nix +++ b/pkgs/development/tools/parsing/bison/bison-2.4.nix @@ -8,7 +8,8 @@ stdenv.mkDerivation rec { sha256 = "019s3pdzggb71g7p7dgajhh53gh0h6nfl4yrzrs0jzsc37ph4lwk"; }; - buildInputs = [m4]; + buildNativeInputs = [m4]; + propagatedBuildInputs = [m4]; doCheck = true; diff --git a/pkgs/development/tools/parsing/bison/bison-2.5.nix b/pkgs/development/tools/parsing/bison/bison-2.5.nix index e373a80e46d..87753d472f3 100644 --- a/pkgs/development/tools/parsing/bison/bison-2.5.nix +++ b/pkgs/development/tools/parsing/bison/bison-2.5.nix @@ -8,8 +8,9 @@ stdenv.mkDerivation rec { sha256 = "1f1rai3v6k6xjii94964iq0alhc2hxwapqa363nfj8rbxvv0sdqa"; }; - buildInputs = [ m4 ] + buildNativeInputs = [ m4 ] ++ stdenv.lib.optional doCheck perl; + propagatedBuildInputs = [ m4 ]; doCheck = true; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 4dbc58aa27d..4c333d95ee6 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -2706,7 +2706,7 @@ let cross = assert crossSystem != null; crossSystem; }); - bison = bison24; + bison = bison25; bison1875 = callPackage ../development/tools/parsing/bison/bison-1.875.nix { }; From 6a1bde84dc45349c9b3dcc6e8a1a519b7e9f6360 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Sat, 24 Sep 2011 08:06:47 +0000 Subject: [PATCH 043/970] pkgs/shells/bash/default.nix: don't install bash completion in non-interactive mode This patch removes the kludge introduced in trunk to avoid a stdenv rebuild. svn path=/nixpkgs/branches/stdenv-updates/; revision=29469 --- pkgs/shells/bash/default.nix | 10 +--------- 1 file changed, 1 insertion(+), 9 deletions(-) diff --git a/pkgs/shells/bash/default.nix b/pkgs/shells/bash/default.nix index 684fc67ed1a..529c7334b49 100644 --- a/pkgs/shells/bash/default.nix +++ b/pkgs/shells/bash/default.nix @@ -51,15 +51,7 @@ stdenv.mkDerivation rec { postInstall = '' # Add an `sh' -> `bash' symlink. ln -s bash "$out/bin/sh" - - '' + (if interactive then "" else '' - # Install the completion examples. - ensureDir "$out/etc" - cp -v "examples/complete/bash_completion" "$out/etc" - - ensureDir "$out/etc/bash_completion.d" - cp -v "examples/complete/complete.gnu-longopt" "$out/etc/bash_completion.d" - ''); + ''; meta = { homepage = http://www.gnu.org/software/bash/; From e460e459bf3717ddda80c6be1f5e608d79a8ad9e Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Wed, 28 Sep 2011 19:26:00 +0000 Subject: [PATCH 044/970] synchronize with trunk svn path=/nixpkgs/branches/stdenv-updates/; revision=29531 --- .../networking/browsers/opera/builder.sh | 39 --------- .../networking/browsers/opera/default.nix | 87 +++++++++++++------ .../libraries/haskell/criterion/default.nix | 10 +-- .../haskell/happstack/happstack-util.nix | 4 +- pkgs/development/libraries/icu/default.nix | 4 +- .../tools/haskell/hlint/default.nix | 4 +- pkgs/top-level/all-packages.nix | 4 +- 7 files changed, 75 insertions(+), 77 deletions(-) delete mode 100644 pkgs/applications/networking/browsers/opera/builder.sh diff --git a/pkgs/applications/networking/browsers/opera/builder.sh b/pkgs/applications/networking/browsers/opera/builder.sh deleted file mode 100644 index de4a413e4ac..00000000000 --- a/pkgs/applications/networking/browsers/opera/builder.sh +++ /dev/null @@ -1,39 +0,0 @@ -source $stdenv/setup - -buildPhase() { - true -} - -installPhase() { - substituteInPlace install --replace /bin/pwd pwd - substituteInPlace install --replace /usr/local "$out" - - # Note: the "no" is because the install scripts asks whether we - # want to install icons in some system-wide directories. - - ensureDir "$out" - - ./install --text --system - - [ -z ${system##*64*} ] && suf=64 - - find $out -type f | while read f; do - echo testing "$f" - # patch all executables - if readelf -h "$f" | grep 'EXEC (Executable file)' &> /dev/null; then - echo "patching $f <<" - patchelf \ - --set-interpreter "$(cat $NIX_GCC/nix-support/dynamic-linker)" \ - --set-rpath "$libPath" \ - "$f" - fi - done - - # Substitute pwd as late as possible so that the md5 checksum check of opera passes. - substituteInPlace $out/bin/opera --replace /bin/pwd pwd - - ensureDir $out/share/applications - cp $desktopItem/share/applications/* $out/share/applications -} - -genericBuild diff --git a/pkgs/applications/networking/browsers/opera/default.nix b/pkgs/applications/networking/browsers/opera/default.nix index 8b7ef628044..3dddc856963 100644 --- a/pkgs/applications/networking/browsers/opera/default.nix +++ b/pkgs/applications/networking/browsers/opera/default.nix @@ -1,46 +1,81 @@ -{ stdenv, fetchurl, qt, zlib, libX11, libXext, libSM, libICE, libXt, glibc -, makeDesktopItem, freetype, fontconfig, libXft, libXrender +{ stdenv, fetchurl, zlib, libX11, libXext, libSM, libICE, libXt +, freetype, fontconfig, libXft, libXrender, libxcb, expat, libXau, libXdmcp +, libuuid, cups, xz +, gstreamer, gstPluginsBase, libxml2 +, gtkSupport ? true, glib, gtk, pango, gdk_pixbuf, cairo, atk +, kdeSupport ? false, qt4, kdelibs }: -assert stdenv.isLinux && stdenv.gcc.gcc != null; +assert stdenv.isLinux && stdenv.gcc.gcc != null && stdenv.gcc.libc != null; + +let + mirror = ftp://ftp.ussg.iu.edu/pub/opera; +in stdenv.mkDerivation rec { - name = "opera-10.63"; + name = "opera-11.51-1087"; - builder = ./builder.sh; + buildNativeInputs = [ xz ]; src = if stdenv.system == "i686-linux" then fetchurl { - url = "http://mirror.liteserver.nl/pub/opera/linux/1063/opera-10.63-6450.i386.linux.tar.bz2"; - sha256 = "dd105d602a4b8897749a4cb9610f8bfe2d07d4f4cc9bf3905930c65592737259"; + url = "${mirror}/linux/1151/${name}.i386.linux.tar.bz2"; + sha256 = "1baaim404g8nwd7knbl1p1ardpx36ib5159nkvqfnnavfyhkinp2"; } else if stdenv.system == "x86_64-linux" then fetchurl { - url = "http://mirror.liteserver.nl/pub/opera/linux/1063/opera-10.63-6450.x86_64.linux.tar.bz2"; - sha256 = "da8ae14cf317364ab0295102220246b205bf30c59c00cadb571395c90dda7c74"; + url = "${mirror}/linux/1151/${name}.x86_64.linux.tar.xz"; + sha256 = "1bciqyfhhdywaasj717by1a975ywf672r3pv9cw9bn0b90pgp933"; } else throw "Opera is not supported on ${stdenv.system} (only i686-linux and x86_64 linux are supported)"; dontStrip = 1; - - # `operapluginwrapper' requires libXt. Adding it makes startup faster - # and omits error messages (on x86). - libPath = - let list = [ stdenv.gcc.gcc glibc qt zlib libX11 libXt libXext libSM libICE libXft freetype fontconfig - libXrender]; - in stdenv.lib.makeLibraryPath list - + ":" + (if stdenv.system == "x86_64-linux" then stdenv.lib.makeSearchPath "lib64" list else ""); - desktopItem = makeDesktopItem { - name = "Opera"; - exec = "opera"; - icon = "opera"; - comment = "Opera Web Browser"; - desktopName = "Opera"; - genericName = "Web Browser"; - categories = "Application;Network;"; - }; + phases = "unpackPhase installPhase fixupPhase"; + + installPhase = '' + ./install --unattended --prefix $out + ''; + + buildInputs = + [ stdenv.gcc.gcc stdenv.gcc.libc zlib libX11 libXt libXext libSM libICE + libXft freetype fontconfig libXrender libuuid expat + gstreamer libxml2 gstPluginsBase + ] + ++ stdenv.lib.optionals gtkSupport [ glib gtk pango gdk_pixbuf cairo atk ] + ++ stdenv.lib.optionals kdeSupport [ kdelibs qt4 ]; + + libPath = stdenv.lib.makeLibraryPath buildInputs + + stdenv.lib.optionalString (stdenv.system == "x86_64-linux") + (":" + stdenv.lib.makeSearchPath "lib64" buildInputs); + + preFixup = + '' + find $out/lib/opera -type f | while read f; do + type=$(readelf -h "$f" 2>/dev/null | grep 'Type:' | sed -e 's/ *Type: *\([A-Z]*\) (.*/\1/') + if [ -z "$type" ]; then + : + elif [ $type == "EXEC" ]; then + echo "patching $f executable <<" + patchelf \ + --set-interpreter "$(cat $NIX_GCC/nix-support/dynamic-linker)" \ + --set-rpath "${libPath}" \ + "$f" + elif [ $type == "DYN" ]; then + echo "patching $f library <<" + patchelf --set-rpath "${libPath}" "$f" + else + echo "Unknown type $type" + exit 1 + fi + done + ''; + + postFixup = '' + oldRPATH=`patchelf --print-rpath $out/lib/opera/opera` + patchelf --set-rpath $oldRPATH:${cups}/lib $out/lib/opera/opera + ''; meta = { homepage = http://www.opera.com; diff --git a/pkgs/development/libraries/haskell/criterion/default.nix b/pkgs/development/libraries/haskell/criterion/default.nix index 0a7f23a38ac..f567569a6f6 100644 --- a/pkgs/development/libraries/haskell/criterion/default.nix +++ b/pkgs/development/libraries/haskell/criterion/default.nix @@ -1,13 +1,13 @@ -{ cabal, deepseq, mtl, mwcRandom, parsec, statistics, time, vector -, vectorAlgorithms +{ cabal, aeson, deepseq, mtl, mwcRandom, parsec, statistics, time +, vector, vectorAlgorithms }: cabal.mkDerivation (self: { pname = "criterion"; - version = "0.5.0.10"; - sha256 = "0sd289s7wnyg0p37j327hv55aw4a18bdv56z26v4qi3j8p2fbpbj"; + version = "0.5.1.0"; + sha256 = "0v43dm1d84zvn32q89dq0nh4dvqr4r6fjdzwcjac0mjics3iy29d"; buildDepends = [ - deepseq mtl mwcRandom parsec statistics time vector + aeson deepseq mtl mwcRandom parsec statistics time vector vectorAlgorithms ]; meta = { diff --git a/pkgs/development/libraries/haskell/happstack/happstack-util.nix b/pkgs/development/libraries/haskell/happstack/happstack-util.nix index de4c1b9990c..faeb174f251 100644 --- a/pkgs/development/libraries/haskell/happstack/happstack-util.nix +++ b/pkgs/development/libraries/haskell/happstack/happstack-util.nix @@ -4,8 +4,8 @@ cabal.mkDerivation (self: { pname = "happstack-util"; - version = "6.0.0"; - sha256 = "06qla74kb58q0rvlfa9k16s4crnylq99hm80xx4phlddyzn0cy4z"; + version = "6.0.2"; + sha256 = "03qlnclpg72iflry1xlkd0sxqm6nybvx113la9r0cmsnz17y546a"; isLibrary = true; isExecutable = true; buildDepends = [ diff --git a/pkgs/development/libraries/icu/default.nix b/pkgs/development/libraries/icu/default.nix index c15bbe2491c..0474b79a847 100644 --- a/pkgs/development/libraries/icu/default.nix +++ b/pkgs/development/libraries/icu/default.nix @@ -2,7 +2,7 @@ let pname = "icu4c"; - version = "4.6"; + version = "4.8.1"; in stdenv.mkDerivation { @@ -11,7 +11,7 @@ stdenv.mkDerivation { src = fetchurl { url = "http://download.icu-project.org/files/${pname}/${version}/${pname}-" + (stdenv.lib.replaceChars ["."] ["_"] version) + "-src.tgz"; - sha256 = "1z6zklqdf6pq7fckk8ar4vmfrnw79bih6yc8gwc7k2vx2alav8dm"; + sha256 = "13zq190gl54zr84f0k48w9knarjsb966jkailyy06yhqjipcv90r"; }; postUnpack = " diff --git a/pkgs/development/tools/haskell/hlint/default.nix b/pkgs/development/tools/haskell/hlint/default.nix index da117157f22..be66cfc0680 100644 --- a/pkgs/development/tools/haskell/hlint/default.nix +++ b/pkgs/development/tools/haskell/hlint/default.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "hlint"; - version = "1.8.15"; - sha256 = "1hi2qapi8lb7cawjzvpknp8qvsnfw3glxyyd5m2lbp3rvkx0d6kr"; + version = "1.8.16"; + sha256 = "0crahq7fvhf0qvjcpjnmv5yh29l52cv7rgfwrc6ka4q0dm9r49vb"; isLibrary = true; isExecutable = true; buildDepends = [ diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index b32b7f90a90..d38892e23a2 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -7069,7 +7069,9 @@ let }; opera = callPackage ../applications/networking/browsers/opera { - qt = qt3; + inherit (pkgs.gtkLibs) gdk_pixbuf atk; + inherit (pkgs.kde4) kdelibs; + inherit (pkgs.gst_all) gstreamer gstPluginsBase; }; pan = callPackage ../applications/networking/newsreaders/pan { From ad076fc3d584f6eadbf5db696a826835e050c31f Mon Sep 17 00:00:00 2001 From: Shea Levy Date: Thu, 29 Sep 2011 21:48:33 +0000 Subject: [PATCH 045/970] shells/bash/4.1,2.nix have been replaced by default.nix svn path=/nixpkgs/branches/stdenv-updates/; revision=29542 --- pkgs/top-level/all-packages.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index d38892e23a2..2234f65fcee 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -1591,11 +1591,11 @@ let ### SHELLS - bash = lowPrio (callPackage ../shells/bash/4.1.nix { + bash = lowPrio (callPackage ../shells/bash { texinfo = null; }); - bashInteractive = appendToName "interactive" (callPackage ../shells/bash/4.2.nix { + bashInteractive = appendToName "interactive" (callPackage ../shells/bash { interactive = true; }); From 024a629e271c3ebad062a27b0cadab29265fe224 Mon Sep 17 00:00:00 2001 From: Shea Levy Date: Fri, 30 Sep 2011 15:29:30 +0000 Subject: [PATCH 046/970] Set the M4 env var, for some reason configure can't find it even though it's in PATH svn path=/nixpkgs/branches/stdenv-updates/; revision=29545 --- pkgs/development/tools/parsing/bison/bison-2.5.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/development/tools/parsing/bison/bison-2.5.nix b/pkgs/development/tools/parsing/bison/bison-2.5.nix index 87753d472f3..98c465a185c 100644 --- a/pkgs/development/tools/parsing/bison/bison-2.5.nix +++ b/pkgs/development/tools/parsing/bison/bison-2.5.nix @@ -12,6 +12,8 @@ stdenv.mkDerivation rec { ++ stdenv.lib.optional doCheck perl; propagatedBuildInputs = [ m4 ]; + M4 = "m4"; + doCheck = true; meta = { From dcef7ad3bf309af208e205c1224cfd1654cbef4b Mon Sep 17 00:00:00 2001 From: Shea Levy Date: Fri, 30 Sep 2011 15:34:37 +0000 Subject: [PATCH 047/970] Have the kernel headers be a linuxPackage, use the current linuxPackage's headers svn path=/nixpkgs/branches/stdenv-updates/; revision=29546 --- .../linux/kernel-headers/default.nix | 59 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 4 +- 2 files changed, 62 insertions(+), 1 deletion(-) create mode 100644 pkgs/os-specific/linux/kernel-headers/default.nix diff --git a/pkgs/os-specific/linux/kernel-headers/default.nix b/pkgs/os-specific/linux/kernel-headers/default.nix new file mode 100644 index 00000000000..bb2e6a28803 --- /dev/null +++ b/pkgs/os-specific/linux/kernel-headers/default.nix @@ -0,0 +1,59 @@ +{stdenv, fetchurl, perl, cross ? null, kernel}: + +assert cross == null -> stdenv.isLinux; + +let + version = kernel.version; + kernelHeadersBaseConfig = if (cross == null) then + stdenv.platform.kernelHeadersBaseConfig + else + cross.platform.kernelHeadersBaseConfig; +in + +stdenv.mkDerivation { + name = "linux-headers-${version}"; + + src = kernel.src; + + targetConfig = if (cross != null) then cross.config else null; + + platform = + if cross != null then cross.platform.kernelArch else + if stdenv.system == "i686-linux" then "i386" else + if stdenv.system == "x86_64-linux" then "x86_64" else + if stdenv.system == "powerpc-linux" then "powerpc" else + if stdenv.system == "armv5tel-linux" then "arm" else + if stdenv.platform ? kernelArch then stdenv.platform.kernelArch else + abort "don't know what the kernel include directory is called for this platform"; + + buildInputs = [perl]; + + extraIncludeDirs = + if cross != null then + (if cross.arch == "powerpc" then ["ppc"] else []) + else if stdenv.system == "powerpc-linux" then ["ppc"] else []; + + buildPhase = '' + if test -n "$targetConfig"; then + export ARCH=$platform + fi + make ${kernelHeadersBaseConfig} + make mrproper headers_check + ''; + + installPhase = '' + make INSTALL_HDR_PATH=$out headers_install + + # Some builds (e.g. KVM) want a kernel.release. + ensureDir $out/include/config + echo "${version}-default" > $out/include/config/kernel.release + ''; + + # !!! hacky + fixupPhase = '' + ln -s asm $out/include/asm-$platform + if test "$platform" = "i386" -o "$platform" = "x86_64"; then + ln -s asm $out/include/asm-x86 + fi + ''; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 2234f65fcee..3c30c879ea2 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -5242,7 +5242,7 @@ let libnl1 = callPackage ../os-specific/linux/libnl/v1.nix { }; - linuxHeaders = linuxHeaders_2_6_32; + linuxHeaders = linuxPackages.kernelHeaders; linuxHeaders26Cross = forceBuildDrv (import ../os-specific/linux/kernel-headers/2.6.32.nix { inherit stdenv fetchurl perl; @@ -5627,6 +5627,8 @@ let broadcom_sta = callPackage ../os-specific/linux/broadcom-sta/default.nix { }; + kernelHeaders = callPackage ../os-specific/linux/kernel-headers { }; + nvidia_x11 = callPackage ../os-specific/linux/nvidia-x11 { }; nvidia_x11_legacy96 = callPackage ../os-specific/linux/nvidia-x11/legacy96.nix { }; From c10d43d3bd6ec003dcfe9567122c749641a9345c Mon Sep 17 00:00:00 2001 From: Shea Levy Date: Fri, 30 Sep 2011 15:37:35 +0000 Subject: [PATCH 048/970] Enable setting the headersSrc so the default kernel can be updated without rebuilding stdenv svn path=/nixpkgs/branches/stdenv-updates/; revision=29547 --- pkgs/os-specific/linux/kernel-headers/default.nix | 2 +- pkgs/os-specific/linux/kernel/generic.nix | 5 ++++- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/kernel-headers/default.nix b/pkgs/os-specific/linux/kernel-headers/default.nix index bb2e6a28803..7153e730a4a 100644 --- a/pkgs/os-specific/linux/kernel-headers/default.nix +++ b/pkgs/os-specific/linux/kernel-headers/default.nix @@ -13,7 +13,7 @@ in stdenv.mkDerivation { name = "linux-headers-${version}"; - src = kernel.src; + src = kernel.headersSrc; targetConfig = if (cross != null) then cross.config else null; diff --git a/pkgs/os-specific/linux/kernel/generic.nix b/pkgs/os-specific/linux/kernel/generic.nix index a86aef1af8e..355f0c9c5ba 100644 --- a/pkgs/os-specific/linux/kernel/generic.nix +++ b/pkgs/os-specific/linux/kernel/generic.nix @@ -3,6 +3,9 @@ , # The kernel source tarball. src +, # The kernel headers source tarball. + headersSrc ? src + , # The kernel version. version @@ -69,7 +72,7 @@ stdenv.mkDerivation { enableParallelBuilding = true; passthru = { - inherit version modDirVersion; + inherit version modDirVersion headersSrc; # Combine the `features' attribute sets of all the kernel patches. features = lib.fold (x: y: (if x ? features then x.features else {}) // y) features kernelPatches; }; From 1a7554562f516cef17a7fdb0258e5f1f7f738d14 Mon Sep 17 00:00:00 2001 From: Shea Levy Date: Fri, 30 Sep 2011 15:39:47 +0000 Subject: [PATCH 049/970] Enable setting the headersVersion so the default kernel can be updated without rebuilding stdenv svn path=/nixpkgs/branches/stdenv-updates/; revision=29548 --- pkgs/os-specific/linux/kernel-headers/default.nix | 2 +- pkgs/os-specific/linux/kernel/generic.nix | 5 ++++- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/kernel-headers/default.nix b/pkgs/os-specific/linux/kernel-headers/default.nix index 7153e730a4a..d2c6bf9d700 100644 --- a/pkgs/os-specific/linux/kernel-headers/default.nix +++ b/pkgs/os-specific/linux/kernel-headers/default.nix @@ -3,7 +3,7 @@ assert cross == null -> stdenv.isLinux; let - version = kernel.version; + version = kernel.headersVersion; kernelHeadersBaseConfig = if (cross == null) then stdenv.platform.kernelHeadersBaseConfig else diff --git a/pkgs/os-specific/linux/kernel/generic.nix b/pkgs/os-specific/linux/kernel/generic.nix index 355f0c9c5ba..6ed8164f341 100644 --- a/pkgs/os-specific/linux/kernel/generic.nix +++ b/pkgs/os-specific/linux/kernel/generic.nix @@ -9,6 +9,9 @@ , # The kernel version. version +, # The kernel headers version. + headersVersion ? version + , # The version number used for the module directory modDirVersion ? version @@ -72,7 +75,7 @@ stdenv.mkDerivation { enableParallelBuilding = true; passthru = { - inherit version modDirVersion headersSrc; + inherit version modDirVersion headersSrc headersVersion; # Combine the `features' attribute sets of all the kernel patches. features = lib.fold (x: y: (if x ? features then x.features else {}) // y) features kernelPatches; }; From d3cf97b56ed237a7033194850b7a324d039abf2d Mon Sep 17 00:00:00 2001 From: Shea Levy Date: Sat, 1 Oct 2011 22:25:28 +0000 Subject: [PATCH 050/970] Cleaner decoupling of glibc and linuxPackages while keeping kernelHeaders a linuxPackage and having a single default.nix for kernelHeaders svn path=/nixpkgs/branches/stdenv-updates/; revision=29554 --- pkgs/os-specific/linux/kernel-headers/default.nix | 4 ++-- pkgs/os-specific/linux/kernel/generic.nix | 8 +------- pkgs/top-level/all-packages.nix | 11 ++++++++++- 3 files changed, 13 insertions(+), 10 deletions(-) diff --git a/pkgs/os-specific/linux/kernel-headers/default.nix b/pkgs/os-specific/linux/kernel-headers/default.nix index d2c6bf9d700..bb2e6a28803 100644 --- a/pkgs/os-specific/linux/kernel-headers/default.nix +++ b/pkgs/os-specific/linux/kernel-headers/default.nix @@ -3,7 +3,7 @@ assert cross == null -> stdenv.isLinux; let - version = kernel.headersVersion; + version = kernel.version; kernelHeadersBaseConfig = if (cross == null) then stdenv.platform.kernelHeadersBaseConfig else @@ -13,7 +13,7 @@ in stdenv.mkDerivation { name = "linux-headers-${version}"; - src = kernel.headersSrc; + src = kernel.src; targetConfig = if (cross != null) then cross.config else null; diff --git a/pkgs/os-specific/linux/kernel/generic.nix b/pkgs/os-specific/linux/kernel/generic.nix index 11aaf176891..af62125eb75 100644 --- a/pkgs/os-specific/linux/kernel/generic.nix +++ b/pkgs/os-specific/linux/kernel/generic.nix @@ -3,15 +3,9 @@ , # The kernel source tarball. src -, # The kernel headers source tarball. - headersSrc ? src - , # The kernel version. version -, # The kernel headers version. - headersVersion ? version - , # The version number used for the module directory modDirVersion ? version @@ -75,7 +69,7 @@ stdenv.mkDerivation { enableParallelBuilding = true; passthru = { - inherit version modDirVersion kernelPatches headersSrc headersVersion; + inherit version modDirVersion kernelPatches; # Combine the `features' attribute sets of all the kernel patches. features = lib.fold (x: y: (if x ? features then x.features else {}) // y) features kernelPatches; }; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 92fa24586c7..89a7a541aab 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -5242,7 +5242,16 @@ let libnl1 = callPackage ../os-specific/linux/libnl/v1.nix { }; - linuxHeaders = linuxPackages.kernelHeaders; + linuxHeaders = + let + + kernel = { + src = linuxPackages.kernel.src; + version = linuxPackages.kernel.version; + }; + + in + callPackage ../os-specific/linux/kernel-headers { inherit kernel; }; linuxHeaders26Cross = forceBuildDrv (import ../os-specific/linux/kernel-headers/2.6.32.nix { inherit stdenv fetchurl perl; From 5bd43ca25f8d5dd101cee410a29956741e787c0a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= Date: Sun, 2 Oct 2011 20:35:40 +0000 Subject: [PATCH 051/970] GNU MPFR 3.0.1. svn path=/nixpkgs/branches/stdenv-updates/; revision=29586 --- pkgs/development/libraries/mpfr/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/mpfr/default.nix b/pkgs/development/libraries/mpfr/default.nix index 51d33f9593c..e2be5d75e8c 100644 --- a/pkgs/development/libraries/mpfr/default.nix +++ b/pkgs/development/libraries/mpfr/default.nix @@ -1,11 +1,11 @@ {stdenv, fetchurl, gmp}: stdenv.mkDerivation rec { - name = "mpfr-3.0.0"; + name = "mpfr-3.0.1"; src = fetchurl { url = "mirror://gnu/mpfr/${name}.tar.bz2"; - sha256 = "07w24h8by7n319p2vwwa1xdcg7qzkd1aqm84lfcbfv2kaff5yklg"; + sha256 = "0zwfwc9rn2sl3kpnr72fi1b8lh8c0mcmgy61y301jhs9pfcp15z1"; }; buildInputs = [ gmp ]; From 3e8b08d2fc30c754ef36aa860fbdb4a57da19eb3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= Date: Sun, 2 Oct 2011 20:35:44 +0000 Subject: [PATCH 052/970] GNU Ncurses 5.9. svn path=/nixpkgs/branches/stdenv-updates/; revision=29587 --- pkgs/development/libraries/ncurses/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/ncurses/default.nix b/pkgs/development/libraries/ncurses/default.nix index 6e15dca01f3..d3b230e3121 100644 --- a/pkgs/development/libraries/ncurses/default.nix +++ b/pkgs/development/libraries/ncurses/default.nix @@ -11,11 +11,11 @@ let cxx = stdenv.system != "i386-sunos"; in stdenv.mkDerivation (rec { - name = "ncurses-5.7"; + name = "ncurses-5.9"; src = fetchurl { url = "mirror://gnu/ncurses/${name}.tar.gz"; - sha256 = "1x4q6kma6zgg438llbgiac3kik7j2lln9v97jdffv3fyqyjxx6qa"; + sha256 = "0fsn7xis81za62afan0vvm38bvgzg5wfmv1m86flqcj0nj7jjilh"; }; crossAttrs = { From 18962bfe6606316a7f46f2cc99d7df506d7913b4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= Date: Sun, 2 Oct 2011 20:35:49 +0000 Subject: [PATCH 053/970] GNU M4 1.4.16. svn path=/nixpkgs/branches/stdenv-updates/; revision=29588 --- pkgs/development/tools/misc/gnum4/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/misc/gnum4/default.nix b/pkgs/development/tools/misc/gnum4/default.nix index df417c3e55e..47d8b51b82b 100644 --- a/pkgs/development/tools/misc/gnum4/default.nix +++ b/pkgs/development/tools/misc/gnum4/default.nix @@ -1,11 +1,11 @@ {stdenv, fetchurl}: stdenv.mkDerivation { - name = "gnum4-1.4.15"; + name = "gnum4-1.4.16"; src = fetchurl { - url = mirror://gnu/m4/m4-1.4.15.tar.bz2; - sha256 = "1ygzshj4h6l6wh52vjqczkyahmv67r3yzi1m6nkh94qgndffmbqa"; + url = mirror://gnu/m4/m4-1.4.16.tar.bz2; + sha256 = "035r7ma272j2cwni2961jp22k6bn3n9xwn3b3qbcn2yrvlghql22"; }; doCheck = !stdenv.isDarwin; From 40f2ee920069739e8129867bbee37d881e1db6bb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= Date: Sun, 2 Oct 2011 20:35:53 +0000 Subject: [PATCH 054/970] GNU tar 1.26. svn path=/nixpkgs/branches/stdenv-updates/; revision=29589 --- pkgs/tools/archivers/gnutar/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/archivers/gnutar/default.nix b/pkgs/tools/archivers/gnutar/default.nix index a38c7fcdd1e..ccd0d755e8c 100644 --- a/pkgs/tools/archivers/gnutar/default.nix +++ b/pkgs/tools/archivers/gnutar/default.nix @@ -1,11 +1,11 @@ {stdenv, fetchurl}: stdenv.mkDerivation rec { - name = "gnutar-1.25"; + name = "gnutar-1.26"; src = fetchurl { - url = "mirror://gnu/tar/tar-1.25.tar.bz2"; - sha256 = "0js9b1jd93kjk6dgf40y2fpgpnix247rk5aws2mjgwz0p10wxxpk"; + url = "mirror://gnu/tar/tar-1.26.tar.bz2"; + sha256 = "0hbdkzmchq9ycr2x1pxqdcgdbaxksh8c6ac0jf75jajhcks6jlss"; }; meta = { From 14a86cfa3b6b10a4a4dd8ac4c3e563df6c5e0c88 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= Date: Sun, 2 Oct 2011 20:35:57 +0000 Subject: [PATCH 055/970] GNU diffutils 3.2. svn path=/nixpkgs/branches/stdenv-updates/; revision=29590 --- pkgs/tools/text/diffutils/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/text/diffutils/default.nix b/pkgs/tools/text/diffutils/default.nix index 4fde88d9262..eae48f2e3a4 100644 --- a/pkgs/tools/text/diffutils/default.nix +++ b/pkgs/tools/text/diffutils/default.nix @@ -1,11 +1,11 @@ {stdenv, fetchurl, coreutils ? null}: stdenv.mkDerivation { - name = "diffutils-3.0"; + name = "diffutils-3.2"; src = fetchurl { - url = mirror://gnu/diffutils/diffutils-3.0.tar.gz; - sha256 = "02g8i6jv0j0vr5nl13ns50lv2dbjy9kkk8jvp11n0g5fpdjizf9g"; + url = mirror://gnu/diffutils/diffutils-3.2.tar.gz; + sha256 = "1lsf0ln0h3mnm2y0mwgrfk0lyfi7bnm4r886acvdrrsvc7pypaia"; }; /* If no explicit coreutils is given, use the one from stdenv. */ From 29d669037e5f058e349b90f3e1d8ea14f62f19ba Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= Date: Sun, 2 Oct 2011 20:36:01 +0000 Subject: [PATCH 056/970] GNU Awk 4.0.0. svn path=/nixpkgs/branches/stdenv-updates/; revision=29591 --- pkgs/tools/text/gawk/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/text/gawk/default.nix b/pkgs/tools/text/gawk/default.nix index c4f37f922c7..0c7e85cce4f 100644 --- a/pkgs/tools/text/gawk/default.nix +++ b/pkgs/tools/text/gawk/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, libsigsegv }: stdenv.mkDerivation rec { - name = "gawk-3.1.8"; + name = "gawk-4.0.0"; src = fetchurl { url = "mirror://gnu/gawk/${name}.tar.bz2"; - sha256 = "1d0jfh319w4h8l1zzqv248916wrc2add1b1aghri31rj9hn7pg2x"; + sha256 = "0sss7rhpvizi2a88h6giv0i7w5h07s2fxkw3s6n1hqvcnhrfgbb0"; }; doCheck = true; From 88dd456354524ae840e11ecf6ae213a75e7a4051 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= Date: Sun, 2 Oct 2011 20:36:06 +0000 Subject: [PATCH 057/970] GNU grep 2.9. svn path=/nixpkgs/branches/stdenv-updates/; revision=29592 --- pkgs/tools/text/gnugrep/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/text/gnugrep/default.nix b/pkgs/tools/text/gnugrep/default.nix index f06be1b7336..402d2413085 100644 --- a/pkgs/tools/text/gnugrep/default.nix +++ b/pkgs/tools/text/gnugrep/default.nix @@ -1,13 +1,13 @@ { stdenv, fetchurl, pcre, libiconv ? null}: -let version = "2.7"; in +let version = "2.9"; in stdenv.mkDerivation ({ name = "gnugrep-${version}"; src = fetchurl { url = "mirror://gnu/grep/grep-${version}.tar.gz"; - sha256 = "1b8vksfd1ngharac3ygaqim3lrf0yqap992sg0vfm7572l88655d"; + sha256 = "0w3r6m597p3qgfj6jj1nsggkwr5p38v6cxasfa8i3izcfan8w4g9"; }; buildInputs = [ pcre ] From 07b8c666f7dc09bc4ed7c50d6b176922f10214b7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= Date: Sun, 2 Oct 2011 20:36:10 +0000 Subject: [PATCH 058/970] OpenCV: Add missing parameter. svn path=/nixpkgs/branches/stdenv-updates/; revision=29593 --- pkgs/development/libraries/opencv/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/libraries/opencv/default.nix b/pkgs/development/libraries/opencv/default.nix index e6d2cb260b1..46c170d33f9 100644 --- a/pkgs/development/libraries/opencv/default.nix +++ b/pkgs/development/libraries/opencv/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, cmake, gtk, libjpeg, libpng, libtiff, jasper, ffmpeg -, pkgconfig, gstreamer, xineLib }: +, pkgconfig, gstreamer, xineLib, glib }: let v = "2.3.1a"; in From 41d04539a66bd4e4f1fc46920021b01d16e337e7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= Date: Mon, 3 Oct 2011 17:35:04 +0000 Subject: [PATCH 059/970] GNU Readline 6.2: Update patch set. svn path=/nixpkgs/branches/stdenv-updates/; revision=29603 --- .../readline/{readline-patches.nix => readline-6.2-patches.nix} | 1 + pkgs/development/libraries/readline/readline6.nix | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) rename pkgs/development/libraries/readline/{readline-patches.nix => readline-6.2-patches.nix} (52%) diff --git a/pkgs/development/libraries/readline/readline-patches.nix b/pkgs/development/libraries/readline/readline-6.2-patches.nix similarity index 52% rename from pkgs/development/libraries/readline/readline-patches.nix rename to pkgs/development/libraries/readline/readline-6.2-patches.nix index b8019fb3350..ae1e67224af 100644 --- a/pkgs/development/libraries/readline/readline-patches.nix +++ b/pkgs/development/libraries/readline/readline-6.2-patches.nix @@ -1,4 +1,5 @@ # Automatically generated by `update-patch-set.sh'; do not edit. patch: [ +(patch "001" "1qxl74f4n0hv4a807byrgbk4ixd8m50apj3922q2ss9pfi0nra1q") ] diff --git a/pkgs/development/libraries/readline/readline6.nix b/pkgs/development/libraries/readline/readline6.nix index c7abfa2bfb2..0a5c2d1b426 100644 --- a/pkgs/development/libraries/readline/readline6.nix +++ b/pkgs/development/libraries/readline/readline6.nix @@ -21,7 +21,7 @@ stdenv.mkDerivation (rec { inherit sha256; }; in - import ./readline-patches.nix patch); + import ./readline-6.2-patches.nix patch); meta = { description = "GNU Readline, a library for interactive line editing"; From 21887cf61ecbfbc4bad5512ee6f76899069ca2d1 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 3 Oct 2011 18:40:12 +0000 Subject: [PATCH 060/970] we would like to test cups svn path=/nixpkgs/branches/stdenv-updates/; revision=29604 --- pkgs/top-level/release-small.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/top-level/release-small.nix b/pkgs/top-level/release-small.nix index 68a287bbf5e..e7957a8a78e 100644 --- a/pkgs/top-level/release-small.nix +++ b/pkgs/top-level/release-small.nix @@ -41,6 +41,7 @@ with (import ./release-lib.nix); coreutils = all; cpio = all; cron = linux; + cups = linux; dhcp = linux; diffutils = all; e2fsprogs = linux; From eff71744ea4f20820440d6fa17ae91441e19022b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= Date: Mon, 3 Oct 2011 19:11:09 +0000 Subject: [PATCH 061/970] GNU Binutils: Fix URL. svn path=/nixpkgs/branches/stdenv-updates/; revision=29605 --- pkgs/development/tools/misc/binutils/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/tools/misc/binutils/default.nix b/pkgs/development/tools/misc/binutils/default.nix index b9a3f598c5c..0dcf46397a0 100644 --- a/pkgs/development/tools/misc/binutils/default.nix +++ b/pkgs/development/tools/misc/binutils/default.nix @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { # {enter "anoncvs" as the password} # cvs -z 9 -d :pserver:anoncvs@sourceware.org:/cvs/src co cgen src = fetchurl { - url = "http://nixos.org/tarballs/${basename}.tar.bz2"; + url = "mirror://gnu/binutils/${basename}.tar.bz2"; sha256 = "0m7nmd7gc9d9md43wbrv65hz6lbi2crqwryzpigv19ray1lzmv6d"; }; From eaaaad52037936c379c0fbde293d2411c8ada498 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= Date: Mon, 3 Oct 2011 19:27:10 +0000 Subject: [PATCH 062/970] GNU Readline: Fix typo. svn path=/nixpkgs/branches/stdenv-updates/; revision=29606 --- pkgs/development/libraries/readline/readline6.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/libraries/readline/readline6.nix b/pkgs/development/libraries/readline/readline6.nix index 0a5c2d1b426..0826e6c5f7c 100644 --- a/pkgs/development/libraries/readline/readline6.nix +++ b/pkgs/development/libraries/readline/readline6.nix @@ -17,7 +17,7 @@ stdenv.mkDerivation (rec { (let patch = nr: sha256: fetchurl { - url = "mirror://gnu/readline/${name}-patches/readline61-${nr}"; + url = "mirror://gnu/readline/${name}-patches/readline62-${nr}"; inherit sha256; }; in From f74e361e453e8d96dda1ffc4323ad7fe5cd93f7b Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 3 Oct 2011 20:50:08 +0000 Subject: [PATCH 063/970] added myself as maintainer svn path=/nixpkgs/branches/stdenv-updates/; revision=29618 --- pkgs/misc/cups/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/misc/cups/default.nix b/pkgs/misc/cups/default.nix index 8a9efdedcf9..cc1157c022e 100644 --- a/pkgs/misc/cups/default.nix +++ b/pkgs/misc/cups/default.nix @@ -41,7 +41,7 @@ stdenv.mkDerivation { homepage = http://www.cups.org/; description = "A standards-based printing system for UNIX"; license = "GPLv2"; # actually LGPL for the library and GPL for the rest - maintainers = [ stdenv.lib.maintainers.urkud ]; + maintainers = [ stdenv.lib.maintainers.urkud stdenv.lib.maintainers.simons ]; platforms = stdenv.lib.platforms.linux; }; } From ba677f861f3955fd4d64e888889fd4a5e6e54f1e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= Date: Wed, 5 Oct 2011 10:52:05 +0000 Subject: [PATCH 064/970] Valgrind: Fix Darwin builds. svn path=/nixpkgs/trunk/; revision=29655 --- .../tools/analysis/valgrind/default.nix | 40 +++++++++++++++++-- 1 file changed, 37 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/analysis/valgrind/default.nix b/pkgs/development/tools/analysis/valgrind/default.nix index 6b35cbc4e68..9a63037e284 100644 --- a/pkgs/development/tools/analysis/valgrind/default.nix +++ b/pkgs/development/tools/analysis/valgrind/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchurl, perl, gdb, autoconf, automake }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (rec { name = "valgrind-3.6.1"; src = fetchurl { @@ -14,7 +14,9 @@ stdenv.mkDerivation rec { buildInputs = stdenv.lib.optional (!stdenv.isDarwin) gdb; configureFlags = - if stdenv.system == "x86_64-linux" then ["--enable-only64bit"] else []; + if (stdenv.system == "x86_64-linux" || stdenv.system == "x86_64-darwin") + then [ "--enable-only64bit" ] + else []; postInstall = '' for i in $out/lib/valgrind/*.supp; do @@ -40,7 +42,39 @@ stdenv.mkDerivation rec { license = "GPLv2+"; maintainers = [ stdenv.lib.maintainers.eelco ]; - + platforms = stdenv.lib.platforms.linux ++ stdenv.lib.platforms.darwin; }; } + +// + +(if stdenv.isDarwin + then { + patchPhase = + # Apple's GCC doesn't recognize `-arch' (as of version 4.2.1, build 5666). + '' echo "getting rid of the \`-arch' GCC option..." + find -name Makefile\* -exec \ + sed -i {} -e's/DARWIN\(.*\)-arch [^ ]\+/DARWIN\1/g' \; + + sed -i coregrind/link_tool_exe_darwin.in \ + -e 's/^my \$archstr = .*/my $archstr = "x86_64";/g' + ''; + + preConfigure = + # Shamelessly drag in MIG. + '' mkdir -p "$TMPDIR/impure-deps/bin" + + # MIG assumes the standard Darwin core utilities (e.g., `rm -d'), so + # let it see the impure directories. + cat > "$TMPDIR/impure-deps/bin/mig" < Date: Wed, 5 Oct 2011 10:52:11 +0000 Subject: [PATCH 065/970] Valgrind: Remove unnecessary dependency on Autoconf and Automake. svn path=/nixpkgs/trunk/; revision=29656 --- pkgs/development/tools/analysis/valgrind/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/analysis/valgrind/default.nix b/pkgs/development/tools/analysis/valgrind/default.nix index 9a63037e284..823ac0ebaaf 100644 --- a/pkgs/development/tools/analysis/valgrind/default.nix +++ b/pkgs/development/tools/analysis/valgrind/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, perl, gdb, autoconf, automake }: +{ stdenv, fetchurl, perl, gdb }: stdenv.mkDerivation (rec { name = "valgrind-3.6.1"; @@ -10,7 +10,7 @@ stdenv.mkDerivation (rec { # Perl is needed for `cg_annotate'. # GDB is needed to provide a sane default for `--db-command'. - buildNativeInputs = [ perl autoconf automake ]; + buildNativeInputs = [ perl ]; buildInputs = stdenv.lib.optional (!stdenv.isDarwin) gdb; configureFlags = From 37776f1568a0580455f49f78f5b46469b042511f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= Date: Wed, 5 Oct 2011 10:52:16 +0000 Subject: [PATCH 066/970] Valgrind: Add myself as maintainer. svn path=/nixpkgs/trunk/; revision=29657 --- pkgs/development/tools/analysis/valgrind/default.nix | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/pkgs/development/tools/analysis/valgrind/default.nix b/pkgs/development/tools/analysis/valgrind/default.nix index 823ac0ebaaf..a9774a84638 100644 --- a/pkgs/development/tools/analysis/valgrind/default.nix +++ b/pkgs/development/tools/analysis/valgrind/default.nix @@ -41,8 +41,7 @@ stdenv.mkDerivation (rec { license = "GPLv2+"; - maintainers = [ stdenv.lib.maintainers.eelco ]; - + maintainers = with stdenv.lib.maintainers; [ eelco ludo ]; platforms = stdenv.lib.platforms.linux ++ stdenv.lib.platforms.darwin; }; } From e44c73e49a63e52b2d6a4028d1b437f0a6095ff3 Mon Sep 17 00:00:00 2001 From: "Yury G. Kudryashov" Date: Wed, 5 Oct 2011 14:45:49 +0000 Subject: [PATCH 067/970] Latest babl and gegl svn path=/nixpkgs/trunk/; revision=29661 --- pkgs/development/libraries/babl/default.nix | 8 ++++---- pkgs/development/libraries/gegl/default.nix | 17 ++++++++++------- 2 files changed, 14 insertions(+), 11 deletions(-) diff --git a/pkgs/development/libraries/babl/default.nix b/pkgs/development/libraries/babl/default.nix index 2464a09f51a..77ddecd71c0 100644 --- a/pkgs/development/libraries/babl/default.nix +++ b/pkgs/development/libraries/babl/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl }: -stdenv.mkDerivation { - name = "babl-0.0.22"; +stdenv.mkDerivation rec { + name = "babl-0.1.4"; src = fetchurl { - url = ftp://ftp.gtk.org/pub/babl/0.0/babl-0.0.22.tar.bz2; - sha256 = "0v8gbf9si4sd06199f8lfmrsbvi6i0hxphd34kyvsj6g2kkkg10s"; + url = "ftp://ftp.gimp.org/pub/babl/0.1/${name}.tar.bz2"; + sha256 = "0cz7zw206bb87c0n0h54h4wlkaa3hx3wsia30mgq316y50jk2djv"; }; meta = { diff --git a/pkgs/development/libraries/gegl/default.nix b/pkgs/development/libraries/gegl/default.nix index 3b1900ae89c..8fa87d90be2 100644 --- a/pkgs/development/libraries/gegl/default.nix +++ b/pkgs/development/libraries/gegl/default.nix @@ -1,17 +1,20 @@ { stdenv, fetchurl, pkgconfig, glib, babl, libpng, cairo, libjpeg -, librsvg, pango, gtk }: +, librsvg, pango, gtk, bzip2 }: -stdenv.mkDerivation { - name = "gegl-0.0.22"; +stdenv.mkDerivation rec { + name = "gegl-0.1.6"; src = fetchurl { - url = ftp://ftp.gimp.org/pub/gegl/0.0/gegl-0.0.22.tar.bz2; - sha256 = "0nx6r9amzhw5d2ghlw3z8qnry18rwz1ymvl2cm31b8p49z436wl5"; + url = "ftp://ftp.gimp.org/pub/gegl/0.1/${name}.tar.bz2"; + sha256 = "1l966ygss2zkksyw62nm139v2abfzbqqrj0psizvbgzf4mb24rm1"; }; - configureFlags = "--disable-docs"; # needs fonts otherwise don't know how to pass them + # needs fonts otherwise don't know how to pass them + configureFlags = "--disable-docs"; - buildInputs = [ pkgconfig glib babl libpng cairo libjpeg librsvg pango gtk ]; + buildInputs = [ babl libpng cairo libjpeg librsvg pango gtk bzip2 ]; + + buildNativeInputs = [ pkgconfig ]; meta = { description = "Graph-based image processing framework"; From a9e1911efa88f5e90856a0d7fb0c8d3eceb20585 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Wed, 5 Oct 2011 17:08:58 +0000 Subject: [PATCH 068/970] haskell-hledger-chart: updated to version 0.16.1 svn path=/nixpkgs/trunk/; revision=29665 --- pkgs/development/libraries/haskell/hledger-chart/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/hledger-chart/default.nix b/pkgs/development/libraries/haskell/hledger-chart/default.nix index 1b9d0eb6f55..84b8c33fc21 100644 --- a/pkgs/development/libraries/haskell/hledger-chart/default.nix +++ b/pkgs/development/libraries/haskell/hledger-chart/default.nix @@ -4,8 +4,8 @@ cabal.mkDerivation (self: { pname = "hledger-chart"; - version = "0.16"; - sha256 = "05njn30xxnjxigvz6sjhm1ks595f9y7ndw3il1grh09rhvgp42f7"; + version = "0.16.1"; + sha256 = "1yk563032ir98gqdvxazjjl1alg6q1pflzawh11pr3zrdnriracn"; isLibrary = false; isExecutable = true; buildDepends = [ From c3a0b9b55fc5188a942182c488f38496978f2cab Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Wed, 5 Oct 2011 17:09:07 +0000 Subject: [PATCH 069/970] haskell-hledger-lib: updated to version 0.16.1 svn path=/nixpkgs/trunk/; revision=29666 --- pkgs/development/libraries/haskell/hledger-lib/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/hledger-lib/default.nix b/pkgs/development/libraries/haskell/hledger-lib/default.nix index 16dc72f3450..d8fdbf3f71d 100644 --- a/pkgs/development/libraries/haskell/hledger-lib/default.nix +++ b/pkgs/development/libraries/haskell/hledger-lib/default.nix @@ -4,8 +4,8 @@ cabal.mkDerivation (self: { pname = "hledger-lib"; - version = "0.16"; - sha256 = "095hghg7b6x355yfd3xcp8cngl94k8qbl5x7qm12ncin9dsmz8h8"; + version = "0.16.1"; + sha256 = "15imhdkzfnxr72lsghrbsfisc7c2al4jkzcp72yf4hhra4zym1sd"; buildDepends = [ cmdargs HUnit mtl parsec regexpr safe split time utf8String ]; From 80d4abd330fa4e27e50a3035fdb0f746e40c3d7d Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Wed, 5 Oct 2011 17:09:15 +0000 Subject: [PATCH 070/970] haskell-hledger-vty: updated to version 0.16.1 svn path=/nixpkgs/trunk/; revision=29667 --- pkgs/development/libraries/haskell/hledger-vty/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/hledger-vty/default.nix b/pkgs/development/libraries/haskell/hledger-vty/default.nix index 5cd816c5ddf..0a6dd1cf202 100644 --- a/pkgs/development/libraries/haskell/hledger-vty/default.nix +++ b/pkgs/development/libraries/haskell/hledger-vty/default.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "hledger-vty"; - version = "0.16"; - sha256 = "161ziq4vwg6wsxijq065g1dpfnvcpxzzbarsj7znbqq4gs02mxx2"; + version = "0.16.1"; + sha256 = "10aq9apxz6nrzvvynha0wkhy34dn8dybizr8assni6rns8ylh188"; isLibrary = false; isExecutable = true; buildDepends = [ cmdargs hledger hledgerLib HUnit safe time vty ]; From 549b848e7c4db984f3d2fbfc7af9d1aec48c3339 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Wed, 5 Oct 2011 17:09:25 +0000 Subject: [PATCH 071/970] haskell-hledger-web: updated to version 0.16.3 svn path=/nixpkgs/trunk/; revision=29668 --- pkgs/development/libraries/haskell/hledger-web/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/hledger-web/default.nix b/pkgs/development/libraries/haskell/hledger-web/default.nix index 2c3affc9c62..a046e86e075 100644 --- a/pkgs/development/libraries/haskell/hledger-web/default.nix +++ b/pkgs/development/libraries/haskell/hledger-web/default.nix @@ -8,8 +8,8 @@ cabal.mkDerivation (self: { pname = "hledger-web"; - version = "0.16"; - sha256 = "1564w1619s08q5c1zx8i8z488zis13a8d6n4cnyha9ci95p1c89j"; + version = "0.16.3"; + sha256 = "0jciah0k6i4aa21hgpl1nqfyjkmm5kg5zmzmxwynvwckncy17ihg"; isLibrary = true; isExecutable = true; buildDepends = [ From 7776c66a8434eaf029d987f08886063555e94dd8 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Wed, 5 Oct 2011 17:09:32 +0000 Subject: [PATCH 072/970] haskell-hledger: updated to version 0.16.1 svn path=/nixpkgs/trunk/; revision=29669 --- pkgs/development/libraries/haskell/hledger/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/hledger/default.nix b/pkgs/development/libraries/haskell/hledger/default.nix index 471e410553a..e0560855286 100644 --- a/pkgs/development/libraries/haskell/hledger/default.nix +++ b/pkgs/development/libraries/haskell/hledger/default.nix @@ -4,8 +4,8 @@ cabal.mkDerivation (self: { pname = "hledger"; - version = "0.16"; - sha256 = "0wz4g67ilxj741j8d7amssa6dr0xrdfghwmhzwlcp1fj4a5a44c8"; + version = "0.16.1"; + sha256 = "182a5qlcxbh9q8hzrmgm99hcgvxjq8j5xq202iff14p1yqv0irs2"; isLibrary = true; isExecutable = true; buildDepends = [ From 384ad944cbadc4a6d6bbd2b008cc557d08ddc101 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Wed, 5 Oct 2011 17:09:39 +0000 Subject: [PATCH 073/970] haskell-skein: updated to version 0.1.0.1 svn path=/nixpkgs/trunk/; revision=29670 --- pkgs/development/libraries/haskell/skein/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/skein/default.nix b/pkgs/development/libraries/haskell/skein/default.nix index 2eebd665aa1..4795c5f2f04 100644 --- a/pkgs/development/libraries/haskell/skein/default.nix +++ b/pkgs/development/libraries/haskell/skein/default.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "skein"; - version = "0.1"; - sha256 = "10fnhbjdq4vrpl17b27pmxg943wsxv27js6p5nrgyzx9ybmdrmdi"; + version = "0.1.0.1"; + sha256 = "1i05ajmnsm0ac9cqnf1lmdaa6sxkirxv5r2h8phpapzvzwislpr8"; buildDepends = [ cereal cryptoApi tagged ]; meta = { description = "Skein, a family of cryptographic hash functions. Includes Skein-MAC as well."; From 105f30bba6f97e67cdfaa137c7f634880b831949 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Wed, 5 Oct 2011 17:09:51 +0000 Subject: [PATCH 074/970] haskell-hakyll: updated to version 3.2.0.9 svn path=/nixpkgs/trunk/; revision=29671 --- pkgs/development/libraries/haskell/hakyll/default.nix | 4 ++-- pkgs/top-level/haskell-packages.nix | 4 +--- 2 files changed, 3 insertions(+), 5 deletions(-) diff --git a/pkgs/development/libraries/haskell/hakyll/default.nix b/pkgs/development/libraries/haskell/hakyll/default.nix index 856949200e0..ca5cd97269d 100644 --- a/pkgs/development/libraries/haskell/hakyll/default.nix +++ b/pkgs/development/libraries/haskell/hakyll/default.nix @@ -4,8 +4,8 @@ cabal.mkDerivation (self: { pname = "hakyll"; - version = "3.2.0.8"; - sha256 = "1yp01g7wzr9qkx3vz7v791gglmr0pg5c6jj076rv118kw0l8n61l"; + version = "3.2.0.9"; + sha256 = "1gb10bvzlm8qn6ap7cxykscbhbs2jsfqgsw53r8vd8k5bfgm5jv6"; buildDepends = [ binary blazeHtml cryptohash hamlet mtl pandoc parsec regexBase regexPcre snapCore snapServer tagsoup time diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix index 738205ea23c..a09778ae5bb 100644 --- a/pkgs/top-level/haskell-packages.nix +++ b/pkgs/top-level/haskell-packages.nix @@ -646,9 +646,7 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y); fgl = self.fgl_5_4_2_4; }; - hakyll = callPackage ../development/libraries/haskell/hakyll { - hamlet = self.hamlet_0_8_2_1; - }; + hakyll = callPackage ../development/libraries/haskell/hakyll {}; hamlet_0_8_2_1 = callPackage ../development/libraries/haskell/hamlet/0.8.2.1.nix {}; hamlet_0_10_2 = callPackage ../development/libraries/haskell/hamlet/0.10.2.nix {}; From b88f6911637b9e5d22c64ec84198110e3acfb283 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Wed, 5 Oct 2011 17:10:00 +0000 Subject: [PATCH 075/970] haskell-hamlet: updated to version 0.10.3 svn path=/nixpkgs/trunk/; revision=29672 --- .../libraries/haskell/hamlet/0.8.2.1.nix | 18 ------------------ .../haskell/hamlet/{0.10.2.nix => default.nix} | 4 ++-- pkgs/top-level/haskell-packages.nix | 4 +--- 3 files changed, 3 insertions(+), 23 deletions(-) delete mode 100644 pkgs/development/libraries/haskell/hamlet/0.8.2.1.nix rename pkgs/development/libraries/haskell/hamlet/{0.10.2.nix => default.nix} (86%) diff --git a/pkgs/development/libraries/haskell/hamlet/0.8.2.1.nix b/pkgs/development/libraries/haskell/hamlet/0.8.2.1.nix deleted file mode 100644 index 0bf489ae983..00000000000 --- a/pkgs/development/libraries/haskell/hamlet/0.8.2.1.nix +++ /dev/null @@ -1,18 +0,0 @@ -{ cabal, blazeBuilder, blazeHtml, failure, parsec, text }: - -cabal.mkDerivation (self: { - pname = "hamlet"; - version = "0.8.2.1"; - sha256 = "0798ic6qap4npw2rx42xcgmi1fcbwqvyic5x6vyyf6abvxv16925"; - buildDepends = [ blazeBuilder blazeHtml failure parsec text ]; - meta = { - homepage = "http://www.yesodweb.com/"; - description = "Haml-like template files that are compile-time checked"; - license = self.stdenv.lib.licenses.bsd3; - platforms = self.ghc.meta.platforms; - maintainers = [ - self.stdenv.lib.maintainers.andres - self.stdenv.lib.maintainers.simons - ]; - }; -}) diff --git a/pkgs/development/libraries/haskell/hamlet/0.10.2.nix b/pkgs/development/libraries/haskell/hamlet/default.nix similarity index 86% rename from pkgs/development/libraries/haskell/hamlet/0.10.2.nix rename to pkgs/development/libraries/haskell/hamlet/default.nix index 1992be553b2..9f1831a991f 100644 --- a/pkgs/development/libraries/haskell/hamlet/0.10.2.nix +++ b/pkgs/development/libraries/haskell/hamlet/default.nix @@ -4,8 +4,8 @@ cabal.mkDerivation (self: { pname = "hamlet"; - version = "0.10.2"; - sha256 = "1p4dz1h640ryhj7prks7qazqyx0l79hi7130ksfchlb5mprz6wq2"; + version = "0.10.3"; + sha256 = "1xkk8hcmfnn9y14fsrab3cv8xknhf8j6hkv668yshg8bjzz1smva"; buildDepends = [ blazeBuilder blazeHtml failure parsec shakespeare text ]; diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix index a09778ae5bb..e55b471a957 100644 --- a/pkgs/top-level/haskell-packages.nix +++ b/pkgs/top-level/haskell-packages.nix @@ -648,9 +648,7 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y); hakyll = callPackage ../development/libraries/haskell/hakyll {}; - hamlet_0_8_2_1 = callPackage ../development/libraries/haskell/hamlet/0.8.2.1.nix {}; - hamlet_0_10_2 = callPackage ../development/libraries/haskell/hamlet/0.10.2.nix {}; - hamlet = self.hamlet_0_10_2; + hamlet = callPackage ../development/libraries/haskell/hamlet {}; happstackData = callPackage ../development/libraries/haskell/happstack/happstack-data.nix {}; From 022f9d81b7fd0223a48f76b5542ee5b8910c5e98 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Wed, 5 Oct 2011 17:14:14 +0000 Subject: [PATCH 076/970] haskell-xml-enumerator: updated to version 0.4.2 svn path=/nixpkgs/trunk/; revision=29673 --- pkgs/development/libraries/haskell/xml-enumerator/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/xml-enumerator/default.nix b/pkgs/development/libraries/haskell/xml-enumerator/default.nix index 016c841eb07..db31688c016 100644 --- a/pkgs/development/libraries/haskell/xml-enumerator/default.nix +++ b/pkgs/development/libraries/haskell/xml-enumerator/default.nix @@ -5,8 +5,8 @@ cabal.mkDerivation (self: { pname = "xml-enumerator"; - version = "0.4.1"; - sha256 = "081avccvkakcbf2m22xdda63jhwykqxxclmlhj6msawkyyqniadj"; + version = "0.4.2"; + sha256 = "05n8cm28bqjgrgf94xwf65isrd7v0nvnzmvlqmdq95zxdw4s0ps9"; buildDepends = [ attoparsecText attoparsecTextEnumerator blazeBuilder blazeBuilderEnumerator dataDefault enumerator failure text From 969a0acdc2a1e0b3e8327a91b838492a84abcd6d Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Wed, 5 Oct 2011 17:23:21 +0000 Subject: [PATCH 077/970] haskell-xml-enumerator: updated to version 0.4.2.1 svn path=/nixpkgs/trunk/; revision=29674 --- pkgs/development/libraries/haskell/xml-enumerator/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/xml-enumerator/default.nix b/pkgs/development/libraries/haskell/xml-enumerator/default.nix index db31688c016..28dfbef6de4 100644 --- a/pkgs/development/libraries/haskell/xml-enumerator/default.nix +++ b/pkgs/development/libraries/haskell/xml-enumerator/default.nix @@ -5,8 +5,8 @@ cabal.mkDerivation (self: { pname = "xml-enumerator"; - version = "0.4.2"; - sha256 = "05n8cm28bqjgrgf94xwf65isrd7v0nvnzmvlqmdq95zxdw4s0ps9"; + version = "0.4.2.1"; + sha256 = "0xz0a4dk94zg0sm0gy90ymmhzrsdvmqvl3qw2xycys6pzmg51im7"; buildDepends = [ attoparsecText attoparsecTextEnumerator blazeBuilder blazeBuilderEnumerator dataDefault enumerator failure text From 9f1347ae7eea0ef6379864100b43e6654680405a Mon Sep 17 00:00:00 2001 From: "Yury G. Kudryashov" Date: Wed, 5 Oct 2011 19:54:44 +0000 Subject: [PATCH 078/970] virtualbox-4.1.2 svn path=/nixpkgs/trunk/; revision=29677 --- pkgs/applications/virtualization/virtualbox/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/virtualization/virtualbox/default.nix b/pkgs/applications/virtualization/virtualbox/default.nix index 0cb4999bce6..6fd4f9d148e 100644 --- a/pkgs/applications/virtualization/virtualbox/default.nix +++ b/pkgs/applications/virtualization/virtualbox/default.nix @@ -4,14 +4,14 @@ , xorriso, makeself, perl, jdk }: -let version = "4.1.0"; in +let version = "4.1.2"; in stdenv.mkDerivation { name = "virtualbox-${version}-${kernel.version}"; src = fetchurl { url = "http://download.virtualbox.org/virtualbox/${version}/VirtualBox-${version}.tar.bz2"; - sha256 = "1pi066xnjgr3fl42i1vc1pbwic9l4m1k6mzs4ip41fz99w59xfzp"; + sha256 = "1g3nqlxk4bxkq5yqwk0mrn50mz5y0kxpcn0hq5f81bbb9niglc5h"; }; buildInputs = [iasl dev86 libxslt libxml2 xproto libX11 libXext libXcursor qt4 libIDL SDL hal libcap glib kernel python alsaLib curl pam xorriso makeself perl jdk ]; From 9bd06b389a9a24e5a876cf133c2c8849c2d7aeef Mon Sep 17 00:00:00 2001 From: "Yury G. Kudryashov" Date: Wed, 5 Oct 2011 20:20:21 +0000 Subject: [PATCH 079/970] libcgroup-0.37.1 svn path=/nixpkgs/trunk/; revision=29678 --- pkgs/os-specific/linux/libcg/default.nix | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/pkgs/os-specific/linux/libcg/default.nix b/pkgs/os-specific/linux/libcg/default.nix index 221150dc891..14f96eb15ae 100644 --- a/pkgs/os-specific/linux/libcg/default.nix +++ b/pkgs/os-specific/linux/libcg/default.nix @@ -1,15 +1,20 @@ {stdenv, fetchurl, pam, yacc, flex}: stdenv.mkDerivation rec { - name = "libcgroup-0.36.2"; + name = "libcgroup-0.37.1"; + src = fetchurl { url = "mirror://sourceforge/libcg/${name}.tar.bz2"; - sha256 = "1qvkd976485vyshaq1cwjzg6w54c3djsaic024yx3sfp14f1gnvz"; + sha256 = "03awrn49bb84a9vaha1kjdbpwdnrfwmd08mlajjilr6kwlnn620b"; }; - buildInputs = [ pam yacc flex ]; + + buildInputs = [ pam ]; + + buildNativeInputs = [ yacc flex ]; meta = { description = "library that abstracts the control group file system in Linux"; homepage = "http://libcg.sourceforge.net"; license = "LGPL"; + platforms = stdenv.lib.platforms.linux; }; } From dce7ac1f10ea1b94fb82ed3bbb14635f5f430b6e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= Date: Wed, 5 Oct 2011 21:51:07 +0000 Subject: [PATCH 080/970] Bigloo 3.7a. svn path=/nixpkgs/trunk/; revision=29679 --- pkgs/development/compilers/bigloo/default.nix | 17 +++++++++++------ 1 file changed, 11 insertions(+), 6 deletions(-) diff --git a/pkgs/development/compilers/bigloo/default.nix b/pkgs/development/compilers/bigloo/default.nix index e4cc56a5f05..fac4a99283a 100644 --- a/pkgs/development/compilers/bigloo/default.nix +++ b/pkgs/development/compilers/bigloo/default.nix @@ -1,20 +1,25 @@ { fetchurl, stdenv }: stdenv.mkDerivation rec { - name = "bigloo3.2a"; + name = "bigloo3.7a"; src = fetchurl { - url = "ftp://ftp-sop.inria.fr/mimosa/fp/Bigloo/${name}.tar.gz"; - sha256 = "131jnn17rcccbijpji7v5xlx4z2jldhbn46gkysf6axdcwxwqgg4"; + url = "ftp://ftp-sop.inria.fr/indes/fp/Bigloo/${name}.tar.gz"; + sha256 = "0y8i87c2bpqzap8rhzgpyfgdzq21py5xq6mgp0w6xv4rjcj9d0v1"; }; + preConfigure = + # Help libgc's configure. + '' export CXXCPP="g++ -E" + ''; + patchPhase = '' # Fix absolute paths. sed -e 's=/bin/mv=mv=g' -e 's=/bin/rm=rm=g' \ -e 's=/tmp=$TMPDIR=g' -i configure autoconf/* \ [Mm]akefile* */[Mm]akefile* */*/[Mm]akefile* \ */*/*/[Mm]akefile* */*/*/*/[Mm]akefile* \ - comptime/Cc/cc.scm gc/install-gc-* + comptime/Cc/cc.scm gc/install-* # Make sure we don't change string lengths in the generated # C files. @@ -24,7 +29,7 @@ stdenv.mkDerivation rec { checkTarget = "test"; - meta = { + meta = { description = "Bigloo, an efficient Scheme compiler"; longDescription = '' @@ -39,7 +44,7 @@ stdenv.mkDerivation rec { between Scheme and C# programs. ''; - homepage = http://www-sop.inria.fr/mimosa/fp/Bigloo/; + homepage = http://www-sop.inria.fr/indes/fp/Bigloo/; license = "GPLv2+"; maintainers = [ stdenv.lib.maintainers.ludo ]; From f68e44a602f63541f1f0458197ab64497ed32fb7 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Thu, 6 Oct 2011 09:57:32 +0000 Subject: [PATCH 081/970] cups: updated to version 1.5.0 svn path=/nixpkgs/branches/stdenv-updates/; revision=29681 --- pkgs/misc/cups/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/misc/cups/default.nix b/pkgs/misc/cups/default.nix index cc1157c022e..56461f2e858 100644 --- a/pkgs/misc/cups/default.nix +++ b/pkgs/misc/cups/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchurl, pkgconfig, zlib, libjpeg, libpng, libtiff, pam, openssl , dbus, libusb, acl }: -let version = "1.4.7"; in +let version = "1.5.0"; in stdenv.mkDerivation { name = "cups-${version}"; @@ -10,7 +10,7 @@ stdenv.mkDerivation { src = fetchurl { url = "http://ftp.easysw.com/pub/cups/${version}/cups-${version}-source.tar.bz2"; - sha256 = "1xlnkdqldq81pdqgisqbyh92k249bzz35m1f5bp4la06p00ksvjf"; + sha256 = "0czc0bmrm31jy03inm6w2mbr5s9q9xk6s1x5x4kddx2qlml9pyf6"; }; buildInputs = [ pkgconfig zlib libjpeg libpng libtiff pam dbus libusb acl ]; @@ -40,7 +40,7 @@ stdenv.mkDerivation { meta = { homepage = http://www.cups.org/; description = "A standards-based printing system for UNIX"; - license = "GPLv2"; # actually LGPL for the library and GPL for the rest + license = stdenv.lib.licenses.gpl2; # actually LGPL for the library and GPL for the rest maintainers = [ stdenv.lib.maintainers.urkud stdenv.lib.maintainers.simons ]; platforms = stdenv.lib.platforms.linux; }; From 667e2020cc12d629a08491b9a94972ecba324064 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Thu, 6 Oct 2011 10:23:23 +0000 Subject: [PATCH 082/970] cppunit: dropped obsolete version 1.10 svn path=/nixpkgs/trunk/; revision=29682 --- pkgs/development/libraries/cppunit/1.10.nix | 12 ------------ .../libraries/cppunit/include-cstdlib.patch | 12 ------------ pkgs/top-level/all-packages.nix | 1 - 3 files changed, 25 deletions(-) delete mode 100644 pkgs/development/libraries/cppunit/1.10.nix delete mode 100644 pkgs/development/libraries/cppunit/include-cstdlib.patch diff --git a/pkgs/development/libraries/cppunit/1.10.nix b/pkgs/development/libraries/cppunit/1.10.nix deleted file mode 100644 index 546f2bbba1e..00000000000 --- a/pkgs/development/libraries/cppunit/1.10.nix +++ /dev/null @@ -1,12 +0,0 @@ -{stdenv, fetchurl}: - -stdenv.mkDerivation { - name = "cppunit-1.10.0"; - - src = fetchurl { - url = mirror://sf/cppunit/cppunit-1.10.0.tar.gz; - sha256 = "08w5ljd3rbz6wzipzxqx1ma779b6k930iwjrg4bckddigrq897bg"; - }; - - patches = [./include-cstdlib.patch]; -} diff --git a/pkgs/development/libraries/cppunit/include-cstdlib.patch b/pkgs/development/libraries/cppunit/include-cstdlib.patch deleted file mode 100644 index 8a00c370ce2..00000000000 --- a/pkgs/development/libraries/cppunit/include-cstdlib.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -rc cppunit-1.10.0/src/cppunit/TypeInfoHelper.cpp cppunit-1.10.0-2/src/cppunit/TypeInfoHelper.cpp -*** cppunit-1.10.0/src/cppunit/TypeInfoHelper.cpp 2004-02-18 21:45:44.000000000 +0100 ---- cppunit-1.10.0-2/src/cppunit/TypeInfoHelper.cpp 2011-04-13 09:20:57.000000000 +0200 -*************** -*** 1,5 **** ---- 1,6 ---- - #include - #include -+ #include - - #if CPPUNIT_HAVE_RTTI - diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 023a05230c0..b8866f8a369 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -3168,7 +3168,6 @@ let ctl = callPackage ../development/libraries/ctl { }; cppunit = callPackage ../development/libraries/cppunit { }; - cppunit_1_10 = callPackage ../development/libraries/cppunit/1.10.nix { }; cracklib = callPackage ../development/libraries/cracklib { }; From 161c5bdafac6166d468b5f233a1c9087d1e1944b Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Thu, 6 Oct 2011 10:23:27 +0000 Subject: [PATCH 083/970] cppunit: improved meta section svn path=/nixpkgs/trunk/; revision=29683 --- pkgs/development/libraries/cppunit/default.nix | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/pkgs/development/libraries/cppunit/default.nix b/pkgs/development/libraries/cppunit/default.nix index 5e55bd51bcd..dbbcf4388c5 100644 --- a/pkgs/development/libraries/cppunit/default.nix +++ b/pkgs/development/libraries/cppunit/default.nix @@ -2,9 +2,16 @@ stdenv.mkDerivation { name = "cppunit-1.12.0"; - + src = fetchurl { url = mirror://sf/cppunit/cppunit-1.12.0.tar.gz; sha256 = "07zyyx5dyai94y8r8va28971f5mw84mb93xx9pm6m4ddpj6c79cq"; }; + + meta = { + homepage = "http://sourceforge.net/apps/mediawiki/cppunit/"; + description = "C++ unit testing framework"; + platforms = stdenv.lib.platforms.linux; + maintainers = [ stdenv.lib.maintainers.simons ]; + }; } From e543b455dfa6d8d56cbd6767c70af04ceaf36df1 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Thu, 6 Oct 2011 10:23:31 +0000 Subject: [PATCH 084/970] libsmbios: updated to version 2.2.28 to fix build errors with GCC 4.6.1 svn path=/nixpkgs/trunk/; revision=29684 --- pkgs/os-specific/linux/libsmbios/default.nix | 26 ++++++++++++-------- 1 file changed, 16 insertions(+), 10 deletions(-) diff --git a/pkgs/os-specific/linux/libsmbios/default.nix b/pkgs/os-specific/linux/libsmbios/default.nix index 41b440a4898..7b7e1c96ab5 100644 --- a/pkgs/os-specific/linux/libsmbios/default.nix +++ b/pkgs/os-specific/linux/libsmbios/default.nix @@ -1,13 +1,16 @@ { stdenv, fetchurl, pkgconfig, libxml2, perl }: -stdenv.mkDerivation rec { - name = "libsmbios-2.2.19"; +let + name = "libsmbios-2.2.28"; +in +stdenv.mkDerivation { + inherit name; src = fetchurl { url = "http://linux.dell.com/libsmbios/download/libsmbios/${name}/${name}.tar.gz"; - sha256 = "0f4wnjml734ssg583r448ypax7vf3f9n8gybzvzg170lc3byayhv"; + sha256 = "03m0n834w49acwbf5cf9ync1ksnn2jkwaysvy7584y60qpmngb91"; }; - + buildInputs = [ pkgconfig libxml2 perl ]; # It tries to install some Python stuff even when Python is disabled. @@ -16,13 +19,16 @@ stdenv.mkDerivation rec { # It forgets to install headers. postInstall = '' - cp -a src/include/* $out/include - cp -a out/public-include/* $out/include - ''; # */ + cp -va "src/include/"* "$out/include/" + cp -va "out/public-include/"* "$out/include/" + ''; meta = { - homepage = http://linux.dell.com/libsmbios/main/index.html; - description = "A library to obtain BIOS information"; - license = "GPLv2+"; # alternatively, under the Open Software License version 2.1 + homepage = "http://linux.dell.com/libsmbios/main"; + description = "a library to obtain BIOS information"; + license = stdenv.lib.licenses.gpl2Plus; # alternatively, under the Open Software License version 2.1 + + platforms = stdenv.lib.platforms.linux; + maintainers = [ stdenv.lib.maintainers.simons ]; }; } From ba6cc24ca8c71787226964aaf9d7b0e9d7cd4284 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Thu, 6 Oct 2011 10:27:33 +0000 Subject: [PATCH 085/970] synchronize with trunk svn path=/nixpkgs/branches/stdenv-updates/; revision=29685 --- pkgs/development/libraries/cppunit/1.10.nix | 12 --------- .../development/libraries/cppunit/default.nix | 9 ++++++- .../libraries/cppunit/include-cstdlib.patch | 12 --------- pkgs/os-specific/linux/libsmbios/default.nix | 26 ++++++++++++------- pkgs/top-level/all-packages.nix | 1 - 5 files changed, 24 insertions(+), 36 deletions(-) delete mode 100644 pkgs/development/libraries/cppunit/1.10.nix delete mode 100644 pkgs/development/libraries/cppunit/include-cstdlib.patch diff --git a/pkgs/development/libraries/cppunit/1.10.nix b/pkgs/development/libraries/cppunit/1.10.nix deleted file mode 100644 index 546f2bbba1e..00000000000 --- a/pkgs/development/libraries/cppunit/1.10.nix +++ /dev/null @@ -1,12 +0,0 @@ -{stdenv, fetchurl}: - -stdenv.mkDerivation { - name = "cppunit-1.10.0"; - - src = fetchurl { - url = mirror://sf/cppunit/cppunit-1.10.0.tar.gz; - sha256 = "08w5ljd3rbz6wzipzxqx1ma779b6k930iwjrg4bckddigrq897bg"; - }; - - patches = [./include-cstdlib.patch]; -} diff --git a/pkgs/development/libraries/cppunit/default.nix b/pkgs/development/libraries/cppunit/default.nix index 5e55bd51bcd..dbbcf4388c5 100644 --- a/pkgs/development/libraries/cppunit/default.nix +++ b/pkgs/development/libraries/cppunit/default.nix @@ -2,9 +2,16 @@ stdenv.mkDerivation { name = "cppunit-1.12.0"; - + src = fetchurl { url = mirror://sf/cppunit/cppunit-1.12.0.tar.gz; sha256 = "07zyyx5dyai94y8r8va28971f5mw84mb93xx9pm6m4ddpj6c79cq"; }; + + meta = { + homepage = "http://sourceforge.net/apps/mediawiki/cppunit/"; + description = "C++ unit testing framework"; + platforms = stdenv.lib.platforms.linux; + maintainers = [ stdenv.lib.maintainers.simons ]; + }; } diff --git a/pkgs/development/libraries/cppunit/include-cstdlib.patch b/pkgs/development/libraries/cppunit/include-cstdlib.patch deleted file mode 100644 index 8a00c370ce2..00000000000 --- a/pkgs/development/libraries/cppunit/include-cstdlib.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -rc cppunit-1.10.0/src/cppunit/TypeInfoHelper.cpp cppunit-1.10.0-2/src/cppunit/TypeInfoHelper.cpp -*** cppunit-1.10.0/src/cppunit/TypeInfoHelper.cpp 2004-02-18 21:45:44.000000000 +0100 ---- cppunit-1.10.0-2/src/cppunit/TypeInfoHelper.cpp 2011-04-13 09:20:57.000000000 +0200 -*************** -*** 1,5 **** ---- 1,6 ---- - #include - #include -+ #include - - #if CPPUNIT_HAVE_RTTI - diff --git a/pkgs/os-specific/linux/libsmbios/default.nix b/pkgs/os-specific/linux/libsmbios/default.nix index 41b440a4898..7b7e1c96ab5 100644 --- a/pkgs/os-specific/linux/libsmbios/default.nix +++ b/pkgs/os-specific/linux/libsmbios/default.nix @@ -1,13 +1,16 @@ { stdenv, fetchurl, pkgconfig, libxml2, perl }: -stdenv.mkDerivation rec { - name = "libsmbios-2.2.19"; +let + name = "libsmbios-2.2.28"; +in +stdenv.mkDerivation { + inherit name; src = fetchurl { url = "http://linux.dell.com/libsmbios/download/libsmbios/${name}/${name}.tar.gz"; - sha256 = "0f4wnjml734ssg583r448ypax7vf3f9n8gybzvzg170lc3byayhv"; + sha256 = "03m0n834w49acwbf5cf9ync1ksnn2jkwaysvy7584y60qpmngb91"; }; - + buildInputs = [ pkgconfig libxml2 perl ]; # It tries to install some Python stuff even when Python is disabled. @@ -16,13 +19,16 @@ stdenv.mkDerivation rec { # It forgets to install headers. postInstall = '' - cp -a src/include/* $out/include - cp -a out/public-include/* $out/include - ''; # */ + cp -va "src/include/"* "$out/include/" + cp -va "out/public-include/"* "$out/include/" + ''; meta = { - homepage = http://linux.dell.com/libsmbios/main/index.html; - description = "A library to obtain BIOS information"; - license = "GPLv2+"; # alternatively, under the Open Software License version 2.1 + homepage = "http://linux.dell.com/libsmbios/main"; + description = "a library to obtain BIOS information"; + license = stdenv.lib.licenses.gpl2Plus; # alternatively, under the Open Software License version 2.1 + + platforms = stdenv.lib.platforms.linux; + maintainers = [ stdenv.lib.maintainers.simons ]; }; } diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index d2718d53b63..6ecbe6fadc7 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -3178,7 +3178,6 @@ let ctl = callPackage ../development/libraries/ctl { }; cppunit = callPackage ../development/libraries/cppunit { }; - cppunit_1_10 = callPackage ../development/libraries/cppunit/1.10.nix { }; cracklib = callPackage ../development/libraries/cracklib { }; From d5d5ff5a78f677b37b97e6f2128e4ada2e391134 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Thu, 6 Oct 2011 10:29:56 +0000 Subject: [PATCH 086/970] release-small.nix: dropped obsolete 'aterm242fixes' package svn path=/nixpkgs/branches/stdenv-updates/; revision=29686 --- pkgs/top-level/release-small.nix | 1 - 1 file changed, 1 deletion(-) diff --git a/pkgs/top-level/release-small.nix b/pkgs/top-level/release-small.nix index e7957a8a78e..35fae54f4eb 100644 --- a/pkgs/top-level/release-small.nix +++ b/pkgs/top-level/release-small.nix @@ -19,7 +19,6 @@ with (import ./release-lib.nix); aspell = all; at = linux; - aterm242fixes = all; aterm25 = all; aterm28 = all; autoconf = all; From bcf053ed23b7391af3b90cfa8343de83c02db212 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Thu, 6 Oct 2011 10:47:09 +0000 Subject: [PATCH 087/970] * Firefox 7.0.1. svn path=/nixpkgs/trunk/; revision=29687 --- pkgs/applications/networking/browsers/firefox/7.0.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/networking/browsers/firefox/7.0.nix b/pkgs/applications/networking/browsers/firefox/7.0.nix index c14386e5f9e..c4fef3dfaf2 100644 --- a/pkgs/applications/networking/browsers/firefox/7.0.nix +++ b/pkgs/applications/networking/browsers/firefox/7.0.nix @@ -15,14 +15,14 @@ assert stdenv.gcc ? libc && stdenv.gcc.libc != null; rec { - firefoxVersion = "7.0"; + firefoxVersion = "7.0.1"; - xulVersion = "7.0"; # this attribute is used by other packages + xulVersion = "7.0.1"; # this attribute is used by other packages src = fetchurl { url = "http://releases.mozilla.org/pub/mozilla.org/firefox/releases/${firefoxVersion}/source/firefox-${firefoxVersion}.source.tar.bz2"; - sha256 = "1fpadlsdc8d739cz52dicn68v2ilv044hxivilgy9jnrazznrm42"; + sha1 = "94bbc7152832371dc0be82f411730df043c5c6ac"; }; commonConfigureFlags = From 5ab3c2abf2503a8f41eedec402fde20e83450496 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Thu, 6 Oct 2011 11:07:25 +0000 Subject: [PATCH 088/970] * NVIDIA driver updated to 285.05.09. svn path=/nixpkgs/trunk/; revision=29688 --- pkgs/os-specific/linux/nvidia-x11/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/os-specific/linux/nvidia-x11/default.nix b/pkgs/os-specific/linux/nvidia-x11/default.nix index f2065e1aa01..1fc65eb35ed 100644 --- a/pkgs/os-specific/linux/nvidia-x11/default.nix +++ b/pkgs/os-specific/linux/nvidia-x11/default.nix @@ -7,7 +7,7 @@ with stdenv.lib; -let versionNumber = "280.13"; in +let versionNumber = "285.05.09"; in stdenv.mkDerivation { name = "nvidia-x11-${versionNumber}${optionalString (!libsOnly) "-${kernel.version}"}"; @@ -18,12 +18,12 @@ stdenv.mkDerivation { if stdenv.system == "i686-linux" then fetchurl { url = "http://us.download.nvidia.com/XFree86/Linux-x86/${versionNumber}/NVIDIA-Linux-x86-${versionNumber}.run"; - sha256 = "16xcidshamxvc80sdnkph5rpgf72m5zz4x155amg2433kkhsy8mj"; + sha256 = "15kgsfpv0jigm1v3vnhcagni694lqm55kqysslmvb090nsczl0yf"; } else if stdenv.system == "x86_64-linux" then fetchurl { url = "http://us.download.nvidia.com/XFree86/Linux-x86_64/${versionNumber}/NVIDIA-Linux-x86_64-${versionNumber}-no-compat32.run"; - sha256 = "14x80qirwlfxhphzqvi92lpgs82qnzb7hq0vd02rkbwvvnkhgdxd"; + sha256 = "1zkgsjkhbx6dfmhhbflghbysr3icwfb5p6210xnhfss5dp2cvbwl"; } else throw "nvidia-x11 does not support platform ${stdenv.system}"; From 8ec876642e5e0d71c6173ae701981e6ace56ca52 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Thu, 6 Oct 2011 11:22:50 +0000 Subject: [PATCH 089/970] * Give the desktop items for Chrome and IceCat the right name. svn path=/nixpkgs/trunk/; revision=29689 --- pkgs/top-level/all-packages.nix | 60 +++++++++++++++++---------------- 1 file changed, 31 insertions(+), 29 deletions(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index b8866f8a369..fcc36c10c78 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -6302,7 +6302,7 @@ let patchelf = patchelf06; }; - chromeWrapper = wrapFirefox chrome "chrome" ""; + chromeWrapper = wrapFirefox { browser = chrome; browserName = "chrome"; desktopName = "Chrome"; }; cinelerra = callPackage ../applications/video/cinelerra { inherit (gnome) esound; @@ -6554,37 +6554,37 @@ let firefox = pkgs.firefoxPkgs.firefox; - firefoxWrapper = wrapFirefox pkgs.firefox "firefox" ""; + firefoxWrapper = wrapFirefox { browser = pkgs.firefox; }; - firefoxPkgs = pkgs.firefox60Pkgs; + firefoxPkgs = pkgs.firefox70Pkgs; firefox36Pkgs = callPackage ../applications/networking/browsers/firefox/3.6.nix { inherit (gtkLibs) gtk pango; inherit (gnome) libIDL; }; - firefox36Wrapper = wrapFirefox firefox36Pkgs.firefox "firefox" ""; + firefox36Wrapper = wrapFirefox { browser = firefox36Pkgs.firefox; }; firefox50Pkgs = callPackage ../applications/networking/browsers/firefox/5.0.nix { inherit (gtkLibs) gtk pango; inherit (gnome) libIDL; }; - firefox50Wrapper = wrapFirefox firefox50Pkgs.firefox "firefox" ""; + firefox50Wrapper = wrapFirefox { browser = firefox50Pkgs.firefox; }; firefox60Pkgs = callPackage ../applications/networking/browsers/firefox/6.0.nix { inherit (gtkLibs) gtk pango; inherit (gnome) libIDL; }; - firefox60Wrapper = wrapFirefox firefox60Pkgs.firefox "firefox" ""; + firefox60Wrapper = wrapFirefox { browser = firefox60Pkgs.firefox; }; firefox70Pkgs = callPackage ../applications/networking/browsers/firefox/7.0.nix { inherit (gtkLibs) gtk pango; inherit (gnome) libIDL; }; - firefox70Wrapper = lowPrio (wrapFirefox firefox70Pkgs.firefox "firefox" ""); + firefox70Wrapper = wrapFirefox { browser = firefox70Pkgs.firefox; }; firefox80bPkgs = callPackage ../applications/networking/browsers/firefox/8.0.nix { inherit (gtkLibs) gtk pango; @@ -6786,7 +6786,7 @@ let [ icecat3 icecatXulrunner3 ]) // { inherit (icecat3) gtk isFirefox3Like meta; }; - icecat3Wrapper = wrapFirefox icecat3Xul "icecat" ""; + icecat3Wrapper = wrapFirefox { browser = icecat3Xul; browserName = "icecat"; desktopName = "IceCat"; }; icecat4 = lowPrio (import ../applications/networking/browsers/icecat-4 { inherit fetchurl stdenv xz pkgconfig perl zip libjpeg libpng zlib cairo @@ -6812,7 +6812,7 @@ let [ icecat4 icecatXulrunner4 ]) // { inherit (icecat4) gtk meta; }; - icecat4Wrapper = wrapFirefox icecat4Xul "icecat" ""; + icecat4Wrapper = wrapFirefox { browser = icecat4Xul; browserName = "icecat"; desktopName = "IceCat"; }; icewm = callPackage ../applications/window-managers/icewm { inherit (gtkLibs) gtk; @@ -7454,26 +7454,28 @@ let wordnet = callPackage ../applications/misc/wordnet { }; - wrapFirefox = browser: browserName: nameSuffix: import ../applications/networking/browsers/firefox/wrapper.nix { - inherit stdenv nameSuffix makeWrapper makeDesktopItem browser browserName; - plugins = - let - enableAdobeFlash = getConfig [ browserName "enableAdobeFlash" ] true; - enableGnash = getConfig [ browserName "enableGnash" ] false; - in - assert !(enableGnash && enableAdobeFlash); - ([ ] - ++ lib.optional enableGnash gnash - ++ lib.optional enableAdobeFlash flashplayer - # RealPlayer is disabled by default for legal reasons. - ++ lib.optional (system != "i686-linux" && getConfig [browserName "enableRealPlayer"] false) RealPlayer - ++ lib.optional (getConfig [browserName "enableDjvu"] false) (djview4) - ++ lib.optional (getConfig [browserName "enableMPlayer"] false) (MPlayerPlugin browser) - ++ lib.optional (getConfig [browserName "enableGeckoMediaPlayer"] false) gecko_mediaplayer - ++ lib.optional (supportsJDK && getConfig [browserName "jre"] false && jrePlugin ? mozillaPlugin) jrePlugin - ++ lib.optional (getConfig [browserName "enableGoogleTalkPlugin"] false) google_talk_plugin - ); - }; + wrapFirefox = + { browser, browserName ? "firefox", desktopName ? "Firefox", nameSuffix ? "" }: + import ../applications/networking/browsers/firefox/wrapper.nix { + inherit stdenv makeWrapper makeDesktopItem browser browserName desktopName nameSuffix; + plugins = + let + enableAdobeFlash = getConfig [ browserName "enableAdobeFlash" ] true; + enableGnash = getConfig [ browserName "enableGnash" ] false; + in + assert !(enableGnash && enableAdobeFlash); + ([ ] + ++ lib.optional enableGnash gnash + ++ lib.optional enableAdobeFlash flashplayer + # RealPlayer is disabled by default for legal reasons. + ++ lib.optional (system != "i686-linux" && getConfig [browserName "enableRealPlayer"] false) RealPlayer + ++ lib.optional (getConfig [browserName "enableDjvu"] false) (djview4) + ++ lib.optional (getConfig [browserName "enableMPlayer"] false) (MPlayerPlugin browser) + ++ lib.optional (getConfig [browserName "enableGeckoMediaPlayer"] false) gecko_mediaplayer + ++ lib.optional (supportsJDK && getConfig [browserName "jre"] false && jrePlugin ? mozillaPlugin) jrePlugin + ++ lib.optional (getConfig [browserName "enableGoogleTalkPlugin"] false) google_talk_plugin + ); + }; x11vnc = callPackage ../tools/X11/x11vnc { }; From 0982859b6c79fa1073ee2314db2f07655a71dbb2 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Thu, 6 Oct 2011 11:31:14 +0000 Subject: [PATCH 090/970] * Neon: build with the new and patched OpenSSL. With this, Subversion can check out the Nix repositories without any warnings about untrusted certificates. * Make Firefox 7 the default. svn path=/nixpkgs/trunk/; revision=29691 --- pkgs/top-level/all-packages.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index fcc36c10c78..035cd00bc9e 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -4203,6 +4203,7 @@ let neon029 = callPackage ../development/libraries/neon/0.29.nix { compressionSupport = true; sslSupport = true; + openssl = opensslNew; }; nethack = builderDefsPackage (import ../games/nethack) { @@ -5958,7 +5959,7 @@ let tunctl = true; mconsole = true; }; - untie = callPackage ../os-specific/linux/untie {}; + untie = callPackage ../os-specific/linux/untie { }; upower = callPackage ../os-specific/linux/upower { dbus_glib = pkgs.dbus_glib_0_94; From b1b09c151099268275d384e8599c260e5f386af5 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Thu, 6 Oct 2011 11:56:18 +0000 Subject: [PATCH 091/970] * gnome-keyring: drop the (unused) dependency on HAL. svn path=/nixpkgs/trunk/; revision=29692 --- pkgs/desktops/gnome-2.28/default.nix | 2 +- pkgs/desktops/gnome-2.28/desktop/gnome-keyring/default.nix | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/desktops/gnome-2.28/default.nix b/pkgs/desktops/gnome-2.28/default.nix index 36eb7b70be2..e486cac465e 100644 --- a/pkgs/desktops/gnome-2.28/default.nix +++ b/pkgs/desktops/gnome-2.28/default.nix @@ -182,7 +182,7 @@ pkgs.makeOverridable #### DESKTOP gnome_keyring = import ./desktop/gnome-keyring { - inherit (pkgs) stdenv fetchurl pkgconfig dbus libgcrypt libtasn1 pam hal python; + inherit (pkgs) stdenv fetchurl pkgconfig dbus libgcrypt libtasn1 pam python; inherit (pkgs.gtkLibs) glib gtk; inherit intltool GConf; }; diff --git a/pkgs/desktops/gnome-2.28/desktop/gnome-keyring/default.nix b/pkgs/desktops/gnome-2.28/desktop/gnome-keyring/default.nix index fdb885bf595..f49cb1c2d1c 100644 --- a/pkgs/desktops/gnome-2.28/desktop/gnome-keyring/default.nix +++ b/pkgs/desktops/gnome-2.28/desktop/gnome-keyring/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchurl, pkgconfig, dbus, libgcrypt, libtasn1, pam, hal, python, glib, gtk, intltool, GConf}: +{stdenv, fetchurl, pkgconfig, dbus, libgcrypt, libtasn1, pam, python, glib, gtk, intltool, GConf}: stdenv.mkDerivation { name = "gnome-keyring-2.28.0"; @@ -8,7 +8,7 @@ stdenv.mkDerivation { sha256 = "1d6av3cq32ypq9f9mv7f9bcqkkdqgbvbb831kad62smczvqk8chv"; }; - buildInputs = [ pkgconfig dbus.libs libgcrypt pam hal python gtk intltool GConf ]; + buildInputs = [ pkgconfig dbus.libs libgcrypt pam python gtk intltool GConf ]; propagatedBuildInputs = [ glib libtasn1 ]; } From 8686ca62783e501dfbd49a2048e41e50348e6ecc Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Thu, 6 Oct 2011 13:15:02 +0000 Subject: [PATCH 092/970] btrfsprogs: override -Werror option in CFLAGS to fix build errors with GCC 4.6.1 svn path=/nixpkgs/trunk/; revision=29693 --- pkgs/tools/filesystems/btrfsprogs/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/tools/filesystems/btrfsprogs/default.nix b/pkgs/tools/filesystems/btrfsprogs/default.nix index 2a5574a829e..75c3644f2df 100644 --- a/pkgs/tools/filesystems/btrfsprogs/default.nix +++ b/pkgs/tools/filesystems/btrfsprogs/default.nix @@ -18,7 +18,7 @@ rec { inherit buildInputs; configureFlags = []; - makeFlags = ["prefix=$out"]; + makeFlags = ["prefix=$out CFLAGS=-Os"]; patches = [ ./glibc212.patch ]; phaseNames = ["doPatch" "doEnsureBtrfsImage" "doMakeInstall"]; From d95e485a86db08670d4f6608f85490a4c685639c Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Thu, 6 Oct 2011 13:15:05 +0000 Subject: [PATCH 093/970] mdadm: strip -Werror option from Makefile to fix build errors with GCC 4.6.1 svn path=/nixpkgs/trunk/; revision=29694 --- pkgs/os-specific/linux/mdadm/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/os-specific/linux/mdadm/default.nix b/pkgs/os-specific/linux/mdadm/default.nix index 0a80e7c8dd0..f0c09ff8658 100644 --- a/pkgs/os-specific/linux/mdadm/default.nix +++ b/pkgs/os-specific/linux/mdadm/default.nix @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { buildNativeInputs = [ groff ]; - preConfigure = "sed -e 's@/lib/udev@\${out}/lib/udev@' -i Makefile"; + preConfigure = "sed -e 's@/lib/udev@\${out}/lib/udev@' -e 's@ -Werror @ @' -i Makefile"; # Force mdadm to use /var/run/mdadm.map for its map file (or # /dev/.mdadm/map as a fallback). From ddd571e25333257ad37dc2e109f5685fb1b5aaca Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Thu, 6 Oct 2011 13:15:09 +0000 Subject: [PATCH 094/970] strip trailing whitespace svn path=/nixpkgs/trunk/; revision=29695 --- pkgs/os-specific/linux/mdadm/default.nix | 2 +- pkgs/tools/filesystems/btrfsprogs/default.nix | 12 ++++++------ 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/pkgs/os-specific/linux/mdadm/default.nix b/pkgs/os-specific/linux/mdadm/default.nix index f0c09ff8658..a88107ae73d 100644 --- a/pkgs/os-specific/linux/mdadm/default.nix +++ b/pkgs/os-specific/linux/mdadm/default.nix @@ -2,7 +2,7 @@ stdenv.mkDerivation rec { name = "mdadm-3.1.2"; - + src = fetchurl { url = "mirror://kernel/linux/utils/raid/mdadm/${name}.tar.bz2"; sha256 = "0s2d2a01j8cizxqvbgd0sn5bpa1j46q8976078b3jq1q7i1ir0zz"; diff --git a/pkgs/tools/filesystems/btrfsprogs/default.nix b/pkgs/tools/filesystems/btrfsprogs/default.nix index 75c3644f2df..22d7a1164c8 100644 --- a/pkgs/tools/filesystems/btrfsprogs/default.nix +++ b/pkgs/tools/filesystems/btrfsprogs/default.nix @@ -1,10 +1,10 @@ -a : -let +a : +let fetchurl = a.fetchurl; - version = a.lib.attrByPath ["version"] "0.19" a; + version = a.lib.attrByPath ["version"] "0.19" a; buildInputs = with a; [ - zlib libuuid acl + zlib libuuid acl ]; in @@ -22,9 +22,9 @@ rec { patches = [ ./glibc212.patch ]; phaseNames = ["doPatch" "doEnsureBtrfsImage" "doMakeInstall"]; - + doEnsureBtrfsImage = a.fullDepEntry ('' - if ! grep 'progs = ' Makefile | grep btrfs-image; then + if ! grep 'progs = ' Makefile | grep btrfs-image; then sed -e 's/progs = .*/& btrfs-image/' -i Makefile fi '') ["minInit" "doUnpack"]; From 1add4b2e6dd4c5ac452edfaffb5c166a4dfe590a Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Thu, 6 Oct 2011 13:16:47 +0000 Subject: [PATCH 095/970] synchronize with trunk svn path=/nixpkgs/branches/stdenv-updates/; revision=29696 --- .../networking/browsers/firefox/7.0.nix | 6 +- pkgs/desktops/gnome-2.28/default.nix | 2 +- .../desktop/gnome-keyring/default.nix | 4 +- pkgs/os-specific/linux/mdadm/default.nix | 4 +- pkgs/os-specific/linux/nvidia-x11/default.nix | 6 +- pkgs/tools/filesystems/btrfsprogs/default.nix | 14 ++--- pkgs/top-level/all-packages.nix | 63 ++++++++++--------- 7 files changed, 51 insertions(+), 48 deletions(-) diff --git a/pkgs/applications/networking/browsers/firefox/7.0.nix b/pkgs/applications/networking/browsers/firefox/7.0.nix index c14386e5f9e..c4fef3dfaf2 100644 --- a/pkgs/applications/networking/browsers/firefox/7.0.nix +++ b/pkgs/applications/networking/browsers/firefox/7.0.nix @@ -15,14 +15,14 @@ assert stdenv.gcc ? libc && stdenv.gcc.libc != null; rec { - firefoxVersion = "7.0"; + firefoxVersion = "7.0.1"; - xulVersion = "7.0"; # this attribute is used by other packages + xulVersion = "7.0.1"; # this attribute is used by other packages src = fetchurl { url = "http://releases.mozilla.org/pub/mozilla.org/firefox/releases/${firefoxVersion}/source/firefox-${firefoxVersion}.source.tar.bz2"; - sha256 = "1fpadlsdc8d739cz52dicn68v2ilv044hxivilgy9jnrazznrm42"; + sha1 = "94bbc7152832371dc0be82f411730df043c5c6ac"; }; commonConfigureFlags = diff --git a/pkgs/desktops/gnome-2.28/default.nix b/pkgs/desktops/gnome-2.28/default.nix index 36eb7b70be2..e486cac465e 100644 --- a/pkgs/desktops/gnome-2.28/default.nix +++ b/pkgs/desktops/gnome-2.28/default.nix @@ -182,7 +182,7 @@ pkgs.makeOverridable #### DESKTOP gnome_keyring = import ./desktop/gnome-keyring { - inherit (pkgs) stdenv fetchurl pkgconfig dbus libgcrypt libtasn1 pam hal python; + inherit (pkgs) stdenv fetchurl pkgconfig dbus libgcrypt libtasn1 pam python; inherit (pkgs.gtkLibs) glib gtk; inherit intltool GConf; }; diff --git a/pkgs/desktops/gnome-2.28/desktop/gnome-keyring/default.nix b/pkgs/desktops/gnome-2.28/desktop/gnome-keyring/default.nix index fdb885bf595..f49cb1c2d1c 100644 --- a/pkgs/desktops/gnome-2.28/desktop/gnome-keyring/default.nix +++ b/pkgs/desktops/gnome-2.28/desktop/gnome-keyring/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchurl, pkgconfig, dbus, libgcrypt, libtasn1, pam, hal, python, glib, gtk, intltool, GConf}: +{stdenv, fetchurl, pkgconfig, dbus, libgcrypt, libtasn1, pam, python, glib, gtk, intltool, GConf}: stdenv.mkDerivation { name = "gnome-keyring-2.28.0"; @@ -8,7 +8,7 @@ stdenv.mkDerivation { sha256 = "1d6av3cq32ypq9f9mv7f9bcqkkdqgbvbb831kad62smczvqk8chv"; }; - buildInputs = [ pkgconfig dbus.libs libgcrypt pam hal python gtk intltool GConf ]; + buildInputs = [ pkgconfig dbus.libs libgcrypt pam python gtk intltool GConf ]; propagatedBuildInputs = [ glib libtasn1 ]; } diff --git a/pkgs/os-specific/linux/mdadm/default.nix b/pkgs/os-specific/linux/mdadm/default.nix index 0a80e7c8dd0..a88107ae73d 100644 --- a/pkgs/os-specific/linux/mdadm/default.nix +++ b/pkgs/os-specific/linux/mdadm/default.nix @@ -2,7 +2,7 @@ stdenv.mkDerivation rec { name = "mdadm-3.1.2"; - + src = fetchurl { url = "mirror://kernel/linux/utils/raid/mdadm/${name}.tar.bz2"; sha256 = "0s2d2a01j8cizxqvbgd0sn5bpa1j46q8976078b3jq1q7i1ir0zz"; @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { buildNativeInputs = [ groff ]; - preConfigure = "sed -e 's@/lib/udev@\${out}/lib/udev@' -i Makefile"; + preConfigure = "sed -e 's@/lib/udev@\${out}/lib/udev@' -e 's@ -Werror @ @' -i Makefile"; # Force mdadm to use /var/run/mdadm.map for its map file (or # /dev/.mdadm/map as a fallback). diff --git a/pkgs/os-specific/linux/nvidia-x11/default.nix b/pkgs/os-specific/linux/nvidia-x11/default.nix index f2065e1aa01..1fc65eb35ed 100644 --- a/pkgs/os-specific/linux/nvidia-x11/default.nix +++ b/pkgs/os-specific/linux/nvidia-x11/default.nix @@ -7,7 +7,7 @@ with stdenv.lib; -let versionNumber = "280.13"; in +let versionNumber = "285.05.09"; in stdenv.mkDerivation { name = "nvidia-x11-${versionNumber}${optionalString (!libsOnly) "-${kernel.version}"}"; @@ -18,12 +18,12 @@ stdenv.mkDerivation { if stdenv.system == "i686-linux" then fetchurl { url = "http://us.download.nvidia.com/XFree86/Linux-x86/${versionNumber}/NVIDIA-Linux-x86-${versionNumber}.run"; - sha256 = "16xcidshamxvc80sdnkph5rpgf72m5zz4x155amg2433kkhsy8mj"; + sha256 = "15kgsfpv0jigm1v3vnhcagni694lqm55kqysslmvb090nsczl0yf"; } else if stdenv.system == "x86_64-linux" then fetchurl { url = "http://us.download.nvidia.com/XFree86/Linux-x86_64/${versionNumber}/NVIDIA-Linux-x86_64-${versionNumber}-no-compat32.run"; - sha256 = "14x80qirwlfxhphzqvi92lpgs82qnzb7hq0vd02rkbwvvnkhgdxd"; + sha256 = "1zkgsjkhbx6dfmhhbflghbysr3icwfb5p6210xnhfss5dp2cvbwl"; } else throw "nvidia-x11 does not support platform ${stdenv.system}"; diff --git a/pkgs/tools/filesystems/btrfsprogs/default.nix b/pkgs/tools/filesystems/btrfsprogs/default.nix index 2a5574a829e..22d7a1164c8 100644 --- a/pkgs/tools/filesystems/btrfsprogs/default.nix +++ b/pkgs/tools/filesystems/btrfsprogs/default.nix @@ -1,10 +1,10 @@ -a : -let +a : +let fetchurl = a.fetchurl; - version = a.lib.attrByPath ["version"] "0.19" a; + version = a.lib.attrByPath ["version"] "0.19" a; buildInputs = with a; [ - zlib libuuid acl + zlib libuuid acl ]; in @@ -18,13 +18,13 @@ rec { inherit buildInputs; configureFlags = []; - makeFlags = ["prefix=$out"]; + makeFlags = ["prefix=$out CFLAGS=-Os"]; patches = [ ./glibc212.patch ]; phaseNames = ["doPatch" "doEnsureBtrfsImage" "doMakeInstall"]; - + doEnsureBtrfsImage = a.fullDepEntry ('' - if ! grep 'progs = ' Makefile | grep btrfs-image; then + if ! grep 'progs = ' Makefile | grep btrfs-image; then sed -e 's/progs = .*/& btrfs-image/' -i Makefile fi '') ["minInit" "doUnpack"]; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 6ecbe6fadc7..77aba9c8372 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -4213,6 +4213,7 @@ let neon029 = callPackage ../development/libraries/neon/0.29.nix { compressionSupport = true; sslSupport = true; + openssl = opensslNew; }; nethack = builderDefsPackage (import ../games/nethack) { @@ -5980,7 +5981,7 @@ let tunctl = true; mconsole = true; }; - untie = callPackage ../os-specific/linux/untie {}; + untie = callPackage ../os-specific/linux/untie { }; upower = callPackage ../os-specific/linux/upower { dbus_glib = pkgs.dbus_glib_0_94; @@ -6324,7 +6325,7 @@ let patchelf = patchelf06; }; - chromeWrapper = wrapFirefox chrome "chrome" ""; + chromeWrapper = wrapFirefox { browser = chrome; browserName = "chrome"; desktopName = "Chrome"; }; cinelerra = callPackage ../applications/video/cinelerra { inherit (gnome) esound; @@ -6576,37 +6577,37 @@ let firefox = pkgs.firefoxPkgs.firefox; - firefoxWrapper = wrapFirefox pkgs.firefox "firefox" ""; + firefoxWrapper = wrapFirefox { browser = pkgs.firefox; }; - firefoxPkgs = pkgs.firefox60Pkgs; + firefoxPkgs = pkgs.firefox70Pkgs; firefox36Pkgs = callPackage ../applications/networking/browsers/firefox/3.6.nix { inherit (gtkLibs) gtk pango; inherit (gnome) libIDL; }; - firefox36Wrapper = wrapFirefox firefox36Pkgs.firefox "firefox" ""; + firefox36Wrapper = wrapFirefox { browser = firefox36Pkgs.firefox; }; firefox50Pkgs = callPackage ../applications/networking/browsers/firefox/5.0.nix { inherit (gtkLibs) gtk pango; inherit (gnome) libIDL; }; - firefox50Wrapper = wrapFirefox firefox50Pkgs.firefox "firefox" ""; + firefox50Wrapper = wrapFirefox { browser = firefox50Pkgs.firefox; }; firefox60Pkgs = callPackage ../applications/networking/browsers/firefox/6.0.nix { inherit (gtkLibs) gtk pango; inherit (gnome) libIDL; }; - firefox60Wrapper = wrapFirefox firefox60Pkgs.firefox "firefox" ""; + firefox60Wrapper = wrapFirefox { browser = firefox60Pkgs.firefox; }; firefox70Pkgs = callPackage ../applications/networking/browsers/firefox/7.0.nix { inherit (gtkLibs) gtk pango; inherit (gnome) libIDL; }; - firefox70Wrapper = lowPrio (wrapFirefox firefox70Pkgs.firefox "firefox" ""); + firefox70Wrapper = wrapFirefox { browser = firefox70Pkgs.firefox; }; firefox80bPkgs = callPackage ../applications/networking/browsers/firefox/8.0.nix { inherit (gtkLibs) gtk pango; @@ -6808,7 +6809,7 @@ let [ icecat3 icecatXulrunner3 ]) // { inherit (icecat3) gtk isFirefox3Like meta; }; - icecat3Wrapper = wrapFirefox icecat3Xul "icecat" ""; + icecat3Wrapper = wrapFirefox { browser = icecat3Xul; browserName = "icecat"; desktopName = "IceCat"; }; icecat4 = lowPrio (import ../applications/networking/browsers/icecat-4 { inherit fetchurl stdenv xz pkgconfig perl zip libjpeg libpng zlib cairo @@ -6834,7 +6835,7 @@ let [ icecat4 icecatXulrunner4 ]) // { inherit (icecat4) gtk meta; }; - icecat4Wrapper = wrapFirefox icecat4Xul "icecat" ""; + icecat4Wrapper = wrapFirefox { browser = icecat4Xul; browserName = "icecat"; desktopName = "IceCat"; }; icewm = callPackage ../applications/window-managers/icewm { inherit (gtkLibs) gtk; @@ -7476,26 +7477,28 @@ let wordnet = callPackage ../applications/misc/wordnet { }; - wrapFirefox = browser: browserName: nameSuffix: import ../applications/networking/browsers/firefox/wrapper.nix { - inherit stdenv nameSuffix makeWrapper makeDesktopItem browser browserName; - plugins = - let - enableAdobeFlash = getConfig [ browserName "enableAdobeFlash" ] true; - enableGnash = getConfig [ browserName "enableGnash" ] false; - in - assert !(enableGnash && enableAdobeFlash); - ([ ] - ++ lib.optional enableGnash gnash - ++ lib.optional enableAdobeFlash flashplayer - # RealPlayer is disabled by default for legal reasons. - ++ lib.optional (system != "i686-linux" && getConfig [browserName "enableRealPlayer"] false) RealPlayer - ++ lib.optional (getConfig [browserName "enableDjvu"] false) (djview4) - ++ lib.optional (getConfig [browserName "enableMPlayer"] false) (MPlayerPlugin browser) - ++ lib.optional (getConfig [browserName "enableGeckoMediaPlayer"] false) gecko_mediaplayer - ++ lib.optional (supportsJDK && getConfig [browserName "jre"] false && jrePlugin ? mozillaPlugin) jrePlugin - ++ lib.optional (getConfig [browserName "enableGoogleTalkPlugin"] false) google_talk_plugin - ); - }; + wrapFirefox = + { browser, browserName ? "firefox", desktopName ? "Firefox", nameSuffix ? "" }: + import ../applications/networking/browsers/firefox/wrapper.nix { + inherit stdenv makeWrapper makeDesktopItem browser browserName desktopName nameSuffix; + plugins = + let + enableAdobeFlash = getConfig [ browserName "enableAdobeFlash" ] true; + enableGnash = getConfig [ browserName "enableGnash" ] false; + in + assert !(enableGnash && enableAdobeFlash); + ([ ] + ++ lib.optional enableGnash gnash + ++ lib.optional enableAdobeFlash flashplayer + # RealPlayer is disabled by default for legal reasons. + ++ lib.optional (system != "i686-linux" && getConfig [browserName "enableRealPlayer"] false) RealPlayer + ++ lib.optional (getConfig [browserName "enableDjvu"] false) (djview4) + ++ lib.optional (getConfig [browserName "enableMPlayer"] false) (MPlayerPlugin browser) + ++ lib.optional (getConfig [browserName "enableGeckoMediaPlayer"] false) gecko_mediaplayer + ++ lib.optional (supportsJDK && getConfig [browserName "jre"] false && jrePlugin ? mozillaPlugin) jrePlugin + ++ lib.optional (getConfig [browserName "enableGoogleTalkPlugin"] false) google_talk_plugin + ); + }; x11vnc = callPackage ../tools/X11/x11vnc { }; From f4d88c2197dac7427399fd8c6a7036d4751c1011 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Thu, 6 Oct 2011 13:21:05 +0000 Subject: [PATCH 096/970] * Thunderbird 7.0.1. svn path=/nixpkgs/trunk/; revision=29697 --- .../mailreaders/thunderbird/{5.x.nix => 7.x.nix} | 8 ++++---- pkgs/top-level/all-packages.nix | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) rename pkgs/applications/networking/mailreaders/thunderbird/{5.x.nix => 7.x.nix} (92%) diff --git a/pkgs/applications/networking/mailreaders/thunderbird/5.x.nix b/pkgs/applications/networking/mailreaders/thunderbird/7.x.nix similarity index 92% rename from pkgs/applications/networking/mailreaders/thunderbird/5.x.nix rename to pkgs/applications/networking/mailreaders/thunderbird/7.x.nix index a409cae0d28..1f51a8e63b5 100644 --- a/pkgs/applications/networking/mailreaders/thunderbird/5.x.nix +++ b/pkgs/applications/networking/mailreaders/thunderbird/7.x.nix @@ -11,18 +11,18 @@ }: -let version = "5.0"; in +let version = "7.0.1"; in -# from wikipedia: This Release no longer supports versions of Mac OS X -# before Mac OS X 10.5 Leopard or Mac computers with PowerPC processors. stdenv.mkDerivation { name = "thunderbird-${version}"; src = fetchurl { url = "http://releases.mozilla.org/pub/mozilla.org/thunderbird/releases/${version}/source/thunderbird-${version}.source.tar.bz2"; - sha1 = "392c3e0ef70b62c29a543f88b2b8d5a51bfe69a7"; + sha1 = "ccfc6fe3fe4ad07b214e20bc440d20e14d3ffbe5"; }; + enableParallelBuilding = true; + buildInputs = [ pkgconfig perl python zip bzip2 gtk dbus_glib alsaLib libIDL nspr libnotify libnotify cairo pixman fontconfig yasm mesa nss diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 035cd00bc9e..ab78b6959a2 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -7323,7 +7323,7 @@ let thinkingRock = callPackage ../applications/misc/thinking-rock { }; - thunderbird = thunderbird3; + thunderbird = thunderbird7; thunderbird2 = callPackage ../applications/networking/mailreaders/thunderbird/2.x.nix { inherit (gnome) libIDL; @@ -7333,7 +7333,7 @@ let inherit (gnome) libIDL; }; - thunderbird5 = callPackage ../applications/networking/mailreaders/thunderbird/5.x.nix { + thunderbird7 = callPackage ../applications/networking/mailreaders/thunderbird/7.x.nix { inherit (gnome) libIDL; }; From a60193db6ba1ebc0946c5aa63a68bd3d0afb3fe3 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Thu, 6 Oct 2011 13:21:07 +0000 Subject: [PATCH 097/970] release-small.nix: updated name of "dbus" attribute svn path=/nixpkgs/branches/stdenv-updates/; revision=29698 --- pkgs/top-level/release-small.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/top-level/release-small.nix b/pkgs/top-level/release-small.nix index 35fae54f4eb..f56f6cf357d 100644 --- a/pkgs/top-level/release-small.nix +++ b/pkgs/top-level/release-small.nix @@ -208,7 +208,7 @@ with (import ./release-lib.nix); zile = linux; zip = all; - dbus = { + dbus_all = { libs = linux; tools = linux; }; From e1fb6adbe8fa928d18c6c883d3c7850b2a0d9bfc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= Date: Thu, 6 Oct 2011 13:27:58 +0000 Subject: [PATCH 098/970] Update Debian Lenny (5.0.9). svn path=/nixpkgs/trunk/; revision=29699 --- pkgs/build-support/vm/default.nix | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/pkgs/build-support/vm/default.nix b/pkgs/build-support/vm/default.nix index cc3d93bd561..aaeeef12a69 100644 --- a/pkgs/build-support/vm/default.nix +++ b/pkgs/build-support/vm/default.nix @@ -1194,22 +1194,22 @@ rec { }; debian50i386 = { - name = "debian-5.0.8-lenny-i386"; - fullName = "Debian 5.0.8 Lenny (i386)"; + name = "debian-5.0.9-lenny-i386"; + fullName = "Debian 5.0.9 Lenny (i386)"; packagesList = fetchurl { url = mirror://debian/dists/lenny/main/binary-i386/Packages.bz2; - sha256 = "0dcvd8ivn71dwln7mx5dbqj30v4cqmc61lj21ry05karkglb5scg"; + sha256 = "07f54775e2b54e201c7020cd65212fbb44288b1071a73f630f58b68b2d08b2af"; }; urlPrefix = mirror://debian; packages = commonDebianPackages; }; - + debian50x86_64 = { - name = "debian-5.0.8-lenny-amd64"; - fullName = "Debian 5.0.8 Lenny (amd64)"; + name = "debian-5.0.9-lenny-amd64"; + fullName = "Debian 5.0.9 Lenny (amd64)"; packagesList = fetchurl { url = mirror://debian/dists/lenny/main/binary-amd64/Packages.bz2; - sha256 = "1wrqjfcqfs7q5i7jnr8115zsjlhzxxm2x41agp546d3wpj68k938"; + sha256 = "1jqb3rr5q5y7yyhrymwa51djsydm92zbbmg4vbif65i7sp9ggky0"; }; urlPrefix = mirror://debian; packages = commonDebianPackages; From 57f482e2c30c8fb6067ac1a9578ad335e7dcfec6 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Thu, 6 Oct 2011 13:28:03 +0000 Subject: [PATCH 099/970] * Get rid of old Thunderbird versions. svn path=/nixpkgs/trunk/; revision=29700 --- .../mailreaders/thunderbird/2.x.nix | 55 -------------- .../mailreaders/thunderbird/3.x.nix | 71 ------------------- .../mailreaders/thunderbird/builder.sh | 34 --------- .../mailreaders/thunderbird/xlibs.patch | 10 --- pkgs/top-level/all-packages.nix | 12 +--- 5 files changed, 1 insertion(+), 181 deletions(-) delete mode 100644 pkgs/applications/networking/mailreaders/thunderbird/2.x.nix delete mode 100644 pkgs/applications/networking/mailreaders/thunderbird/3.x.nix delete mode 100644 pkgs/applications/networking/mailreaders/thunderbird/builder.sh delete mode 100644 pkgs/applications/networking/mailreaders/thunderbird/xlibs.patch diff --git a/pkgs/applications/networking/mailreaders/thunderbird/2.x.nix b/pkgs/applications/networking/mailreaders/thunderbird/2.x.nix deleted file mode 100644 index 3604470cb0d..00000000000 --- a/pkgs/applications/networking/mailreaders/thunderbird/2.x.nix +++ /dev/null @@ -1,55 +0,0 @@ -{ stdenv, fetchurl, pkgconfig, gtk, perl, zip, libIDL, libXi -, libjpeg, libpng, zlib, cairo - -, # If you want the resulting program to call itself "Thunderbird" - # instead of "Mail", enable this option. However, those - # binaries may not be distributed without permission from the - # Mozilla Foundation, see - # http://www.mozilla.org/foundation/trademarks/. - enableOfficialBranding ? false - -}: - -stdenv.mkDerivation { - name = "thunderbird-2.0.0.22"; - - builder = ./builder.sh; - - src = fetchurl { - url = ftp://ftp.mozilla.org/pub/mozilla.org/thunderbird/releases/2.0.0.22/source/thunderbird-2.0.0.22-source.tar.bz2; - sha1 = "a9da470ff090dfd049cae6b0c3b1a4e95c3f2022"; - }; - - buildInputs = [ - pkgconfig gtk perl zip libIDL libXi libjpeg libpng zlib cairo - ]; - - patches = [ - # Ugh, inexplicable problem since GTK+ 2.10. Probably a Firefox - # bug, but I don't know. See - # http://lists.gobolinux.org/pipermail/gobolinux-users/2007-January/004344.html - ./xlibs.patch - ]; - - configureFlags = [ - "--enable-application=mail" - "--enable-optimize" - "--disable-debug" - "--enable-xft" - "--disable-freetype2" - "--enable-svg" - "--enable-canvas" - "--enable-strip" - "--enable-default-toolkit=gtk2" - "--with-system-jpeg" - "--with-system-png" - "--with-system-zlib" - "--enable-system-cairo" - "--enable-extensions=default" - ] - ++ (if enableOfficialBranding then ["--enable-official-branding"] else []); - - meta = { - description = "Mozilla Thunderbird, a full-featured email client"; - }; -} diff --git a/pkgs/applications/networking/mailreaders/thunderbird/3.x.nix b/pkgs/applications/networking/mailreaders/thunderbird/3.x.nix deleted file mode 100644 index cc21a5b0400..00000000000 --- a/pkgs/applications/networking/mailreaders/thunderbird/3.x.nix +++ /dev/null @@ -1,71 +0,0 @@ -{ stdenv, fetchurl, pkgconfig, gtk, perl, python, zip, libIDL -, dbus_glib, bzip2, alsaLib, nspr -, libnotify, cairo, pixman, fontconfig - -, # If you want the resulting program to call itself "Thunderbird" - # instead of "Shredder", enable this option. However, those - # binaries may not be distributed without permission from the - # Mozilla Foundation, see - # http://www.mozilla.org/foundation/trademarks/. - enableOfficialBranding ? false - -}: - -let version = "3.1.9"; in - -stdenv.mkDerivation { - name = "thunderbird-${version}"; - - src = fetchurl { - url = "http://releases.mozilla.org/pub/mozilla.org/thunderbird/releases/${version}/source/thunderbird-${version}.source.tar.bz2"; - sha1 = "22b153102939430180ae1873ce15ef52286ff08d"; - }; - - buildInputs = - [ pkgconfig perl python zip bzip2 gtk dbus_glib alsaLib libIDL nspr libnotify - libnotify cairo pixman fontconfig - ]; - - NIX_LDFLAGS = "-lpixman-1"; - - configureFlags = - [ "--enable-application=mail" - "--enable-optimize" - "--disable-debug" - "--enable-strip" - "--with-system-jpeg" - "--with-system-zlib" - "--with-system-bz2" - "--with-system-nspr" - "--enable-system-cairo" - "--disable-crashreporter" - "--disable-necko-wifi" - "--disable-tests" - "--enable-static" # required by `make install' - ] - ++ stdenv.lib.optional enableOfficialBranding "--enable-official-branding"; - - # The Thunderbird Makefiles refer to the variables LIBXUL_DIST, - # prefix, and PREFIX in some places where they are not set. In - # particular, there are some linker flags like - # `-rpath-link=$(LIBXUL_DIST)/bin'. Since this expands to - # `-rpath-link=/bin', the build fails due to the purity checks in - # the ld wrapper. So disable the purity check for now. - preBuild = "NIX_ENFORCE_PURITY=0"; - - # This doesn't work: - #makeFlags = "LIBXUL_DIST=$(out) prefix=$(out) PREFIX=$(out)"; - - postInstall = - '' - # Fix some references to /bin paths in the Xulrunner shell script. - substituteInPlace $out/lib/thunderbird-*/thunderbird \ - --replace /bin/pwd "$(type -tP pwd)" \ - --replace /bin/ls "$(type -tP ls)" - ''; - - meta = { - description = "Mozilla Thunderbird, a full-featured email client"; - homepage = http://www.mozilla.org/thunderbird/; - }; -} diff --git a/pkgs/applications/networking/mailreaders/thunderbird/builder.sh b/pkgs/applications/networking/mailreaders/thunderbird/builder.sh deleted file mode 100644 index c4b477fcec5..00000000000 --- a/pkgs/applications/networking/mailreaders/thunderbird/builder.sh +++ /dev/null @@ -1,34 +0,0 @@ -source $stdenv/setup - -postInstall() { - - # Strip some more stuff - strip -S $out/lib/*/* || true - - # Fix some references to /bin paths in the Thunderbird shell script. - substituteInPlace $out/bin/thunderbird \ - --replace /bin/pwd "$(type -tP pwd)" \ - --replace /bin/ls "$(type -tP ls)" - - # This fixes starting Thunderbird when there already is a running - # instance. The `thunderbird' wrapper script actually expects to - # be in the same directory as `run-mozilla.sh', apparently. - libDir=$(cd $out/lib && ls -d thunderbird-*) - test -n "$libDir" - cd $out/bin - mv thunderbird ../lib/$libDir/ - ln -s ../lib/$libDir/thunderbird . - - # Register extensions etc. - echo "running thunderbird -register..." - (cd $out/lib/$libDir && LD_LIBRARY_PATH=. ./thunderbird-bin -register) || false - - echo "running regxpcom..." - (cd $out/lib/$libDir && LD_LIBRARY_PATH=. ./regxpcom) || false - - # Put the Thunderbird icon in the right place. - ensureDir $out/lib/$libDir/chrome/icons/default - ln -s ../../../icons/default.xpm $out/lib/$libDir/chrome/icons/default/ -} - -genericBuild diff --git a/pkgs/applications/networking/mailreaders/thunderbird/xlibs.patch b/pkgs/applications/networking/mailreaders/thunderbird/xlibs.patch deleted file mode 100644 index a656fbf9beb..00000000000 --- a/pkgs/applications/networking/mailreaders/thunderbird/xlibs.patch +++ /dev/null @@ -1,10 +0,0 @@ ---- mozilla/layout/build/Makefile.in.orig 2007-01-13 14:23:19.000000000 -0200 -+++ mozilla/layout/build/Makefile.in 2007-01-13 14:24:55.000000000 -0200 -@@ -282,5 +282,6 @@ LDFLAGS += -Wl,-LD_LAYOUT:lgot_buffer=50 - endif - endif - -+LDFLAGS += -lX11 -lXrender - - export:: $(BUILD_DATE) - \ No newline at end of file diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index ab78b6959a2..c5c4d812c8c 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -7323,17 +7323,7 @@ let thinkingRock = callPackage ../applications/misc/thinking-rock { }; - thunderbird = thunderbird7; - - thunderbird2 = callPackage ../applications/networking/mailreaders/thunderbird/2.x.nix { - inherit (gnome) libIDL; - }; - - thunderbird3 = callPackage ../applications/networking/mailreaders/thunderbird/3.x.nix { - inherit (gnome) libIDL; - }; - - thunderbird7 = callPackage ../applications/networking/mailreaders/thunderbird/7.x.nix { + thunderbird = callPackage ../applications/networking/mailreaders/thunderbird/7.x.nix { inherit (gnome) libIDL; }; From ee74cf87dc37dbbad89ab18a1228a5d92959205e Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Thu, 6 Oct 2011 13:52:54 +0000 Subject: [PATCH 100/970] * Set the Chrome icon in its desktop item. svn path=/nixpkgs/trunk/; revision=29701 --- .../networking/browsers/firefox/wrapper.nix | 6 ++---- pkgs/top-level/all-packages.nix | 10 +++++++--- 2 files changed, 9 insertions(+), 7 deletions(-) diff --git a/pkgs/applications/networking/browsers/firefox/wrapper.nix b/pkgs/applications/networking/browsers/firefox/wrapper.nix index 24e1e827363..0784b79d8bd 100644 --- a/pkgs/applications/networking/browsers/firefox/wrapper.nix +++ b/pkgs/applications/networking/browsers/firefox/wrapper.nix @@ -1,7 +1,5 @@ { stdenv, browser, makeDesktopItem, makeWrapper, plugins -, browserName ? "firefox" -, desktopName ? "Firefox" -, nameSuffix ? "" +, browserName, desktopName, nameSuffix, icon }: stdenv.mkDerivation { @@ -10,7 +8,7 @@ stdenv.mkDerivation { desktopItem = makeDesktopItem { name = browserName; exec = browserName; - icon = "${browser}/lib/${browser.name}/icons/mozicon128.png"; + icon = icon; comment = ""; desktopName = desktopName; genericName = "Web Browser"; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index c5c4d812c8c..c754d07480d 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -6303,7 +6303,10 @@ let patchelf = patchelf06; }; - chromeWrapper = wrapFirefox { browser = chrome; browserName = "chrome"; desktopName = "Chrome"; }; + chromeWrapper = wrapFirefox + { browser = chrome; browserName = "chrome"; desktopName = "Chrome"; + icon = "${chrome}/libexec/chrome/product_logo_48.png"; + }; cinelerra = callPackage ../applications/video/cinelerra { inherit (gnome) esound; @@ -7446,9 +7449,10 @@ let wordnet = callPackage ../applications/misc/wordnet { }; wrapFirefox = - { browser, browserName ? "firefox", desktopName ? "Firefox", nameSuffix ? "" }: + { browser, browserName ? "firefox", desktopName ? "Firefox", nameSuffix ? "" + , icon ? "${browser}/lib/${browser.name}/icons/mozicon128.png" }: import ../applications/networking/browsers/firefox/wrapper.nix { - inherit stdenv makeWrapper makeDesktopItem browser browserName desktopName nameSuffix; + inherit stdenv makeWrapper makeDesktopItem browser browserName desktopName nameSuffix icon; plugins = let enableAdobeFlash = getConfig [ browserName "enableAdobeFlash" ] true; From d1eddb691b543f856b5f72b9e50e36fcb393a9b0 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Thu, 6 Oct 2011 14:09:28 +0000 Subject: [PATCH 101/970] * NSPR updated to 4.8.9. svn path=/nixpkgs/trunk/; revision=29702 --- pkgs/development/libraries/nspr/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/nspr/default.nix b/pkgs/development/libraries/nspr/default.nix index 2509f26b5cb..0497278f14a 100644 --- a/pkgs/development/libraries/nspr/default.nix +++ b/pkgs/development/libraries/nspr/default.nix @@ -1,13 +1,13 @@ { stdenv, fetchurl }: -let version = "4.8.8"; in +let version = "4.8.9"; in stdenv.mkDerivation { name = "nspr-${version}"; src = fetchurl { url = "http://ftp.mozilla.org/pub/mozilla.org/nspr/releases/v${version}/src/nspr-${version}.tar.gz"; - sha256 = "1jfl97hbb88lpyvhcv6q8zrqyw9wri2m838qdhwkwcgfsbgg9wwj"; + sha256 = "1khw7l80f0k5jbk37hw6xqqmv6pmsp2m4xlfj2xh6bz7374cfhzz"; }; preConfigure = "cd mozilla/nsprpub"; From f1dcb1ccd071bde199ee6e03b845ecb3515472bc Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Thu, 6 Oct 2011 14:10:56 +0000 Subject: [PATCH 102/970] * Thunderbird: install a desktop item. svn path=/nixpkgs/trunk/; revision=29703 --- .../networking/mailreaders/thunderbird/7.x.nix | 14 +++++++++++++- 1 file changed, 13 insertions(+), 1 deletion(-) diff --git a/pkgs/applications/networking/mailreaders/thunderbird/7.x.nix b/pkgs/applications/networking/mailreaders/thunderbird/7.x.nix index 1f51a8e63b5..fb84271787c 100644 --- a/pkgs/applications/networking/mailreaders/thunderbird/7.x.nix +++ b/pkgs/applications/networking/mailreaders/thunderbird/7.x.nix @@ -25,7 +25,7 @@ stdenv.mkDerivation { buildInputs = [ pkgconfig perl python zip bzip2 gtk dbus_glib alsaLib libIDL nspr libnotify - libnotify cairo pixman fontconfig yasm mesa nss + libnotify cairo pixman fontconfig yasm mesa /* nss */ ]; patches = [ @@ -69,6 +69,18 @@ stdenv.mkDerivation { substituteInPlace $out/lib/thunderbird-*/thunderbird \ --replace /bin/pwd "$(type -tP pwd)" \ --replace /bin/ls "$(type -tP ls)" + + # Create a desktop item. + mkdir -p $out/share/applications + cat > $out/share/applications/thunderbird.desktop < Date: Thu, 6 Oct 2011 20:25:05 +0000 Subject: [PATCH 103/970] Adding boinc. It installs. I don't know how to use it. svn path=/nixpkgs/trunk/; revision=29704 --- .../science/misc/boinc/default.nix | 36 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 38 insertions(+) create mode 100644 pkgs/applications/science/misc/boinc/default.nix diff --git a/pkgs/applications/science/misc/boinc/default.nix b/pkgs/applications/science/misc/boinc/default.nix new file mode 100644 index 00000000000..bd6e5b2a9f0 --- /dev/null +++ b/pkgs/applications/science/misc/boinc/default.nix @@ -0,0 +1,36 @@ +{ fetchsvn, stdenv, autoconf, automake, pkgconfig, m4, curl, +mesa, libXmu, libXi, freeglut, libjpeg, libtool }: + +stdenv.mkDerivation rec { + name = "boinc-6.13.6"; + + src = fetchsvn { + url = "http://boinc.berkeley.edu/svn/tags/boinc_core_release_6_13_6"; + rev = 24341; + sha256 = "17312g4mhxigka1rafxxw46a4mbdlfj1wh1nlp1cbg43hv2rf7bq"; + }; + + buildInputs = [ libtool automake autoconf m4 pkgconfig curl mesa libXmu libXi + freeglut libjpeg ]; + + postConfigure = '' + sed -i -e s,/etc,$out/etc, client/scripts/Makefile + ''; + + preConfigure = '' + ./_autosetup + configureFlags="$configureFlags --sysconfdir=$out/etc" + ''; + + configureFlags = "--disable-server"; + + meta = { + description = "Free software for distributed and grid computing"; + + homepage = http://boinc.berkeley.edu/; + + license = "LGPLv2+"; + + platforms = stdenv.lib.platforms.linux; # arbitrary choice + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index c754d07480d..0065a2888b5 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -8208,6 +8208,8 @@ let ### SCIENCE / MISC + boinc = callPackage ../applications/science/misc/boinc { }; + golly = callPackage ../applications/science/misc/golly { }; simgrid = callPackage ../applications/science/misc/simgrid { }; From e0c4e42d8cb0052b642f0e4b0a9654b7d31c775e Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Thu, 6 Oct 2011 21:30:27 +0000 Subject: [PATCH 104/970] haskell-cmdlib: updated to version 0.3.4 svn path=/nixpkgs/trunk/; revision=29705 --- pkgs/development/libraries/haskell/cmdlib/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/development/libraries/haskell/cmdlib/default.nix b/pkgs/development/libraries/haskell/cmdlib/default.nix index 93df5ef217c..e49042a4a1f 100644 --- a/pkgs/development/libraries/haskell/cmdlib/default.nix +++ b/pkgs/development/libraries/haskell/cmdlib/default.nix @@ -1,12 +1,12 @@ -{ cabal, mtl, split, syb }: +{ cabal, mtl, split, syb, transformers }: cabal.mkDerivation (self: { pname = "cmdlib"; - version = "0.3.3"; - sha256 = "0gryz70d69r9pscwxmn5yr02r0zvvgj1vwc3g9klgbkipbsa7xvk"; + version = "0.3.4"; + sha256 = "1f8vb681xd2v7hv0s84x032yf8x2jlxc0j302irv20fkc1w1vbrr"; isLibrary = true; isExecutable = true; - buildDepends = [ mtl split syb ]; + buildDepends = [ mtl split syb transformers ]; meta = { description = "a library for command line parsing & online help"; license = self.stdenv.lib.licenses.bsd3; From 79ab307dd761ee1aa48123b5c63917e861cf672f Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Fri, 7 Oct 2011 09:26:03 +0000 Subject: [PATCH 105/970] * Fix Chatzilla (it doesn't work with recent Xulrunners). * Get rid of xulrunnerWrapper. svn path=/nixpkgs/trunk/; revision=29706 --- .../networking/browsers/conkeror/default.nix | 17 +++++++++++---- .../networking/irc/chatzilla/default.nix | 17 ++++++++------- .../interpreters/xulrunner/wrapper/builder.sh | 21 ------------------- .../xulrunner/wrapper/default.nix | 13 ------------ pkgs/top-level/all-packages.nix | 13 ++++-------- 5 files changed, 27 insertions(+), 54 deletions(-) delete mode 100644 pkgs/development/interpreters/xulrunner/wrapper/builder.sh delete mode 100644 pkgs/development/interpreters/xulrunner/wrapper/default.nix diff --git a/pkgs/applications/networking/browsers/conkeror/default.nix b/pkgs/applications/networking/browsers/conkeror/default.nix index e9c1c926ba4..08196780143 100644 --- a/pkgs/applications/networking/browsers/conkeror/default.nix +++ b/pkgs/applications/networking/browsers/conkeror/default.nix @@ -1,14 +1,23 @@ -{ stdenv, fetchurl, unzip }: +{ stdenv, fetchurl, unzip, xulrunner, makeWrapper }: + stdenv.mkDerivation { name = "conkeror-1.0pre-20110917"; + src = fetchurl { url = http://repo.or.cz/w/conkeror.git/snapshot/9d1f522674379874e502545babe0c843f78fa43c.zip; sha256 = "1ga3d9rc3xfaxvjnhnar752q9ga897q9fck0864i7rh0w7xbrhx2"; }; - buildInputs = [ unzip ]; - installPhase = '' - cp -v -r . $out + + buildInputs = [ unzip makeWrapper ]; + + buildCommand = '' + mkdir -p $out/libexec/conkeror + unzip $src -d $out/libexec + + makeWrapper ${xulrunner}/bin/xulrunner $out/bin/conkeror \ + --add-flags $out/libexec/conkeror/application.ini ''; + meta = { description = "A keyboard-oriented, customizable, extensible web browser"; longDescription = '' diff --git a/pkgs/applications/networking/irc/chatzilla/default.nix b/pkgs/applications/networking/irc/chatzilla/default.nix index a0197a99a50..8ce73c69f3d 100644 --- a/pkgs/applications/networking/irc/chatzilla/default.nix +++ b/pkgs/applications/networking/irc/chatzilla/default.nix @@ -1,19 +1,22 @@ -{ stdenv, fetchurl, unzip }: +{ stdenv, fetchurl, unzip, xulrunner, makeWrapper }: stdenv.mkDerivation rec { - name = "chatzilla-0.9.86.1"; + name = "chatzilla-0.9.87"; src = fetchurl { # Obtained from http://chatzilla.rdmsoft.com/xulrunner/. - url = http://chatzilla.rdmsoft.com/xulrunner/download/chatzilla-0.9.86.1-xr.zip; - sha256 = "06s4g0x7hsckd7wr904j8rzksvqhvcrhl9zwga2458rgafcbbghd"; + url = http://chatzilla.rdmsoft.com/xulrunner/download/chatzilla-0.9.87-xr.zip; + sha256 = "1qwbqngrxyip3k2b71adg271sifvrrxcixkyrsy4vmgl5bwdsl4d"; }; - buildInputs = [ unzip ]; + buildInputs = [ unzip makeWrapper ]; buildCommand = '' - ensureDir $out - unzip $src -d $out + mkdir -p $out/libexec/chatzilla + unzip $src -d $out/libexec/chatzilla + + makeWrapper ${xulrunner}/bin/xulrunner $out/bin/chatzilla \ + --add-flags $out/libexec/chatzilla/application.ini ''; meta = { diff --git a/pkgs/development/interpreters/xulrunner/wrapper/builder.sh b/pkgs/development/interpreters/xulrunner/wrapper/builder.sh deleted file mode 100644 index 4deed9e7a7f..00000000000 --- a/pkgs/development/interpreters/xulrunner/wrapper/builder.sh +++ /dev/null @@ -1,21 +0,0 @@ -source $stdenv/setup - -ensureDir $out/bin - -wrapper="$out/bin/$launcher" - -if test -e $xulrunner/bin/xulrunner; then - runner=$xulrunner/bin/xulrunner -elif test -e $xulrunner/bin/firefox; then - runner="$xulrunner/bin/firefox -app" -else - echo "XUL runner not found" - exit 1 -fi - -cat > $wrapper < Date: Fri, 7 Oct 2011 11:37:42 +0000 Subject: [PATCH 106/970] * Apache 2.2.21. svn path=/nixpkgs/trunk/; revision=29707 --- pkgs/servers/http/apache-httpd/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/http/apache-httpd/default.nix b/pkgs/servers/http/apache-httpd/default.nix index 22f733e40c6..0d586b0c3a6 100644 --- a/pkgs/servers/http/apache-httpd/default.nix +++ b/pkgs/servers/http/apache-httpd/default.nix @@ -8,12 +8,12 @@ assert sslSupport -> openssl != null; assert ldapSupport -> aprutil.ldapSupport && openldap != null; stdenv.mkDerivation rec { - version = "2.2.20"; + version = "2.2.21"; name = "apache-httpd-${version}"; src = fetchurl { url = "mirror://apache/httpd/httpd-${version}.tar.bz2"; - sha1 = "c8f00a505af6ed3f89f45b640217c388f5cd32b0"; + sha1 = "c02f9b05da9a7e316ff37d9053dc76a57ba51cb4"; }; buildInputs = [perl apr aprutil pcre] ++ From 20778d629b102f26cf76efd4ee41583efbc9fab6 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Fri, 7 Oct 2011 12:18:17 +0000 Subject: [PATCH 107/970] * Updated Catalyst to 5.9. It now uses Plack for interfacing with the web server, so add that as well. svn path=/nixpkgs/trunk/; revision=29709 --- .../lwp-protocol-https-cert-file.patch | 17 + pkgs/top-level/perl-packages.nix | 301 ++++++++++++++---- 2 files changed, 261 insertions(+), 57 deletions(-) create mode 100644 pkgs/development/perl-modules/lwp-protocol-https-cert-file.patch diff --git a/pkgs/development/perl-modules/lwp-protocol-https-cert-file.patch b/pkgs/development/perl-modules/lwp-protocol-https-cert-file.patch new file mode 100644 index 00000000000..c0fa85ecce8 --- /dev/null +++ b/pkgs/development/perl-modules/lwp-protocol-https-cert-file.patch @@ -0,0 +1,17 @@ +Use $OPENSSL_X509_CERT_FILE to get the CA certificates. + +diff -ru -x '*~' LWP-Protocol-https-6.02-orig/lib/LWP/Protocol/https.pm LWP-Protocol-https-6.02/lib/LWP/Protocol/https.pm +--- LWP-Protocol-https-6.02-orig/lib/LWP/Protocol/https.pm 2011-03-27 13:54:01.000000000 +0200 ++++ LWP-Protocol-https-6.02/lib/LWP/Protocol/https.pm 2011-10-07 13:23:41.398628375 +0200 +@@ -21,6 +21,11 @@ + } + if ($ssl_opts{SSL_verify_mode}) { + unless (exists $ssl_opts{SSL_ca_file} || exists $ssl_opts{SSL_ca_path}) { ++ if (defined $ENV{'OPENSSL_X509_CERT_FILE'}) { ++ $ssl_opts{SSL_ca_file} = $ENV{'OPENSSL_X509_CERT_FILE'}; ++ } ++ } ++ unless (exists $ssl_opts{SSL_ca_file} || exists $ssl_opts{SSL_ca_path}) { + eval { + require Mozilla::CA; + }; diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index ae902dabe5d..ece567bb075 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -292,7 +292,7 @@ rec { }; buildInputs = [ TestWWWMechanizeCatalyst TestUseOk ]; propagatedBuildInputs = - [ CatalystPluginAuthentication ClassAccessor CryptPasswdMD5 AuthenHtpasswd ]; + [ CatalystPluginAuthentication ClassAccessor CryptPasswdMD5 AuthenHtpasswd HTMLForm ]; }; CatalystAuthenticationStoreDBIxClass = buildPerlPackage rec { @@ -389,10 +389,10 @@ rec { }; CatalystRuntime = buildPerlPackage rec{ - name = "Catalyst-Runtime-5.80033"; + name = "Catalyst-Runtime-5.90003"; src = fetchurl { url = "mirror://cpan/authors/id/B/BO/BOBTFISH/${name}.tar.gz"; - sha256 = "1q542lrnvc0a11923awhk51fqzzxfa8zdkbch7z07dl8y81mwhl2"; + sha256 = "0i53d208gf9bg6zasa8ya0nk3wik1crfrkw9rmbxsba16i5nm101"; }; buildInputs = [ TestException ]; propagatedBuildInputs = @@ -405,6 +405,7 @@ rec { TextSimpleTable TimeHiRes TreeSimple TreeSimpleVisitorFactory URI TaskWeaken /* TextBalanced */ MROCompat MooseXTypes MooseXGetopt MooseXTypesCommon StringRewritePrefix + MooseXTypesLoadableClass Plack PlackMiddlewareReverseProxy ]; }; @@ -1148,6 +1149,15 @@ rec { }; }; + DevelStackTraceAsHTML = buildPerlPackage rec { + name = "Devel-StackTrace-AsHTML-0.11"; + src = fetchurl { + url = "mirror://cpan/modules/by-module/Devel/${name}.tar.gz"; + sha256 = "0y0r42gszp3bxbs9j2nn3xgs8ij1cnadrywwwdc6r0y8m0siyapg"; + }; + propagatedBuildInputs = [ DevelStackTrace ]; + }; + DevelSymdump = buildPerlPackage rec { name = "Devel-Symdump-2.08"; src = fetchurl { @@ -1268,6 +1278,14 @@ rec { }; }; + EncodeLocale = buildPerlPackage rec { + name = "Encode-Locale-1.02"; + src = fetchurl { + url = "mirror://cpan/modules/by-module/Encode/${name}.tar.gz"; + sha256 = "0h2kim6mg236s749wlg35lhv1zdkrkr0bm65spkg005cn0mbmi90"; + }; + }; + Error = buildPerlPackage rec { name = "Error-0.17016"; src = fetchurl { @@ -1377,6 +1395,15 @@ rec { propagatedBuildInputs = [ NumberCompare TextGlob ]; }; + FileListing = buildPerlPackage rec { + name = "File-Listing-6.03"; + src = fetchurl { + url = "mirror://cpan/modules/by-module/File/${name}.tar.gz"; + sha256 = "154hp49pcngsqrwi1pbw3fx82v7vql4dc9wh7qfj37vmy8sn1s93"; + }; + propagatedBuildInputs = [ HTTPDate ]; + }; + FileModified = buildPerlPackage { name = "File-Modified-0.07"; src = fetchurl { @@ -1410,6 +1437,14 @@ rec { propagatedBuildInputs = [ClassInspector ParamsUtil]; }; + FilesysNotifySimple = buildPerlPackage rec { + name = "Filesys-Notify-Simple-0.08"; + src = fetchurl { + url = "mirror://cpan/modules/by-module/Filesys/${name}.tar.gz"; + sha256 = "042klyvi8fbkhmyg1h7883bbjdhiclmky9w2wfga7piq5il6nxgi"; + }; + }; + FileTemp = buildPerlPackage rec { name = "File-Temp-0.22"; src = fetchurl { @@ -1541,6 +1576,14 @@ rec { propagatedBuildInputs = [ Clone ]; }; + HashMultiValue = buildPerlPackage rec { + name = "Hash-MultiValue-0.10"; + src = fetchurl { + url = "mirror://cpan/modules/by-module/Hash/${name}.tar.gz"; + sha256 = "1n9klrg01myij2svcmdc212msmsr3cmsl2yw5k9my8j3s96b5yn1"; + }; + }; + HookLexWrap = buildPerlPackage rec { name = "Hook-LexWrap-0.22"; src = fetchurl { @@ -1550,6 +1593,15 @@ rec { buildInputs = [ pkgs.unzip ]; }; + HTMLForm = buildPerlPackage rec { + name = "HTML-Form-6.00"; + src = fetchurl { + url = "mirror://cpan/modules/by-module/HTML/${name}.tar.gz"; + sha256 = "11s9mlybjm14sa6m3wcfjf9pv00yynv0yk4parx44ga9h1a6y6xl"; + }; + propagatedBuildInputs = [ HTMLParser HTTPMessage URI ]; + }; + HTMLFormFu = buildPerlPackage rec { name = "HTML-FormFu-0.03007"; src = fetchurl { @@ -1568,11 +1620,11 @@ rec { ]; }; - HTMLParser = buildPerlPackage { - name = "HTML-Parser-3.56"; + HTMLParser = buildPerlPackage rec { + name = "HTML-Parser-3.68"; src = fetchurl { - url = mirror://cpan/authors/id/G/GA/GAAS/HTML-Parser-3.56.tar.gz; - sha256 = "0x1h42r54aq4yqpwi7mla4jzia9c5ysyqh8ir2nav833f9jm6g2h"; + url = "mirror://cpan/modules/by-module/HTML/${name}.tar.gz"; + sha256 = "1hhniqqpvi01vxsyvmcj677yg7a12zy0a3ynwxwg3ig6shn8a3j3"; }; propagatedBuildInputs = [HTMLTagset]; }; @@ -1586,11 +1638,11 @@ rec { propagatedBuildInputs = [HTMLParser]; }; - HTMLTagset = buildPerlPackage { - name = "HTML-Tagset-3.10"; + HTMLTagset = buildPerlPackage rec { + name = "HTML-Tagset-3.20"; src = fetchurl { - url = mirror://cpan/authors/id/P/PE/PETDANCE/HTML-Tagset-3.10.tar.gz; - sha256 = "05k292qy7jzjlmmybis8nncpnwwa4jfkm7q3gq6866ydxrzds9xh"; + url = "mirror://cpan/modules/by-module/HTML/${name}.tar.gz"; + sha256 = "1qh8249wgr4v9vgghq77zh1d2zs176bir223a8gh3k9nksn7vcdd"; }; }; @@ -1652,6 +1704,23 @@ rec { propagatedBuildInputs = [ LWP ]; }; + HTTPCookies = buildPerlPackage rec { + name = "HTTP-Cookies-6.00"; + src = fetchurl { + url = "mirror://cpan/modules/by-module/HTTP/${name}.tar.gz"; + sha256 = "0758c3rj22z1bj7pbypmh1jadgd6w68nn8inhds96r39jhc79d9h"; + }; + propagatedBuildInputs = [ HTTPDate HTTPMessage ]; + }; + + HTTPDate = buildPerlPackage rec { + name = "HTTP-Date-6.00"; + src = fetchurl { + url = "mirror://cpan/modules/by-module/HTTP/${name}.tar.gz"; + sha256 = "15nrnfir4xqdd3lm0s0jgh9zwxx5ylmvl63xqmj5wipzl4l76vs6"; + }; + }; + HTTPHeaderParserXS = buildPerlPackage rec { name = "HTTP-HeaderParser-XS-0.20"; src = fetchurl { @@ -1660,6 +1729,24 @@ rec { }; }; + HTTPMessage = buildPerlPackage rec { + name = "HTTP-Message-6.02"; + src = fetchurl { + url = "mirror://cpan/modules/by-module/HTTP/${name}.tar.gz"; + sha256 = "10ai2vabbx6yqsyz6rbi7hp4vljmlq9kyn74jvjp95la5v4b6c93"; + }; + propagatedBuildInputs = [ EncodeLocale HTMLParser HTTPDate IOCompress LWPMediaTypes URI ]; + }; + + HTTPParserXS = buildPerlPackage rec { + name = "HTTP-Parser-XS-0.14"; + src = fetchurl { + url = "mirror://cpan/modules/by-module/HTTP/${name}.tar.gz"; + sha256 = "06srbjc380kvvj76r8n5c2y282j5zfgn0s0zmb9h3shwrynfqj05"; + }; + buildInputs = [ TestMore ]; + }; + HTTPRequestAsCGI = buildPerlPackage rec { name = "HTTP-Request-AsCGI-1.2"; src = fetchurl { @@ -1670,12 +1757,12 @@ rec { }; HTTPResponseEncoding = buildPerlPackage rec { - name = "HTTP-Response-Encoding-0.05"; + name = "HTTP-Response-Encoding-0.06"; src = fetchurl { - url = "mirror://cpan/authors/id/D/DA/DANKOGAI/${name}.tar.gz"; - sha256 = "04gdl633g0s2ckn7zixcma2krbpfcd46jngg155qpdx5sdwfkm16"; + url = "mirror://cpan/modules/by-module/HTTP/${name}.tar.gz"; + sha256 = "1am8lis8107s5npca1xgazdy5sknknzcqyhdmc220s4a4f77n5hh"; }; - propagatedBuildInputs = [LWP]; + propagatedBuildInputs = [ LWP ]; }; HTTPServerSimple = buildPerlPackage rec { @@ -1732,14 +1819,13 @@ rec { }; }; - IOSocketSSL = buildPerlPackage { - name = "IO-Socket-SSL-1.33"; + IOSocketSSL = buildPerlPackage rec { + name = "IO-Socket-SSL-1.44"; src = fetchurl { - url = mirror://cpan/authors/id/S/SU/SULLR/IO-Socket-SSL-1.33.tar.gz; - sha256 = "1lpp2cs794d989b9gfhssjv1bkcs9lmrkjcpnxsavj7822izs4xj"; + url = "mirror://cpan/modules/by-module/IO/${name}.tar.gz"; + sha256 = "1xbgx1ij34a3dlwv94zjh3a02cj2lyhwzxcmv59harl784xn1mlg"; }; - propagatedBuildInputs = [NetSSLeay]; - # TODO: IOSocketINET6 + propagatedBuildInputs = [ URI NetSSLeay ]; }; IOString = buildPerlPackage rec { @@ -2029,21 +2115,39 @@ rec { }; }; - LWP = buildPerlPackage rec { - name = "libwww-perl-5.825"; + name = "libwww-perl-6.02"; src = fetchurl { - url = "mirror://cpan/authors/id/G/GA/GAAS/${name}.tar.gz"; - sha256 = "1wb7br1n86571xz19l20cc5ysy1lx3rhvlk02g5517919z3jxvhw"; + url = "mirror://cpan/modules/by-module/LWP/${name}.tar.gz"; + sha256 = "0cn2cbrz5mrpqmnfhhk0bgv0c1q1x722xlnlnzw6zymj5sg3w6dm"; }; - propagatedBuildInputs = [URI HTMLParser HTMLTagset]; + propagatedBuildInputs = + [ EncodeLocale FileListing HTMLParser HTTPCookies HTTPMessage LWPMediaTypes URI NetHTTP ]; + }; + + LWPMediaTypes = buildPerlPackage rec { + name = "LWP-MediaTypes-6.01"; + src = fetchurl { + url = "mirror://cpan/modules/by-module/LWP/${name}.tar.gz"; + sha256 = "1fhxql3xnhrlyzkjyss4swvhyh0r58cv2kwjcpj3mdbbg54ah9fz"; + }; + }; + + LWPProtocolHttps = buildPerlPackage rec { + name = "LWP-Protocol-https-6.02"; + src = fetchurl { + url = "mirror://cpan/modules/by-module/LWP/${name}.tar.gz"; + sha256 = "0y2an4v7g4jm8fsszk2489m179i28kx79ywwiywkwk1aw3yqh0y5"; + }; + patches = [ ../development/perl-modules/lwp-protocol-https-cert-file.patch ]; + propagatedBuildInputs = [ LWP IOSocketSSL ]; + doCheck = false; # tries to connect to https://www.apache.org/. }; maatkit = import ../development/perl-modules/maatkit { inherit fetchurl buildPerlPackage stdenv DBDmysql; }; - MailIMAPClient = buildPerlPackage { name = "Mail-IMAPClient-2.2.9"; src = fetchurl { @@ -2251,6 +2355,15 @@ rec { propagatedBuildInputs = [ Moose MooseXTypes ]; }; + MooseXTypesLoadableClass = buildPerlPackage rec { + name = "MooseX-Types-LoadableClass-0.006"; + src = fetchurl { + url = "mirror://cpan/modules/by-module/MooseX/${name}.tar.gz"; + sha256 = "035d2gzq1j60skn39jav2jr6sbx1hq9vqmmfjfc3cvhahfzrygs4"; + }; + propagatedBuildInputs = [ ClassLoad Moose MooseXTypes NamespaceClean ]; + }; + Mouse = buildPerlPackage rec { name = "Mouse-0.26"; src = fetchurl { @@ -2313,7 +2426,7 @@ rec { patches = [ ../development/perl-modules/net-amazon-mechanicalturk.patch ]; propagatedBuildInputs = - [ DigestHMAC LWP URI XMLParser IOString CryptSSLeay ]; + [ DigestHMAC LWP LWPProtocolHttps URI XMLParser IOString ]; buildInputs = [ DBI DBDSQLite ]; }; @@ -2327,6 +2440,14 @@ rec { doCheck = false; }; + NetHTTP = buildPerlPackage rec { + name = "Net-HTTP-6.01"; + src = fetchurl { + url = "mirror://cpan/modules/by-module/Net/${name}.tar.gz"; + sha256 = "0ipad5y605fr968snxmp1sxrkvag9r5y0g8qvj9n7ca9nbwq7n3n"; + }; + }; + NetIP = buildPerlPackage { name = "Net-IP-1.25"; src = fetchurl { @@ -2336,10 +2457,10 @@ rec { }; NetServer = buildPerlPackage rec { - name = "Net-Server-0.97"; + name = "Net-Server-0.99"; src = fetchurl { - url = "mirror://cpan/authors/id/R/RH/RHANDOM/${name}.tar.gz"; - sha256 = "13vhv13w06g6h6iqx440q1h6hwj0kpjdxcc3fl9crkwg5glygg2f"; + url = "mirror://cpan/modules/by-module/Net/${name}.tar.gz"; + sha256 = "0pdf2fvklpcxrdz3wwmhbvjs6kvzcvjw28f3pny8z17188lv06n1"; }; doCheck = false; # seems to hang waiting for connections }; @@ -2363,16 +2484,15 @@ rec { propagatedBuildInputs = [IOSocketSSL]; }; - NetSSLeay = buildPerlPackage { - name = "Net-SSLeay-1.36"; + NetSSLeay = buildPerlPackage rec { + name = "Net-SSLeay-1.42"; src = fetchurl { - url = mirror://cpan/authors/id/F/FL/FLORA/Net-SSLeay-1.36.tar.gz; - sha256 = "1kjk5kdwsklchxrv21m4ii80akbxrg3i6y4zwfb91an5cdr8jqp2"; + url = "mirror://cpan/modules/by-module/Net/${name}.tar.gz"; + sha256 = "17gxf0d1l0qlxn0d6gqz1dlzl6cdqv0jg47k0h1fcs45rlcpgjmn"; }; - buildInputs = [pkgs.openssl]; + buildInputs = [ pkgs.openssl ]; OPENSSL_PREFIX = pkgs.openssl; - # Test perform network access - doCheck = false; + doCheck = false; # Test performs network access. }; NetTwitterLite = buildPerlPackage { @@ -2574,6 +2694,28 @@ rec { }; }; + Plack = buildPerlPackage rec { + name = "Plack-0.9984"; + src = fetchurl { + url = "mirror://cpan/authors/id/M/MI/MIYAGAWA/${name}.tar.gz"; + sha256 = "0xx200va9l6zimp2ybvbh1l3m80cdw03mfxqqf9k6v7cqvxir6pz"; + }; + buildInputs = [ TestRequires TestTCP HTTPRequestAsCGI ]; + propagatedBuildInputs = + [ LWP FileShareDir TryTiny DevelStackTrace DevelStackTraceAsHTML HTTPBody + HashMultiValue FilesysNotifySimple + ]; + }; + + PlackMiddlewareReverseProxy = buildPerlPackage rec { + name = "Plack-Middleware-ReverseProxy-0.10"; + src = fetchurl { + url = "mirror://cpan/modules/by-module/Plack/${name}.tar.gz"; + sha256 = "0w9bl1z71frra0dgz4gsxskvj1c8dhjkhrj2gqwdds6jcqyny7mf"; + }; + propagatedBuildInputs = [ Plack YAML ]; + }; + PPI = buildPerlPackage rec { name = "PPI-1.210"; src = fetchurl { @@ -2593,6 +2735,14 @@ rec { doCheck = false; }; + PSGI = buildPerlPackage rec { + name = "PSGI-1.03"; + src = fetchurl { + url = "mirror://cpan/authors/id/M/MI/MIYAGAWA/${name}.tar.gz"; + sha256 = "0b1k7smg50xfdhrjifa2gkkm52vna41alvbw8vb2pk99jmgnngh6"; + }; + }; + ModulePluggable = buildPerlPackage rec { name = "Module-Pluggable-3.9"; src = fetchurl { @@ -2809,6 +2959,17 @@ rec { ]; }; + Starman = buildPerlPackage rec { + name = "Starman-0.2014"; + src = fetchurl { + url = "mirror://cpan/modules/by-module/Plack/${name}.tar.gz"; + sha256 = "0hf3wpm2q4zcgjahjrpkkzy4fn74vkddg9yqs7p97xb290pvlbki"; + }; + buildInputs = [ TestRequires TestTCP ]; + propagatedBuildInputs = [ Plack DataDump HTTPParserXS NetServer ]; + doCheck = false; # binds to various TCP ports1 + }; + StatisticsDescriptive = buildPerlPackage rec { name = "Statistics-Descriptive-3.0202"; src = fetchurl { @@ -2977,6 +3138,15 @@ rec { buildInputs = [TestPodCoverage]; }; + TaskPlack = buildPerlPackage rec { + name = "Task-Plack-0.25"; + src = fetchurl { + url = "mirror://cpan/modules/by-module/Task/${name}.tar.gz"; + sha256 = "1mk3z7xis1akf8245qgw5mnnsl7570kdidx83nj81kv410pw2v43"; + }; + propagatedBuildInputs = [ Plack PSGI ]; + }; + TaskWeaken = buildPerlPackage { name = "Task-Weaken-1.02"; src = fetchurl { @@ -3162,14 +3332,6 @@ rec { }; }; - TestSimple = buildPerlPackage rec { - name = "Test-Simple-0.98"; - src = fetchurl { - url = "mirror://cpan/modules/by-module/Test/${name}.tar.gz"; - sha256 = "1a0jrl3n2g05qn6c79pv5bnc1wlq36qccwdgf1pjrrvmrgi07cig"; - }; - }; - TestScript = buildPerlPackage rec { name = "Test-Script-1.07"; src = fetchurl { @@ -3179,6 +3341,22 @@ rec { propagatedBuildInputs = [ProbePerl IPCRun3]; }; + TestSharedFork = buildPerlPackage rec { + name = "Test-SharedFork-0.18"; + src = fetchurl { + url = "mirror://cpan/modules/by-module/Test/${name}.tar.gz"; + sha256 = "1wc41jzi780w75m2ry1038mzxyz7386r8rmhbnmj3krcdxy676cc"; + }; + }; + + TestSimple = buildPerlPackage rec { + name = "Test-Simple-0.98"; + src = fetchurl { + url = "mirror://cpan/modules/by-module/Test/${name}.tar.gz"; + sha256 = "1a0jrl3n2g05qn6c79pv5bnc1wlq36qccwdgf1pjrrvmrgi07cig"; + }; + }; + TestSubCalls = buildPerlPackage rec { name = "Test-SubCalls-1.09"; src = fetchurl { @@ -3188,6 +3366,15 @@ rec { propagatedBuildInputs = [ HookLexWrap ]; }; + TestTCP = buildPerlPackage rec { + name = "Test-TCP-1.13"; + src = fetchurl { + url = "mirror://cpan/modules/by-module/Test/${name}.tar.gz"; + sha256 = "00vbkynkdflqgdvywdxzgg3yx1w7nfb68py8l3lglq9jq4pq9wbb"; + }; + propagatedBuildInputs = [ TestMore TestSharedFork ]; + }; + TestTester = buildPerlPackage { name = "Test-Tester-0.107"; src = fetchurl { @@ -3227,17 +3414,17 @@ rec { }; TestWWWMechanizeCatalyst = buildPerlPackage rec { - name = "Test-WWW-Mechanize-Catalyst-0.45"; + name = "Test-WWW-Mechanize-Catalyst-0.55"; src = fetchurl { - url = "mirror://cpan/authors/id/L/LB/LBROCARD/${name}.tar.gz"; - sha256 = "0hixz0hibv2z87kdqvrphzgww0xibgg56w7bh299dgw2739hy4yf"; + url = "mirror://cpan/modules/by-module/Test/${name}.tar.gz"; + sha256 = "0zdg4sxx231dj3qgbr58i63927gl4qzh0krignqxp8q6ck3hr63f"; }; - propagatedBuildInputs = [ - CatalystRuntime TestWWWMechanize WWWMechanize - CatalystPluginSessionStateCookie - ]; - buildInputs = [TestPod]; - doCheck = false; + propagatedBuildInputs = + [ CatalystRuntime TestWWWMechanize WWWMechanize + CatalystPluginSessionStateCookie HTMLForm + ]; + buildInputs = [ TestPod ]; + doCheck = false; # listens on an external port }; TextAligner = buildPerlPackage rec { @@ -3435,10 +3622,10 @@ rec { }; URI = buildPerlPackage rec { - name = "URI-1.51"; + name = "URI-1.59"; src = fetchurl { url = "mirror://cpan/authors/id/G/GA/GAAS/${name}.tar.gz"; - sha256 = "0gfdphz0yhm62vn9cbw720i6pm1gingcir15dq8ppbnk6cylnyal"; + sha256 = "1inanl9vs6q1bwvig1s8hdwagjw4484gs4s7pjnx5f4xb2dx526b"; }; }; From c286f9acb61f275e433b4177c221e66bf8ae7afb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?= Date: Fri, 7 Oct 2011 19:01:09 +0000 Subject: [PATCH 108/970] Making the nvidia installer install the file libcuda.so. 'boinc' wants this file. svn path=/nixpkgs/trunk/; revision=29711 --- pkgs/os-specific/linux/nvidia-x11/builder.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/os-specific/linux/nvidia-x11/builder.sh b/pkgs/os-specific/linux/nvidia-x11/builder.sh index 830745ea6b7..180eb84e5e4 100755 --- a/pkgs/os-specific/linux/nvidia-x11/builder.sh +++ b/pkgs/os-specific/linux/nvidia-x11/builder.sh @@ -39,6 +39,7 @@ installPhase() { ln -snf libnvidia-tls.so.$versionNumber $out/lib/tls/libnvidia-tls.so.1 ln -snf libXvMCNVIDIA.so.$versionNumber $out/lib/libXvMCNVIDIA_dynamic.so.1 ln -snf libcuda.so.$versionNumber $out/lib/libcuda.so.1 + ln -snf libcuda.so.1 $out/lib/libcuda.so ln -snf libvdpau_nvidia.so.$versionNumber $out/lib/libvdpau_nvidia.so patchelf --set-rpath $out/lib:$glPath $out/lib/libGL.so.*.* From 80d397413d2c6068227083e00a6643430a7d284c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?= Date: Fri, 7 Oct 2011 19:01:19 +0000 Subject: [PATCH 109/970] Boinc can even run, but only if placed in the proper (writeable) path. svn path=/nixpkgs/trunk/; revision=29712 --- .../science/misc/boinc/default.nix | 19 ++++++++++++++++--- 1 file changed, 16 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/science/misc/boinc/default.nix b/pkgs/applications/science/misc/boinc/default.nix index bd6e5b2a9f0..6dfcbb0656e 100644 --- a/pkgs/applications/science/misc/boinc/default.nix +++ b/pkgs/applications/science/misc/boinc/default.nix @@ -1,5 +1,6 @@ { fetchsvn, stdenv, autoconf, automake, pkgconfig, m4, curl, -mesa, libXmu, libXi, freeglut, libjpeg, libtool }: +mesa, libXmu, libXi, freeglut, libjpeg, libtool, wxGTK, +sqlite, gtk, patchelf, libXScrnSaver, libnotify, libX11 }: stdenv.mkDerivation rec { name = "boinc-6.13.6"; @@ -11,7 +12,7 @@ stdenv.mkDerivation rec { }; buildInputs = [ libtool automake autoconf m4 pkgconfig curl mesa libXmu libXi - freeglut libjpeg ]; + freeglut libjpeg wxGTK sqlite gtk libXScrnSaver libnotify patchelf libX11 ]; postConfigure = '' sed -i -e s,/etc,$out/etc, client/scripts/Makefile @@ -22,7 +23,19 @@ stdenv.mkDerivation rec { configureFlags="$configureFlags --sysconfdir=$out/etc" ''; - configureFlags = "--disable-server"; + enableParallelBuilding = true; + + configureFlags = "--disable-server --disable-fast-install"; + + postInstall = " + # Remove a leading rpath to /tmp/... I don't know how it got there + # I could not manage to get rid of that through autotools. + for a in $out/bin/*; do + RPATH=$(patchelf --print-rpath $a) + NEWRPATH=$(echo $RPATH | sed 's/^[^:]*://') + patchelf --set-rpath $out/lib:$NEWRPATH $a + done + "; meta = { description = "Free software for distributed and grid computing"; From c67c7d49b0028abe3978be7d886044af6896d6aa Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?= Date: Fri, 7 Oct 2011 19:01:27 +0000 Subject: [PATCH 110/970] Boinc wanted to be told to link to libX11 svn path=/nixpkgs/trunk/; revision=29713 --- pkgs/applications/science/misc/boinc/default.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/applications/science/misc/boinc/default.nix b/pkgs/applications/science/misc/boinc/default.nix index 6dfcbb0656e..460355b274f 100644 --- a/pkgs/applications/science/misc/boinc/default.nix +++ b/pkgs/applications/science/misc/boinc/default.nix @@ -18,6 +18,8 @@ stdenv.mkDerivation rec { sed -i -e s,/etc,$out/etc, client/scripts/Makefile ''; + NIX_LDFLAGS = "-lX11"; + preConfigure = '' ./_autosetup configureFlags="$configureFlags --sysconfdir=$out/etc" From 7e3c1b357bbfe6293c2577db341db2d22d185882 Mon Sep 17 00:00:00 2001 From: "Yury G. Kudryashov" Date: Fri, 7 Oct 2011 20:46:21 +0000 Subject: [PATCH 111/970] Drop kde3.kdebase Hydra fails to build it for a while, and nobody noticed. svn path=/nixpkgs/trunk/; revision=29714 --- pkgs/desktops/kde-3/kdebase/default.nix | 57 ------------------------- pkgs/top-level/all-packages.nix | 6 --- 2 files changed, 63 deletions(-) delete mode 100644 pkgs/desktops/kde-3/kdebase/default.nix diff --git a/pkgs/desktops/kde-3/kdebase/default.nix b/pkgs/desktops/kde-3/kdebase/default.nix deleted file mode 100644 index 6a6a1ea4a1e..00000000000 --- a/pkgs/desktops/kde-3/kdebase/default.nix +++ /dev/null @@ -1,57 +0,0 @@ -{ stdenv, fetchurl, pkgconfig, x11, xlibs, zlib, libpng, libjpeg, perl -, qt, kdelibs, openssl, bzip2, fontconfig, pam, hal, dbus, glib -}: - -# Note: the glib dependency is needed for nspluginviewer. - -let version = "3.5.10"; in - -stdenv.mkDerivation { - name = "kdebase-${version}"; - - src = fetchurl { - url = "mirror://kde/stable/${version}/src/kdebase-${version}.tar.bz2"; - sha256 = "0qbbw78b725kf35p5jx11zq0246zm15pyyhmlpkz4cn5527rvakp"; - }; - - buildInputs = [ - pkgconfig x11 zlib libpng libjpeg perl qt kdelibs openssl bzip2 - fontconfig pam hal dbus glib - xlibs.libXrandr xlibs.libXinerama xlibs.libXau xlibs.libXdmcp - xlibs.libXcursor xlibs.libfontenc xlibs.imake xlibs.bdftopcf - xlibs.libxkbfile xlibs.xf86miscproto xlibs.libXxf86misc - xlibs.scrnsaverproto xlibs.libXScrnSaver - xlibs.libXcomposite xlibs.libXfixes - ]; - - configureFlags = '' - --without-arts - --with-ssl-dir=${openssl} - --with-extra-includes=${libjpeg}/include - ''; - - # Prevent configure from looking for pkg-config and freetype-config - # in the wrong location (it looks in /usr/bin etc. *before* looking - # in $PATH). - preConfigure = '' - substituteInPlace configure \ - --replace /usr/bin /no-such-path \ - --replace /usr/local/bin /no-such-path \ - --replace /opt/local/bin /no-such-path - ''; - - # Quick hack to work around a faulty dependency in - # konqueror/keditbookmarks/Makefile.am (${includedir} should be - # ${kdelibs} or so). - preBuild = '' - ensureDir $out/include - ln -s ${kdelibs}/include/kbookmarknotifier.h $out/include/ - ''; - - postInstall = "rm $out/include/kbookmarknotifier.h"; - - # Work around some inexplicable build failure starting in kdebase 3.5.9. - LDFLAGS = "-L${kdelibs}/lib"; - - meta.platforms = stdenv.lib.platforms.linux; -} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index f927dec6d98..efe6f70887b 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -7867,12 +7867,6 @@ let qt = qt3; }; - kdebase = callPackage ../desktops/kde-3/kdebase { - stdenv = overrideGCC stdenv gcc43; - inherit (kde3) kdelibs; - qt = qt3; - }; - arts = callPackage ../development/libraries/arts { qt = qt3; inherit (gnome) glib; From c7d6b6028725d045350a721acd48cc3c2ba5020a Mon Sep 17 00:00:00 2001 From: "Yury G. Kudryashov" Date: Fri, 7 Oct 2011 20:46:29 +0000 Subject: [PATCH 112/970] Drop kde3.kile Use kde4.kile instead svn path=/nixpkgs/trunk/; revision=29715 --- pkgs/applications/editors/kile/2.0.nix | 22 ------------------- .../editors/kile/{2.1.nix => default.nix} | 0 pkgs/top-level/all-packages.nix | 7 +----- 3 files changed, 1 insertion(+), 28 deletions(-) delete mode 100644 pkgs/applications/editors/kile/2.0.nix rename pkgs/applications/editors/kile/{2.1.nix => default.nix} (100%) diff --git a/pkgs/applications/editors/kile/2.0.nix b/pkgs/applications/editors/kile/2.0.nix deleted file mode 100644 index 704b8e1b824..00000000000 --- a/pkgs/applications/editors/kile/2.0.nix +++ /dev/null @@ -1,22 +0,0 @@ -{stdenv, fetchurl, perl, arts, qt, kdelibs, - libX11, libXt, libXext, libXrender, libXft, - zlib, libpng, libjpeg, freetype, expat }: - -stdenv.mkDerivation { - name = "kile-2.0.3"; - - src = fetchurl { - url = mirror://sourceforge/kile/kile-2.0.3.tar.bz2; - md5 = "f0296547d3e916dd385e0b8913918852"; - }; - - buildInputs = [ perl arts qt kdelibs libX11 libXt libXext libXrender libXft - zlib libpng libjpeg freetype expat ]; - - meta = { - description = "An integrated LaTeX editor for KDE"; - homepage = http://kile.sourceforge.net; - license = "GPLv2"; - platforms = stdenv.lib.platforms.linux; - }; -} diff --git a/pkgs/applications/editors/kile/2.1.nix b/pkgs/applications/editors/kile/default.nix similarity index 100% rename from pkgs/applications/editors/kile/2.1.nix rename to pkgs/applications/editors/kile/default.nix diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index efe6f70887b..1ed9c99fbde 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -7882,11 +7882,6 @@ let inherit (kde3) kdelibs; }; - kile = callPackage ../applications/editors/kile/2.0.nix { - inherit (kde3) arts kdelibs; - qt = qt3; - }; - kphone = callPackage ../applications/networking/kphone { qt = qt3; stdenv = overrideGCC stdenv gcc42; # I'm to lazy to clean up header files @@ -7949,7 +7944,7 @@ let kdiff3 = callPackage ../tools/text/kdiff3 { }; - kile = callPackage ../applications/editors/kile/2.1.nix { }; + kile = callPackage ../applications/editors/kile { }; kmplayer = callPackage ../applications/video/kmplayer { inherit (pkgs.gtkLibs) pango; From 1ef1f01e13cd79e1dc4424db7e50b27250a5d80a Mon Sep 17 00:00:00 2001 From: "Yury G. Kudryashov" Date: Sat, 8 Oct 2011 11:53:18 +0000 Subject: [PATCH 113/970] Remove thunderbird2/3 from release.nix svn path=/nixpkgs/trunk/; revision=29716 --- pkgs/top-level/release.nix | 2 -- 1 file changed, 2 deletions(-) diff --git a/pkgs/top-level/release.nix b/pkgs/top-level/release.nix index 09be02ba915..d4a50a32371 100644 --- a/pkgs/top-level/release.nix +++ b/pkgs/top-level/release.nix @@ -301,8 +301,6 @@ with (import ./release-lib.nix); texLiveBeamer = linux; texLiveExtra = linux; texinfo = all; - thunderbird2 = linux; - thunderbird3 = linux; tightvnc = linux; time = linux; tinycc = ["i686-linux"]; From bc0b96370f623a81779b1d5c7dcf4461eb04138e Mon Sep 17 00:00:00 2001 From: "Yury G. Kudryashov" Date: Sat, 8 Oct 2011 11:59:24 +0000 Subject: [PATCH 114/970] KDE-4.7.2 mass update Regenerate manifests+update oxygen-icons hash; kde-wallpapers hash remains the same. svn path=/nixpkgs/trunk/; revision=29717 --- pkgs/desktops/kde-4.7/default.nix | 2 +- pkgs/desktops/kde-4.7/kde-package/4.7.1.nix | 273 ------------------ pkgs/desktops/kde-4.7/kde-package/4.7.2.nix | 273 ++++++++++++++++++ pkgs/desktops/kde-4.7/l10n/manifest-4.7.0.nix | 262 ----------------- pkgs/desktops/kde-4.7/l10n/manifest-4.7.1.nix | 262 ----------------- pkgs/desktops/kde-4.7/l10n/manifest-4.7.2.nix | 262 +++++++++++++++++ pkgs/desktops/kde-4.7/oxygen-icons.nix | 2 +- 7 files changed, 537 insertions(+), 799 deletions(-) delete mode 100644 pkgs/desktops/kde-4.7/kde-package/4.7.1.nix create mode 100644 pkgs/desktops/kde-4.7/kde-package/4.7.2.nix delete mode 100644 pkgs/desktops/kde-4.7/l10n/manifest-4.7.0.nix delete mode 100644 pkgs/desktops/kde-4.7/l10n/manifest-4.7.1.nix create mode 100644 pkgs/desktops/kde-4.7/l10n/manifest-4.7.2.nix diff --git a/pkgs/desktops/kde-4.7/default.nix b/pkgs/desktops/kde-4.7/default.nix index 0e2377f2535..aeb62fc0740 100644 --- a/pkgs/desktops/kde-4.7/default.nix +++ b/pkgs/desktops/kde-4.7/default.nix @@ -1,7 +1,7 @@ { callPackage, callPackageOrig, stdenv, qt47 }: let - release = "4.7.1"; + release = "4.7.2"; # Need callPackageOrig to avoid infinite cycle kde = callPackageOrig ./kde-package { diff --git a/pkgs/desktops/kde-4.7/kde-package/4.7.1.nix b/pkgs/desktops/kde-4.7/kde-package/4.7.1.nix deleted file mode 100644 index 43de59d7a2e..00000000000 --- a/pkgs/desktops/kde-4.7/kde-package/4.7.1.nix +++ /dev/null @@ -1,273 +0,0 @@ -{stable=true; -hashes=builtins.listToAttrs[ - {name="blinken";value="0946y6g67bqbkdcnqas97izr514190f08qzq5jg12xjv3q5i9xnr";} - {name="cantor";value="1yipf6019nr1vacdl1mp6wwffwaq7khyh1rp5wx0f3y70p7q6w8v";} - {name="gwenview";value="00vxhpg2481pz7bh0kac1fsl8dawjlxm7x38y572802qbhd02jr4";} - {name="kalgebra";value="1rkl8jyiqi9ymwl4inflgwg2252k5x5yag25zr8crwg1ax9rvmhv";} - {name="kalzium";value="110l065vwjfyjr0130xklrsr3jwlqb27fv9mhc9w5v9i5shl79xm";} - {name="kamera";value="17sac0bydq4d2rv63jzjy87dry9g3n6chw7gg6nncisvkgz1dyz2";} - {name="kanagram";value="10nhgb1gf5vh6767xrbfwicdhw4kd3za4lnwrsww823dqpi6cryz";} - {name="kate";value="1n3zs4rs3y4z9g2ssiqi6jy7c2li0pah2p0vsdjw0ifq0xqvvz67";} - {name="kbruch";value="0x3y5gbq4xhqjrp4g91v3wjggrimxx6k8nsvny0ykriqql6xzq77";} - {name="kcolorchooser";value="1fwjf0fys3iz4c86jfhzq6j43ps7jiab9qhspkv6cvnv1dyi0ryy";} - {name="kdeaccessibility";value="1980y2vqxkhz40xkkljqawkafshhrimlyb7hvk5waz9a2jz0vwwj";} - {name="kdeadmin";value="1614acnvycihysxy3k26q8xsxswsx73m32n0c34hb0d5xj87ndk0";} - {name="kdeartwork";value="0xsmq5x9lbplj3rxza0lxxdbnz5srmxjzw993rzwj9687jvgi6hv";} - {name="kde-baseapps";value="1jpfslapsl4l7yqxq4cry0dwj2hps2s6kayj81dcs2crqrz75plc";} - {name="kdegames";value="0b3zljmkhyml31kfj9n75sa9h3xknn8v0y099mdc1wcny7p7zyrl";} - {name="kdegraphics-strigi-analyzer";value="1xnaipyn29wa5i26rgv2jbijii64qklz5fgcy49zpd0pxqnkxxwl";} - {name="kdegraphics-thumbnailers";value="07nvydwzzwnr1a5x3v732mry1qw7lvn8l3h3b73r6fvmnhs91iyp";} - {name="kdelibs";value="1gwgilr2m95m8w4q55d79g3qsgpq5jv7aq7crq7xbrhz3smv6ciw";} - {name="kdemultimedia";value="1p76vrzr1wmlpnkspy9nf8v1am6bdi5wc6zl4y9lp6y6qv9diz1w";} - {name="kdenetwork";value="1hmcljp8d85zyi55314js7jl5ihf060hji5gcm6s4s95xqg7hwvh";} - {name="kdepim";value="09lvdpq8nm9b97g0xlmc2ikklq7pc4c61v9lz53mb8c1hi9yxasd";} - {name="kdepimlibs";value="0svj7fqkn3g8ryip9qy4rh0j7xnjgwhv45rbz4s6lsjh81ipnc4j";} - {name="kdepim-runtime";value="0iy0sph5cvzmyn2gi0had5xhppdxdhs5dqm7lm79lk27i8913sjk";} - {name="kdeplasma-addons";value="1xrdqhaklf2l5043l1qhfjqyr6985m5j1jzd8rgabkwa9dv5bb4c";} - {name="kde-runtime";value="1qppx56xdrmapl0l0fv2p502yg470hiwhzdjv5kiw0akwl7g2ll5";} - {name="kdesdk";value="0db4kiikf0bl07m09cj01id0ivl1hm30pr5401xscqask7ddq2v9";} - {name="kdetoys";value="02zjz6h62nlxhjhsv5apxyhs140h6dc5i5laxi68j8fi4p8gyk5a";} - {name="kdeutils";value="0s7lw9qiyzn4wccbgalrsb91hspqniaf93x94s3gcw7jmk4znwwd";} - {name="kde-wallpapers";value="17x3npychdv9z90a6y2yxxscnczrpzkd8zanml3y1kkx1kcwvkrv";} - {name="kdewebdev";value="0ll5s60231vc6k989ahfw7k9wk0r6ml3icg25zj90785ildqqrnz";} - {name="kde-workspace";value="15kvc30w4ysjm7il7lkfls3xm9v4azhlz2jv75n5bp5h41kbznl5";} - {name="kgamma";value="1fzhhjqz6x19lk6c77mmq94bjk5f8qj0pq9c7923gd9d644azbsc";} - {name="kgeography";value="0s9nnsjma95j402wlcswrqdjz9csxbnxpnshcg5xxj3135122yv6";} - {name="khangman";value="04frra3qj4jkmhlsr4im6sjhyv7rs32fj88vphzwx0nbq086i078";} - {name="kig";value="1si3zi3w75mg9sd2imbs6f2z0ywkzbvg9cj672fmamczw5wrjp6n";} - {name="kimono";value="1bqw23g6c1l3bxnnzgz4pn5j2w2vxwfi1nrdjcbkfwsa4px2q7bn";} - {name="kiten";value="0i3dp8jqqjlx2hjbqwc01qaja9bh7aas0m4s75py5j2im7gkxncs";} - {name="klettres";value="1mxpxh4p16jnxmd2gff4ink222hbd1qxigr3hn8jc3a0kwrnpxdk";} - {name="kmplot";value="1adw71m9h6z85lwavsjsbdcnlgkchic6y5110hmb9x067n5hrfkq";} - {name="kolourpaint";value="01lc73vvpl5jmzvx9vi857k69mww97rd7fnqm2776d7dbkgpzzs8";} - {name="konsole";value="0ywy8xy38v058hfl6yakxqz355y64mmqbhxf0j1h0zz50744ww1r";} - {name="korundum";value="1ib02m2dr9ab1v1xxcngdisprr7mlll3h52d9lrjj6clnxlxz1sz";} - {name="kross-interpreters";value="1glb2hkj84zmcjjq3sh79w7g4y0v25ddd9hjiilppskwnqby16bb";} - {name="kruler";value="18h5kp7pni6j9nqfxzwfcfnv8sbgg1s656clzyi7f9znsw8bgzvd";} - {name="ksaneplugin";value="0mk7q66h6v5carkywkpjr5893r01vgcqf0lx9c1fq7n0mn22zl9s";} - {name="ksnapshot";value="0wf1bwkrhp714fhhh3y82p35rxk7prwqsn89nsl7rj3l7gryismp";} - {name="kstars";value="0bbnf8vnhinmgb03dab7ji2rpb3k2d901nm5r11lxwjdv58d4vkn";} - {name="ktouch";value="1b354imxnfv4yklzh0xd358gydczmlijkkjm2ks04111895h97b1";} - {name="kturtle";value="147sn2lrzxgfwiqxziymjvvy67sgwmdfcrgqvv93rmp5r9y3zmiy";} - {name="kwordquiz";value="1a2vifgixn6zgrp4nm5lvq41v24xp4nbnv8a7c9p53chx3y8i2px";} - {name="libkdcraw";value="1h49g41c2sxxzx6w865k2ljiqlgill7imh1pnkw1wsfwk4ii9msz";} - {name="libkdeedu";value="058gidzzda4ca4h2125ja17gdfq52zqdh70c22f6p4ph47qw503m";} - {name="libkexiv2";value="0vkl2gnp7saw26crj2hbg953knrv3v1pjd9c5d29vckdn5q417zr";} - {name="libkipi";value="00wnm45v65my7dp7g3sri54prjk1mkqi4nqf3f5xisnshi3vzr5f";} - {name="libksane";value="1w0d164lnc576irrxfi1f6rzv85wn5gawqp92yg8zqhna1zxjhzp";} - {name="marble";value="1964ix9dcssw4bny944rdwhxifnj5ay6nmbhvbvwq1d77ckzz9sf";} - {name="mobipocket";value="1npmbkvrg1kil6sh91m79kavfrivkk3jpb0c0spm0s93b85pgvky";} - {name="okular";value="0fw49r0hskhscml18715yqxxwrzigrx0rkhcljgckss7bksyfsfn";} - {name="oxygen-icons";value="1gwpsh7iwmzl1n9wzp8q95jlimbmygcrqwkzzp9jwsyfl9qn86y5";} - {name="parley";value="0c8k3sxpzxnaldvyskfp86cnhrzabq8alkv32ikr3y948ib9q31m";} - {name="perlkde";value="01ysn4bq5zjc0b8gqyinx08scimiix505zvdw13a9axfb4vnk05j";} - {name="perlqt";value="067hj2fw2jvd6d0ywdmq6y630ygm6xjrvkrnhm3czqxpfs6hp2mk";} - {name="pykde4";value="106kjcbg2gpgj7kypg79yjb2b3jbcc8zfslc65vkb32ivipk0j16";} - {name="qtruby";value="1dp3zdh5m3yp55r7pwxi4nqfjsfv84qcg9n5msp7lw78k04xidg7";} - {name="qyoto";value="1kynbz0gpjbq5xdpfv1by39cxji1z3wisv8c6bgxz7yknqp16qix";} - {name="rocs";value="1mlvw0fb83f0vjdf0amlx92w2fvjl79rcvhlv267vsw0idd3vp2g";} - {name="smokegen";value="1j0apyqv17fycysfjc0mf4rhq2g6zwn9fz7dsib1hylza813smxr";} - {name="smokekde";value="1zgf2pcxwxzhjhab46q2ir1ys4mq2xf9ais9473xc6xjvrbg74dd";} - {name="smokeqt";value="19xfpm9as6sbsfjsn8qiqnlfsqwpri56886kl9kp7qhr6dga54ma";} - {name="step";value="1819shriclbp1ny28gjik1mg1c3mvm4drk0c84zcq2vj6dz2fp61";} - {name="svgpart";value="1wcjbhl608y7a0rzwziaja7zi1kjixcnmwaik5xyss2hmx59m934";} -]; -modules=[ -{ - module="kdegraphics"; - split=true; - pkgs=[ - { name="gwenview"; } - { name="kamera"; } - { name="kcolorchooser"; } - { name="kdegraphics-strigi-analyzer"; sane="kdegraphics_strigi_analyzer"; } - { name="kdegraphics-thumbnailers"; sane="kdegraphics_thumbnailers"; } - { name="kgamma"; } - { name="kolourpaint"; } - { name="kruler"; } - { name="ksaneplugin"; } - { name="ksnapshot"; } - { name="libkdcraw"; } - { name="libkexiv2"; } - { name="libkipi"; } - { name="libksane"; } - { name="mobipocket"; } - { name="okular"; } - { name="svgpart"; } - ]; -} -{ - module="kdeedu"; - split=true; - pkgs=[ - { name="blinken"; } - { name="cantor"; } - { name="kalgebra"; } - { name="kalzium"; } - { name="kanagram"; } - { name="kbruch"; } - { name="kgeography"; } - { name="khangman"; } - { name="kig"; } - { name="kiten"; } - { name="klettres"; } - { name="kmplot"; } - { name="kstars"; } - { name="ktouch"; } - { name="kturtle"; } - { name="kwordquiz"; } - { name="libkdeedu"; } - { name="marble"; } - { name="parley"; } - { name="rocs"; } - { name="step"; } - ]; -} -{ - module="kdebindings"; - split=true; - pkgs=[ - { name="kimono"; } - { name="korundum"; } - { name="kross-interpreters"; sane="kross_interpreters"; } - { name="perlkde"; } - { name="perlqt"; } - { name="pykde4"; } - { name="qtruby"; } - { name="qyoto"; } - { name="smokegen"; } - { name="smokekde"; } - { name="smokeqt"; } - ]; -} -{ - module="kde-baseapps"; -sane="kde_baseapps"; split=true; - pkgs=[ - { name="kate"; } - { name="kde-baseapps"; sane="kde_baseapps"; } - { name="konsole"; } - ]; -} -{ module="kdeaccessibility"; split=false; - pkgs=[ - { name="kaccessible"; } - { name="kmag"; } - { name="kmouth"; } - { name="kmousetool"; } - { name="jovie"; } - ]; - -} -{ module="kdeadmin"; split=false; - pkgs=[ - { name="strigi-analyzer"; sane="strigi_analyzer";} - { name="kuser"; } - { name="kcron"; } - { name="ksystemlog"; } - { name="system-config-printer-kde"; sane="system_config_printer_kde";} - ]; - -} -{ module="kdeartwork"; split=false; - pkgs=[ - { name="ColorSchemes"; } - { name="IconThemes"; } - { name="emoticons"; } - { name="kscreensaver"; } - { name="kwin-styles"; sane="kwin_styles";} - { name="sounds"; } - { name="styles"; } - { name="wallpapers"; } - { name="HighResolutionWallpapers"; } - { name="WeatherWallpapers"; } - { name="desktopthemes"; } - { name="aurorae"; } - ]; - -} -{ module="kdegames"; split=false;} -{ module="kdelibs"; split=false;} -{ module="kdemultimedia"; split=false;} -{ module="kdenetwork"; split=false; - pkgs=[ - { name="kfile-plugins"; sane="kfile_plugins";} - { name="kget"; } - { name="kopete"; } - { name="krdc"; } - { name="kppp"; } - { name="krfb"; } - { name="kdnssd"; } - { name="filesharing"; } - ]; - -} -{ module="kdepim"; split=false;} -{ module="kdepimlibs"; split=false;} -{ module="kdepim-runtime"; sane="kdepim_runtime"; split=false;} -{ module="kdeplasma-addons"; sane="kdeplasma_addons"; split=false;} -{ module="kde-runtime"; sane="kde_runtime"; split=false;} -{ module="kdesdk"; split=false; - pkgs=[ - { name="cervisia"; } - { name="lokalize"; } - { name="kdeaccounts-plugin"; sane="kdeaccounts_plugin";} - { name="dolphin-plugins-svn"; sane="dolphin_plugins_svn";subdir="dolphin-plugins/svn"; } - { name="dolphin-plugins-git"; sane="dolphin_plugins_git";subdir="dolphin-plugins/git"; } - { name="kcachegrind"; } - { name="kapptemplate"; } - { name="kpartloader"; } - { name="strigi-analyzer"; sane="strigi_analyzer";} - { name="kioslave"; } - { name="okteta"; } - { name="kmtrace"; } - { name="kompare"; } - { name="kprofilemethod"; } - { name="kstartperf"; } - { name="kuiviewer"; } - { name="poxml"; } - { name="scripts"; } - { name="umbrello"; } - ]; - -} -{ module="kdetoys"; split=false; - pkgs=[ - { name="kteatime"; } - { name="ktux"; } - { name="amor"; } - ]; - -} -{ module="kdeutils"; split=false; - pkgs=[ - { name="ark"; } - { name="kcalc"; } - { name="kremotecontrol"; } - { name="kdf"; } - { name="kfloppy"; } - { name="printer-applet"; sane="printer_applet";} - { name="filelight"; } - { name="kcharselect"; } - { name="kgpg"; } - { name="ktimer"; } - { name="kwallet"; } - { name="sweeper"; } - { name="superkaramba"; } - ]; - -} -{ module="kde-wallpapers"; sane="kde_wallpapers"; split=false;} -{ module="kdewebdev"; split=false; - pkgs=[ - { name="klinkstatus"; } - { name="kfilereplace"; } - { name="kimagemapeditor"; } - { name="kommander"; } - ]; - -} -{ module="kde-workspace"; sane="kde_workspace"; split=false;} -{ module="oxygen-icons"; sane="oxygen_icons"; split=false;} -]; -} diff --git a/pkgs/desktops/kde-4.7/kde-package/4.7.2.nix b/pkgs/desktops/kde-4.7/kde-package/4.7.2.nix new file mode 100644 index 00000000000..dafde475b24 --- /dev/null +++ b/pkgs/desktops/kde-4.7/kde-package/4.7.2.nix @@ -0,0 +1,273 @@ +{stable=true; +hashes=builtins.listToAttrs[ + {name="blinken";value="0597y7xf6908i03mzrc4k6pfjc9fzlxc1d72rg8153j9183yadr1";} + {name="cantor";value="13cxw0iq0radipd75yl5pjs0qq3px9khjnphrwcq86ss9jivv70y";} + {name="gwenview";value="0zngbigs8g75wwfrhi5f64pxpg77fggd2d54ly4mh3kr1h79ndxs";} + {name="kalgebra";value="1dqiavpc91sk8418ahvv4knim0k0ifs1yj2c9bng4aq46kmi7wl5";} + {name="kalzium";value="0aysmjnm9iy20prx0q294szp0f9ghmj2mbcix7ds8977l630pkhm";} + {name="kamera";value="1kbfhfr3l7iffv4lb8fzik8zdx9kqskpalzr76i7awdba0qqx37n";} + {name="kanagram";value="16f37j66lpyg96f3clrh856fl4chlpmxlg3pqjp6lfad47b1191r";} + {name="kate";value="1qhvchk1kvs4a9hsd2zxfvn6hrnn883ic8ba6pvwnzvqpdaqijq4";} + {name="kbruch";value="0hxcdwyybwsxg07vl83hypn8xzpnn5747zapwv2sg2hxwkccw4sj";} + {name="kcolorchooser";value="0hp849nb3hhn48d49kdbl8b95d1l5ychgc6qwfn9nvrvhazgs51q";} + {name="kdeaccessibility";value="179k9wmy5j0iig3n0xlzpry7j0li6bv7q1wpqra5hsmlk3ns440s";} + {name="kdeadmin";value="0mycw08xw2gbqd09mz6vxwhpxmn6c2isch4kaisha61zz8rm827p";} + {name="kdeartwork";value="0cq75mz1s6qbaargdpk435bnllvk6a33zspplw33y9q4l3xyih74";} + {name="kde-baseapps";value="1yhbfr1nrdkyklyayvbfdbm1jhdyvkgic9dx1dxpbjfgv552h10i";} + {name="kdegames";value="046kk60y7ajv4vagffhnc6jpslmggs1700ds4xl5ina2vhazwl31";} + {name="kdegraphics-strigi-analyzer";value="029zw71xc2r3g5d58yv09vzwyv7zd9r87vs1sqpa8jglpysaml9j";} + {name="kdegraphics-thumbnailers";value="0sp44m3nn2vv926h91f13kar2zi30l1y445jcdinlpckbzkgyyc8";} + {name="kdelibs";value="0f4b7ycs79qx360mhwf1jsbcawhp0sp76pbk46d20g0ms8rhp9xz";} + {name="kdemultimedia";value="0078gfx96bqzj26lwyz6jpln07963v4w8qqxg5wc53sd3w8f39m5";} + {name="kdenetwork";value="0vy3ygqszy8ishb4sbipvil148yhv73r8mbj6p10lqnrrah0c5n6";} + {name="kdepim";value="0c36q3z1krwpzx2naj1gqirvsvl5sadh0an9csa2159vqyzxld8n";} + {name="kdepimlibs";value="016jazpgnpzcvxvzn43fl5ihw13ckq16ggb97fzmpahkrh01yyc2";} + {name="kdepim-runtime";value="00a89zzqh7005ig4lxz1fypdb0hmxwibs78yk0fyr5qdjdd3i90k";} + {name="kdeplasma-addons";value="0cf93s7g3zbrdmkwia0djj7x5qas2q77vgajpab8cwj3r6cnm5bi";} + {name="kde-runtime";value="0b8sq97xi0mh0iiwzrfzar3kv2dsiljq3c2bbxgvwlf942g7w5j6";} + {name="kdesdk";value="1gi0p4xgyaflkwyv8fmcjfsc6gav83k78ib8awy42cwn8bwpsdy9";} + {name="kdetoys";value="0sd9p4rldz07w6sbwsx5b1iwgpljhkycphlnj698qll2dqrjm6b1";} + {name="kdeutils";value="15igw1jnvzdr1jf6jbip1xw5lj5kpk6ffgp6wmnlyssmqj7i7snd";} + {name="kde-wallpapers";value="0hcgjrqdj1lvgy098lglca1mi77gdg4332hp494klwvmhny1j0li";} + {name="kdewebdev";value="0g4fw17pivck9av8xd6dij6q70vr4zjbr2cpngrm0nmzyl5xiky7";} + {name="kde-workspace";value="1c4y7wnizj7b9nq97yypi80ylsli7pny5pzdr477015dh1kls5va";} + {name="kgamma";value="14p5xwdlyg8za1rwp809axfnybgm0dxhxhpfr97gslqqsnncfq74";} + {name="kgeography";value="114m0bs18bjl0f1rvp2v0w6wi0zkw1qk9dy5z8axk5q8dykhxdxs";} + {name="khangman";value="07rsfx6lmhfvbm46bzl01cg3l6rbib3phwnf5xdq1b6rifw5d5ks";} + {name="kig";value="0264vyq18rx16nq62vqk1g5ip5i7gnpy9x6z6f6p6vdqfb1bankn";} + {name="kimono";value="1pkzr2d6axwrbf7n10d48fmkxa1l7i79nf39p12abkh5gy5k6rbn";} + {name="kiten";value="0clbfp5n5mvkps6f4c9jx4bfb367c3461sy6yrl35q32j2s0d7dh";} + {name="klettres";value="16ywszx3nr6lszdx6sj0cc5nv92db1j7wxn8np24ijvhvvf2qv6c";} + {name="kmplot";value="0y7zs9zacx73hbxab2w15h1rpvdsqcncpn80qkhgfg7kiw1mgnvy";} + {name="kolourpaint";value="1s2zhw4mc2pq1bzbgkd37iswz8bar38vhvind7xl14n7fmh1a456";} + {name="konsole";value="0f3dwwfcrqa0qyqhjzl7r0v5yc91j018gxbyka0633r5v657yp2a";} + {name="korundum";value="1d94rlaj89yshvywv3nwvbg7yjdysmxxv9zi4q4lfa8f210pay6b";} + {name="kross-interpreters";value="0d3gjj1mj8nzawdcn5g60khmzh8k9jxn8invzy9xcdywdbpdyda2";} + {name="kruler";value="1gb7p0b6zbcq2kjf74rcblxjyzn6ffy4pp4mfhynhcnh2fv0nniw";} + {name="ksaneplugin";value="04lzyibnxmskszrb6f3k85lxc8ifrlwy71pqy080bfxsmw6avsra";} + {name="ksnapshot";value="0rvz9vr2xaq7ixf0rm7snlhkam9cga0w10vmglsrylwi2cch1j59";} + {name="kstars";value="13xdbigh7rjcy9ycywz5h3r3q918yqsjdwf4b56w63bi89bf69yx";} + {name="ktouch";value="0xxzw58v6395vqs45n2d8865ixyjpqzjna2ahw8j0hv997x4cmc4";} + {name="kturtle";value="18hcy1zwyi1s90ypm2sh3s6myqz5hkrsjgyyiabk44rw8ikgsa8a";} + {name="kwordquiz";value="1zl21d58z8qrrs898czba902rzvz0xr9ndm1dychnrwmbzm5rjj8";} + {name="libkdcraw";value="0lzia65czgrqkl31sfzpnvpzqhrm01zx6vxr3fx0ckmz35rmy5sk";} + {name="libkdeedu";value="1bj1f92b408ccf55icsvk0yssp7ilsglcz0k1j5z1bc9lzmdfn3h";} + {name="libkexiv2";value="0wfzskm6c96cf7k6f29spxy1x2p15wkmn3r4n3qpxlc8wk4psrg1";} + {name="libkipi";value="0nf9cx0p2allmhfbl2yab5xi6mrc9gqkfmndfjdd271bwrgy4w1y";} + {name="libksane";value="0zaygvwxxs2i2jprkn6l7mmr5563523xgv19h7chfqbwg4r3y6yc";} + {name="marble";value="1i1k2shnzkr0dddd7f6l6xxfhgn0dvvx3bqk596avzpn4bsxinfr";} + {name="mobipocket";value="0j9saz9chk2v2jcpiyv3b43z8hpdf4npxfnjqhahqq71pv13fzyi";} + {name="okular";value="1qalyxr3cc78yk18601l1z4sflw5bg96jy1c1pkg79zjcdrb1n7x";} + {name="oxygen-icons";value="0814knrcisp0mpcr9fcmmbpf140s8jbdrrzw4k3rnk81vffh8w8y";} + {name="parley";value="10wkkv3fknbv7d56rnfz1vzs3npyfa9c4b7bmaqzj0399p7l1k65";} + {name="perlkde";value="1za9gvh8pvdb9wp79cf9sv1f6hn8is7nq4is9qh46k56z2pgzp92";} + {name="perlqt";value="1xindf7sb22wisvcqrfgjb6kjcx4vhapijjgkf2j9xyjlx4fiafa";} + {name="pykde4";value="1qap0n4kd247nl5bn9l1015ajpmbzwafqznf8a3i36f77yg1misf";} + {name="qtruby";value="1p1f1qkfzr5kl88pgb90slm27vi1yjxxbi62rph0qdkp9crhvgn4";} + {name="qyoto";value="1yb99hqqsrw28nf2zhaq6v3aw67qvl83jylgr47rczixdgazzqg0";} + {name="rocs";value="1lzkvww0ygq6cl6qzsnmbblbnp4lxhzvc8kiapn7ydcyas7sy21z";} + {name="smokegen";value="0yb8w6n8dyivcq97xkqxws60zqzqzh6babml1g022yb35ka4f2dk";} + {name="smokekde";value="1zqm1gxbdpvccx777v2vy200n314nrvslabf2mb1y61dxqwkvkmi";} + {name="smokeqt";value="0qhksy9z03kfmgbgvnch4vxbxyzcng0f7cy337s50cnh4rabl017";} + {name="step";value="01hdl1z7sd2a5sgx1n96anbwsvs6dmd3r4q8dpn5ha657xc38qy1";} + {name="svgpart";value="05199j918xk16bq5mmqdc2w3agrknngxsrk5gxas6rflhg8v4qz3";} +]; +modules=[ +{ + module="kdegraphics"; + split=true; + pkgs=[ + { name="gwenview"; } + { name="kamera"; } + { name="kcolorchooser"; } + { name="kdegraphics-strigi-analyzer"; sane="kdegraphics_strigi_analyzer"; } + { name="kdegraphics-thumbnailers"; sane="kdegraphics_thumbnailers"; } + { name="kgamma"; } + { name="kolourpaint"; } + { name="kruler"; } + { name="ksaneplugin"; } + { name="ksnapshot"; } + { name="libkdcraw"; } + { name="libkexiv2"; } + { name="libkipi"; } + { name="libksane"; } + { name="mobipocket"; } + { name="okular"; } + { name="svgpart"; } + ]; +} +{ + module="kdeedu"; + split=true; + pkgs=[ + { name="blinken"; } + { name="cantor"; } + { name="kalgebra"; } + { name="kalzium"; } + { name="kanagram"; } + { name="kbruch"; } + { name="kgeography"; } + { name="khangman"; } + { name="kig"; } + { name="kiten"; } + { name="klettres"; } + { name="kmplot"; } + { name="kstars"; } + { name="ktouch"; } + { name="kturtle"; } + { name="kwordquiz"; } + { name="libkdeedu"; } + { name="marble"; } + { name="parley"; } + { name="rocs"; } + { name="step"; } + ]; +} +{ + module="kdebindings"; + split=true; + pkgs=[ + { name="kimono"; } + { name="korundum"; } + { name="kross-interpreters"; sane="kross_interpreters"; } + { name="perlkde"; } + { name="perlqt"; } + { name="pykde4"; } + { name="qtruby"; } + { name="qyoto"; } + { name="smokegen"; } + { name="smokekde"; } + { name="smokeqt"; } + ]; +} +{ + module="kde-baseapps"; +sane="kde_baseapps"; split=true; + pkgs=[ + { name="kate"; } + { name="kde-baseapps"; sane="kde_baseapps"; } + { name="konsole"; } + ]; +} +{ module="kdeaccessibility"; split=false; + pkgs=[ + { name="kaccessible"; } + { name="kmag"; } + { name="kmouth"; } + { name="kmousetool"; } + { name="jovie"; } + ]; + +} +{ module="kdeadmin"; split=false; + pkgs=[ + { name="strigi-analyzer"; sane="strigi_analyzer";} + { name="kuser"; } + { name="kcron"; } + { name="ksystemlog"; } + { name="system-config-printer-kde"; sane="system_config_printer_kde";} + ]; + +} +{ module="kdeartwork"; split=false; + pkgs=[ + { name="ColorSchemes"; } + { name="IconThemes"; } + { name="emoticons"; } + { name="kscreensaver"; } + { name="kwin-styles"; sane="kwin_styles";} + { name="sounds"; } + { name="styles"; } + { name="wallpapers"; } + { name="HighResolutionWallpapers"; } + { name="WeatherWallpapers"; } + { name="desktopthemes"; } + { name="aurorae"; } + ]; + +} +{ module="kdegames"; split=false;} +{ module="kdelibs"; split=false;} +{ module="kdemultimedia"; split=false;} +{ module="kdenetwork"; split=false; + pkgs=[ + { name="kfile-plugins"; sane="kfile_plugins";} + { name="kget"; } + { name="kopete"; } + { name="krdc"; } + { name="kppp"; } + { name="krfb"; } + { name="kdnssd"; } + { name="filesharing"; } + ]; + +} +{ module="kdepim"; split=false;} +{ module="kdepimlibs"; split=false;} +{ module="kdepim-runtime"; sane="kdepim_runtime"; split=false;} +{ module="kdeplasma-addons"; sane="kdeplasma_addons"; split=false;} +{ module="kde-runtime"; sane="kde_runtime"; split=false;} +{ module="kdesdk"; split=false; + pkgs=[ + { name="cervisia"; } + { name="lokalize"; } + { name="kdeaccounts-plugin"; sane="kdeaccounts_plugin";} + { name="dolphin-plugins-svn"; sane="dolphin_plugins_svn";subdir="dolphin-plugins/svn"; } + { name="dolphin-plugins-git"; sane="dolphin_plugins_git";subdir="dolphin-plugins/git"; } + { name="kcachegrind"; } + { name="kapptemplate"; } + { name="kpartloader"; } + { name="strigi-analyzer"; sane="strigi_analyzer";} + { name="kioslave"; } + { name="okteta"; } + { name="kmtrace"; } + { name="kompare"; } + { name="kprofilemethod"; } + { name="kstartperf"; } + { name="kuiviewer"; } + { name="poxml"; } + { name="scripts"; } + { name="umbrello"; } + ]; + +} +{ module="kdetoys"; split=false; + pkgs=[ + { name="kteatime"; } + { name="ktux"; } + { name="amor"; } + ]; + +} +{ module="kdeutils"; split=false; + pkgs=[ + { name="ark"; } + { name="kcalc"; } + { name="kremotecontrol"; } + { name="kdf"; } + { name="kfloppy"; } + { name="printer-applet"; sane="printer_applet";} + { name="filelight"; } + { name="kcharselect"; } + { name="kgpg"; } + { name="ktimer"; } + { name="kwallet"; } + { name="sweeper"; } + { name="superkaramba"; } + ]; + +} +{ module="kde-wallpapers"; sane="kde_wallpapers"; split=false;} +{ module="kdewebdev"; split=false; + pkgs=[ + { name="klinkstatus"; } + { name="kfilereplace"; } + { name="kimagemapeditor"; } + { name="kommander"; } + ]; + +} +{ module="kde-workspace"; sane="kde_workspace"; split=false;} +{ module="oxygen-icons"; sane="oxygen_icons"; split=false;} +]; +} diff --git a/pkgs/desktops/kde-4.7/l10n/manifest-4.7.0.nix b/pkgs/desktops/kde-4.7/l10n/manifest-4.7.0.nix deleted file mode 100644 index d9eba519942..00000000000 --- a/pkgs/desktops/kde-4.7/l10n/manifest-4.7.0.nix +++ /dev/null @@ -1,262 +0,0 @@ -[ -{ - lang = "ar"; - saneName = "ar"; - sha256 = "16533377hxcb6xy92qw74yp2cvyrmi5bjxjh62xbqf7m3967nj56"; -} -{ - lang = "bg"; - saneName = "bg"; - sha256 = "06i189a8z0z7jv9mi1cvxc1k57gmfsf207m28rg30jhbd4gd5py7"; -} -{ - lang = "bs"; - saneName = "bs"; - sha256 = "1sqcd5jdl04ax6r615rqs4nlsc4xc1xsvc8cdi5pplwilsys0flm"; -} -{ - lang = "ca"; - saneName = "ca"; - sha256 = "1ghhl6yxhcjakv41lznhdp1nx9jp7g75g305cz3n26nbpwaz4mkd"; -} -{ - lang = "ca@valencia"; - saneName = "ca_valencia"; - sha256 = "16sb3kcjc7s02sg9bi3678cdv7hqn3xlpcsa07iwgxdzgh6yp6x0"; -} -{ - lang = "cs"; - saneName = "cs"; - sha256 = "1g52dbp4jwn67p90jkd209csn3nrc1aznpsay5i9919240wsb4mm"; -} -{ - lang = "da"; - saneName = "da"; - sha256 = "168hd69gznsarvxbzgs7hjmxjhhxsccwjfgvf328qbcb88n7570w"; -} -{ - lang = "de"; - saneName = "de"; - sha256 = "07a5f6k22pkps3a0n1ph80f1affmmrlxf1v6ywxdna64si97za43"; -} -{ - lang = "el"; - saneName = "el"; - sha256 = "1kv1wx91mgsrkscx6jf9sjl2li5n8z39hnbiyl9zy2364ximjb3c"; -} -{ - lang = "en_GB"; - saneName = "en_GB"; - sha256 = "12y9m2c0kaigi0qdisw7w2dxf40xz3ihqkwk2x2vbivzsd91ai44"; -} -{ - lang = "es"; - saneName = "es"; - sha256 = "0manicnw3l3kg6qmwq7894cjlwh8091nw6s1w31qvpx7grxznp4w"; -} -{ - lang = "et"; - saneName = "et"; - sha256 = "06xm411l20qqgfv12wxbz3x6daahwlzpp07n3ifi7jh6wzv1j0nh"; -} -{ - lang = "eu"; - saneName = "eu"; - sha256 = "08y65gkpq2ziylddzk44d2rp8mprr3bayxsgl4zw8plmyj6p79fs"; -} -{ - lang = "fi"; - saneName = "fi"; - sha256 = "1xdgnn06psg84a60ssd85855jw93bi787aawyrh7n77q5za8rs83"; -} -{ - lang = "fr"; - saneName = "fr"; - sha256 = "1l6ljqy5aa6wbvkywi47mvkw28whcdwcdd3hrqy8kyxf064d5lk6"; -} -{ - lang = "ga"; - saneName = "ga"; - sha256 = "1nnh11hbqvb6gxgfp086algbjiw5j4rs5fxzl74i8935qhjz12pk"; -} -{ - lang = "gl"; - saneName = "gl"; - sha256 = "0sqgcjrzr422iy9qmyyzhmwah696gkv810xh6hd71yv3416wpnjk"; -} -{ - lang = "he"; - saneName = "he"; - sha256 = "1hid5izn5g63iaz634x2x7ahylf99ccjms21461lg4w72mb732f9"; -} -{ - lang = "hr"; - saneName = "hr"; - sha256 = "0kqk28rcdawdxz1h8dph1ik49ag2nxbbq3712fpjylswqa0dh4v3"; -} -{ - lang = "hu"; - saneName = "hu"; - sha256 = "1gnsvyw412j2k9maac2sflvfnv1mf4lwaqcxrhyb5zfvz7pflfqh"; -} -{ - lang = "ia"; - saneName = "ia"; - sha256 = "03a89wb03yc57d5nxvawdzvc7qzzcwj5r1gri7p6khjbl6r5gx63"; -} -{ - lang = "id"; - saneName = "id"; - sha256 = "0r0c7yd3sq4bwqa9l3j8fc7bhdfnr14q1270l2vvn1r4r9y4myb7"; -} -{ - lang = "is"; - saneName = "is"; - sha256 = "00m3sfrcawqva93w90y29lf747b43pmcgd97n6iii2alk8z1xc6b"; -} -{ - lang = "it"; - saneName = "it"; - sha256 = "1v6gl0bbml5ddz60sc7dk0pirnjdmpiqhksbyqbmx9d650x5jpm0"; -} -{ - lang = "ja"; - saneName = "ja"; - sha256 = "0y0nwy805w0x90kfmpkldjllaq5qrs031kl2r2v67n0i2i0g48n3"; -} -{ - lang = "kk"; - saneName = "kk"; - sha256 = "06fmh05ccbx58vprw4h1f4hqsv2gjkm0y982lajgrwpswc09kdrj"; -} -{ - lang = "km"; - saneName = "km"; - sha256 = "1l17xj681m29xladp8cb6vbwprvf7l5kj8iignyyziv7sw6v5fs9"; -} -{ - lang = "kn"; - saneName = "kn"; - sha256 = "0is1yarm4r5dcm424nha7p093rzndsqmkbgrj65q8szf8pdii3pz"; -} -{ - lang = "ko"; - saneName = "ko"; - sha256 = "1fr2ln91k910qbpkxsqxaf05bdgf2mg4jj4chxygqhwv1ffxj4f0"; -} -{ - lang = "lt"; - saneName = "lt"; - sha256 = "1m8iawglrznv1qsqsw2sns6fbbv52zs2wzmz793p4n1v67ly4n75"; -} -{ - lang = "lv"; - saneName = "lv"; - sha256 = "1p89fw17nfd77klr2dkrm98xahxqprq9a1906rl7m7jdrsh44zrd"; -} -{ - lang = "nb"; - saneName = "nb"; - sha256 = "082cjvczqlvzsgzwdlyqy8qvfdfcvxgj8fy4faxv5iaqdv4hzf1j"; -} -{ - lang = "nds"; - saneName = "nds"; - sha256 = "0vhg8hkg4iad0g0jmy9qb61z7bnyw9dmpnibwpn1sypq8cy1qgax"; -} -{ - lang = "nl"; - saneName = "nl"; - sha256 = "1nvkspaycgkx639cmjp0cv81fb8fjqmfw6r7r6fhq4gjyk6awdbl"; -} -{ - lang = "nn"; - saneName = "nn"; - sha256 = "03y7c4vn9ihz65bylmabcjsjssb9wc4j4nb9slb98dm97cqn015b"; -} -{ - lang = "pa"; - saneName = "pa"; - sha256 = "0vhf2bb4ii737hmg639s0h7pl38dxrpncvgl6l2lzv2nb3g92ihk"; -} -{ - lang = "pl"; - saneName = "pl"; - sha256 = "116ii59z71v3wlp9xd5ni3zk140i4s461l1wpqxx2p8lrs6087m6"; -} -{ - lang = "pt"; - saneName = "pt"; - sha256 = "04mh52cdg63nacs5mydmx244ljq39495bai4zm7viz1b0lkwhfi8"; -} -{ - lang = "pt_BR"; - saneName = "pt_BR"; - sha256 = "1fqsgxfxmsbadk32kgxskkjvbq4wb06gq26i4h41y3cbanw11r9v"; -} -{ - lang = "ro"; - saneName = "ro"; - sha256 = "04r6avdjd4pjnq6viprm5252jyqd73wiqc419y72vpxh39rri72k"; -} -{ - lang = "ru"; - saneName = "ru"; - sha256 = "0gdy3yjczgjigr1pfmwsjscgh9q7mvz11m82axw0989kvq34ryx3"; -} -{ - lang = "sk"; - saneName = "sk"; - sha256 = "0kgg6a0xy4cnij7g576rsixkn7b0c9l782zxn2brcnqlfqzyh3b7"; -} -{ - lang = "sl"; - saneName = "sl"; - sha256 = "1yf15mcyi0k9vmrmd0fqz265dsy2xr6fhf1wl3lljb0mqsyf0a8a"; -} -{ - lang = "sr"; - saneName = "sr"; - sha256 = "1cyw5kkpwq7yzhib6dlqln21fk3zfppalhw21rnfr0ih1znpaa1p"; -} -{ - lang = "sv"; - saneName = "sv"; - sha256 = "1kaq1zlgxb5z9bpfpnpznnv3yhqjr4wgdm47b5fcg149ha6q43hp"; -} -{ - lang = "th"; - saneName = "th"; - sha256 = "1yzbxwzd624akmby1bhfm74fp6p41fq38jxs8qdsflav531nz47z"; -} -{ - lang = "tr"; - saneName = "tr"; - sha256 = "1l1q154ib9wr8brp0pk6r0n7xz8kzdbhfb803kwg0ajhjddpihim"; -} -{ - lang = "ug"; - saneName = "ug"; - sha256 = "05zcz4rwvlc1gbcm7612rlvsbjnf293kiv902rms64smd3w8237r"; -} -{ - lang = "uk"; - saneName = "uk"; - sha256 = "04b5nj9q3x2cpc03awm09ijx0qzkvmxp9wb3cj3q4mhkd8n42k6i"; -} -{ - lang = "wa"; - saneName = "wa"; - sha256 = "10w1n2cni7mqf8fyy5gq699d9nw0fma1brq5a3wfwnxhlk7hxs6a"; -} -{ - lang = "zh_CN"; - saneName = "zh_CN"; - sha256 = "15xfbyf2m3lhd6q7imsmjxv81kw1ml286dh771gg4m668j7101pq"; -} -{ - lang = "zh_TW"; - saneName = "zh_TW"; - sha256 = "0d9gw75qq37yq3icz4mjqnqqar0vrmc6aly8pybg4qw167jzzqn6"; -} -] diff --git a/pkgs/desktops/kde-4.7/l10n/manifest-4.7.1.nix b/pkgs/desktops/kde-4.7/l10n/manifest-4.7.1.nix deleted file mode 100644 index f4ecf8656cf..00000000000 --- a/pkgs/desktops/kde-4.7/l10n/manifest-4.7.1.nix +++ /dev/null @@ -1,262 +0,0 @@ -[ -{ - lang = "ar"; - saneName = "ar"; - sha256 = "03sl2d83hyl138kl7424nxi546v1x1yp5ywqknk194532gf7isf2"; -} -{ - lang = "bg"; - saneName = "bg"; - sha256 = "0dal1sdvr28d0w9izl6chzybp1xgnvl20yn59yszl9zfwxzm5z45"; -} -{ - lang = "bs"; - saneName = "bs"; - sha256 = "17galw35j93jsmdpihr2x1jrpz8phyrrw403q77xb7csdc89mg41"; -} -{ - lang = "ca"; - saneName = "ca"; - sha256 = "07llq52f0hxz39h2amq1an788m6bijijifk9hilbkiixs1bpcycp"; -} -{ - lang = "ca@valencia"; - saneName = "ca_valencia"; - sha256 = "0f07p6nz0gryjihz35ga4hn7gj32is978ns74mxkgql3cqkmzpp8"; -} -{ - lang = "cs"; - saneName = "cs"; - sha256 = "0lcmp4lrlzjx8003fdpgsz5xi33ldj5sxkim90y76866kwgfd8a0"; -} -{ - lang = "da"; - saneName = "da"; - sha256 = "10ja0jg6fqq0a9nx2lcljp4fmrvn8yicv75wchfmz6ydrylfmlmc"; -} -{ - lang = "de"; - saneName = "de"; - sha256 = "10xbbjq08r47pcxg6j8k3yyvfjf6fvk16f3njriclsrxg5kgjcb1"; -} -{ - lang = "el"; - saneName = "el"; - sha256 = "0w6fkkmqqx73mf3piwqfk98xyk8izvrxkhw653npm30j2x5l1ccf"; -} -{ - lang = "en_GB"; - saneName = "en_GB"; - sha256 = "1xpsly96d68kzswscfz7fj4xzk3z92ddlzs06jl5ga3vi5v08br9"; -} -{ - lang = "es"; - saneName = "es"; - sha256 = "12wpzdqx5ckkr3x7wsbyb6ljixm66cxsxw5vpxf987hm9pblip9c"; -} -{ - lang = "et"; - saneName = "et"; - sha256 = "11s8wlv3qpnd9hf39z53nan6ljxdvh17knaz1jl7a04f0dczc1hj"; -} -{ - lang = "eu"; - saneName = "eu"; - sha256 = "0a491igqcz1gb7218m9wflvrlyj0h95xlmsn70pb1jv0kvmpib7w"; -} -{ - lang = "fi"; - saneName = "fi"; - sha256 = "0c5fji14j8h7zpj5941wrl6nar76ll5ry2yhcdq82ciphc74421q"; -} -{ - lang = "fr"; - saneName = "fr"; - sha256 = "1bgmlj7s7rdzva5i3kdi0hf16kh929a9qmhg745ivbfl89slbi6c"; -} -{ - lang = "ga"; - saneName = "ga"; - sha256 = "1fail3mpmsb0zvskwrxzjx0bvsbf28rv5qjzh061w1a9jqd0ggn3"; -} -{ - lang = "gl"; - saneName = "gl"; - sha256 = "0hx6y2xzgvnhcvmdf7qh1bk1jk87srmxpi1m4blwqara189bmqz7"; -} -{ - lang = "he"; - saneName = "he"; - sha256 = "1fjdjaqplqs9jk0np4fj8sm9jds8i9hxxf64cqj0is6wcf7lf9bc"; -} -{ - lang = "hr"; - saneName = "hr"; - sha256 = "1j56aj0bhpgfzlxcav3rwzahxm6q00hpdg6jmgq0m02d45kvn8z5"; -} -{ - lang = "hu"; - saneName = "hu"; - sha256 = "1syxpqk37jwippx7p273f4h6n14jhbv22wmq8la48jsqdkgrrgjg"; -} -{ - lang = "ia"; - saneName = "ia"; - sha256 = "1jazhp4n5ymz5gbxc3g3c9jvd7k1fs2b1w09vhnbgwa6i3gpa1i8"; -} -{ - lang = "id"; - saneName = "id"; - sha256 = "1g85002i29g6qzmjrwng4pndrkxnkg1ph1qvkkrnkkpygbw3whvm"; -} -{ - lang = "is"; - saneName = "is"; - sha256 = "11aavg4gw7xcdaq72ygynm2zbjcmal0baaw6sk1gy597620hfm5g"; -} -{ - lang = "it"; - saneName = "it"; - sha256 = "1395nskpbg8ah2q18ahsfv39ixhw74gb5cxr2irsfkgnwbmglas1"; -} -{ - lang = "ja"; - saneName = "ja"; - sha256 = "0jrnbd8j6qcfhxvfs014qq0dbdbp6632bk2210xg07sfmrz43csm"; -} -{ - lang = "kk"; - saneName = "kk"; - sha256 = "0rxvj142rw40d93ygfysavpw4jbyn8yx6c828sv5lp8c2r4kid5a"; -} -{ - lang = "km"; - saneName = "km"; - sha256 = "12x5dnk33khmfnf9fk5qq3par1l21xfy24lq4a6jdf8ya9nj62r5"; -} -{ - lang = "kn"; - saneName = "kn"; - sha256 = "0c4cp019ij80fc188dzkv5nbxplxhnhqc3b2qda9xr1j78vbbh46"; -} -{ - lang = "ko"; - saneName = "ko"; - sha256 = "0lhnvy370fk21z1r1wdq484pdjq6c0jsj3s2z58z4x7rfw2lq487"; -} -{ - lang = "lt"; - saneName = "lt"; - sha256 = "1blcg57vm05sbvcgslr49k84whm3f99mcd15zb8fxvvrybg0hr2m"; -} -{ - lang = "lv"; - saneName = "lv"; - sha256 = "0jc2vv97jwbbr966spzv10aimb9c42x5ia1rnr2kvs1hb8sxwvp1"; -} -{ - lang = "nb"; - saneName = "nb"; - sha256 = "04362qr5p3dhscrppcbg9cj28idrs0hslc2lk98drpq2rkc8rjmb"; -} -{ - lang = "nds"; - saneName = "nds"; - sha256 = "1ci4xh56w6rn68sl5xk23l1rxxfz7ni7y4z2sc5yidwi1acxfwpm"; -} -{ - lang = "nl"; - saneName = "nl"; - sha256 = "197jdabjxk61n5b69sw9jqcpp7561hq3dw086z2pymqll5irjf7f"; -} -{ - lang = "nn"; - saneName = "nn"; - sha256 = "1cd0ifr6p9m8h665grwy8nk3gw72w9h5a8bygf5nj55164qmff98"; -} -{ - lang = "pa"; - saneName = "pa"; - sha256 = "1scn7nkl521v1f1y0km3s57s02xfblblg2f572s9yz5j2da9p2j0"; -} -{ - lang = "pl"; - saneName = "pl"; - sha256 = "1qn6lakcfah85ws9njz2xp36xj2n3ld3mhqkvcb6mddv943x65vj"; -} -{ - lang = "pt"; - saneName = "pt"; - sha256 = "0pw2zvma1jczkp0ypshxyl4dcnx6jakms91i2pwyswa8jv3mfx3b"; -} -{ - lang = "pt_BR"; - saneName = "pt_BR"; - sha256 = "1n9m7wj5gd3kwf6smbx53l3jbjyvd26ginw007bnv6x14g2y7k19"; -} -{ - lang = "ro"; - saneName = "ro"; - sha256 = "155l1szxvjcgmw44097q8dvgd9ljgs2y3dn8mpi3y6cqj5kdb42s"; -} -{ - lang = "ru"; - saneName = "ru"; - sha256 = "166ck2pvhdrpyf269fmkqkqs3l6s4cc8f2p3w88f5z75qg9xc3bj"; -} -{ - lang = "sk"; - saneName = "sk"; - sha256 = "18bidvnhg2gqnjgr6np1gm2irn81b108kx7ri11gwppqh3h90340"; -} -{ - lang = "sl"; - saneName = "sl"; - sha256 = "0c2av80r3zc1jkybj3yp5hspv5rwlyda039jy11y49d6zwval097"; -} -{ - lang = "sr"; - saneName = "sr"; - sha256 = "0dffkmsd9l30c17fi5x6m6lx5hi5diqqxmmn36a9wb393mw8srm9"; -} -{ - lang = "sv"; - saneName = "sv"; - sha256 = "10rrlrwarh8sks2wym2kq3rk69kgzqk38ll93i0i0zhjgyqiahrg"; -} -{ - lang = "th"; - saneName = "th"; - sha256 = "1sqyw6zd3vnpkvb7iisqhnk7vjp3212h97yqgmlsxfry2rys1kmr"; -} -{ - lang = "tr"; - saneName = "tr"; - sha256 = "0vzr81c004zwxqhfwhpfs4g1w5dvbxzb9y3g3vsagnsc94i5fb9y"; -} -{ - lang = "ug"; - saneName = "ug"; - sha256 = "0p0ln8dcpq2hbqz651lb7izb82dqhh5pl3a931yzd99a6lr3kd39"; -} -{ - lang = "uk"; - saneName = "uk"; - sha256 = "0b6q2s1qigzchqs9dmzm31jrnhz3vfsix4zbmzs0wdib05qy6y1f"; -} -{ - lang = "wa"; - saneName = "wa"; - sha256 = "01hi12hanz44lbn52dcll2glcljax1mv3n5qc8w9gf4cqjjrs2ia"; -} -{ - lang = "zh_CN"; - saneName = "zh_CN"; - sha256 = "0iwszbl2myh9ik3yk19nyrj43rcki23amp5i2sx7lz9gy14lvgl8"; -} -{ - lang = "zh_TW"; - saneName = "zh_TW"; - sha256 = "1j1kvyc82ysin4ksp63gzczg4ihvn4qlfjd5l16qi0galp96mz21"; -} -] diff --git a/pkgs/desktops/kde-4.7/l10n/manifest-4.7.2.nix b/pkgs/desktops/kde-4.7/l10n/manifest-4.7.2.nix new file mode 100644 index 00000000000..ff89f2d8d0c --- /dev/null +++ b/pkgs/desktops/kde-4.7/l10n/manifest-4.7.2.nix @@ -0,0 +1,262 @@ +[ +{ + lang = "ar"; + saneName = "ar"; + sha256 = "17s0d1yr561r55b2jgj6ypmjbwv9p7ykmpv28r6lcs7smdhvazg2"; +} +{ + lang = "bg"; + saneName = "bg"; + sha256 = "1q3r15v4hqmw7hqb4bxkgp3xvvybhs4ij8j2k6ph78sl2kq0z9vg"; +} +{ + lang = "bs"; + saneName = "bs"; + sha256 = "00q0mamzkf3rn1r9dxjkbg0fcs0sg06m38d5hvvc81ia2f743qps"; +} +{ + lang = "ca"; + saneName = "ca"; + sha256 = "1k9x805ikaqxq33mxj8knxdbmba22pb7yl5r6yvgys6ffr36x4gv"; +} +{ + lang = "ca@valencia"; + saneName = "ca_valencia"; + sha256 = "0zfxlsxrwzyh6va0fc7d7xvahw51khf51w5v3yqx0c5zvkbnk5h2"; +} +{ + lang = "cs"; + saneName = "cs"; + sha256 = "1adccwlxqwdv575cckfh665ml0wx47226hmjyyp9qws8csi56c69"; +} +{ + lang = "da"; + saneName = "da"; + sha256 = "0d0zbv7f3cwzsly45ilzfz2abjp22f45ilzfmqjp4naj153c1dxi"; +} +{ + lang = "de"; + saneName = "de"; + sha256 = "02mzvz5n00dvdnw86awfd3g3s4dsbk28i6nd7hpqxz6anvasqrc1"; +} +{ + lang = "el"; + saneName = "el"; + sha256 = "00gi08mgkw9r3mbagxfx25ywcrl7h0xsgs8wvng8y098vq5bsql4"; +} +{ + lang = "en_GB"; + saneName = "en_GB"; + sha256 = "0sf7ipp0sggdfcpijhy0gymkvmlxd4yknrw5v1mcbl6hjdg4fpyr"; +} +{ + lang = "es"; + saneName = "es"; + sha256 = "0axzzwmx39rad34qnasdla014c5dvz65hvnkf184q2q2fzbsqcn4"; +} +{ + lang = "et"; + saneName = "et"; + sha256 = "080prwlf12nhbkkbkc111zsjr5j2zm0zp328s923gmrh5dfxi6c5"; +} +{ + lang = "eu"; + saneName = "eu"; + sha256 = "0vbc01xxnzpnvnrzvv3xird3g7glyls970rbq815a5f8d0svcqhz"; +} +{ + lang = "fi"; + saneName = "fi"; + sha256 = "0rhi9hc2kwh3dl3zin5l8akf1qlfc8i3yi8857f92az4crah0h7j"; +} +{ + lang = "fr"; + saneName = "fr"; + sha256 = "0jwlkiv3phlw4hinjz0hxgmcs5v9nkg2rdh96qfsmqm8qjwbgjj9"; +} +{ + lang = "ga"; + saneName = "ga"; + sha256 = "0nr7357xknsx2nn4w25yxzmhz1rij9b2i9fix9gbfrfi103p4j3d"; +} +{ + lang = "gl"; + saneName = "gl"; + sha256 = "1fvnfxyn2gdmbp6n9rrh7amzb23vwlfz0dif5c4pc17vkm733hci"; +} +{ + lang = "he"; + saneName = "he"; + sha256 = "1rmrwbfad81hhx3rvdis38mg4dvq88x3m2ypjy4vg47h7y3nzzsd"; +} +{ + lang = "hr"; + saneName = "hr"; + sha256 = "0w234ndd1rljrnxg1ws814r0kybh3ajc1x5n2m4qch1xvsq96knh"; +} +{ + lang = "hu"; + saneName = "hu"; + sha256 = "0rjaajqa3ci5qpx6zqzglzmllfnsm8knsal65bnm4msxh8s06k96"; +} +{ + lang = "ia"; + saneName = "ia"; + sha256 = "15rsn2qak7fjc3l54s1j26dlng4k31kh9qdgs68y38hsq65x4zc9"; +} +{ + lang = "id"; + saneName = "id"; + sha256 = "0dlciv1yk6vjc17506cabn722z9n0x25y2cmanafqb37ilm3ji9q"; +} +{ + lang = "is"; + saneName = "is"; + sha256 = "0iqsz23l4205p2vbm7nrhq6f4xcjnv2i8fll4zrim1fvmv8m9imb"; +} +{ + lang = "it"; + saneName = "it"; + sha256 = "1xmbw2c62d4zfarrwfdxg9ijgyly0p659ycxjqq6vq066ji728n0"; +} +{ + lang = "ja"; + saneName = "ja"; + sha256 = "1jrq9vhs7md5bjfaym5jqjhmlf0ydi9fwdhz87y03bp4cx8k17f5"; +} +{ + lang = "kk"; + saneName = "kk"; + sha256 = "1d5jl8yi8jjp1myg1d3jxh2fdf58n4lh77g50f9f4lab7xhwqiy0"; +} +{ + lang = "km"; + saneName = "km"; + sha256 = "1apxmwmsmis77y2if15npf38wd98nzl9h6qqi02mpbl2gq32hjnm"; +} +{ + lang = "kn"; + saneName = "kn"; + sha256 = "0r70d4m4x0jyq7fq3zj0dgy3v0pz25zbk20l932w3zyq6nxmaj18"; +} +{ + lang = "ko"; + saneName = "ko"; + sha256 = "0zr2ph6n2475fifanx2gisn0z29hgzcd822jy8h33qy1rysfzjv7"; +} +{ + lang = "lt"; + saneName = "lt"; + sha256 = "12vvy72nb16b0i2a8dqfq6zvbdxkanh39wqi6ysmbzxbic634lwy"; +} +{ + lang = "lv"; + saneName = "lv"; + sha256 = "1daxrnydhqcnmi0c2ag2jvdckshk9dypgpi6dchgfbffn4bqgy9p"; +} +{ + lang = "nb"; + saneName = "nb"; + sha256 = "1mjkbgd2k9g6ka811j6yphc9c7yl6hyx504k74l3qwhcd53nhixm"; +} +{ + lang = "nds"; + saneName = "nds"; + sha256 = "0vryzfy5phybffdizm4vxb3k1z04mqwhabvk7qijr536jv457s79"; +} +{ + lang = "nl"; + saneName = "nl"; + sha256 = "16w8i0ywlpyck2svahrjsgaadp18x6y26n637av23ll2albiigj3"; +} +{ + lang = "nn"; + saneName = "nn"; + sha256 = "1kq0nrj5i9kdb2rmn6wmrv0y3awjk25kqq0ls6f49nxy954nw1ch"; +} +{ + lang = "pa"; + saneName = "pa"; + sha256 = "12dqa9lbr99lmb35qb4vsl3pykn04kb95p4dw8yap380wfqr0j53"; +} +{ + lang = "pl"; + saneName = "pl"; + sha256 = "0mdcfw9v5434rrq1ix1zprvmrs3vdkl54nmaz7iz9iqlc44c44w1"; +} +{ + lang = "pt"; + saneName = "pt"; + sha256 = "08bwh2b9040wvhvq3ncih4b1s7yz1cdgchkird2zghsks34jn32j"; +} +{ + lang = "pt_BR"; + saneName = "pt_BR"; + sha256 = "145zgkslkm8y2vrxcr4zm2hv7m7mqc5h5q0vad33p6cxqpy8d0im"; +} +{ + lang = "ro"; + saneName = "ro"; + sha256 = "0w3s87h3msbjrbmil4za323jsh5wg80n4vzsvy77nhlv4a4zkd6p"; +} +{ + lang = "ru"; + saneName = "ru"; + sha256 = "1cddg14g2cdm2lfspps32ld8cbmd9qiwn78a2m6f6jsfbjh8kk0v"; +} +{ + lang = "sk"; + saneName = "sk"; + sha256 = "0wlgmfa15vk8vv9zd08dafvdd0df2j4721lnrn3pjrknbapfv76w"; +} +{ + lang = "sl"; + saneName = "sl"; + sha256 = "176x46y8fxhbs2x4zma705xz258jcxw45af5jkwskq6rq1v2nk8p"; +} +{ + lang = "sr"; + saneName = "sr"; + sha256 = "1sxrxblmyrpvjzag3z7a7ia3k1fd6n3jvqjv6mdcnzky6n4wjs35"; +} +{ + lang = "sv"; + saneName = "sv"; + sha256 = "1ni87ph5wgxydq5dyj7yw9xc6izx0gdqyqqvcbnzxxbfcg37apnx"; +} +{ + lang = "th"; + saneName = "th"; + sha256 = "1a4fn0vbb714pg15z9w9jkgmmqs0c3wl8397jg68xr6621cphpnh"; +} +{ + lang = "tr"; + saneName = "tr"; + sha256 = "09m81r5vlh9mi863wm0kmnbr881xy2qnsn2n6fy27csk91sj9g6s"; +} +{ + lang = "ug"; + saneName = "ug"; + sha256 = "191ivdzc60sz4z5d513v7m89clq214kw31r8pp16basayqvcycwg"; +} +{ + lang = "uk"; + saneName = "uk"; + sha256 = "1141213hrvw77ri5n518vj76k9whvr73vahbbrygfib3r1vml4rf"; +} +{ + lang = "wa"; + saneName = "wa"; + sha256 = "0mczkwzq5zb5s1mpl9g711lnng7j3bcfmn66zwm5is4ij4hd2swr"; +} +{ + lang = "zh_CN"; + saneName = "zh_CN"; + sha256 = "0ra5km0ddh3k3mb36drynf1wyfi05a1nf346jamx4lafsp5xai1r"; +} +{ + lang = "zh_TW"; + saneName = "zh_TW"; + sha256 = "0qbc0hs1f43aqkj92nnw5vn8b2r11y19hjhh2p8b41818dcyscyf"; +} +] diff --git a/pkgs/desktops/kde-4.7/oxygen-icons.nix b/pkgs/desktops/kde-4.7/oxygen-icons.nix index 655aadda48e..f2a5e666232 100644 --- a/pkgs/desktops/kde-4.7/oxygen-icons.nix +++ b/pkgs/desktops/kde-4.7/oxygen-icons.nix @@ -3,7 +3,7 @@ kde { outputHashAlgo = "sha256"; outputHashMode = "recursive"; - outputHash = "87010a208f6860429d78c0d518a4f70c450b9c199900076d0aa232de8ae6452e"; + outputHash = "0c12c72bcf41cfaf03f85fc1ae27e44d8cecac3deb504ab1de4c30f4fc9e3cd0"; buildNativeInputs = [ cmake ]; From c35c6ec9fa326f092c6640c9f06b19ed15115765 Mon Sep 17 00:00:00 2001 From: "Yury G. Kudryashov" Date: Sat, 8 Oct 2011 12:06:03 +0000 Subject: [PATCH 115/970] Drop 'gnomevfs = gnome_vfs;' alias s/gnomevfs/gnome_vfs/ in packages svn path=/nixpkgs/trunk/; revision=29718 --- pkgs/applications/editors/gobby/default.nix | 6 +++--- .../applications/editors/monodevelop/default.nix | 4 ++-- .../networking/browsers/icecat-3/default.nix | 4 ++-- .../networking/browsers/icecat-4/default.nix | 4 ++-- pkgs/desktops/gnome-2.28/default.nix | 1 - .../guile-modules/guile-gnome/default.nix | 4 ++-- pkgs/development/libraries/libgsf/default.nix | 4 ++-- pkgs/tools/filesystems/relfs/default.nix | 4 ++-- pkgs/top-level/all-packages.nix | 16 ++++++++-------- 9 files changed, 23 insertions(+), 24 deletions(-) diff --git a/pkgs/applications/editors/gobby/default.nix b/pkgs/applications/editors/gobby/default.nix index ea86f9caf52..badd18b8915 100644 --- a/pkgs/applications/editors/gobby/default.nix +++ b/pkgs/applications/editors/gobby/default.nix @@ -2,7 +2,7 @@ , gnomeSupport ? false # build support for Gnome(gnome-vfs) , stdenv, fetchurl, pkgconfig , gtkmm, gsasl, gtksourceview, libxmlxx, libinfinity, intltool -, gnomevfs ? null}: +, gnome_vfs ? null}: let libinf = libinfinity.override { gtkWidgets = true; inherit avahiSupport; }; @@ -16,7 +16,7 @@ in stdenv.mkDerivation rec { }; buildInputs = [ pkgconfig gtkmm gsasl gtksourceview libxmlxx libinf intltool ] - ++ stdenv.lib.optional gnomeSupport gnomevfs; + ++ stdenv.lib.optional gnomeSupport gnome_vfs; configureFlags = '' ''; @@ -28,4 +28,4 @@ in stdenv.mkDerivation rec { maintainers = [ maintainers.phreedom ]; platforms = platforms.all; }; -} \ No newline at end of file +} diff --git a/pkgs/applications/editors/monodevelop/default.nix b/pkgs/applications/editors/monodevelop/default.nix index 23dab206e18..e4dc00ff0a1 100644 --- a/pkgs/applications/editors/monodevelop/default.nix +++ b/pkgs/applications/editors/monodevelop/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchurl, file, mono, gtksharp, gtksourceviewsharp , gtkmozembedsharp, monodoc , perl, perlXMLParser, pkgconfig -, glib, gtk, GConf, gnomevfs, libbonobo, libglade, libgnome +, glib, gtk, GConf, gnome_vfs, libbonobo, libglade, libgnome , mozilla }: @@ -20,7 +20,7 @@ stdenv.mkDerivation { buildInputs = [ file mono gtksharp gtksourceviewsharp perl perlXMLParser pkgconfig - glib gtk GConf gnomevfs libbonobo libglade libgnome + glib gtk GConf gnome_vfs libbonobo libglade libgnome gtkmozembedsharp monodoc ]; diff --git a/pkgs/applications/networking/browsers/icecat-3/default.nix b/pkgs/applications/networking/browsers/icecat-3/default.nix index a63584fda28..99f135c6d7b 100644 --- a/pkgs/applications/networking/browsers/icecat-3/default.nix +++ b/pkgs/applications/networking/browsers/icecat-3/default.nix @@ -1,6 +1,6 @@ { fetchurl, stdenv, xz, pkgconfig, gtk, pango, perl, python, ply, zip, libIDL , libjpeg, libpng, zlib, cairo, dbus, dbus_glib, bzip2, xlibs, alsaLib -, libnotify, gnomevfs, libgnomeui +, libnotify, gnome_vfs, libgnomeui , freetype, fontconfig, wirelesstools ? null, pixman , application ? "browser" }: @@ -19,7 +19,7 @@ stdenv.mkDerivation { }; buildInputs = - [ xz libgnomeui libnotify gnomevfs alsaLib + [ xz libgnomeui libnotify gnome_vfs alsaLib pkgconfig gtk perl zip libIDL libjpeg libpng zlib cairo bzip2 pixman python ply dbus dbus_glib pango freetype fontconfig xlibs.libXi xlibs.libX11 xlibs.libXrender xlibs.libXft xlibs.libXt diff --git a/pkgs/applications/networking/browsers/icecat-4/default.nix b/pkgs/applications/networking/browsers/icecat-4/default.nix index 5d6f5c3acb0..9de1b4525a9 100644 --- a/pkgs/applications/networking/browsers/icecat-4/default.nix +++ b/pkgs/applications/networking/browsers/icecat-4/default.nix @@ -1,6 +1,6 @@ { fetchurl, stdenv, xz, pkgconfig, gtk, pango, perl, python, ply, zip, libIDL , libjpeg, libpng, zlib, cairo, dbus, dbus_glib, bzip2, xlibs, alsaLib -, libnotify, gnomevfs, libgnomeui +, libnotify, gnome_vfs, libgnomeui , freetype, fontconfig, wirelesstools ? null, pixman , application ? "browser" }: @@ -19,7 +19,7 @@ stdenv.mkDerivation { }; buildInputs = - [ xz libgnomeui libnotify gnomevfs alsaLib + [ xz libgnomeui libnotify gnome_vfs alsaLib pkgconfig gtk perl zip libIDL libjpeg libpng zlib cairo bzip2 pixman python ply dbus dbus_glib pango freetype fontconfig xlibs.libXi xlibs.libX11 xlibs.libXrender xlibs.libXft xlibs.libXt diff --git a/pkgs/desktops/gnome-2.28/default.nix b/pkgs/desktops/gnome-2.28/default.nix index e486cac465e..7e56c158fdb 100644 --- a/pkgs/desktops/gnome-2.28/default.nix +++ b/pkgs/desktops/gnome-2.28/default.nix @@ -6,7 +6,6 @@ pkgs.makeOverridable inherit (pkgs.gtkLibs) glib pango atk gtk gtkmm; # Backward compatibility. - gnomevfs = gnome_vfs; startupnotification = startup_notification; gnomedocutils = gnome_doc_utils; gnomeicontheme = gnome_icon_theme; diff --git a/pkgs/development/guile-modules/guile-gnome/default.nix b/pkgs/development/guile-modules/guile-gnome/default.nix index b6a7a43297c..30480844a41 100644 --- a/pkgs/development/guile-modules/guile-gnome/default.nix +++ b/pkgs/development/guile-modules/guile-gnome/default.nix @@ -1,5 +1,5 @@ { fetchurl, stdenv, guile, guile_lib, gwrap -, pkgconfig, gconf, glib, gnomevfs, gtk +, pkgconfig, gconf, glib, gnome_vfs, gtk , libglade, libgnome, libgnomecanvas, libgnomeui, pango, guileCairo }: stdenv.mkDerivation rec { @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { buildInputs = [ guile gwrap - pkgconfig gconf glib gnomevfs gtk libglade libgnome libgnomecanvas + pkgconfig gconf glib gnome_vfs gtk libglade libgnome libgnomecanvas libgnomeui pango guileCairo ] ++ stdenv.lib.optional doCheck guile_lib; diff --git a/pkgs/development/libraries/libgsf/default.nix b/pkgs/development/libraries/libgsf/default.nix index d68cb73b2b5..a417f63cdd9 100644 --- a/pkgs/development/libraries/libgsf/default.nix +++ b/pkgs/development/libraries/libgsf/default.nix @@ -1,6 +1,6 @@ { fetchurl, stdenv, perl, perlXMLParser, pkgconfig, libxml2 , glib, gettext, intltool, bzip2 -, gnomevfs, libbonobo, python }: +, gnome_vfs, libbonobo, python }: stdenv.mkDerivation rec { @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { }; buildInputs = - [ perl perlXMLParser pkgconfig gettext bzip2 gnomevfs python intltool ]; + [ perl perlXMLParser pkgconfig gettext bzip2 gnome_vfs python intltool ]; propagatedBuildInputs = [ glib libxml2 libbonobo ]; diff --git a/pkgs/tools/filesystems/relfs/default.nix b/pkgs/tools/filesystems/relfs/default.nix index 2eb8e3a0b3b..56dad0c1e3d 100644 --- a/pkgs/tools/filesystems/relfs/default.nix +++ b/pkgs/tools/filesystems/relfs/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchcvs, builderDefs, ocaml, fuse, postgresql, pcre -, libuuid, gnomevfs, pkgconfig, GConf }: +, libuuid, gnome_vfs, pkgconfig, GConf }: let localDefs = builderDefs.passthru.function { src = fetchcvs { @@ -10,7 +10,7 @@ }; buildInputs = [ocaml fuse postgresql pcre - libuuid gnomevfs pkgconfig GConf]; + libuuid gnome_vfs pkgconfig GConf]; configureFlags = []; build = builderDefs.stringsWithDeps.fullDepEntry (" cd deps diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 1ed9c99fbde..84a00ecaa99 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -1237,7 +1237,7 @@ let reiserfsprogs = callPackage ../tools/filesystems/reiserfsprogs { }; relfs = callPackage ../tools/filesystems/relfs { - inherit (gnome) gnomevfs GConf; + inherit (gnome) gnome_vfs GConf; }; remind = callPackage ../tools/misc/remind { }; @@ -2667,7 +2667,7 @@ let guileGnome = callPackage ../development/guile-modules/guile-gnome { gconf = gnome.GConf; - inherit (gnome) glib gnomevfs gtk libglade libgnome libgnomecanvas + inherit (gnome) glib gnome_vfs gtk libglade libgnome libgnomecanvas libgnomeui pango; }; @@ -3879,7 +3879,7 @@ let libspectre = callPackage ../development/libraries/libspectre { }; libgsf = callPackage ../development/libraries/libgsf { - inherit (gnome) glib gnomevfs libbonobo; + inherit (gnome) glib gnome_vfs libbonobo; }; libiconv = callPackage ../development/libraries/libiconv { }; @@ -6765,7 +6765,7 @@ let inherit fetchurl stdenv xz pkgconfig perl zip libjpeg libpng zlib cairo python dbus dbus_glib freetype fontconfig bzip2 xlibs alsaLib libnotify wirelesstools; - inherit (gnome) libIDL libgnomeui gnomevfs gtk pango; + inherit (gnome) libIDL libgnomeui gnome_vfs gtk pango; inherit (xlibs) pixman; inherit (pythonPackages) ply; }); @@ -6775,7 +6775,7 @@ let inherit fetchurl stdenv xz pkgconfig perl zip libjpeg libpng zlib cairo python dbus dbus_glib freetype fontconfig bzip2 xlibs alsaLib libnotify wirelesstools; - inherit (gnome) libIDL libgnomeui gnomevfs gtk pango; + inherit (gnome) libIDL libgnomeui gnome_vfs gtk pango; inherit (xlibs) pixman; inherit (pythonPackages) ply; }); @@ -6791,7 +6791,7 @@ let inherit fetchurl stdenv xz pkgconfig perl zip libjpeg libpng zlib cairo python dbus dbus_glib freetype fontconfig bzip2 xlibs alsaLib libnotify wirelesstools; - inherit (gnome) libIDL libgnomeui gnomevfs gtk pango; + inherit (gnome) libIDL libgnomeui gnome_vfs gtk pango; inherit (xlibs) pixman; inherit (pythonPackages) ply; }); @@ -6801,7 +6801,7 @@ let inherit fetchurl stdenv xz pkgconfig perl zip libjpeg libpng zlib cairo python dbus dbus_glib freetype fontconfig bzip2 xlibs alsaLib libnotify wirelesstools; - inherit (gnome) libIDL libgnomeui gnomevfs gtk pango; + inherit (gnome) libIDL libgnomeui gnome_vfs gtk pango; inherit (xlibs) pixman; inherit (pythonPackages) ply; }); @@ -6964,7 +6964,7 @@ let mmex = callPackage ../applications/office/mmex { }; monodevelop = callPackage ../applications/editors/monodevelop { - inherit (gnome) gnomevfs libbonobo libglade libgnome GConf glib gtk; + inherit (gnome) gnome_vfs libbonobo libglade libgnome GConf glib gtk; mozilla = firefox; gtksharp = gtksharp2; }; From 0ba5532d4be027d98cb74cd8d500cfb8ef3806e9 Mon Sep 17 00:00:00 2001 From: "Yury G. Kudryashov" Date: Sat, 8 Oct 2011 14:08:39 +0000 Subject: [PATCH 116/970] gnome-vfs-2.24.4 svn path=/nixpkgs/trunk/; revision=29719 --- pkgs/desktops/gnome-2.28/default.nix | 2 +- .../gnome-2.28/platform/gnome-vfs/default.nix | 15 ++++++++------- 2 files changed, 9 insertions(+), 8 deletions(-) diff --git a/pkgs/desktops/gnome-2.28/default.nix b/pkgs/desktops/gnome-2.28/default.nix index 7e56c158fdb..7516b53bc72 100644 --- a/pkgs/desktops/gnome-2.28/default.nix +++ b/pkgs/desktops/gnome-2.28/default.nix @@ -100,7 +100,7 @@ pkgs.makeOverridable }; gnome_vfs = import ./platform/gnome-vfs { - inherit (pkgs) stdenv fetchurl pkgconfig libxml2 bzip2 openssl samba dbus_glib fam hal cdparanoia; + inherit (pkgs) stdenv fetchurl_gnome pkgconfig libxml2 bzip2 openssl samba dbus_glib fam hal cdparanoia; inherit (pkgs.gtkLibs) glib; inherit intltool GConf gnome_mime_data; }; diff --git a/pkgs/desktops/gnome-2.28/platform/gnome-vfs/default.nix b/pkgs/desktops/gnome-2.28/platform/gnome-vfs/default.nix index 1e35ac9430b..c141da4324d 100644 --- a/pkgs/desktops/gnome-2.28/platform/gnome-vfs/default.nix +++ b/pkgs/desktops/gnome-2.28/platform/gnome-vfs/default.nix @@ -1,12 +1,13 @@ -{ stdenv, fetchurl, pkgconfig, libxml2, bzip2, openssl, samba, dbus_glib, glib, fam, hal, cdparanoia -, intltool, GConf, gnome_mime_data}: +{ stdenv, fetchurl_gnome, pkgconfig, libxml2, bzip2, openssl, samba, dbus_glib +, glib, fam, hal, cdparanoia, intltool, GConf, gnome_mime_data}: -stdenv.mkDerivation { - name = "gnome-vfs-2.24.1"; +stdenv.mkDerivation rec { + name = src.pkgname; - src = fetchurl { - url = mirror://gnome/sources/gnome-vfs/2.24/gnome-vfs-2.24.1.tar.bz2; - sha256 = "1dmyr8nj77717r8dhwkixpar2yp8ld3r683gp222n59v61718ndw"; + src = fetchurl_gnome { + project = "gnome-vfs"; + major = "2"; minor = "24"; patchlevel = "4"; + sha256 = "1ajg8jb8k3snxc7rrgczlh8daxkjidmcv3zr9w809sq4p2sn9pk2"; }; buildInputs = From a2d0e3b73923e6c1c02862c1ea9eeaf590d1412a Mon Sep 17 00:00:00 2001 From: "Yury G. Kudryashov" Date: Sat, 8 Oct 2011 14:08:44 +0000 Subject: [PATCH 117/970] libgnome-2.32.1, drop esound dependency svn path=/nixpkgs/trunk/; revision=29720 --- pkgs/desktops/gnome-2.28/default.nix | 4 ++-- .../gnome-2.28/platform/libgnome/default.nix | 20 ++++++++++--------- 2 files changed, 13 insertions(+), 11 deletions(-) diff --git a/pkgs/desktops/gnome-2.28/default.nix b/pkgs/desktops/gnome-2.28/default.nix index 7516b53bc72..432535e5595 100644 --- a/pkgs/desktops/gnome-2.28/default.nix +++ b/pkgs/desktops/gnome-2.28/default.nix @@ -112,9 +112,9 @@ pkgs.makeOverridable }; libgnome = import ./platform/libgnome { - inherit (pkgs) stdenv fetchurl pkgconfig popt zlib; + inherit (pkgs) stdenv fetchurl_gnome libcanberra pkgconfig popt zlib libtool; inherit (pkgs.gtkLibs) glib; - inherit intltool esound libbonobo GConf gnome_vfs ORBit2; + inherit intltool libbonobo GConf gnome_vfs ORBit2; }; libgnomeui = import ./platform/libgnomeui { diff --git a/pkgs/desktops/gnome-2.28/platform/libgnome/default.nix b/pkgs/desktops/gnome-2.28/platform/libgnome/default.nix index c79a61b883a..76f213b5fa8 100644 --- a/pkgs/desktops/gnome-2.28/platform/libgnome/default.nix +++ b/pkgs/desktops/gnome-2.28/platform/libgnome/default.nix @@ -1,14 +1,16 @@ -{ stdenv, fetchurl, pkgconfig, glib, popt, zlib -, intltool, esound, libbonobo, GConf, gnome_vfs, ORBit2}: +{ stdenv, fetchurl_gnome, pkgconfig, glib, popt, zlib, libcanberra +, intltool, libbonobo, GConf, gnome_vfs, ORBit2, libtool}: -stdenv.mkDerivation { - name = "libgnome-2.28.0"; +stdenv.mkDerivation rec { + name = src.pkgname; - src = fetchurl { - url = mirror://gnome/sources/libgnome/2.28/libgnome-2.28.0.tar.bz2; - sha256 = "03hc1m88swxxw4cq491kz7495ksv762imamzbbvhci41bc40anwv"; + src = fetchurl_gnome { + project = "libgnome"; + major = "2"; minor = "32"; patchlevel = "1"; + sha256 = "197pnq8y0knqjhm2fg4j6hbqqm3qfzfnd0irhwxpk1b4hqb3kimj"; }; - buildInputs = [ pkgconfig popt zlib intltool GConf gnome_vfs ]; - propagatedBuildInputs = [ glib libbonobo esound ]; + buildNativeInputs = [ pkgconfig ]; + buildInputs = [ popt zlib intltool GConf gnome_vfs libcanberra libtool ]; + propagatedBuildInputs = [ glib libbonobo ]; } From e60fe8673bee23847839c3b7e00c6f0c3f34c9d8 Mon Sep 17 00:00:00 2001 From: "Yury G. Kudryashov" Date: Sat, 8 Oct 2011 16:58:32 +0000 Subject: [PATCH 118/970] gnome: use callPackage, move to gnome-2 gnome28 was a mix of packages from various releases, so do not mention 2.28 in the attribute name. svn path=/nixpkgs/trunk/; revision=29721 --- pkgs/desktops/gnome-2.28/default.nix | 338 ------------------ .../bindings/libglademm/default.nix | 0 pkgs/desktops/gnome-2/default.nix | 133 +++++++ .../desktop/gnome-control-center/default.nix | 4 +- .../desktop/gnome-desktop/default.nix | 4 +- .../desktop/gnome-doc-utils/default.nix | 4 +- .../desktop/gnome-icon-theme/default.nix | 0 .../desktop/gnome-keyring/default.nix | 0 .../desktop/gnome-menus/default.nix | 0 .../desktop/gnome-panel/default.nix | 4 +- .../desktop/gnome-session/default.nix | 0 .../desktop/gnome-settings-daemon/default.nix | 0 .../desktop/gtksourceview/default.nix | 4 +- .../desktop/gvfs/builder.sh | 0 .../desktop/gvfs/default.nix | 0 .../desktop/libcroco/default.nix | 0 .../desktop/libgnomekbd/default.nix | 0 .../desktop/libgweather/default.nix | 0 .../desktop/librsvg/default.nix | 0 .../desktop/libsoup/default.nix | 0 .../desktop/libwnck/default.nix | 0 .../desktop/metacity/default.nix | 0 .../desktop/nautilus/default.nix | 0 .../desktop/rarian/default.nix | 0 .../desktop/scrollkeeper/default.nix | 0 .../desktop/vte/default.nix | 0 .../desktop/zenity/default.nix | 0 .../platform/GConf/default.nix | 0 .../platform/ORBit2/default.nix | 0 .../platform/at-spi/default.nix | 0 .../platform/audiofile/default.nix | 0 .../platform/esound/default.nix | 0 .../platform/glib-networking/default.nix | 0 .../platform/gnome-common/default.nix | 0 .../platform/gnome-mime-data/default.nix | 0 .../platform/gnome-vfs-monikers/default.nix | 0 .../platform/gnome-vfs/default.nix | 0 .../platform/gtk-doc/default.nix | 0 .../platform/gtkglext/default.nix | 0 .../01_remove-disable-deprecated.patch | 0 .../platform/gtkhtml/default.nix | 0 .../platform/intltool/default.nix | 0 .../platform/libIDL/default.nix | 0 .../platform/libart_lgpl/default.nix | 0 .../platform/libbonobo/default.nix | 0 .../platform/libbonoboui/default.nix | 0 .../platform/libglade/default.nix | 0 .../platform/libgnome/default.nix | 0 .../platform/libgnomecanvas/default.nix | 0 .../platform/libgnomecanvasmm/default.nix | 0 .../platform/libgnomecups/default.nix | 0 .../platform/libgnomeprint/default.nix | 0 .../platform/libgnomeprintui/default.nix | 0 .../platform/libgnomeui/default.nix | 0 .../platform/libgtkhtml/default.nix | 0 .../platform/libunique/default.nix | 0 .../platform/startup-notification/default.nix | 0 pkgs/top-level/all-packages.nix | 17 +- 58 files changed, 153 insertions(+), 355 deletions(-) delete mode 100644 pkgs/desktops/gnome-2.28/default.nix rename pkgs/desktops/{gnome-2.28 => gnome-2}/bindings/libglademm/default.nix (100%) create mode 100644 pkgs/desktops/gnome-2/default.nix rename pkgs/desktops/{gnome-2.28 => gnome-2}/desktop/gnome-control-center/default.nix (88%) rename pkgs/desktops/{gnome-2.28 => gnome-2}/desktop/gnome-desktop/default.nix (70%) rename pkgs/desktops/{gnome-2.28 => gnome-2}/desktop/gnome-doc-utils/default.nix (74%) rename pkgs/desktops/{gnome-2.28 => gnome-2}/desktop/gnome-icon-theme/default.nix (100%) rename pkgs/desktops/{gnome-2.28 => gnome-2}/desktop/gnome-keyring/default.nix (100%) rename pkgs/desktops/{gnome-2.28 => gnome-2}/desktop/gnome-menus/default.nix (100%) rename pkgs/desktops/{gnome-2.28 => gnome-2}/desktop/gnome-panel/default.nix (92%) rename pkgs/desktops/{gnome-2.28 => gnome-2}/desktop/gnome-session/default.nix (100%) rename pkgs/desktops/{gnome-2.28 => gnome-2}/desktop/gnome-settings-daemon/default.nix (100%) rename pkgs/desktops/{gnome-2.28 => gnome-2}/desktop/gtksourceview/default.nix (71%) rename pkgs/desktops/{gnome-2.28 => gnome-2}/desktop/gvfs/builder.sh (100%) rename pkgs/desktops/{gnome-2.28 => gnome-2}/desktop/gvfs/default.nix (100%) rename pkgs/desktops/{gnome-2.28 => gnome-2}/desktop/libcroco/default.nix (100%) rename pkgs/desktops/{gnome-2.28 => gnome-2}/desktop/libgnomekbd/default.nix (100%) rename pkgs/desktops/{gnome-2.28 => gnome-2}/desktop/libgweather/default.nix (100%) rename pkgs/desktops/{gnome-2.28 => gnome-2}/desktop/librsvg/default.nix (100%) rename pkgs/desktops/{gnome-2.28 => gnome-2}/desktop/libsoup/default.nix (100%) rename pkgs/desktops/{gnome-2.28 => gnome-2}/desktop/libwnck/default.nix (100%) rename pkgs/desktops/{gnome-2.28 => gnome-2}/desktop/metacity/default.nix (100%) rename pkgs/desktops/{gnome-2.28 => gnome-2}/desktop/nautilus/default.nix (100%) rename pkgs/desktops/{gnome-2.28 => gnome-2}/desktop/rarian/default.nix (100%) rename pkgs/desktops/{gnome-2.28 => gnome-2}/desktop/scrollkeeper/default.nix (100%) rename pkgs/desktops/{gnome-2.28 => gnome-2}/desktop/vte/default.nix (100%) rename pkgs/desktops/{gnome-2.28 => gnome-2}/desktop/zenity/default.nix (100%) rename pkgs/desktops/{gnome-2.28 => gnome-2}/platform/GConf/default.nix (100%) rename pkgs/desktops/{gnome-2.28 => gnome-2}/platform/ORBit2/default.nix (100%) rename pkgs/desktops/{gnome-2.28 => gnome-2}/platform/at-spi/default.nix (100%) rename pkgs/desktops/{gnome-2.28 => gnome-2}/platform/audiofile/default.nix (100%) rename pkgs/desktops/{gnome-2.28 => gnome-2}/platform/esound/default.nix (100%) rename pkgs/desktops/{gnome-2.28 => gnome-2}/platform/glib-networking/default.nix (100%) rename pkgs/desktops/{gnome-2.28 => gnome-2}/platform/gnome-common/default.nix (100%) rename pkgs/desktops/{gnome-2.28 => gnome-2}/platform/gnome-mime-data/default.nix (100%) rename pkgs/desktops/{gnome-2.28 => gnome-2}/platform/gnome-vfs-monikers/default.nix (100%) rename pkgs/desktops/{gnome-2.28 => gnome-2}/platform/gnome-vfs/default.nix (100%) rename pkgs/desktops/{gnome-2.28 => gnome-2}/platform/gtk-doc/default.nix (100%) rename pkgs/desktops/{gnome-2.28 => gnome-2}/platform/gtkglext/default.nix (100%) rename pkgs/desktops/{gnome-2.28 => gnome-2}/platform/gtkhtml/01_remove-disable-deprecated.patch (100%) rename pkgs/desktops/{gnome-2.28 => gnome-2}/platform/gtkhtml/default.nix (100%) rename pkgs/desktops/{gnome-2.28 => gnome-2}/platform/intltool/default.nix (100%) rename pkgs/desktops/{gnome-2.28 => gnome-2}/platform/libIDL/default.nix (100%) rename pkgs/desktops/{gnome-2.28 => gnome-2}/platform/libart_lgpl/default.nix (100%) rename pkgs/desktops/{gnome-2.28 => gnome-2}/platform/libbonobo/default.nix (100%) rename pkgs/desktops/{gnome-2.28 => gnome-2}/platform/libbonoboui/default.nix (100%) rename pkgs/desktops/{gnome-2.28 => gnome-2}/platform/libglade/default.nix (100%) rename pkgs/desktops/{gnome-2.28 => gnome-2}/platform/libgnome/default.nix (100%) rename pkgs/desktops/{gnome-2.28 => gnome-2}/platform/libgnomecanvas/default.nix (100%) rename pkgs/desktops/{gnome-2.28 => gnome-2}/platform/libgnomecanvasmm/default.nix (100%) rename pkgs/desktops/{gnome-2.28 => gnome-2}/platform/libgnomecups/default.nix (100%) rename pkgs/desktops/{gnome-2.28 => gnome-2}/platform/libgnomeprint/default.nix (100%) rename pkgs/desktops/{gnome-2.28 => gnome-2}/platform/libgnomeprintui/default.nix (100%) rename pkgs/desktops/{gnome-2.28 => gnome-2}/platform/libgnomeui/default.nix (100%) rename pkgs/desktops/{gnome-2.28 => gnome-2}/platform/libgtkhtml/default.nix (100%) rename pkgs/desktops/{gnome-2.28 => gnome-2}/platform/libunique/default.nix (100%) rename pkgs/desktops/{gnome-2.28 => gnome-2}/platform/startup-notification/default.nix (100%) diff --git a/pkgs/desktops/gnome-2.28/default.nix b/pkgs/desktops/gnome-2.28/default.nix deleted file mode 100644 index 432535e5595..00000000000 --- a/pkgs/desktops/gnome-2.28/default.nix +++ /dev/null @@ -1,338 +0,0 @@ -pkgs: -pkgs.makeOverridable -(__overrides: rec { - inherit __overrides; - - inherit (pkgs.gtkLibs) glib pango atk gtk gtkmm; - - # Backward compatibility. - startupnotification = startup_notification; - gnomedocutils = gnome_doc_utils; - gnomeicontheme = gnome_icon_theme; - gnomepanel = gnome_panel; - -#### PLATFORM - - audiofile = import ./platform/audiofile { - inherit (pkgs) stdenv fetchurl; - }; - - esound = import ./platform/esound { - inherit (pkgs) stdenv fetchurl pkgconfig alsaLib; - inherit audiofile; - }; - - libIDL = import ./platform/libIDL { - inherit (pkgs) stdenv fetchurl flex bison pkgconfig; - inherit (pkgs.gtkLibs) glib; - gettext = if pkgs.stdenv.isDarwin then pkgs.gettext else null; - }; - - ORBit2 = import ./platform/ORBit2 { - inherit (pkgs) stdenv fetchurl pkgconfig; - inherit (pkgs.gtkLibs) glib; - inherit libIDL; - }; - - libart_lgpl = import ./platform/libart_lgpl { - inherit (pkgs) stdenv fetchurl; - }; - - libglade = import ./platform/libglade { - inherit (pkgs) stdenv fetchurl pkgconfig libxml2 python gettext; - inherit (pkgs.gtkLibs) gtk; - }; - - libgnomeprint = import ./platform/libgnomeprint { - inherit intltool libart_lgpl libgnomecups; - inherit (pkgs) stdenv fetchurl pkgconfig gettext libxml2 bison flex; - inherit (pkgs.gtkLibs) gtk; - }; - - libgnomeprintui = import ./platform/libgnomeprintui { - inherit intltool libgnomecanvas libgnomeprint gnomeicontheme; - inherit (pkgs) stdenv fetchurl pkgconfig gettext; - inherit (pkgs.gtkLibs) gtk; - }; - - libgnomecups = import ./platform/libgnomecups { - inherit intltool libart_lgpl; - inherit (pkgs) stdenv fetchurl pkgconfig gettext libxml2; - inherit (pkgs.gtkLibs) gtk; - }; - - libgtkhtml = import ./platform/libgtkhtml { - inherit (pkgs) stdenv fetchurl pkgconfig gettext libxml2; - inherit (pkgs.gtkLibs) gtk; - }; - - intltool = import ./platform/intltool { - inherit (pkgs) stdenv fetchurl pkgconfig perl perlXMLParser gettext; - }; - - GConf = import ./platform/GConf { - inherit (pkgs) stdenv fetchurl pkgconfig dbus_glib libxml2 policykit; - inherit (pkgs.gtkLibs) glib; - inherit intltool ORBit2; - dbus_libs = pkgs.dbus.libs; - }; - - libgnomecanvas = import ./platform/libgnomecanvas { - inherit (pkgs) stdenv fetchurl pkgconfig; - inherit (pkgs.gtkLibs) gtk; - inherit intltool libart_lgpl libglade; - }; - - libgnomecanvasmm = import ./platform/libgnomecanvasmm { - inherit (pkgs) stdenv fetchurl pkgconfig; - inherit libgnomecanvas gtkmm; - }; - - # for git-head builds - gnome_common = import platform/gnome-common { - inherit (pkgs) stdenv fetchgit pkgconfig - autoconf automake libtool; - }; - - gnome_mime_data = import ./platform/gnome-mime-data { - inherit (pkgs) stdenv fetchurl; - inherit intltool; - }; - - gnome_vfs = import ./platform/gnome-vfs { - inherit (pkgs) stdenv fetchurl_gnome pkgconfig libxml2 bzip2 openssl samba dbus_glib fam hal cdparanoia; - inherit (pkgs.gtkLibs) glib; - inherit intltool GConf gnome_mime_data; - }; - - gnome_vfs_monikers = import ./platform/gnome-vfs-monikers { - inherit (pkgs) stdenv fetchurl pkgconfig; - inherit (pkgs.gtkLibs) glib; - inherit intltool gnome_vfs libbonobo ORBit2; - }; - - libgnome = import ./platform/libgnome { - inherit (pkgs) stdenv fetchurl_gnome libcanberra pkgconfig popt zlib libtool; - inherit (pkgs.gtkLibs) glib; - inherit intltool libbonobo GConf gnome_vfs ORBit2; - }; - - libgnomeui = import ./platform/libgnomeui { - inherit (pkgs) stdenv fetchurl pkgconfig libxml2 xlibs; - inherit intltool libgnome libgnomecanvas libbonoboui GConf; - inherit gnome_vfs gnome_keyring libglade glib pango; - }; - - libbonobo = import ./platform/libbonobo { - inherit (pkgs) stdenv fetchurl flex bison pkgconfig dbus_glib libxml2 popt; - inherit (pkgs.gtkLibs) glib; - inherit intltool ORBit2; - }; - - libbonoboui = import ./platform/libbonoboui { - inherit (pkgs) stdenv fetchurl bison pkgconfig popt libxml2; - inherit intltool libbonobo GConf libgnomecanvas libgnome libglade gtk; - }; - - at_spi = import ./platform/at-spi { - inherit (pkgs) stdenv fetchurl python pkgconfig popt; - inherit (pkgs.xlibs) libX11 libICE libXtst libXi; - inherit (pkgs.gtkLibs) atk gtk; - inherit intltool libbonobo ORBit2; - }; - - glib_networking = import ./platform/glib-networking { - inherit (pkgs) stdenv fetchurl pkgconfig glib libtool intltool gnutls2 - libproxy libgcrypt libtasn1; - }; - - gtk_doc = import ./platform/gtk-doc { - inherit (pkgs) stdenv fetchurl pkgconfig perl python libxml2 libxslt; - inherit (pkgs) docbook_xml_dtd_43 docbook_xsl dblatex; - inherit gnome_doc_utils; - }; - - # What name should we use?? - gtkdoc = gtk_doc; - - gtkhtml = import ./platform/gtkhtml { - inherit (pkgs.gtkLibs) gtk; - inherit (pkgs) fetchurl stdenv pkgconfig intltool enchant isocodes; - inherit GConf gnome_icon_theme; - }; - - - # Freedesktop library - startup_notification = import ./platform/startup-notification { - inherit (pkgs) stdenv fetchurl pkgconfig xlibs; - }; - - # Required for nautilus - libunique = import ./platform/libunique { - inherit (pkgs) stdenv fetchurl pkgconfig gettext; - inherit (pkgs.gtkLibs) gtk; - }; - - gtkglext = import ./platform/gtkglext { - inherit (pkgs) stdenv fetchurl mesa pkgconfig; - inherit (pkgs.gtkLibs) gtk pango; - }; - -#### DESKTOP - - gnome_keyring = import ./desktop/gnome-keyring { - inherit (pkgs) stdenv fetchurl pkgconfig dbus libgcrypt libtasn1 pam python; - inherit (pkgs.gtkLibs) glib gtk; - inherit intltool GConf; - }; - - libsoup = import ./desktop/libsoup { - inherit (pkgs) stdenv fetchurl pkgconfig libxml2 gnutls libproxy sqlite curl; - inherit (pkgs.gtkLibs) glib; - inherit GConf gnome_keyring; - }; - - libwnck = import ./desktop/libwnck { - inherit (pkgs) stdenv fetchurl pkgconfig; - inherit (pkgs.xlibs) libX11; - inherit (pkgs.gtkLibs) gtk; - inherit intltool; - }; - - # Not part of GNOME desktop, but provides CSS support for librsvg - libcroco = import ./desktop/libcroco { - inherit (pkgs) stdenv fetchurl pkgconfig libxml2; - inherit (pkgs.gtkLibs) glib; - }; - - librsvg = import ./desktop/librsvg { - inherit (pkgs) stdenv fetchurl pkgconfig libxml2 libgsf bzip2; - inherit (pkgs.gtkLibs) glib gtk; - inherit libcroco; - }; - - libgweather = import ./desktop/libgweather { - inherit (pkgs) stdenv fetchurl pkgconfig libxml2 libtasn1 nettle gmp; - inherit (pkgs.gtkLibs) gtk; - inherit intltool GConf libsoup; - }; - - gvfs = import ./desktop/gvfs { - inherit (pkgs) stdenv fetchurl pkgconfig dbus samba hal libarchive fuse libgphoto2 cdparanoia libxml2 libtool; - inherit (pkgs.gtkLibs) glib; - inherit intltool GConf gnome_keyring libsoup; - }; - - libgnomekbd = import ./desktop/libgnomekbd { - inherit (pkgs) stdenv fetchurl pkgconfig dbus_glib libxklavier; - inherit (pkgs.gtkLibs) glib gtk; - inherit intltool GConf libglade; - }; - - # Removed from recent GNOME releases, but still required - scrollkeeper = import ./desktop/scrollkeeper { - inherit (pkgs) stdenv fetchurl pkgconfig perl perlXMLParser libxml2 libxslt docbook_xml_dtd_42 automake; - }; - - # scrollkeeper replacement - rarian = import ./desktop/rarian { - inherit (pkgs) stdenv fetchurl pkgconfig perl perlXMLParser libxml2 libxslt docbook_xml_dtd_42; - }; - - gnome_doc_utils = import ./desktop/gnome-doc-utils { - inherit (pkgs) stdenv fetchurl python pkgconfig libxslt - makeWrapper; - inherit intltool scrollkeeper; - libxml2 = pkgs.libxml2Python; - }; - - zenity = import ./desktop/zenity { - inherit (pkgs) stdenv fetchurl pkgconfig cairo libxml2 libxslt; - inherit (pkgs.gtkLibs) glib gtk pango atk; - inherit gnome_doc_utils intltool libglade; - inherit (pkgs.xlibs) libX11; - }; - - metacity = import ./desktop/metacity { - inherit (pkgs) stdenv fetchurl pkgconfig libcanberra; - inherit (pkgs.gtkLibs) glib gtk; - inherit (pkgs.xlibs) libXcomposite libXcursor libXdamage; - inherit intltool GConf startup_notification zenity gnome_doc_utils; - }; - - gnome_menus = import ./desktop/gnome-menus { - inherit (pkgs) stdenv fetchurl pkgconfig python; - inherit (pkgs.gtkLibs) glib; - inherit intltool; - }; - - gnome_desktop = import ./desktop/gnome-desktop { - inherit (pkgs) stdenv fetchurl pkgconfig python libxslt which; - libxml2 = pkgs.libxml2Python; - inherit (pkgs.xlibs) libX11; - inherit (pkgs.gtkLibs) gtk; - inherit intltool GConf gnome_doc_utils; - }; - - gnome_panel = import ./desktop/gnome-panel { - inherit (pkgs) stdenv fetchurl pkgconfig dbus_glib dbus cairo popt which bzip2 python libxslt libtasn1; - libxml2 = pkgs.libxml2Python; - inherit (pkgs.gtkLibs) glib gtk pango atk; - inherit (pkgs.xlibs) libXau; - inherit intltool ORBit2 libglade libgnome libgnomeui libbonobo libbonoboui GConf gnome_menus gnome_desktop; - inherit libwnck librsvg libgweather gnome_doc_utils libgnomecanvas libart_lgpl; - }; - - gnome_session = import ./desktop/gnome-session { - inherit (pkgs) stdenv fetchurl pkgconfig dbus_glib cairo dbus; - inherit (pkgs.gtkLibs) gtk pango atk; - inherit (pkgs.xlibs) libXau libXtst inputproto; - inherit intltool libglade startup_notification GConf; - }; - - gnome_settings_daemon = import ./desktop/gnome-settings-daemon { - inherit (pkgs) stdenv fetchurl pkgconfig dbus_glib libxklavier; - inherit (pkgs.gtkLibs) gtk; - inherit intltool GConf gnome_desktop libglade libgnomekbd; - }; - - gnome_control_center = import ./desktop/gnome-control-center { - inherit (pkgs) stdenv fetchurl pkgconfig dbus_glib libxklavier hal libtool bzip2; - inherit (pkgs) cairo popt which python libxslt shared_mime_info desktop_file_utils; - inherit (pkgs.gtkLibs) glib gtk pango atk; - inherit gnome_doc_utils intltool GConf libglade libgnome libgnomeui libgnomekbd libunique; - inherit librsvg gnome_menus gnome_desktop gnome_panel metacity gnome_settings_daemon; - inherit libbonobo libbonoboui libgnomecanvas libart_lgpl gnome_vfs ORBit2; - libxml2 = pkgs.libxml2Python; - }; - - gtksourceview = import ./desktop/gtksourceview { - inherit (pkgs) stdenv fetchurl pkgconfig cairo perl intltool - gettext; - inherit (pkgs.gtkLibs) atk glib gtk pango; - libxml2 = pkgs.libxml2Python; - }; - - nautilus = import ./desktop/nautilus { - inherit (pkgs) stdenv fetchurl pkgconfig libxml2 dbus_glib libexif shared_mime_info; - inherit (pkgs.gtkLibs) gtk; - inherit gnome_desktop libunique intltool GConf; - }; - - gnome_icon_theme = import ./desktop/gnome-icon-theme { - inherit (pkgs) stdenv fetchurl pkgconfig intltool iconnamingutils; - }; - - vte = import ./desktop/vte { - inherit (pkgs) stdenv fetchurl pkgconfig ncurses python; - inherit intltool glib gtk; - }; - -#### BINDINGS - - libglademm = import ./bindings/libglademm { - inherit (pkgs) stdenv fetchurl pkgconfig intltool; - inherit gtkmm libglade; - }; - -}) {} diff --git a/pkgs/desktops/gnome-2.28/bindings/libglademm/default.nix b/pkgs/desktops/gnome-2/bindings/libglademm/default.nix similarity index 100% rename from pkgs/desktops/gnome-2.28/bindings/libglademm/default.nix rename to pkgs/desktops/gnome-2/bindings/libglademm/default.nix diff --git a/pkgs/desktops/gnome-2/default.nix b/pkgs/desktops/gnome-2/default.nix new file mode 100644 index 00000000000..814b054f74e --- /dev/null +++ b/pkgs/desktops/gnome-2/default.nix @@ -0,0 +1,133 @@ +{ callPackage, self, stdenv, gettext, overrides ? {} }: +{ + __overrides = overrides; + + # Backward compatibility. + gtkdoc = self.gtk_doc; + startupnotification = self.startup_notification; + gnomedocutils = self.gnome_doc_utils; + gnomeicontheme = self.gnome_icon_theme; + gnomepanel = self.gnome_panel; + +#### PLATFORM + + audiofile = callPackage ./platform/audiofile { }; + + esound = callPackage ./platform/esound { }; + + libIDL = callPackage ./platform/libIDL { + gettext = if stdenv.isDarwin then gettext else null; + }; + + ORBit2 = callPackage ./platform/ORBit2 { }; + + libart_lgpl = callPackage ./platform/libart_lgpl { }; + + libglade = callPackage ./platform/libglade { }; + + libgnomeprint = callPackage ./platform/libgnomeprint { }; + + libgnomeprintui = callPackage ./platform/libgnomeprintui { }; + + libgnomecups = callPackage ./platform/libgnomecups { }; + + libgtkhtml = callPackage ./platform/libgtkhtml { }; + + intltool = callPackage ./platform/intltool { }; + + GConf = callPackage ./platform/GConf { }; + + libgnomecanvas = callPackage ./platform/libgnomecanvas { }; + + libgnomecanvasmm = callPackage ./platform/libgnomecanvasmm { }; + + # for git-head builds + gnome_common = callPackage platform/gnome-common { }; + + gnome_mime_data = callPackage ./platform/gnome-mime-data { }; + + gnome_vfs = callPackage ./platform/gnome-vfs { }; + + gnome_vfs_monikers = callPackage ./platform/gnome-vfs-monikers { }; + + libgnome = callPackage ./platform/libgnome { }; + + libgnomeui = callPackage ./platform/libgnomeui { }; + + libbonobo = callPackage ./platform/libbonobo { }; + + libbonoboui = callPackage ./platform/libbonoboui { }; + + at_spi = callPackage ./platform/at-spi { }; + + glib_networking = callPackage ./platform/glib-networking { }; + + gtk_doc = callPackage ./platform/gtk-doc { }; + + gtkhtml = callPackage ./platform/gtkhtml { }; + + + # Freedesktop library + startup_notification = callPackage ./platform/startup-notification { }; + + # Required for nautilus + libunique = callPackage ./platform/libunique { }; + + gtkglext = callPackage ./platform/gtkglext { }; + +#### DESKTOP + + gnome_keyring = callPackage ./desktop/gnome-keyring { }; + + libsoup = callPackage ./desktop/libsoup { }; + + libwnck = callPackage ./desktop/libwnck { }; + + # Not part of GNOME desktop, but provides CSS support for librsvg + libcroco = callPackage ./desktop/libcroco { }; + + librsvg = callPackage ./desktop/librsvg { }; + + libgweather = callPackage ./desktop/libgweather { }; + + gvfs = callPackage ./desktop/gvfs { }; + + libgnomekbd = callPackage ./desktop/libgnomekbd { }; + + # Removed from recent GNOME releases, but still required + scrollkeeper = callPackage ./desktop/scrollkeeper { }; + + # scrollkeeper replacement + rarian = callPackage ./desktop/rarian { }; + + gnome_doc_utils = callPackage ./desktop/gnome-doc-utils { }; + + zenity = callPackage ./desktop/zenity { }; + + metacity = callPackage ./desktop/metacity { }; + + gnome_menus = callPackage ./desktop/gnome-menus { }; + + gnome_desktop = callPackage ./desktop/gnome-desktop { }; + + gnome_panel = callPackage ./desktop/gnome-panel { }; + + gnome_session = callPackage ./desktop/gnome-session { }; + + gnome_settings_daemon = callPackage ./desktop/gnome-settings-daemon { }; + + gnome_control_center = callPackage ./desktop/gnome-control-center { }; + + gtksourceview = callPackage ./desktop/gtksourceview { }; + + nautilus = callPackage ./desktop/nautilus { }; + + gnome_icon_theme = callPackage ./desktop/gnome-icon-theme { }; + + vte = callPackage ./desktop/vte { }; + +#### BINDINGS + + libglademm = callPackage ./bindings/libglademm { }; + +} diff --git a/pkgs/desktops/gnome-2.28/desktop/gnome-control-center/default.nix b/pkgs/desktops/gnome-2/desktop/gnome-control-center/default.nix similarity index 88% rename from pkgs/desktops/gnome-2.28/desktop/gnome-control-center/default.nix rename to pkgs/desktops/gnome-2/desktop/gnome-control-center/default.nix index 4ebbd20d229..7d7e6cb6aec 100644 --- a/pkgs/desktops/gnome-2.28/desktop/gnome-control-center/default.nix +++ b/pkgs/desktops/gnome-2/desktop/gnome-control-center/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, dbus_glib, libxml2, libxslt, libxklavier, hal, cairo, popt, which, python +{ stdenv, fetchurl, pkgconfig, dbus_glib, libxml2Python, libxslt, libxklavier, hal, cairo, popt, which, python , shared_mime_info, desktop_file_utils, libunique, libtool, bzip2 , glib, gtk, pango, atk, gnome_doc_utils, intltool, GConf, libglade, libgnome, libgnomeui, libgnomekbd , librsvg, gnome_menus, gnome_desktop, gnome_panel, metacity, gnome_settings_daemon @@ -10,7 +10,7 @@ stdenv.mkDerivation { url = mirror://gnome/sources/gnome-control-center/2.28/gnome-control-center-2.28.0.tar.bz2; sha256 = "0m0z7dn5qzl63cpc8ivagm4yfsfgigfawl5v3df3pw3z4jk2bsfp"; }; - buildInputs = [ pkgconfig dbus_glib libxml2 libxslt libxklavier hal popt which python shared_mime_info desktop_file_utils + buildInputs = [ pkgconfig dbus_glib libxml2Python libxslt libxklavier hal popt which python shared_mime_info desktop_file_utils gtk gnome_doc_utils intltool GConf libglade libgnomekbd libunique libtool bzip2 libgnomeui librsvg gnome_menus gnome_desktop gnome_panel metacity gnome_settings_daemon ]; configureFlags = "--disable-scrollkeeper"; diff --git a/pkgs/desktops/gnome-2.28/desktop/gnome-desktop/default.nix b/pkgs/desktops/gnome-2/desktop/gnome-desktop/default.nix similarity index 70% rename from pkgs/desktops/gnome-2.28/desktop/gnome-desktop/default.nix rename to pkgs/desktops/gnome-2/desktop/gnome-desktop/default.nix index e048488bff8..8c011ad2769 100644 --- a/pkgs/desktops/gnome-2.28/desktop/gnome-desktop/default.nix +++ b/pkgs/desktops/gnome-2/desktop/gnome-desktop/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, python, libxml2, libxslt, which, libX11, gtk +{ stdenv, fetchurl, pkgconfig, python, libxml2Python, libxslt, which, libX11, gtk , intltool, GConf, gnome_doc_utils}: stdenv.mkDerivation { @@ -8,6 +8,6 @@ stdenv.mkDerivation { sha256 = "1raag5c74pyy0f1i37fjxyxcnk9ck4mh6c1hcdmv5dv40xndwvwp"; }; configureFlags = "--disable-scrollkeeper"; - buildInputs = [ pkgconfig python libxml2 libxslt which libX11 gtk + buildInputs = [ pkgconfig python libxml2Python libxslt which libX11 gtk intltool GConf gnome_doc_utils ]; } diff --git a/pkgs/desktops/gnome-2.28/desktop/gnome-doc-utils/default.nix b/pkgs/desktops/gnome-2/desktop/gnome-doc-utils/default.nix similarity index 74% rename from pkgs/desktops/gnome-2.28/desktop/gnome-doc-utils/default.nix rename to pkgs/desktops/gnome-2/desktop/gnome-doc-utils/default.nix index c2e49deb009..58d3dfd0a8f 100644 --- a/pkgs/desktops/gnome-2.28/desktop/gnome-doc-utils/default.nix +++ b/pkgs/desktops/gnome-2/desktop/gnome-doc-utils/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchurl, python, pkgconfig, libxml2, libxslt, intltool, scrollkeeper, +{stdenv, fetchurl, python, pkgconfig, libxml2Python, libxslt, intltool, scrollkeeper, makeWrapper}: stdenv.mkDerivation { @@ -8,7 +8,7 @@ stdenv.mkDerivation { sha256 = "1937zr088vn7vhy9rwfc021ih21hhf700c3m4ria8mlcpcvh1380"; }; configureFlags = "--disable-scrollkeeper"; - buildInputs = [ python pkgconfig libxml2 libxslt intltool scrollkeeper + buildInputs = [ python pkgconfig libxml2Python libxslt intltool scrollkeeper makeWrapper ]; postInstall = '' wrapProgram $out/bin/xml2po --prefix PYTHONPATH : $(toPythonPath $out) \ diff --git a/pkgs/desktops/gnome-2.28/desktop/gnome-icon-theme/default.nix b/pkgs/desktops/gnome-2/desktop/gnome-icon-theme/default.nix similarity index 100% rename from pkgs/desktops/gnome-2.28/desktop/gnome-icon-theme/default.nix rename to pkgs/desktops/gnome-2/desktop/gnome-icon-theme/default.nix diff --git a/pkgs/desktops/gnome-2.28/desktop/gnome-keyring/default.nix b/pkgs/desktops/gnome-2/desktop/gnome-keyring/default.nix similarity index 100% rename from pkgs/desktops/gnome-2.28/desktop/gnome-keyring/default.nix rename to pkgs/desktops/gnome-2/desktop/gnome-keyring/default.nix diff --git a/pkgs/desktops/gnome-2.28/desktop/gnome-menus/default.nix b/pkgs/desktops/gnome-2/desktop/gnome-menus/default.nix similarity index 100% rename from pkgs/desktops/gnome-2.28/desktop/gnome-menus/default.nix rename to pkgs/desktops/gnome-2/desktop/gnome-menus/default.nix diff --git a/pkgs/desktops/gnome-2.28/desktop/gnome-panel/default.nix b/pkgs/desktops/gnome-2/desktop/gnome-panel/default.nix similarity index 92% rename from pkgs/desktops/gnome-2.28/desktop/gnome-panel/default.nix rename to pkgs/desktops/gnome-2/desktop/gnome-panel/default.nix index 48b2ca2f8ef..774b1ff508b 100644 --- a/pkgs/desktops/gnome-2.28/desktop/gnome-panel/default.nix +++ b/pkgs/desktops/gnome-2/desktop/gnome-panel/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, dbus_glib, dbus, cairo, popt, which, libxml2, libxslt, bzip2, python +{ stdenv, fetchurl, pkgconfig, dbus_glib, dbus, cairo, popt, which, libxml2Python, libxslt, bzip2, python , glib, gtk, pango, atk, libXau , intltool, ORBit2, libglade, libgnome, libgnomeui, libbonobo, libbonoboui, GConf, gnome_menus, gnome_desktop , libwnck, librsvg, libgweather, gnome_doc_utils, libgnomecanvas, libart_lgpl, libtasn1}: @@ -9,7 +9,7 @@ stdenv.mkDerivation { url = mirror://gnome/sources/gnome-panel/2.28/gnome-panel-2.28.0.tar.bz2; sha256 = "0rc4f6vmyrm3s8ncbll0a1ik2j1gg068fq3xal120sc4iw68q5n1"; }; - buildInputs = [ pkgconfig gtk dbus_glib popt which libxml2 libxslt bzip2 python libXau + buildInputs = [ pkgconfig gtk dbus_glib popt which libxml2Python libxslt bzip2 python libXau intltool ORBit2 libglade libgnome libgnomeui libbonobo libbonoboui GConf gnome_menus gnome_desktop libwnck librsvg libgweather gnome_doc_utils libtasn1 ]; configureFlags = "--disable-scrollkeeper"; diff --git a/pkgs/desktops/gnome-2.28/desktop/gnome-session/default.nix b/pkgs/desktops/gnome-2/desktop/gnome-session/default.nix similarity index 100% rename from pkgs/desktops/gnome-2.28/desktop/gnome-session/default.nix rename to pkgs/desktops/gnome-2/desktop/gnome-session/default.nix diff --git a/pkgs/desktops/gnome-2.28/desktop/gnome-settings-daemon/default.nix b/pkgs/desktops/gnome-2/desktop/gnome-settings-daemon/default.nix similarity index 100% rename from pkgs/desktops/gnome-2.28/desktop/gnome-settings-daemon/default.nix rename to pkgs/desktops/gnome-2/desktop/gnome-settings-daemon/default.nix diff --git a/pkgs/desktops/gnome-2.28/desktop/gtksourceview/default.nix b/pkgs/desktops/gnome-2/desktop/gtksourceview/default.nix similarity index 71% rename from pkgs/desktops/gnome-2.28/desktop/gtksourceview/default.nix rename to pkgs/desktops/gnome-2/desktop/gtksourceview/default.nix index 64dbd8e1a6f..aa1080012d5 100644 --- a/pkgs/desktops/gnome-2.28/desktop/gtksourceview/default.nix +++ b/pkgs/desktops/gnome-2/desktop/gtksourceview/default.nix @@ -1,5 +1,5 @@ {stdenv, fetchurl, pkgconfig, atk, cairo, glib, gtk, pango, - libxml2, perl, intltool, gettext}: + libxml2Python, perl, intltool, gettext}: stdenv.mkDerivation { name = "gtksourceview-2.9.9"; @@ -7,6 +7,6 @@ stdenv.mkDerivation { url = mirror://gnome/sources/gtksourceview/2.9/gtksourceview-2.9.9.tar.bz2; sha256 = "0d0i586nj8jsqqfcjcvaj0yzc3sid3s1a4y62xr0qbddkbn1wllj"; }; - buildInputs = [pkgconfig atk cairo glib gtk pango libxml2 perl intltool + buildInputs = [pkgconfig atk cairo glib gtk pango libxml2Python perl intltool gettext]; } diff --git a/pkgs/desktops/gnome-2.28/desktop/gvfs/builder.sh b/pkgs/desktops/gnome-2/desktop/gvfs/builder.sh similarity index 100% rename from pkgs/desktops/gnome-2.28/desktop/gvfs/builder.sh rename to pkgs/desktops/gnome-2/desktop/gvfs/builder.sh diff --git a/pkgs/desktops/gnome-2.28/desktop/gvfs/default.nix b/pkgs/desktops/gnome-2/desktop/gvfs/default.nix similarity index 100% rename from pkgs/desktops/gnome-2.28/desktop/gvfs/default.nix rename to pkgs/desktops/gnome-2/desktop/gvfs/default.nix diff --git a/pkgs/desktops/gnome-2.28/desktop/libcroco/default.nix b/pkgs/desktops/gnome-2/desktop/libcroco/default.nix similarity index 100% rename from pkgs/desktops/gnome-2.28/desktop/libcroco/default.nix rename to pkgs/desktops/gnome-2/desktop/libcroco/default.nix diff --git a/pkgs/desktops/gnome-2.28/desktop/libgnomekbd/default.nix b/pkgs/desktops/gnome-2/desktop/libgnomekbd/default.nix similarity index 100% rename from pkgs/desktops/gnome-2.28/desktop/libgnomekbd/default.nix rename to pkgs/desktops/gnome-2/desktop/libgnomekbd/default.nix diff --git a/pkgs/desktops/gnome-2.28/desktop/libgweather/default.nix b/pkgs/desktops/gnome-2/desktop/libgweather/default.nix similarity index 100% rename from pkgs/desktops/gnome-2.28/desktop/libgweather/default.nix rename to pkgs/desktops/gnome-2/desktop/libgweather/default.nix diff --git a/pkgs/desktops/gnome-2.28/desktop/librsvg/default.nix b/pkgs/desktops/gnome-2/desktop/librsvg/default.nix similarity index 100% rename from pkgs/desktops/gnome-2.28/desktop/librsvg/default.nix rename to pkgs/desktops/gnome-2/desktop/librsvg/default.nix diff --git a/pkgs/desktops/gnome-2.28/desktop/libsoup/default.nix b/pkgs/desktops/gnome-2/desktop/libsoup/default.nix similarity index 100% rename from pkgs/desktops/gnome-2.28/desktop/libsoup/default.nix rename to pkgs/desktops/gnome-2/desktop/libsoup/default.nix diff --git a/pkgs/desktops/gnome-2.28/desktop/libwnck/default.nix b/pkgs/desktops/gnome-2/desktop/libwnck/default.nix similarity index 100% rename from pkgs/desktops/gnome-2.28/desktop/libwnck/default.nix rename to pkgs/desktops/gnome-2/desktop/libwnck/default.nix diff --git a/pkgs/desktops/gnome-2.28/desktop/metacity/default.nix b/pkgs/desktops/gnome-2/desktop/metacity/default.nix similarity index 100% rename from pkgs/desktops/gnome-2.28/desktop/metacity/default.nix rename to pkgs/desktops/gnome-2/desktop/metacity/default.nix diff --git a/pkgs/desktops/gnome-2.28/desktop/nautilus/default.nix b/pkgs/desktops/gnome-2/desktop/nautilus/default.nix similarity index 100% rename from pkgs/desktops/gnome-2.28/desktop/nautilus/default.nix rename to pkgs/desktops/gnome-2/desktop/nautilus/default.nix diff --git a/pkgs/desktops/gnome-2.28/desktop/rarian/default.nix b/pkgs/desktops/gnome-2/desktop/rarian/default.nix similarity index 100% rename from pkgs/desktops/gnome-2.28/desktop/rarian/default.nix rename to pkgs/desktops/gnome-2/desktop/rarian/default.nix diff --git a/pkgs/desktops/gnome-2.28/desktop/scrollkeeper/default.nix b/pkgs/desktops/gnome-2/desktop/scrollkeeper/default.nix similarity index 100% rename from pkgs/desktops/gnome-2.28/desktop/scrollkeeper/default.nix rename to pkgs/desktops/gnome-2/desktop/scrollkeeper/default.nix diff --git a/pkgs/desktops/gnome-2.28/desktop/vte/default.nix b/pkgs/desktops/gnome-2/desktop/vte/default.nix similarity index 100% rename from pkgs/desktops/gnome-2.28/desktop/vte/default.nix rename to pkgs/desktops/gnome-2/desktop/vte/default.nix diff --git a/pkgs/desktops/gnome-2.28/desktop/zenity/default.nix b/pkgs/desktops/gnome-2/desktop/zenity/default.nix similarity index 100% rename from pkgs/desktops/gnome-2.28/desktop/zenity/default.nix rename to pkgs/desktops/gnome-2/desktop/zenity/default.nix diff --git a/pkgs/desktops/gnome-2.28/platform/GConf/default.nix b/pkgs/desktops/gnome-2/platform/GConf/default.nix similarity index 100% rename from pkgs/desktops/gnome-2.28/platform/GConf/default.nix rename to pkgs/desktops/gnome-2/platform/GConf/default.nix diff --git a/pkgs/desktops/gnome-2.28/platform/ORBit2/default.nix b/pkgs/desktops/gnome-2/platform/ORBit2/default.nix similarity index 100% rename from pkgs/desktops/gnome-2.28/platform/ORBit2/default.nix rename to pkgs/desktops/gnome-2/platform/ORBit2/default.nix diff --git a/pkgs/desktops/gnome-2.28/platform/at-spi/default.nix b/pkgs/desktops/gnome-2/platform/at-spi/default.nix similarity index 100% rename from pkgs/desktops/gnome-2.28/platform/at-spi/default.nix rename to pkgs/desktops/gnome-2/platform/at-spi/default.nix diff --git a/pkgs/desktops/gnome-2.28/platform/audiofile/default.nix b/pkgs/desktops/gnome-2/platform/audiofile/default.nix similarity index 100% rename from pkgs/desktops/gnome-2.28/platform/audiofile/default.nix rename to pkgs/desktops/gnome-2/platform/audiofile/default.nix diff --git a/pkgs/desktops/gnome-2.28/platform/esound/default.nix b/pkgs/desktops/gnome-2/platform/esound/default.nix similarity index 100% rename from pkgs/desktops/gnome-2.28/platform/esound/default.nix rename to pkgs/desktops/gnome-2/platform/esound/default.nix diff --git a/pkgs/desktops/gnome-2.28/platform/glib-networking/default.nix b/pkgs/desktops/gnome-2/platform/glib-networking/default.nix similarity index 100% rename from pkgs/desktops/gnome-2.28/platform/glib-networking/default.nix rename to pkgs/desktops/gnome-2/platform/glib-networking/default.nix diff --git a/pkgs/desktops/gnome-2.28/platform/gnome-common/default.nix b/pkgs/desktops/gnome-2/platform/gnome-common/default.nix similarity index 100% rename from pkgs/desktops/gnome-2.28/platform/gnome-common/default.nix rename to pkgs/desktops/gnome-2/platform/gnome-common/default.nix diff --git a/pkgs/desktops/gnome-2.28/platform/gnome-mime-data/default.nix b/pkgs/desktops/gnome-2/platform/gnome-mime-data/default.nix similarity index 100% rename from pkgs/desktops/gnome-2.28/platform/gnome-mime-data/default.nix rename to pkgs/desktops/gnome-2/platform/gnome-mime-data/default.nix diff --git a/pkgs/desktops/gnome-2.28/platform/gnome-vfs-monikers/default.nix b/pkgs/desktops/gnome-2/platform/gnome-vfs-monikers/default.nix similarity index 100% rename from pkgs/desktops/gnome-2.28/platform/gnome-vfs-monikers/default.nix rename to pkgs/desktops/gnome-2/platform/gnome-vfs-monikers/default.nix diff --git a/pkgs/desktops/gnome-2.28/platform/gnome-vfs/default.nix b/pkgs/desktops/gnome-2/platform/gnome-vfs/default.nix similarity index 100% rename from pkgs/desktops/gnome-2.28/platform/gnome-vfs/default.nix rename to pkgs/desktops/gnome-2/platform/gnome-vfs/default.nix diff --git a/pkgs/desktops/gnome-2.28/platform/gtk-doc/default.nix b/pkgs/desktops/gnome-2/platform/gtk-doc/default.nix similarity index 100% rename from pkgs/desktops/gnome-2.28/platform/gtk-doc/default.nix rename to pkgs/desktops/gnome-2/platform/gtk-doc/default.nix diff --git a/pkgs/desktops/gnome-2.28/platform/gtkglext/default.nix b/pkgs/desktops/gnome-2/platform/gtkglext/default.nix similarity index 100% rename from pkgs/desktops/gnome-2.28/platform/gtkglext/default.nix rename to pkgs/desktops/gnome-2/platform/gtkglext/default.nix diff --git a/pkgs/desktops/gnome-2.28/platform/gtkhtml/01_remove-disable-deprecated.patch b/pkgs/desktops/gnome-2/platform/gtkhtml/01_remove-disable-deprecated.patch similarity index 100% rename from pkgs/desktops/gnome-2.28/platform/gtkhtml/01_remove-disable-deprecated.patch rename to pkgs/desktops/gnome-2/platform/gtkhtml/01_remove-disable-deprecated.patch diff --git a/pkgs/desktops/gnome-2.28/platform/gtkhtml/default.nix b/pkgs/desktops/gnome-2/platform/gtkhtml/default.nix similarity index 100% rename from pkgs/desktops/gnome-2.28/platform/gtkhtml/default.nix rename to pkgs/desktops/gnome-2/platform/gtkhtml/default.nix diff --git a/pkgs/desktops/gnome-2.28/platform/intltool/default.nix b/pkgs/desktops/gnome-2/platform/intltool/default.nix similarity index 100% rename from pkgs/desktops/gnome-2.28/platform/intltool/default.nix rename to pkgs/desktops/gnome-2/platform/intltool/default.nix diff --git a/pkgs/desktops/gnome-2.28/platform/libIDL/default.nix b/pkgs/desktops/gnome-2/platform/libIDL/default.nix similarity index 100% rename from pkgs/desktops/gnome-2.28/platform/libIDL/default.nix rename to pkgs/desktops/gnome-2/platform/libIDL/default.nix diff --git a/pkgs/desktops/gnome-2.28/platform/libart_lgpl/default.nix b/pkgs/desktops/gnome-2/platform/libart_lgpl/default.nix similarity index 100% rename from pkgs/desktops/gnome-2.28/platform/libart_lgpl/default.nix rename to pkgs/desktops/gnome-2/platform/libart_lgpl/default.nix diff --git a/pkgs/desktops/gnome-2.28/platform/libbonobo/default.nix b/pkgs/desktops/gnome-2/platform/libbonobo/default.nix similarity index 100% rename from pkgs/desktops/gnome-2.28/platform/libbonobo/default.nix rename to pkgs/desktops/gnome-2/platform/libbonobo/default.nix diff --git a/pkgs/desktops/gnome-2.28/platform/libbonoboui/default.nix b/pkgs/desktops/gnome-2/platform/libbonoboui/default.nix similarity index 100% rename from pkgs/desktops/gnome-2.28/platform/libbonoboui/default.nix rename to pkgs/desktops/gnome-2/platform/libbonoboui/default.nix diff --git a/pkgs/desktops/gnome-2.28/platform/libglade/default.nix b/pkgs/desktops/gnome-2/platform/libglade/default.nix similarity index 100% rename from pkgs/desktops/gnome-2.28/platform/libglade/default.nix rename to pkgs/desktops/gnome-2/platform/libglade/default.nix diff --git a/pkgs/desktops/gnome-2.28/platform/libgnome/default.nix b/pkgs/desktops/gnome-2/platform/libgnome/default.nix similarity index 100% rename from pkgs/desktops/gnome-2.28/platform/libgnome/default.nix rename to pkgs/desktops/gnome-2/platform/libgnome/default.nix diff --git a/pkgs/desktops/gnome-2.28/platform/libgnomecanvas/default.nix b/pkgs/desktops/gnome-2/platform/libgnomecanvas/default.nix similarity index 100% rename from pkgs/desktops/gnome-2.28/platform/libgnomecanvas/default.nix rename to pkgs/desktops/gnome-2/platform/libgnomecanvas/default.nix diff --git a/pkgs/desktops/gnome-2.28/platform/libgnomecanvasmm/default.nix b/pkgs/desktops/gnome-2/platform/libgnomecanvasmm/default.nix similarity index 100% rename from pkgs/desktops/gnome-2.28/platform/libgnomecanvasmm/default.nix rename to pkgs/desktops/gnome-2/platform/libgnomecanvasmm/default.nix diff --git a/pkgs/desktops/gnome-2.28/platform/libgnomecups/default.nix b/pkgs/desktops/gnome-2/platform/libgnomecups/default.nix similarity index 100% rename from pkgs/desktops/gnome-2.28/platform/libgnomecups/default.nix rename to pkgs/desktops/gnome-2/platform/libgnomecups/default.nix diff --git a/pkgs/desktops/gnome-2.28/platform/libgnomeprint/default.nix b/pkgs/desktops/gnome-2/platform/libgnomeprint/default.nix similarity index 100% rename from pkgs/desktops/gnome-2.28/platform/libgnomeprint/default.nix rename to pkgs/desktops/gnome-2/platform/libgnomeprint/default.nix diff --git a/pkgs/desktops/gnome-2.28/platform/libgnomeprintui/default.nix b/pkgs/desktops/gnome-2/platform/libgnomeprintui/default.nix similarity index 100% rename from pkgs/desktops/gnome-2.28/platform/libgnomeprintui/default.nix rename to pkgs/desktops/gnome-2/platform/libgnomeprintui/default.nix diff --git a/pkgs/desktops/gnome-2.28/platform/libgnomeui/default.nix b/pkgs/desktops/gnome-2/platform/libgnomeui/default.nix similarity index 100% rename from pkgs/desktops/gnome-2.28/platform/libgnomeui/default.nix rename to pkgs/desktops/gnome-2/platform/libgnomeui/default.nix diff --git a/pkgs/desktops/gnome-2.28/platform/libgtkhtml/default.nix b/pkgs/desktops/gnome-2/platform/libgtkhtml/default.nix similarity index 100% rename from pkgs/desktops/gnome-2.28/platform/libgtkhtml/default.nix rename to pkgs/desktops/gnome-2/platform/libgtkhtml/default.nix diff --git a/pkgs/desktops/gnome-2.28/platform/libunique/default.nix b/pkgs/desktops/gnome-2/platform/libunique/default.nix similarity index 100% rename from pkgs/desktops/gnome-2.28/platform/libunique/default.nix rename to pkgs/desktops/gnome-2/platform/libunique/default.nix diff --git a/pkgs/desktops/gnome-2.28/platform/startup-notification/default.nix b/pkgs/desktops/gnome-2/platform/startup-notification/default.nix similarity index 100% rename from pkgs/desktops/gnome-2.28/platform/startup-notification/default.nix rename to pkgs/desktops/gnome-2/platform/startup-notification/default.nix diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 84a00ecaa99..476fa68b491 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -4544,7 +4544,7 @@ let webkit = builderDefsPackage ../development/libraries/webkit { - inherit (gnome28) gtkdoc libsoup; + inherit (gnome) gtkdoc libsoup; inherit (gtkLibs) gtk atk pango glib; inherit freetype fontconfig gettext gperf curl libjpeg libtiff libpng libxml2 libxslt sqlite @@ -4558,7 +4558,7 @@ let webkitSVN = builderDefsPackage ../development/libraries/webkit/svn.nix { - inherit (gnome28) gtkdoc libsoup; + inherit (gnome) gtkdoc libsoup; inherit (gtkLibs) gtk atk pango glib; inherit freetype fontconfig gettext gperf curl libjpeg libtiff libpng libxml2 libxslt sqlite @@ -6952,7 +6952,7 @@ let which gettext makeWrapper file libidn sqlite docutils libnotify vala dbus_glib; inherit (gtkLibs) gtk glib; - inherit (gnome28) gtksourceview; + inherit (gnome) gtksourceview; inherit (webkit.passthru.args) libsoup; inherit (xlibs) kbproto xproto libXScrnSaver scrnsaverproto; }; @@ -7280,7 +7280,7 @@ let surf = callPackage ../applications/misc/surf { inherit (gtkLibs) gtk glib; - libsoup = gnome28.libsoup; + libsoup = gnome.libsoup; }; svk = perlPackages.SVK; @@ -7359,7 +7359,7 @@ let inherit pkgconfig webkit makeWrapper; inherit (gtkLibs) gtk glib; inherit (xlibs) libX11 kbproto; - inherit (gnome28) glib_networking libsoup; + inherit (gnome) glib_networking libsoup; }; valknut = callPackage ../applications/networking/p2p/valknut { @@ -7856,9 +7856,12 @@ let # import ../desktops/e17 { inherit callPackage pkgs; } # ); - gnome28 = recurseIntoAttrs (import ../desktops/gnome-2.28 pkgs); + gnome2 = (callPackage ../desktops/gnome-2 { + callPackage = pkgs.newScope pkgs.gnome2; + self = pkgs.gnome2; + } // pkgs.gtkLibs); - gnome = gnome28; + gnome = recurseIntoAttrs gnome2; kde3 = recurseIntoAttrs { From 2fdeacfebbe9c1cb3cd9df9f43eb84693da18e45 Mon Sep 17 00:00:00 2001 From: "Yury G. Kudryashov" Date: Sat, 8 Oct 2011 19:05:13 +0000 Subject: [PATCH 119/970] libunique-1.1.6 svn path=/nixpkgs/trunk/; revision=29722 --- .../gnome-2/platform/libunique/default.nix | 18 +++++++++++------- 1 file changed, 11 insertions(+), 7 deletions(-) diff --git a/pkgs/desktops/gnome-2/platform/libunique/default.nix b/pkgs/desktops/gnome-2/platform/libunique/default.nix index ed6d268fdeb..2661307c9d2 100644 --- a/pkgs/desktops/gnome-2/platform/libunique/default.nix +++ b/pkgs/desktops/gnome-2/platform/libunique/default.nix @@ -1,10 +1,14 @@ -{stdenv, fetchurl, pkgconfig, gettext, gtk}: +{stdenv, fetchurl_gnome, pkgconfig, gtk}: -stdenv.mkDerivation { - name = "libunique-1.1.2"; - src = fetchurl { - url = mirror://gnome/sources/libunique/1.1/libunique-1.1.2.tar.bz2; - sha256 = "0vhcbw4ccc58xhs99r6bkabrzbayyq2qk01xm8vv4hpwjl117yvk"; +stdenv.mkDerivation rec { + name = src.pkgname; + + src = fetchurl_gnome { + project = "libunique"; + major = "1"; minor = "1"; patchlevel = "6"; + sha256 = "1fsgvmncd9caw552lyfg8swmsd6bh4ijjsph69bwacwfxwf09j75"; }; - buildInputs = [ pkgconfig gettext gtk ]; + + buildNativeInputs = [ pkgconfig ]; + buildInputs = [ gtk ]; } From bbd24e9c871033423434842994223524cf699d41 Mon Sep 17 00:00:00 2001 From: "Yury G. Kudryashov" Date: Sat, 8 Oct 2011 19:12:24 +0000 Subject: [PATCH 120/970] Update gnome-common svn path=/nixpkgs/trunk/; revision=29723 --- .../gnome-2/platform/gnome-common/default.nix | 19 ++++++++----------- 1 file changed, 8 insertions(+), 11 deletions(-) diff --git a/pkgs/desktops/gnome-2/platform/gnome-common/default.nix b/pkgs/desktops/gnome-2/platform/gnome-common/default.nix index 1d2e1724163..548783abf79 100644 --- a/pkgs/desktops/gnome-2/platform/gnome-common/default.nix +++ b/pkgs/desktops/gnome-2/platform/gnome-common/default.nix @@ -1,14 +1,11 @@ -{stdenv, fetchgit, pkgconfig, autoconf, automake, libtool}: +{ stdenv, fetchurl_gnome }: -stdenv.mkDerivation { - name = "gnome-common-2.28.0"; - src = fetchgit { - url = mirror://gnome/sources/gnome-common/2.28/gnome-common-2.28.0.tar.bz2; - sha256 = "18dnx5hndl19lpk6i3ybfsssfasma5wi7p9mqw05sx137l81fj6x"; +stdenv.mkDerivation rec { + name = src.pkgname; + + src = fetchurl_gnome { + project = "gnome-common"; + major = "2"; minor = "34"; patchlevel = "0"; + sha256 = "1pz13mpp09q5s3bikm8ml92s1g0scihsm4iipqv1ql3mp6d4z73s"; }; - buildInputs = [ pkgconfig automake autoconf libtool - ]; - preConfigure = '' - ./autogen.sh - ''; } From 026325e75b5879ff966f85f712d127a263de5958 Mon Sep 17 00:00:00 2001 From: "Yury G. Kudryashov" Date: Sun, 9 Oct 2011 07:11:28 +0000 Subject: [PATCH 121/970] Update a few gnome packages svn path=/nixpkgs/trunk/; revision=29724 --- .../gnome-2/platform/ORBit2/default.nix | 17 ++++++++-------- .../gnome-2/platform/libbonobo/default.nix | 20 +++++++++++-------- .../platform/libgnomecanvas/default.nix | 17 ++++++++-------- 3 files changed, 30 insertions(+), 24 deletions(-) diff --git a/pkgs/desktops/gnome-2/platform/ORBit2/default.nix b/pkgs/desktops/gnome-2/platform/ORBit2/default.nix index 0d536e830b1..e58dd38e369 100644 --- a/pkgs/desktops/gnome-2/platform/ORBit2/default.nix +++ b/pkgs/desktops/gnome-2/platform/ORBit2/default.nix @@ -1,13 +1,14 @@ -{stdenv, fetchurl, pkgconfig, glib, libIDL}: +{stdenv, fetchurl_gnome, pkgconfig, glib, libIDL}: -stdenv.mkDerivation { - name = "ORBit2-2.14.17"; +stdenv.mkDerivation rec { + name = src.pkgname; - src = fetchurl { - url = mirror://gnome/sources/ORBit2/2.14/ORBit2-2.14.17.tar.bz2; - sha256 = "0k4px2f949ac7vmj7b155g1rpf7pmvl48sbnkjhlg4wgcwzwxgv2"; + src = fetchurl_gnome { + project = "ORBit2"; + major = "2"; minor = "14"; patchlevel = "19"; + sha256 = "0l3mhpyym9m5iz09fz0rgiqxl2ym6kpkwpsp1xrr4aa80nlh1jam"; }; - - buildInputs = [ pkgconfig ]; + + buildNativeInputs = [ pkgconfig ]; propagatedBuildInputs = [ glib libIDL ]; } diff --git a/pkgs/desktops/gnome-2/platform/libbonobo/default.nix b/pkgs/desktops/gnome-2/platform/libbonobo/default.nix index 9910965cf91..bd268e5ec43 100644 --- a/pkgs/desktops/gnome-2/platform/libbonobo/default.nix +++ b/pkgs/desktops/gnome-2/platform/libbonobo/default.nix @@ -1,13 +1,17 @@ -{stdenv, fetchurl, flex, bison, pkgconfig, glib, dbus_glib, libxml2, popt, intltool, ORBit2}: +{ stdenv, fetchurl_gnome, flex, bison, pkgconfig, glib, dbus_glib, libxml2, popt +, intltool, ORBit2, procps }: -stdenv.mkDerivation { - name = "libbonobo-2.24.2"; +stdenv.mkDerivation rec { + name = src.pkgname; - src = fetchurl { - url = mirror://gnome/sources/libbonobo/2.24/libbonobo-2.24.2.tar.bz2; - sha256 = "1gr85amd271z0lbr68crcsc24rx1pa5k20f67y3y2mx664527h4m"; + src = fetchurl_gnome { + project = "libbonobo"; + major = "2"; minor = "32"; patchlevel = "1"; + sha256 = "0swp4kk6x7hy1rvd1f9jba31lvfc6qvafkvbpg9h0r34fzrd8q4i"; }; - - buildInputs = [ flex bison pkgconfig dbus_glib libxml2 intltool ]; + + preConfigure = "export USER=`whoami`"; + buildNativeInputs = [ flex bison pkgconfig intltool procps ]; + buildInputs = [ libxml2 ]; propagatedBuildInputs = [ popt glib ORBit2 ]; } diff --git a/pkgs/desktops/gnome-2/platform/libgnomecanvas/default.nix b/pkgs/desktops/gnome-2/platform/libgnomecanvas/default.nix index 95f484ff7a4..bf2c0360aa2 100644 --- a/pkgs/desktops/gnome-2/platform/libgnomecanvas/default.nix +++ b/pkgs/desktops/gnome-2/platform/libgnomecanvas/default.nix @@ -1,14 +1,15 @@ -{ stdenv, fetchurl, pkgconfig, gtk, intltool, libart_lgpl, libglade }: +{ stdenv, fetchurl_gnome, pkgconfig, gtk, intltool, libart_lgpl, libglade }: -stdenv.mkDerivation { - name = "libgnomecanvas-2.26.0"; +stdenv.mkDerivation rec { + name = src.pkgname; - src = fetchurl { - url = mirror://gnome/sources/libgnomecanvas/2.26/libgnomecanvas-2.26.0.tar.bz2; - sha256 = "13f5rf5pkp9hnyxzvssrxnlykjaixa7vrig9a7v06wrxqfn81d40"; + src = fetchurl_gnome { + project = "libgnomecanvas"; + major = "2"; minor = "30"; patchlevel = "3"; + sha256 = "0h6xvswbqspdifnyh5pm2pqq55yp3kn6yrswq7ay9z49hkh7i6w5"; }; - buildInputs = [ pkgconfig intltool libglade ]; - + buildInputs = [ libglade ]; + buildNativeInputs = [ pkgconfig intltool ]; propagatedBuildInputs = [ libart_lgpl gtk ]; } From f865f7c26d8a1f6f0e99ce4b151813299376981c Mon Sep 17 00:00:00 2001 From: "Yury G. Kudryashov" Date: Sun, 9 Oct 2011 07:11:38 +0000 Subject: [PATCH 122/970] libIDL-0.8.14 svn path=/nixpkgs/trunk/; revision=29725 --- .../gnome-2/platform/libIDL/default.nix | 19 ++++++++++++------- 1 file changed, 12 insertions(+), 7 deletions(-) diff --git a/pkgs/desktops/gnome-2/platform/libIDL/default.nix b/pkgs/desktops/gnome-2/platform/libIDL/default.nix index f48b0821f12..5783976d9a2 100644 --- a/pkgs/desktops/gnome-2/platform/libIDL/default.nix +++ b/pkgs/desktops/gnome-2/platform/libIDL/default.nix @@ -1,10 +1,15 @@ -{stdenv, fetchurl, flex, bison, pkgconfig, glib, gettext ? null}: +{stdenv, fetchurl_gnome, flex, bison, pkgconfig, glib, gettext}: -stdenv.mkDerivation { - name = "libIDL-0.8.13"; - src = fetchurl { - url = mirror://gnome/sources/libIDL/0.8/libIDL-0.8.13.tar.bz2; - sha256 = "0w9b4q5sllwncz498sj5lmc3ajzc8x74dy0jy27m2yg9v887xk5w"; +stdenv.mkDerivation rec { + name = src.pkgname; + + src = fetchurl_gnome { + project = "libIDL"; + major = "0"; minor = "8"; patchlevel = "14"; + sha256 = "08129my8s9fbrk0vqvnmx6ph4nid744g5vbwphzkaik51664vln5"; }; - buildInputs = [ flex bison pkgconfig glib gettext ]; + + buildInputs = [ glib gettext ]; + + buildNativeInputs = [ flex bison pkgconfig ]; } From 32dd8c0854f37eade7be7dbd0531b27f8adb3b16 Mon Sep 17 00:00:00 2001 From: "Yury G. Kudryashov" Date: Sun, 9 Oct 2011 08:38:34 +0000 Subject: [PATCH 123/970] gtkLibx3x update svn path=/nixpkgs/trunk/; revision=29726 --- pkgs/development/libraries/atk/{2.1.x.nix => 2.2.x.nix} | 4 ++-- pkgs/development/libraries/glib/{2.29.x.nix => 2.30.x.nix} | 4 ++-- pkgs/development/libraries/gtk+/{3.1.x.nix => 3.2.x.nix} | 4 ++-- pkgs/development/libraries/pango/1.29.x.nix | 4 ++-- pkgs/top-level/all-packages.nix | 6 +++--- 5 files changed, 11 insertions(+), 11 deletions(-) rename pkgs/development/libraries/atk/{2.1.x.nix => 2.2.x.nix} (87%) rename pkgs/development/libraries/glib/{2.29.x.nix => 2.30.x.nix} (91%) rename pkgs/development/libraries/gtk+/{3.1.x.nix => 3.2.x.nix} (91%) diff --git a/pkgs/development/libraries/atk/2.1.x.nix b/pkgs/development/libraries/atk/2.2.x.nix similarity index 87% rename from pkgs/development/libraries/atk/2.1.x.nix rename to pkgs/development/libraries/atk/2.2.x.nix index 28619a85c03..45737aad319 100644 --- a/pkgs/development/libraries/atk/2.1.x.nix +++ b/pkgs/development/libraries/atk/2.2.x.nix @@ -5,8 +5,8 @@ stdenv.mkDerivation rec { src = fetchurl_gnome { project = "atk"; - major = "2"; minor = "1"; patchlevel = "5"; extension = "xz"; - sha256 = "005b9sq8p9ykp4f35b59si3mcbw4p9hyxps1ij4x73p07rrbf0z9"; + major = "2"; minor = "2"; patchlevel = "0"; extension = "xz"; + sha256 = "17bkqg89l9hxbkgc76cxlin1bwczk7m6ikbccx677lrxh3kz08lb"; }; buildNativeInputs = [ pkgconfig perl xz ]; diff --git a/pkgs/development/libraries/glib/2.29.x.nix b/pkgs/development/libraries/glib/2.30.x.nix similarity index 91% rename from pkgs/development/libraries/glib/2.29.x.nix rename to pkgs/development/libraries/glib/2.30.x.nix index 589ec625dcc..f92b9cf4cca 100644 --- a/pkgs/development/libraries/glib/2.29.x.nix +++ b/pkgs/development/libraries/glib/2.30.x.nix @@ -16,8 +16,8 @@ stdenv.mkDerivation rec { src = fetchurl_gnome { project = "glib"; - major = "2"; minor = "29"; patchlevel = "18"; extension = "xz"; - sha256 = "1hc198x625w1w8if1xlvqyjs9aazc27s0l374kqc4sr51wcpbxpy"; + major = "2"; minor = "30"; patchlevel = "0"; extension = "xz"; + sha256 = "1hfdnxf5hsfhkd54390lnc1b14m9n7y031fpma4vpsh96js00k6n"; }; # configure script looks for d-bus but it is only needed for tests diff --git a/pkgs/development/libraries/gtk+/3.1.x.nix b/pkgs/development/libraries/gtk+/3.2.x.nix similarity index 91% rename from pkgs/development/libraries/gtk+/3.1.x.nix rename to pkgs/development/libraries/gtk+/3.2.x.nix index 5b473d44e7e..a72411d1636 100644 --- a/pkgs/development/libraries/gtk+/3.1.x.nix +++ b/pkgs/development/libraries/gtk+/3.2.x.nix @@ -12,8 +12,8 @@ stdenv.mkDerivation rec { src = fetchurl_gnome { project = "gtk+"; - major = "3"; minor = "1"; patchlevel = "16"; extension = "xz"; - sha256 = "15arbf75qpchr9wrawb3zkn52rzf5wm2qv4dq10zfzlflimrq2rg"; + major = "3"; minor = "2"; patchlevel = "0"; extension = "xz"; + sha256 = "0k6l5sw8njbnbapzm9v5jwlrrl7xv1b8c9lmqx97bzbapslw3qxw"; }; enableParallelBuilding = true; diff --git a/pkgs/development/libraries/pango/1.29.x.nix b/pkgs/development/libraries/pango/1.29.x.nix index 14dd3d8c5a5..b255f05dd23 100644 --- a/pkgs/development/libraries/pango/1.29.x.nix +++ b/pkgs/development/libraries/pango/1.29.x.nix @@ -5,8 +5,8 @@ stdenv.mkDerivation rec { src = fetchurl_gnome { project = "pango"; - major = "1"; minor = "29"; patchlevel = "3"; extension = "xz"; - sha256 = "0vp88j3ghngkkc4dpya443qng0bb1g86g54bcwf4lf3zmk6r1nmh"; + major = "1"; minor = "29"; patchlevel = "4"; extension = "xz"; + sha256 = "0zqjq6ccv6mbah74rcvb03ksq1jwan21z37mdmqa56307sax3s3s"; }; buildInputs = stdenv.lib.optional stdenv.isDarwin gettext; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 476fa68b491..63e5670fe22 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -3576,17 +3576,17 @@ let }); gtkLibs3x = let callPackage = newScope pkgs.gtkLibs3x; in { - glib = callPackage ../development/libraries/glib/2.29.x.nix { }; + glib = callPackage ../development/libraries/glib/2.30.x.nix { }; gdk_pixbuf = callPackage ../development/libraries/gdk-pixbuf/2.24.x.nix { }; - atk = callPackage ../development/libraries/atk/2.1.x.nix { }; + atk = callPackage ../development/libraries/atk/2.2.x.nix { }; cairo = callPackage ../development/libraries/cairo { }; pango = callPackage ../development/libraries/pango/1.29.x.nix { }; - gtk = callPackage ../development/libraries/gtk+/3.1.x.nix { }; + gtk = callPackage ../development/libraries/gtk+/3.2.x.nix { }; # Let hydra build gtk-3.x but do not show this to users yet recurseForRelease = true; From 99003e95086148ceb27130ce88880611ad5eff2e Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Sun, 9 Oct 2011 15:29:52 +0000 Subject: [PATCH 124/970] haskell-hashed-storage: updated to version 0.5.9 svn path=/nixpkgs/trunk/; revision=29727 --- pkgs/development/libraries/haskell/hashed-storage/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/hashed-storage/default.nix b/pkgs/development/libraries/haskell/hashed-storage/default.nix index dc7378ce047..441dac7a4df 100644 --- a/pkgs/development/libraries/haskell/hashed-storage/default.nix +++ b/pkgs/development/libraries/haskell/hashed-storage/default.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "hashed-storage"; - version = "0.5.8"; - sha256 = "1730hg6h7a1b0vgr9dvish41bpgly5cjpdwhqny75fi5in7dqplh"; + version = "0.5.9"; + sha256 = "1ycn0zwk5jqm6wwgs8nxpdg7fh5wx0i2058i0a924whj196kkhk2"; isLibrary = true; isExecutable = true; buildDepends = [ From fad97e38859b31051f6839441cb4c4c3a6e1c678 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Sun, 9 Oct 2011 15:29:59 +0000 Subject: [PATCH 125/970] haskell-parsec: added version 3.1.2 svn path=/nixpkgs/trunk/; revision=29728 --- .../libraries/haskell/parsec/3.1.2.nix | 18 ++++++++++++++++++ pkgs/top-level/haskell-packages.nix | 3 ++- 2 files changed, 20 insertions(+), 1 deletion(-) create mode 100644 pkgs/development/libraries/haskell/parsec/3.1.2.nix diff --git a/pkgs/development/libraries/haskell/parsec/3.1.2.nix b/pkgs/development/libraries/haskell/parsec/3.1.2.nix new file mode 100644 index 00000000000..95ef6219dbb --- /dev/null +++ b/pkgs/development/libraries/haskell/parsec/3.1.2.nix @@ -0,0 +1,18 @@ +{ cabal, mtl, text }: + +cabal.mkDerivation (self: { + pname = "parsec"; + version = "3.1.2"; + sha256 = "0lhn9j2j5jlh7g0qx9f6ms63n9x1xlxg9isdvm6z0ksy3ywj9wch"; + buildDepends = [ mtl text ]; + meta = { + homepage = "http://www.cs.uu.nl/~daan/parsec.html"; + description = "Monadic parser combinators"; + license = self.stdenv.lib.licenses.bsd3; + platforms = self.ghc.meta.platforms; + maintainers = [ + self.stdenv.lib.maintainers.andres + self.stdenv.lib.maintainers.simons + ]; + }; +}) diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix index e55b471a957..5b70dc6b7c0 100644 --- a/pkgs/top-level/haskell-packages.nix +++ b/pkgs/top-level/haskell-packages.nix @@ -927,8 +927,9 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y); parsec_2_1_0_1 = callPackage ../development/libraries/haskell/parsec/2.1.0.1.nix {}; parsec_3_1_1 = callPackage ../development/libraries/haskell/parsec/3.1.1.nix {}; + parsec_3_1_2 = callPackage ../development/libraries/haskell/parsec/3.1.2.nix {}; parsec2 = self.parsec_2_1_0_1; - parsec3 = self.parsec_3_1_1; + parsec3 = self.parsec_3_1_2; parsec = self.parsec2; parsimony = callPackage ../development/libraries/haskell/parsimony {}; From dbab602826f68a186c9596fca472228f9129f64a Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Sun, 9 Oct 2011 15:30:05 +0000 Subject: [PATCH 126/970] haskell-parallel: added version 3.2.0.0 svn path=/nixpkgs/trunk/; revision=29729 --- .../libraries/haskell/parallel/3.2.0.0.nix | 17 +++++++++++++++++ pkgs/top-level/haskell-packages.nix | 1 + 2 files changed, 18 insertions(+) create mode 100644 pkgs/development/libraries/haskell/parallel/3.2.0.0.nix diff --git a/pkgs/development/libraries/haskell/parallel/3.2.0.0.nix b/pkgs/development/libraries/haskell/parallel/3.2.0.0.nix new file mode 100644 index 00000000000..9c260d06566 --- /dev/null +++ b/pkgs/development/libraries/haskell/parallel/3.2.0.0.nix @@ -0,0 +1,17 @@ +{ cabal, deepseq }: + +cabal.mkDerivation (self: { + pname = "parallel"; + version = "3.2.0.0"; + sha256 = "1wqdy9p7xqq84ffgzdakvqydxq9668r9xq3wyay9wlgrk83wd1sq"; + buildDepends = [ deepseq ]; + meta = { + description = "Parallel programming library"; + license = self.stdenv.lib.licenses.bsd3; + platforms = self.ghc.meta.platforms; + maintainers = [ + self.stdenv.lib.maintainers.andres + self.stdenv.lib.maintainers.simons + ]; + }; +}) diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix index 5b70dc6b7c0..61cecdd81b5 100644 --- a/pkgs/top-level/haskell-packages.nix +++ b/pkgs/top-level/haskell-packages.nix @@ -921,6 +921,7 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y); parallel_1_1_0_1 = callPackage ../development/libraries/haskell/parallel/1.1.0.1.nix {}; parallel_2_2_0_1 = callPackage ../development/libraries/haskell/parallel/2.2.0.1.nix {}; parallel_3_1_0_1 = callPackage ../development/libraries/haskell/parallel/3.1.0.1.nix {}; + parallel_3_2_0_0 = callPackage ../development/libraries/haskell/parallel/3.2.0.0.nix {}; parallel = self.parallel_1_1_0_1; parseargs = callPackage ../development/libraries/haskell/parseargs {}; From 692ae674c1adc509806da69d8db931b4ca478f6b Mon Sep 17 00:00:00 2001 From: "Yury G. Kudryashov" Date: Sun, 9 Oct 2011 17:23:37 +0000 Subject: [PATCH 127/970] gtklibs3x.glibmm-2.30 svn path=/nixpkgs/trunk/; revision=29730 --- pkgs/development/libraries/glibmm/2.30.x.nix | 25 ++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 27 insertions(+) create mode 100644 pkgs/development/libraries/glibmm/2.30.x.nix diff --git a/pkgs/development/libraries/glibmm/2.30.x.nix b/pkgs/development/libraries/glibmm/2.30.x.nix new file mode 100644 index 00000000000..e3565a4e614 --- /dev/null +++ b/pkgs/development/libraries/glibmm/2.30.x.nix @@ -0,0 +1,25 @@ +{ stdenv, fetchurl_gnome, pkgconfig, glib, libsigcxx, xz }: + +stdenv.mkDerivation rec { + name = src.pkgname; + + src = fetchurl_gnome { + project = "glibmm"; + major = "2"; minor = "30"; patchlevel = "0"; extension = "xz"; + sha256 = "1d0dxq4iamch8igrnbvbfwkfpvcnjfzyr9iq2x8hi89b9k1kzbd7"; + }; + + buildNativeInputs = [pkgconfig xz]; + propagatedBuildInputs = [glib libsigcxx]; + + meta = { + description = "C++ interface to the GLib library"; + + homepage = http://gtkmm.org/; + + license = "LGPLv2+"; + + maintainers = with stdenv.lib.maintainers; [urkud raskin]; + platforms = stdenv.lib.platforms.linux; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 63e5670fe22..7512a9f25ed 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -3578,6 +3578,8 @@ let gtkLibs3x = let callPackage = newScope pkgs.gtkLibs3x; in { glib = callPackage ../development/libraries/glib/2.30.x.nix { }; + glibmm = callPackage ../development/libraries/glibmm/2.30.x.nix { }; + gdk_pixbuf = callPackage ../development/libraries/gdk-pixbuf/2.24.x.nix { }; atk = callPackage ../development/libraries/atk/2.2.x.nix { }; From da80ec5203774d6c726f41714279af0ee304d819 Mon Sep 17 00:00:00 2001 From: "Yury G. Kudryashov" Date: Sun, 9 Oct 2011 17:23:47 +0000 Subject: [PATCH 128/970] libbonoboui-2.24.4, fix build svn path=/nixpkgs/trunk/; revision=29731 --- .../gnome-2/platform/libbonoboui/default.nix | 18 ++++++++++-------- 1 file changed, 10 insertions(+), 8 deletions(-) diff --git a/pkgs/desktops/gnome-2/platform/libbonoboui/default.nix b/pkgs/desktops/gnome-2/platform/libbonoboui/default.nix index 20169161b82..6eefd42b38d 100644 --- a/pkgs/desktops/gnome-2/platform/libbonoboui/default.nix +++ b/pkgs/desktops/gnome-2/platform/libbonoboui/default.nix @@ -1,14 +1,16 @@ -{ stdenv, fetchurl, bison, pkgconfig, popt, libxml2, gtk +{ stdenv, fetchurl_gnome, bison, pkgconfig, popt, libxml2, gtk, libtool , intltool, libbonobo, GConf, libgnomecanvas, libgnome, libglade }: -stdenv.mkDerivation { - name = "libbonoboui-2.24.2"; +stdenv.mkDerivation rec { + name = src.pkgname; - src = fetchurl { - url = mirror://gnome/sources/libbonoboui/2.24/libbonoboui-2.24.2.tar.bz2; - sha256 = "005ypnzb3mfsb0k0aa3h77vwc4ifjq6r4d11msqllvx7avfgkg5f"; + src = fetchurl_gnome { + project = "libbonoboui"; + major = "2"; minor = "24"; patchlevel = "5"; + sha256 = "1kbgqh7bw0fdx4f1a1aqwpff7gp5mwhbaz60c6c98bc4djng5dgs"; }; - - buildInputs = [ bison pkgconfig popt gtk libxml2 intltool GConf libglade ]; + + buildNativeInputs = [ pkgconfig intltool ]; + buildInputs = [ bison popt gtk libxml2 GConf libglade libtool ]; propagatedBuildInputs = [ libbonobo libgnomecanvas libgnome ]; } From 57d384459ef1d76c0a8ae5ac7fa1b889410286dc Mon Sep 17 00:00:00 2001 From: "Yury G. Kudryashov" Date: Sun, 9 Oct 2011 17:23:54 +0000 Subject: [PATCH 129/970] Add gnome3. Do not recurse into attrs svn path=/nixpkgs/trunk/; revision=29732 --- pkgs/desktops/gnome-3/TODO.txt | 113 +++++++++++++++++++++++ pkgs/desktops/gnome-3/default.nix | 8 ++ pkgs/desktops/gnome-3/platform/GConf.nix | 16 ++++ pkgs/top-level/all-packages.nix | 4 + 4 files changed, 141 insertions(+) create mode 100644 pkgs/desktops/gnome-3/TODO.txt create mode 100644 pkgs/desktops/gnome-3/default.nix create mode 100644 pkgs/desktops/gnome-3/platform/GConf.nix diff --git a/pkgs/desktops/gnome-3/TODO.txt b/pkgs/desktops/gnome-3/TODO.txt new file mode 100644 index 00000000000..d3a04425cfb --- /dev/null +++ b/pkgs/desktops/gnome-3/TODO.txt @@ -0,0 +1,113 @@ +## CORE +core:NetworkManager:0.9.1.90: +core:atk:2.2.0: +core:atkmm:2.22.5: +core:brasero:3.2.0: +core:cantarell-fonts:0.0.6: +core:caribou:0.4.0: +core:clutter:1.8.0: +core:clutter-gtk:1.0.4: +core:cogl:1.8.0: +core:dconf:0.10.0: +core:empathy:3.2.0: +core:eog:3.2.0: +core:epiphany:3.2.0: +core:evince:3.2.0: +core:evolution-data-server:3.2.0: +core:folks:0.6.3.2: +core:gcalctool:6.2.0: +core:gdk-pixbuf:2.24.0: +core:gdm:3.2.0: +core:gjs:1.30.0: +core:glib:2.30.0: +core:glib-networking:2.30.0: +core:glibmm:2.30.0: +core:gnome-backgrounds:3.2.0: +core:gnome-bluetooth:3.2.0: +core:gnome-contacts:3.2.0.1: +core:gnome-control-center:3.2.0: +core:gnome-desktop:3.2.0: +core:gnome-disk-utility:3.0.2: +core:gnome-doc-utils:0.20.6: +core:gnome-icon-theme:3.2.0: +core:gnome-icon-theme-extras:3.0.0: +core:gnome-icon-theme-symbolic:3.2.0: +core:gnome-keyring:3.2.0: +core:gnome-menus:3.2.0: +core:gnome-online-accounts:3.2.0.1: +core:gnome-packagekit:3.2.0: +core:gnome-panel:3.2.0: +core:gnome-power-manager:3.2.0: +core:gnome-screensaver:3.2.0: +core:gnome-session:3.2.0: +core:gnome-settings-daemon:3.2.0: +core:gnome-shell:3.2.0: +core:gnome-system-monitor:3.2.0: +core:gnome-terminal:3.2.0: +core:gnome-themes-standard:3.2.0.2: +core:gnome-user-docs:3.2.0.1: +core:gnome-user-share:3.0.0: +core:gnome-utils:3.2.0: +core:gnome-video-effects:0.3.0: +core:gobject-introspection:1.30.0: +core:gsettings-desktop-schemas:3.2.0: +core:gst-plugins-base:0.10.35: +core:gst-plugins-good:0.10.30: +core:gstreamer:0.10.35: +core:gtk+:3.2.0: +core:gtk+:2.24.6: +core:gtk-doc:1.18: +core:gtkmm:3.2.0: +core:gucharmap:3.2.0: +core:gvfs:1.10.0: +core:libgnome-keyring:3.2.0: +core:libgnomekbd:3.2.0: +core:libgtop:2.28.4: +core:libgweather:3.2.0: +core:libpeas:1.2.0: +core:librsvg:2.34.1: +core:libsoup:2.36.0: +core:libwnck:3.2.0: +core:metacity:2.34.1: +core:mm-common:0.9.5: +core:mousetweaks:3.2.0: +core:mutter:3.2.0: +core:nautilus:3.2.0: +core:network-manager-applet:0.9.1.90: +core:notification-daemon:0.7.2: +core:pango:1.29.4: +core:pangomm:2.28.3: +core:polkit-gnome:0.103: +core:sushi:0.2.0: +core:totem-pl-parser:2.32.6: +core:vino:3.2.0: +core:vte:0.30.0: +core:yelp:3.2.0: +core:yelp-tools:3.2.0: +core:yelp-xsl:3.2.0: +core:zenity:3.2.0: + +## APPS +apps:accerciser:3.2.0: +apps:aisleriot:3.2.0: +apps:anjuta:3.2.0: +apps:cheese:3.2.0: +apps:devhelp:3.2.0: +apps:evolution:3.2.0: +apps:file-roller:3.2.0: +apps:gedit:3.2.0: +apps:glade:3.10.0: +apps:gnome-color-manager:3.2.0: +apps:gnome-devel-docs:3.2.0: +apps:gnome-documents:0.2.0: +apps:gnome-games:3.2.0: +apps:gnome-nettool:3.0.0: +apps:hamster-applet:2.91.2: +apps:nautilus-sendto:3.0.1: +apps:nemiver:0.9.0: +apps:orca:3.2.0: +apps:rygel:0.12.3: +apps:seahorse:3.2.0: +apps:totem:3.2.0: +apps:vinagre:3.2.0: + diff --git a/pkgs/desktops/gnome-3/default.nix b/pkgs/desktops/gnome-3/default.nix new file mode 100644 index 00000000000..b82ca22d94f --- /dev/null +++ b/pkgs/desktops/gnome-3/default.nix @@ -0,0 +1,8 @@ +{ callPackage }: + +{ + # Ensure that we use dbus-glib built with gtkLibs3x.glib + dbus_glib = callPackage ../../development/libraries/dbus-glib { }; + + GConf = callPackage ./platform/GConf.nix { }; +} diff --git a/pkgs/desktops/gnome-3/platform/GConf.nix b/pkgs/desktops/gnome-3/platform/GConf.nix new file mode 100644 index 00000000000..824aa8843a7 --- /dev/null +++ b/pkgs/desktops/gnome-3/platform/GConf.nix @@ -0,0 +1,16 @@ +{ stdenv, fetchurl_gnome, glib, dbus_glib, pkgconfig, xz, libxml2, gtk, intltool }: + +stdenv.mkDerivation rec { + name = src.pkgname; + + src = fetchurl_gnome { + project = "GConf"; + major = "3"; minor = "2"; patchlevel = "0"; extension = "xz"; + sha256 = "02vdm6slc2mdw0yfl6lh7qawqcb2k7sk6br21fdj1vfp55ap8wgk"; + }; + + propagatedBuildInputs = [ glib dbus_glib libxml2 gtk ]; + buildNativeInputs = [ pkgconfig xz intltool ]; + + configureFlags = "--disable-orbit"; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 7512a9f25ed..152215ecebe 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -7863,6 +7863,10 @@ let self = pkgs.gnome2; } // pkgs.gtkLibs); + gnome3 = (import ../desktops/gnome-3 { + callPackage = pkgs.newScope pkgs.gnome3; + } // pkgs.gtkLibs3x); + gnome = recurseIntoAttrs gnome2; kde3 = recurseIntoAttrs { From 2133339ecf4f6b31a69e9cc244f027c237b61e12 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Sun, 9 Oct 2011 17:47:04 +0000 Subject: [PATCH 130/970] haskell-thespian: added version 0.999 svn path=/nixpkgs/trunk/; revision=29733 --- .../libraries/haskell/thespian/default.nix | 18 ++++++++++++++++++ pkgs/top-level/haskell-packages.nix | 2 ++ 2 files changed, 20 insertions(+) create mode 100644 pkgs/development/libraries/haskell/thespian/default.nix diff --git a/pkgs/development/libraries/haskell/thespian/default.nix b/pkgs/development/libraries/haskell/thespian/default.nix new file mode 100644 index 00000000000..d4108f0a012 --- /dev/null +++ b/pkgs/development/libraries/haskell/thespian/default.nix @@ -0,0 +1,18 @@ +{ cabal, mtl }: + +cabal.mkDerivation (self: { + pname = "thespian"; + version = "0.999"; + sha256 = "0z3cqjcf6xr0z7g3s1jszcs39w43sl0793gl0qm3dklbginqbcnn"; + buildDepends = [ mtl ]; + meta = { + homepage = "http://bitbucket.org/alinabi/thespian"; + description = "Lightweight Erlang-style actors for Haskell"; + license = self.stdenv.lib.licenses.bsd3; + platforms = self.ghc.meta.platforms; + maintainers = [ + self.stdenv.lib.maintainers.andres + self.stdenv.lib.maintainers.simons + ]; + }; +}) diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix index 61cecdd81b5..aa14f2360bd 100644 --- a/pkgs/top-level/haskell-packages.nix +++ b/pkgs/top-level/haskell-packages.nix @@ -1177,6 +1177,8 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y); text_0_11_1_5 = callPackage ../development/libraries/haskell/text/0.11.1.5.nix {}; text = self.text_0_11_1_5; + thespian = callPackage ../development/libraries/haskell/thespian {}; + thLift = callPackage ../development/libraries/haskell/th-lift {}; threadmanager = callPackage ../development/libraries/haskell/threadmanager {}; From 9caf409d96cfd0fc7ca4059421559a04a2dc5e0a Mon Sep 17 00:00:00 2001 From: "Yury G. Kudryashov" Date: Sun, 9 Oct 2011 18:22:18 +0000 Subject: [PATCH 131/970] odt2txt-0.4 svn path=/nixpkgs/trunk/; revision=29734 --- pkgs/tools/text/odt2txt/default.nix | 22 ++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 24 insertions(+) create mode 100644 pkgs/tools/text/odt2txt/default.nix diff --git a/pkgs/tools/text/odt2txt/default.nix b/pkgs/tools/text/odt2txt/default.nix new file mode 100644 index 00000000000..16553d03d20 --- /dev/null +++ b/pkgs/tools/text/odt2txt/default.nix @@ -0,0 +1,22 @@ +{ stdenv, fetchurl, zlib }: + +stdenv.mkDerivation rec { + name = "odt2txt-0.4"; + + src = fetchurl { + url = "${homepage}/${name}.tar.gz"; + sha256 = "1y36s7w2ng0r4nismxb3hb3zvsim8aimvvblz9hgnanw3kwbvx55"; + }; + + configurePhase="export makeFlags=\"DESTDIR=$out\""; + + buildInputs = [ zlib ]; + + meta = { + description = "Simple .odt to .txt converter"; + homepage = http://stosberg.net/odt2txt; + platforms = stdenv.lib.platforms.all; + lincense = stdenv.lib.licenses.gpl2; + maintainers = [ stdenv.lib.maintainers.urkud ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 152215ecebe..2001c64f874 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -1065,6 +1065,8 @@ let obexftp = callPackage ../tools/bluetooth/obexftp { }; + odt2txt = callPackage ../tools/text/odt2txt { }; + offlineimap = callPackage ../tools/networking/offlineimap { ssl = pythonPackages.ssl; }; From 8d9482648638052a68935c7152c71f43880d4d0a Mon Sep 17 00:00:00 2001 From: "Yury G. Kudryashov" Date: Sun, 9 Oct 2011 18:45:47 +0000 Subject: [PATCH 132/970] colordiff: fix man install path svn path=/nixpkgs/trunk/; revision=29735 --- pkgs/tools/text/colordiff/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/tools/text/colordiff/default.nix b/pkgs/tools/text/colordiff/default.nix index 07ce3de3d13..06e15d07ff0 100644 --- a/pkgs/tools/text/colordiff/default.nix +++ b/pkgs/tools/text/colordiff/default.nix @@ -9,5 +9,5 @@ stdenv.mkDerivation { buildInputs = [ perl /* xmlto */ ]; dontBuild = 1; # do not build doc yet. - installPhase = ''make INSTALL_DIR=/bin MAN_DIR=/man DESTDIR="$out" install''; + installPhase = ''make INSTALL_DIR=/bin MAN_DIR=/share/man/man1 DESTDIR="$out" install''; } From f3f0940e25a3770f18b956f44467948ffe99a2c2 Mon Sep 17 00:00:00 2001 From: Joachim Schiele Date: Sun, 9 Oct 2011 22:28:41 +0000 Subject: [PATCH 133/970] added support for cntlm on nixos! svn path=/nixpkgs/trunk/; revision=29736 --- pkgs/tools/networking/cntlm/default.nix | 25 +++++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 27 insertions(+) create mode 100644 pkgs/tools/networking/cntlm/default.nix diff --git a/pkgs/tools/networking/cntlm/default.nix b/pkgs/tools/networking/cntlm/default.nix new file mode 100644 index 00000000000..f5865020785 --- /dev/null +++ b/pkgs/tools/networking/cntlm/default.nix @@ -0,0 +1,25 @@ +{ stdenv, fetchurl, which}: + +stdenv.mkDerivation { + name = "cntlm-0.35.1"; + + src = fetchurl { + url = mirror://sourceforge/cntlm/cntlm-0.35.1.tar.gz; + sha256 = "7b3fb7184e72cc3f1743bb8e503a5305e96458bc630a7e1ebfc9f3c07ffa6c5e"; + }; + + buildInputs = [ which ]; + + installPhase = '' + ensureDir $out/bin; cp cntlm $out/bin/; + ensureDir $out/share/; cp COPYRIGHT README VERSION doc/cntlm.conf $out/share/; + ensureDir $out/man/; cp doc/cntlm.1 $out/man/; + ''; + + meta = { + description = "Cntlm is an NTLM/NTLMv2 authenticating HTTP proxy"; + homepage = http://cntlm.sourceforge.net/; + license = stdenv.lib.licenses.gpl2; + maintainers = [ stdenv.lib.maintainers.qknight ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 2001c64f874..55aa9984ae7 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -1197,6 +1197,8 @@ let proxytunnel = callPackage ../tools/misc/proxytunnel { }; + cntlm = callPackage ../tools/networking/cntlm { }; + psmisc = callPackage ../os-specific/linux/psmisc { }; pstoedit = callPackage ../tools/graphics/pstoedit { }; From 6170e886073cde1e2e082c1cd0054f44b4d131b1 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 10 Oct 2011 08:56:08 +0000 Subject: [PATCH 134/970] pkgs/tools/text/odt2txt: fixed evaluation error svn path=/nixpkgs/trunk/; revision=29738 --- pkgs/tools/text/odt2txt/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/tools/text/odt2txt/default.nix b/pkgs/tools/text/odt2txt/default.nix index 16553d03d20..b7134bf8e47 100644 --- a/pkgs/tools/text/odt2txt/default.nix +++ b/pkgs/tools/text/odt2txt/default.nix @@ -4,7 +4,7 @@ stdenv.mkDerivation rec { name = "odt2txt-0.4"; src = fetchurl { - url = "${homepage}/${name}.tar.gz"; + url = "${meta.homepage}/${name}.tar.gz"; sha256 = "1y36s7w2ng0r4nismxb3hb3zvsim8aimvvblz9hgnanw3kwbvx55"; }; From c3863358efde1a37092c3e9002fc4cffc25864c7 Mon Sep 17 00:00:00 2001 From: "Yury G. Kudryashov" Date: Mon, 10 Oct 2011 21:48:21 +0000 Subject: [PATCH 135/970] libgnomeui-2.24.5; add libtool to deps svn path=/nixpkgs/trunk/; revision=29746 --- .../gnome-2/platform/libgnomeui/default.nix | 19 +++++++++++-------- 1 file changed, 11 insertions(+), 8 deletions(-) diff --git a/pkgs/desktops/gnome-2/platform/libgnomeui/default.nix b/pkgs/desktops/gnome-2/platform/libgnomeui/default.nix index d3edee3ffd3..04bac7f4164 100644 --- a/pkgs/desktops/gnome-2/platform/libgnomeui/default.nix +++ b/pkgs/desktops/gnome-2/platform/libgnomeui/default.nix @@ -1,16 +1,19 @@ -{ stdenv, fetchurl, pkgconfig, libxml2, xlibs, glib, pango -, intltool, libgnome, libgnomecanvas, libbonoboui, GConf +{ stdenv, fetchurl_gnome, pkgconfig, libxml2, xlibs, glib, pango +, intltool, libgnome, libgnomecanvas, libbonoboui, GConf, libtool , gnome_vfs, gnome_keyring, libglade }: -stdenv.mkDerivation { - name = "libgnomeui-2.24.2"; +stdenv.mkDerivation rec { + name = src.pkgname; - src = fetchurl { - url = mirror://gnome/sources/libgnomeui/2.24/libgnomeui-2.24.2.tar.bz2; - sha256 = "04296nf6agg8zsbw6pzl3mzn890bkcczs6fnna5jay7fvnrmjx5f"; + src = fetchurl_gnome { + project = "libgnomeui"; + major = "2"; minor = "24"; patchlevel = "5"; + sha256 = "03rwbli76crkjl6gp422wrc9lqpl174k56cp9i96b7l8jlj2yddf"; }; - buildInputs = [ pkgconfig intltool xlibs.xlibs libxml2 GConf pango glib gnome_keyring libglade ]; + buildNativeInputs = [ pkgconfig intltool ]; + buildInputs = + [ xlibs.xlibs libxml2 GConf pango glib gnome_keyring libglade libtool ]; propagatedBuildInputs = [ libgnome libbonoboui libgnomecanvas gnome_vfs ]; } From 57b11967c8e4657653492c6851ace2d3d5f5de83 Mon Sep 17 00:00:00 2001 From: "Yury G. Kudryashov" Date: Mon, 10 Oct 2011 22:10:18 +0000 Subject: [PATCH 136/970] Remove already packaged packages from gnome-3/TODO.txt svn path=/nixpkgs/trunk/; revision=29747 --- pkgs/desktops/gnome-3/TODO.txt | 6 ------ 1 file changed, 6 deletions(-) diff --git a/pkgs/desktops/gnome-3/TODO.txt b/pkgs/desktops/gnome-3/TODO.txt index d3a04425cfb..c3991805ab2 100644 --- a/pkgs/desktops/gnome-3/TODO.txt +++ b/pkgs/desktops/gnome-3/TODO.txt @@ -1,6 +1,5 @@ ## CORE core:NetworkManager:0.9.1.90: -core:atk:2.2.0: core:atkmm:2.22.5: core:brasero:3.2.0: core:cantarell-fonts:0.0.6: @@ -16,12 +15,9 @@ core:evince:3.2.0: core:evolution-data-server:3.2.0: core:folks:0.6.3.2: core:gcalctool:6.2.0: -core:gdk-pixbuf:2.24.0: core:gdm:3.2.0: core:gjs:1.30.0: -core:glib:2.30.0: core:glib-networking:2.30.0: -core:glibmm:2.30.0: core:gnome-backgrounds:3.2.0: core:gnome-bluetooth:3.2.0: core:gnome-contacts:3.2.0.1: @@ -54,7 +50,6 @@ core:gsettings-desktop-schemas:3.2.0: core:gst-plugins-base:0.10.35: core:gst-plugins-good:0.10.30: core:gstreamer:0.10.35: -core:gtk+:3.2.0: core:gtk+:2.24.6: core:gtk-doc:1.18: core:gtkmm:3.2.0: @@ -75,7 +70,6 @@ core:mutter:3.2.0: core:nautilus:3.2.0: core:network-manager-applet:0.9.1.90: core:notification-daemon:0.7.2: -core:pango:1.29.4: core:pangomm:2.28.3: core:polkit-gnome:0.103: core:sushi:0.2.0: From b5861542dd50ef4acf4a24a2235a9199b688c407 Mon Sep 17 00:00:00 2001 From: "Yury G. Kudryashov" Date: Mon, 10 Oct 2011 22:26:41 +0000 Subject: [PATCH 137/970] gtkLibs3x.atkmm svn path=/nixpkgs/trunk/; revision=29748 --- pkgs/desktops/gnome-3/TODO.txt | 1 - pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/desktops/gnome-3/TODO.txt b/pkgs/desktops/gnome-3/TODO.txt index c3991805ab2..eaffb5d3092 100644 --- a/pkgs/desktops/gnome-3/TODO.txt +++ b/pkgs/desktops/gnome-3/TODO.txt @@ -1,6 +1,5 @@ ## CORE core:NetworkManager:0.9.1.90: -core:atkmm:2.22.5: core:brasero:3.2.0: core:cantarell-fonts:0.0.6: core:caribou:0.4.0: diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 55aa9984ae7..2be53875fd6 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -3588,6 +3588,8 @@ let atk = callPackage ../development/libraries/atk/2.2.x.nix { }; + atkmm = callPackage ../development/libraries/atkmm/2.22.x.nix { }; + cairo = callPackage ../development/libraries/cairo { }; pango = callPackage ../development/libraries/pango/1.29.x.nix { }; From a1f9b6f7b63e3571efdb332c8cf2a6a0094cb910 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Tue, 11 Oct 2011 09:13:31 +0000 Subject: [PATCH 138/970] * Enable "make check" for checkinstall-based Debian builds. I always assumed this was enabled... svn path=/nixpkgs/trunk/; revision=29750 --- pkgs/build-support/release/debian-build.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/build-support/release/debian-build.nix b/pkgs/build-support/release/debian-build.nix index c2a194a042f..52924d2c42c 100644 --- a/pkgs/build-support/release/debian-build.nix +++ b/pkgs/build-support/release/debian-build.nix @@ -14,7 +14,7 @@ vmTools.runInLinuxImage (stdenv.mkDerivation ( { - #doCheck = true; + doCheck = true; prefix = "/usr"; From 40f1e4e289c19b9a8deafa77ad8e450f0f93f753 Mon Sep 17 00:00:00 2001 From: Rob Vermaas Date: Tue, 11 Oct 2011 13:22:09 +0000 Subject: [PATCH 139/970] * rpm-closure.pl: add possibility to use multiple repositories * default.nix: do not assume fixed filesystem type when mounting, to allow using other filesystems svn path=/nixpkgs/trunk/; revision=29757 --- pkgs/build-support/vm/default.nix | 40 ++++++++------- pkgs/build-support/vm/rpm/rpm-closure.pl | 64 +++++++++++++++--------- 2 files changed, 63 insertions(+), 41 deletions(-) diff --git a/pkgs/build-support/vm/default.nix b/pkgs/build-support/vm/default.nix index aaeeef12a69..d3487be717c 100644 --- a/pkgs/build-support/vm/default.nix +++ b/pkgs/build-support/vm/default.nix @@ -127,7 +127,7 @@ rec { if test -z "$mountDisk"; then mount -t tmpfs none /fs else - mount -t ext2 /dev/${hd} /fs + mount /dev/${hd} /fs fi mkdir -p /fs/dev @@ -166,7 +166,6 @@ rec { halt -d -p -f ''; - initrd = makeInitrd { contents = [ { object = stage1Init; @@ -303,7 +302,7 @@ rec { ''; - createRootFS = '' + defaultCreateRootFS = '' mkdir /mnt ${e2fsprogs}/sbin/mke2fs -F /dev/${hd} ${utillinux}/bin/mount -t ext2 /dev/${hd} /mnt @@ -486,12 +485,12 @@ rec { fillDiskWithRPMs = { size ? 4096, rpms, name, fullName, preInstall ? "", postInstall ? "" - , runScripts ? true + , runScripts ? true, createRootFS ? defaultCreateRootFS }: runInLinuxVM (stdenv.mkDerivation { inherit name preInstall postInstall rpms; - + memSize = 512; preVM = createEmptyImage {inherit size fullName;}; buildCommand = '' @@ -526,10 +525,10 @@ rec { eval "$postInstall" rm /mnt/.debug - - ${utillinux}/bin/umount /mnt/nix/store - ${utillinux}/bin/umount /mnt/tmp - ${utillinux}/bin/umount /mnt + + ${utillinux}/bin/umount /mnt/nix/store + ${utillinux}/bin/umount /mnt/tmp + ${utillinux}/bin/umount /mnt ''; passthru = { inherit fullName; }; @@ -631,7 +630,7 @@ rec { strongly connected components. See deb/deb-closure.nix. */ fillDiskWithDebs = - { size ? 4096, debs, name, fullName, postInstall ? null }: + { size ? 4096, debs, name, fullName, postInstall ? null, createRootFS ? defaultCreateRootFS }: runInLinuxVM (stdenv.mkDerivation { inherit name postInstall; @@ -712,12 +711,15 @@ rec { `primary.xml.gz' file of a Fedora or openSUSE distribution. */ rpmClosureGenerator = - {name, packagesList, urlPrefix, packages, archs ? []}: - + {name, packagesLists, urlPrefixes, packages, archs ? []}: + assert (builtins.length packagesLists) == (builtins.length urlPrefixes) ; runCommand "${name}.nix" {buildInputs = [perl perlPackages.XMLSimple]; inherit archs;} '' - gunzip < ${packagesList} > ./packages.xml + ${lib.concatImapStrings (i: pl: '' + gunzip < ${pl} > ./packages_${toString i}.xml + '') packagesLists} perl -w ${rpm/rpm-closure.pl} \ - ./packages.xml ${urlPrefix} ${toString packages} > $out + ${lib.concatImapStrings (i: pl: "./packages_${toString i}.xml ${pl.snd} " ) (lib.zipLists packagesLists urlPrefixes)} \ + ${toString packages} > $out ''; @@ -726,15 +728,17 @@ rec { names. */ makeImageFromRPMDist = - { name, fullName, size ? 4096, urlPrefix, packagesList + { name, fullName, size ? 4096 + , urlPrefix ? "", urlPrefixes ? [urlPrefix] + , packagesList ? "", packagesLists ? [packagesList] , packages, extraPackages ? [] , preInstall ? "", postInstall ? "", archs ? ["noarch" "i386"] - , runScripts ? true }: + , runScripts ? true, createRootFS ? defaultCreateRootFS }: fillDiskWithRPMs { - inherit name fullName size preInstall postInstall runScripts; + inherit name fullName size preInstall postInstall runScripts createRootFS; rpms = import (rpmClosureGenerator { - inherit name packagesList urlPrefix archs; + inherit name packagesLists urlPrefixes archs; packages = packages ++ extraPackages; }) { inherit fetchurl; }; }; diff --git a/pkgs/build-support/vm/rpm/rpm-closure.pl b/pkgs/build-support/vm/rpm/rpm-closure.pl index 5f333fdfe80..5efc162784a 100644 --- a/pkgs/build-support/vm/rpm/rpm-closure.pl +++ b/pkgs/build-support/vm/rpm/rpm-closure.pl @@ -1,34 +1,52 @@ use strict; use XML::Simple; -my $packagesFile = shift @ARGV; -my $urlPrefix = shift @ARGV; +my @packagesFiles = (); +my @urlPrefixes = (); + +# rpm-closure.pl ( )+ + + +while(-f $ARGV[0]) { + my $packagesFile = shift @ARGV; + my $urlPrefix = shift @ARGV; + push(@packagesFiles, $packagesFile); + push(@urlPrefixes, $urlPrefix); +} + my @toplevelPkgs = @ARGV; my @archs = split ' ', ($ENV{'archs'} or ""); -print STDERR "parsing packages...\n"; - -my $xml = XMLin($packagesFile, ForceArray => ['package', 'rpm:entry', 'file'], KeyAttr => []) or die; - -print STDERR "file contains $xml->{packages} packages\n"; - - my %pkgs; -foreach my $pkg (@{$xml->{'package'}}) { - if (scalar @archs > 0) { - my $arch = $pkg->{arch}; - my $found = 0; - foreach my $a (@archs) { $found = 1 if $arch eq $a; } - next if !$found; - } - if (defined $pkgs{$pkg->{name}}) { - print STDERR "WARNING: duplicate occurrence of package $pkg->{name}\n"; - next; - } - $pkgs{$pkg->{name}} = $pkg; -} +for (my $i = 0; $i < scalar(@packagesFiles); $i++) { + my $packagesFile = $packagesFiles[$i]; + print STDERR "parsing packages in $packagesFile...\n"; + my $xml = XMLin($packagesFile, ForceArray => ['package', 'rpm:entry', 'file'], KeyAttr => []) or die; + + print STDERR "$packagesFile contains $xml->{packages} packages\n"; + + foreach my $pkg (@{$xml->{'package'}}) { + if (scalar @archs > 0) { + my $arch = $pkg->{arch}; + my $found = 0; + foreach my $a (@archs) { $found = 1 if $arch eq $a; } + next if !$found; + } + if (defined $pkgs{$pkg->{name}}) { + my $earlierPkg = $pkgs{$pkg->{name}}; + print STDERR "WARNING: duplicate occurrence of package $pkg->{name}\n"; + if ($earlierPkg->{'time'}->{file} <= $pkg->{'time'}->{file}) { + print STDERR "WARNING: replaced package $pkg->{name} with newer one\n"; + $pkg->{urlPrefix} = $urlPrefixes[$i]; + $pkgs{$pkg->{name}} = $pkg; + } + next; + } + $pkg->{urlPrefix} = $urlPrefixes[$i]; + $pkgs{$pkg->{name}} = $pkg; + } +} my %provides; foreach my $pkgName (keys %pkgs) { @@ -104,7 +122,7 @@ print "[\n\n"; foreach my $pkgName (@needed) { my $pkg = $pkgs{$pkgName}; print " (fetchurl {\n"; - print " url = $urlPrefix/$pkg->{location}->{href};\n"; + print " url = $pkg->{urlPrefix}/$pkg->{location}->{href};\n"; if ($pkg->{checksum}->{type} eq "sha") { print " sha1 = \"$pkg->{checksum}->{content}\";\n"; } elsif ($pkg->{checksum}->{type} eq "sha256") { From 0d62f0418c82438c99977af9f0e25be80f66893d Mon Sep 17 00:00:00 2001 From: Rob Vermaas Date: Tue, 11 Oct 2011 14:47:56 +0000 Subject: [PATCH 140/970] nix-build.nix: also recognize xz tarballs svn path=/nixpkgs/trunk/; revision=29760 --- pkgs/build-support/release/nix-build.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/build-support/release/nix-build.nix b/pkgs/build-support/release/nix-build.nix index 5c569f97ccf..a32f0e07a0c 100644 --- a/pkgs/build-support/release/nix-build.nix +++ b/pkgs/build-support/release/nix-build.nix @@ -68,7 +68,7 @@ stdenv.mkDerivation ( # multiple tarballs, just pick the first one. origSrc=$src if test -d $src/tarballs; then - src=$(ls $src/tarballs/*.tar.bz2 $src/tarballs/*.tar.gz | sort | head -1) + src=$(ls $src/tarballs/*.tar.bz2 $src/tarballs/*.tar.gz $src/tarballs/*.tar.xz | sort | head -1) fi # Set GCC flags for coverage analysis, if desired. From 64eda35d0f4575f6090beedc75584621bc58725f Mon Sep 17 00:00:00 2001 From: Karn Kallio Date: Tue, 11 Oct 2011 15:20:46 +0000 Subject: [PATCH 141/970] Switch to mirror; ftp.gimp.org unavailable for about a week. svn path=/nixpkgs/trunk/; revision=29762 --- pkgs/development/libraries/babl/default.nix | 2 +- pkgs/development/libraries/gegl/default.nix | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/babl/default.nix b/pkgs/development/libraries/babl/default.nix index 77ddecd71c0..3449314a381 100644 --- a/pkgs/development/libraries/babl/default.nix +++ b/pkgs/development/libraries/babl/default.nix @@ -4,7 +4,7 @@ stdenv.mkDerivation rec { name = "babl-0.1.4"; src = fetchurl { - url = "ftp://ftp.gimp.org/pub/babl/0.1/${name}.tar.bz2"; + url = "http://ftp.snt.utwente.nl/pub/software/gimp/babl/0.1/${name}.tar.bz2"; sha256 = "0cz7zw206bb87c0n0h54h4wlkaa3hx3wsia30mgq316y50jk2djv"; }; diff --git a/pkgs/development/libraries/gegl/default.nix b/pkgs/development/libraries/gegl/default.nix index 8fa87d90be2..3e7f29ecb6f 100644 --- a/pkgs/development/libraries/gegl/default.nix +++ b/pkgs/development/libraries/gegl/default.nix @@ -5,7 +5,7 @@ stdenv.mkDerivation rec { name = "gegl-0.1.6"; src = fetchurl { - url = "ftp://ftp.gimp.org/pub/gegl/0.1/${name}.tar.bz2"; + url = "http://ftp.snt.utwente.nl/pub/software/gimp/gegl/0.1/${name}.tar.bz2"; sha256 = "1l966ygss2zkksyw62nm139v2abfzbqqrj0psizvbgzf4mb24rm1"; }; From 57dfcfed606f0ee4075f609a466f655189e4cdd5 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Tue, 11 Oct 2011 16:47:56 +0000 Subject: [PATCH 142/970] haskell-asn1-data: updated to version 0.6.0 svn path=/nixpkgs/trunk/; revision=29764 --- pkgs/development/libraries/haskell/asn1-data/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/asn1-data/default.nix b/pkgs/development/libraries/haskell/asn1-data/default.nix index 01229fe3f07..73ee535f959 100644 --- a/pkgs/development/libraries/haskell/asn1-data/default.nix +++ b/pkgs/development/libraries/haskell/asn1-data/default.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "asn1-data"; - version = "0.5.1"; - sha256 = "10ci77pf0y8g7i1fwksv5na32jsy3brfdv6nzrnwih1brq6l5fn4"; + version = "0.6.0"; + sha256 = "0gk34x2frkk2s7d0i7ahwnjv9jcqdgx2sd1kp3d854548k171z3f"; isLibrary = true; isExecutable = true; buildDepends = [ From 2c1c739890b30205de4bb9ec5fbca209e22ed463 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Tue, 11 Oct 2011 16:48:01 +0000 Subject: [PATCH 143/970] haskell-authenticate: updated to version 0.10.2.2 svn path=/nixpkgs/trunk/; revision=29765 --- pkgs/development/libraries/haskell/authenticate/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/authenticate/default.nix b/pkgs/development/libraries/haskell/authenticate/default.nix index ed91c9d4dd9..ca178c3fa36 100644 --- a/pkgs/development/libraries/haskell/authenticate/default.nix +++ b/pkgs/development/libraries/haskell/authenticate/default.nix @@ -6,8 +6,8 @@ cabal.mkDerivation (self: { pname = "authenticate"; - version = "0.10.2.1"; - sha256 = "1bi46bls57wzmd90grrp6rpvgzsz064yi804b6pavq0pxiz1yaj9"; + version = "0.10.2.2"; + sha256 = "10w13wcd8cwaf4ifxllsiijwza2ys4a5zyhjcbl4938609p60hi8"; buildDepends = [ aesonNative attoparsec base64Bytestring blazeBuilder caseInsensitive enumerator failure httpEnumerator httpTypes network From 86b454d4b0d2c11df5bc329f9065295431d14380 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Tue, 11 Oct 2011 16:48:05 +0000 Subject: [PATCH 144/970] haskell-certificate: updated to version 0.9.3 svn path=/nixpkgs/trunk/; revision=29766 --- pkgs/development/libraries/haskell/certificate/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/certificate/default.nix b/pkgs/development/libraries/haskell/certificate/default.nix index 41646034aa0..09d44e07222 100644 --- a/pkgs/development/libraries/haskell/certificate/default.nix +++ b/pkgs/development/libraries/haskell/certificate/default.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "certificate"; - version = "0.9.1"; - sha256 = "0hq9a0vz72kk1n3hdza36rji8vc95y667iwcsmsh5habyh6q8228"; + version = "0.9.3"; + sha256 = "1gg26d1arf588zjhdzs8r26k40v6m679l8k2vw28l8j3q5m11p71"; isLibrary = true; isExecutable = true; buildDepends = [ asn1Data base64Bytestring mtl time ]; From 6e5a99dadff892901081d8f99b9cb68da3dac62d Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Tue, 11 Oct 2011 16:48:09 +0000 Subject: [PATCH 145/970] haskell-http-enumerator: updated to version 0.7.1.1 svn path=/nixpkgs/trunk/; revision=29767 --- .../development/libraries/haskell/http-enumerator/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/http-enumerator/default.nix b/pkgs/development/libraries/haskell/http-enumerator/default.nix index 22b6e6370f3..5aa02f5dea4 100644 --- a/pkgs/development/libraries/haskell/http-enumerator/default.nix +++ b/pkgs/development/libraries/haskell/http-enumerator/default.nix @@ -7,8 +7,8 @@ cabal.mkDerivation (self: { pname = "http-enumerator"; - version = "0.7.1"; - sha256 = "0d8zfgj41jdg6k9ny717xy1ca2jxnmr7aliqlq2arf4900lxjlwd"; + version = "0.7.1.1"; + sha256 = "0b26gvwpnv851x1v5qix7mp0wliff9klqc2pfp2ig54l77s15y36"; isLibrary = true; isExecutable = true; buildDepends = [ From 764bfaafb4b8a8e0229932da7e98dffdb1d7e6c4 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Tue, 11 Oct 2011 16:48:15 +0000 Subject: [PATCH 146/970] haskell-tls-extra: updated to version 0.4.0 svn path=/nixpkgs/trunk/; revision=29768 --- pkgs/development/libraries/haskell/tls-extra/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/tls-extra/default.nix b/pkgs/development/libraries/haskell/tls-extra/default.nix index 7b7517b0d42..7409d9d1b94 100644 --- a/pkgs/development/libraries/haskell/tls-extra/default.nix +++ b/pkgs/development/libraries/haskell/tls-extra/default.nix @@ -4,8 +4,8 @@ cabal.mkDerivation (self: { pname = "tls-extra"; - version = "0.3.1"; - sha256 = "1zj8l5nglfaarbbzb1icil6cp6rjqfs33nryxc34akz22zwwmln4"; + version = "0.4.0"; + sha256 = "1incrrkvzhq7gdcrrqka0l50a7fj7nccdrin00wplm7ljl129d87"; isLibrary = true; isExecutable = true; buildDepends = [ From 52987e278dfab1d5480fdb25803217dbda279b8e Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Tue, 11 Oct 2011 16:48:19 +0000 Subject: [PATCH 147/970] haskell-tls: updated to version 0.8.0 svn path=/nixpkgs/trunk/; revision=29769 --- pkgs/development/libraries/haskell/tls/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/tls/default.nix b/pkgs/development/libraries/haskell/tls/default.nix index 8da9fbbf4b5..ad5e80b2be9 100644 --- a/pkgs/development/libraries/haskell/tls/default.nix +++ b/pkgs/development/libraries/haskell/tls/default.nix @@ -4,8 +4,8 @@ cabal.mkDerivation (self: { pname = "tls"; - version = "0.7.2"; - sha256 = "0x24jf83sfsnpvfm645lng5bc21zsbv6mbagr6q1q71zhfzfyb74"; + version = "0.8.0"; + sha256 = "05c7bizwkwcp83idsa5cjb53lvm9f44iaypp9yiqv4ly9q3h315q"; isLibrary = true; isExecutable = true; buildDepends = [ From dd4305c67af890be2fed986e16df29980b8e911e Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Tue, 11 Oct 2011 16:48:24 +0000 Subject: [PATCH 148/970] haskell-uniplate: updated to version 1.6.3 svn path=/nixpkgs/trunk/; revision=29770 --- pkgs/development/libraries/haskell/uniplate/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/development/libraries/haskell/uniplate/default.nix b/pkgs/development/libraries/haskell/uniplate/default.nix index c9320595e55..020fc6408f3 100644 --- a/pkgs/development/libraries/haskell/uniplate/default.nix +++ b/pkgs/development/libraries/haskell/uniplate/default.nix @@ -1,10 +1,10 @@ -{ cabal, syb }: +{ cabal, hashable, syb, unorderedContainers }: cabal.mkDerivation (self: { pname = "uniplate"; - version = "1.6.2"; - sha256 = "1lns0llhszk68jnq5if3xrk997idzszqc267q63kkdwp1zxdicrd"; - buildDepends = [ syb ]; + version = "1.6.3"; + sha256 = "14p10zhsa9ws0rn2nm0gi25bdyhhs83b6qv8bjyywb02sh15xhkw"; + buildDepends = [ hashable syb unorderedContainers ]; meta = { homepage = "http://community.haskell.org/~ndm/uniplate/"; description = "Help writing simple, concise and fast generic operations"; From 51fea45a1b4ea92eaa410ff9cc9d9a8868b26e0f Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Tue, 11 Oct 2011 16:48:28 +0000 Subject: [PATCH 149/970] haskell-vacuum: updated to version 1.0.0.1 svn path=/nixpkgs/trunk/; revision=29771 --- pkgs/development/libraries/haskell/vacuum/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/libraries/haskell/vacuum/default.nix b/pkgs/development/libraries/haskell/vacuum/default.nix index 960e90d645d..1c3c1df5a00 100644 --- a/pkgs/development/libraries/haskell/vacuum/default.nix +++ b/pkgs/development/libraries/haskell/vacuum/default.nix @@ -2,11 +2,11 @@ cabal.mkDerivation (self: { pname = "vacuum"; - version = "1.0.0"; - sha256 = "2229948ce801052c5ffb70ffc07e301d87d60740b053df8a7b7851ad02c01d9f"; + version = "1.0.0.1"; + sha256 = "172py7nvyv66hvqmhigfm59rjb328bfzv0z11q8qdpf5w1fpvmc5"; extraLibraries = [ ghcPaths ]; meta = { - homepage = "http://moonpatio.com/vacuum/"; + homepage = "http://web.archive.org/web/20100410115820/http://moonpatio.com/vacuum/"; description = "Extract graph representations of ghc heap values"; license = "LGPL"; platforms = self.ghc.meta.platforms; From 2c6200c02551ab1b873e39b8e1cb7cea27023c3e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?= Date: Tue, 11 Oct 2011 19:30:11 +0000 Subject: [PATCH 150/970] Updating veracity svn path=/nixpkgs/trunk/; revision=29772 --- .../version-management/veracity/src-for-default.nix | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/applications/version-management/veracity/src-for-default.nix b/pkgs/applications/version-management/veracity/src-for-default.nix index 504d260204c..85bc00db713 100644 --- a/pkgs/applications/version-management/veracity/src-for-default.nix +++ b/pkgs/applications/version-management/veracity/src-for-default.nix @@ -1,9 +1,9 @@ rec { - version="1.0.0.10517"; - name="veracity-1.0.0.10517"; - hash="08bka5zzn7i7c3dm3xp57n3szvm9msmi7mq1zynqb6i210qix79g"; - url="http://download.sourcegear.com/Veracity/release/1.0.0.10517/veracity-source-${version}.tar.gz"; - advertisedUrl="http://download.sourcegear.com/Veracity/release/1.0.0.10517/veracity-source-1.0.0.10517.tar.gz"; + version="1.1.0.10565"; + name="veracity-1.1.0.10565"; + hash="0sx12zzc60pdvzhf8ax2lisnw0rsrvnrk2500y1vfqhwxh2r04id"; + url="http://download.sourcegear.com/Veracity/release/1.1.0.10565/veracity-source-${version}.tar.gz"; + advertisedUrl="http://download.sourcegear.com/Veracity/release/1.1.0.10565/veracity-source-1.1.0.10565.tar.gz"; } From 2ed828052e8eca4e57baf84c59fc99c2b103313f Mon Sep 17 00:00:00 2001 From: "Yury G. Kudryashov" Date: Tue, 11 Oct 2011 19:46:31 +0000 Subject: [PATCH 151/970] Remove wxPython26 since it is not used svn path=/nixpkgs/trunk/; revision=29773 --- .../python-modules/wxPython/2.6.nix | 18 ------------------ pkgs/top-level/all-packages.nix | 1 - pkgs/top-level/python-packages.nix | 8 -------- 3 files changed, 27 deletions(-) delete mode 100644 pkgs/development/python-modules/wxPython/2.6.nix diff --git a/pkgs/development/python-modules/wxPython/2.6.nix b/pkgs/development/python-modules/wxPython/2.6.nix deleted file mode 100644 index 362f52bf44f..00000000000 --- a/pkgs/development/python-modules/wxPython/2.6.nix +++ /dev/null @@ -1,18 +0,0 @@ -{ stdenv, fetchurl, pkgconfig, wxGTK, pythonPackages }: - -assert wxGTK.unicode; - -stdenv.mkDerivation { - name = "wxPython-2.6.3.3"; - - builder = ./builder.sh; - - src = fetchurl { - url = mirror://sourceforge/wxpython/wxPython-src-2.6.3.3.tar.bz2; - md5 = "66b9c5f8e20a9505c39dab1a1234daa9"; - }; - - buildInputs = [ pkgconfig wxGTK (wxGTK.gtk) pythonPackages.python pythonPackages.wrapPython ]; - - passthru = { inherit wxGTK; }; -} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 2be53875fd6..64032e899ce 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -4807,7 +4807,6 @@ let setuptools = pythonPackages.setuptools; wxPython = pythonPackages.wxPython; - wxPython26 = pythonPackages.wxPython26; wxPython28 = pythonPackages.wxPython28; twisted = pythonPackages.twisted; diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index edf38bff72a..828f88aac44 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -2024,20 +2024,12 @@ let pythonPackages = python.modules // rec { wxPython = wxPython28; - wxPython26 = import ../development/python-modules/wxPython/2.6.nix { - inherit (pkgs) stdenv fetchurl pkgconfig; - inherit pythonPackages; - wxGTK = pkgs.wxGTK26; - }; - - wxPython28 = import ../development/python-modules/wxPython/2.8.nix { inherit (pkgs) stdenv fetchurl pkgconfig; inherit pythonPackages; wxGTK = pkgs.wxGTK28; }; - zbase32 = buildPythonPackage (rec { name = "zbase32-1.1.2"; From 4289cff0c29e4bd777729369985301480d5b3199 Mon Sep 17 00:00:00 2001 From: "Yury G. Kudryashov" Date: Tue, 11 Oct 2011 20:47:30 +0000 Subject: [PATCH 152/970] Remove gtkLibs216.*mm svn path=/nixpkgs/trunk/; revision=29774 --- pkgs/development/libraries/glibmm/2.18.x.nix | 21 ------------- pkgs/development/libraries/gtkmm/2.14.x.nix | 31 ------------------- pkgs/development/libraries/pangomm/2.14.x.nix | 28 ----------------- pkgs/top-level/all-packages.nix | 6 ---- 4 files changed, 86 deletions(-) delete mode 100644 pkgs/development/libraries/glibmm/2.18.x.nix delete mode 100644 pkgs/development/libraries/gtkmm/2.14.x.nix delete mode 100644 pkgs/development/libraries/pangomm/2.14.x.nix diff --git a/pkgs/development/libraries/glibmm/2.18.x.nix b/pkgs/development/libraries/glibmm/2.18.x.nix deleted file mode 100644 index b5f8ebf7eb1..00000000000 --- a/pkgs/development/libraries/glibmm/2.18.x.nix +++ /dev/null @@ -1,21 +0,0 @@ -{ stdenv, fetchurl, pkgconfig, glib, libsigcxx }: - -stdenv.mkDerivation rec { - name = "glibmm-2.18.1"; - - src = fetchurl { - url = "mirror://gnome/sources/glibmm/2.18/${name}.tar.bz2"; - sha256 = "0jg65hv6pwxqk4fabsjjz2zwn5hb6rgy3szj956avliarbliyr3r"; - }; - - buildInputs = [pkgconfig]; - propagatedBuildInputs = [glib libsigcxx]; - - meta = { - description = "C++ interface to the GLib library"; - - homepage = http://gtkmm.org/; - - license = "LGPLv2+"; - }; -} diff --git a/pkgs/development/libraries/gtkmm/2.14.x.nix b/pkgs/development/libraries/gtkmm/2.14.x.nix deleted file mode 100644 index 74b234d8e4b..00000000000 --- a/pkgs/development/libraries/gtkmm/2.14.x.nix +++ /dev/null @@ -1,31 +0,0 @@ -{ stdenv, fetchurl, pkgconfig, gtk, atk, glibmm, cairomm, pangomm }: - -stdenv.mkDerivation rec { - name = "gtkmm-2.14.3"; - - src = fetchurl { - url = "mirror://gnome/sources/gtkmm/2.14/${name}.tar.bz2"; - sha256 = "18jral2lv9jv02d3balh0mi0wgbqhrz5y2laclri1skccc2q3c94"; - }; - - buildInputs = [pkgconfig]; - propagatedBuildInputs = [ glibmm gtk atk cairomm pangomm ]; - - meta = { - description = "C++ interface to the GTK+ graphical user interface library"; - - longDescription = '' - gtkmm is the official C++ interface for the popular GUI library - GTK+. Highlights include typesafe callbacks, and a - comprehensive set of widgets that are easily extensible via - inheritance. You can create user interfaces either in code or - with the Glade User Interface designer, using libglademm. - There's extensive documentation, including API reference and a - tutorial. - ''; - - homepage = http://gtkmm.org/; - - license = "LGPLv2+"; - }; -} diff --git a/pkgs/development/libraries/pangomm/2.14.x.nix b/pkgs/development/libraries/pangomm/2.14.x.nix deleted file mode 100644 index 346962c5eaa..00000000000 --- a/pkgs/development/libraries/pangomm/2.14.x.nix +++ /dev/null @@ -1,28 +0,0 @@ -{ stdenv, fetchurl, pkgconfig, pango, glibmm, cairomm, libpng }: - -stdenv.mkDerivation rec { - name = "pangomm-2.14.1"; - - src = fetchurl { - url = "mirror://gnome/sources/pangomm/2.14/${name}.tar.bz2"; - sha256 = "0mrm5hv8kb84qzb97lqbipzzc8g0b97pfgz2hqq33xs2ha3lswnp"; - }; - - buildInputs = [ pkgconfig ]; - propagatedBuildInputs = [ pango glibmm cairomm libpng ]; - - meta = { - description = "C++ interface to the Pango text rendering library"; - - longDescription = '' - Pango is a library for laying out and rendering of text, with an - emphasis on internationalization. Pango can be used anywhere - that text layout is needed, though most of the work on Pango so - far has been done in the context of the GTK+ widget toolkit. - Pango forms the core of text and font handling for GTK+-2.x. - ''; - - homepage = http://www.pango.org/; - license = "LGPLv2+"; - }; -} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 64032e899ce..fbc27330614 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -3537,20 +3537,14 @@ let glib = callPackage ../development/libraries/glib/2.20.x.nix { }; - glibmm = callPackage ../development/libraries/glibmm/2.18.x.nix { }; - atk = callPackage ../development/libraries/atk/1.24.x.nix { }; cairo = callPackage ../development/libraries/cairo { }; pango = callPackage ../development/libraries/pango/1.24.x.nix { }; - pangomm = callPackage ../development/libraries/pangomm/2.14.x.nix { }; - gtk = callPackage ../development/libraries/gtk+/2.16.x.nix { }; - gtkmm = callPackage ../development/libraries/gtkmm/2.14.x.nix { }; - }); gtkLibs224 = recurseIntoAttrs (let callPackage = pkgs.newScope pkgs.gtkLibs224; in { From 1d70839b229e8b78c00deee392a7dc6e16b7894e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andres=20L=C3=B6h?= Date: Tue, 11 Oct 2011 22:18:21 +0000 Subject: [PATCH 153/970] Added haskell-Zwaluw-0.1 svn path=/nixpkgs/trunk/; revision=29777 --- .../libraries/haskell/Zwaluw/default.nix | 17 +++++++++++++++++ pkgs/top-level/haskell-packages.nix | 2 ++ 2 files changed, 19 insertions(+) create mode 100644 pkgs/development/libraries/haskell/Zwaluw/default.nix diff --git a/pkgs/development/libraries/haskell/Zwaluw/default.nix b/pkgs/development/libraries/haskell/Zwaluw/default.nix new file mode 100644 index 00000000000..125da2a795e --- /dev/null +++ b/pkgs/development/libraries/haskell/Zwaluw/default.nix @@ -0,0 +1,17 @@ +{ cabal }: + +cabal.mkDerivation (self: { + pname = "Zwaluw"; + version = "0.1"; + sha256 = "1crvcvni5gzpc1c6cnaqqp0gng1l9gk9d8ac23967nvp82xav7s1"; + meta = { + homepage = "https://github.com/MedeaMelana/Zwaluw"; + description = "Combinators for bidirectional URL routing"; + license = self.stdenv.lib.licenses.bsd3; + platforms = self.ghc.meta.platforms; + maintainers = [ + self.stdenv.lib.maintainers.andres + self.stdenv.lib.maintainers.simons + ]; + }; +}) diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix index aa14f2360bd..f42761c93cb 100644 --- a/pkgs/top-level/haskell-packages.nix +++ b/pkgs/top-level/haskell-packages.nix @@ -1340,6 +1340,8 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y); zlibEnum = callPackage ../development/libraries/haskell/zlib-enum {}; + Zwaluw = callPackage ../development/libraries/haskell/Zwaluw {}; + # Compilers. AgdaExecutable = callPackage ../development/compilers/Agda-executable {}; From 70b8d1e6830df242ad4aec244c81d6895bc5bfd3 Mon Sep 17 00:00:00 2001 From: Marco Maggesi Date: Wed, 12 Oct 2011 09:44:20 +0000 Subject: [PATCH 154/970] Update BLCR to version 0.8.4. svn path=/nixpkgs/trunk/; revision=29778 --- pkgs/os-specific/linux/blcr/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/os-specific/linux/blcr/default.nix b/pkgs/os-specific/linux/blcr/default.nix index afe627f7886..5377b404582 100644 --- a/pkgs/os-specific/linux/blcr/default.nix +++ b/pkgs/os-specific/linux/blcr/default.nix @@ -3,11 +3,11 @@ assert stdenv.isLinux; stdenv.mkDerivation { - name = "blcr-0.8.3-${kernel.version}"; + name = "blcr-0.8.4-${kernel.version}"; src = fetchurl { - url = https://ftg.lbl.gov/assets/projects/CheckpointRestart/downloads/blcr-0.8.3.tar.gz; - sha256 = "c8243c9a7a215d4fc4e8f2199045711cf711a6f2e0b39a94413478ffae110eac"; + url = https://ftg.lbl.gov/assets/projects/CheckpointRestart/downloads/blcr-0.8.4.tar.gz; + sha256 = "d851da66627d9212ac37bc9ea2aba40008ff2dc51d45dbd395ca2e403c3d78cf"; }; buildInputs = [ perl makeWrapper ]; From f8dfbd4a43ca404b8639a425a25634d80a4a7210 Mon Sep 17 00:00:00 2001 From: Marco Maggesi Date: Wed, 12 Oct 2011 12:10:26 +0000 Subject: [PATCH 155/970] BLCR: Add myself as mantainer. Add platforms. svn path=/nixpkgs/trunk/; revision=29779 --- pkgs/os-specific/linux/blcr/default.nix | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/pkgs/os-specific/linux/blcr/default.nix b/pkgs/os-specific/linux/blcr/default.nix index 5377b404582..cc7f3934734 100644 --- a/pkgs/os-specific/linux/blcr/default.nix +++ b/pkgs/os-specific/linux/blcr/default.nix @@ -31,5 +31,9 @@ stdenv.mkDerivation { description = "Berkeley Lab Checkpoint/Restart for Linux (BLCR)"; homepage = https://ftg.lbl.gov/projects/CheckpointRestart/; license = "GPL2"; + platforms = stdenv.lib.platforms.linux; + maintainers = with stdenv.lib.maintainers; [ + z77z + ]; }; } From e1a97996f732f63e5c022b99108c854ff8f91533 Mon Sep 17 00:00:00 2001 From: Shea Levy Date: Wed, 12 Oct 2011 18:01:28 +0000 Subject: [PATCH 156/970] Rails 3.1.1 svn path=/nixpkgs/trunk/; revision=29793 --- .../interpreters/ruby/generated.nix | 153 +++++++++--------- 1 file changed, 75 insertions(+), 78 deletions(-) diff --git a/pkgs/development/interpreters/ruby/generated.nix b/pkgs/development/interpreters/ruby/generated.nix index b6ec049f9f7..9615c30ff65 100644 --- a/pkgs/development/interpreters/ruby/generated.nix +++ b/pkgs/development/interpreters/ruby/generated.nix @@ -3,106 +3,106 @@ g: # Get dependencies from patched gems { aliases = { - actionmailer = g.actionmailer_3_1_0; - actionpack = g.actionpack_3_1_0; - activemodel = g.activemodel_3_1_0; - activerecord = g.activerecord_3_1_0; - activeresource = g.activeresource_3_1_0; - activesupport = g.activesupport_3_1_0; + actionmailer = g.actionmailer_3_1_1; + actionpack = g.actionpack_3_1_1; + activemodel = g.activemodel_3_1_1; + activerecord = g.activerecord_3_1_1; + activeresource = g.activeresource_3_1_1; + activesupport = g.activesupport_3_1_1; arel = g.arel_2_2_1; - bcrypt_ruby = g.bcrypt_ruby_3_0_0; builder = g.builder_3_0_0; - bundler = g.bundler_1_0_18; + bundler = g.bundler_1_0_21; erubis = g.erubis_2_7_0; hike = g.hike_1_2_1; i18n = g.i18n_0_6_0; + json = g.json_1_6_1; mail = g.mail_2_3_0; mime_types = g.mime_types_1_16; multi_json = g.multi_json_1_0_3; nix = g.nix_0_1_1; polyglot = g.polyglot_0_3_2; - rack = g.rack_1_3_2; - rack_cache = g.rack_cache_1_0_3; + rack = g.rack_1_3_4; + rack_cache = g.rack_cache_1_1; rack_mount = g.rack_mount_0_8_3; rack_ssl = g.rack_ssl_1_3_2; rack_test = g.rack_test_0_6_1; - rails = g.rails_3_1_0; - railties = g.railties_3_1_0; + rails = g.rails_3_1_1; + railties = g.railties_3_1_1; rake = g.rake_0_9_2; - rdoc = g.rdoc_3_9_4; - sprockets = g.sprockets_2_0_0; + rdoc = g.rdoc_3_10; + sprockets = g.sprockets_2_0_2; thor = g.thor_0_14_6; tilt = g.tilt_1_3_3; treetop = g.treetop_1_4_10; - tzinfo = g.tzinfo_0_3_29; + tzinfo = g.tzinfo_0_3_30; }; gem_nix_args = [ ''nix'' ''rails'' ''rake'' ]; gems = { - actionmailer_3_1_0 = { + actionmailer_3_1_1 = { basename = ''actionmailer''; meta = { description = ''Email composition, delivery, and receiving framework (part of Rails).''; homepage = ''http://www.rubyonrails.org''; longDescription = ''Email on Rails. Compose, deliver, receive, and test emails using the familiar controller/view pattern. First-class support for multipart email and attachments.''; }; - name = ''actionmailer-3.1.0''; + name = ''actionmailer-3.1.1''; requiredGems = [ g.mail_2_3_0 ]; - sha256 = ''1730ky434qhbqnwnvbj9r57i4s6lcmwvnfhv6i91iif7anmjl22p''; + sha256 = ''0aa5vpaw8kr7id21wgslxjyxy9bygl5mjkjyn9mqg8qg7182dp0d''; }; - actionpack_3_1_0 = { + actionpack_3_1_1 = { basename = ''actionpack''; meta = { description = ''Web-flow and rendering framework putting the VC in MVC (part of Rails).''; homepage = ''http://www.rubyonrails.org''; longDescription = ''Web apps on Rails. Simple, battle-tested conventions for building and testing MVC web applications. Works with any Rack-compatible server.''; }; - name = ''actionpack-3.1.0''; - requiredGems = [ g.activemodel_3_1_0 g.rack_cache_1_0_3 g.rack_test_0_6_1 g.rack_mount_0_8_3 g.sprockets_2_0_0 g.erubis_2_7_0 ]; - sha256 = ''0igy1dp8zdh653v4wz7vxdjmz681k8653n0xan9ng1qgsk9b7wlh''; + name = ''actionpack-3.1.1''; + requiredGems = [ g.activemodel_3_1_1 g.rack_cache_1_1 g.rack_test_0_6_1 g.rack_mount_0_8_3 g.sprockets_2_0_2 g.erubis_2_7_0 ]; + sha256 = ''0hh4ndbi9kvkp1srad324vd9i7nhi8vqc0vhfh044jzwq1dvbqc6''; }; - activemodel_3_1_0 = { + activemodel_3_1_1 = { basename = ''activemodel''; meta = { description = ''A toolkit for building modeling frameworks (part of Rails).''; homepage = ''http://www.rubyonrails.org''; longDescription = ''A toolkit for building modeling frameworks like Active Record and Active Resource. Rich support for attributes, callbacks, validations, observers, serialization, internationalization, and testing.''; }; - name = ''activemodel-3.1.0''; - requiredGems = [ g.builder_3_0_0 g.i18n_0_6_0 g.bcrypt_ruby_3_0_0 ]; - sha256 = ''1hpppp54v05ci4l7nx79i9lcnf6z00lhi5wpn8sgyr5869xihvq6''; + name = ''activemodel-3.1.1''; + requiredGems = [ g.builder_3_0_0 g.i18n_0_6_0 ]; + sha256 = ''0r7zlzswf1vdhk97lll6kv64l0nya2li9gai19vd4qclh4m2n9n1''; }; - activerecord_3_1_0 = { + activerecord_3_1_1 = { basename = ''activerecord''; meta = { description = ''Object-relational mapper framework (part of Rails).''; homepage = ''http://www.rubyonrails.org''; longDescription = ''Databases on Rails. Build a persistent domain model by mapping database tables to Ruby classes. Strong conventions for associations, validations, aggregations, migrations, and testing come baked-in.''; }; - name = ''activerecord-3.1.0''; - requiredGems = [ g.arel_2_2_1 g.tzinfo_0_3_29 ]; - sha256 = ''1dq5k2r6a85wmzgv5gv0rrxf43agzzcj6z4az6w034nxarv7ccml''; + name = ''activerecord-3.1.1''; + requiredGems = [ g.arel_2_2_1 g.tzinfo_0_3_30 ]; + sha256 = ''1zab48wj04nyl01kkmmj23l5lwjid5mkhd92hpr3qf1r82zcj983''; }; - activeresource_3_1_0 = { + activeresource_3_1_1 = { basename = ''activeresource''; meta = { description = ''REST modeling framework (part of Rails).''; homepage = ''http://www.rubyonrails.org''; longDescription = ''REST on Rails. Wrap your RESTful web app with Ruby classes and work with them like Active Record models.''; }; - name = ''activeresource-3.1.0''; + name = ''activeresource-3.1.1''; requiredGems = [ ]; - sha256 = ''1vd4mmfxk1zmqxv44q0wxhg74yc7qah17im44qjv0b850522vavg''; + sha256 = ''04wk4s5a5iiyhd90m6bfs0vl92h3yf85vypfp79y3n0ybq7hd27w''; }; - activesupport_3_1_0 = { + activesupport_3_1_1 = { basename = ''activesupport''; meta = { description = ''A toolkit of support libraries and Ruby core extensions extracted from the Rails framework.''; homepage = ''http://www.rubyonrails.org''; longDescription = ''A toolkit of support libraries and Ruby core extensions extracted from the Rails framework. Rich support for multibyte strings, internationalization, time zones, and testing.''; }; - name = ''activesupport-3.1.0''; + name = ''activesupport-3.1.1''; requiredGems = [ g.multi_json_1_0_3 ]; - sha256 = ''0hrnak4rpaxxb34918d9yjvcgz2jv7mnbsf3a7nz6dvqf6gw7110''; + sha256 = ''1d9c0iqsngp7sib5jjvs2zlq8xwzi2yfc0kp6s9a7y6rm9k5f9f2''; }; arel_2_2_1 = { basename = ''arel''; @@ -122,20 +122,6 @@ database compatibility and query generation.''; requiredGems = [ ]; sha256 = ''19pz68pr9l8h2j2v3vqzhjvs94s0hwqwpb6m9sd6ncj18gaci8jy''; }; - bcrypt_ruby_3_0_0 = { - basename = ''bcrypt_ruby''; - meta = { - description = ''OpenBSD's bcrypt() password hashing algorithm.''; - homepage = ''http://bcrypt-ruby.rubyforge.org''; - longDescription = '' bcrypt() is a sophisticated and secure hash algorithm designed by The OpenBSD project - for hashing passwords. bcrypt-ruby provides a simple, humane wrapper for safely handling - passwords. -''; - }; - name = ''bcrypt-ruby-3.0.0''; - requiredGems = [ ]; - sha256 = ''0chw0hh2vkb0nc4x1g350wzplf7kas6fddfa976c6gwvjgrbd7fw''; - }; builder_3_0_0 = { basename = ''builder''; meta = { @@ -152,16 +138,16 @@ simple to do. Currently the following builder objects are supported: requiredGems = [ ]; sha256 = ''13k12jii9z1hma4xxk2dl74wsx985idl3cs9svvla8p0bmgf3lzv''; }; - bundler_1_0_18 = { + bundler_1_0_21 = { basename = ''bundler''; meta = { description = ''The best way to manage your application's dependencies''; homepage = ''http://gembundler.com''; longDescription = ''Bundler manages an application's dependencies through its entire life, across many machines, systematically and repeatably''; }; - name = ''bundler-1.0.18''; + name = ''bundler-1.0.21''; requiredGems = [ ]; - sha256 = ''0rz1qibmvydkfx0akq97rlihvf20jl51dxh8x0xivb1i0zkykb5b''; + sha256 = ''0lcxz75vvgqib43wxzv6021qs5d7bxhnds4j4q27hzqs982cn0s6''; }; erubis_2_7_0 = { basename = ''erubis''; @@ -208,6 +194,17 @@ simple to do. Currently the following builder objects are supported: requiredGems = [ ]; sha256 = ''1pgmfhmh2wv409g7kla30mkp8jpslvp25vcmmim1figl87wpn3j0''; }; + json_1_6_1 = { + basename = ''json''; + meta = { + description = ''JSON Implementation for Ruby''; + homepage = ''http://flori.github.com/json''; + longDescription = ''This is a JSON implementation as a Ruby extension in C.''; + }; + name = ''json-1.6.1''; + requiredGems = [ ]; + sha256 = ''0xxqr491s2xrxy76551jby4fcwdqa222wwhfhxhgwj7prf35sqc4''; + }; mail_2_3_0 = { basename = ''mail''; meta = { @@ -266,7 +263,7 @@ augments 'require' to find and load matching files.''; requiredGems = [ ]; sha256 = ''0m2ni5bcwfmhjwndhy115zgcvq0wdf3hk0hal1sfidfz9vbd0hyz''; }; - rack_1_3_2 = { + rack_1_3_4 = { basename = ''rack''; meta = { description = ''a modular Ruby webserver interface''; @@ -280,20 +277,20 @@ middleware) into a single method call. Also see http://rack.rubyforge.org. ''; }; - name = ''rack-1.3.2''; + name = ''rack-1.3.4''; requiredGems = [ ]; - sha256 = ''1qrs4ryj8a4c3f9raz8mvcl82dinzyiy7rcp7i3jd2xjra75dz7k''; + sha256 = ''17wil1sf8pinmbzlf05sfw48ry6x1hmgxq1im8fagjrf3p2rnzrl''; }; - rack_cache_1_0_3 = { + rack_cache_1_1 = { basename = ''rack_cache''; meta = { description = ''HTTP Caching for Rack''; homepage = ''http://tomayko.com/src/rack-cache/''; longDescription = ''HTTP Caching for Rack''; }; - name = ''rack-cache-1.0.3''; - requiredGems = [ g.rack_1_3_2 ]; - sha256 = ''188q2sf44380zqq8kpqb6d4gl7fh5bimkcn8khpri64n6lmqd42w''; + name = ''rack-cache-1.1''; + requiredGems = [ g.rack_1_3_4 ]; + sha256 = ''08jlym48qwfj7wddv0vpjj3vlc03q8wvbya24zbrjj8grgfgrvrl''; }; rack_mount_0_8_3 = { basename = ''rack_mount''; @@ -333,27 +330,27 @@ request helpers feature.''; requiredGems = [ ]; sha256 = ''0hq5q8fjhbb7szzrj7k0l21z025c4qsxqzd5qmgivikhymw10ws0''; }; - rails_3_1_0 = { + rails_3_1_1 = { basename = ''rails''; meta = { description = ''Full-stack web application framework.''; homepage = ''http://www.rubyonrails.org''; longDescription = ''Ruby on Rails is a full-stack web framework optimized for programmer happiness and sustainable productivity. It encourages beautiful code by favoring convention over configuration.''; }; - name = ''rails-3.1.0''; - requiredGems = [ g.activesupport_3_1_0 g.actionpack_3_1_0 g.activerecord_3_1_0 g.activeresource_3_1_0 g.actionmailer_3_1_0 g.railties_3_1_0 g.bundler_1_0_18 ]; - sha256 = ''1ki0jnq40kvfdp3kvnzvnrl9j09n9gql77pbl6jz565siqnvikms''; + name = ''rails-3.1.1''; + requiredGems = [ g.activesupport_3_1_1 g.actionpack_3_1_1 g.activerecord_3_1_1 g.activeresource_3_1_1 g.actionmailer_3_1_1 g.railties_3_1_1 g.bundler_1_0_21 ]; + sha256 = ''0w8ab71f4b78mq8q7kbb5bfwsbzy4mnp82jckzwndkhxf9141js2''; }; - railties_3_1_0 = { + railties_3_1_1 = { basename = ''railties''; meta = { description = ''Tools for creating, working with, and running Rails applications.''; homepage = ''http://www.rubyonrails.org''; longDescription = ''Rails internals: application bootup, plugins, generators, and rake tasks.''; }; - name = ''railties-3.1.0''; - requiredGems = [ g.rake_0_9_2 g.thor_0_14_6 g.rack_ssl_1_3_2 g.rdoc_3_9_4 ]; - sha256 = ''155snh4hwflxqylyqlsyqpdm5f80qk2lqn9jhksx85m1sz99mxym''; + name = ''railties-3.1.1''; + requiredGems = [ g.rake_0_9_2 g.thor_0_14_6 g.rack_ssl_1_3_2 g.rdoc_3_10 ]; + sha256 = ''0xvspkv63xvm47daw13dn7p1nzhmlk0zmyw4mznazp44zvzkli63''; }; rake_0_9_2 = { basename = ''rake''; @@ -368,7 +365,7 @@ request helpers feature.''; requiredGems = [ ]; sha256 = ''1348lm18j0rki4zjgb4rgplai32j0izkvbbi66lk7n0z89dm4ny5''; }; - rdoc_3_9_4 = { + rdoc_3_10 = { basename = ''rdoc''; meta = { description = ''RDoc produces HTML and command-line documentation for Ruby projects''; @@ -379,20 +376,20 @@ documentation. See RDoc for a description of RDoc's markup and basic use.''; }; - name = ''rdoc-3.9.4''; - requiredGems = [ ]; - sha256 = ''0znp5xssql3pmk38s58b0dvvcv5d3r28gx6jrzyb9158jz98jmf5''; + name = ''rdoc-3.10''; + requiredGems = [ g.json_1_6_1 ]; + sha256 = ''16cx357w9s9ijyl8pzd947dr6n7wnmm6cd0yxm4cy0hbjqafpn1k''; }; - sprockets_2_0_0 = { + sprockets_2_0_2 = { basename = ''sprockets''; meta = { description = ''Rack-based asset packaging system''; homepage = ''http://getsprockets.org/''; longDescription = ''Sprockets is a Rack-based asset packaging system that concatenates and serves JavaScript, CoffeeScript, CSS, LESS, Sass, and SCSS.''; }; - name = ''sprockets-2.0.0''; + name = ''sprockets-2.0.2''; requiredGems = [ g.hike_1_2_1 g.tilt_1_3_3 ]; - sha256 = ''1b3yih9mzpbn6w1kymwrcd606yw8nds5h3ig4ky5g65qwl7gk75c''; + sha256 = ''1wwpixlql2p9jq497g97iv0iw2fni7sldcxvfzz65df07pi54624''; }; thor_0_14_6 = { basename = ''thor''; @@ -426,16 +423,16 @@ See RDoc for a description of RDoc's markup and basic use.''; requiredGems = [ g.polyglot_0_3_2 ]; sha256 = ''01f4w7fm6phhdbkx7bp0b58hrk3x4b0a63p2vvjbxm5gi2gv9ap2''; }; - tzinfo_0_3_29 = { + tzinfo_0_3_30 = { basename = ''tzinfo''; meta = { description = ''Daylight-savings aware timezone library''; homepage = ''http://tzinfo.rubyforge.org/''; longDescription = ''TZInfo is a Ruby library that uses the standard tz (Olson) database to provide daylight savings aware transformations between times in different time zones.''; }; - name = ''tzinfo-0.3.29''; + name = ''tzinfo-0.3.30''; requiredGems = [ ]; - sha256 = ''10504cr141vgg12nqbd920xj0q2b07gbjjdwdrwjj35pp97ymrij''; + sha256 = ''13zzcbbwkz5h9v7ik1xmwlp1bwnn5qpm37b3h2p2csa2j2n7nbaj''; }; }; } From a6db3d5723301c641377fd987f5b2355fdd1a230 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= Date: Wed, 12 Oct 2011 19:16:15 +0000 Subject: [PATCH 157/970] Fixing package naming in wesnoth broken by r27666 svn path=/nixpkgs/trunk/; revision=29794 --- pkgs/games/wesnoth/default.nix | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/pkgs/games/wesnoth/default.nix b/pkgs/games/wesnoth/default.nix index 000fa02b8ab..f9f1ddebc1d 100644 --- a/pkgs/games/wesnoth/default.nix +++ b/pkgs/games/wesnoth/default.nix @@ -3,20 +3,20 @@ , fribidi, asciidoc }: stdenv.mkDerivation rec { - name = "wesnoth"; + pname = "wesnoth"; version = "1.8.6"; - pname = "${name}-${version}"; + name = "${pname}-${version}"; src = fetchurl { - url = "mirror://sourceforge/sourceforge/${name}/${pname}.tar.bz2"; + url = "mirror://sourceforge/sourceforge/${pname}/${name}.tar.bz2"; sha256 = "10c01ys846zsy831gprdy2nx3qlzv65s4jy99lw6misak3x07rjg"; }; buildInputs = [ SDL SDL_image SDL_mixer SDL_net SDL_ttf pango gettext zlib boost fribidi automake autoconf freetype libpng pkgconfig lua dbus fontconfig libtool ]; - # The preInstall sed substitution fix errors which I + # The preInstall sed substitution fix errors which I # believe arise from autotools version mismatches. Rather than # hunt for the correct automake and autoconf versions these changes # make the build work with the versions current in Nixpkgs. @@ -26,8 +26,8 @@ stdenv.mkDerivation rec { configurePhase = '' ./autogen.sh --prefix=$out --with-boost=${boost} \ - --with-preferences-dir=.${name} \ - --with-datadir-name=${name} + --with-preferences-dir=.${pname} \ + --with-datadir-name=${pname} ''; # Make the package build with the gcc currently available in Nixpkgs. @@ -42,7 +42,7 @@ stdenv.mkDerivation rec { reclaim the throne of Wesnoth, or take hand in any number of other adventures. ''; - + homepage = http://www.wesnoth.org/; license = licenses.gpl2; maintainers = [ maintainers.kkallio ]; From 14e951e6d59c4bf2ecf3386c7a18eb019531e803 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= Date: Wed, 12 Oct 2011 20:43:44 +0000 Subject: [PATCH 158/970] GNU RCS 5.8. svn path=/nixpkgs/trunk/; revision=29795 --- .../version-management/rcs/default.nix | 29 +++++++++++-------- 1 file changed, 17 insertions(+), 12 deletions(-) diff --git a/pkgs/applications/version-management/rcs/default.nix b/pkgs/applications/version-management/rcs/default.nix index 38c1d38e349..4be4c0c5f69 100644 --- a/pkgs/applications/version-management/rcs/default.nix +++ b/pkgs/applications/version-management/rcs/default.nix @@ -1,23 +1,28 @@ {stdenv, fetchurl}: -stdenv.mkDerivation { - name = "rcs-5.7"; +stdenv.mkDerivation rec { + name = "rcs-5.8"; src = fetchurl { - url = ftp://ftp.cs.purdue.edu/pub/RCS/rcs-5.7.tar; - md5 = "f7b3f106bf87ff6344df38490f6a02c5"; + url = "mirror://gnu/rcs/${name}.tar.gz"; + sha256 = "0q12nlghv4khxw5lk0y4949caghzg4jg0ripddi2h3q75vmfh6vh"; }; - patches = [ ./no-root.patch ]; - - preConfigure = '' - makeFlags="man1dir=$out/share/man/man1 man5dir=$out/share/man/man5"; - ''; + doCheck = true; meta = { - homepage = http://www.cs.purdue.edu/homes/trinkle/RCS/; - description = "Revision Control System, a version management system"; - maintainers = [ stdenv.lib.maintainers.eelco stdenv.lib.maintainers.simons ]; + homepage = http://www.gnu.org/software/rcs/; + description = "GNU RCS, a revision control system"; + longDescription = + '' The GNU Revision Control System (RCS) manages multiple revisions of + files. RCS automates the storing, retrieval, logging, + identification, and merging of revisions. RCS is useful for text + that is revised frequently, including source code, programs, + documentation, graphics, papers, and form letters. + ''; + + license = "GPLv3+"; + maintainers = with stdenv.lib.maintainers; [ eelco simons ludo ]; platforms = stdenv.lib.platforms.all; }; } From ce2bceeeaca56391e71afa3baf92df0343c0ff96 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?= Date: Wed, 12 Oct 2011 21:25:05 +0000 Subject: [PATCH 159/970] Updating feh. svn path=/nixpkgs/trunk/; revision=29798 --- pkgs/applications/graphics/feh/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/graphics/feh/default.nix b/pkgs/applications/graphics/feh/default.nix index c36e79fbc3a..eedf797c1c7 100644 --- a/pkgs/applications/graphics/feh/default.nix +++ b/pkgs/applications/graphics/feh/default.nix @@ -2,11 +2,11 @@ , libXinerama, curl }: stdenv.mkDerivation { - name = "feh-1.14.2"; + name = "feh-2.0"; src = fetchurl { - url = http://feh.finalrewind.org/feh-1.14.2.tar.bz2; - sha256 = "117g1caihil88a3q0qy9gqj521l3illlsk56cgxhpc2am6ch5nwr"; + url = http://feh.finalrewind.org/feh-2.0.tar.bz2; + sha256 = "0ilrabi0i4gads6b5r4d7svdav00n5vxjcn6h4kbd05d2hz0mjf5"; }; buildInputs = [x11 imlib2 giblib libjpeg libpng libXinerama curl]; From 18bd78f116a3be3576dacd3e66cdd7dc70ec394a Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Wed, 12 Oct 2011 21:59:36 +0000 Subject: [PATCH 160/970] * Get k3b to build again. svn path=/nixpkgs/trunk/; revision=29801 --- pkgs/applications/misc/k3b/default.nix | 18 +++++++++++------- 1 file changed, 11 insertions(+), 7 deletions(-) diff --git a/pkgs/applications/misc/k3b/default.nix b/pkgs/applications/misc/k3b/default.nix index ff2451761dc..cff71a6a00e 100644 --- a/pkgs/applications/misc/k3b/default.nix +++ b/pkgs/applications/misc/k3b/default.nix @@ -1,21 +1,25 @@ { stdenv, fetchurl, cmake, qt4, perl, shared_mime_info, libvorbis, taglib -, ffmpeg, flac, libsamplerate, libdvdread, lame, libsndfile, libmad, gettext -, kdelibs, kdemultimedia, automoc4, phonon, makeWrapper +, flac, libsamplerate, libdvdread, lame, libsndfile, libmad, gettext +, kdelibs, kdemultimedia, automoc4, phonon }: stdenv.mkDerivation rec { name = "k3b-2.0.2"; + src = fetchurl { url = "mirror://sourceforge/k3b/${name}.tar.bz2"; sha256 = "1kdpylz3w9bg02jg4mjhqz8bq1yb4xi4fqfl9139qcyjq4lny5xg"; }; - buildInputs = [ cmake qt4 perl shared_mime_info libvorbis taglib - ffmpeg flac libsamplerate libdvdread lame libsndfile - libmad gettext stdenv.gcc.libc - kdelibs kdemultimedia automoc4 phonon - makeWrapper ]; + buildInputs = + [ cmake qt4 perl shared_mime_info libvorbis taglib + flac libsamplerate libdvdread lame libsndfile + libmad gettext stdenv.gcc.libc + kdelibs kdemultimedia automoc4 phonon + ]; + enableParallelBuilding = true; + meta = with stdenv.lib; { description = "CD/DVD Burning Application for KDE"; license = licenses.gpl2Plus; From 2feeeacb7b603569bd90aaae760bc976561ccc18 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Thu, 13 Oct 2011 07:26:44 +0000 Subject: [PATCH 161/970] nbd: we don't generate statically linked binaries for that package anymore, so it's no longer necessary to pass a special version of glib to the expression. svn path=/nixpkgs/trunk/; revision=29802 --- pkgs/top-level/all-packages.nix | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index fbc27330614..490e7cbf879 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -1003,11 +1003,7 @@ let namazu = callPackage ../tools/text/namazu { }; - nbd = callPackage ../tools/networking/nbd { - glib = gtkLibs.glib.override { - stdenv = makeStaticBinaries stdenv; - }; - }; + nbd = callPackage ../tools/networking/nbd { }; netcdf = callPackage ../development/libraries/netcdf { }; From ee2fdfb00df8cc281dde26cd698f28f1eeb96a60 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Thu, 13 Oct 2011 07:38:44 +0000 Subject: [PATCH 162/970] mscgen: added version 0.20 svn path=/nixpkgs/trunk/; revision=29803 --- pkgs/tools/graphics/mscgen/default.nix | 42 ++++++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 44 insertions(+) create mode 100644 pkgs/tools/graphics/mscgen/default.nix diff --git a/pkgs/tools/graphics/mscgen/default.nix b/pkgs/tools/graphics/mscgen/default.nix new file mode 100644 index 00000000000..63e6afaa803 --- /dev/null +++ b/pkgs/tools/graphics/mscgen/default.nix @@ -0,0 +1,42 @@ +{ stdenv, fetchurl, flex, bison, gd, libpng, freetype, zlib }: + +let + version = "0.20"; +in +stdenv.mkDerivation { + name = "mscgen-${version}"; + + src = fetchurl { + url = "www.mcternan.me.uk/mscgen/software/mscgen-src-${version}.tar.gz"; + sha256 = "3c3481ae0599e1c2d30b7ed54ab45249127533ab2f20e768a0ae58d8551ddc23"; + }; + + buildInputs = [ flex bison gd libpng freetype zlib ]; + + doCheck = true; + preCheck = '' + sed -i -e "s|#!/bin/bash|#!${stdenv.shell}|" test/renderercheck.sh + ''; + + meta = { + homepage = "http://www.mcternan.me.uk/mscgen/"; + description = "convert Message Sequence Chart descriptions into PNG, SVG, or EPS images"; + license = "GPLv2"; + + longDescription = '' + Mscgen is a small program that parses Message Sequence Chart + descriptions and produces PNG, SVG, EPS or server side image maps + (ismaps) as the output. Message Sequence Charts (MSCs) are a way + of representing entities and interactions over some time period + and are often used in combination with SDL. MSCs are popular in + Telecoms to specify how protocols operate although MSCs need not + be complicated to create or use. Mscgen aims to provide a simple + text language that is clear to create, edit and understand, which + can also be transformed into common image formats for display or + printing. + ''; + + platforms = stdenv.lib.platforms.linux; + maintainers = [ stdenv.lib.maintainers.simons ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 490e7cbf879..24147b4f2eb 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -969,6 +969,8 @@ let mpage = callPackage ../tools/text/mpage { }; + mscgen = callPackage ../tools/graphics/mscgen { }; + msf = builderDefsPackage (import ../tools/security/metasploit/3.1.nix) { inherit ruby makeWrapper; }; From 3850bb86baef6ace53ddbc04e51164bb688aa21c Mon Sep 17 00:00:00 2001 From: Florian Friesdorf Date: Thu, 13 Oct 2011 08:47:49 +0000 Subject: [PATCH 163/970] linux_2_6_39_powertop svn path=/nixpkgs/trunk/; revision=29805 --- pkgs/top-level/all-packages.nix | 26 ++++++++++++++++++++++++++ 1 file changed, 26 insertions(+) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 24147b4f2eb..ab0fc4ccb61 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -5537,6 +5537,7 @@ let linux_2_6_38_ati = linux_2_6_38.override { extraConfig="DRM_RADEON_KMS y"; }; + # Please keep in sync with linux_2_6_39_powertop, except for extraConfig linux_2_6_39 = makeOverridable (import ../os-specific/linux/kernel/linux-2.6.39.nix) { inherit fetchurl stdenv perl mktemp module_init_tools ubootChooser; kernelPatches = @@ -5547,6 +5548,30 @@ let ]; }; + # Please keep in sync with linux_2_6_39, except for extraConfig + linux_2_6_39_powertop = makeOverridable (import ../os-specific/linux/kernel/linux-2.6.39.nix) { + inherit fetchurl stdenv perl mktemp module_init_tools ubootChooser; + extraConfig = '' + CPU_FREQ_GOV_ONDEMAND y + CPU_FREQ_STAT y + DEBUG_KERNEL y + HIGH_RES_TIMERS y + HPET_TIMER y + NO_HZ y + PM_ADVANCED_DEBUG y + PM_RUNTIME y + SND_AC97_POWER_SAVE y + TIMER_STATS y + USB_SUSPEND y + ''; + kernelPatches = + [ #kernelPatches.fbcondecor_2_6_38 + kernelPatches.sec_perm_2_6_24 + kernelPatches.aufs2_1_2_6_39 + #kernelPatches.mips_restart_2_6_36 + ]; + }; + linux_3_0 = makeOverridable (import ../os-specific/linux/kernel/linux-3.0.nix) { inherit fetchurl stdenv perl mktemp module_init_tools ubootChooser; kernelPatches = @@ -5713,6 +5738,7 @@ let linuxPackages_2_6_38 = recurseIntoAttrs (linuxPackagesFor linux_2_6_38 pkgs.linuxPackages_2_6_38); linuxPackages_2_6_38_ati = recurseIntoAttrs (linuxPackagesFor linux_2_6_38_ati pkgs.linuxPackages_2_6_38); linuxPackages_2_6_39 = recurseIntoAttrs (linuxPackagesFor linux_2_6_39 pkgs.linuxPackages_2_6_39); + linuxPackages_2_6_39_powertop = recurseIntoAttrs (linuxPackagesFor linux_2_6_39_powertop pkgs.linuxPackages_2_6_39_powertop); linuxPackages_3_0 = recurseIntoAttrs (linuxPackagesFor linux_3_0 pkgs.linuxPackages_3_0); linuxPackages_3_1 = recurseIntoAttrs (linuxPackagesFor linux_3_1 pkgs.linuxPackages_3_1); linuxPackages_nanonote_jz_2_6_34 = recurseIntoAttrs (linuxPackagesFor linux_nanonote_jz_2_6_34 pkgs.linuxPackages_nanonote_jz_2_6_34); From 0989227b08fd53e391d4fde3bd67be34abce8eef Mon Sep 17 00:00:00 2001 From: Florian Friesdorf Date: Thu, 13 Oct 2011 08:47:58 +0000 Subject: [PATCH 164/970] fix powertop-1.13.patch svn path=/nixpkgs/trunk/; revision=29806 --- pkgs/os-specific/linux/powertop/powertop-1.13.patch | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/powertop/powertop-1.13.patch b/pkgs/os-specific/linux/powertop/powertop-1.13.patch index d8a7d546c54..cf66b297190 100644 --- a/pkgs/os-specific/linux/powertop/powertop-1.13.patch +++ b/pkgs/os-specific/linux/powertop/powertop-1.13.patch @@ -1,7 +1,7 @@ diff -ru powertop-1.13/Makefile powertop-1.13.new/Makefile --- powertop-1.13/Makefile +++ powertop-1.13.new/Makefile -@@ -1,6 +1,6 @@ +@@ -1,8 +1,8 @@ VERSION = 1.13 -BINDIR=/usr/bin @@ -10,6 +10,6 @@ diff -ru powertop-1.13/Makefile powertop-1.13.new/Makefile +BINDIR=${out}/bin +LOCALESDIR=${out}/share/locale +MANDIR=${out}/share/man/man8 - WARNFLAGS=-Wall -W -Wshadow -W -Wformat -Wimplicit-function-declaration -Wimplicit-int + WARNFLAGS=-Wall -Wshadow -W -Wformat -Wimplicit-function-declaration -Wimplicit-int CFLAGS?=-Os -g ${WARNFLAGS} CC?=gcc From dfd9a5906da6aad5e96818874e3009bce16b9df6 Mon Sep 17 00:00:00 2001 From: Florian Friesdorf Date: Thu, 13 Oct 2011 08:53:47 +0000 Subject: [PATCH 165/970] powertop meta info svn path=/nixpkgs/trunk/; revision=29807 --- pkgs/os-specific/linux/powertop/default.nix | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/pkgs/os-specific/linux/powertop/default.nix b/pkgs/os-specific/linux/powertop/default.nix index aaa7d6f04e0..e0575b33c49 100644 --- a/pkgs/os-specific/linux/powertop/default.nix +++ b/pkgs/os-specific/linux/powertop/default.nix @@ -8,4 +8,10 @@ stdenv.mkDerivation { }; patches = [./powertop-1.13.patch]; buildInputs = [ncurses gettext]; + meta = { + description = "Analyze power consumption on Intel-based laptops"; + license = "GPLv2"; + maintainers = [ stdenv.lib.maintainers.chaoflow ]; + platforms = stdenv.lib.platforms.linux; + }; } From 58e9385e704fc22cb6bc0c364465c73df13fd022 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?= Date: Thu, 13 Oct 2011 08:58:45 +0000 Subject: [PATCH 166/970] Downgrading boinc to the last stable version. svn path=/nixpkgs/trunk/; revision=29808 --- pkgs/applications/science/misc/boinc/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/science/misc/boinc/default.nix b/pkgs/applications/science/misc/boinc/default.nix index 460355b274f..5cc79469b76 100644 --- a/pkgs/applications/science/misc/boinc/default.nix +++ b/pkgs/applications/science/misc/boinc/default.nix @@ -3,12 +3,12 @@ mesa, libXmu, libXi, freeglut, libjpeg, libtool, wxGTK, sqlite, gtk, patchelf, libXScrnSaver, libnotify, libX11 }: stdenv.mkDerivation rec { - name = "boinc-6.13.6"; + name = "boinc-6.12.39"; src = fetchsvn { - url = "http://boinc.berkeley.edu/svn/tags/boinc_core_release_6_13_6"; + url = "http://boinc.berkeley.edu/svn/tags/boinc_core_release_6_12_39"; rev = 24341; - sha256 = "17312g4mhxigka1rafxxw46a4mbdlfj1wh1nlp1cbg43hv2rf7bq"; + sha256 = "158fkm4mr7wljsy8gav20km8jamf00mxjk1wsiqw6kx62bih37yb"; }; buildInputs = [ libtool automake autoconf m4 pkgconfig curl mesa libXmu libXi From 19503ac12a97d18f28bc4733de55522edff8d387 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?= Date: Thu, 13 Oct 2011 08:59:56 +0000 Subject: [PATCH 167/970] Updating task spooler svn path=/nixpkgs/trunk/; revision=29809 --- pkgs/tools/system/ts/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/system/ts/default.nix b/pkgs/tools/system/ts/default.nix index be41b88c9e3..ef3fa7ec706 100644 --- a/pkgs/tools/system/ts/default.nix +++ b/pkgs/tools/system/ts/default.nix @@ -2,7 +2,7 @@ stdenv.mkDerivation { - name = "ts-0.7.0"; + name = "ts-0.7.1"; installPhase=''make install "PREFIX=$out"''; @@ -11,8 +11,8 @@ stdenv.mkDerivation { }; src = fetchurl { - url = http://vicerveza.homeunix.net/~viric/soft/ts/ts-0.7.0.tar.gz; - sha256 = "1m9nf0299idkh355afk2c9v9qqpxm4ram3gyf8a9qv4f9gg6hprp"; + url = http://vicerveza.homeunix.net/~viric/soft/ts/ts-0.7.1.tar.gz; + sha256 = "0s1hrgw99jn6ar01lcvhdgqsw0jzfnbpdayp0pydr6ikx1zwz70v"; }; meta = { From abd410f804fce1e71f0de46543b79c8412b51da9 Mon Sep 17 00:00:00 2001 From: Florian Friesdorf Date: Thu, 13 Oct 2011 09:06:52 +0000 Subject: [PATCH 168/970] fix powertop INOTIFY suggestion INOTIFY_USER exists since 2.6.18 svn path=/nixpkgs/trunk/; revision=29810 --- ...OTIFY_USER-instead-of-CONFIG_INOTIFY.patch | 28 +++++++++++++++++++ pkgs/os-specific/linux/powertop/default.nix | 5 +++- 2 files changed, 32 insertions(+), 1 deletion(-) create mode 100644 pkgs/os-specific/linux/powertop/0001-CONFIG_INOTIFY_USER-instead-of-CONFIG_INOTIFY.patch diff --git a/pkgs/os-specific/linux/powertop/0001-CONFIG_INOTIFY_USER-instead-of-CONFIG_INOTIFY.patch b/pkgs/os-specific/linux/powertop/0001-CONFIG_INOTIFY_USER-instead-of-CONFIG_INOTIFY.patch new file mode 100644 index 00000000000..46caed050f4 --- /dev/null +++ b/pkgs/os-specific/linux/powertop/0001-CONFIG_INOTIFY_USER-instead-of-CONFIG_INOTIFY.patch @@ -0,0 +1,28 @@ +From 89e46f3270e3b6d704959c4d0f44ae6bab8f7616 Mon Sep 17 00:00:00 2001 +From: Florian Friesdorf +Date: Thu, 13 Oct 2011 10:14:34 +0200 +Subject: [PATCH] CONFIG_INOTIFY_USER instead of CONFIG_INOTIFY + +since 2.6.36 the former fully replaced the latter +--- + powertop.c | 4 ++-- + 1 files changed, 2 insertions(+), 2 deletions(-) + +diff --git a/powertop.c b/powertop.c +index 74eb328..8df3652 100644 +--- a/powertop.c ++++ b/powertop.c +@@ -1191,8 +1191,8 @@ int main(int argc, char **argv) + suggest_kernel_config("CONFIG_CPU_FREQ_STAT", 1, + _("Suggestion: Enable the CONFIG_CPU_FREQ_STAT kernel configuration option.\n" + "This option allows PowerTOP to show P-state percentages \n" "P-states correspond to CPU frequencies."), 2); +- suggest_kernel_config("CONFIG_INOTIFY", 1, +- _("Suggestion: Enable the CONFIG_INOTIFY kernel configuration option.\n" ++ suggest_kernel_config("CONFIG_INOTIFY_USER", 1, ++ _("Suggestion: Enable the CONFIG_INOTIFY_USER kernel configuration option.\n" + "This option allows programs to wait for changes in files and directories\n" + "instead of having to poll for these changes"), 5); + +-- +1.7.6 + diff --git a/pkgs/os-specific/linux/powertop/default.nix b/pkgs/os-specific/linux/powertop/default.nix index e0575b33c49..7c66556df29 100644 --- a/pkgs/os-specific/linux/powertop/default.nix +++ b/pkgs/os-specific/linux/powertop/default.nix @@ -6,7 +6,10 @@ stdenv.mkDerivation { url = http://www.lesswatts.org/projects/powertop/download/powertop-1.13.tar.gz; sha256 = "164dqp6msdaxpi2bmvwawasyrf1sfvanlc9ddp97v1wnjh46dj1b"; }; - patches = [./powertop-1.13.patch]; + patches = [ + ./powertop-1.13.patch + ./0001-CONFIG_INOTIFY_USER-instead-of-CONFIG_INOTIFY.patch + ]; buildInputs = [ncurses gettext]; meta = { description = "Analyze power consumption on Intel-based laptops"; From 805a4c0261d2c33d62a47af0cc89869e6e1c4e2e Mon Sep 17 00:00:00 2001 From: Florian Friesdorf Date: Thu, 13 Oct 2011 09:23:22 +0000 Subject: [PATCH 169/970] linux/kernel - added myself to maintainers svn path=/nixpkgs/trunk/; revision=29811 --- pkgs/os-specific/linux/kernel/generic.nix | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/pkgs/os-specific/linux/kernel/generic.nix b/pkgs/os-specific/linux/kernel/generic.nix index eaa90ac0eec..dbfdf86f9c9 100644 --- a/pkgs/os-specific/linux/kernel/generic.nix +++ b/pkgs/os-specific/linux/kernel/generic.nix @@ -139,7 +139,10 @@ stdenv.mkDerivation { + ")"); license = "GPLv2"; homepage = http://www.kernel.org/; - maintainers = [ lib.maintainers.eelco ]; + maintainers = [ + lib.maintainers.eelco + lib.maintainers.chaoflow + ]; platforms = lib.platforms.linux; } // extraMeta; } From 843ed0c33924250a79141c02e53d3bd9596687d7 Mon Sep 17 00:00:00 2001 From: Marco Maggesi Date: Thu, 13 Oct 2011 12:37:15 +0000 Subject: [PATCH 170/970] Update OpenAFS client to version 1.6.0. Also enable Hydra build. svn path=/nixpkgs/trunk/; revision=29819 --- pkgs/lib/licenses.nix | 6 ++ pkgs/servers/openafs-client/default.nix | 68 +++++++----------- pkgs/servers/openafs-client/replace-usrbinenv | 72 ------------------- .../servers/openafs-client/replace-usrbinperl | 16 ----- .../servers/openafs-client/replace-usrinclude | 42 ----------- pkgs/servers/openafs-client/replace-usrsrc | 11 --- 6 files changed, 32 insertions(+), 183 deletions(-) delete mode 100644 pkgs/servers/openafs-client/replace-usrbinenv delete mode 100644 pkgs/servers/openafs-client/replace-usrbinperl delete mode 100644 pkgs/servers/openafs-client/replace-usrinclude delete mode 100644 pkgs/servers/openafs-client/replace-usrsrc diff --git a/pkgs/lib/licenses.nix b/pkgs/lib/licenses.nix index 1d6b1ca58e2..293bf59ec5d 100644 --- a/pkgs/lib/licenses.nix +++ b/pkgs/lib/licenses.nix @@ -82,6 +82,12 @@ url = https://fedoraproject.org/wiki/Licensing/GPL_Classpath_Exception; }; + ipl10 = { + shortName = "IPL 1.0"; + fullName = "IBM Public License Version 1.0"; + url = http://www.ibm.com/developerworks/opensource/library/os-i18n2/os-ipl.html; + }; + ijg = { shortName = "IJG"; fullName = "Independent JPEG Group License"; diff --git a/pkgs/servers/openafs-client/default.nix b/pkgs/servers/openafs-client/default.nix index 330bcc2e863..ba7de83d939 100644 --- a/pkgs/servers/openafs-client/default.nix +++ b/pkgs/servers/openafs-client/default.nix @@ -1,63 +1,47 @@ -{ stdenv, fetchurl, autoconf, automake, flex, yacc, +{ stdenv, fetchurl, which, autoconf, automake, flex, yacc, kernel, glibc, ncurses, perl, krb5 }: assert stdenv.isLinux; -let - pname = "openafs"; - version = "1.4.11"; - name = "${pname}-${version}-${kernel.version}"; - webpage = http://www.openafs.org; -in - -stdenv.mkDerivation rec { - inherit name; +stdenv.mkDerivation { + name = "openafs-1.6.0-${kernel.version}"; src = fetchurl { - url = "${webpage}/dl/${pname}/${version}/${pname}-${version}-src.tar.gz"; - sha256 = "ea5377119fd7b5317428644fa427066b9edbde395d997943a448426742d2c5c9"; + url = http://www.openafs.org/dl/openafs/1.6.0/openafs-1.6.0-src.tar.bz2; + sha256 = "1rj40qp30hswr08p69jigya78ggbn4dc7qnnw2sfjpv52ywa68p7"; }; - buildInputs = [ autoconf automake flex yacc ncurses perl ]; + buildInputs = [ autoconf automake flex yacc ncurses perl which ]; - replace_usrbinenv = ./replace-usrbinenv; - replace_usrinclude = ./replace-usrinclude; - replace_usrbinperl = ./replace-usrbinperl; - replace_usrsrc = ./replace-usrsrc; - - configurePhase = '' + preConfigure = '' ln -s ${kernel}/lib/modules/*/build $TMP/linux - echo "Replace ..." - for i in `cat ${replace_usrbinenv}`; do - substituteInPlace $i --replace "/usr/bin/env" $(type -tp env) + patchShebangs . + for i in `grep -l -R '/usr/\(include\|src\)' .`; do + echo "Patch /usr/include and /usr/src in $i" + substituteInPlace $i \ + --replace "/usr/include" "${glibc}/include" \ + --replace "/usr/src" "$TMP" done - for i in `cat ${replace_usrinclude}`; do - substituteInPlace $i --replace "/usr/include" "${glibc}/include" - done - for i in `cat ${replace_usrbinperl}`; do - substituteInPlace $i --replace "/usr/bin/perl" $(type -tp perl) - done - for i in `cat ${replace_usrsrc}`; do - substituteInPlace $i --replace "/usr/src" "$TMP" - done - echo "... done" ./regen.sh - ./configure \ - --prefix=$out \ - --with-linux-kernel-build=$TMP/linux \ - --with-krb5-conf=${krb5}/bin/krb5-config \ - --sysconfdir=/etc/static - #--with-afs-sysname=amd64_linux26 \ + export KRB5_CONFIG=${krb5}/bin/krb5-config - substituteInPlace src/pinstall/install.c --replace "/bin/cp" $(type -tp cp) + configureFlagsArray=( + "--with-linux-kernel-build=$TMP/linux" + "--with-krb5" + "--sysconfdir=/etc/static" + ) ''; meta = { - description = "Open AFS client for Linux"; - homepage = webpage; - license = "IPL"; + description = "Open AFS client"; + homepage = http://www.openafs.org; + license = stdenv.lib.licenses.ipl10; + platforms = stdenv.lib.platforms.linux; + maintainers = with stdenv.lib.maintainers; [ + z77z + ]; }; } diff --git a/pkgs/servers/openafs-client/replace-usrbinenv b/pkgs/servers/openafs-client/replace-usrbinenv deleted file mode 100644 index b014e899272..00000000000 --- a/pkgs/servers/openafs-client/replace-usrbinenv +++ /dev/null @@ -1,72 +0,0 @@ -src/tests/ptsmembersuser.pl -src/tests/bossalvagevolume.pl -src/tests/bosstop.pl -src/tests/baduniq.pl -src/tests/voslistvol.pl -src/tests/aclremoveuser.pl -src/tests/vosbackup.pl -src/tests/bosaddhost.pl -src/tests/vosremove.pl -src/tests/bosexec.pl -src/tests/boscreate.pl -src/tests/bosremovehost.pl -src/tests/reauth.pl -src/tests/ptsexamineuser.pl -src/tests/ptsmembersgroup.pl -src/tests/bosremovekey.pl -src/tests/voslistvldb.pl -src/tests/bosshutdown.pl -src/tests/bosadduser.pl -src/tests/aclclearnegrights.pl -src/tests/boslisthosts.pl -src/tests/ptslistmax.pl -src/tests/vosrestore.pl -src/tests/acladdrights.pl -src/tests/ptslistown.pl -src/tests/bosstart.pl -src/tests/vospartinfo.pl -src/tests/bosrestartstopped.pl -src/tests/voszap.pl -src/tests/vosexamine.pl -src/tests/acladdnegrights.pl -src/tests/ptsdeletegroup.pl -src/tests/bosdelete.pl -src/tests/bosstatus.pl -src/tests/aclcopy.pl -src/tests/ptscreateuser.pl -src/tests/vosrelease.pl -src/tests/bosremoveuser.pl -src/tests/ptsexaminegroup.pl -src/tests/voslock.pl -src/tests/vossyncserv.pl -src/tests/ptsadduser.pl -src/tests/bossalvagepart.pl -src/tests/ptsdeleteuser.pl -src/tests/voslistpart.pl -src/tests/vosunlock.pl -src/tests/boslistkeys.pl -src/tests/voscreate.pl -src/tests/vosunlockall.pl -src/tests/vosdump.pl -src/tests/vosaddsite.pl -src/tests/acladdgroup.pl -src/tests/acladduser.pl -src/tests/afs-newcell.pl -src/tests/bosaddkey.pl -src/tests/ptsremove.pl -src/tests/aclremovegroup.pl -src/tests/vosremsite.pl -src/tests/ptschown.pl -src/tests/ptssetf.pl -src/tests/afs-rmcell.pl -src/tests/bosinstall.pl -src/tests/boslistusers.pl -src/tests/vossyncvldb.pl -src/tests/vosdelentry.pl -src/tests/vosmove.pl -src/tests/run-suite.pl -src/tests/vosrename.pl -src/tests/ptscreategroup.pl -src/tests/bosdeleterunning.pl -src/tests/ptssetmax.pl -src/tests/bossalvageserver.pl diff --git a/pkgs/servers/openafs-client/replace-usrbinperl b/pkgs/servers/openafs-client/replace-usrbinperl deleted file mode 100644 index d0742adf06b..00000000000 --- a/pkgs/servers/openafs-client/replace-usrbinperl +++ /dev/null @@ -1,16 +0,0 @@ -src/libafs/make_kbuild_makefile.pl -src/mkdest.pl -src/tools/install/write_fstab.pl -src/tools/install/write_pam.pl -src/tools/install/check_udebug.pl -src/config/make_libafs_tree.pl -src/config/make_vnode.pl -src/packaging/Debian/afs-newcell -src/packaging/Debian/afs-rootvol -src/packaging/Debian/kernel-version -src/packaging/MacOS/csrvdbmerge.pl -src/packaging/MacOS/decode-panic -src/packaging/MacOS/Uninstall -src/packaging/RedHat/mockbuild.pl -src/packaging/RedHat/openafs-buildfedora.pl -src/packaging/RedHat/makesrpm.pl diff --git a/pkgs/servers/openafs-client/replace-usrinclude b/pkgs/servers/openafs-client/replace-usrinclude deleted file mode 100644 index 65cd5394912..00000000000 --- a/pkgs/servers/openafs-client/replace-usrinclude +++ /dev/null @@ -1,42 +0,0 @@ -acinclude.m4 -config.guess -configure -configure-libafs -src/libafs/MakefileProto.NBSD.in -src/libafs/MakefileProto.HPUX.in -src/libafs/MakefileProto.FBSD.in -src/libafs/MakefileProto.OBSD.in -src/libafs/MakefileProto.DFBSD.in -src/libafs/MakefileProto.AIX.in -src/libafs/MakefileProto.DARWIN.in -src/libafs/MakefileProto.SOLARIS.in -src/libafs/Makefile.common.in -src/libafs/MakefileProto.IRIX.in -src/WINNT/kfw/inc/krb4/conf.h -src/JAVA/libjafs/Makefile.in -src/splint.cfg -src/util/vice.h -src/cf/osconf.m4 -src/vfsck/dir.c -src/vfsck/main.c -src/vfsck/utilities.c -src/vfsck/vprintf.c -src/vfsck/pass2.c -src/vfsck/inode.c -src/afsweb/apache_includes/1.2/buff.h -src/afsweb/apache_includes/1.2/conf.h -src/afsweb/apache_includes/1.3.1/buff.h -src/afsweb/apache_includes/1.3.1/ap_config.h -src/afsweb/apache_includes/buff.h -src/afsweb/apache_includes/1.3.6/buff.h -src/afsweb/apache_includes/1.3.6/ap_config.h -src/afsweb/apache_includes/conf.h -src/des/conf.h -src/tests/OpenAFS/errtrans.pm -src/wsadmin.lib/rt_r4.generic -src/wsadmin.lib/pmax_31.generic -src/wsadmin.lib/rt_r4.generic.dkload -src/libuafs/Makefile.common.in -src/afs/afs.h -src/afs/IRIX/osi_vfs.h -src/lwp/process.s diff --git a/pkgs/servers/openafs-client/replace-usrsrc b/pkgs/servers/openafs-client/replace-usrsrc deleted file mode 100644 index 42f2c270952..00000000000 --- a/pkgs/servers/openafs-client/replace-usrsrc +++ /dev/null @@ -1,11 +0,0 @@ -acinclude.m4 -configure -configure-libafs -src/libafs/MakefileProto.NBSD.in -src/tools/install/make_rpm_source -src/tools/install/openafs-tools-cmd-1.2.5-1.spec -src/tools/install/openafs-tools-cmd-1.2.2-1.spec -src/config/make_vnode.pl -src/config/linux-version -src/wsadmin.lib/pmax_31.generic -src/afs/OBSD/osi_vfsops.c From 50a5f9f0e89d6c838a1b6fa1c57a44b08bec8648 Mon Sep 17 00:00:00 2001 From: Florian Friesdorf Date: Thu, 13 Oct 2011 13:04:45 +0000 Subject: [PATCH 171/970] linux_3_0_powertop svn path=/nixpkgs/trunk/; revision=29820 --- pkgs/top-level/all-packages.nix | 27 +++++++++++++++++++++++++++ 1 file changed, 27 insertions(+) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index ab0fc4ccb61..1c6cd5847d8 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -5572,6 +5572,7 @@ let ]; }; + # Please keep in sync with linux_3_0_powertop, except for extraConfig linux_3_0 = makeOverridable (import ../os-specific/linux/kernel/linux-3.0.nix) { inherit fetchurl stdenv perl mktemp module_init_tools ubootChooser; kernelPatches = @@ -5583,6 +5584,31 @@ let ]; }; + # Please keep in sync with linux_3_0, except for extraConfig + linux_3_0_powertop = makeOverridable (import ../os-specific/linux/kernel/linux-3.0.nix) { + inherit fetchurl stdenv perl mktemp module_init_tools ubootChooser; + extraConfig = '' + CPU_FREQ_GOV_ONDEMAND y + CPU_FREQ_STAT y + DEBUG_KERNEL y + HIGH_RES_TIMERS y + HPET_TIMER y + NO_HZ y + PM_ADVANCED_DEBUG y + PM_RUNTIME y + SND_AC97_POWER_SAVE y + TIMER_STATS y + USB_SUSPEND y + ''; + kernelPatches = + [ #kernelPatches.fbcondecor_2_6_38 + kernelPatches.sec_perm_2_6_24 + kernelPatches.aufs3_0 + #kernelPatches.aufs2_1_3_0 + #kernelPatches.mips_restart_2_6_36 + ]; + }; + linux_3_1 = makeOverridable (import ../os-specific/linux/kernel/linux-3.1.nix) { inherit fetchurl stdenv perl mktemp module_init_tools ubootChooser; kernelPatches = @@ -5740,6 +5766,7 @@ let linuxPackages_2_6_39 = recurseIntoAttrs (linuxPackagesFor linux_2_6_39 pkgs.linuxPackages_2_6_39); linuxPackages_2_6_39_powertop = recurseIntoAttrs (linuxPackagesFor linux_2_6_39_powertop pkgs.linuxPackages_2_6_39_powertop); linuxPackages_3_0 = recurseIntoAttrs (linuxPackagesFor linux_3_0 pkgs.linuxPackages_3_0); + linuxPackages_3_0_powertop = recurseIntoAttrs (linuxPackagesFor linux_3_0_powertop pkgs.linuxPackages_3_0_powertop); linuxPackages_3_1 = recurseIntoAttrs (linuxPackagesFor linux_3_1 pkgs.linuxPackages_3_1); linuxPackages_nanonote_jz_2_6_34 = recurseIntoAttrs (linuxPackagesFor linux_nanonote_jz_2_6_34 pkgs.linuxPackages_nanonote_jz_2_6_34); linuxPackages_nanonote_jz_2_6_35 = recurseIntoAttrs (linuxPackagesFor linux_nanonote_jz_2_6_35 pkgs.linuxPackages_nanonote_jz_2_6_35); From 1a54d4bbd64921ee36e46d45552f8c3eba06c449 Mon Sep 17 00:00:00 2001 From: Florian Friesdorf Date: Thu, 13 Oct 2011 13:05:22 +0000 Subject: [PATCH 172/970] powertop: renamed inotify patch svn path=/nixpkgs/trunk/; revision=29821 --- pkgs/os-specific/linux/powertop/default.nix | 2 +- ..._USER-instead-of-CONFIG_INOTIFY.patch => inotify_user.patch} | 0 2 files changed, 1 insertion(+), 1 deletion(-) rename pkgs/os-specific/linux/powertop/{0001-CONFIG_INOTIFY_USER-instead-of-CONFIG_INOTIFY.patch => inotify_user.patch} (100%) diff --git a/pkgs/os-specific/linux/powertop/default.nix b/pkgs/os-specific/linux/powertop/default.nix index 7c66556df29..ae23e165178 100644 --- a/pkgs/os-specific/linux/powertop/default.nix +++ b/pkgs/os-specific/linux/powertop/default.nix @@ -8,7 +8,7 @@ stdenv.mkDerivation { }; patches = [ ./powertop-1.13.patch - ./0001-CONFIG_INOTIFY_USER-instead-of-CONFIG_INOTIFY.patch + ./inotify_user.patch ]; buildInputs = [ncurses gettext]; meta = { diff --git a/pkgs/os-specific/linux/powertop/0001-CONFIG_INOTIFY_USER-instead-of-CONFIG_INOTIFY.patch b/pkgs/os-specific/linux/powertop/inotify_user.patch similarity index 100% rename from pkgs/os-specific/linux/powertop/0001-CONFIG_INOTIFY_USER-instead-of-CONFIG_INOTIFY.patch rename to pkgs/os-specific/linux/powertop/inotify_user.patch From 9d1255778313b9adc1a2f7f906aeb23a88377c82 Mon Sep 17 00:00:00 2001 From: Florian Friesdorf Date: Thu, 13 Oct 2011 13:05:58 +0000 Subject: [PATCH 173/970] powertop: modprobe configs if /proc/config.gz is missing svn path=/nixpkgs/trunk/; revision=29822 --- pkgs/os-specific/linux/powertop/default.nix | 1 + .../linux/powertop/modprobe_configs.patch | 28 +++++++++++++++++++ 2 files changed, 29 insertions(+) create mode 100644 pkgs/os-specific/linux/powertop/modprobe_configs.patch diff --git a/pkgs/os-specific/linux/powertop/default.nix b/pkgs/os-specific/linux/powertop/default.nix index ae23e165178..3d8ca36c3ed 100644 --- a/pkgs/os-specific/linux/powertop/default.nix +++ b/pkgs/os-specific/linux/powertop/default.nix @@ -9,6 +9,7 @@ stdenv.mkDerivation { patches = [ ./powertop-1.13.patch ./inotify_user.patch + ./modprobe_configs.patch ]; buildInputs = [ncurses gettext]; meta = { diff --git a/pkgs/os-specific/linux/powertop/modprobe_configs.patch b/pkgs/os-specific/linux/powertop/modprobe_configs.patch new file mode 100644 index 00000000000..3d6e2a28761 --- /dev/null +++ b/pkgs/os-specific/linux/powertop/modprobe_configs.patch @@ -0,0 +1,28 @@ +From 0002a70b83221a8a831d776836d13105ac886323 Mon Sep 17 00:00:00 2001 +From: Florian Friesdorf +Date: Thu, 13 Oct 2011 14:57:02 +0200 +Subject: [PATCH] powertop tries to load configs, if /proc/config.gz is + missing + +--- + config.c | 4 ++++ + 1 files changed, 4 insertions(+), 0 deletions(-) + +diff --git a/config.c b/config.c +index b2567f2..62ac978 100644 +--- a/config.c ++++ b/config.c +@@ -44,6 +44,10 @@ static void read_kernel_config(void) + char filename[100]; + if (configcount) + return; ++ if (access("/proc/config.gz", R_OK) != 0) { ++ file = popen("modprobe configs >/dev/null 2>&1", "r"); ++ pclose(file); ++ } + if (access("/proc/config.gz", R_OK) == 0) { + file = popen("zcat /proc/config.gz 2> /dev/null", "r"); + while (file && !feof(file)) { +-- +1.7.6 + From 41a5209ccff7586b29e06ff25f13e0675d164189 Mon Sep 17 00:00:00 2001 From: Florian Friesdorf Date: Thu, 13 Oct 2011 13:51:33 +0000 Subject: [PATCH 174/970] linux_3_1_powertop svn path=/nixpkgs/trunk/; revision=29823 --- pkgs/top-level/all-packages.nix | 25 +++++++++++++++++++++++++ 1 file changed, 25 insertions(+) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 1c6cd5847d8..16015543ba7 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -5620,6 +5620,30 @@ let ]; }; + linux_3_1_powertop = makeOverridable (import ../os-specific/linux/kernel/linux-3.1.nix) { + inherit fetchurl stdenv perl mktemp module_init_tools ubootChooser; + extraConfig = '' + CPU_FREQ_GOV_ONDEMAND y + CPU_FREQ_STAT y + DEBUG_KERNEL y + HIGH_RES_TIMERS y + HPET_TIMER y + NO_HZ y + PM_ADVANCED_DEBUG y + PM_RUNTIME y + SND_AC97_POWER_SAVE y + TIMER_STATS y + USB_SUSPEND y + ''; + kernelPatches = + [ #kernelPatches.fbcondecor_2_6_38 + kernelPatches.sec_perm_2_6_24 + kernelPatches.efi_stub + #kernelPatches.aufs2_1_2_6_38 + #kernelPatches.mips_restart_2_6_36 + ]; + }; + /* Linux kernel modules are inherently tied to a specific kernel. So rather than provide specific instances of those packages for a specific kernel, we have a function that builds those packages @@ -5768,6 +5792,7 @@ let linuxPackages_3_0 = recurseIntoAttrs (linuxPackagesFor linux_3_0 pkgs.linuxPackages_3_0); linuxPackages_3_0_powertop = recurseIntoAttrs (linuxPackagesFor linux_3_0_powertop pkgs.linuxPackages_3_0_powertop); linuxPackages_3_1 = recurseIntoAttrs (linuxPackagesFor linux_3_1 pkgs.linuxPackages_3_1); + linuxPackages_3_1_powertop = recurseIntoAttrs (linuxPackagesFor linux_3_1_powertop pkgs.linuxPackages_3_1_powertop); linuxPackages_nanonote_jz_2_6_34 = recurseIntoAttrs (linuxPackagesFor linux_nanonote_jz_2_6_34 pkgs.linuxPackages_nanonote_jz_2_6_34); linuxPackages_nanonote_jz_2_6_35 = recurseIntoAttrs (linuxPackagesFor linux_nanonote_jz_2_6_35 pkgs.linuxPackages_nanonote_jz_2_6_35); linuxPackages_nanonote_jz_2_6_36 = recurseIntoAttrs (linuxPackagesFor linux_nanonote_jz_2_6_36 pkgs.linuxPackages_nanonote_jz_2_6_36); From 2d511f724671ae33a291d17c10a1667d8ff1a755 Mon Sep 17 00:00:00 2001 From: Florian Friesdorf Date: Thu, 13 Oct 2011 13:51:39 +0000 Subject: [PATCH 175/970] use override for powertop kernels svn path=/nixpkgs/trunk/; revision=29824 --- pkgs/top-level/all-packages.nix | 33 +++------------------------------ 1 file changed, 3 insertions(+), 30 deletions(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 16015543ba7..f9522366d50 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -5537,7 +5537,6 @@ let linux_2_6_38_ati = linux_2_6_38.override { extraConfig="DRM_RADEON_KMS y"; }; - # Please keep in sync with linux_2_6_39_powertop, except for extraConfig linux_2_6_39 = makeOverridable (import ../os-specific/linux/kernel/linux-2.6.39.nix) { inherit fetchurl stdenv perl mktemp module_init_tools ubootChooser; kernelPatches = @@ -5548,9 +5547,7 @@ let ]; }; - # Please keep in sync with linux_2_6_39, except for extraConfig - linux_2_6_39_powertop = makeOverridable (import ../os-specific/linux/kernel/linux-2.6.39.nix) { - inherit fetchurl stdenv perl mktemp module_init_tools ubootChooser; + linux_2_6_39_powertop = linux_2_6_39.override { extraConfig = '' CPU_FREQ_GOV_ONDEMAND y CPU_FREQ_STAT y @@ -5564,15 +5561,8 @@ let TIMER_STATS y USB_SUSPEND y ''; - kernelPatches = - [ #kernelPatches.fbcondecor_2_6_38 - kernelPatches.sec_perm_2_6_24 - kernelPatches.aufs2_1_2_6_39 - #kernelPatches.mips_restart_2_6_36 - ]; }; - # Please keep in sync with linux_3_0_powertop, except for extraConfig linux_3_0 = makeOverridable (import ../os-specific/linux/kernel/linux-3.0.nix) { inherit fetchurl stdenv perl mktemp module_init_tools ubootChooser; kernelPatches = @@ -5584,9 +5574,7 @@ let ]; }; - # Please keep in sync with linux_3_0, except for extraConfig - linux_3_0_powertop = makeOverridable (import ../os-specific/linux/kernel/linux-3.0.nix) { - inherit fetchurl stdenv perl mktemp module_init_tools ubootChooser; + linux_3_0_powertop = linux_3_0.override { extraConfig = '' CPU_FREQ_GOV_ONDEMAND y CPU_FREQ_STAT y @@ -5600,13 +5588,6 @@ let TIMER_STATS y USB_SUSPEND y ''; - kernelPatches = - [ #kernelPatches.fbcondecor_2_6_38 - kernelPatches.sec_perm_2_6_24 - kernelPatches.aufs3_0 - #kernelPatches.aufs2_1_3_0 - #kernelPatches.mips_restart_2_6_36 - ]; }; linux_3_1 = makeOverridable (import ../os-specific/linux/kernel/linux-3.1.nix) { @@ -5620,8 +5601,7 @@ let ]; }; - linux_3_1_powertop = makeOverridable (import ../os-specific/linux/kernel/linux-3.1.nix) { - inherit fetchurl stdenv perl mktemp module_init_tools ubootChooser; + linux_3_1_powertop = linux_3_1.override { extraConfig = '' CPU_FREQ_GOV_ONDEMAND y CPU_FREQ_STAT y @@ -5635,13 +5615,6 @@ let TIMER_STATS y USB_SUSPEND y ''; - kernelPatches = - [ #kernelPatches.fbcondecor_2_6_38 - kernelPatches.sec_perm_2_6_24 - kernelPatches.efi_stub - #kernelPatches.aufs2_1_2_6_38 - #kernelPatches.mips_restart_2_6_36 - ]; }; /* Linux kernel modules are inherently tied to a specific kernel. So From b76071a0964c3a83f1ab2ed25fb01646e374bfb1 Mon Sep 17 00:00:00 2001 From: Florian Friesdorf Date: Thu, 13 Oct 2011 13:51:46 +0000 Subject: [PATCH 176/970] remove redundant/conflicting config (y vs m) from powertop kernels svn path=/nixpkgs/trunk/; revision=29825 --- pkgs/top-level/all-packages.nix | 18 ------------------ 1 file changed, 18 deletions(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index f9522366d50..4680183b84a 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -5549,15 +5549,9 @@ let linux_2_6_39_powertop = linux_2_6_39.override { extraConfig = '' - CPU_FREQ_GOV_ONDEMAND y - CPU_FREQ_STAT y DEBUG_KERNEL y - HIGH_RES_TIMERS y - HPET_TIMER y - NO_HZ y PM_ADVANCED_DEBUG y PM_RUNTIME y - SND_AC97_POWER_SAVE y TIMER_STATS y USB_SUSPEND y ''; @@ -5576,15 +5570,9 @@ let linux_3_0_powertop = linux_3_0.override { extraConfig = '' - CPU_FREQ_GOV_ONDEMAND y - CPU_FREQ_STAT y DEBUG_KERNEL y - HIGH_RES_TIMERS y - HPET_TIMER y - NO_HZ y PM_ADVANCED_DEBUG y PM_RUNTIME y - SND_AC97_POWER_SAVE y TIMER_STATS y USB_SUSPEND y ''; @@ -5603,15 +5591,9 @@ let linux_3_1_powertop = linux_3_1.override { extraConfig = '' - CPU_FREQ_GOV_ONDEMAND y - CPU_FREQ_STAT y DEBUG_KERNEL y - HIGH_RES_TIMERS y - HPET_TIMER y - NO_HZ y PM_ADVANCED_DEBUG y PM_RUNTIME y - SND_AC97_POWER_SAVE y TIMER_STATS y USB_SUSPEND y ''; From 69f3a67710a816927706698cef30154d4547c14b Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Thu, 13 Oct 2011 15:01:44 +0000 Subject: [PATCH 177/970] * Upstart updated to 1.3. svn path=/nixpkgs/trunk/; revision=29828 --- pkgs/os-specific/linux/upstart/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/os-specific/linux/upstart/default.nix b/pkgs/os-specific/linux/upstart/default.nix index fba83235475..4e440770ef9 100644 --- a/pkgs/os-specific/linux/upstart/default.nix +++ b/pkgs/os-specific/linux/upstart/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, pkgconfig, dbus, libnih }: stdenv.mkDerivation rec { - name = "upstart-0.6.7"; + name = "upstart-1.3"; src = fetchurl { - url = "http://upstart.ubuntu.com/download/0.6/${name}.tar.gz"; - sha256 = "1f1pds27cadi6ycii1fkn5bbs1brjqxa2b45wfn03ikc2azqxlr9"; + url = "http://upstart.ubuntu.com/download/1.3/${name}.tar.gz"; + md5 = "7820797b64878c27115fff6a7398a6a9"; }; buildInputs = [ pkgconfig dbus libnih ]; From 85c97efc50fd7d88e1e92273ba126ede9fb84a43 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Thu, 13 Oct 2011 17:00:46 +0000 Subject: [PATCH 178/970] nbd: updated to version 2.9.24 svn path=/nixpkgs/trunk/; revision=29829 --- pkgs/tools/networking/nbd/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/networking/nbd/default.nix b/pkgs/tools/networking/nbd/default.nix index 28ca2f3d3ed..ef032eee390 100644 --- a/pkgs/tools/networking/nbd/default.nix +++ b/pkgs/tools/networking/nbd/default.nix @@ -1,14 +1,14 @@ { stdenv, fetchurl, pkgconfig, glib }: let - name = "nbd-2.9.23"; + name = "nbd-2.9.24"; in stdenv.mkDerivation { inherit name; src = fetchurl { url = "mirror://sourceforge/nbd/${name}.tar.bz2"; - sha256 = "0ab44fe9e80c3f41bb1025ecda351a874affd46bf56ba4033ea03700c3b83803"; + sha256 = "025cqsx6cwbr62javdvm5vx675ai0b1absbx4if1v5pp9hzrpxmq"; }; buildInputs = [pkgconfig glib]; From dbdcb3fad435fc531e0bfc71e1b93cc0ff5b0882 Mon Sep 17 00:00:00 2001 From: Florian Friesdorf Date: Thu, 13 Oct 2011 18:30:55 +0000 Subject: [PATCH 179/970] powertop kernels: re-disable debug flags enabled by default svn path=/nixpkgs/trunk/; revision=29830 --- pkgs/top-level/all-packages.nix | 24 ++++++++++++++++++++++++ 1 file changed, 24 insertions(+) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 4680183b84a..d4dc2123778 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -5554,6 +5554,14 @@ let PM_RUNTIME y TIMER_STATS y USB_SUSPEND y + BACKTRACE_SELF_TEST n + CPU_NOTIFIER_ERROR_INJECT n + DEBUG_DEVRES n + DEBUG_NX_TEST n + DEBUG_STACK_USAGE n + DEBUG_STACKOVERFLOW n + RCU_TORTURE_TEST n + SCHEDSTATS n ''; }; @@ -5575,6 +5583,14 @@ let PM_RUNTIME y TIMER_STATS y USB_SUSPEND y + BACKTRACE_SELF_TEST n + CPU_NOTIFIER_ERROR_INJECT n + DEBUG_DEVRES n + DEBUG_NX_TEST n + DEBUG_STACK_USAGE n + DEBUG_STACKOVERFLOW n + RCU_TORTURE_TEST n + SCHEDSTATS n ''; }; @@ -5596,6 +5612,14 @@ let PM_RUNTIME y TIMER_STATS y USB_SUSPEND y + BACKTRACE_SELF_TEST n + CPU_NOTIFIER_ERROR_INJECT n + DEBUG_DEVRES n + DEBUG_NX_TEST n + DEBUG_STACK_USAGE n + DEBUG_STACKOVERFLOW n + RCU_TORTURE_TEST n + SCHEDSTATS n ''; }; From dbdfb3d11cb6ea5f3cc5d5ea776d703d51827ed8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?= Date: Fri, 14 Oct 2011 07:47:20 +0000 Subject: [PATCH 180/970] Adding cbrowser. Have cscope on the path to use it (which you should already have, because otherwise how would you have created the database for cbrowser?) svn path=/nixpkgs/trunk/; revision=29831 --- .../misc/cbrowser/backslashes-quotes.diff | 49 +++++++++++++++++++ .../tools/misc/cbrowser/default.nix | 34 +++++++++++++ pkgs/top-level/all-packages.nix | 2 + 3 files changed, 85 insertions(+) create mode 100644 pkgs/development/tools/misc/cbrowser/backslashes-quotes.diff create mode 100644 pkgs/development/tools/misc/cbrowser/default.nix diff --git a/pkgs/development/tools/misc/cbrowser/backslashes-quotes.diff b/pkgs/development/tools/misc/cbrowser/backslashes-quotes.diff new file mode 100644 index 00000000000..cc42f0745da --- /dev/null +++ b/pkgs/development/tools/misc/cbrowser/backslashes-quotes.diff @@ -0,0 +1,49 @@ +Based on this: +http://sourceforge.net/tracker/?func=detail&aid=1493886&group_id=5152&atid=305152 +fix the infinite loops in quote highlight - ID: 1493886 + +--- cbrowser-0.8-2/ftcllib.tcl 2000-07-04 01:17:43.000000000 +0200 ++++ cbrowser-0.8/ftcllib.tcl 2006-05-24 00:39:18.833762522 +0200 +@@ -1290,13 +1290,39 @@ + foreach {start end} [concat 1.0 [$widget tag ranges comment] end] { + + while {[set temp [$widget search -regexp -- $pattern $start $end]] != ""} { ++ set startquote [$widget index "$temp + 1chars"] + +- set endquote [$widget search -regexp -- {[^\\]\"} "$temp + 1chars" $end] ++ set temp [$widget index "$startquote + 1chars"] ++ while {1==1} { ++ set endquote [$widget search -regexp -- {\"} $temp $end] ++ ++ # The program will not break if a /*C comment*/ is between C quotes. ++ if { $endquote == "" } { ++ set endquote $startquote ++ break ++ } ++ ++ # look for double backslashes ++ if {[set temp2 [$widget search -regexp -- {\\\\} $temp $endquote]] != ""} { ++ set temp "$temp2 + 2chars" ++ continue ++ } ++ ++ # look for \" ++ if {[set temp2 [$widget search -regexp -- {\\\"} $temp $endquote]] != ""} { ++ set temp "$temp2 + 2chars" ++ continue ++ } ++ ++ break ++ } + + if {[strlen $endquote] > 0} { +- set start [$widget index "$endquote + 2chars"] ++ set start [$widget index "$endquote + 1chars"] + +- $widget tag add quote "$temp + 1chars" $start ++ $widget tag add quote $startquote $start ++ } else { ++ set start [$widget index "$start + 1chars"] + } + } + } diff --git a/pkgs/development/tools/misc/cbrowser/default.nix b/pkgs/development/tools/misc/cbrowser/default.nix new file mode 100644 index 00000000000..50dc907a780 --- /dev/null +++ b/pkgs/development/tools/misc/cbrowser/default.nix @@ -0,0 +1,34 @@ +{ fetchurl, stdenv, cscope, tk, makeWrapper }: + +stdenv.mkDerivation rec { + name = "cbrowser-0.8"; + + src = fetchurl { + url = "mirror://sourceforge/cbrowser/cbrowser-0.8.tar.gz"; + sha256 = "1050mirjab23qsnq3lp3a9vwcbavmh9kznzjm7dr5vkx8b7ffcji"; + }; + + patches = [ ./backslashes-quotes.diff ]; + + buildInputs = [ tk makeWrapper ]; + + installPhase = '' + ensureDir $out/bin $out/share/${name} + cp -R * $out/share/${name}/ + + makeWrapper $out/share/${name}/cbrowser $out/bin/cbrowser \ + --prefix PATH : ${tk}/bin + ''; + + meta = { + description = "Tcl/Tk GUI front-end to cscope"; + + license = "GPLv2+"; + + homepage = http://sourceforge.net/projects/cbrowser/; + + 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 d4dc2123778..1551ff9aba1 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -2764,6 +2764,8 @@ let byacc = callPackage ../development/tools/parsing/byacc { }; + cbrowser = callPackage ../development/tools/misc/cbrowser { }; + ccache = callPackage ../development/tools/misc/ccache { }; complexity = callPackage ../development/tools/misc/complexity { }; From 7a2cb5bc64fb5d415cddc4d58d676700db776fee Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?= Date: Fri, 14 Oct 2011 07:55:02 +0000 Subject: [PATCH 181/970] Updating dmenu svn path=/nixpkgs/trunk/; revision=29832 --- pkgs/applications/misc/dmenu/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/misc/dmenu/default.nix b/pkgs/applications/misc/dmenu/default.nix index 2a55512ff26..32af65f924a 100644 --- a/pkgs/applications/misc/dmenu/default.nix +++ b/pkgs/applications/misc/dmenu/default.nix @@ -1,11 +1,11 @@ {stdenv, fetchurl, libX11, libXinerama}: stdenv.mkDerivation rec { - name = "dmenu-4.4"; + name = "dmenu-4.4.1"; src = fetchurl { url = "http://dl.suckless.org/tools/${name}.tar.gz"; - sha256 = "016hfnmk4kb2n3slxrg4z27p2l8x1awqsig961syssw4p1zybpav"; + sha256 = "0l25vdnzlslk0r4m6hjkzxdygh3wpq04b9mr8zc9h3b1md2icr3d"; }; buildInputs = [ libX11 libXinerama ]; From d6e22c9b4a7151435986a484d780c339a10cb999 Mon Sep 17 00:00:00 2001 From: Florian Friesdorf Date: Fri, 14 Oct 2011 09:47:30 +0000 Subject: [PATCH 182/970] python26Full and explicit python27Full svn path=/nixpkgs/trunk/; revision=29833 --- pkgs/top-level/all-packages.nix | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 1551ff9aba1..63579d4519e 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -2586,8 +2586,16 @@ let sw_vers = if stdenv.isDarwin then pkgs.darwinSwVersUtility else null; }; - pythonFull = callPackage ../development/interpreters/python/wrapper.nix { - extraLibs = lib.attrValues python.modules; + pythonFull = python27Full; + + python26Full = callPackage ../development/interpreters/python/wrapper.nix { + extraLibs = lib.attrValues python26.modules; + python = python26; + }; + + python27Full = callPackage ../development/interpreters/python/wrapper.nix { + extraLibs = lib.attrValues python27.modules; + python = python27; }; pythonhomeWrapper = callPackage ../development/interpreters/python/pythonhome-wrapper.nix { }; From d2b089cc0bbd2fb10961d1cbc41d9f6796ccb4e6 Mon Sep 17 00:00:00 2001 From: Florian Friesdorf Date: Fri, 14 Oct 2011 10:30:14 +0000 Subject: [PATCH 183/970] notmuch - simplify expression svn path=/nixpkgs/trunk/; revision=29834 --- .../mailreaders/notmuch/default.nix | 92 +++++++------------ 1 file changed, 33 insertions(+), 59 deletions(-) diff --git a/pkgs/applications/networking/mailreaders/notmuch/default.nix b/pkgs/applications/networking/mailreaders/notmuch/default.nix index a9456a30ecc..dcaaf01c336 100644 --- a/pkgs/applications/networking/mailreaders/notmuch/default.nix +++ b/pkgs/applications/networking/mailreaders/notmuch/default.nix @@ -10,66 +10,40 @@ stdenv.mkDerivation rec { buildInputs = [ bash emacs gdb git glib gmime gnupg1 pkgconfig talloc xapian ]; - # XXX: Make me a loop patchPhase = '' - # substituteInPlace "test/atomicity" \ - # --replace "#!/usr/bin/env bash" "#!${bash}/bin/bash" - substituteInPlace "test/aggregate-results.sh" \ - --replace "#!/usr/bin/env bash" "#!${bash}/bin/bash" - substituteInPlace "test/author-order" \ - --replace "#!/usr/bin/env bash" "#!${bash}/bin/bash" - substituteInPlace "test/basic" \ - --replace "#!/usr/bin/env bash" "#!${bash}/bin/bash" - substituteInPlace "test/crypto" \ - --replace "#!/usr/bin/env bash" "#!${bash}/bin/bash" - substituteInPlace "test/dump-restore" \ - --replace "#!/usr/bin/env bash" "#!${bash}/bin/bash" - substituteInPlace "test/emacs" \ - --replace "#!/usr/bin/env bash" "#!${bash}/bin/bash" - substituteInPlace "test/emacs-large-search-buffer" \ - --replace "#!/usr/bin/env bash" "#!${bash}/bin/bash" - substituteInPlace "test/encoding" \ - --replace "#!/usr/bin/env bash" "#!${bash}/bin/bash" - substituteInPlace "test/from-guessing" \ - --replace "#!/usr/bin/env bash" "#!${bash}/bin/bash" - substituteInPlace "test/json" \ - --replace "#!/usr/bin/env bash" "#!${bash}/bin/bash" - substituteInPlace "test/long-id" \ - --replace "#!/usr/bin/env bash" "#!${bash}/bin/bash" - substituteInPlace "test/maildir-sync" \ - --replace "#!/usr/bin/env bash" "#!${bash}/bin/bash" - substituteInPlace "test/new" \ - --replace "#!/usr/bin/env bash" "#!${bash}/bin/bash" - substituteInPlace "test/notmuch-test" \ - --replace "#!/usr/bin/env bash" "#!${bash}/bin/bash" - substituteInPlace "test/raw" \ - --replace "#!/usr/bin/env bash" "#!${bash}/bin/bash" - substituteInPlace "test/reply" \ - --replace "#!/usr/bin/env bash" "#!${bash}/bin/bash" - substituteInPlace "test/search" \ - --replace "#!/usr/bin/env bash" "#!${bash}/bin/bash" - substituteInPlace "test/search-by-folder" \ - --replace "#!/usr/bin/env bash" "#!${bash}/bin/bash" - substituteInPlace "test/search-insufficient-from-quoting" \ - --replace "#!/usr/bin/env bash" "#!${bash}/bin/bash" - substituteInPlace "test/search-folder-coherence" \ - --replace "#!/usr/bin/env bash" "#!${bash}/bin/bash" - substituteInPlace "test/search-output" \ - --replace "#!/usr/bin/env bash" "#!${bash}/bin/bash" - substituteInPlace "test/search-position-overlap-bug" \ - --replace "#!/usr/bin/env bash" "#!${bash}/bin/bash" - substituteInPlace "test/symbol-hiding" \ - --replace "#!/usr/bin/env bash" "#!${bash}/bin/bash" - substituteInPlace "test/test-lib.sh" \ - --replace "#!/usr/bin/env bash" "#!${bash}/bin/bash" - substituteInPlace "test/test-verbose" \ - --replace "#!/usr/bin/env bash" "#!${bash}/bin/bash" - substituteInPlace "test/thread-naming" \ - --replace "#!/usr/bin/env bash" "#!${bash}/bin/bash" - substituteInPlace "test/thread-order" \ - --replace "#!/usr/bin/env bash" "#!${bash}/bin/bash" - substituteInPlace "test/uuencode" \ - --replace "#!/usr/bin/env bash" "#!${bash}/bin/bash" + (cd test && for prg in \ + aggregate-results.sh \ + author-order \ + basic \ + crypto \ + dump-restore \ + emacs \ + emacs-large-search-buffer \ + encoding \ + from-guessing \ + json \ + long-id \ + maildir-sync \ + new \ + notmuch-test \ + raw \ + reply \ + search \ + search-by-folder \ + search-insufficient-from-quoting \ + search-folder-coherence \ + search-output \ + search-position-overlap-bug \ + symbol-hiding \ + test-lib.sh \ + test-verbose \ + thread-naming \ + thread-order \ + uuencode \ + ;do + substituteInPlace "$prg" \ + --replace "#!/usr/bin/env bash" "#!${bash}/bin/bash" + done) ''; postBuild = '' From 1fc00185f498704af62eb33c392bac559ca4a918 Mon Sep 17 00:00:00 2001 From: Sander van der Burg Date: Fri, 14 Oct 2011 13:24:55 +0000 Subject: [PATCH 184/970] Updated Axis2 to version 1.6.1 svn path=/nixpkgs/trunk/; revision=29836 --- pkgs/servers/http/tomcat/axis2/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/servers/http/tomcat/axis2/default.nix b/pkgs/servers/http/tomcat/axis2/default.nix index 66e0f78f5ca..0208420d132 100644 --- a/pkgs/servers/http/tomcat/axis2/default.nix +++ b/pkgs/servers/http/tomcat/axis2/default.nix @@ -1,11 +1,11 @@ {stdenv, fetchurl, apacheAnt, jdk, unzip}: stdenv.mkDerivation { - name = "axis2-1.5.4"; + name = "axis2-1.6.1"; src = fetchurl { - url = http://apache.mirror.easycolocate.nl/axis/axis2/java/core/1.5.4/axis2-1.5.4-bin.zip; - sha256 = "0mqnsj14g8aqmh3gjxgys6kwa7q8jkjgczb0hlcr4v2par0hdfng"; + url = http://apache.mirror.versatel.nl//axis/axis2/java/core/1.6.1/axis2-1.6.1-bin.zip; + sha256 = "1a0p85qh9924dv3y7zivf62hy1jzdaxnndqh93g6lndmacfhkk64"; }; buildInputs = [ unzip apacheAnt jdk ]; From 39df2ce05ed7d703b55e4bd262099e2527c059f1 Mon Sep 17 00:00:00 2001 From: Marco Maggesi Date: Fri, 14 Oct 2011 14:00:50 +0000 Subject: [PATCH 185/970] Add yaml - Yet Another JSON Library svn path=/nixpkgs/trunk/; revision=29837 --- pkgs/development/libraries/yajl/default.nix | 23 +++++++++++++++++++++ pkgs/lib/licenses.nix | 6 ++++++ pkgs/top-level/all-packages.nix | 2 ++ 3 files changed, 31 insertions(+) create mode 100644 pkgs/development/libraries/yajl/default.nix diff --git a/pkgs/development/libraries/yajl/default.nix b/pkgs/development/libraries/yajl/default.nix new file mode 100644 index 00000000000..05f2919b7cf --- /dev/null +++ b/pkgs/development/libraries/yajl/default.nix @@ -0,0 +1,23 @@ +{stdenv, fetchurl, cmake, ruby}: + +stdenv.mkDerivation { + name = "yajl-2.0.1"; + + src = fetchurl { + url = http://github.com/lloyd/yajl/tarball/2.0.1; + name = "yajl-2.0.1.tar.gz"; + sha256 = "08a7bgmdpvi6w9f9bxx5f42njwmwzdf6jz3w6ila7jgbl5mhknf2"; + }; + + buildInputs = [ cmake ruby ]; + + meta = { + description = "Yet Another JSON Library"; + longDescription = '' + YAJL is a small event-driven (SAX-style) JSON parser written in ANSI + C, and a small validating JSON generator. + ''; + homepage = http://lloyd.github.com/yajl/; + license = stdenv.lib.license.isc; + }; +} diff --git a/pkgs/lib/licenses.nix b/pkgs/lib/licenses.nix index 293bf59ec5d..edfa057be7b 100644 --- a/pkgs/lib/licenses.nix +++ b/pkgs/lib/licenses.nix @@ -82,6 +82,12 @@ url = https://fedoraproject.org/wiki/Licensing/GPL_Classpath_Exception; }; + isc = { + shortName = "ISC"; + fullName = "Internet Systems Consortium License"; + url = http://www.opensource.org/licenses/ISC; + }; + ipl10 = { shortName = "IPL 1.0"; fullName = "IBM Public License Version 1.0"; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 63579d4519e..b5fae908580 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -4640,6 +4640,8 @@ let xvidcore = callPackage ../development/libraries/xvidcore { }; + yajl = callPackage ../development/libraries/yajl { }; + zangband = builderDefsPackage (import ../games/zangband) { inherit ncurses flex bison autoconf automake m4 coreutils; }; From c8e061945cfeacb9cb0366f3ef6afadccadeda73 Mon Sep 17 00:00:00 2001 From: Marco Maggesi Date: Fri, 14 Oct 2011 14:14:36 +0000 Subject: [PATCH 186/970] yajl: enable Hydra build svn path=/nixpkgs/trunk/; revision=29838 --- pkgs/development/libraries/yajl/default.nix | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/pkgs/development/libraries/yajl/default.nix b/pkgs/development/libraries/yajl/default.nix index 05f2919b7cf..cedc9cd5810 100644 --- a/pkgs/development/libraries/yajl/default.nix +++ b/pkgs/development/libraries/yajl/default.nix @@ -19,5 +19,9 @@ stdenv.mkDerivation { ''; homepage = http://lloyd.github.com/yajl/; license = stdenv.lib.license.isc; + platforms = stdenv.lib.platforms.linux; + maintainers = with stdenv.lib.maintainers; [ + z77z + ]; }; } From c8529df9a9228c3c56b9b4713282f3db9f82f6a2 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Fri, 14 Oct 2011 17:26:12 +0000 Subject: [PATCH 187/970] haskell-Hipmunk: updated to version 5.2.0.4 svn path=/nixpkgs/trunk/; revision=29839 --- pkgs/development/libraries/haskell/Hipmunk/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/Hipmunk/default.nix b/pkgs/development/libraries/haskell/Hipmunk/default.nix index d1fb880ed1f..ab3fe660cfa 100644 --- a/pkgs/development/libraries/haskell/Hipmunk/default.nix +++ b/pkgs/development/libraries/haskell/Hipmunk/default.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "Hipmunk"; - version = "5.2.0.3"; - sha256 = "1as00372hz0ngy6pc5l0w7qgw5flcyag07zk3dxkbj5kv24xk49m"; + version = "5.2.0.4"; + sha256 = "0sa0a4hg0xp8l64dy8hnfkhvy2miv79b5550v8gkvrbqcci0qfay"; buildDepends = [ StateVar transformers ]; noHaddock = true; meta = { From e0528d4078beaad1f61250260434eb480286a010 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Fri, 14 Oct 2011 17:26:16 +0000 Subject: [PATCH 188/970] haskell-asn1-data: updated to version 0.6.1 svn path=/nixpkgs/trunk/; revision=29840 --- pkgs/development/libraries/haskell/asn1-data/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/asn1-data/default.nix b/pkgs/development/libraries/haskell/asn1-data/default.nix index 73ee535f959..6337ab40890 100644 --- a/pkgs/development/libraries/haskell/asn1-data/default.nix +++ b/pkgs/development/libraries/haskell/asn1-data/default.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "asn1-data"; - version = "0.6.0"; - sha256 = "0gk34x2frkk2s7d0i7ahwnjv9jcqdgx2sd1kp3d854548k171z3f"; + version = "0.6.1"; + sha256 = "1kj1h1z4ix8kdxq5838xk70sgz9rq0vdii5nli1rcycx3y2ipi84"; isLibrary = true; isExecutable = true; buildDepends = [ From 65d9c62ac8d5fe4715d9678ebe6107eff15f7302 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Fri, 14 Oct 2011 17:26:22 +0000 Subject: [PATCH 189/970] haskell-certificate: updated to version 0.9.4 svn path=/nixpkgs/trunk/; revision=29841 --- pkgs/development/libraries/haskell/certificate/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/certificate/default.nix b/pkgs/development/libraries/haskell/certificate/default.nix index 09d44e07222..94a9e6fb17a 100644 --- a/pkgs/development/libraries/haskell/certificate/default.nix +++ b/pkgs/development/libraries/haskell/certificate/default.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "certificate"; - version = "0.9.3"; - sha256 = "1gg26d1arf588zjhdzs8r26k40v6m679l8k2vw28l8j3q5m11p71"; + version = "0.9.4"; + sha256 = "0apv2paxlp12ksn28bn4lb1mg05cs7sjygfarxacwmz43jy6ld9v"; isLibrary = true; isExecutable = true; buildDepends = [ asn1Data base64Bytestring mtl time ]; From c7aca7221ba1b6b52f3d92a5a84913a614187cba Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Fri, 14 Oct 2011 17:26:27 +0000 Subject: [PATCH 190/970] haskell-http-enumerator: updated to version 0.7.1.2 svn path=/nixpkgs/trunk/; revision=29842 --- .../development/libraries/haskell/http-enumerator/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/http-enumerator/default.nix b/pkgs/development/libraries/haskell/http-enumerator/default.nix index 5aa02f5dea4..8b868d15a82 100644 --- a/pkgs/development/libraries/haskell/http-enumerator/default.nix +++ b/pkgs/development/libraries/haskell/http-enumerator/default.nix @@ -7,8 +7,8 @@ cabal.mkDerivation (self: { pname = "http-enumerator"; - version = "0.7.1.1"; - sha256 = "0b26gvwpnv851x1v5qix7mp0wliff9klqc2pfp2ig54l77s15y36"; + version = "0.7.1.2"; + sha256 = "1jxy017vhmzwq4480r6g45mg3x1d48zckbcyqhsk40bw5i32dfmv"; isLibrary = true; isExecutable = true; buildDepends = [ From e4199791316a41ee0c02c8ae3dac9e4862f44baa Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Fri, 14 Oct 2011 17:26:32 +0000 Subject: [PATCH 191/970] haskell-tls: updated to version 0.8.1 svn path=/nixpkgs/trunk/; revision=29843 --- pkgs/development/libraries/haskell/tls/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/tls/default.nix b/pkgs/development/libraries/haskell/tls/default.nix index ad5e80b2be9..de1027dbef1 100644 --- a/pkgs/development/libraries/haskell/tls/default.nix +++ b/pkgs/development/libraries/haskell/tls/default.nix @@ -4,8 +4,8 @@ cabal.mkDerivation (self: { pname = "tls"; - version = "0.8.0"; - sha256 = "05c7bizwkwcp83idsa5cjb53lvm9f44iaypp9yiqv4ly9q3h315q"; + version = "0.8.1"; + sha256 = "1qgjzsp9f0mrkwrqzs69279q1dkz72hpazq6qp49p2xfsfzdp7dj"; isLibrary = true; isExecutable = true; buildDepends = [ From b27823bfaca9c9b5777e8f6acd4ca7c3715e3173 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Fri, 14 Oct 2011 17:26:38 +0000 Subject: [PATCH 192/970] haskell-cpphs: updated to version 1.13.2 svn path=/nixpkgs/trunk/; revision=29844 --- pkgs/development/tools/misc/cpphs/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/misc/cpphs/default.nix b/pkgs/development/tools/misc/cpphs/default.nix index 702c88d2ddb..620cb8149a2 100644 --- a/pkgs/development/tools/misc/cpphs/default.nix +++ b/pkgs/development/tools/misc/cpphs/default.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "cpphs"; - version = "1.13.1"; - sha256 = "0k5p9gqnalll3w1962dwydnygk25h777bic2gvdh8i8hhyz5fsx2"; + version = "1.13.2"; + sha256 = "1q3pzfcgrl9nka1gdl84c4fqc1ql83idlbb8fghqsjp0ijzcxk3s"; isLibrary = true; isExecutable = true; meta = { From c7cea676ce58f7c0ecb45c612492c1127d9d6962 Mon Sep 17 00:00:00 2001 From: Rob Vermaas Date: Fri, 14 Oct 2011 18:04:34 +0000 Subject: [PATCH 193/970] add disper svn path=/nixpkgs/trunk/; revision=29845 --- pkgs/tools/misc/disper/default.nix | 22 ++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 24 insertions(+) create mode 100644 pkgs/tools/misc/disper/default.nix diff --git a/pkgs/tools/misc/disper/default.nix b/pkgs/tools/misc/disper/default.nix new file mode 100644 index 00000000000..cc11427f65a --- /dev/null +++ b/pkgs/tools/misc/disper/default.nix @@ -0,0 +1,22 @@ +{stdenv, fetchurl, python}: + +stdenv.mkDerivation rec { + name = "disper-0.3.0"; + + buildInputs = [python]; + + preConfigure = '' + export makeFlags="PREFIX=$out" + ''; + + src = fetchurl { + url = http://ppa.launchpad.net/disper-dev/ppa/ubuntu/pool/main/d/disper/disper_0.3.0.tar.gz; + sha256 = "1mfqidm5c89nknzksabqgjygdp57xpszz7hy2dxh39hpgrsk3l58"; + }; + + meta = { + description = "Disper is an on-the-fly display switch utility."; + homepage = http://willem.engen.nl/projects/disper/; + }; + +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index b5fae908580..d33ba31d5c8 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -581,6 +581,8 @@ let dirmngr = callPackage ../tools/security/dirmngr { }; + disper = callPackage ../tools/misc/disper { }; + dmg2img = callPackage ../tools/misc/dmg2img { }; docbook2x = callPackage ../tools/typesetting/docbook2x { From 0baf36471578a960588c78eb69d89dc7623029ee Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= Date: Fri, 14 Oct 2011 21:56:07 +0000 Subject: [PATCH 194/970] XZ Utils 5.0.3. svn path=/nixpkgs/branches/stdenv-updates/; revision=29846 --- pkgs/tools/compression/xz/default.nix | 44 ++++++++++++++++----------- 1 file changed, 27 insertions(+), 17 deletions(-) diff --git a/pkgs/tools/compression/xz/default.nix b/pkgs/tools/compression/xz/default.nix index b6aa8e96013..78a8ed95a4e 100644 --- a/pkgs/tools/compression/xz/default.nix +++ b/pkgs/tools/compression/xz/default.nix @@ -1,25 +1,35 @@ -{stdenv, fetchurl, lib}: +{ stdenv, fetchurl }: + +stdenv.mkDerivation rec { + name = "xz-5.0.3"; -stdenv.mkDerivation ({ - name = "xz-5.0.0"; - src = fetchurl { - url = http://tukaani.org/xz/xz-5.0.0.tar.bz2; - sha256 = "1n2nc00d83di0jl5d9qwpngkmlk3wqhs4w9q2ah680v9qijrxa27"; + url = "http://tukaani.org/xz/${name}.tar.bz2"; + sha256 = "1sgaq4gdh8llz3gnlgvd65x610fwc8h4m32skhqn5npwgghvj4as"; }; + doCheck = true; + meta = { homepage = http://tukaani.org/xz/; - description = "Successor of the LZMA Utils package"; - license = "GPL/LGPL"; - maintainers = [ lib.maintainers.sander ]; + description = "XZ, general-purpose data compression software, successor of LZMA"; + + longDescription = + '' XZ Utils is free general-purpose data compression software with high + compression ratio. XZ Utils were written for POSIX-like systems, + but also work on some not-so-POSIX systems. XZ Utils are the + successor to LZMA Utils. + + The core of the XZ Utils compression code is based on LZMA SDK, but + it has been modified quite a lot to be suitable for XZ Utils. The + primary compression algorithm is currently LZMA2, which is used + inside the .xz container format. With typical files, XZ Utils + create 30 % smaller output than gzip and 15 % smaller output than + bzip2. + ''; + + licenses = [ "GPLv2+" "LGPLv2.1+" ]; + maintainers = with stdenv.lib.maintainers; [ sander ludo ]; + platforms = stdenv.lib.platforms.all; }; } - -// - -(if stdenv.system == "x86_64-darwin" - # Work around assembler misconfiguration as `x86'. This appears to be fixed - # by commit b9b5c54cd438b3ae47b44cc211b71f3bc53e35ef (Nov 22 12:00:30 2009 # +0200). - then { configureFlags = "--enable-assembler=x86_64"; } - else {})) From e2e7a6f1cefdc4af7b213256f7fa153d2d24087f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= Date: Fri, 14 Oct 2011 21:56:11 +0000 Subject: [PATCH 195/970] Add XZ to stdenv. svn path=/nixpkgs/branches/stdenv-updates/; revision=29847 --- pkgs/stdenv/linux/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/stdenv/linux/default.nix b/pkgs/stdenv/linux/default.nix index 315c0895d20..a45e6a71817 100644 --- a/pkgs/stdenv/linux/default.nix +++ b/pkgs/stdenv/linux/default.nix @@ -293,7 +293,7 @@ rec { inherit gcc; inherit (stdenvLinuxBoot3Pkgs) binutils glibc; inherit (stdenvLinuxBoot4Pkgs) - gzip bzip2 bash coreutils diffutils findutils gawk + gzip bzip2 xz bash coreutils diffutils findutils gawk gnumake gnused gnutar gnugrep gnupatch patchelf attr acl; }; From 5d5b8932231d2ae59fc9d7ea3142d1f2f75c9cfb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= Date: Fri, 14 Oct 2011 21:56:16 +0000 Subject: [PATCH 196/970] GNU Coreutils 8.14. svn path=/nixpkgs/branches/stdenv-updates/; revision=29848 --- pkgs/tools/misc/coreutils/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/tools/misc/coreutils/default.nix b/pkgs/tools/misc/coreutils/default.nix index f21f97a18a2..26c4d0fbdce 100644 --- a/pkgs/tools/misc/coreutils/default.nix +++ b/pkgs/tools/misc/coreutils/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, perl, xz, gmp ? null +{ stdenv, fetchurl, perl, gmp ? null , aclSupport ? false, acl ? null , selinuxSupport? false, libselinux ? null, libsepol ? null }: @@ -6,14 +6,14 @@ assert aclSupport -> acl != null; assert selinuxSupport -> ( (libselinux != null) && (libsepol != null) ); stdenv.mkDerivation (rec { - name = "coreutils-8.13"; + name = "coreutils-8.14"; src = fetchurl { url = "mirror://gnu/coreutils/${name}.tar.xz"; - sha256 = "06xc4jfkr5h8pc6wq14ncihapf5chcwvvcjvpwkby1ngw0xbxz8b"; + sha256 = "0bdh31fvd0ng2sqrrbz0a4yy084hmj76pbljksqyv4ljq4bhh4hd"; }; - buildNativeInputs = [ perl xz ]; + buildNativeInputs = [ perl ]; buildInputs = [ gmp ] ++ stdenv.lib.optional aclSupport acl ++ stdenv.lib.optional selinuxSupport libselinux From 909200437c419a0c9bb68c22f8a3439a1837916d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= Date: Fri, 14 Oct 2011 21:56:21 +0000 Subject: [PATCH 197/970] GNU MPFR 3.1.0. svn path=/nixpkgs/branches/stdenv-updates/; revision=29849 --- pkgs/development/libraries/mpfr/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/mpfr/default.nix b/pkgs/development/libraries/mpfr/default.nix index e2be5d75e8c..0ab745879ac 100644 --- a/pkgs/development/libraries/mpfr/default.nix +++ b/pkgs/development/libraries/mpfr/default.nix @@ -1,11 +1,11 @@ {stdenv, fetchurl, gmp}: stdenv.mkDerivation rec { - name = "mpfr-3.0.1"; + name = "mpfr-3.1.0"; src = fetchurl { url = "mirror://gnu/mpfr/${name}.tar.bz2"; - sha256 = "0zwfwc9rn2sl3kpnr72fi1b8lh8c0mcmgy61y301jhs9pfcp15z1"; + sha256 = "105nx8qqx5x8f4rlplr2wk4cyv61iw5j3jgi2k21rpb8s6xbp9vl"; }; buildInputs = [ gmp ]; From b64890665803ebb4c1e0b3280ff0983e15441472 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Fri, 14 Oct 2011 22:04:10 +0000 Subject: [PATCH 198/970] haskell-packages.nix: use blanks instead of tabs svn path=/nixpkgs/trunk/; revision=29850 --- pkgs/top-level/haskell-packages.nix | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix index f42761c93cb..aae14807855 100644 --- a/pkgs/top-level/haskell-packages.nix +++ b/pkgs/top-level/haskell-packages.nix @@ -194,7 +194,7 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y); haskellPlatform = self.haskellPlatform_2011_2_0_1; mtl1 = self.mtl_1_1_1_1; text = self.text_0_11_1_5; - repaExamples = null; # don't pick this version of 'repa-examples' during nix-env -u + repaExamples = null; # don't pick this version of 'repa-examples' during nix-env -u }; haskellPlatform_2011_2_0_1 = @@ -236,7 +236,7 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y); self : self.haskellPlatformArgs_2011_2_0_0 self // { haskellPlatform = self.haskellPlatform_2011_2_0_0; mtl1 = self.mtl_1_1_1_1; - repaExamples = null; # don't pick this version of 'repa-examples' during nix-env -u + repaExamples = null; # don't pick this version of 'repa-examples' during nix-env -u }; haskellPlatform_2011_2_0_0 = @@ -274,7 +274,7 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y); haskellPlatformDefaults_2010_2_0_0 = self : self.haskellPlatformArgs_2010_2_0_0 self // { haskellPlatform = self.haskellPlatform_2010_2_0_0; - repaExamples = null; # don't pick this version of 'repa-examples' during nix-env -u + repaExamples = null; # don't pick this version of 'repa-examples' during nix-env -u }; haskellPlatform_2010_2_0_0 = @@ -311,7 +311,7 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y); self : self.haskellPlatformArgs_2010_1_0_0 self // { haskellPlatform = self.haskellPlatform_2010_1_0_0; extensibleExceptions = self.extensibleExceptions_0_1_1_0; - repaExamples = null; # don't pick this version of 'repa-examples' during nix-env -u + repaExamples = null; # don't pick this version of 'repa-examples' during nix-env -u }; haskellPlatform_2010_1_0_0 = @@ -349,7 +349,7 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y); self : self.haskellPlatformArgs_2009_2_0_2 self // { haskellPlatform = self.haskellPlatform_2009_2_0_2; extensibleExceptions = self.extensibleExceptions_0_1_1_0; - repaExamples = null; # don't pick this version of 'repa-examples' during nix-env -u + repaExamples = null; # don't pick this version of 'repa-examples' during nix-env -u }; haskellPlatform_2009_2_0_2 = From 21099834774d0cc2aaffe5727b3f1bec17a41c28 Mon Sep 17 00:00:00 2001 From: "Yury G. Kudryashov" Date: Sat, 15 Oct 2011 13:32:05 +0000 Subject: [PATCH 199/970] Fix comment svn path=/nixpkgs/trunk/; revision=29852 --- pkgs/desktops/kde-4.7/kde-package/default.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/desktops/kde-4.7/kde-package/default.nix b/pkgs/desktops/kde-4.7/kde-package/default.nix index f725c2f7bb1..38713de5820 100644 --- a/pkgs/desktops/kde-4.7/kde-package/default.nix +++ b/pkgs/desktops/kde-4.7/kde-package/default.nix @@ -33,7 +33,8 @@ rec { enableParallelBuilding = true; } // (removeAttrs a [ "meta" "name" ])); - # kdeMonoPkg wrapper for modules splitted upstream. Used in TODO + # kdeMonoPkg wrapper for modules splitted upstream compatible with combinePkgs + # API. kdeSplittedPkg = module: {name, sane ? name}: kdeMonoPkg name; # Build subdirectory ${subdir} of tarball ${module}-${release}.tar.bz2 From 7bb3f9173171cb4abb00cbeebe8b71922d47ad6f Mon Sep 17 00:00:00 2001 From: Russell O'Connor Date: Sat, 15 Oct 2011 14:46:05 +0000 Subject: [PATCH 200/970] updating dwarf-fortress svn path=/nixpkgs/trunk/; revision=29853 --- pkgs/games/dwarf-fortress/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/games/dwarf-fortress/default.nix b/pkgs/games/dwarf-fortress/default.nix index b08a70a3982..f12caaae53f 100644 --- a/pkgs/games/dwarf-fortress/default.nix +++ b/pkgs/games/dwarf-fortress/default.nix @@ -3,11 +3,11 @@ assert stdenv.system == "i686-linux"; stdenv.mkDerivation rec { - name = "dwarf-fortress-0.31.16"; + name = "dwarf-fortress-0.31.25"; src = fetchurl { - url = "http://www.bay12games.com/dwarves/df_31_16_linux.tar.bz2"; - sha256 = "04pyxyigrrclbpxdx3wryisgy5xraz0s7rsxr2kp4i136479f2r4"; + url = "http://www.bay12games.com/dwarves/df_31_25_linux.tar.bz2"; + sha256 = "0d3klvf5n99j38pdhx9mak78px65aw47smck82jb92la97drmcg3"; }; phases = "unpackPhase patchPhase installPhase"; From 9188489caff9074c93cd982ed5fc72c9052385a2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= Date: Sat, 15 Oct 2011 16:34:26 +0000 Subject: [PATCH 201/970] Guile: Disable more GC-sensitive tests when using `-O0'. svn path=/nixpkgs/trunk/; revision=29854 --- .../guile/disable-gc-sensitive-tests.patch | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/pkgs/development/interpreters/guile/disable-gc-sensitive-tests.patch b/pkgs/development/interpreters/guile/disable-gc-sensitive-tests.patch index 8a43e58f5f5..076091a702a 100644 --- a/pkgs/development/interpreters/guile/disable-gc-sensitive-tests.patch +++ b/pkgs/development/interpreters/guile/disable-gc-sensitive-tests.patch @@ -3,6 +3,16 @@ compiling with `-O0' (as is done with coverage analysis) since there may be many false references held on the stack, leading to the failure of such tests. +--- a/test-suite/tests/gc.test ++++ b/test-suite/tests/gc.test +@@ -67,6 +67,7 @@ + + (with-test-prefix "gc" + (pass-if "Unused modules are removed" ++ (throw 'unresolved) + (let* ((guard (make-guardian)) + (total 1000)) + --- a/test-suite/tests/threads.test +++ b/test-suite/tests/threads.test @@ -366,6 +366,7 @@ From 383baf8794ebbdb81dff24b7d6f314e046f5d0cd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= Date: Sat, 15 Oct 2011 23:25:12 +0000 Subject: [PATCH 202/970] GNU M4: Have a test work around flaws in newer Linux versions. svn path=/nixpkgs/branches/stdenv-updates/; revision=29856 --- pkgs/development/tools/misc/gnum4/default.nix | 2 +- .../tools/misc/gnum4/readlink-EINVAL.patch | 18 ++++++++++++++++++ 2 files changed, 19 insertions(+), 1 deletion(-) create mode 100644 pkgs/development/tools/misc/gnum4/readlink-EINVAL.patch diff --git a/pkgs/development/tools/misc/gnum4/default.nix b/pkgs/development/tools/misc/gnum4/default.nix index 47d8b51b82b..12cc50a37a0 100644 --- a/pkgs/development/tools/misc/gnum4/default.nix +++ b/pkgs/development/tools/misc/gnum4/default.nix @@ -11,7 +11,7 @@ stdenv.mkDerivation { doCheck = !stdenv.isDarwin; # Upstream is aware of it; it may be in the next release. - patches = [ ./s_isdir.patch ]; + patches = [ ./s_isdir.patch ./readlink-EINVAL.patch ]; meta = { homepage = http://www.gnu.org/software/m4/; diff --git a/pkgs/development/tools/misc/gnum4/readlink-EINVAL.patch b/pkgs/development/tools/misc/gnum4/readlink-EINVAL.patch new file mode 100644 index 00000000000..dd371584a79 --- /dev/null +++ b/pkgs/development/tools/misc/gnum4/readlink-EINVAL.patch @@ -0,0 +1,18 @@ +Newer Linux kernels would return EINVAL instead of ENOENT. +The patch below, taken from Gnulib, allows the test to pass when +these Linux versions are in use: +https://lists.gnu.org/archive/html/bug-gnulib/2011-03/msg00308.html . + +diff --git a/tests/test-readlink.h b/tests/test-readlink.h +index 08d5662..7247fc4 100644 +--- a/tests/test-readlink.h ++++ b/tests/test-readlink.h +@@ -38,7 +38,7 @@ test_readlink (ssize_t (*func) (char const *, char *, size_t), bool print) + ASSERT (errno == ENOENT); + errno = 0; + ASSERT (func ("", buf, sizeof buf) == -1); +- ASSERT (errno == ENOENT); ++ ASSERT (errno == ENOENT || errno == EINVAL); + errno = 0; + ASSERT (func (".", buf, sizeof buf) == -1); + ASSERT (errno == EINVAL); From 549bd62221bd51bf9515ed169e1d651dd9bf0031 Mon Sep 17 00:00:00 2001 From: Cillian de Roiste Date: Sun, 16 Oct 2011 12:36:37 +0000 Subject: [PATCH 203/970] Adding the virtualenv package, for creating isolated dev environments svn path=/nixpkgs/trunk/; revision=29857 --- pkgs/top-level/python-packages.nix | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 828f88aac44..ec71f7c881a 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -1963,6 +1963,22 @@ let pythonPackages = python.modules // rec { }; }; + virtualenv = buildPythonPackage rec { + name = "virtualenv-1.6.4"; + src = fetchurl { + url = "http://pypi.python.org/packages/source/v/virtualenv/${name}.tar.gz"; + md5 = "1072b66d53c24e019a8f1304ac9d9fc5"; + }; + + doCheck = false; + + meta = with stdenv.lib; { + description = "a tool to create isolated Python environments"; + homepage = http://www.virtualenv.org; + license = licenses.mit; + maintainers = [ maintainers.goibhniu ]; + }; + }; vnc2flv = buildPythonPackage rec { name = "vnc2flv-20100207"; From 13e76321f08bd6c5e3ba31ab16939e74fd8e040e Mon Sep 17 00:00:00 2001 From: Cillian de Roiste Date: Sun, 16 Oct 2011 12:46:47 +0000 Subject: [PATCH 204/970] Updating IPython (python shell) to 0.11 svn path=/nixpkgs/trunk/; revision=29858 --- pkgs/shells/ipython/default.nix | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/shells/ipython/default.nix b/pkgs/shells/ipython/default.nix index 2c029b764b0..8e430df5290 100644 --- a/pkgs/shells/ipython/default.nix +++ b/pkgs/shells/ipython/default.nix @@ -1,15 +1,15 @@ { stdenv, fetchurl, buildPythonPackage, pythonPackages }: -buildPythonPackage { - name = "ipython-0.10.1"; +buildPythonPackage rec { + name = "ipython-0.11"; namePrefix = ""; src = fetchurl { - url = "http://ipython.scipy.org/dist/0.10.1/ipython-0.10.1.tar.gz"; - sha256 = "18zwrg25zn72w4rmcwxzcw11ibgp001fawm2sz189zv86z70fxi2"; + url = "http://pypi.python.org/packages/source/i/ipython/${name}.tar.gz"; + md5 = "efc899e752a4a4a67a99575cea1719ef"; }; - propagatedBuildInputs = [ pythonPackages.readline ]; + propagatedBuildInputs = [ pythonPackages.readline pythonPackages.sqlite3 ]; doCheck = false; From 8f13b206cf0d206bf40728adf6b0445dc8ed5dcc Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Sun, 16 Oct 2011 18:22:30 +0000 Subject: [PATCH 205/970] haskell-haskell-src-meta: updated to version 0.5.0.2 svn path=/nixpkgs/trunk/; revision=29859 --- .../libraries/haskell/haskell-src-meta/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/haskell-src-meta/default.nix b/pkgs/development/libraries/haskell/haskell-src-meta/default.nix index fd16c1151f2..5271176a5cf 100644 --- a/pkgs/development/libraries/haskell/haskell-src-meta/default.nix +++ b/pkgs/development/libraries/haskell/haskell-src-meta/default.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "haskell-src-meta"; - version = "0.5"; - sha256 = "0403j2ks2as61rfl049v4h43xpgx06bm739y80vada6jc85rfinr"; + version = "0.5.0.2"; + sha256 = "059zvr91bnajql19c76vwivvy6sbca83ky8ja91bf8xv1p3jfz3w"; buildDepends = [ haskellSrcExts syb thLift ]; meta = { description = "Parse source to template-haskell abstract syntax"; From aa49225df1b17ea2689554abf5702e3bd790dcd3 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Sun, 16 Oct 2011 18:22:36 +0000 Subject: [PATCH 206/970] haskell-snap-core: updated to version 0.5.5 svn path=/nixpkgs/trunk/; revision=29860 --- .../libraries/haskell/snap/core.nix | 19 ++++++++++--------- 1 file changed, 10 insertions(+), 9 deletions(-) diff --git a/pkgs/development/libraries/haskell/snap/core.nix b/pkgs/development/libraries/haskell/snap/core.nix index 5baa0c9d82b..ceb18b666f9 100644 --- a/pkgs/development/libraries/haskell/snap/core.nix +++ b/pkgs/development/libraries/haskell/snap/core.nix @@ -1,18 +1,19 @@ { cabal, attoparsec, attoparsecEnumerator, blazeBuilder -, bytestringMmap, bytestringNums, caseInsensitive, deepseq, dlist -, enumerator, MonadCatchIOTransformers, mtl, text, time -, transformers, unixCompat, vector, zlib +, blazeBuilderEnumerator, bytestringMmap, bytestringNums +, caseInsensitive, deepseq, dlist, enumerator +, MonadCatchIOTransformers, mtl, text, time, transformers +, unixCompat, vector, zlibEnum }: cabal.mkDerivation (self: { pname = "snap-core"; - version = "0.5.4"; - sha256 = "0v6lsb60s3w96rqpp9ky8nd660zja8asw02vx1562nvd19k65jbb"; + version = "0.5.5"; + sha256 = "1md9n3f11ki87774fh3p7d6bykfdwcqz6b2yrjci4mwf1b1xppkj"; buildDepends = [ - attoparsec attoparsecEnumerator blazeBuilder bytestringMmap - bytestringNums caseInsensitive deepseq dlist enumerator - MonadCatchIOTransformers mtl text time transformers unixCompat - vector zlib + attoparsec attoparsecEnumerator blazeBuilder blazeBuilderEnumerator + bytestringMmap bytestringNums caseInsensitive deepseq dlist + enumerator MonadCatchIOTransformers mtl text time transformers + unixCompat vector zlibEnum ]; meta = { homepage = "http://snapframework.com/"; From be3cf6fe6cdb9e71c81ae94deccef9c62f99e821 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Sun, 16 Oct 2011 18:22:42 +0000 Subject: [PATCH 207/970] haskell-snap-server: updated to version 0.5.5 svn path=/nixpkgs/trunk/; revision=29861 --- pkgs/development/libraries/haskell/snap/server.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/snap/server.nix b/pkgs/development/libraries/haskell/snap/server.nix index c2c1fcddbf1..838097064e7 100644 --- a/pkgs/development/libraries/haskell/snap/server.nix +++ b/pkgs/development/libraries/haskell/snap/server.nix @@ -7,8 +7,8 @@ cabal.mkDerivation (self: { pname = "snap-server"; - version = "0.5.4"; - sha256 = "1kzhmn8pg2lzpqz6319lcy5lk27jcl7jlxq96x1bhnxss8k0idix"; + version = "0.5.5"; + sha256 = "10b4y5sfgr1bxs48b78nv6hs68v6qhg008rj9qnwwdp8lxgl4hi8"; buildDepends = [ attoparsec attoparsecEnumerator binary blazeBuilder blazeBuilderEnumerator bytestringNums caseInsensitive directoryTree From 8d424305f51a2c5b90e3d893cb3d0fa396fb0f79 Mon Sep 17 00:00:00 2001 From: Marco Maggesi Date: Mon, 17 Oct 2011 08:36:07 +0000 Subject: [PATCH 208/970] Update Io to version 2011.09.12. svn path=/nixpkgs/trunk/; revision=29862 --- pkgs/development/interpreters/io/default.nix | 70 ++++++-------------- pkgs/top-level/all-packages.nix | 6 +- 2 files changed, 23 insertions(+), 53 deletions(-) diff --git a/pkgs/development/interpreters/io/default.nix b/pkgs/development/interpreters/io/default.nix index b3427caea59..bfa73eb8744 100644 --- a/pkgs/development/interpreters/io/default.nix +++ b/pkgs/development/interpreters/io/default.nix @@ -1,57 +1,31 @@ -args : -let - lib = args.lib; - fetchurl = args.fetchurl; - fullDepEntry = args.fullDepEntry; - doPatchShebangs = args.doPatchShebangs; +{ stdenv, fetchurl, cmake, zlib, sqlite, gmp, libffi, cairo, ncurses, + freetype, mesa, libpng, libtiff, libjpeg, readline, libsndfile, libxml2, + freeglut, e2fsprogs, libsamplerate, pcre, libevent, libedit, yajl, + python, openssl, glfw +}: - version = lib.attrByPath ["version"] "2008.03.30" args; - buildInputs = with args; [ - zlib sqlite gmp libffi cairo ncurses freetype mesa +stdenv.mkDerivation { + name = "io-2011.09.12"; + src = fetchurl { + url = http://github.com/stevedekorte/io/tarball/2011.09.12; + name = "io-2011.09.12.tar.gz"; + sha256 = "14nhk5vkk74pbf36jsfaxqh2ihi5d7jby79yf1ibbax319xbjk3v"; + }; + + buildInputs = [ + cmake zlib sqlite gmp libffi cairo ncurses freetype mesa libpng libtiff libjpeg readline libsndfile libxml2 - freeglut e2fsprogs libsamplerate pcre libevent libedit + freeglut e2fsprogs libsamplerate pcre libevent libedit yajl ]; -in -rec { - src = /* Here a fetchurl expression goes */ - fetchurl { - url = "http://github.com/stevedekorte/io/tarball/${version}"; - name = "io-${version}.tar.gz"; - sha256 = "1i1hcidcf93145jj1vwwa2jvp8lb25pn2kg0cb56a059narrqxlv"; - }; - inherit buildInputs; - configureFlags = []; + cmakeFlags = [ "-DCMAKE_BUILD_TYPE=release" ]; - makeFlags = ["INSTALL_PREFIX=$out"]; - - /* doConfigure should be specified separately */ - phaseNames = ["preBuild" "doMakeInstall" "postInstall" (doPatchShebangs "$out/share/io/samples") - (doPatchShebangs "$out/lib/io")]; - - preBuild = fullDepEntry ('' - for i in $pkgs ${ - if args.stdenv ? glibc then args.stdenv.glibc else "" - } ${ - if args ? libffi && args.libffi != null then "$(echo ${args.libffi}/lib/*/include/..)" else "" - }; do - echo "Path: $i" - sed -i build/AddonBuilder.io -e '/"\/sw"/asearchPrefixes append("'"$i"'"); ' - sed -i addons/Flux/io/Flux.io -e 's@/usr/local/@'"$out/"'@g' - done - '') ["minInit" "addInputs" "doUnpack"]; - - postInstall = fullDepEntry ('' - ensureDir $out/share/io - - ln -s $out/lib/io/addons $out/share/io - cp -r samples $out/share/io - '') ["minInit" "doUnpack" "defEnsureDir" "doMakeInstall"]; - - name = "io-" + version; meta = { description = "Io programming language"; - maintainers = [lib.maintainers.raskin]; - platforms = lib.platforms.linux; + maintainers = with stdenv.lib.maintainers; [ + raskin + z77z + ]; + platforms = stdenv.lib.platforms.linux; }; } diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index d33ba31d5c8..d44c6f7ce93 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -2494,11 +2494,7 @@ let guile = guile_2_0; - io = builderDefsPackage (import ../development/interpreters/io) { - inherit sqlite zlib gmp libffi cairo ncurses freetype mesa - libpng libtiff libjpeg readline libsndfile libxml2 - freeglut e2fsprogs libsamplerate pcre libevent libedit; - }; + io = callPackage ../development/interpreters/io { }; j = callPackage ../development/interpreters/j {}; From 71f9ad3fe3b9d08b9daa17b68b805b5483a1e586 Mon Sep 17 00:00:00 2001 From: Marco Maggesi Date: Mon, 17 Oct 2011 10:19:35 +0000 Subject: [PATCH 209/970] Make yajl build on Darwin. svn path=/nixpkgs/trunk/; revision=29863 --- pkgs/development/libraries/yajl/default.nix | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/pkgs/development/libraries/yajl/default.nix b/pkgs/development/libraries/yajl/default.nix index cedc9cd5810..6ba81a4766b 100644 --- a/pkgs/development/libraries/yajl/default.nix +++ b/pkgs/development/libraries/yajl/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchurl, cmake, ruby}: +{stdenv, fetchurl, cmake, ruby, darwinInstallNameToolUtility}: stdenv.mkDerivation { name = "yajl-2.0.1"; @@ -9,7 +9,8 @@ stdenv.mkDerivation { sha256 = "08a7bgmdpvi6w9f9bxx5f42njwmwzdf6jz3w6ila7jgbl5mhknf2"; }; - buildInputs = [ cmake ruby ]; + buildInputs = [ cmake ruby ] + ++ stdenv.lib.optional stdenv.isDarwin darwinInstallNameToolUtility; meta = { description = "Yet Another JSON Library"; @@ -19,7 +20,7 @@ stdenv.mkDerivation { ''; homepage = http://lloyd.github.com/yajl/; license = stdenv.lib.license.isc; - platforms = stdenv.lib.platforms.linux; + platforms = with stdenv.lib.platforms; [ linux darwin ]; maintainers = with stdenv.lib.maintainers; [ z77z ]; From e726f10554acef785cc396155b8076ec204eaf7c Mon Sep 17 00:00:00 2001 From: Marco Maggesi Date: Mon, 17 Oct 2011 12:57:15 +0000 Subject: [PATCH 210/970] Io does not depend anymore on e2fsprogs svn path=/nixpkgs/trunk/; revision=29864 --- pkgs/development/interpreters/io/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/interpreters/io/default.nix b/pkgs/development/interpreters/io/default.nix index bfa73eb8744..40b1b2ee306 100644 --- a/pkgs/development/interpreters/io/default.nix +++ b/pkgs/development/interpreters/io/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchurl, cmake, zlib, sqlite, gmp, libffi, cairo, ncurses, freetype, mesa, libpng, libtiff, libjpeg, readline, libsndfile, libxml2, - freeglut, e2fsprogs, libsamplerate, pcre, libevent, libedit, yajl, + freeglut, libsamplerate, pcre, libevent, libedit, yajl, python, openssl, glfw }: From 17c7829893102c3ddd8d3df8b7ff3118500e0a91 Mon Sep 17 00:00:00 2001 From: Marco Maggesi Date: Mon, 17 Oct 2011 12:59:44 +0000 Subject: [PATCH 211/970] Ooops. svn path=/nixpkgs/trunk/; revision=29865 --- pkgs/development/interpreters/io/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/interpreters/io/default.nix b/pkgs/development/interpreters/io/default.nix index 40b1b2ee306..b5ec30563d0 100644 --- a/pkgs/development/interpreters/io/default.nix +++ b/pkgs/development/interpreters/io/default.nix @@ -15,7 +15,7 @@ stdenv.mkDerivation { buildInputs = [ cmake zlib sqlite gmp libffi cairo ncurses freetype mesa libpng libtiff libjpeg readline libsndfile libxml2 - freeglut e2fsprogs libsamplerate pcre libevent libedit yajl + freeglut libsamplerate pcre libevent libedit yajl ]; cmakeFlags = [ "-DCMAKE_BUILD_TYPE=release" ]; From 7b478fb0fdce8e3b464675c0d9e44b65fb6aec16 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 17 Oct 2011 17:04:59 +0000 Subject: [PATCH 212/970] haskell-certificate: updated to version 0.9.5 svn path=/nixpkgs/trunk/; revision=29866 --- pkgs/development/libraries/haskell/certificate/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/certificate/default.nix b/pkgs/development/libraries/haskell/certificate/default.nix index 94a9e6fb17a..46e3d078a69 100644 --- a/pkgs/development/libraries/haskell/certificate/default.nix +++ b/pkgs/development/libraries/haskell/certificate/default.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "certificate"; - version = "0.9.4"; - sha256 = "0apv2paxlp12ksn28bn4lb1mg05cs7sjygfarxacwmz43jy6ld9v"; + version = "0.9.5"; + sha256 = "0nc50x4pqsrm8q6n4xjp79q4dmmglrqd8rbryza8jmcml8fchvbz"; isLibrary = true; isExecutable = true; buildDepends = [ asn1Data base64Bytestring mtl time ]; From 810a7e41981bf99f62de32a0c9aa93609a03ad6c Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 17 Oct 2011 17:05:05 +0000 Subject: [PATCH 213/970] haskell-hakyll: updated to version 3.2.0.10 svn path=/nixpkgs/trunk/; revision=29867 --- pkgs/development/libraries/haskell/hakyll/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/hakyll/default.nix b/pkgs/development/libraries/haskell/hakyll/default.nix index ca5cd97269d..310e872b528 100644 --- a/pkgs/development/libraries/haskell/hakyll/default.nix +++ b/pkgs/development/libraries/haskell/hakyll/default.nix @@ -4,8 +4,8 @@ cabal.mkDerivation (self: { pname = "hakyll"; - version = "3.2.0.9"; - sha256 = "1gb10bvzlm8qn6ap7cxykscbhbs2jsfqgsw53r8vd8k5bfgm5jv6"; + version = "3.2.0.10"; + sha256 = "1hdivw1smfkxza5jl8gm84gnzb5a9sgc2lcas3hikv968p9c1yry"; buildDepends = [ binary blazeHtml cryptohash hamlet mtl pandoc parsec regexBase regexPcre snapCore snapServer tagsoup time From 924e624aad78fd37b51ed2edf4db0f7b09cb04bd Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 17 Oct 2011 17:05:14 +0000 Subject: [PATCH 214/970] haskell-haskeline: updated to version 0.6.4.4 svn path=/nixpkgs/trunk/; revision=29868 --- pkgs/development/libraries/haskell/haskeline/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/haskeline/default.nix b/pkgs/development/libraries/haskell/haskeline/default.nix index 12e1448c041..63fdc751d8d 100644 --- a/pkgs/development/libraries/haskell/haskeline/default.nix +++ b/pkgs/development/libraries/haskell/haskeline/default.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "haskeline"; - version = "0.6.4.3"; - sha256 = "1dlrsazprvn6xcd12k5ln536rv9sljjccrjgpq6jj6b9ziadwiwr"; + version = "0.6.4.4"; + sha256 = "03cnhidnpnz7fh34c7x0rpl15zi6hkh9khganrdhwa59srxzbxqb"; buildDepends = [ extensibleExceptions mtl terminfo utf8String ]; meta = { homepage = "http://trac.haskell.org/haskeline"; From 491c6e43b182a189f27455dcc17e64ca7b7dbd7d Mon Sep 17 00:00:00 2001 From: Russell O'Connor Date: Mon, 17 Oct 2011 22:18:21 +0000 Subject: [PATCH 215/970] Package for picosat. svn path=/nixpkgs/trunk/; revision=29869 --- .../science/logic/picosat/default.nix | 41 +++++++++++++++++++ 1 file changed, 41 insertions(+) create mode 100644 pkgs/applications/science/logic/picosat/default.nix diff --git a/pkgs/applications/science/logic/picosat/default.nix b/pkgs/applications/science/logic/picosat/default.nix new file mode 100644 index 00000000000..5a92c103961 --- /dev/null +++ b/pkgs/applications/science/logic/picosat/default.nix @@ -0,0 +1,41 @@ +{stdenv, fetchurl }: + +let + version = "936"; + pname = "picosat"; + +in + +stdenv.mkDerivation rec { + name = "${pname}-${version}"; + + src = fetchurl { + url = "http://fmv.jku.at/picosat/${name}.tar.gz"; + sha256 = "02hq68fmfjs085216wsj13ff6i1rhc652yscl16w9jzpfqzly91n"; + }; + + dontAddPrefix = true; + + # configureFlags = "--shared"; the ./configure file is broken and doesn't accept this parameter :( + patchPhase = '' + sed -e 's/^shared=no/shared=yes/' -i configure + ''; + + installPhase = '' + ensureDir "$out"/bin + cp picomus "$out"/bin + cp picosat "$out"/bin + ensureDir "$out"/lib + cp libpicosat.a "$out"/lib + cp libpicosat.so "$out"/lib + ensureDir "$out"/include/picosat + cp picosat.h "$out"/include/picosat + ''; + + meta = { + homepage = http://fmv.jku.at/picosat/; + description = "SAT solver with proof and core support"; + license = "MIT"; + maintainers = [ stdenv.lib.maintainers.roconnor ]; + }; +} From 9783d27b7a4f404c1fa10cb26454ba3305635aed Mon Sep 17 00:00:00 2001 From: Shea Levy Date: Tue, 18 Oct 2011 16:37:28 +0000 Subject: [PATCH 216/970] Bump llvm and clang to 2.9 svn path=/nixpkgs/trunk/; revision=29878 --- .../compilers/llvm/clang-include-paths.patch | 20 ++++++++--------- pkgs/development/compilers/llvm/default.nix | 22 ++++++++++--------- 2 files changed, 22 insertions(+), 20 deletions(-) diff --git a/pkgs/development/compilers/llvm/clang-include-paths.patch b/pkgs/development/compilers/llvm/clang-include-paths.patch index 5c80e582145..aaa9a5fc4b5 100644 --- a/pkgs/development/compilers/llvm/clang-include-paths.patch +++ b/pkgs/development/compilers/llvm/clang-include-paths.patch @@ -1,15 +1,15 @@ diff -ru -x '*~' a/tools/clang/lib/Frontend/InitHeaderSearch.cpp b/tools/clang/lib/Frontend/InitHeaderSearch.cpp ---- a/tools/clang/lib/Frontend/InitHeaderSearch.cpp 2010-09-03 18:45:53.000000000 +0200 -+++ b/tools/clang/lib/Frontend/InitHeaderSearch.cpp 2011-02-05 14:59:08.669573190 +0100 -@@ -443,6 +443,7 @@ - AddPath(*i, System, false, false, false); - return; - } +--- a/tools/clang/lib/Frontend/InitHeaderSearch.cpp 2011-03-21 20:24:04.000000000 -0400 ++++ b/tools/clang/lib/Frontend/InitHeaderSearch.cpp 2011-10-18 12:09:50.624355551 -0400 +@@ -438,6 +438,7 @@ + + void InitHeaderSearch::AddDefaultCIncludePaths(const llvm::Triple &triple, + const HeaderSearchOptions &HSOpts) { +#if 0 llvm::Triple::OSType os = triple.getOS(); + switch (os) { - case llvm::Triple::Win32: -@@ -532,6 +533,8 @@ +@@ -559,6 +560,8 @@ } AddPath("/usr/include", System, false, false, false); @@ -18,7 +18,7 @@ diff -ru -x '*~' a/tools/clang/lib/Frontend/InitHeaderSearch.cpp b/tools/clang/l } void InitHeaderSearch:: -@@ -550,6 +553,7 @@ +@@ -577,6 +580,7 @@ triple); return; } @@ -26,7 +26,7 @@ diff -ru -x '*~' a/tools/clang/lib/Frontend/InitHeaderSearch.cpp b/tools/clang/l // FIXME: temporary hack: hard-coded paths. switch (os) { case llvm::Triple::Cygwin: -@@ -769,6 +773,10 @@ +@@ -847,6 +851,10 @@ default: break; } diff --git a/pkgs/development/compilers/llvm/default.nix b/pkgs/development/compilers/llvm/default.nix index 4229e43949a..0c5117f445f 100644 --- a/pkgs/development/compilers/llvm/default.nix +++ b/pkgs/development/compilers/llvm/default.nix @@ -1,12 +1,14 @@ { stdenv, fetchurl, gcc, flex, perl, libtool, groff , buildClang ? false }: +let version = "2.9"; in + stdenv.mkDerivation ({ - name = "llvm-2.8"; - + name = "llvm-${version}"; + src = fetchurl { - url = http://llvm.org/releases/2.8/llvm-2.8.tgz; - sha256 = "0fyl2gk2ld28isz9bq4f6r4dhqm9vljfj3pdfwlc2v0w5xsdpb95"; + url = "http://llvm.org/releases/${version}/llvm-${version}.tgz"; + sha256 = "0y9pgdakn3n0vf8zs6fjxjw6972nyw4rkfwwza6b8a3ll77kc4k6"; }; buildInputs = [ gcc flex perl groff ]; @@ -17,7 +19,7 @@ stdenv.mkDerivation ({ homepage = http://llvm.org/; description = "Collection of modular and reusable compiler and toolchain technologies"; license = "BSD"; - maintainers = with stdenv.lib.maintainers; [viric]; + maintainers = with stdenv.lib.maintainers; [viric shlevy]; platforms = with stdenv.lib.platforms; all; }; } @@ -30,17 +32,17 @@ stdenv.mkDerivation ({ else if (stdenv.system == "x86_64-linux") then "x86_64-unknown-linux-gnu" else throw "System not supported"; in { - name = "clang-2.8"; + name = "clang-${version}"; srcClang = fetchurl { - url = http://llvm.org/releases/2.8/clang-2.8.tgz; - sha256 = "1hg0vqmyr4wdy686l2bga0rpin41v0q9ds2k5659m8z6acali0zd"; + url = "http://llvm.org/releases/${version}/clang-${version}.tgz"; + sha256 = "1pq9g7qxw761dp6gx3amx39kl9p4zhlymmn8gfmcnw9ag0zizi3h"; }; prePatch = '' pushd tools unpackFile $srcClang - mv clang-2.8 clang + mv clang-${version} clang popd find ''; @@ -59,7 +61,7 @@ stdenv.mkDerivation ({ homepage = http://clang.llvm.org/; description = "A C language family frontend for LLVM"; license = "BSD"; - maintainers = with stdenv.lib.maintainers; [viric]; + maintainers = with stdenv.lib.maintainers; [viric shlevy]; platforms = with stdenv.lib.platforms; linux; }; } From db619f2d55ce346b6d9d72905de643ba495cf55a Mon Sep 17 00:00:00 2001 From: Shea Levy Date: Tue, 18 Oct 2011 20:03:09 +0000 Subject: [PATCH 217/970] First try at a clang-wrapper. Hello world compiles\! svn path=/nixpkgs/trunk/; revision=29879 --- pkgs/build-support/clang-wrapper/add-flags | 24 +++ pkgs/build-support/clang-wrapper/builder.sh | 131 ++++++++++++++ .../clang-wrapper/clang-wrapper.sh | 152 +++++++++++++++++ pkgs/build-support/clang-wrapper/default.nix | 84 +++++++++ .../build-support/clang-wrapper/ld-wrapper.sh | 161 ++++++++++++++++++ .../build-support/clang-wrapper/setup-hook.sh | 33 ++++ pkgs/build-support/clang-wrapper/utils.sh | 23 +++ pkgs/development/compilers/llvm/default.nix | 2 + pkgs/top-level/all-packages.nix | 16 +- 9 files changed, 623 insertions(+), 3 deletions(-) create mode 100644 pkgs/build-support/clang-wrapper/add-flags create mode 100644 pkgs/build-support/clang-wrapper/builder.sh create mode 100644 pkgs/build-support/clang-wrapper/clang-wrapper.sh create mode 100644 pkgs/build-support/clang-wrapper/default.nix create mode 100644 pkgs/build-support/clang-wrapper/ld-wrapper.sh create mode 100644 pkgs/build-support/clang-wrapper/setup-hook.sh create mode 100644 pkgs/build-support/clang-wrapper/utils.sh diff --git a/pkgs/build-support/clang-wrapper/add-flags b/pkgs/build-support/clang-wrapper/add-flags new file mode 100644 index 00000000000..3b064547153 --- /dev/null +++ b/pkgs/build-support/clang-wrapper/add-flags @@ -0,0 +1,24 @@ +# `-B@out@/bin' forces clang to use ld-wrapper.sh when calling ld. +export NIX_CFLAGS_COMPILE="-B@out@/bin/ $NIX_CFLAGS_COMPILE" + +if test -e @out@/nix-support/libc-cflags; then + export NIX_CFLAGS_COMPILE="$(cat @out@/nix-support/libc-cflags) $NIX_CFLAGS_COMPILE" +fi + +if test -e @out@/nix-support/clang-cflags; then + export NIX_CFLAGS_COMPILE="$(cat @out@/nix-support/clang-cflags) $NIX_CFLAGS_COMPILE" +fi + +if test -e @out@/nix-support/libc-ldflags; then + export NIX_LDFLAGS="$NIX_LDFLAGS $(cat @out@/nix-support/libc-ldflags)" +fi + +if test -e @out@/nix-support/clang-ldflags; then + export NIX_LDFLAGS="$NIX_LDFLAGS $(cat @out@/nix-support/clang-ldflags)" +fi + +if test -e @out@/nix-support/libc-ldflags-before; then + export NIX_LDFLAGS_BEFORE="$(cat @out@/nix-support/libc-ldflags-before) $NIX_LDFLAGS_BEFORE" +fi + +export NIX_CLANG_WRAPPER_FLAGS_SET=1 diff --git a/pkgs/build-support/clang-wrapper/builder.sh b/pkgs/build-support/clang-wrapper/builder.sh new file mode 100644 index 00000000000..dc039605d03 --- /dev/null +++ b/pkgs/build-support/clang-wrapper/builder.sh @@ -0,0 +1,131 @@ +source $stdenv/setup + + +ensureDir $out/bin +ensureDir $out/nix-support + + +if test -z "$nativeLibc"; then + dynamicLinker="$libc/lib/$dynamicLinker" + echo $dynamicLinker > $out/nix-support/dynamic-linker + + if test -e $libc/lib/32/ld-linux.so.2; then + echo $libc/lib/32/ld-linux.so.2 > $out/nix-support/dynamic-linker-m32 + fi + + # The "-B$libc/lib/" flag is a quick hack to force clang to link + # against the crt1.o from our own glibc, rather than the one in + # /usr/lib. (This is only an issue when using an `impure' + # compiler/linker, i.e., one that searches /usr/lib and so on.) + echo "-B$libc/lib/ -idirafter $libc/include" > $out/nix-support/libc-cflags + + echo "-L$libc/lib" > $out/nix-support/libc-ldflags + + # The dynamic linker is passed in `ldflagsBefore' to allow + # explicit overrides of the dynamic linker by callers to clang/ld + # (the *last* value counts, so ours should come first). + echo "-dynamic-linker $dynamicLinker" > $out/nix-support/libc-ldflags-before +fi + +if test -n "$nativeTools"; then + clangPath="$nativePrefix/bin" + ldPath="$nativePrefix/bin" +else + basePath=`echo $gcc/lib/*/*/*` + # Need libgcc until the llvm compiler-rt library is complete + clangLDFlags="$clangLDFlags -L$basePath" + if test -e "$gcc/lib64"; then + clangLDFlags="$clangLDFlags -L$gcc/lib64" + else + clangLDFlags="$clangLDFlags -L$gcc/lib" + fi + + clangLDFlags="$clangLDFlags -L$clang/lib" + echo "$clangLDFlags" > $out/nix-support/clang-ldflags + + # Need files like crtbegin.o from gcc + # It's unclear if these will ever be provided by an LLVM project + clangCFlags="$clangCFlags -B$basePath" + + clangCFlags="$clangCFlags -I$clang/lib/clang/$clangVersion/include" + echo "$clangCFlags" > $out/nix-support/clang-cflags + + clangPath="$clang/bin" + ldPath="$binutils/bin" +fi + + +doSubstitute() { + local src=$1 + local dst=$2 + # Can't use substitute() here, because replace may not have been + # built yet (in the bootstrap). + sed \ + -e "s^@out@^$out^g" \ + -e "s^@shell@^$shell^g" \ + -e "s^@clang@^$clang^g" \ + -e "s^@clangProg@^$clangProg^g" \ + -e "s^@binutils@^$binutils^g" \ + -e "s^@coreutils@^$coreutils^g" \ + -e "s^@libc@^$libc^g" \ + -e "s^@ld@^$ldPath/ld^g" \ + < "$src" > "$dst" +} + + +# Make wrapper scripts around clang and clang++. Also make symlinks +# cc and c++ +mkClangWrapper() { + local dst=$1 + local src=$2 + + if ! test -f "$src"; then + echo "$src does not exist (skipping)" + return 1 + fi + + clangProg="$src" + doSubstitute "$clangWrapper" "$dst" + chmod +x "$dst" +} + +if mkClangWrapper $out/bin/clang $clangPath/clang +then + ln -sv clang $out/bin/cc +fi + +if mkClangWrapper $out/bin/clang++ $clangPath/clang++ +then + ln -sv clang++ $out/bin/c++ +fi + + +# Create a symlink to as (the assembler). This is useful when a +# clang-wrapper is installed in a user environment, as it ensures that +# the right assembler is called. +ln -s $ldPath/as $out/bin/as + + +# Make a wrapper around the linker. +doSubstitute "$ldWrapper" "$out/bin/ld" +chmod +x "$out/bin/ld" + + +# Emit a setup hook. Also store the path to the original Clang and +# libc. +test -n "$clang" && echo $clang > $out/nix-support/orig-clang +test -n "$libc" && echo $libc > $out/nix-support/orig-libc + +doSubstitute "$addFlags" "$out/nix-support/add-flags.sh" + +doSubstitute "$setupHook" "$out/nix-support/setup-hook" + +cp -p $utils $out/nix-support/utils.sh + + +# Propagate the wrapped clang so that if you install the wrapper, you get +# llvm tools, the manpages, etc. as well (including for binutils +# and Glibc). +if test -z "$nativeTools"; then + echo $clang $binutils $libc > $out/nix-support/propagated-user-env-packages +fi diff --git a/pkgs/build-support/clang-wrapper/clang-wrapper.sh b/pkgs/build-support/clang-wrapper/clang-wrapper.sh new file mode 100644 index 00000000000..473adba8627 --- /dev/null +++ b/pkgs/build-support/clang-wrapper/clang-wrapper.sh @@ -0,0 +1,152 @@ +#! @shell@ -e + +if test -n "$NIX_CLANG_WRAPPER_START_HOOK"; then + source "$NIX_CLANG_WRAPPER_START_HOOK" +fi + +if test -z "$NIX_CLANG_WRAPPER_FLAGS_SET"; then + source @out@/nix-support/add-flags.sh +fi + +source @out@/nix-support/utils.sh + + +# Figure out if linker flags should be passed. Clang prints annoying +# warnings when they are not needed. (does it really? Copied from gcc-wrapper) +dontLink=0 +getVersion=0 +nonFlagArgs=0 + +for i in "$@"; do + if test "$i" = "-c"; then + dontLink=1 + elif test "$i" = "-S"; then + dontLink=1 + elif test "$i" = "-E"; then + dontLink=1 + elif test "$i" = "-E"; then + dontLink=1 + elif test "$i" = "-M"; then + dontLink=1 + elif test "$i" = "-MM"; then + dontLink=1 + elif test "$i" = "-x"; then + # At least for the cases c-header or c++-header we should set dontLink. + # I expect no one use -x other than making precompiled headers. + dontLink=1 + elif test "${i:0:1}" != "-"; then + nonFlagArgs=1 + elif test "$i" = "-m32"; then + if test -e @out@/nix-support/dynamic-linker-m32; then + NIX_LDFLAGS="$NIX_LDFLAGS -dynamic-linker $(cat @out@/nix-support/dynamic-linker-m32)" + fi + fi +done + +# If we pass a flag like -Wl, then clang will call the linker unless it +# can figure out that it has to do something else (e.g., because of a +# "-c" flag). So if no non-flag arguments are given, don't pass any +# linker flags. This catches cases like "clang" (should just print +# "clang: no input files") and "clang -v" (should print the version). +if test "$nonFlagArgs" = "0"; then + dontLink=1 +fi + + +# Optionally filter out paths not refering to the store. +params=("$@") +if test "$NIX_ENFORCE_PURITY" = "1" -a -n "$NIX_STORE"; then + rest=() + n=0 + while test $n -lt ${#params[*]}; do + p=${params[n]} + p2=${params[$((n+1))]} + if test "${p:0:3}" = "-L/" && badPath "${p:2}"; then + skip $p + elif test "$p" = "-L" && badPath "$p2"; then + n=$((n + 1)); skip $p2 + elif test "${p:0:3}" = "-I/" && badPath "${p:2}"; then + skip $p + elif test "$p" = "-I" && badPath "$p2"; then + n=$((n + 1)); skip $p2 + elif test "$p" = "-isystem" && badPath "$p2"; then + n=$((n + 1)); skip $p2 + else + rest=("${rest[@]}" "$p") + fi + n=$((n + 1)) + done + params=("${rest[@]}") +fi + + +# Add the flags for the C compiler proper. +extraAfter=($NIX_CFLAGS_COMPILE) +extraBefore=() + +if test "$dontLink" != "1"; then + + # Add the flags that should only be passed to the compiler when + # linking. + extraAfter=(${extraAfter[@]} $NIX_CFLAGS_LINK) + + # Add the flags that should be passed to the linker (and prevent + # `ld-wrapper' from adding NIX_LDFLAGS again). + for i in $NIX_LDFLAGS_BEFORE; do + extraBefore=(${extraBefore[@]} "-Wl,$i") + done + for i in $NIX_LDFLAGS; do + if test "${i:0:3}" = "-L/"; then + extraAfter=(${extraAfter[@]} "$i") + else + extraAfter=(${extraAfter[@]} "-Wl,$i") + fi + done + export NIX_LDFLAGS_SET=1 + + if test "$NIX_STRIP_DEBUG" = "1"; then + # Add executable-stripping flags. + extraAfter=(${extraAfter[@]} $NIX_CFLAGS_STRIP) + fi +fi + +# As a very special hack, if the arguments are just `-v', then don't +# add anything. This is to prevent `clang -v' (which normally prints +# out the version number and returns exit code 0) from printing out +# `No input files specified' and returning exit code 1. +if test "$*" = "-v"; then + extraAfter=() + extraBefore=() +fi + +# Optionally print debug info. +if test "$NIX_DEBUG" = "1"; then + echo "original flags to @clangProg@:" >&2 + for i in "${params[@]}"; do + echo " $i" >&2 + done + echo "extraBefore flags to @clangProg@:" >&2 + for i in ${extraBefore[@]}; do + echo " $i" >&2 + done + echo "extraAfter flags to @clangProg@:" >&2 + for i in ${extraAfter[@]}; do + echo " $i" >&2 + done +fi + +if test -n "$NIX_CLANG_WRAPPER_EXEC_HOOK"; then + source "$NIX_CLANG_WRAPPER_EXEC_HOOK" +fi + + +# Call the real `clang'. Filter out warnings from stderr about unused +# `-B' flags, since they confuse some programs. Deep bash magic to +# apply grep to stderr (by swapping stdin/stderr twice). +if test -z "$NIX_CLANG_NEEDS_GREP"; then + @clangProg@ ${extraBefore[@]} "${params[@]}" ${extraAfter[@]} +else + (@clangProg@ ${extraBefore[@]} "${params[@]}" ${extraAfter[@]} 3>&2 2>&1 1>&3- \ + | (grep -v 'file path prefix' || true); exit ${PIPESTATUS[0]}) 3>&2 2>&1 1>&3- + exit $? +fi diff --git a/pkgs/build-support/clang-wrapper/default.nix b/pkgs/build-support/clang-wrapper/default.nix new file mode 100644 index 00000000000..4730a7969e2 --- /dev/null +++ b/pkgs/build-support/clang-wrapper/default.nix @@ -0,0 +1,84 @@ +# The Nix `clang' stdenv.mkDerivation is not directly usable, since it doesn't +# know where the C library and standard header files are. Therefore +# the compiler produced by that package cannot be installed directly +# in a user environment and used from the command line. This +# stdenv.mkDerivation provides a wrapper that sets up the right environment +# variables so that the compiler and the linker just "work". + +{ name ? "", stdenv, nativeTools, nativeLibc, nativePrefix ? "" +, clang ? null, libc ? null, binutils ? null, coreutils ? null, shell ? "" +, zlib ? null +}: + +assert nativeTools -> nativePrefix != ""; +assert !nativeTools -> clang != null && binutils != null && coreutils != null; +assert !nativeLibc -> libc != null; + +let + + clangVersion = (builtins.parseDrvName clang.name).version; + clangName = (builtins.parseDrvName clang.name).name; + +in + +stdenv.mkDerivation { + name = + (if name != "" then name else clangName + "-wrapper") + + (if clang != null && clangVersion != "" then "-" + clangVersion else ""); + + builder = ./builder.sh; + setupHook = ./setup-hook.sh; + clangWrapper = ./clang-wrapper.sh; + ldWrapper = ./ld-wrapper.sh; + utils = ./utils.sh; + addFlags = ./add-flags; + + inherit nativeTools nativeLibc nativePrefix clang clangVersion; + gcc = clang.gcc; + libc = if nativeLibc then null else libc; + binutils = if nativeTools then null else binutils; + # The wrapper scripts use 'cat', so we may need coreutils + coreutils = if nativeTools then null else coreutils; + + langC = true; + langCC = true; + shell = if shell == "" then stdenv.shell else + if builtins.isAttrs shell then (shell + shell.shellPath) + else shell; + + crossAttrs = { + shell = shell.hostDrv + shell.hostDrv.shellPath; + libc = libc.hostDrv; + coreutils = coreutils.hostDrv; + binutils = binutils.hostDrv; + clang = clang.hostDrv; + # + # This is not the best way to do this. I think the reference should be + # the style in the gcc-cross-wrapper, but to keep a stable stdenv now I + # do this sufficient if/else. + dynamicLinker = + (if stdenv.cross.arch == "arm" then "ld-linux.so.3" else + if stdenv.cross.arch == "mips" then "ld.so.1" else + if stdenv.lib.hasSuffix "pc-gnu" stdenv.cross.config then "ld.so.1" else + abort "don't know the name of the dynamic linker for this platform"); + }; + + meta = + let clang_ = if clang != null then clang else {}; in + (if clang_ ? meta then removeAttrs clang.meta ["priority"] else {}) // + { description = + stdenv.lib.attrByPath ["meta" "description"] "System C compiler" clang_ + + " (wrapper script)"; + }; + + # The dynamic linker has different names on different Linux platforms. + dynamicLinker = + if !nativeLibc then + (if stdenv.system == "i686-linux" then "ld-linux.so.2" else + if stdenv.system == "x86_64-linux" then "ld-linux-x86-64.so.2" else + if stdenv.system == "armv5tel-linux" then "ld-linux.so.3" else + if stdenv.system == "powerpc-linux" then "ld.so.1" else + if stdenv.system == "mips64-linux" then "ld.so.1" else + abort "don't know the name of the dynamic linker for this platform") + else ""; +} diff --git a/pkgs/build-support/clang-wrapper/ld-wrapper.sh b/pkgs/build-support/clang-wrapper/ld-wrapper.sh new file mode 100644 index 00000000000..48378778ba9 --- /dev/null +++ b/pkgs/build-support/clang-wrapper/ld-wrapper.sh @@ -0,0 +1,161 @@ +#! @shell@ -e + +if test -n "$NIX_LD_WRAPPER_START_HOOK"; then + source "$NIX_LD_WRAPPER_START_HOOK" +fi + +if test -z "$NIX_CLANG_WRAPPER_FLAGS_SET"; then + source @out@/nix-support/add-flags.sh +fi + +source @out@/nix-support/utils.sh + + +# Optionally filter out paths not refering to the store. +params=("$@") +if test "$NIX_ENFORCE_PURITY" = "1" -a -n "$NIX_STORE" \ + -a \( -z "$NIX_IGNORE_LD_THROUGH_CLANG" -o -z "$NIX_LDFLAGS_SET" \); then + rest=() + n=0 + while test $n -lt ${#params[*]}; do + p=${params[n]} + p2=${params[$((n+1))]} + if test "${p:0:3}" = "-L/" && badPath "${p:2}"; then + skip $p + elif test "$p" = "-L" && badPath "$p2"; then + n=$((n + 1)); skip $p2 + elif test "$p" = "-rpath" && badPath "$p2"; then + n=$((n + 1)); skip $p2 + elif test "$p" = "-dynamic-linker" && badPath "$p2"; then + n=$((n + 1)); skip $p2 + elif test "${p:0:1}" = "/" && badPath "$p"; then + # We cannot skip this; barf. + echo "impure path \`$p' used in link" >&2 + exit 1 + else + rest=("${rest[@]}" "$p") + fi + n=$((n + 1)) + done + params=("${rest[@]}") +fi + + +extra=() +extraBefore=() + +if test -z "$NIX_LDFLAGS_SET"; then + extra=(${extra[@]} $NIX_LDFLAGS) + extraBefore=(${extraBefore[@]} $NIX_LDFLAGS_BEFORE) +fi + + +# Add all used dynamic libraries to the rpath. +if test "$NIX_DONT_SET_RPATH" != "1"; then + + libPath="" + addToLibPath() { + local path="$1" + if test "${path:0:1}" != "/"; then return 0; fi + case "$path" in + *..*|*./*|*/.*|*//*) + local path2 + if path2=$(readlink -f "$path"); then + path="$path2" + fi + ;; + esac + case $libPath in + *\ $path\ *) return 0 ;; + esac + libPath="$libPath $path " + } + + addToRPath() { + # If the path is not in the store, don't add it to the rpath. + # This typically happens for libraries in /tmp that are later + # copied to $out/lib. If not, we're screwed. + if test "${1:0:${#NIX_STORE}}" != "$NIX_STORE"; then return 0; fi + case $rpath in + *\ $1\ *) return 0 ;; + esac + rpath="$rpath $1 " + } + + libs="" + addToLibs() { + libs="$libs $1" + } + + rpath="" + + # First, find all -L... switches. + allParams=("${params[@]}" ${extra[@]}) + n=0 + while test $n -lt ${#allParams[*]}; do + p=${allParams[n]} + p2=${allParams[$((n+1))]} + if test "${p:0:3}" = "-L/"; then + addToLibPath ${p:2} + elif test "$p" = "-L"; then + addToLibPath ${p2} + n=$((n + 1)) + elif test "$p" = "-l"; then + addToLibs ${p2} + n=$((n + 1)) + elif test "${p:0:2}" = "-l"; then + addToLibs ${p:2} + elif test "$p" = "-dynamic-linker"; then + # Ignore the dynamic linker argument, or it + # will get into the next 'elif'. We don't want + # the dynamic linker path rpath to go always first. + n=$((n + 1)) + elif [[ "$p" =~ ^[^-].*\.so($|\.) ]]; then + # This is a direct reference to a shared library, so add + # its directory to the rpath. + path="$(dirname "$p")"; + addToRPath "${path}" + fi + n=$((n + 1)) + done + + # Second, for each directory in the library search path (-L...), + # see if it contains a dynamic library used by a -l... flag. If + # so, add the directory to the rpath. + # It's important to add the rpath in the order of -L..., so + # the link time chosen objects will be those of runtime linking. + + for i in $libPath; do + for j in $libs; do + if test -f "$i/lib$j.so"; then + addToRPath $i + break + fi + done + done + + + # Finally, add `-rpath' switches. + for i in $rpath; do + extra=(${extra[@]} -rpath $i) + done +fi + + +# Optionally print debug info. +if test "$NIX_DEBUG" = "1"; then + echo "original flags to @ld@:" >&2 + for i in "${params[@]}"; do + echo " $i" >&2 + done + echo "extra flags to @ld@:" >&2 + for i in ${extra[@]}; do + echo " $i" >&2 + done +fi + +if test -n "$NIX_LD_WRAPPER_EXEC_HOOK"; then + source "$NIX_LD_WRAPPER_EXEC_HOOK" +fi + +exec @ld@ ${extraBefore[@]} "${params[@]}" ${extra[@]} diff --git a/pkgs/build-support/clang-wrapper/setup-hook.sh b/pkgs/build-support/clang-wrapper/setup-hook.sh new file mode 100644 index 00000000000..74365a52704 --- /dev/null +++ b/pkgs/build-support/clang-wrapper/setup-hook.sh @@ -0,0 +1,33 @@ +addCVars () { + if test -d $1/include; then + export NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE -I$1/include" + fi + + if test -d $1/lib64; then + export NIX_LDFLAGS="$NIX_LDFLAGS -L$1/lib64" + fi + + if test -d $1/lib; then + export NIX_LDFLAGS="$NIX_LDFLAGS -L$1/lib" + fi +} + +envHooks=(${envHooks[@]} addCVars) + +# Note: these come *after* $out in the PATH (see setup.sh). + +if test -n "@clang@"; then + addToSearchPath PATH @clang@/bin +fi + +if test -n "@binutils@"; then + addToSearchPath PATH @binutils@/bin +fi + +if test -n "@libc@"; then + addToSearchPath PATH @libc@/bin +fi + +if test -n "@coreutils@"; then + addToSearchPath PATH @coreutils@/bin +fi diff --git a/pkgs/build-support/clang-wrapper/utils.sh b/pkgs/build-support/clang-wrapper/utils.sh new file mode 100644 index 00000000000..9a664e1d1e6 --- /dev/null +++ b/pkgs/build-support/clang-wrapper/utils.sh @@ -0,0 +1,23 @@ +skip () { + if test "$NIX_DEBUG" = "1"; then + echo "skipping impure path $1" >&2 + fi +} + + +# Checks whether a path is impure. E.g., `/lib/foo.so' is impure, but +# `/nix/store/.../lib/foo.so' isn't. +badPath() { + local p=$1 + + # Relative paths are okay (since they're presumably relative to + # the temporary build directory). + if test "${p:0:1}" != "/"; then return 1; fi + + # Otherwise, the path should refer to the store or some temporary + # directory (including the build directory). + test \ + "${p:0:${#NIX_STORE}}" != "$NIX_STORE" -a \ + "${p:0:4}" != "/tmp" -a \ + "${p:0:${#NIX_BUILD_TOP}}" != "$NIX_BUILD_TOP" +} diff --git a/pkgs/development/compilers/llvm/default.nix b/pkgs/development/compilers/llvm/default.nix index 0c5117f445f..3044acede21 100644 --- a/pkgs/development/compilers/llvm/default.nix +++ b/pkgs/development/compilers/llvm/default.nix @@ -57,6 +57,8 @@ stdenv.mkDerivation ({ tools/clang/lib/Frontend/InitHeaderSearch.cpp ''; + passthru = { gcc = gcc.gcc; }; + meta = { homepage = http://clang.llvm.org/; description = "A C language family frontend for LLVM"; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index d44c6f7ce93..3660c152a16 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -1640,9 +1640,7 @@ let ccl = builderDefsPackage ../development/compilers/ccl {}; - clang = llvm.override { - buildClang = true; - }; + clang = wrapClang (llvm.override { buildClang = true; }); clangSVN = llvmSVN.override { buildClang = true; @@ -2426,6 +2424,18 @@ let inherit stdenv binutils coreutils zlib; }; + wrapClangWith = clangWrapper: glibc: baseClang: clangWrapper { + nativeTools = stdenv ? gcc && stdenv.gcc.nativeTools; + nativeLibc = stdenv ? gcc && stdenv.gcc.nativeLibc; + nativePrefix = if stdenv ? gcc then stdenv.gcc.nativePrefix else ""; + clang = baseClang; + libc = glibc; + shell = bash; + inherit stdenv binutils coreutils zlib; + }; + + wrapClang = wrapClangWith (import ../build-support/clang-wrapper) glibc; + wrapGCC = wrapGCCWith (import ../build-support/gcc-wrapper) glibc; wrapGCCCross = From 1ed93241cde41d856684d0d7dbfc943e7835b65c Mon Sep 17 00:00:00 2001 From: Shea Levy Date: Wed, 19 Oct 2011 04:14:55 +0000 Subject: [PATCH 218/970] clang: Don't send extra -I flags to the linker svn path=/nixpkgs/trunk/; revision=29883 --- .../compilers/llvm/clang-ld-flags.patch | 45 +++++++++++++++++++ pkgs/development/compilers/llvm/default.nix | 2 +- 2 files changed, 46 insertions(+), 1 deletion(-) create mode 100644 pkgs/development/compilers/llvm/clang-ld-flags.patch diff --git a/pkgs/development/compilers/llvm/clang-ld-flags.patch b/pkgs/development/compilers/llvm/clang-ld-flags.patch new file mode 100644 index 00000000000..fc625a0e0b7 --- /dev/null +++ b/pkgs/development/compilers/llvm/clang-ld-flags.patch @@ -0,0 +1,45 @@ +diff -Naur a/tools/clang/lib/Driver/ToolChains.cpp b/tools/clang/lib/Driver/ToolChains.cpp +--- a/tools/clang/lib/Driver/ToolChains.cpp 2011-03-21 17:29:27.000000000 -0400 ++++ b/tools/clang/lib/Driver/ToolChains.cpp 2011-10-18 19:43:48.999590771 -0400 +@@ -1482,12 +1482,9 @@ + Lib = Lib64; + } + +- llvm::sys::Path LinkerPath(Base + "/../../../../" + GccTriple + "/bin/ld"); +- if (!llvm::sys::fs::exists(LinkerPath.str(), Exists) && Exists) +- Linker = LinkerPath.str(); +- else +- Linker = GetProgramPath("ld"); ++ Linker = GetProgramPath("ld"); + ++#if 0 + LinuxDistro Distro = DetectLinuxDistro(Arch); + + if (IsUbuntu(Distro)) { +@@ -1531,6 +1528,7 @@ + Paths.push_back(Base + "/../../.."); + if (Arch == getArch() && IsUbuntu(Distro)) + Paths.push_back("/usr/lib/" + GccTriple); ++#endif + } + + bool Linux::HasNativeLLVMSupport() const { +diff -Naur a/tools/clang/lib/Driver/Tools.cpp b/tools/clang/lib/Driver/Tools.cpp +--- a/tools/clang/lib/Driver/Tools.cpp 2011-03-06 18:31:01.000000000 -0500 ++++ b/tools/clang/lib/Driver/Tools.cpp 2011-10-18 18:44:00.799604267 -0400 +@@ -3619,6 +3619,7 @@ + ToolChain.getArch() == llvm::Triple::thumb || + (!Args.hasArg(options::OPT_static) && + !Args.hasArg(options::OPT_shared))) { ++#if 0 + CmdArgs.push_back("-dynamic-linker"); + if (ToolChain.getArch() == llvm::Triple::x86) + CmdArgs.push_back("/lib/ld-linux.so.2"); +@@ -3627,6 +3628,7 @@ + CmdArgs.push_back("/lib/ld-linux.so.3"); + else + CmdArgs.push_back("/lib64/ld-linux-x86-64.so.2"); ++#endif + } + + CmdArgs.push_back("-o"); diff --git a/pkgs/development/compilers/llvm/default.nix b/pkgs/development/compilers/llvm/default.nix index 3044acede21..c98005417c9 100644 --- a/pkgs/development/compilers/llvm/default.nix +++ b/pkgs/development/compilers/llvm/default.nix @@ -47,7 +47,7 @@ stdenv.mkDerivation ({ find ''; - patches = [ ./clang-include-paths.patch ]; + patches = [ ./clang-include-paths.patch ./clang-ld-flags.patch ]; # Set up the header file paths preConfigure = '' From 42fd7e5d64b79eec1a3c75e01f8377ed92071e84 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Wed, 19 Oct 2011 10:27:57 +0000 Subject: [PATCH 219/970] python-ldap: added version 2.4.3 svn path=/nixpkgs/trunk/; revision=29886 --- pkgs/top-level/python-packages.nix | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index ec71f7c881a..2ca2e261a17 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -1358,6 +1358,17 @@ let pythonPackages = python.modules // rec { }; }; + ldap = buildPythonPackage rec { + name = "python-ldap-2.4.3"; + + src = fetchurl { + url = "http://pypi.python.org/packages/source/p/python-ldap/${name}.tar.gz"; + sha256 = "17aysa9b4zjw00ikjirf4m37xbp2ifj1g0zjs14xzqqib3nh1yw8"; + }; + + NIX_CFLAGS_COMPILE = "-I${pkgs.cyrus_sasl}/include/sasl"; + propagatedBuildInputs = [pkgs.openldap pkgs.cyrus_sasl pkgs.openssl]; + }; pylint = buildPythonPackage rec { name = "pylint-0.23.0"; From 4f32c23d86d25b53bbdefaff9061a294ca42e754 Mon Sep 17 00:00:00 2001 From: Sander van der Burg Date: Wed, 19 Oct 2011 12:24:24 +0000 Subject: [PATCH 220/970] Bumped some versions of Disnix tools svn path=/nixpkgs/trunk/; revision=29890 --- .../disnix/activation-scripts/default.nix | 6 +++--- pkgs/tools/package-management/disnix/default.nix | 6 +++--- pkgs/tools/package-management/disnix/disnixos/default.nix | 6 +++--- 3 files changed, 9 insertions(+), 9 deletions(-) diff --git a/pkgs/tools/package-management/disnix/activation-scripts/default.nix b/pkgs/tools/package-management/disnix/activation-scripts/default.nix index 4e1442935ee..8725f5d1250 100644 --- a/pkgs/tools/package-management/disnix/activation-scripts/default.nix +++ b/pkgs/tools/package-management/disnix/activation-scripts/default.nix @@ -16,10 +16,10 @@ assert enableSubversionRepository -> subversion != null; assert enableEjabberdDump -> ejabberd != null; stdenv.mkDerivation { - name = "disnix-activation-scripts-0.2"; + name = "disnix-activation-scripts-0.3pre29887"; src = fetchurl { - url = http://hydra.nixos.org/build/910903/download/1/disnix-activation-scripts-0.2.tar.gz; - sha256 = "0r7yqvh3jnbvpb6lmr10lm4r5pvi4jaw0c6rhlyl5q6nh3mxymnd"; + url = http://hydra.nixos.org/build/1461490/download/1/disnix-activation-scripts-0.3pre29887.tar.gz; + sha256 = "034mx096iz9dqjsrxh6jkvcwch399gfsahrm6vfnswz9jfvfdcw0"; }; preConfigure = if enableEjabberdDump then "export PATH=$PATH:${ejabberd}/sbin" else ""; diff --git a/pkgs/tools/package-management/disnix/default.nix b/pkgs/tools/package-management/disnix/default.nix index fbb19159ef8..631db35a9b0 100644 --- a/pkgs/tools/package-management/disnix/default.nix +++ b/pkgs/tools/package-management/disnix/default.nix @@ -1,10 +1,10 @@ {stdenv, fetchurl, pkgconfig, dbus_glib, libxml2, libxslt, getopt, nixUnstable, gettext, libiconv}: stdenv.mkDerivation { - name = "disnix-0.3pre27244"; + name = "disnix-0.3pre29816"; src = fetchurl { - url = http://hydra.nixos.org/build/1083290/download/4/disnix-0.3pre27244.tar.gz; - sha256 = "1x7y34mxs26k019y9y8fsnzdk7wmjqfmybw99qgqqxy5kblvlzns"; + url = http://hydra.nixos.org/build/1453079/download/4/disnix-0.3pre29816.tar.gz; + sha256 = "13gi0zs0a8pvgmgh3h431ydran3qf3px5m3d6vddd9b225kbkgwz"; }; buildInputs = [ pkgconfig dbus_glib libxml2 libxslt getopt nixUnstable ] ++ stdenv.lib.optional (!stdenv.isLinux) libiconv diff --git a/pkgs/tools/package-management/disnix/disnixos/default.nix b/pkgs/tools/package-management/disnix/disnixos/default.nix index 1a7ca571604..9fe76d81070 100644 --- a/pkgs/tools/package-management/disnix/disnixos/default.nix +++ b/pkgs/tools/package-management/disnix/disnixos/default.nix @@ -1,10 +1,10 @@ {stdenv, fetchurl, disnix, socat, pkgconfig}: stdenv.mkDerivation { - name = "disnixos-0.2pre27672"; + name = "disnixos-0.2pre29885"; src = fetchurl { - url = http://hydra.nixos.org/build/1153468/download/3/disnixos-0.2pre27672.tar.gz; - sha256 = "0z74p9fnvchvl78brj2p3r9h0wwvpl86zk0ynzqcf8ww0h71ws08"; + url = http://hydra.nixos.org/build/1461383/download/3/disnixos-0.2pre29885.tar.gz; + sha256 = "1lyxpadykk7nbb7gad12mbcsz29c6fqihhv3k3vkh32fimbq7bma"; }; buildInputs = [ socat pkgconfig disnix ]; dontStrip = true; From efaa164120b5c9f434904e637d3c963b83e48dbc Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Wed, 19 Oct 2011 16:36:40 +0000 Subject: [PATCH 221/970] haskell-packages.nix: fixed misspelled uuParsinglib attribute svn path=/nixpkgs/trunk/; revision=29895 --- pkgs/top-level/haskell-packages.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix index aae14807855..c604ed49bfe 100644 --- a/pkgs/top-level/haskell-packages.nix +++ b/pkgs/top-level/haskell-packages.nix @@ -1225,7 +1225,7 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y); uulib = callPackage ../development/libraries/haskell/uulib {}; - uuParsingLib = callPackage ../development/libraries/haskell/uu-parsinglib {}; + uuParsinglib = callPackage ../development/libraries/haskell/uu-parsinglib {}; vacuum = callPackage ../development/libraries/haskell/vacuum {}; From eec3529bc2a6138b785605fb588d85330b6c513e Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Wed, 19 Oct 2011 16:36:45 +0000 Subject: [PATCH 222/970] haskell-NanoProlog: added version 0.2.3.1 svn path=/nixpkgs/trunk/; revision=29896 --- .../libraries/haskell/NanoProlog/default.nix | 19 +++++++++++++++++++ pkgs/top-level/haskell-packages.nix | 2 ++ 2 files changed, 21 insertions(+) create mode 100644 pkgs/development/libraries/haskell/NanoProlog/default.nix diff --git a/pkgs/development/libraries/haskell/NanoProlog/default.nix b/pkgs/development/libraries/haskell/NanoProlog/default.nix new file mode 100644 index 00000000000..8daa9d2f815 --- /dev/null +++ b/pkgs/development/libraries/haskell/NanoProlog/default.nix @@ -0,0 +1,19 @@ +{ cabal, ListLike, uuParsinglib }: + +cabal.mkDerivation (self: { + pname = "NanoProlog"; + version = "0.2.3.1"; + sha256 = "1pyvf1vmq61nhjg09416ap37c07lavrrgj2m9wx9dkyvhipzlxjv"; + isLibrary = true; + isExecutable = true; + buildDepends = [ ListLike uuParsinglib ]; + meta = { + description = "Very small interpreter for a Prolog-like language"; + license = self.stdenv.lib.licenses.bsd3; + platforms = self.ghc.meta.platforms; + maintainers = [ + self.stdenv.lib.maintainers.andres + self.stdenv.lib.maintainers.simons + ]; + }; +}) diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix index c604ed49bfe..adb1b585d77 100644 --- a/pkgs/top-level/haskell-packages.nix +++ b/pkgs/top-level/haskell-packages.nix @@ -874,6 +874,8 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y); mwcRandom = callPackage ../development/libraries/haskell/mwc-random {}; + NanoProlog = callPackage ../development/libraries/haskell/NanoProlog {}; + neither = callPackage ../development/libraries/haskell/neither {}; network_2_2_1_4 = callPackage ../development/libraries/haskell/network/2.2.1.4.nix {}; From f7a1a82fcec36ac61f039c79206cf58f0fa1743e Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Wed, 19 Oct 2011 16:36:51 +0000 Subject: [PATCH 223/970] haskell-crypto-api: added version 0.7 svn path=/nixpkgs/trunk/; revision=29897 --- .../crypto-api/{default.nix => 0.6.4.nix} | 0 .../libraries/haskell/crypto-api/0.7.nix | 18 ++++++++++++++++++ pkgs/top-level/haskell-packages.nix | 4 +++- 3 files changed, 21 insertions(+), 1 deletion(-) rename pkgs/development/libraries/haskell/crypto-api/{default.nix => 0.6.4.nix} (100%) create mode 100644 pkgs/development/libraries/haskell/crypto-api/0.7.nix diff --git a/pkgs/development/libraries/haskell/crypto-api/default.nix b/pkgs/development/libraries/haskell/crypto-api/0.6.4.nix similarity index 100% rename from pkgs/development/libraries/haskell/crypto-api/default.nix rename to pkgs/development/libraries/haskell/crypto-api/0.6.4.nix diff --git a/pkgs/development/libraries/haskell/crypto-api/0.7.nix b/pkgs/development/libraries/haskell/crypto-api/0.7.nix new file mode 100644 index 00000000000..644edbf1961 --- /dev/null +++ b/pkgs/development/libraries/haskell/crypto-api/0.7.nix @@ -0,0 +1,18 @@ +{ cabal, cereal, entropy, largeword, tagged }: + +cabal.mkDerivation (self: { + pname = "crypto-api"; + version = "0.7"; + sha256 = "0831rmkq603ga9py5xxfw77qixdliyh15dxh9ls7rd7ia6sqjvx0"; + buildDepends = [ cereal entropy largeword tagged ]; + meta = { + homepage = "http://trac.haskell.org/crypto-api/wiki"; + description = "A generic interface for cryptographic operations"; + license = self.stdenv.lib.licenses.bsd3; + platforms = self.ghc.meta.platforms; + maintainers = [ + self.stdenv.lib.maintainers.andres + self.stdenv.lib.maintainers.simons + ]; + }; +}) diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix index adb1b585d77..cface11d4e2 100644 --- a/pkgs/top-level/haskell-packages.nix +++ b/pkgs/top-level/haskell-packages.nix @@ -488,7 +488,9 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y); Crypto = callPackage ../development/libraries/haskell/Crypto {}; - cryptoApi = callPackage ../development/libraries/haskell/crypto-api {}; + cryptoApi_0_6_4 = callPackage ../development/libraries/haskell/crypto-api/0.6.4.nix {}; + cryptoApi_0_7 = callPackage ../development/libraries/haskell/crypto-api/0.7.nix {}; + cryptoApi = self.cryptoApi_0_6_4; cryptocipher = callPackage ../development/libraries/haskell/cryptocipher {}; From d547b72bee62617e4aa5b213e8766f12cc5d0481 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Wed, 19 Oct 2011 16:36:57 +0000 Subject: [PATCH 224/970] haskell-blaze-builder-enumerator: updated to version 0.2.0.3 svn path=/nixpkgs/trunk/; revision=29898 --- .../libraries/haskell/blaze-builder-enumerator/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/blaze-builder-enumerator/default.nix b/pkgs/development/libraries/haskell/blaze-builder-enumerator/default.nix index 84d667de29a..ccc8d36d6fd 100644 --- a/pkgs/development/libraries/haskell/blaze-builder-enumerator/default.nix +++ b/pkgs/development/libraries/haskell/blaze-builder-enumerator/default.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "blaze-builder-enumerator"; - version = "0.2.0.2"; - sha256 = "0as4mjh695jpxp9qfhpsxyr1448l0pk94sh5kk8sgxv5hfiy41k9"; + version = "0.2.0.3"; + sha256 = "00a9rly27sh49gi5askg7z3ji8ig9llxk4qcznsag01d1z0kb97n"; buildDepends = [ blazeBuilder enumerator transformers ]; meta = { homepage = "https://github.com/meiersi/blaze-builder-enumerator"; From 34f300aee6af215e4346dfbeffa0a8874ef6afbf Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Wed, 19 Oct 2011 16:37:01 +0000 Subject: [PATCH 225/970] haskell-hp2any-core: updated to version 0.11.1 svn path=/nixpkgs/trunk/; revision=29899 --- .../development/libraries/haskell/hp2any-core/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/development/libraries/haskell/hp2any-core/default.nix b/pkgs/development/libraries/haskell/hp2any-core/default.nix index 8bc4620ac26..f1634f632a3 100644 --- a/pkgs/development/libraries/haskell/hp2any-core/default.nix +++ b/pkgs/development/libraries/haskell/hp2any-core/default.nix @@ -1,10 +1,10 @@ -{ cabal, bytestringTrie, network, time }: +{ cabal, attoparsec, network, time }: cabal.mkDerivation (self: { pname = "hp2any-core"; - version = "0.10.1"; - sha256 = "1qblsvlj4x22ml3k5mlr28r5xk9rmi7lpipd369dbvdzm0rflf03"; - buildDepends = [ bytestringTrie network time ]; + version = "0.11.1"; + sha256 = "146bigmch7dawyyakj0w55p0jdpnxkj8q5izjsswqqk0pdxia546"; + buildDepends = [ attoparsec network time ]; meta = { homepage = "http://www.haskell.org/haskellwiki/Hp2any"; description = "Heap profiling helper library"; From bfc36e2f8a1185d626b8a94b53ae3945117a63a7 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Wed, 19 Oct 2011 16:37:05 +0000 Subject: [PATCH 226/970] haskell-yap: updated to version 0.1 svn path=/nixpkgs/trunk/; revision=29900 --- pkgs/development/libraries/haskell/yap/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/yap/default.nix b/pkgs/development/libraries/haskell/yap/default.nix index 858466ab1a4..27938a2fad0 100644 --- a/pkgs/development/libraries/haskell/yap/default.nix +++ b/pkgs/development/libraries/haskell/yap/default.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "yap"; - version = "0.0"; - sha256 = "0cjsmf9p220fb9yf2i81xspa3rpnlln3hfb9yc5x6xbcc6py0nw5"; + version = "0.1"; + sha256 = "14x1z5pmb499qq5sy0iksxv0mli8556s1jh9jm7rdg671h1cy1hl"; meta = { description = "yet another prelude - a simplistic refactoring with algebraic classes"; license = self.stdenv.lib.licenses.bsd3; From 94dbab27a39dbc50bf0a4088694ce4c17cd0e87f Mon Sep 17 00:00:00 2001 From: Shea Levy Date: Wed, 19 Oct 2011 17:11:26 +0000 Subject: [PATCH 227/970] Bootstrap clang with itself svn path=/nixpkgs/trunk/; revision=29901 --- pkgs/development/compilers/llvm/default.nix | 15 +++++++++------ pkgs/stdenv/adapters.nix | 1 + pkgs/top-level/all-packages.nix | 7 ++++++- 3 files changed, 16 insertions(+), 7 deletions(-) diff --git a/pkgs/development/compilers/llvm/default.nix b/pkgs/development/compilers/llvm/default.nix index c98005417c9..fc308f4e61c 100644 --- a/pkgs/development/compilers/llvm/default.nix +++ b/pkgs/development/compilers/llvm/default.nix @@ -1,17 +1,20 @@ -{ stdenv, fetchurl, gcc, flex, perl, libtool, groff -, buildClang ? false }: +{ stdenv, fetchurl, perl, groff, buildClang ? false }: let version = "2.9"; in stdenv.mkDerivation ({ name = "llvm-${version}"; + CC = if stdenv.gcc ? clang then "clang" else "gcc"; + + CXX = if stdenv.gcc ? clang then "clang++" else "g++"; + src = fetchurl { url = "http://llvm.org/releases/${version}/llvm-${version}.tgz"; sha256 = "0y9pgdakn3n0vf8zs6fjxjw6972nyw4rkfwwza6b8a3ll77kc4k6"; }; - buildInputs = [ gcc flex perl groff ]; + buildInputs = [ perl groff ]; configureFlags = [ "--enable-optimized" "--enable-shared" "--disable-static" ]; @@ -51,13 +54,13 @@ stdenv.mkDerivation ({ # Set up the header file paths preConfigure = '' - sed -i -e 's,C_INCLUDE_PATH,"${gcc.libc}/include/",' \ + sed -i -e 's,C_INCLUDE_PATH,"${stdenv.gcc.libc}/include/",' \ -e 's,CPP_HOST,"${triplet}",' \ - -e 's,CPP_INCLUDE_PATH,"${gcc.gcc}/include/c++/${gcc.gcc.version}",' \ + -e 's,CPP_INCLUDE_PATH,"${stdenv.gcc.gcc}/include/c++/${stdenv.gcc.gcc.version}",' \ tools/clang/lib/Frontend/InitHeaderSearch.cpp ''; - passthru = { gcc = gcc.gcc; }; + passthru = { gcc = stdenv.gcc.gcc; }; meta = { homepage = http://clang.llvm.org/; diff --git a/pkgs/stdenv/adapters.nix b/pkgs/stdenv/adapters.nix index 3e596c4ef0e..311d967c0a3 100644 --- a/pkgs/stdenv/adapters.nix +++ b/pkgs/stdenv/adapters.nix @@ -11,6 +11,7 @@ rec { # Override the compiler in stdenv for specific packages. overrideGCC = stdenv: gcc: stdenv // { mkDerivation = args: stdenv.mkDerivation (args // { NIX_GCC = gcc; }); + inherit gcc; }; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 3660c152a16..ba131ccf476 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -1640,7 +1640,12 @@ let ccl = builderDefsPackage ../development/compilers/ccl {}; - clang = wrapClang (llvm.override { buildClang = true; }); + clangBoot = wrapClang (llvm.override { buildClang = true; }); + + clang = wrapClang (llvm.override { buildClang = true; stdenv = stdenvAdapters.overrideGCC stdenv clangBoot; }); + + #Use this instead of stdenv to build with clang + clangStdenv = stdenvAdapters.overrideGCC stdenv clang; clangSVN = llvmSVN.override { buildClang = true; From 94884218d440d81219fbb397cdd34097706dd227 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Wed, 19 Oct 2011 18:06:13 +0000 Subject: [PATCH 228/970] haskell-haskeline: updated to version 0.6.4.5 svn path=/nixpkgs/trunk/; revision=29902 --- pkgs/development/libraries/haskell/haskeline/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/haskeline/default.nix b/pkgs/development/libraries/haskell/haskeline/default.nix index 63fdc751d8d..2b15fa562bf 100644 --- a/pkgs/development/libraries/haskell/haskeline/default.nix +++ b/pkgs/development/libraries/haskell/haskeline/default.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "haskeline"; - version = "0.6.4.4"; - sha256 = "03cnhidnpnz7fh34c7x0rpl15zi6hkh9khganrdhwa59srxzbxqb"; + version = "0.6.4.5"; + sha256 = "1blhbh53p6di3q3gldzmg3i8f4w3ahipai3di49i4rdcnjry0j5b"; buildDepends = [ extensibleExceptions mtl terminfo utf8String ]; meta = { homepage = "http://trac.haskell.org/haskeline"; From 3c80eda948d29ca347e1a21456fe4f43f86d30e3 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Wed, 19 Oct 2011 18:06:19 +0000 Subject: [PATCH 229/970] haskell-vector: ensure that version 0.7.1 uses the correct version of 'primitive' svn path=/nixpkgs/trunk/; revision=29903 --- pkgs/top-level/haskell-packages.nix | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix index cface11d4e2..73c41a9d06a 100644 --- a/pkgs/top-level/haskell-packages.nix +++ b/pkgs/top-level/haskell-packages.nix @@ -1237,7 +1237,9 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y); Vec = callPackage ../development/libraries/haskell/Vec {}; - vector_0_7_1 = callPackage ../development/libraries/haskell/vector/0.7.1.nix {}; + vector_0_7_1 = callPackage ../development/libraries/haskell/vector/0.7.1.nix { + primitive = self.primitive_0_3_1; + }; vector_0_9 = callPackage ../development/libraries/haskell/vector/0.9.nix { primitive = self.primitive_0_4_0_1; }; From 0b115205578e7907874a0a19d58aaa8dcbae1ade Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Wed, 19 Oct 2011 18:25:45 +0000 Subject: [PATCH 230/970] haskell-packages.nix: make users of haskell-vector and haskell-primitive explicit svn path=/nixpkgs/trunk/; revision=29904 --- pkgs/top-level/haskell-packages.nix | 76 ++++++++++++++++++++++------- 1 file changed, 58 insertions(+), 18 deletions(-) diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix index 73c41a9d06a..b62bd4d3bab 100644 --- a/pkgs/top-level/haskell-packages.nix +++ b/pkgs/top-level/haskell-packages.nix @@ -366,9 +366,13 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y); ACVector = callPackage ../development/libraries/haskell/AC-Vector {}; - aeson = callPackage ../development/libraries/haskell/aeson {}; + aeson = callPackage ../development/libraries/haskell/aeson { + vector = self.vector_0_7_1; + }; - aesonNative = callPackage ../development/libraries/haskell/aeson-native {}; + aesonNative = callPackage ../development/libraries/haskell/aeson-native { + vector = self.vector_0_7_1; + }; ansiTerminal = callPackage ../development/libraries/haskell/ansi-terminal {}; @@ -418,9 +422,13 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y); blazeHtml = callPackage ../development/libraries/haskell/blaze-html {}; - blazeTextual = callPackage ../development/libraries/haskell/blaze-textual {}; + blazeTextual = callPackage ../development/libraries/haskell/blaze-textual { + vector = self.vector_0_7_1; + }; - blazeTextualNative = callPackage ../development/libraries/haskell/blaze-textual-native {}; + blazeTextualNative = callPackage ../development/libraries/haskell/blaze-textual-native { + vector = self.vector_0_7_1; + }; bmp = callPackage ../development/libraries/haskell/bmp {}; @@ -484,7 +492,9 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y); cprngAes = callPackage ../development/libraries/haskell/cprng-aes {}; - criterion = callPackage ../development/libraries/haskell/criterion {}; + criterion = callPackage ../development/libraries/haskell/criterion { + vector = self.vector_0_7_1; + }; Crypto = callPackage ../development/libraries/haskell/Crypto {}; @@ -492,7 +502,10 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y); cryptoApi_0_7 = callPackage ../development/libraries/haskell/crypto-api/0.7.nix {}; cryptoApi = self.cryptoApi_0_6_4; - cryptocipher = callPackage ../development/libraries/haskell/cryptocipher {}; + cryptocipher = callPackage ../development/libraries/haskell/cryptocipher { + primitive = self.primitive_0_3_1; + vector = self.vector_0_7_1; + }; cryptohash = callPackage ../development/libraries/haskell/cryptohash {}; @@ -581,7 +594,9 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y); fingertree = callPackage ../development/libraries/haskell/fingertree {}; - gamma = callPackage ../development/libraries/haskell/gamma {}; + gamma = callPackage ../development/libraries/haskell/gamma { + vector = self.vector_0_7_1; + }; gdiff = callPackage ../development/libraries/haskell/gdiff {}; @@ -729,7 +744,9 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y); HList = callPackage ../development/libraries/haskell/HList {}; - hmatrix = callPackage ../development/libraries/haskell/hmatrix {}; + hmatrix = callPackage ../development/libraries/haskell/hmatrix { + vector = self.vector_0_7_1; + }; hopenssl = callPackage ../development/libraries/haskell/hopenssl {}; @@ -874,7 +891,10 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y); murmurHash = callPackage ../development/libraries/haskell/murmur-hash {}; - mwcRandom = callPackage ../development/libraries/haskell/mwc-random {}; + mwcRandom = callPackage ../development/libraries/haskell/mwc-random { + primitive = self.primitive_0_3_1; + vector = self.vector_0_7_1; + }; NanoProlog = callPackage ../development/libraries/haskell/NanoProlog {}; @@ -995,7 +1015,9 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y); random = null; # core package until ghc-7.2.1 random_newtime = self.random_1_0_0_2_newtime; - randomFu = callPackage ../development/libraries/haskell/random-fu {}; + randomFu = callPackage ../development/libraries/haskell/random-fu { + vector = self.vector_0_7_1; + }; randomSource = callPackage ../development/libraries/haskell/random-source {}; @@ -1071,15 +1093,22 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y); smallcheck = callPackage ../development/libraries/haskell/smallcheck {}; - snapCore = callPackage ../development/libraries/haskell/snap/core.nix {}; + snapCore = callPackage ../development/libraries/haskell/snap/core.nix { + vector = self.vector_0_7_1; + }; - snapServer = callPackage ../development/libraries/haskell/snap/server.nix {}; + snapServer = callPackage ../development/libraries/haskell/snap/server.nix { + vector = self.vector_0_7_1; + }; stateref = callPackage ../development/libraries/haskell/stateref {}; StateVar = callPackage ../development/libraries/haskell/StateVar {}; - statistics = callPackage ../development/libraries/haskell/statistics {}; + statistics = callPackage ../development/libraries/haskell/statistics { + primitive = self.primitive_0_3_1; + vector = self.vector_0_7_1; + }; streamproc = callPackage ../development/libraries/haskell/streamproc {}; @@ -1198,7 +1227,9 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y); tls = callPackage ../development/libraries/haskell/tls {}; - tlsExtra = callPackage ../development/libraries/haskell/tls-extra {}; + tlsExtra = callPackage ../development/libraries/haskell/tls-extra { + vector = self.vector_0_7_1; + }; transformers_0_2_2_0 = callPackage ../development/libraries/haskell/transformers/0.2.2.0.nix {}; transformers = self.transformers_0_2_2_0; @@ -1245,12 +1276,19 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y); }; vector = self.vector_0_7_1; - vectorAlgorithms = callPackage ../development/libraries/haskell/vector-algorithms {}; + vectorAlgorithms = callPackage ../development/libraries/haskell/vector-algorithms { + primitive = self.primitive_0_3_1; + vector = self.vector_0_7_1; + }; vectorSpace = callPackage ../development/libraries/haskell/vector-space {}; - vty_4_6_0_4 = callPackage ../development/libraries/haskell/vty/4.6.0.4.nix {}; - vty_4_7_0_4 = callPackage ../development/libraries/haskell/vty/4.7.0.4.nix {}; + # vty_4_6_0_4 = callPackage ../development/libraries/haskell/vty/4.6.0.4.nix { + # vector = self.vector_0_7_1; + # }; + vty_4_7_0_4 = callPackage ../development/libraries/haskell/vty/4.7.0.4.nix { + vector = self.vector_0_7_1; + }; vty = self.vty_4_7_0_4; wai = callPackage ../development/libraries/haskell/wai {}; @@ -1317,7 +1355,9 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y); yesodForm = callPackage ../development/libraries/haskell/yesod-form {}; - yesodJson = callPackage ../development/libraries/haskell/yesod-json {}; + yesodJson = callPackage ../development/libraries/haskell/yesod-json { + vector = self.vector_0_7_1; + }; yesodPersistent = callPackage ../development/libraries/haskell/yesod-persistent {}; From b903b335fbd42af9c16432d7f7c1d250da6b9a75 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Wed, 19 Oct 2011 18:25:52 +0000 Subject: [PATCH 231/970] haskell-vty: dropped obsolete version 4.6.0.4 svn path=/nixpkgs/trunk/; revision=29905 --- .../libraries/haskell/vty/4.6.0.4.nix | 18 ------------------ .../haskell/vty/{4.7.0.4.nix => default.nix} | 0 pkgs/top-level/haskell-packages.nix | 6 +----- 3 files changed, 1 insertion(+), 23 deletions(-) delete mode 100644 pkgs/development/libraries/haskell/vty/4.6.0.4.nix rename pkgs/development/libraries/haskell/vty/{4.7.0.4.nix => default.nix} (100%) diff --git a/pkgs/development/libraries/haskell/vty/4.6.0.4.nix b/pkgs/development/libraries/haskell/vty/4.6.0.4.nix deleted file mode 100644 index 55c73118446..00000000000 --- a/pkgs/development/libraries/haskell/vty/4.6.0.4.nix +++ /dev/null @@ -1,18 +0,0 @@ -{ cabal, deepseq, mtl, parallel, parsec, terminfo, utf8String }: - -cabal.mkDerivation (self: { - pname = "vty"; - version = "4.6.0.4"; - sha256 = "0kabssw3v7nglvsr687ppmdnnmii1q2g5zg8rxwi2hcmvnjx7567"; - buildDepends = [ deepseq mtl parallel parsec terminfo utf8String ]; - meta = { - homepage = "http://trac.haskell.org/vty/"; - description = "A simple terminal access library"; - license = self.stdenv.lib.licenses.bsd3; - platforms = self.ghc.meta.platforms; - maintainers = [ - self.stdenv.lib.maintainers.andres - self.stdenv.lib.maintainers.simons - ]; - }; -}) diff --git a/pkgs/development/libraries/haskell/vty/4.7.0.4.nix b/pkgs/development/libraries/haskell/vty/default.nix similarity index 100% rename from pkgs/development/libraries/haskell/vty/4.7.0.4.nix rename to pkgs/development/libraries/haskell/vty/default.nix diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix index b62bd4d3bab..d922b397c31 100644 --- a/pkgs/top-level/haskell-packages.nix +++ b/pkgs/top-level/haskell-packages.nix @@ -1283,13 +1283,9 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y); vectorSpace = callPackage ../development/libraries/haskell/vector-space {}; - # vty_4_6_0_4 = callPackage ../development/libraries/haskell/vty/4.6.0.4.nix { - # vector = self.vector_0_7_1; - # }; - vty_4_7_0_4 = callPackage ../development/libraries/haskell/vty/4.7.0.4.nix { + vty = callPackage ../development/libraries/haskell/vty { vector = self.vector_0_7_1; }; - vty = self.vty_4_7_0_4; wai = callPackage ../development/libraries/haskell/wai {}; From 8398d7ef2a77c7afa4fe2fd2956254419c51e060 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Wed, 19 Oct 2011 18:25:57 +0000 Subject: [PATCH 232/970] haskell-packages.nix: update default attributes of vector and primitive to the latest versions svn path=/nixpkgs/trunk/; revision=29906 --- pkgs/top-level/haskell-packages.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix index d922b397c31..fc834042dbc 100644 --- a/pkgs/top-level/haskell-packages.nix +++ b/pkgs/top-level/haskell-packages.nix @@ -977,7 +977,7 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y); primitive_0_3_1 = callPackage ../development/libraries/haskell/primitive/0.3.1.nix {}; primitive_0_4_0_1 = callPackage ../development/libraries/haskell/primitive/0.4.0.1.nix {}; - primitive = self.primitive_0_3_1; + primitive = self.primitive_0_4_0_1; processLeksah = callPackage ../development/libraries/haskell/leksah/process-leksah.nix {}; @@ -1274,7 +1274,7 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y); vector_0_9 = callPackage ../development/libraries/haskell/vector/0.9.nix { primitive = self.primitive_0_4_0_1; }; - vector = self.vector_0_7_1; + vector = self.vector_0_9; vectorAlgorithms = callPackage ../development/libraries/haskell/vector-algorithms { primitive = self.primitive_0_3_1; From 9a8c52cf41858f8c8076e3ee0a52fa1d32a62dbc Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Wed, 19 Oct 2011 18:26:02 +0000 Subject: [PATCH 233/970] haskell-hmatrix: enable -fvector flag svn path=/nixpkgs/trunk/; revision=29907 --- pkgs/development/libraries/haskell/hmatrix/default.nix | 1 + pkgs/top-level/haskell-packages.nix | 4 +--- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/pkgs/development/libraries/haskell/hmatrix/default.nix b/pkgs/development/libraries/haskell/hmatrix/default.nix index 43c66c3d894..5f45d99c75c 100644 --- a/pkgs/development/libraries/haskell/hmatrix/default.nix +++ b/pkgs/development/libraries/haskell/hmatrix/default.nix @@ -10,6 +10,7 @@ cabal.mkDerivation (self: { binary HUnit QuickCheck random storableComplex vector ]; extraLibraries = [ blas gsl liblapack ]; + configureFlags = "-fvector"; meta = { homepage = "http://perception.inf.um.es/hmatrix"; description = "Linear algebra and numerical computation"; diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix index fc834042dbc..0f2f551af56 100644 --- a/pkgs/top-level/haskell-packages.nix +++ b/pkgs/top-level/haskell-packages.nix @@ -744,9 +744,7 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y); HList = callPackage ../development/libraries/haskell/HList {}; - hmatrix = callPackage ../development/libraries/haskell/hmatrix { - vector = self.vector_0_7_1; - }; + hmatrix = callPackage ../development/libraries/haskell/hmatrix {}; hopenssl = callPackage ../development/libraries/haskell/hopenssl {}; From 35bbc615f7a06045645f15c1c6097109b31d9348 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Wed, 19 Oct 2011 19:37:27 +0000 Subject: [PATCH 234/970] haskell-packages.nix: cosmetic svn path=/nixpkgs/trunk/; revision=29908 --- pkgs/top-level/haskell-packages.nix | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix index 0f2f551af56..a93d654b0fa 100644 --- a/pkgs/top-level/haskell-packages.nix +++ b/pkgs/top-level/haskell-packages.nix @@ -503,8 +503,8 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y); cryptoApi = self.cryptoApi_0_6_4; cryptocipher = callPackage ../development/libraries/haskell/cryptocipher { - primitive = self.primitive_0_3_1; - vector = self.vector_0_7_1; + primitive = self.primitive_0_3_1; + vector = self.vector_0_7_1; }; cryptohash = callPackage ../development/libraries/haskell/cryptohash {}; @@ -890,8 +890,8 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y); murmurHash = callPackage ../development/libraries/haskell/murmur-hash {}; mwcRandom = callPackage ../development/libraries/haskell/mwc-random { - primitive = self.primitive_0_3_1; - vector = self.vector_0_7_1; + primitive = self.primitive_0_3_1; + vector = self.vector_0_7_1; }; NanoProlog = callPackage ../development/libraries/haskell/NanoProlog {}; @@ -1104,8 +1104,8 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y); StateVar = callPackage ../development/libraries/haskell/StateVar {}; statistics = callPackage ../development/libraries/haskell/statistics { - primitive = self.primitive_0_3_1; - vector = self.vector_0_7_1; + primitive = self.primitive_0_3_1; + vector = self.vector_0_7_1; }; streamproc = callPackage ../development/libraries/haskell/streamproc {}; @@ -1275,8 +1275,8 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y); vector = self.vector_0_9; vectorAlgorithms = callPackage ../development/libraries/haskell/vector-algorithms { - primitive = self.primitive_0_3_1; - vector = self.vector_0_7_1; + primitive = self.primitive_0_3_1; + vector = self.vector_0_7_1; }; vectorSpace = callPackage ../development/libraries/haskell/vector-space {}; From 172507f79e3894408cb4804f270f16896936bf96 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Wed, 19 Oct 2011 19:37:34 +0000 Subject: [PATCH 235/970] haskell-WebBits: added version 2.1 svn path=/nixpkgs/trunk/; revision=29909 --- .../libraries/haskell/WebBits/2.1.nix | 18 ++++++++++++++++++ pkgs/top-level/haskell-packages.nix | 11 ++++++++--- 2 files changed, 26 insertions(+), 3 deletions(-) create mode 100644 pkgs/development/libraries/haskell/WebBits/2.1.nix diff --git a/pkgs/development/libraries/haskell/WebBits/2.1.nix b/pkgs/development/libraries/haskell/WebBits/2.1.nix new file mode 100644 index 00000000000..915ff0b1d60 --- /dev/null +++ b/pkgs/development/libraries/haskell/WebBits/2.1.nix @@ -0,0 +1,18 @@ +{ cabal, mtl, parsec, syb }: + +cabal.mkDerivation (self: { + pname = "WebBits"; + version = "2.1"; + sha256 = "18m19fck9zb6jh8bfd47nja1q6ab1jmd0q5r3k8m5674i6273hyn"; + buildDepends = [ mtl parsec syb ]; + meta = { + homepage = "http://www.cs.brown.edu/research/plt/"; + description = "JavaScript analysis tools"; + license = self.stdenv.lib.licenses.bsd3; + platforms = self.ghc.meta.platforms; + maintainers = [ + self.stdenv.lib.maintainers.andres + self.stdenv.lib.maintainers.simons + ]; + }; +}) diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix index a93d654b0fa..74bff87bf79 100644 --- a/pkgs/top-level/haskell-packages.nix +++ b/pkgs/top-level/haskell-packages.nix @@ -1299,10 +1299,15 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y); WebBits_2_0 = callPackage ../development/libraries/haskell/WebBits/2.0.nix { parsec = self.parsec2; }; - WebBits = self.WebBits_2_0; + WebBits_2_1 = callPackage ../development/libraries/haskell/WebBits/2.1.nix {}; + WebBits = self.WebBits_2_1; - WebBitsHtml_1_0_1 = callPackage ../development/libraries/haskell/WebBits-Html/1.0.1.nix {}; - WebBitsHtml_1_0_2 = callPackage ../development/libraries/haskell/WebBits-Html/1.0.2.nix {}; + WebBitsHtml_1_0_1 = callPackage ../development/libraries/haskell/WebBits-Html/1.0.1.nix { + WebBits = self.WebBits_2_0; + }; + WebBitsHtml_1_0_2 = callPackage ../development/libraries/haskell/WebBits-Html/1.0.2.nix { + WebBits = self.WebBits_2_0; + }; WebBitsHtml = self.WebBitsHtml_1_0_2; webRoutes = callPackage ../development/libraries/haskell/web-routes {}; From f3f7cbde1905c663d8bcb36ad577dff26b17f300 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Wed, 19 Oct 2011 19:45:38 +0000 Subject: [PATCH 236/970] updated to haskell-vector 0.9: aeson-native, blaze-textual-native, and cryptocipher svn path=/nixpkgs/trunk/; revision=29910 --- pkgs/top-level/haskell-packages.nix | 17 ++++------------- 1 file changed, 4 insertions(+), 13 deletions(-) diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix index 74bff87bf79..c0a88e9048c 100644 --- a/pkgs/top-level/haskell-packages.nix +++ b/pkgs/top-level/haskell-packages.nix @@ -370,9 +370,7 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y); vector = self.vector_0_7_1; }; - aesonNative = callPackage ../development/libraries/haskell/aeson-native { - vector = self.vector_0_7_1; - }; + aesonNative = callPackage ../development/libraries/haskell/aeson-native {}; ansiTerminal = callPackage ../development/libraries/haskell/ansi-terminal {}; @@ -426,9 +424,7 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y); vector = self.vector_0_7_1; }; - blazeTextualNative = callPackage ../development/libraries/haskell/blaze-textual-native { - vector = self.vector_0_7_1; - }; + blazeTextualNative = callPackage ../development/libraries/haskell/blaze-textual-native {}; bmp = callPackage ../development/libraries/haskell/bmp {}; @@ -502,10 +498,7 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y); cryptoApi_0_7 = callPackage ../development/libraries/haskell/crypto-api/0.7.nix {}; cryptoApi = self.cryptoApi_0_6_4; - cryptocipher = callPackage ../development/libraries/haskell/cryptocipher { - primitive = self.primitive_0_3_1; - vector = self.vector_0_7_1; - }; + cryptocipher = callPackage ../development/libraries/haskell/cryptocipher {}; cryptohash = callPackage ../development/libraries/haskell/cryptohash {}; @@ -1063,9 +1056,7 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y); regular = callPackage ../development/libraries/haskell/regular {}; - repa = callPackage ../development/libraries/haskell/repa { - vector = self.vector_0_9; - }; + repa = callPackage ../development/libraries/haskell/repa {}; repaAlgorithms = callPackage ../development/libraries/haskell/repa-algorithms {}; From fe7f1ba5705e2e13b4d512b1250fbc6484a75b10 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Wed, 19 Oct 2011 19:45:43 +0000 Subject: [PATCH 237/970] haskell-yesod-auth: updated to version 0.7.4 svn path=/nixpkgs/trunk/; revision=29911 --- pkgs/development/libraries/haskell/yesod-auth/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/yesod-auth/default.nix b/pkgs/development/libraries/haskell/yesod-auth/default.nix index 56d5c43887b..fb74e1dfba2 100644 --- a/pkgs/development/libraries/haskell/yesod-auth/default.nix +++ b/pkgs/development/libraries/haskell/yesod-auth/default.nix @@ -7,8 +7,8 @@ cabal.mkDerivation (self: { pname = "yesod-auth"; - version = "0.7.2"; - sha256 = "18i1ijxrhmmxy45ymc89f7m2zazd7lca4jv4q08d7mr1hdgsx8cn"; + version = "0.7.4"; + sha256 = "088hhyy7fwga7hwqqwxxn12iqnz6jadq1bc9p8hdv1jy6ib769dl"; buildDepends = [ aesonNative authenticate blazeHtml controlMonadAttempt hamlet httpEnumerator mimeMail persistent persistentTemplate pureMD5 From aa79612af53764b891f6f720cec4434e96c68b52 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Wed, 19 Oct 2011 19:45:47 +0000 Subject: [PATCH 238/970] haskell-yesod-core: updated to version 0.9.3.2 svn path=/nixpkgs/trunk/; revision=29912 --- .../libraries/haskell/yesod-core/default.nix | 24 ++++++++++--------- 1 file changed, 13 insertions(+), 11 deletions(-) diff --git a/pkgs/development/libraries/haskell/yesod-core/default.nix b/pkgs/development/libraries/haskell/yesod-core/default.nix index 5321294e55a..9319eb9a39c 100644 --- a/pkgs/development/libraries/haskell/yesod-core/default.nix +++ b/pkgs/development/libraries/haskell/yesod-core/default.nix @@ -1,19 +1,21 @@ -{ cabal, blazeBuilder, blazeHtml, caseInsensitive, cereal -, clientsession, cookie, enumerator, failure, hamlet, httpTypes -, monadControl, parsec, pathPieces, random, shakespeare -, shakespeareCss, shakespeareJs, strictConcurrency, text, time -, transformers, wai, waiExtra +{ cabal, aesonNative, blazeBuilder, blazeHtml, caseInsensitive +, cereal, clientsession, cookie, dataObject, dataObjectYaml +, enumerator, failure, hamlet, httpTypes, monadControl, parsec +, pathPieces, random, shakespeare, shakespeareCss, shakespeareJs +, strictConcurrency, text, time, transformers, vector, wai +, waiExtra }: cabal.mkDerivation (self: { pname = "yesod-core"; - version = "0.9.2"; - sha256 = "1h9w5fgdr4w4ikp5axzxmsvc14ikbsjmlwd2lmlrh1cjcx8xzjwf"; + version = "0.9.3.2"; + sha256 = "1h45vgxcn4sraax5rsccksx5yz57k32d7vzpp02prz2s2x5bv3xl"; buildDepends = [ - blazeBuilder blazeHtml caseInsensitive cereal clientsession cookie - enumerator failure hamlet httpTypes monadControl parsec pathPieces - random shakespeare shakespeareCss shakespeareJs strictConcurrency - text time transformers wai waiExtra + aesonNative blazeBuilder blazeHtml caseInsensitive cereal + clientsession cookie dataObject dataObjectYaml enumerator failure + hamlet httpTypes monadControl parsec pathPieces random shakespeare + shakespeareCss shakespeareJs strictConcurrency text time + transformers vector wai waiExtra ]; meta = { homepage = "http://www.yesodweb.com/"; From 575ec1ce252a1657b257dc5fad51c1847a8de602 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Wed, 19 Oct 2011 19:45:51 +0000 Subject: [PATCH 239/970] haskell-yesod-form: updated to version 0.3.3 svn path=/nixpkgs/trunk/; revision=29913 --- pkgs/development/libraries/haskell/yesod-form/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/yesod-form/default.nix b/pkgs/development/libraries/haskell/yesod-form/default.nix index fab623a2926..133d45c6c19 100644 --- a/pkgs/development/libraries/haskell/yesod-form/default.nix +++ b/pkgs/development/libraries/haskell/yesod-form/default.nix @@ -5,8 +5,8 @@ cabal.mkDerivation (self: { pname = "yesod-form"; - version = "0.3.2.1"; - sha256 = "1gzd8vs9nabv7vf41b5xxwy49yak9jd3mpxkg4yx7pndm4321hp9"; + version = "0.3.3"; + sha256 = "1lym9h7xr26i36n62cvbdyzjxna1p0alyhx9qhi5zhg0xz4nd3xq"; buildDepends = [ blazeBuilder blazeHtml dataDefault emailValidate hamlet network persistent shakespeareCss shakespeareJs text time transformers wai From ffbe3e6ef04a84623233493f55579d75d072e933 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Wed, 19 Oct 2011 19:45:56 +0000 Subject: [PATCH 240/970] haskell-yesod-static: updated to version 0.3.1.2 svn path=/nixpkgs/trunk/; revision=29914 --- .../libraries/haskell/yesod-static/default.nix | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/pkgs/development/libraries/haskell/yesod-static/default.nix b/pkgs/development/libraries/haskell/yesod-static/default.nix index 8fbc8baff49..0f700667f34 100644 --- a/pkgs/development/libraries/haskell/yesod-static/default.nix +++ b/pkgs/development/libraries/haskell/yesod-static/default.nix @@ -1,13 +1,14 @@ -{ cabal, base64Bytestring, cereal, fileEmbed, httpTypes, pureMD5 -, text, transformers, unixCompat, wai, waiAppStatic, yesodCore +{ cabal, base64Bytestring, cereal, enumerator, fileEmbed, httpTypes +, pureMD5, text, transformers, unixCompat, wai, waiAppStatic +, yesodCore }: cabal.mkDerivation (self: { pname = "yesod-static"; - version = "0.3.0.1"; - sha256 = "1dvg60kawmvczwxvkxzx5k19y36i23fi0faw71ck58mlkjdczby5"; + version = "0.3.1.2"; + sha256 = "0r72xspxq7122k9vird4yqqzrn6p4xgzvxid7ig62zdxjlw1p36j"; buildDepends = [ - base64Bytestring cereal fileEmbed httpTypes pureMD5 text + base64Bytestring cereal enumerator fileEmbed httpTypes pureMD5 text transformers unixCompat wai waiAppStatic yesodCore ]; meta = { From 0c9057b912aa25813597582502dc065eb914596a Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Wed, 19 Oct 2011 19:46:00 +0000 Subject: [PATCH 241/970] haskell-yesod: updated to version 0.9.3 svn path=/nixpkgs/trunk/; revision=29915 --- pkgs/development/libraries/haskell/yesod/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/yesod/default.nix b/pkgs/development/libraries/haskell/yesod/default.nix index e4947dc94f2..84a5c25b91f 100644 --- a/pkgs/development/libraries/haskell/yesod/default.nix +++ b/pkgs/development/libraries/haskell/yesod/default.nix @@ -7,8 +7,8 @@ cabal.mkDerivation (self: { pname = "yesod"; - version = "0.9.2.2"; - sha256 = "09l7cdsrxlr1nb03h3nisih9sm824gnp3nkblvgh8b1pfi54wdkl"; + version = "0.9.3"; + sha256 = "1w5fml250i63qhlxkn1bidc3sminmxf98zsdzvdi42sfjx8fdkkx"; isLibrary = true; isExecutable = true; buildDepends = [ From 1faa8711c8a7ec46831270807789c5711fb943ec Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Wed, 19 Oct 2011 19:54:55 +0000 Subject: [PATCH 242/970] haskell-nixos-types: updated to version 1.2 svn path=/nixpkgs/trunk/; revision=29916 --- pkgs/development/libraries/haskell/nixos-types/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/nixos-types/default.nix b/pkgs/development/libraries/haskell/nixos-types/default.nix index b63f8a9fbdc..9a1103a2bb8 100644 --- a/pkgs/development/libraries/haskell/nixos-types/default.nix +++ b/pkgs/development/libraries/haskell/nixos-types/default.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "nixos-types"; - version = "1.1"; - sha256 = "0vnlhq2pjnslq1h9h3lyaxw604s3zdhs7k8hfr35m178rdm3a5az"; + version = "1.2"; + sha256 = "140qk6wqq87qfk471cnhrg135fnqv0vfmfxh8kj14ar2kxvzrr8w"; buildDepends = [ regexPosix ]; meta = { homepage = "http://github.com/haskell4nix/nixos-types"; From 7784111b49bb86a1005da6d7fb2ba6f33d874710 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Wed, 19 Oct 2011 19:54:59 +0000 Subject: [PATCH 243/970] haskell-cabal2nix: updated to version 1.18 svn path=/nixpkgs/trunk/; revision=29917 --- pkgs/development/tools/haskell/cabal2nix/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/haskell/cabal2nix/default.nix b/pkgs/development/tools/haskell/cabal2nix/default.nix index 5c354c8e156..983555bec43 100644 --- a/pkgs/development/tools/haskell/cabal2nix/default.nix +++ b/pkgs/development/tools/haskell/cabal2nix/default.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "cabal2nix"; - version = "1.17"; - sha256 = "0pga0rfghpvjazhs0mgnxg2kf82m8bsmlx3g9pxhiw5f4amfr2g7"; + version = "1.18"; + sha256 = "1bx9gv5nxz68p8rimai6gy05l84f7n3rajacvg6dak9nsrnbl95i"; isLibrary = false; isExecutable = true; buildDepends = [ hackageDb HTTP mtl nixosTypes regexPosix ]; From 54951e39944fa29d757d89c45aa65dfe40947f38 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Wed, 19 Oct 2011 20:41:15 +0000 Subject: [PATCH 244/970] * QEMU/KVM updated to 0.15.1. svn path=/nixpkgs/trunk/; revision=29918 --- pkgs/os-specific/linux/qemu-kvm/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/qemu-kvm/default.nix b/pkgs/os-specific/linux/qemu-kvm/default.nix index 3f35d3304ce..821084c1b33 100644 --- a/pkgs/os-specific/linux/qemu-kvm/default.nix +++ b/pkgs/os-specific/linux/qemu-kvm/default.nix @@ -4,11 +4,11 @@ assert stdenv.isLinux; stdenv.mkDerivation rec { - name = "qemu-kvm-0.15.0"; + name = "qemu-kvm-0.15.1"; src = fetchurl { url = "mirror://sourceforge/kvm/${name}.tar.gz"; - sha256 = "0y247bc2cyawliaiyk8k41kl3mcjvh52b9bgzvxv0h55zwdpg3l2"; + sha256 = "0gkk96yid3nq8i4z8xbiarj0r9v7b2zavf5mnh0rc7kclzxa7mmf"; }; patches = [ ./smb-tmpdir.patch ]; From 6e3cde63834ef21346e80862256c6a08909f514a Mon Sep 17 00:00:00 2001 From: Shea Levy Date: Wed, 19 Oct 2011 20:57:18 +0000 Subject: [PATCH 245/970] Enable building clang separately from llvm Note that there is some duplication when building clang now. The llvm source is unpacked twice, ./configure is run twice, and two small unit test libraries are compiled twice. IMO this is a fair tradeoff for having llvm be a separate build unaffected by changes to clang svn path=/nixpkgs/trunk/; revision=29919 --- .../llvm/clang-system-llvm-libs.patch | 42 ++++++ .../compilers/llvm/clang-tblgen.patch | 134 ++++++++++++++++++ pkgs/development/compilers/llvm/clang.nix | 62 ++++++++ pkgs/development/compilers/llvm/default.nix | 48 +------ pkgs/top-level/all-packages.nix | 11 +- 5 files changed, 249 insertions(+), 48 deletions(-) create mode 100644 pkgs/development/compilers/llvm/clang-system-llvm-libs.patch create mode 100644 pkgs/development/compilers/llvm/clang-tblgen.patch create mode 100644 pkgs/development/compilers/llvm/clang.nix diff --git a/pkgs/development/compilers/llvm/clang-system-llvm-libs.patch b/pkgs/development/compilers/llvm/clang-system-llvm-libs.patch new file mode 100644 index 00000000000..0d82cf4017a --- /dev/null +++ b/pkgs/development/compilers/llvm/clang-system-llvm-libs.patch @@ -0,0 +1,42 @@ +diff -Naur llvm-2.9-orig/Makefile.rules llvm-2.9/Makefile.rules +--- llvm-2.9-orig/Makefile.rules 2011-03-25 02:26:58.000000000 -0400 ++++ llvm-2.9/Makefile.rules 2011-10-19 15:31:38.538674143 -0400 +@@ -941,7 +941,7 @@ + @echo "*** llvm-config doesn't exist - rebuilding it." + @$(MAKE) -C $(PROJ_OBJ_ROOT)/tools/llvm-config + +-$(ToolDir)/$(strip $(TOOLNAME))$(EXEEXT): $(LLVM_CONFIG) ++$(ToolDir)/$(strip $(TOOLNAME))$(EXEEXT): + + ifeq ($(ENABLE_SHARED), 1) + # We can take the "auto-import" feature to get rid of using dllimport. +@@ -1137,7 +1137,7 @@ + else + SharedLibKindMessage := "Shared Library" + endif +-$(LibName.SO): $(ObjectsO) $(ProjLibsPaths) $(LLVMLibsPaths) $(SharedLibDir)/.dir ++$(LibName.SO): $(ObjectsO) $(ProjLibsPaths) $(SharedLibDir)/.dir + $(Echo) Linking $(BuildMode) $(SharedLibKindMessage) \ + $(notdir $@) + $(Verb) $(Link) $(SharedLinkOptions) -o $@ $(ObjectsO) \ +@@ -1411,7 +1411,7 @@ + $(ToolBuildPath): $(ToolDir)/.dir + endif + +-$(ToolBuildPath): $(ObjectsO) $(ProjLibsPaths) $(LLVMLibsPaths) ++$(ToolBuildPath): $(ObjectsO) $(ProjLibsPaths) + $(Echo) Linking $(BuildMode) executable $(TOOLNAME) $(StripWarnMsg) + $(Verb) $(Link) -o $@ $(TOOLLINKOPTS) $(ObjectsO) $(ProjLibsOptions) \ + $(LLVMLibsOptions) $(ExtraLibs) $(TOOLLINKOPTSB) $(LIBS) +diff -Naur llvm-2.9-orig/unittests/Makefile.unittest llvm-2.9/unittests/Makefile.unittest +--- llvm-2.9-orig/unittests/Makefile.unittest 2011-02-04 12:12:18.000000000 -0500 ++++ llvm-2.9/unittests/Makefile.unittest 2011-10-19 15:47:27.100035616 -0400 +@@ -47,7 +47,7 @@ + Run.Shared := $(SHLIBPATH_VAR)="$(SharedLibDir)$${$(SHLIBPATH_VAR):+:}$$$(SHLIBPATH_VAR)" + endif + +-$(LLVMUnitTestExe): $(ObjectsO) $(ProjLibsPaths) $(LLVMLibsPaths) ++$(LLVMUnitTestExe): $(ObjectsO) $(ProjLibsPaths) + $(Echo) Linking $(BuildMode) unit test $(TESTNAME) $(StripWarnMsg) + $(Verb) $(Link) -o $@ $(TOOLLINKOPTS) $(ObjectsO) $(ProjLibsOptions) \ + $(TESTLIBS) $(LLVMLibsOptions) $(ExtraLibs) $(TOOLLINKOPTSB) $(LIBS) diff --git a/pkgs/development/compilers/llvm/clang-tblgen.patch b/pkgs/development/compilers/llvm/clang-tblgen.patch new file mode 100644 index 00000000000..9533529555d --- /dev/null +++ b/pkgs/development/compilers/llvm/clang-tblgen.patch @@ -0,0 +1,134 @@ +diff -Naur a/tools/clang/include/clang/AST/Makefile b/tools/clang/include/clang/AST/Makefile +--- a/tools/clang/include/clang/AST/Makefile 2010-08-18 19:23:40.000000000 -0400 ++++ b/tools/clang/include/clang/AST/Makefile 2011-10-19 14:19:21.420750346 -0400 +@@ -6,24 +6,24 @@ + + include $(CLANG_LEVEL)/Makefile + +-$(ObjDir)/Attrs.inc.tmp : $(TD_SRC_DIR)/Attr.td $(TBLGEN) \ ++$(ObjDir)/Attrs.inc.tmp : $(TD_SRC_DIR)/Attr.td \ + $(ObjDir)/.dir + $(Echo) "Building Clang attribute classes with tblgen" + $(Verb) $(TableGen) -gen-clang-attr-classes -o $(call SYSPATH, $@) \ + -I $(PROJ_SRC_DIR)/../../ $< + +-$(ObjDir)/AttrImpl.inc.tmp : $(TD_SRC_DIR)/Attr.td $(TBLGEN) \ ++$(ObjDir)/AttrImpl.inc.tmp : $(TD_SRC_DIR)/Attr.td \ + $(ObjDir)/.dir + $(Echo) "Building Clang attribute implementations with tblgen" + $(Verb) $(TableGen) -gen-clang-attr-impl -o $(call SYSPATH, $@) \ + -I $(PROJ_SRC_DIR)/../../ $< + +-$(ObjDir)/StmtNodes.inc.tmp : $(TD_SRC_DIR)/StmtNodes.td $(TBLGEN) \ ++$(ObjDir)/StmtNodes.inc.tmp : $(TD_SRC_DIR)/StmtNodes.td \ + $(ObjDir)/.dir + $(Echo) "Building Clang statement node tables with tblgen" + $(Verb) $(TableGen) -gen-clang-stmt-nodes -o $(call SYSPATH, $@) $< + +-$(ObjDir)/DeclNodes.inc.tmp : $(TD_SRC_DIR)/DeclNodes.td $(TBLGEN) \ ++$(ObjDir)/DeclNodes.inc.tmp : $(TD_SRC_DIR)/DeclNodes.td \ + $(ObjDir)/.dir + $(Echo) "Building Clang declaration node tables with tblgen" + $(Verb) $(TableGen) -gen-clang-decl-nodes -o $(call SYSPATH, $@) $< +diff -Naur a/tools/clang/include/clang/Basic/Makefile b/tools/clang/include/clang/Basic/Makefile +--- a/tools/clang/include/clang/Basic/Makefile 2010-09-09 16:27:36.000000000 -0400 ++++ b/tools/clang/include/clang/Basic/Makefile 2011-10-19 14:17:54.950837324 -0400 +@@ -29,20 +29,20 @@ + CLANG_HAS_VERSION_PATCHLEVEL := 1 + endif + +-$(ObjDir)/Diagnostic%Kinds.inc.tmp : Diagnostic.td Diagnostic%Kinds.td $(TBLGEN) $(ObjDir)/.dir ++$(ObjDir)/Diagnostic%Kinds.inc.tmp : Diagnostic.td Diagnostic%Kinds.td $(ObjDir)/.dir + $(Echo) "Building Clang $(patsubst Diagnostic%Kinds.inc.tmp,%,$(@F)) diagnostic tables with tblgen" + $(Verb) $(TableGen) -gen-clang-diags-defs -clang-component=$(patsubst Diagnostic%Kinds.inc.tmp,%,$(@F)) -o $(call SYSPATH, $@) $< + +-$(ObjDir)/DiagnosticGroups.inc.tmp : Diagnostic.td DiagnosticGroups.td $(INPUT_TDS) $(TBLGEN) $(ObjDir)/.dir ++$(ObjDir)/DiagnosticGroups.inc.tmp : Diagnostic.td DiagnosticGroups.td $(INPUT_TDS) $(ObjDir)/.dir + $(Echo) "Building Clang diagnostic groups with tblgen" + $(Verb) $(TableGen) -gen-clang-diag-groups -o $(call SYSPATH, $@) $< + +-$(ObjDir)/AttrList.inc.tmp : Attr.td $(TBLGEN) $(ObjDir)/.dir ++$(ObjDir)/AttrList.inc.tmp : Attr.td $(ObjDir)/.dir + $(Echo) "Building Clang attribute list with tblgen" + $(Verb) $(TableGen) -gen-clang-attr-list -o $(call SYSPATH, $@) \ + -I $(PROJ_SRC_DIR)/../.. $< + +-$(ObjDir)/arm_neon.inc.tmp : arm_neon.td $(TBLGEN) $(ObjDir)/.dir ++$(ObjDir)/arm_neon.inc.tmp : arm_neon.td $(ObjDir)/.dir + $(Echo) "Building Clang arm_neon.inc with tblgen" + $(Verb) $(TableGen) -gen-arm-neon-sema -o $(call SYSPATH, $@) $< + +diff -Naur a/tools/clang/include/clang/Driver/Makefile b/tools/clang/include/clang/Driver/Makefile +--- a/tools/clang/include/clang/Driver/Makefile 2010-06-08 16:34:18.000000000 -0400 ++++ b/tools/clang/include/clang/Driver/Makefile 2011-10-19 14:25:33.739369159 -0400 +@@ -5,14 +5,14 @@ + + include $(CLANG_LEVEL)/Makefile + +-$(ObjDir)/Options.inc.tmp : Options.td OptParser.td $(TBLGEN) $(ObjDir)/.dir ++$(ObjDir)/Options.inc.tmp : Options.td OptParser.td $(ObjDir)/.dir + $(Echo) "Building Clang Driver Option tables with tblgen" + $(Verb) $(TableGen) -gen-opt-parser-defs -o $(call SYSPATH, $@) $< + +-$(ObjDir)/CC1Options.inc.tmp : CC1Options.td OptParser.td $(TBLGEN) $(ObjDir)/.dir ++$(ObjDir)/CC1Options.inc.tmp : CC1Options.td OptParser.td $(ObjDir)/.dir + $(Echo) "Building Clang CC1 Option tables with tblgen" + $(Verb) $(TableGen) -gen-opt-parser-defs -o $(call SYSPATH, $@) $< + +-$(ObjDir)/CC1AsOptions.inc.tmp : CC1AsOptions.td OptParser.td $(TBLGEN) $(ObjDir)/.dir ++$(ObjDir)/CC1AsOptions.inc.tmp : CC1AsOptions.td OptParser.td $(ObjDir)/.dir + $(Echo) "Building Clang CC1 Assembler Option tables with tblgen" + $(Verb) $(TableGen) -gen-opt-parser-defs -o $(call SYSPATH, $@) $< +diff -Naur a/tools/clang/include/clang/Lex/Makefile b/tools/clang/include/clang/Lex/Makefile +--- a/tools/clang/include/clang/Lex/Makefile 2010-10-19 22:31:43.000000000 -0400 ++++ b/tools/clang/include/clang/Lex/Makefile 2011-10-19 14:18:25.082807086 -0400 +@@ -6,7 +6,7 @@ + + include $(CLANG_LEVEL)/Makefile + +-$(ObjDir)/AttrSpellings.inc.tmp : $(TD_SRC_DIR)/Attr.td $(TBLGEN) \ ++$(ObjDir)/AttrSpellings.inc.tmp : $(TD_SRC_DIR)/Attr.td \ + $(ObjDir)/.dir + $(Echo) "Building Clang attribute spellings with tblgen" + $(Verb) $(TableGen) -gen-clang-attr-spelling-list -o $(call SYSPATH, $@) \ +diff -Naur a/tools/clang/include/clang/Serialization/Makefile b/tools/clang/include/clang/Serialization/Makefile +--- a/tools/clang/include/clang/Serialization/Makefile 2010-08-18 19:23:40.000000000 -0400 ++++ b/tools/clang/include/clang/Serialization/Makefile 2011-10-19 14:25:05.764398164 -0400 +@@ -6,13 +6,13 @@ + + include $(CLANG_LEVEL)/Makefile + +-$(ObjDir)/AttrPCHRead.inc.tmp : $(TD_SRC_DIR)/Attr.td $(TBLGEN) \ ++$(ObjDir)/AttrPCHRead.inc.tmp : $(TD_SRC_DIR)/Attr.td \ + $(ObjDir)/.dir + $(Echo) "Building Clang PCH reader with tblgen" + $(Verb) $(TableGen) -gen-clang-attr-pch-read -o $(call SYSPATH, $@) \ + -I $(PROJ_SRC_DIR)/../../ $< + +-$(ObjDir)/AttrPCHWrite.inc.tmp : $(TD_SRC_DIR)/Attr.td $(TBLGEN) \ ++$(ObjDir)/AttrPCHWrite.inc.tmp : $(TD_SRC_DIR)/Attr.td \ + $(ObjDir)/.dir + $(Echo) "Building Clang PCH writer with tblgen" + $(Verb) $(TableGen) -gen-clang-attr-pch-write -o $(call SYSPATH, $@) \ +diff -Naur a/tools/clang/lib/Headers/Makefile b/tools/clang/lib/Headers/Makefile +--- a/tools/clang/lib/Headers/Makefile 2010-07-21 21:19:36.000000000 -0400 ++++ b/tools/clang/lib/Headers/Makefile 2011-10-19 14:15:18.520993127 -0400 +@@ -49,6 +49,6 @@ + + install-local:: $(INSTHEADERS) + +-$(ObjDir)/arm_neon.h.inc.tmp : $(CLANG_LEVEL)/include/clang/Basic/arm_neon.td $(TBLGEN) $(ObjDir)/.dir ++$(ObjDir)/arm_neon.h.inc.tmp : $(CLANG_LEVEL)/include/clang/Basic/arm_neon.td $(ObjDir)/.dir + $(Echo) "Building Clang arm_neon.h.inc with tblgen" + $(Verb) $(TableGen) -gen-arm-neon -o $(call SYSPATH, $@) $< +diff -Naur a/tools/clang/lib/StaticAnalyzer/Checkers/Makefile b/tools/clang/lib/StaticAnalyzer/Checkers/Makefile +--- a/tools/clang/lib/StaticAnalyzer/Checkers/Makefile 2011-02-15 02:42:38.000000000 -0500 ++++ b/tools/clang/lib/StaticAnalyzer/Checkers/Makefile 2011-10-19 14:15:58.240953760 -0400 +@@ -19,6 +19,6 @@ + + include $(CLANG_LEVEL)/Makefile + +-$(ObjDir)/Checkers.inc.tmp : Checkers.td $(PROJ_SRC_DIR)/$(CLANG_LEVEL)/include/clang/StaticAnalyzer/Checkers/CheckerBase.td $(TBLGEN) $(ObjDir)/.dir ++$(ObjDir)/Checkers.inc.tmp : Checkers.td $(PROJ_SRC_DIR)/$(CLANG_LEVEL)/include/clang/StaticAnalyzer/Checkers/CheckerBase.td $(ObjDir)/.dir + $(Echo) "Building Clang SA Checkers tables with tblgen" + $(Verb) $(TableGen) -gen-clang-sa-checkers -I $(PROJ_SRC_DIR)/$(CLANG_LEVEL)/include -o $(call SYSPATH, $@) $< diff --git a/pkgs/development/compilers/llvm/clang.nix b/pkgs/development/compilers/llvm/clang.nix new file mode 100644 index 00000000000..fc37a5c00d2 --- /dev/null +++ b/pkgs/development/compilers/llvm/clang.nix @@ -0,0 +1,62 @@ +{ stdenv, fetchurl, perl, groff, llvm }: + +assert stdenv.system == "i686-linux" || stdenv.system == "x86_64-linux"; +let + triplet = if (stdenv.system == "i686-linux") then "i686-unknown-linux-gnu" + else if (stdenv.system == "x86_64-linux") then "x86_64-unknown-linux-gnu" + else throw "System not supported"; + + version = "2.9"; +in + +stdenv.mkDerivation { + name = "clang-${version}"; + + CC = if stdenv.gcc ? clang then "clang" else "gcc"; + + CXX = if stdenv.gcc ? clang then "clang++" else "g++"; + + src = llvm.src; + + buildInputs = [ perl llvm groff ]; + + configureFlags = [ "--enable-optimized" "--enable-shared" "--disable-static" ]; + srcClang = fetchurl { + url = "http://llvm.org/releases/${version}/clang-${version}.tgz"; + sha256 = "1pq9g7qxw761dp6gx3amx39kl9p4zhlymmn8gfmcnw9ag0zizi3h"; + }; + + prePatch = '' + pushd tools + unpackFile $srcClang + mv clang-${version} clang + popd + find + ''; + + patches = [ ./clang-include-paths.patch ./clang-ld-flags.patch ./clang-tblgen.patch ./clang-system-llvm-libs.patch ]; + + buildFlags = [ "TableGen=tblgen" "LLVM_CONFIG=llvm-config" ]; + # Set up the header file paths + preBuild = '' + sed -i -e 's,C_INCLUDE_PATH,"${stdenv.gcc.libc}/include/",' \ + -e 's,CPP_HOST,"${triplet}",' \ + -e 's,CPP_INCLUDE_PATH,"${stdenv.gcc.gcc}/include/c++/${stdenv.gcc.gcc.version}",' \ + tools/clang/lib/Frontend/InitHeaderSearch.cpp + + pushd utils/unittest + make + popd + cd tools/clang + ''; + + passthru = { gcc = stdenv.gcc.gcc; }; + + meta = { + homepage = http://clang.llvm.org/; + description = "A C language family frontend for LLVM"; + license = "BSD"; + maintainers = with stdenv.lib.maintainers; [viric shlevy]; + platforms = with stdenv.lib.platforms; linux; + }; +} diff --git a/pkgs/development/compilers/llvm/default.nix b/pkgs/development/compilers/llvm/default.nix index fc308f4e61c..62e71d4a1b2 100644 --- a/pkgs/development/compilers/llvm/default.nix +++ b/pkgs/development/compilers/llvm/default.nix @@ -1,8 +1,8 @@ -{ stdenv, fetchurl, perl, groff, buildClang ? false }: +{ stdenv, fetchurl, perl, groff }: let version = "2.9"; in -stdenv.mkDerivation ({ +stdenv.mkDerivation { name = "llvm-${version}"; CC = if stdenv.gcc ? clang then "clang" else "gcc"; @@ -26,48 +26,4 @@ stdenv.mkDerivation ({ platforms = with stdenv.lib.platforms; all; }; } -// stdenv.lib.optionalAttrs buildClang ( - # I write the assert because 'gcc.libc' will be evaluated although 'triplet' would not - # evaluate properly (in the preConfigure below) - assert stdenv.system == "i686-linux" || stdenv.system == "x86_64-linux"; - let - triplet = if (stdenv.system == "i686-linux") then "i686-unknown-linux-gnu" - else if (stdenv.system == "x86_64-linux") then "x86_64-unknown-linux-gnu" - else throw "System not supported"; - in { - name = "clang-${version}"; - srcClang = fetchurl { - url = "http://llvm.org/releases/${version}/clang-${version}.tgz"; - sha256 = "1pq9g7qxw761dp6gx3amx39kl9p4zhlymmn8gfmcnw9ag0zizi3h"; - }; - - prePatch = '' - pushd tools - unpackFile $srcClang - mv clang-${version} clang - popd - find - ''; - - patches = [ ./clang-include-paths.patch ./clang-ld-flags.patch ]; - - # Set up the header file paths - preConfigure = '' - sed -i -e 's,C_INCLUDE_PATH,"${stdenv.gcc.libc}/include/",' \ - -e 's,CPP_HOST,"${triplet}",' \ - -e 's,CPP_INCLUDE_PATH,"${stdenv.gcc.gcc}/include/c++/${stdenv.gcc.gcc.version}",' \ - tools/clang/lib/Frontend/InitHeaderSearch.cpp - ''; - - passthru = { gcc = stdenv.gcc.gcc; }; - - meta = { - homepage = http://clang.llvm.org/; - description = "A C language family frontend for LLVM"; - license = "BSD"; - maintainers = with stdenv.lib.maintainers; [viric shlevy]; - platforms = with stdenv.lib.platforms; linux; - }; - } -)) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index ba131ccf476..7d5fe94b196 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -1640,9 +1640,16 @@ let ccl = builderDefsPackage ../development/compilers/ccl {}; - clangBoot = wrapClang (llvm.override { buildClang = true; }); + clangBootUnwrapped = callPackage ../development/compilers/llvm/clang.nix { }; - clang = wrapClang (llvm.override { buildClang = true; stdenv = stdenvAdapters.overrideGCC stdenv clangBoot; }); + clangBoot = wrapClang clangBootUnwrapped; + + clangUnwrapped = let clangBootStdenv = stdenvAdapters.overrideGCC stdenv clangBoot; in clangBootUnwrapped.override { + stdenv = clangBootStdenv; + llvm = llvm.override { stdenv = clangBootStdenv; }; + }; + + clang = wrapClang clangUnwrapped; #Use this instead of stdenv to build with clang clangStdenv = stdenvAdapters.overrideGCC stdenv clang; From 1d7f2e1e90ef563bec91237ff310762edc2d2e3b Mon Sep 17 00:00:00 2001 From: Shea Levy Date: Wed, 19 Oct 2011 21:47:28 +0000 Subject: [PATCH 246/970] clang: Install static analysis tools svn path=/nixpkgs/trunk/; revision=29921 --- pkgs/development/compilers/llvm/clang.nix | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/pkgs/development/compilers/llvm/clang.nix b/pkgs/development/compilers/llvm/clang.nix index fc37a5c00d2..ca3b72ffc51 100644 --- a/pkgs/development/compilers/llvm/clang.nix +++ b/pkgs/development/compilers/llvm/clang.nix @@ -37,7 +37,7 @@ stdenv.mkDerivation { patches = [ ./clang-include-paths.patch ./clang-ld-flags.patch ./clang-tblgen.patch ./clang-system-llvm-libs.patch ]; buildFlags = [ "TableGen=tblgen" "LLVM_CONFIG=llvm-config" ]; - # Set up the header file paths + preBuild = '' sed -i -e 's,C_INCLUDE_PATH,"${stdenv.gcc.libc}/include/",' \ -e 's,CPP_HOST,"${triplet}",' \ @@ -50,6 +50,11 @@ stdenv.mkDerivation { cd tools/clang ''; + postInstall = '' + install -v -m755 tools/scan-build/scan-build $out/bin + install -v -m755 tools/scan-view/scan-view $out/bin + ''; + passthru = { gcc = stdenv.gcc.gcc; }; meta = { From 188df149514f541587e6699d5423b1783c76fe56 Mon Sep 17 00:00:00 2001 From: Shea Levy Date: Wed, 19 Oct 2011 23:49:22 +0000 Subject: [PATCH 247/970] clang: Use configureFlags instead of env vars to tell which compiler to use svn path=/nixpkgs/trunk/; revision=29922 --- pkgs/development/compilers/llvm/clang.nix | 11 ++++++----- pkgs/development/compilers/llvm/default.nix | 10 +++++----- 2 files changed, 11 insertions(+), 10 deletions(-) diff --git a/pkgs/development/compilers/llvm/clang.nix b/pkgs/development/compilers/llvm/clang.nix index ca3b72ffc51..ca205022adb 100644 --- a/pkgs/development/compilers/llvm/clang.nix +++ b/pkgs/development/compilers/llvm/clang.nix @@ -12,15 +12,16 @@ in stdenv.mkDerivation { name = "clang-${version}"; - CC = if stdenv.gcc ? clang then "clang" else "gcc"; - - CXX = if stdenv.gcc ? clang then "clang++" else "g++"; - src = llvm.src; buildInputs = [ perl llvm groff ]; - configureFlags = [ "--enable-optimized" "--enable-shared" "--disable-static" ]; + configureFlags = [ "--enable-optimized" "--enable-shared" "--disable-static" ] + ++ stdenv.lib.optionals (stdenv.gcc ? clang) [ + "--with-built-clang=yes" + "CXX=clang++" + ]; + srcClang = fetchurl { url = "http://llvm.org/releases/${version}/clang-${version}.tgz"; sha256 = "1pq9g7qxw761dp6gx3amx39kl9p4zhlymmn8gfmcnw9ag0zizi3h"; diff --git a/pkgs/development/compilers/llvm/default.nix b/pkgs/development/compilers/llvm/default.nix index 62e71d4a1b2..7b38db8a646 100644 --- a/pkgs/development/compilers/llvm/default.nix +++ b/pkgs/development/compilers/llvm/default.nix @@ -5,10 +5,6 @@ let version = "2.9"; in stdenv.mkDerivation { name = "llvm-${version}"; - CC = if stdenv.gcc ? clang then "clang" else "gcc"; - - CXX = if stdenv.gcc ? clang then "clang++" else "g++"; - src = fetchurl { url = "http://llvm.org/releases/${version}/llvm-${version}.tgz"; sha256 = "0y9pgdakn3n0vf8zs6fjxjw6972nyw4rkfwwza6b8a3ll77kc4k6"; @@ -16,7 +12,11 @@ stdenv.mkDerivation { buildInputs = [ perl groff ]; - configureFlags = [ "--enable-optimized" "--enable-shared" "--disable-static" ]; + configureFlags = [ "--enable-optimized" "--enable-shared" "--disable-static" ] + ++ stdenv.lib.optionals (stdenv.gcc ? clang) [ + "--with-built-clang=yes" + "CXX=clang++" + ]; meta = { homepage = http://llvm.org/; From 1214310f5d276a2283298c039ca3309b86b66658 Mon Sep 17 00:00:00 2001 From: Shea Levy Date: Thu, 20 Oct 2011 00:15:49 +0000 Subject: [PATCH 248/970] Use the right triplet for 1686 Not sure why we're inconsistent between arches there... svn path=/nixpkgs/trunk/; revision=29923 --- pkgs/development/compilers/llvm/clang.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/compilers/llvm/clang.nix b/pkgs/development/compilers/llvm/clang.nix index ca205022adb..9f084c8a1d1 100644 --- a/pkgs/development/compilers/llvm/clang.nix +++ b/pkgs/development/compilers/llvm/clang.nix @@ -2,7 +2,7 @@ assert stdenv.system == "i686-linux" || stdenv.system == "x86_64-linux"; let - triplet = if (stdenv.system == "i686-linux") then "i686-unknown-linux-gnu" + triplet = if (stdenv.system == "i686-linux") then "i686-pc-linux-gnu" else if (stdenv.system == "x86_64-linux") then "x86_64-unknown-linux-gnu" else throw "System not supported"; From 252286194e8a08a45d32102f0f68be316f661bd6 Mon Sep 17 00:00:00 2001 From: Shea Levy Date: Thu, 20 Oct 2011 02:07:00 +0000 Subject: [PATCH 249/970] clang: have gcc tell us its target triplet, no need to limit to x86 linuces svn path=/nixpkgs/trunk/; revision=29924 --- pkgs/development/compilers/llvm/clang.nix | 13 +++---------- 1 file changed, 3 insertions(+), 10 deletions(-) diff --git a/pkgs/development/compilers/llvm/clang.nix b/pkgs/development/compilers/llvm/clang.nix index 9f084c8a1d1..7c177544725 100644 --- a/pkgs/development/compilers/llvm/clang.nix +++ b/pkgs/development/compilers/llvm/clang.nix @@ -1,13 +1,6 @@ { stdenv, fetchurl, perl, groff, llvm }: -assert stdenv.system == "i686-linux" || stdenv.system == "x86_64-linux"; -let - triplet = if (stdenv.system == "i686-linux") then "i686-pc-linux-gnu" - else if (stdenv.system == "x86_64-linux") then "x86_64-unknown-linux-gnu" - else throw "System not supported"; - - version = "2.9"; -in +let version = "2.9"; in stdenv.mkDerivation { name = "clang-${version}"; @@ -41,7 +34,7 @@ stdenv.mkDerivation { preBuild = '' sed -i -e 's,C_INCLUDE_PATH,"${stdenv.gcc.libc}/include/",' \ - -e 's,CPP_HOST,"${triplet}",' \ + -e 's,CPP_HOST,"'$(${stdenv.gcc.gcc}/bin/gcc -dumpmachine)'",' \ -e 's,CPP_INCLUDE_PATH,"${stdenv.gcc.gcc}/include/c++/${stdenv.gcc.gcc.version}",' \ tools/clang/lib/Frontend/InitHeaderSearch.cpp @@ -63,6 +56,6 @@ stdenv.mkDerivation { description = "A C language family frontend for LLVM"; license = "BSD"; maintainers = with stdenv.lib.maintainers; [viric shlevy]; - platforms = with stdenv.lib.platforms; linux; + platforms = with stdenv.lib.platforms; all; }; } From 7c32c9c42688828d5ebc895c250bcad0a3a5d1f3 Mon Sep 17 00:00:00 2001 From: Shea Levy Date: Thu, 20 Oct 2011 10:15:54 +0000 Subject: [PATCH 250/970] llvm: Use the sw_vers program on darwin svn path=/nixpkgs/trunk/; revision=29925 --- pkgs/development/compilers/llvm/default.nix | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/pkgs/development/compilers/llvm/default.nix b/pkgs/development/compilers/llvm/default.nix index 7b38db8a646..c8f05bb1fd7 100644 --- a/pkgs/development/compilers/llvm/default.nix +++ b/pkgs/development/compilers/llvm/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, perl, groff }: +{ stdenv, fetchurl, perl, groff, darwinSwVersUtility }: let version = "2.9"; in @@ -10,7 +10,8 @@ stdenv.mkDerivation { sha256 = "0y9pgdakn3n0vf8zs6fjxjw6972nyw4rkfwwza6b8a3ll77kc4k6"; }; - buildInputs = [ perl groff ]; + buildInputs = [ perl groff ] ++ + stdenv.lib.optional stdenv.isDarwin darwinSwVersUtility; configureFlags = [ "--enable-optimized" "--enable-shared" "--disable-static" ] ++ stdenv.lib.optionals (stdenv.gcc ? clang) [ From 631f071df875d861974387d587aa76cccbf2009b Mon Sep 17 00:00:00 2001 From: Sander van der Burg Date: Thu, 20 Oct 2011 11:07:47 +0000 Subject: [PATCH 251/970] Bumped version of disnixos svn path=/nixpkgs/trunk/; revision=29929 --- pkgs/tools/package-management/disnix/disnixos/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/tools/package-management/disnix/disnixos/default.nix b/pkgs/tools/package-management/disnix/disnixos/default.nix index 9fe76d81070..92914dd1cad 100644 --- a/pkgs/tools/package-management/disnix/disnixos/default.nix +++ b/pkgs/tools/package-management/disnix/disnixos/default.nix @@ -1,17 +1,17 @@ {stdenv, fetchurl, disnix, socat, pkgconfig}: stdenv.mkDerivation { - name = "disnixos-0.2pre29885"; + name = "disnixos-0.2pre29928"; src = fetchurl { - url = http://hydra.nixos.org/build/1461383/download/3/disnixos-0.2pre29885.tar.gz; - sha256 = "1lyxpadykk7nbb7gad12mbcsz29c6fqihhv3k3vkh32fimbq7bma"; + url = http://hydra.nixos.org/build/1464065/download/3/disnixos-0.2pre29928.tar.gz; + sha256 = "0l7kszbpi8lzq95khi45fbq71l5csf8kamds4va6bxsyfwxrx6sm"; }; buildInputs = [ socat pkgconfig disnix ]; dontStrip = true; NIX_STRIP_DEBUG = true; meta = { - description = "Provides complementary NixOS infrastructure deployment to NixOS"; + description = "Provides complementary NixOS infrastructure deployment to Disnix"; license = "LGPLv2.1+"; maintainers = [ stdenv.lib.maintainers.sander ]; }; From 9ee72eb9ae259b08b55c2016880690a87321f17c Mon Sep 17 00:00:00 2001 From: Sander van der Burg Date: Thu, 20 Oct 2011 11:17:24 +0000 Subject: [PATCH 252/970] Added license to yafc svn path=/nixpkgs/trunk/; revision=29930 --- pkgs/applications/networking/yafc/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/applications/networking/yafc/default.nix b/pkgs/applications/networking/yafc/default.nix index ae3ce06ca50..a6c3c43417e 100644 --- a/pkgs/applications/networking/yafc/default.nix +++ b/pkgs/applications/networking/yafc/default.nix @@ -16,5 +16,6 @@ stdenv.mkDerivation { meta = { description = "ftp/sftp client with readline, autocompletion and bookmarks"; homepage = http://yafc.sourceforge.net; + license = "GPLv2+"; }; } From d744daf77373f2b0985814795c3d7dd6441492b1 Mon Sep 17 00:00:00 2001 From: Sander van der Burg Date: Thu, 20 Oct 2011 11:18:43 +0000 Subject: [PATCH 253/970] Removed non existent license attribute svn path=/nixpkgs/trunk/; revision=29931 --- pkgs/development/libraries/yajl/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/libraries/yajl/default.nix b/pkgs/development/libraries/yajl/default.nix index 6ba81a4766b..e9a4f015b5b 100644 --- a/pkgs/development/libraries/yajl/default.nix +++ b/pkgs/development/libraries/yajl/default.nix @@ -19,7 +19,7 @@ stdenv.mkDerivation { C, and a small validating JSON generator. ''; homepage = http://lloyd.github.com/yajl/; - license = stdenv.lib.license.isc; + license = "ISC"; platforms = with stdenv.lib.platforms; [ linux darwin ]; maintainers = with stdenv.lib.maintainers; [ z77z From bc49e0ff8476f5b2adea8d3dadcce002af1336ae Mon Sep 17 00:00:00 2001 From: Marco Maggesi Date: Thu, 20 Oct 2011 11:46:13 +0000 Subject: [PATCH 254/970] yajl: fix meta.license svn path=/nixpkgs/trunk/; revision=29933 --- pkgs/development/libraries/yajl/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/libraries/yajl/default.nix b/pkgs/development/libraries/yajl/default.nix index e9a4f015b5b..573f3853869 100644 --- a/pkgs/development/libraries/yajl/default.nix +++ b/pkgs/development/libraries/yajl/default.nix @@ -19,7 +19,7 @@ stdenv.mkDerivation { C, and a small validating JSON generator. ''; homepage = http://lloyd.github.com/yajl/; - license = "ISC"; + license = stdenv.lib.licenses.isc; platforms = with stdenv.lib.platforms; [ linux darwin ]; maintainers = with stdenv.lib.maintainers; [ z77z From 7e2fbda505e5307be1f5764e5090f49426275d02 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Thu, 20 Oct 2011 17:51:52 +0000 Subject: [PATCH 255/970] * Net::Amazon::EC2: use LWP::Protocol::https. svn path=/nixpkgs/trunk/; revision=29941 --- pkgs/top-level/perl-packages.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index ece567bb075..32b804a2b19 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -2413,7 +2413,7 @@ rec { ../development/perl-modules/net-amazon-ec2-nova-compat.patch ]; propagatedBuildInputs = - [ DigestHMAC LWP Moose URI ParamsValidate XMLSimple Moose CryptSSLeay ]; + [ DigestHMAC LWP LWPProtocolHttps Moose URI ParamsValidate XMLSimple ]; doCheck = false; # wants to create actual EC2 instances (for $$$) }; From b0ead4190d561c9e1c393d7317cc8d141e3c2871 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Thu, 20 Oct 2011 18:17:37 +0000 Subject: [PATCH 256/970] * Some Net::Amazon::EC2 patches. svn path=/nixpkgs/trunk/; revision=29944 --- .../perl-modules/net-amazon-ec2-ipv6.patch | 60 +++++++++++++++++++ .../net-amazon-ec2-nova-compat.patch | 11 +++- pkgs/top-level/perl-packages.nix | 2 + 3 files changed, 72 insertions(+), 1 deletion(-) create mode 100644 pkgs/development/perl-modules/net-amazon-ec2-ipv6.patch diff --git a/pkgs/development/perl-modules/net-amazon-ec2-ipv6.patch b/pkgs/development/perl-modules/net-amazon-ec2-ipv6.patch new file mode 100644 index 00000000000..453d8f7d29e --- /dev/null +++ b/pkgs/development/perl-modules/net-amazon-ec2-ipv6.patch @@ -0,0 +1,60 @@ +Support OpenStack's DescribeInstancesV6 API call. + +diff -ru -x '*~' Net-Amazon-EC2-0.14-orig2//lib/Net/Amazon/EC2/RunningInstances.pm Net-Amazon-EC2-0.14//lib/Net/Amazon/EC2/RunningInstances.pm +--- Net-Amazon-EC2-0.14-orig2//lib/Net/Amazon/EC2/RunningInstances.pm 2010-01-24 02:12:50.000000000 +0100 ++++ Net-Amazon-EC2-0.14//lib/Net/Amazon/EC2/RunningInstances.pm 2011-06-21 17:19:36.000000000 +0200 +@@ -25,6 +25,10 @@ + This element remains empty until the instance enters a + running state. + ++=item dns_name_v6 (optional) ++ ++The public IPv6 address of the instance. ++ + =item image_id (required) + + The image id of the AMI currently running in this instance. +@@ -126,6 +130,7 @@ + + has 'ami_launch_index' => ( is => 'ro', isa => 'Str', required => 0 ); + has 'dns_name' => ( is => 'ro', isa => 'Maybe[Str]', required => 0 ); ++has 'dns_name_v6' => ( is => 'ro', isa => 'Maybe[Str]', required => 0 ); + has 'image_id' => ( is => 'ro', isa => 'Str', required => 1 ); + has 'kernel_id' => ( is => 'ro', isa => 'Maybe[Str]', required => 1 ); + has 'ramdisk_id' => ( is => 'ro', isa => 'Maybe[Str]', required => 1 ); +diff -ru -x '*~' Net-Amazon-EC2-0.14-orig2//lib/Net/Amazon/EC2.pm Net-Amazon-EC2-0.14//lib/Net/Amazon/EC2.pm +--- Net-Amazon-EC2-0.14-orig2//lib/Net/Amazon/EC2.pm 2011-06-16 16:11:53.000000000 +0200 ++++ Net-Amazon-EC2-0.14//lib/Net/Amazon/EC2.pm 2011-10-20 20:13:12.585277245 +0200 +@@ -1542,6 +1542,7 @@ + my $self = shift; + my %args = validate( @_, { + InstanceId => { type => SCALAR | ARRAYREF, optional => 1 }, ++ Action => { default => "DescribeInstances" }, + }); + + # If we have a array ref of instances lets split them out into their InstanceId.n format +@@ -1556,7 +1557,8 @@ + $args{"InstanceId.1"} = delete $args{InstanceId}; + } + +- my $xml = $self->_sign(Action => 'DescribeInstances', %args); ++ my $xml = $self->_sign(Action => $args{Action}, %args); ++ delete $args{Action}; + my $reservations; + + if ( grep { defined && length } $xml->{Errors} ) { +@@ -1635,6 +1637,7 @@ + my $running_instance = Net::Amazon::EC2::RunningInstances->new( + ami_launch_index => $instance_elem->{amiLaunchIndex}, + dns_name => $instance_elem->{dnsName}, ++ dns_name_v6 => $instance_elem->{dnsNameV6}, + image_id => $instance_elem->{imageId}, + kernel_id => $instance_elem->{kernelId}, + ramdisk_id => $instance_elem->{ramdiskId}, +@@ -3866,4 +3869,4 @@ + + =head1 SEE ALSO + +-Amazon EC2 API: L +\ No newline at end of file ++Amazon EC2 API: L diff --git a/pkgs/development/perl-modules/net-amazon-ec2-nova-compat.patch b/pkgs/development/perl-modules/net-amazon-ec2-nova-compat.patch index c08b3579fc3..5d9aef7f70d 100644 --- a/pkgs/development/perl-modules/net-amazon-ec2-nova-compat.patch +++ b/pkgs/development/perl-modules/net-amazon-ec2-nova-compat.patch @@ -1,6 +1,6 @@ diff -ru -x '*~' Net-Amazon-EC2-0.14-orig/lib/Net/Amazon/EC2.pm Net-Amazon-EC2-0.14/lib/Net/Amazon/EC2.pm --- Net-Amazon-EC2-0.14-orig/lib/Net/Amazon/EC2.pm 2010-02-02 02:26:58.000000000 +0100 -+++ Net-Amazon-EC2-0.14/lib/Net/Amazon/EC2.pm 2011-06-16 14:18:19.874176129 +0200 ++++ Net-Amazon-EC2-0.14/lib/Net/Amazon/EC2.pm 2011-06-16 16:11:53.861341300 +0200 @@ -1552,6 +1552,8 @@ $args{"InstanceId." . $count} = $instance_id; $count++; @@ -10,3 +10,12 @@ diff -ru -x '*~' Net-Amazon-EC2-0.14-orig/lib/Net/Amazon/EC2.pm Net-Amazon-EC2-0 } my $xml = $self->_sign(Action => 'DescribeInstances', %args); +@@ -3739,6 +3741,8 @@ + $args{"InstanceId." . $count} = $instance_id; + $count++; + } ++ } else { ++ $args{"InstanceId.1"} = delete $args{InstanceId}; + } + + my $xml = $self->_sign(Action => 'TerminateInstances', %args); diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 32b804a2b19..74160ca3f23 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -2411,6 +2411,8 @@ rec { # "InstanceId", as required by the Amazon spec. EC2 tolerates # "InstanceId", but Nova doesn't. ../development/perl-modules/net-amazon-ec2-nova-compat.patch + # Support DescribeInstancesV6. + ../development/perl-modules/net-amazon-ec2-ipv6.patch ]; propagatedBuildInputs = [ DigestHMAC LWP LWPProtocolHttps Moose URI ParamsValidate XMLSimple ]; From 8f76df522ecfaca887bac3c722e0451f0905638b Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Thu, 20 Oct 2011 23:11:13 +0000 Subject: [PATCH 257/970] * 32-bit Flash player updated. svn path=/nixpkgs/trunk/; revision=29951 --- .../browsers/mozilla-plugins/flashplayer-10/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/browsers/mozilla-plugins/flashplayer-10/default.nix b/pkgs/applications/networking/browsers/mozilla-plugins/flashplayer-10/default.nix index 6cdd175573d..ad6867ab5be 100644 --- a/pkgs/applications/networking/browsers/mozilla-plugins/flashplayer-10/default.nix +++ b/pkgs/applications/networking/browsers/mozilla-plugins/flashplayer-10/default.nix @@ -53,9 +53,9 @@ let url = http://download.macromedia.com/pub/labs/flashplayer10/flashplayer_square_p2_32bit_debug_linux_092710.tar.gz; sha256 = "11w3mxa39l4mnlsqzlwbdh1sald549afyqbx2kbid7in5qzamlcc"; } else { - version = "10.3.183.7"; + version = "10.3.183.10"; url = http://fpdownload.macromedia.com/get/flashplayer/current/install_flash_player_10_linux.tar.gz; - sha256 = "166ipldmd03psy68xxirmdd4p591vjnffpv2l97yg1bbkn5h2pj6"; + sha256 = "0fj51dg0aa813b44yn8dvmmvw4qwi8vbi0x8n1bcqrcld3sbpmfz"; } else throw "Flash Player is not supported on this platform"; From 6ddae753dcab1d30d31126c96ab6e13d3f07607f Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Fri, 21 Oct 2011 00:43:56 +0000 Subject: [PATCH 258/970] * Added regionset, a tool for changing the region code setting of DVD players. svn path=/nixpkgs/trunk/; revision=29952 --- pkgs/os-specific/linux/regionset/default.nix | 18 ++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 20 insertions(+) create mode 100644 pkgs/os-specific/linux/regionset/default.nix diff --git a/pkgs/os-specific/linux/regionset/default.nix b/pkgs/os-specific/linux/regionset/default.nix new file mode 100644 index 00000000000..699c4cd82b8 --- /dev/null +++ b/pkgs/os-specific/linux/regionset/default.nix @@ -0,0 +1,18 @@ +{ stdenv, fetchurl }: + +stdenv.mkDerivation { + name = "regionset-20030629"; + + src = fetchurl { + url = "mirror://sourceforge/dvd/regionset.tar.gz"; + sha256 = "0ssr7s0g60kq04y8v60rh2fzn9wp93al3v4rl0ybza1skild9v70"; + }; + + installPhase = "mkdir -p $out/sbin; cp regionset $out/sbin"; + + meta = { + homepage = http://dvd.sourceforge.net/; + descriptions = "Tool for changing the region code setting of DVD players"; + platforms = stdenv.lib.platforms.linux; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 7d5fe94b196..b5412d68f89 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -5956,6 +5956,8 @@ let radeonR600 = callPackage ../os-specific/linux/firmware/radeon-r600 { }; radeonJuniper = callPackage ../os-specific/linux/firmware/radeon-juniper { }; + regionset = callPackage ../os-specific/linux/regionset { }; + rfkill = callPackage ../os-specific/linux/rfkill { }; rt2860fw = callPackage ../os-specific/linux/firmware/rt2860 { }; From 572b54cb9cffc76ae520cce41412ec35c7fd67b1 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Fri, 21 Oct 2011 02:26:26 +0000 Subject: [PATCH 259/970] * Spotify updated to the latest version. svn path=/nixpkgs/trunk/; revision=29953 --- pkgs/applications/audio/spotify/default.nix | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/applications/audio/spotify/default.nix b/pkgs/applications/audio/spotify/default.nix index 3a15d32aa7f..38eb51b93db 100644 --- a/pkgs/applications/audio/spotify/default.nix +++ b/pkgs/applications/audio/spotify/default.nix @@ -2,7 +2,7 @@ assert stdenv.system == "i686-linux" || stdenv.system == "x86_64-linux"; -let version = "0.6.1.309"; in +let version = "0.6.2.291"; in stdenv.mkDerivation { name = "spotify-${version}"; @@ -10,13 +10,13 @@ stdenv.mkDerivation { src = if stdenv.system == "i686-linux" then fetchurl { - url = "http://repository.spotify.com/pool/non-free/s/spotify/spotify-client-qt_${version}.gb871a7d-1_i386.deb"; - sha256 = "01bavmv78vd3lxsinbls72v2sj8czbcwzdg6sc2f9yd5g7snb3im"; + url = "http://repository.spotify.com/pool/non-free/s/spotify/spotify-client-qt_${version}.gcccc1f5.116-1_i386.deb"; + sha256 = "164ka9xry9nbnv77w71kzi7bjidlmccw8wnn4fyzavi8pbrpmj08"; } else if stdenv.system == "x86_64-linux" then fetchurl { - url = "http://repository.spotify.com/pool/non-free/s/spotify/spotify-client-qt_${version}.gb871a7d-1_amd64.deb"; - sha256 = "13ki1pcpna7f5sxf1j2axww95c4kqhj0r1d11y98mfvzxxjqimjs"; + url = "http://repository.spotify.com/pool/non-free/s/spotify/spotify-client-qt_${version}.gcccc1f5.116-1_amd64.deb"; + sha256 = "08snnpqd5ldiqv98pwx3fjrhdlwp4arbgda9xnsy92wfk0s85lv8"; } else throw "Spotify not supported on this platform."; From 11d18ba4fd2aae30cdfe380dbce4e432092fa153 Mon Sep 17 00:00:00 2001 From: Marco Maggesi Date: Fri, 21 Oct 2011 14:12:46 +0000 Subject: [PATCH 260/970] Update fossil to version 1.20 svn path=/nixpkgs/trunk/; revision=29954 --- pkgs/applications/version-management/fossil/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/version-management/fossil/default.nix b/pkgs/applications/version-management/fossil/default.nix index 6bf401b895a..01d61165af5 100644 --- a/pkgs/applications/version-management/fossil/default.nix +++ b/pkgs/applications/version-management/fossil/default.nix @@ -1,8 +1,8 @@ {stdenv, fetchurl, zlib, openssl, tcl}: let - version = "1.19"; - filedate = "20110901182519"; + version = "1.20"; + filedate = "20111021125253"; in stdenv.mkDerivation { @@ -10,7 +10,7 @@ stdenv.mkDerivation { src = fetchurl { url = "http://www.fossil-scm.org/download/fossil-src-${filedate}.tar.gz"; - sha256 = "14snmwjfl9xz52d8lfzsp4zciwfbi9fwk623bm5dxhn2fczzc960"; + sha256 = "1qislpc003ydz22ix27k01j975qw745wwjj5x82zd39412mlzycg"; }; buildInputs = [ zlib openssl ]; From 5e51aadc10b41e7dcca7150530ddb11f65fcf2bb Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Fri, 21 Oct 2011 14:43:18 +0000 Subject: [PATCH 261/970] * Fix evaluation errors. svn path=/nixpkgs/trunk/; revision=29955 --- .../graphics/darktable/default.nix | 25 +++++++++++-------- pkgs/development/compilers/llvm/clang.nix | 2 ++ pkgs/development/libraries/yajl/default.nix | 6 ++--- pkgs/top-level/all-packages.nix | 5 +--- 4 files changed, 19 insertions(+), 19 deletions(-) diff --git a/pkgs/applications/graphics/darktable/default.nix b/pkgs/applications/graphics/darktable/default.nix index c0ebb95a67a..b0452bba115 100644 --- a/pkgs/applications/graphics/darktable/default.nix +++ b/pkgs/applications/graphics/darktable/default.nix @@ -1,9 +1,11 @@ -{ stdenv, fetchurl, - GConf, atk, cairo, cmake, curl, dbus_glib, exiv2, glib, - gnome_keyring, gphoto2, gtk, ilmbase, intltool, lcms, lcms2, - lensfun, libXau, libXdmcp, libexif, libglade, libgphoto2, libjpeg, - libpng, libpthreadstubs, libraw1394, librsvg, libtiff, libxcb, - openexr, pixman, pkgconfig, sqlite}: +{ stdenv, fetchurl +, GConf, atk, cairo, cmake, curl, dbus_glib, exiv2, glib +, gnome_keyring, gphoto2, gtk, ilmbase, intltool, lcms, lcms2 +, lensfun, libXau, libXdmcp, libexif, libglade, libgphoto2, libjpeg +, libpng, libpthreadstubs, libraw1394, librsvg, libtiff, libxcb +, openexr, pixman, pkgconfig, sqlite }: + +assert stdenv ? glibc; stdenv.mkDerivation rec { version = "0.9.1"; @@ -14,11 +16,12 @@ stdenv.mkDerivation rec { sha256 = "b687a5f1b2a6c8aa230c1dc3ef83bf74a103e3ebe1c61cdea95a612a7375f21e"; }; - buildInputs = [ - GConf atk cairo cmake curl dbus_glib exiv2 glib gnome_keyring gtk - ilmbase intltool lcms lcms2 lensfun libXau libXdmcp libexif - libglade libgphoto2 libjpeg libpng libpthreadstubs libraw1394 - librsvg libtiff libxcb openexr pixman pkgconfig sqlite]; + buildInputs = + [ GConf atk cairo cmake curl dbus_glib exiv2 glib gnome_keyring gtk + ilmbase intltool lcms lcms2 lensfun libXau libXdmcp libexif + libglade libgphoto2 libjpeg libpng libpthreadstubs libraw1394 + librsvg libtiff libxcb openexr pixman pkgconfig sqlite + ]; preConfigure = '' export NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE -I${gtk}/include/gtk-2.0" diff --git a/pkgs/development/compilers/llvm/clang.nix b/pkgs/development/compilers/llvm/clang.nix index 7c177544725..38da51b9c27 100644 --- a/pkgs/development/compilers/llvm/clang.nix +++ b/pkgs/development/compilers/llvm/clang.nix @@ -1,5 +1,7 @@ { stdenv, fetchurl, perl, groff, llvm }: +assert stdenv.isLinux; + let version = "2.9"; in stdenv.mkDerivation { diff --git a/pkgs/development/libraries/yajl/default.nix b/pkgs/development/libraries/yajl/default.nix index 573f3853869..221344b9125 100644 --- a/pkgs/development/libraries/yajl/default.nix +++ b/pkgs/development/libraries/yajl/default.nix @@ -20,9 +20,7 @@ stdenv.mkDerivation { ''; homepage = http://lloyd.github.com/yajl/; license = stdenv.lib.licenses.isc; - platforms = with stdenv.lib.platforms; [ linux darwin ]; - maintainers = with stdenv.lib.maintainers; [ - z77z - ]; + platforms = with stdenv.lib.platforms; linux ++ darwin; + maintainers = with stdenv.lib.maintainers; [ z77z ]; }; } diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index b5412d68f89..9a9ecf40731 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -1663,10 +1663,7 @@ let cmucl_binary = callPackage ../development/compilers/cmucl/binary.nix { }; dylan = callPackage ../development/compilers/gwydion-dylan { - dylan = - import ../development/compilers/gwydion-dylan/binary.nix { - inherit fetchurl stdenv; - }; + dylan = callPackage ../development/compilers/gwydion-dylan/binary.nix { }; }; ecl = callPackage ../development/compilers/ecl { }; From cac34d2be5a95da37d70e612cd259fac647c87e1 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Fri, 21 Oct 2011 15:01:40 +0000 Subject: [PATCH 262/970] * Applied a patch to get Euca2ools / Boto to work on Python 2.7. svn path=/nixpkgs/trunk/; revision=29956 --- .../python-modules/boto-1.9-python-2.7.patch | 19 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 ++ 2 files changed, 21 insertions(+) create mode 100644 pkgs/development/python-modules/boto-1.9-python-2.7.patch diff --git a/pkgs/development/python-modules/boto-1.9-python-2.7.patch b/pkgs/development/python-modules/boto-1.9-python-2.7.patch new file mode 100644 index 00000000000..79ff9a7e4af --- /dev/null +++ b/pkgs/development/python-modules/boto-1.9-python-2.7.patch @@ -0,0 +1,19 @@ +Fix Boto 1.9 on Python 2.7. + +https://github.com/boto/boto/commit/6760075073c34d6dddb7e13b80dfa8d09f0f4f79 + +diff --git a/boto/connection.py b/boto/connection.py +index c5779e2..71942f1 100644 +--- a/boto/connection.py ++++ b/boto/connection.py +@@ -252,8 +252,9 @@ class AWSAuthConnection(object): + # versions, it would append ":443" to the hostname sent + # in the Host header and so we needed to make sure we + # did the same when calculating the V2 signature. In 2.6 ++ # (and higher!) + # it no longer does that. Hence, this kludge. +- if sys.version[:3] == "2.6" and port == 443: ++ if sys.version[:3] in ('2.6', '2.7') and port == 443: + signature_host = self.host + else: + signature_host = '%s:%d' % (self.host, port) diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 2ca2e261a17..3c1622847be 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -156,6 +156,8 @@ let pythonPackages = python.modules // rec { sha1 = "00a033b0a593c3ca82927867950f73d88b831155"; }; + patches = [ ../development/python-modules/boto-1.9-python-2.7.patch ]; + meta = { homepage = http://code.google.com/p/boto/; From 75c3c1418dbc2c94885db10cffb076dd55af3518 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Fri, 21 Oct 2011 16:10:07 +0000 Subject: [PATCH 263/970] * Fix powerpc-linux evaluation (does anybody care?). svn path=/nixpkgs/trunk/; revision=29958 --- pkgs/development/compilers/llvm/clang.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/compilers/llvm/clang.nix b/pkgs/development/compilers/llvm/clang.nix index 38da51b9c27..78b3219a328 100644 --- a/pkgs/development/compilers/llvm/clang.nix +++ b/pkgs/development/compilers/llvm/clang.nix @@ -1,6 +1,6 @@ { stdenv, fetchurl, perl, groff, llvm }: -assert stdenv.isLinux; +assert stdenv.isLinux && stdenv.gcc.gcc != null; let version = "2.9"; in From 7d2a905c821b2140dcfc713cdc943556f8d87d25 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Fri, 21 Oct 2011 16:13:49 +0000 Subject: [PATCH 264/970] haskell-crypto-api: updated to version 0.8 svn path=/nixpkgs/trunk/; revision=29959 --- .../libraries/haskell/crypto-api/{0.7.nix => 0.8.nix} | 4 ++-- pkgs/top-level/haskell-packages.nix | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) rename pkgs/development/libraries/haskell/crypto-api/{0.7.nix => 0.8.nix} (85%) diff --git a/pkgs/development/libraries/haskell/crypto-api/0.7.nix b/pkgs/development/libraries/haskell/crypto-api/0.8.nix similarity index 85% rename from pkgs/development/libraries/haskell/crypto-api/0.7.nix rename to pkgs/development/libraries/haskell/crypto-api/0.8.nix index 644edbf1961..66204112c16 100644 --- a/pkgs/development/libraries/haskell/crypto-api/0.7.nix +++ b/pkgs/development/libraries/haskell/crypto-api/0.8.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "crypto-api"; - version = "0.7"; - sha256 = "0831rmkq603ga9py5xxfw77qixdliyh15dxh9ls7rd7ia6sqjvx0"; + version = "0.8"; + sha256 = "1fwkafb9v2348vr1a4xnlmkgs4kh85az4f3wnrl9cbqwxf3cc328"; buildDepends = [ cereal entropy largeword tagged ]; meta = { homepage = "http://trac.haskell.org/crypto-api/wiki"; diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix index c0a88e9048c..a3522040035 100644 --- a/pkgs/top-level/haskell-packages.nix +++ b/pkgs/top-level/haskell-packages.nix @@ -495,7 +495,7 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y); Crypto = callPackage ../development/libraries/haskell/Crypto {}; cryptoApi_0_6_4 = callPackage ../development/libraries/haskell/crypto-api/0.6.4.nix {}; - cryptoApi_0_7 = callPackage ../development/libraries/haskell/crypto-api/0.7.nix {}; + cryptoApi_0_8 = callPackage ../development/libraries/haskell/crypto-api/0.8.nix {}; cryptoApi = self.cryptoApi_0_6_4; cryptocipher = callPackage ../development/libraries/haskell/cryptocipher {}; From bba184d3753e5353a159ab9d05f984b4ed603fa8 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Fri, 21 Oct 2011 16:13:56 +0000 Subject: [PATCH 265/970] haskell-ConfigFile: updated to version 1.1.0 svn path=/nixpkgs/trunk/; revision=29960 --- pkgs/development/libraries/haskell/ConfigFile/default.nix | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/ConfigFile/default.nix b/pkgs/development/libraries/haskell/ConfigFile/default.nix index 378d1e2cd37..d7a5a674bb6 100644 --- a/pkgs/development/libraries/haskell/ConfigFile/default.nix +++ b/pkgs/development/libraries/haskell/ConfigFile/default.nix @@ -2,11 +2,12 @@ cabal.mkDerivation (self: { pname = "ConfigFile"; - version = "1.0.6"; - sha256 = "339722184b86d53d8b361933e572b6e1478824c7eba3fb66b67d0eb5245cd038"; + version = "1.1.0"; + sha256 = "0m5p56if711qi69lxw78746sb0jr5gqbmip5hdbb7lk4z5drgvhc"; isLibrary = true; isExecutable = true; buildDepends = [ MissingH mtl parsec ]; + noHaddock = true; meta = { homepage = "http://software.complete.org/configfile"; description = "Configuration file reading & writing"; From b1dde142213552693d260dbf7dc9b1c4de22b56a Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Fri, 21 Oct 2011 16:14:00 +0000 Subject: [PATCH 266/970] haskell-NanoProlog: updated to version 0.2.3.3 svn path=/nixpkgs/trunk/; revision=29961 --- pkgs/development/libraries/haskell/NanoProlog/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/NanoProlog/default.nix b/pkgs/development/libraries/haskell/NanoProlog/default.nix index 8daa9d2f815..85f5a1d9e6e 100644 --- a/pkgs/development/libraries/haskell/NanoProlog/default.nix +++ b/pkgs/development/libraries/haskell/NanoProlog/default.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "NanoProlog"; - version = "0.2.3.1"; - sha256 = "1pyvf1vmq61nhjg09416ap37c07lavrrgj2m9wx9dkyvhipzlxjv"; + version = "0.2.3.3"; + sha256 = "0008xpahqbs2djchlw1bslhqqhbc0n7ql7pqm4g7lh8xd3ampxba"; isLibrary = true; isExecutable = true; buildDepends = [ ListLike uuParsinglib ]; From 9704af30c37895a44dde127ea13a8d01e66f1aed Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Fri, 21 Oct 2011 16:25:27 +0000 Subject: [PATCH 267/970] * Latest EC2 AMI tools. svn path=/nixpkgs/trunk/; revision=29963 --- pkgs/tools/virtualization/amazon-ec2-ami-tools/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/virtualization/amazon-ec2-ami-tools/default.nix b/pkgs/tools/virtualization/amazon-ec2-ami-tools/default.nix index d0ab00057f5..f6f32a7c5b7 100644 --- a/pkgs/tools/virtualization/amazon-ec2-ami-tools/default.nix +++ b/pkgs/tools/virtualization/amazon-ec2-ami-tools/default.nix @@ -1,13 +1,13 @@ { stdenv, fetchurl, unzip, ruby, openssl, makeWrapper }: stdenv.mkDerivation { - name = "ec2-ami-tools-1.3-53773"; + name = "ec2-ami-tools-1.4.0.1"; buildInputs = [ unzip makeWrapper ]; src = fetchurl { url = http://s3.amazonaws.com/ec2-downloads/ec2-ami-tools.zip; - sha256 = "310e3b405c11b979b1cd210c5b4c32e97065d616f6bfa449c4e1e50420ce8002"; + sha256 = "1fjg3gx5k0z8r4apg5whz3yxc3xnz7z5g6j93hf765lfriz1rccz"; }; # Amazon EC2 requires that disk images are writable. If they're @@ -31,7 +31,7 @@ stdenv.mkDerivation { done sed -i 's|/bin/bash|${stdenv.shell}|' $out/lib/ec2/platform/base/pipeline.rb - ''; + ''; # */ meta = { homepage = http://developer.amazonwebservices.com/connect/entry.jspa?externalID=368&categoryID=88; From e98852cefda2b8428998fb14a485bc5d3df9ecee Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Fri, 21 Oct 2011 16:34:38 +0000 Subject: [PATCH 268/970] git-annex: updated to version 3.20111011 svn path=/nixpkgs/trunk/; revision=29964 --- .../applications/version-management/git-and-tools/default.nix | 3 +-- .../version-management/git-and-tools/git-annex/default.nix | 4 ++-- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/pkgs/applications/version-management/git-and-tools/default.nix b/pkgs/applications/version-management/git-and-tools/default.nix index 7513a7adbc7..153ff2f03e9 100644 --- a/pkgs/applications/version-management/git-and-tools/default.nix +++ b/pkgs/applications/version-management/git-and-tools/default.nix @@ -48,8 +48,7 @@ rec { gitAnnex = lib.makeOverridable (import ./git-annex) { inherit stdenv fetchurl libuuid rsync findutils curl perl git ikiwiki which; inherit (haskellPackages) ghc MissingH utf8String pcreLight SHA dataenc - HTTP testpack monadControl hS3 mtl network hslogger hxt json; - QuickCheck2 = haskellPackages.QuickCheck_2_4_0_1; + HTTP testpack monadControl hS3 mtl network hslogger hxt json QuickCheck2; }; qgit = import ./qgit { diff --git a/pkgs/applications/version-management/git-and-tools/git-annex/default.nix b/pkgs/applications/version-management/git-and-tools/git-annex/default.nix index 848214b0fb9..5fdf9f43bb1 100644 --- a/pkgs/applications/version-management/git-and-tools/git-annex/default.nix +++ b/pkgs/applications/version-management/git-and-tools/git-annex/default.nix @@ -4,14 +4,14 @@ }: let - version = "3.20110915"; + version = "3.20111011"; in stdenv.mkDerivation { name = "git-annex-${version}"; src = fetchurl { url = "http://ftp.de.debian.org/debian/pool/main/g/git-annex/git-annex_${version}.tar.gz"; - sha256 = "d16c305c82b151ef6ce0c5cfa52a119240b66e02424aefc15a1f67392f976d47"; + sha256 = "6bfd8ff6784d309bc20aaae38b0edd8f71ed44255b584093a881153d8a70c01c"; }; buildInputs = [ From 9016346fbda7caf443cd91ae37d3e31dd30cddff Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Fri, 21 Oct 2011 16:50:36 +0000 Subject: [PATCH 269/970] git: updated to version 1.7.7 svn path=/nixpkgs/trunk/; revision=29965 --- .../version-management/git-and-tools/git/default.nix | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/applications/version-management/git-and-tools/git/default.nix b/pkgs/applications/version-management/git-and-tools/git/default.nix index 1491b6f7417..eb5daae67e2 100644 --- a/pkgs/applications/version-management/git-and-tools/git/default.nix +++ b/pkgs/applications/version-management/git-and-tools/git/default.nix @@ -8,15 +8,15 @@ }: let + version = "1.7.7"; svn = subversionClient.override { perlBindings = true; }; in - -stdenv.mkDerivation rec { - name = "git-1.7.6"; +stdenv.mkDerivation { + name = "git-${version}"; src = fetchurl { - url = "mirror://kernel/software/scm/git/${name}.tar.bz2"; - sha256 = "778795cece63cd758192378f3a999870cea290181b3a4c9de573c77192561082"; + url = "http://git-core.googlecode.com/files/git-${version}.tar.gz"; + sha256 = "1xkpyd6mff4m8kmk4vkwi7snr2ff2nmrmsa5hf9bk2a93v07p5ss"; }; patches = [ ./docbook2texi.patch ]; From 68198ed18d895a19807e2c6d85f424c6d7fe5e95 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Fri, 21 Oct 2011 17:00:03 +0000 Subject: [PATCH 270/970] smartmontools: updated to version 5.42 svn path=/nixpkgs/trunk/; revision=29966 --- pkgs/tools/system/smartmontools/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/system/smartmontools/default.nix b/pkgs/tools/system/smartmontools/default.nix index 140e0008ed8..154f6acc09b 100644 --- a/pkgs/tools/system/smartmontools/default.nix +++ b/pkgs/tools/system/smartmontools/default.nix @@ -1,14 +1,14 @@ {stdenv, fetchurl}: let - name = "smartmontools-5.41"; + name = "smartmontools-5.42"; in stdenv.mkDerivation { inherit name; src = fetchurl { url = "mirror://sourceforge/smartmontools/${name}.tar.gz"; - sha256 = "173eb14e3253a30230f38c7e684085bcae7fa021efff58bdf94c2702ac76fa32"; + sha256 = "b664d11e814e114ce3a32a4fa918c9e649c684e2897c007b2a8b92574decc374"; }; meta = { From 87a251aea5288c6a0035c8973643a4512484d489 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Fri, 21 Oct 2011 19:30:32 +0000 Subject: [PATCH 271/970] * Samba 3.6.1. svn path=/nixpkgs/trunk/; revision=29967 --- pkgs/servers/samba/default.nix | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/pkgs/servers/samba/default.nix b/pkgs/servers/samba/default.nix index c76c52e5fcc..280122a9d00 100644 --- a/pkgs/servers/samba/default.nix +++ b/pkgs/servers/samba/default.nix @@ -21,11 +21,11 @@ let in stdenv.mkDerivation rec { - name = "samba-3.6.0"; + name = "samba-3.6.1"; src = fetchurl { url = "http://us3.samba.org/samba/ftp/stable/${name}.tar.gz"; - sha256 = "0gzm09l75i95iibcxykc2h2m9haqx70jp1bpis1mhmvqwillbhg1"; + sha256 = "0r6mbghja357xhpada5djg0gpczi50f18ap53hdn8b7y0amz5c65"; }; buildInputs = [ readline pam openldap popt iniparser libunwind fam acl cups ] @@ -37,7 +37,6 @@ stdenv.mkDerivation rec { configureFlags = '' --with-pam - --with-cifsmount --with-aio-support --with-pam_smbpass --disable-swat From 9667d5ec5acc10ca20c3a560a8d290f7b9186bbf Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Fri, 21 Oct 2011 23:36:48 +0000 Subject: [PATCH 272/970] * Samba: Apply a patch that fixes readlink() on symlinks that point outside of the share. This is necessary for EC2 image generation (and similar actions). Many thanks to Jeremy Allison to fixing this very quickly. (https://bugzilla.samba.org/show_bug.cgi?id=8541) svn path=/nixpkgs/trunk/; revision=29969 --- pkgs/servers/samba/default.nix | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/pkgs/servers/samba/default.nix b/pkgs/servers/samba/default.nix index 280122a9d00..9cb27b23faa 100644 --- a/pkgs/servers/samba/default.nix +++ b/pkgs/servers/samba/default.nix @@ -28,6 +28,14 @@ stdenv.mkDerivation rec { sha256 = "0r6mbghja357xhpada5djg0gpczi50f18ap53hdn8b7y0amz5c65"; }; + patches = + [ # Fix for https://bugzilla.samba.org/show_bug.cgi?id=8541. + (fetchurl { + url = https://attachments.samba.org/attachment.cgi?id=7018; + sha256 = "1fmq0dx7r09pf6gdw1bcigmnx36yb80xcrh7jv0yv9m1w8m3l2w9"; + }) + ]; + buildInputs = [ readline pam openldap popt iniparser libunwind fam acl cups ] ++ stdenv.lib.optional useKerberos kerberos; From d91165c3688016634c578b3b29802f32f5527760 Mon Sep 17 00:00:00 2001 From: Cillian de Roiste Date: Sat, 22 Oct 2011 00:01:26 +0000 Subject: [PATCH 273/970] Updating Inkscape to 0.48.2 svn path=/nixpkgs/trunk/; revision=29971 --- pkgs/applications/graphics/inkscape/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/graphics/inkscape/default.nix b/pkgs/applications/graphics/inkscape/default.nix index 0da9bf0b41c..19a2346802c 100644 --- a/pkgs/applications/graphics/inkscape/default.nix +++ b/pkgs/applications/graphics/inkscape/default.nix @@ -4,14 +4,14 @@ , gsl, python, pyxml, lxml, poppler }: stdenv.mkDerivation rec { - name = "inkscape-0.48.1"; + name = "inkscape-0.48.2"; src = fetchurl { url = "mirror://sourceforge/inkscape/${name}.tar.bz2"; - sha256 = "11mvwil787pj3kx3qvjqvd6z5hlk40i6g95g4vs52hrp2ifs9ga4"; + sha256 = "10v7ixdz7f8vgk2wv0m81zli9p0f446cm1f4aqlvni1ndsx44fi2"; }; - patches = [ ./configure-python-libs.patch ]; + patches = [ ./configure-python-libs.patch ]; propagatedBuildInputs = [ # Python is used at run-time to execute scripts, e.g., those from From 87bf6373198112dcddbb1dda5de785ff26168f1e Mon Sep 17 00:00:00 2001 From: Nicolas Pierron Date: Sat, 22 Oct 2011 15:41:20 +0000 Subject: [PATCH 274/970] Mercurial: Give access to ssl and curses python packages for fast-export and crecord. svn path=/nixpkgs/trunk/; revision=29972 --- .../version-management/git-and-tools/default.nix | 5 ++--- .../git-and-tools/fast-export/default.nix | 15 ++++++++------- .../version-management/mercurial/default.nix | 9 +++++---- pkgs/top-level/all-packages.nix | 6 +++++- 4 files changed, 20 insertions(+), 15 deletions(-) diff --git a/pkgs/applications/version-management/git-and-tools/default.nix b/pkgs/applications/version-management/git-and-tools/default.nix index 153ff2f03e9..6319c3592c6 100644 --- a/pkgs/applications/version-management/git-and-tools/default.nix +++ b/pkgs/applications/version-management/git-and-tools/default.nix @@ -3,7 +3,7 @@ */ args: with args; with pkgs; let - inherit (pkgs) stdenv fetchurl subversion; + inherit (pkgs) stdenv fetchgit fetchurl subversion; in rec { @@ -91,8 +91,7 @@ rec { }; gitFastExport = import ./fast-export { - inherit fetchurl sourceFromHead stdenv mercurial coreutils git makeWrapper - subversion; + inherit fetchgit stdenv mercurial coreutils git makeWrapper subversion; }; git2cl = import ./git2cl { diff --git a/pkgs/applications/version-management/git-and-tools/fast-export/default.nix b/pkgs/applications/version-management/git-and-tools/fast-export/default.nix index ef633d87ca6..45860362433 100644 --- a/pkgs/applications/version-management/git-and-tools/fast-export/default.nix +++ b/pkgs/applications/version-management/git-and-tools/fast-export/default.nix @@ -1,13 +1,14 @@ -args: with args; +{stdenv, fetchgit, mercurial, coreutils, git, makeWrapper, subversion}: + stdenv.mkDerivation { name = "fast-export"; - # REGION AUTO UPDATE: { name="git_fast_export"; type = "git"; url="git://repo.or.cz/hg2git.git"; } - src = sourceFromHead "git_fast_export-1464dabbff7fe42b9069e98869db40276d295ad6.tar.gz" - (fetchurl { url = "http://mawercer.de/~nix/repos/git_fast_export-1464dabbff7fe42b9069e98869db40276d295ad6.tar.gz"; sha256 = "c65b8607836794b250f5faeef5ec1bcbf40f0bfaeb39ccb600966deb6a40d755"; }); - # END + src = fetchgit { + url = "git://repo.or.cz/fast-export.git"; + rev = "refs/heads/master"; + }; - buildInputs =([mercurial.python mercurial makeWrapper subversion]); + buildInputs = [mercurial.python mercurial makeWrapper subversion]; buildPhase="true"; # skip svn for now @@ -24,7 +25,7 @@ stdenv.mkDerivation { mv *.py $l for p in $out/bin/*.sh; do wrapProgram $p \ - --set PYTHONPATH "$(echo ${mercurial}/lib/python*/site-packages)" \ + --prefix PYTHONPATH : "$(echo ${mercurial}/lib/python*/site-packages):$(echo ${mercurial.python}/lib/python*/site-packages)${stdenv.lib.concatMapStrings (x: ":$(echo ${x}/lib/python*/site-packages)") mercurial.pythonPackages}" \ --prefix PATH : "$(dirname $(type -p python))":$l done ''; diff --git a/pkgs/applications/version-management/mercurial/default.nix b/pkgs/applications/version-management/mercurial/default.nix index eca4dfea17e..e263d7556c0 100644 --- a/pkgs/applications/version-management/mercurial/default.nix +++ b/pkgs/applications/version-management/mercurial/default.nix @@ -1,15 +1,16 @@ { stdenv, fetchurl, python, makeWrapper, docutils -, guiSupport ? false, tk ? null, ssl }: +, guiSupport ? false, tk ? null, ssl, curses }: stdenv.mkDerivation rec { - name = "mercurial-1.9"; + name = "mercurial-1.9.2"; src = fetchurl { url = "http://mercurial.selenic.com/release/${name}.tar.gz"; - sha256 = "1q1307rv5cyv7qalwkampy1h2f92j4d46v4x9647ljljs8f4n7ki"; + sha256 = "481309264d8528a871aab013068c48fa3a6072b016a4095a22230cfdfb8bb9aa"; }; inherit python; # pass it so that the same version can be used in hg2git + pythonPackages = [ ssl curses ]; buildInputs = [ python makeWrapper docutils ]; @@ -31,7 +32,7 @@ stdenv.mkDerivation rec { '' for i in $(cd $out/bin && ls); do wrapProgram $out/bin/$i \ - --prefix PYTHONPATH : "$(toPythonPath "$out ${ssl}")" \ + --prefix PYTHONPATH : "$(toPythonPath "$out ${ssl} ${curses}")" \ $WRAP_TK done diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 9a9ecf40731..40e514b7693 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -7025,7 +7025,11 @@ let mercurial = callPackage ../applications/version-management/mercurial { guiSupport = getConfig ["mercurial" "guiSupport"] false; # for hgk (gitk gui for hg) - inherit (pythonPackages) ssl; + inherit (pythonPackages) ssl curses; + # when used with hg-fast-export (git) mercurials files are using + # httplib.FakeSocket which is not provided after python 2.6. (httplib2 + # has removed it from its interface). + python = python27; }; merkaartor = callPackage ../applications/misc/merkaartor { }; From 2dcd1544dd18fd6420955b484ca33142bb73006e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= Date: Sat, 22 Oct 2011 16:21:07 +0000 Subject: [PATCH 275/970] GNU Guile 2.0.3! svn path=/nixpkgs/trunk/; revision=29973 --- pkgs/development/interpreters/guile/default.nix | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/pkgs/development/interpreters/guile/default.nix b/pkgs/development/interpreters/guile/default.nix index be8d238a97c..33349605736 100644 --- a/pkgs/development/interpreters/guile/default.nix +++ b/pkgs/development/interpreters/guile/default.nix @@ -1,4 +1,4 @@ -{ fetchurl, stdenv, libtool, readline, gmp, pkgconfig, boehmgc, libunistring +{ fetchurl, stdenv, xz, libtool, readline, gmp, pkgconfig, boehmgc, libunistring , libffi, gawk, makeWrapper, coverageAnalysis ? null }: # Do either a coverage analysis build or a standard build. @@ -7,13 +7,14 @@ else stdenv.mkDerivation) rec { - name = "guile-2.0.2"; + name = "guile-2.0.3"; src = fetchurl { - url = "mirror://gnu/guile/${name}.tar.gz"; - sha256 = "0adiwydwb285bb7mcakfdzjgyv24lrm7pk2grgxzi66kidpm6dhx"; + url = "mirror://gnu/guile/${name}.tar.xz"; + sha256 = "14rhlpxxa4v5y3gl992l7lnd5qnqawx0a84idnwq0w2qviwcvsyj"; }; + buildNativeInputs = [ xz ]; buildInputs = [ makeWrapper gawk readline libtool libunistring libffi pkgconfig From 22ff0a19c324681075fa1eb8415f0adf04a1f30b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?= Date: Sat, 22 Oct 2011 20:41:37 +0000 Subject: [PATCH 276/970] Updating the fossil tarball hash, due to an update upstream: http://www.mail-archive.com/fossil-users@lists.fossil-scm.org/msg06730.html I also add readline (it may provide a nicer prompt on fossil sqlite) and sqlite (required for some tests). The old tarballs were broken in a way that the tests requiring sqlite were not run. svn path=/nixpkgs/trunk/; revision=29974 --- pkgs/applications/version-management/fossil/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/version-management/fossil/default.nix b/pkgs/applications/version-management/fossil/default.nix index 01d61165af5..29aa9843fbe 100644 --- a/pkgs/applications/version-management/fossil/default.nix +++ b/pkgs/applications/version-management/fossil/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchurl, zlib, openssl, tcl}: +{stdenv, fetchurl, zlib, openssl, tcl, readline, sqlite}: let version = "1.20"; @@ -10,10 +10,10 @@ stdenv.mkDerivation { src = fetchurl { url = "http://www.fossil-scm.org/download/fossil-src-${filedate}.tar.gz"; - sha256 = "1qislpc003ydz22ix27k01j975qw745wwjj5x82zd39412mlzycg"; + sha256 = "0m75kw77iray3kbjm1xfn8hr116fn11yv1wr7adcwy314cgj0vv3"; }; - buildInputs = [ zlib openssl ]; + buildInputs = [ zlib openssl readline sqlite ]; buildNativeInputs = [ tcl ]; doCheck = true; From c10a1a50b81d95a0851dba9730e2983c56eca7e9 Mon Sep 17 00:00:00 2001 From: Alexander Tsamutali Date: Sat, 22 Oct 2011 21:04:29 +0000 Subject: [PATCH 277/970] games/alienarena: New nixbuild. svn path=/nixpkgs/trunk/; revision=29975 --- pkgs/games/alienarena/default.nix | 32 +++++++++++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 34 insertions(+) create mode 100644 pkgs/games/alienarena/default.nix diff --git a/pkgs/games/alienarena/default.nix b/pkgs/games/alienarena/default.nix new file mode 100644 index 00000000000..aa7d2f1e914 --- /dev/null +++ b/pkgs/games/alienarena/default.nix @@ -0,0 +1,32 @@ +{ stdenv, fetchurl, pkgconfig, libjpeg, libX11, libXxf86vm, curl, libogg +, libvorbis, freetype, openal, mesa }: +stdenv.mkDerivation rec { + name = "alienarena-7.52"; + src = fetchurl { + url = "http://icculus.org/alienarena/Files/alienarena-7_52-linux20110929.tar.gz"; + sha256 = "1s1l3apxsxnd8lyi568y38a1fcdr0gwmc3lkgq2nkc676k4gki3m"; + }; + buildInputs = [ pkgconfig libjpeg libX11 curl libogg libvorbis + freetype openal mesa libXxf86vm ]; + patchPhase = '' + substituteInPlace ./configure \ + --replace libopenal.so.1 ${openal}/lib/libopenal.so.1 + ''; + meta = { + description = "A free, stand-alone first-person shooter computer game"; + longDescription = '' + Do you like old school deathmatch with modern features? How + about rich, colorful, arcade-like atmospheres? How about retro + Sci-Fi? Then you're going to love what Alien Arena has in store + for you! This game combines some of the very best aspects of + such games as Quake III and Unreal Tournament and wraps them up + with a retro alien theme, while adding tons of original ideas to + make the game quite unique. + ''; + homepage = http://red.planetarena.org; + # Engine is under GPLv2, everything else is under + license = [ "unfree-redistributable" ]; + maintainers = with stdenv.lib.maintainers; [ astsmtl ]; + platforms = with stdenv.lib.platforms; linux; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 40e514b7693..9735091c691 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -7681,6 +7681,8 @@ let ### GAMES + alienarena = callPackage ../games/alienarena { }; + asc = callPackage ../games/asc { lua = lua5; libsigcxx = libsigcxx12; From d4a560845d34c313c5eb64bf8bfbbe5563ba28c6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= Date: Sat, 22 Oct 2011 21:55:04 +0000 Subject: [PATCH 278/970] Make `ftp.gnu.org' the first site for GNU stuff. svn path=/nixpkgs/trunk/; revision=29976 --- pkgs/build-support/fetchurl/mirrors.nix | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/pkgs/build-support/fetchurl/mirrors.nix b/pkgs/build-support/fetchurl/mirrors.nix index b8925f89303..f65d7cc7fa5 100644 --- a/pkgs/build-support/fetchurl/mirrors.nix +++ b/pkgs/build-support/fetchurl/mirrors.nix @@ -24,6 +24,9 @@ rec { # GNU (http://www.gnu.org/prep/ftp.html). gnu = [ + # This one is the master repository, and thus it's always up-to-date. + http://ftp.gnu.org/pub/gnu/ + # This one redirects to a (supposedly) nearby and (supposedly) up-to-date # mirror. http://ftpmirror.gnu.org/ @@ -33,8 +36,6 @@ rec { ftp://mirror.cict.fr/gnu/ ftp://ftp.cs.tu-berlin.de/pub/gnu/ ftp://ftp.chg.ru/pub/gnu/ - - http://ftp.gnu.org/pub/gnu/ ]; # GCC. From 5cd2d19bb553de6041c045accdd1cac3880aac93 Mon Sep 17 00:00:00 2001 From: Alexander Tsamutali Date: Sat, 22 Oct 2011 22:12:45 +0000 Subject: [PATCH 279/970] tools/misc/qjoypad: New nixbuild. svn path=/nixpkgs/trunk/; revision=29977 --- pkgs/tools/misc/qjoypad/default.nix | 38 +++++++++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 40 insertions(+) create mode 100644 pkgs/tools/misc/qjoypad/default.nix diff --git a/pkgs/tools/misc/qjoypad/default.nix b/pkgs/tools/misc/qjoypad/default.nix new file mode 100644 index 00000000000..b6c69be2f09 --- /dev/null +++ b/pkgs/tools/misc/qjoypad/default.nix @@ -0,0 +1,38 @@ +{ stdenv, fetchurl, pkgconfig, libX11, libXtst, qt4 }: +stdenv.mkDerivation rec { + name = "qjoypad-4.1.0"; + src = fetchurl { + url = "mirror://sourceforge/qjoypad/${name}.tar.gz"; + sha256 = "1jlm7i26nfp185xrl41kz5z6fgvyj51bjpz48cg27xx64y40iamm"; + }; + buildInputs = [ pkgconfig libX11 libXtst qt4 ]; + patchPhase = '' + cd src + substituteInPlace config --replace /bin/bash /bin/sh + ensureDir $out + export NIX_LDFLAGS="$NIX_LDFLAGS -rpath ${libX11}/lib" + ''; + meta = { + description = "A program that lets you use gaming devices anywhere"; + longDescription = '' + A simple Linux/QT program that lets you use your gaming devices + where you want them: in your games! QJoyPad takes input from a + gamepad or joystick and translates it into key strokes or mouse + actions, letting you control any XWindows program with your game + controller. This lets you play all those games that for some + reason don't have joystick support with your joystick. QJoyPad + also gives you the advantage of multiple saved layouts so you + can have a separate setting for every game, or for every class + of game! That way you can play your games the way you want, not + the way the programmers decided, and you can have the same + button be "fire" in every one of your space fighters. QJoyPad + gives you the freedom and flexibility to really take advantage + of gaming devices in Linux, and makes the Linux gaming + experience just a little bit nicer. + ''; + homepage = http://qjoypad.sourceforge.net; + license = with stdenv.lib.licenses; gpl2; + maintainers = with stdenv.lib.maintainers; [ astsmtl ]; + platforms = with stdenv.lib.platforms; linux; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 9735091c691..d0f919a644e 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -1228,6 +1228,8 @@ let qhull = callPackage ../development/libraries/qhull { }; + qjoypad = callPackage ../tools/misc/qjoypad { }; + qshowdiff = callPackage ../tools/text/qshowdiff { }; radvd = callPackage ../tools/networking/radvd { }; From 11941954d8d7abb1304c995f4e6b55f851d6c375 Mon Sep 17 00:00:00 2001 From: Shea Levy Date: Sun, 23 Oct 2011 15:52:28 +0000 Subject: [PATCH 280/970] Linux 3.0.7 svn path=/nixpkgs/trunk/; revision=29978 --- pkgs/os-specific/linux/kernel/linux-3.0.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/linux-3.0.nix b/pkgs/os-specific/linux/kernel/linux-3.0.nix index 6f1a32e5c0f..d2680db30f1 100644 --- a/pkgs/os-specific/linux/kernel/linux-3.0.nix +++ b/pkgs/os-specific/linux/kernel/linux-3.0.nix @@ -200,7 +200,7 @@ in import ./generic.nix ( rec { - version = "3.0.4"; + version = "3.0.7"; preConfigure = '' substituteInPlace scripts/depmod.sh --replace '-b "$INSTALL_MOD_PATH"' "" @@ -208,7 +208,7 @@ import ./generic.nix ( src = fetchurl { url = "mirror://kernel/linux/kernel/v3.x/linux-${version}.tar.bz2"; - sha256 = "1vypjcdii75h5f4zsw9lm8wzxd5ix0mk5p94c96hxv828mqqkmhk"; + sha256 = "1k7466p2xj3fg2kl5cy9ygd4wnd38wam64ga5nr76cz15ylgg06f"; }; config = configWithPlatform stdenv.platform; From 5e6dbdf3867ad9d55f28aaae4147a8ae2bbfa168 Mon Sep 17 00:00:00 2001 From: Rob Vermaas Date: Mon, 24 Oct 2011 01:03:16 +0000 Subject: [PATCH 281/970] update to gcc 4.4.6 svn path=/nixpkgs/trunk/; revision=29979 --- pkgs/development/compilers/gcc-4.4/default.nix | 2 +- pkgs/development/compilers/gcc-4.4/sources.nix | 14 +++++++------- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/pkgs/development/compilers/gcc-4.4/default.nix b/pkgs/development/compilers/gcc-4.4/default.nix index 6c2897c56c4..fa34364912e 100644 --- a/pkgs/development/compilers/gcc-4.4/default.nix +++ b/pkgs/development/compilers/gcc-4.4/default.nix @@ -33,7 +33,7 @@ assert langVhdl -> gnat != null; with stdenv.lib; -let version = "4.4.3"; +let version = "4.4.6"; javaEcj = fetchurl { # The `$(top_srcdir)/ecj.jar' file is automatically picked up at # `configure' time. diff --git a/pkgs/development/compilers/gcc-4.4/sources.nix b/pkgs/development/compilers/gcc-4.4/sources.nix index 351240e73ca..357cc2634ed 100644 --- a/pkgs/development/compilers/gcc-4.4/sources.nix +++ b/pkgs/development/compilers/gcc-4.4/sources.nix @@ -1,26 +1,26 @@ /* Automatically generated by `update-gcc.sh', do not edit. - For GCC 4.4.2. */ + For GCC 4.4.6. */ { fetchurl, optional, version, langC, langCC, langFortran, langJava, langAda }: -assert version == "4.4.3"; +assert version == "4.4.6"; optional /* langC */ true (fetchurl { url = "mirror://gcc/releases/gcc-${version}/gcc-core-${version}.tar.bz2"; - sha256 = "0ml360nwkf95w0ykn19zlyxmdvvzpmrbxj2vfrn0k8i2pvk13wwj"; + sha256 = "c2959820de3e42eee6b1d381586992f26430f0083b9a51db31d706080fc9b44a"; }) ++ optional langCC (fetchurl { url = "mirror://gcc/releases/gcc-${version}/gcc-g++-${version}.tar.bz2"; - sha256 = "1s5zy8pfn4rgfm2l1dpfzrrdhi2l5zhphqk0h3gsbn1pdw751kkv"; + sha256 = "6d5d2dacab9569472e4caa291abe94017a9b19574b9b0d866de7b04702634ddf"; }) ++ optional langFortran (fetchurl { url = "mirror://gcc/releases/gcc-${version}/gcc-fortran-${version}.tar.bz2"; - sha256 = "0iivw5kgwxdlqamwgaw5zhw48jajsmg09fgynyxkrxsa702s74sw"; + sha256 = "2b9998716a16b80f4cf843ce81da1cf58ce116e0b85422e3004ce4454e8ff923"; }) ++ optional langJava (fetchurl { url = "mirror://gcc/releases/gcc-${version}/gcc-java-${version}.tar.bz2"; - sha256 = "13r0yxz6sif3i6sxh7b3fa5m1ygynvsg1bf6ssq6njp1fzp9a2kq"; + sha256 = "7c8c12eac21d2a5c605ea4d9b7aa52e482354205b801bc93d62603b6f0956b35"; }) ++ optional langAda (fetchurl { url = "mirror://gcc/releases/gcc-${version}/gcc-ada-${version}.tar.bz2"; - sha256 = "146jfkwgg7gdgfqnrm04133amk8k9vr51wc01rwp2bcjai9c3kk7"; + sha256 = "771ef0e90abf61208ce84689bed15391ad249287e36a28e816d6a044035af0c6"; }) ++ [] From 6bdcaec0cb8671bf65087ca7ab841a5c6d203dca Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Mon, 24 Oct 2011 13:56:50 +0000 Subject: [PATCH 282/970] * Purity fix in libwww-perl. svn path=/nixpkgs/trunk/; revision=29984 --- pkgs/top-level/perl-packages.nix | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 74160ca3f23..877d5aed1e1 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -2116,13 +2116,14 @@ rec { }; LWP = buildPerlPackage rec { - name = "libwww-perl-6.02"; + name = "libwww-perl-6.03"; src = fetchurl { url = "mirror://cpan/modules/by-module/LWP/${name}.tar.gz"; - sha256 = "0cn2cbrz5mrpqmnfhhk0bgv0c1q1x722xlnlnzw6zymj5sg3w6dm"; + sha256 = "1zlnz4ylk1y0rw56vlf9knawwjx72b1gm09yp06ccpgmmndif4dg"; }; propagatedBuildInputs = [ EncodeLocale FileListing HTMLParser HTTPCookies HTTPMessage LWPMediaTypes URI NetHTTP ]; + doCheck = false; # tries to start a daemon }; LWPMediaTypes = buildPerlPackage rec { From c026c359881a5759c29f199e2c85774d2a91ad6f Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 24 Oct 2011 15:35:56 +0000 Subject: [PATCH 283/970] haskell-crypto-api: dropped obsolete version 0.6.4 svn path=/nixpkgs/trunk/; revision=29985 --- .../libraries/haskell/crypto-api/0.6.4.nix | 18 ------------------ .../crypto-api/{0.8.nix => default.nix} | 0 pkgs/top-level/haskell-packages.nix | 4 +--- 3 files changed, 1 insertion(+), 21 deletions(-) delete mode 100644 pkgs/development/libraries/haskell/crypto-api/0.6.4.nix rename pkgs/development/libraries/haskell/crypto-api/{0.8.nix => default.nix} (100%) diff --git a/pkgs/development/libraries/haskell/crypto-api/0.6.4.nix b/pkgs/development/libraries/haskell/crypto-api/0.6.4.nix deleted file mode 100644 index e651d03b736..00000000000 --- a/pkgs/development/libraries/haskell/crypto-api/0.6.4.nix +++ /dev/null @@ -1,18 +0,0 @@ -{ cabal, cereal, entropy, largeword, tagged }: - -cabal.mkDerivation (self: { - pname = "crypto-api"; - version = "0.6.4"; - sha256 = "1v3nnfw13r514a723lsx8d1awlad6fmv27bgp76f1ssv1garraf3"; - buildDepends = [ cereal entropy largeword tagged ]; - meta = { - homepage = "http://trac.haskell.org/crypto-api/wiki"; - description = "A generic interface for cryptographic operations"; - license = self.stdenv.lib.licenses.bsd3; - platforms = self.ghc.meta.platforms; - maintainers = [ - self.stdenv.lib.maintainers.andres - self.stdenv.lib.maintainers.simons - ]; - }; -}) diff --git a/pkgs/development/libraries/haskell/crypto-api/0.8.nix b/pkgs/development/libraries/haskell/crypto-api/default.nix similarity index 100% rename from pkgs/development/libraries/haskell/crypto-api/0.8.nix rename to pkgs/development/libraries/haskell/crypto-api/default.nix diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix index a3522040035..d92dca86ecd 100644 --- a/pkgs/top-level/haskell-packages.nix +++ b/pkgs/top-level/haskell-packages.nix @@ -494,9 +494,7 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y); Crypto = callPackage ../development/libraries/haskell/Crypto {}; - cryptoApi_0_6_4 = callPackage ../development/libraries/haskell/crypto-api/0.6.4.nix {}; - cryptoApi_0_8 = callPackage ../development/libraries/haskell/crypto-api/0.8.nix {}; - cryptoApi = self.cryptoApi_0_6_4; + cryptoApi = callPackage ../development/libraries/haskell/crypto-api {}; cryptocipher = callPackage ../development/libraries/haskell/cryptocipher {}; From 7f96fe0a323462f171933dc28524d3aba687d6c4 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 24 Oct 2011 15:36:06 +0000 Subject: [PATCH 284/970] haskell-bytestring-nums: updated to version 0.3.5 svn path=/nixpkgs/trunk/; revision=29986 --- .../development/libraries/haskell/bytestring-nums/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/bytestring-nums/default.nix b/pkgs/development/libraries/haskell/bytestring-nums/default.nix index 4a480b07931..20228b9eed1 100644 --- a/pkgs/development/libraries/haskell/bytestring-nums/default.nix +++ b/pkgs/development/libraries/haskell/bytestring-nums/default.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "bytestring-nums"; - version = "0.3.3"; - sha256 = "09gdbyj5qw98j57cs9phzsbmvdm7y6j07wg908i34jklwm24nxfd"; + version = "0.3.5"; + sha256 = "12knbyrvr1wa7za8bwypvq3cp81k18qi032dl98s2ylhcz1r6rdk"; isLibrary = true; isExecutable = true; meta = { From 142d3b222da91f875b194620fd19b1bfd1af8748 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 24 Oct 2011 15:36:14 +0000 Subject: [PATCH 285/970] haskell-clientsession: updated to version 0.7.3.2 svn path=/nixpkgs/trunk/; revision=29987 --- pkgs/development/libraries/haskell/clientsession/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/clientsession/default.nix b/pkgs/development/libraries/haskell/clientsession/default.nix index c5096ae9a77..a2ebb5c2d9b 100644 --- a/pkgs/development/libraries/haskell/clientsession/default.nix +++ b/pkgs/development/libraries/haskell/clientsession/default.nix @@ -3,8 +3,8 @@ cabal.mkDerivation (self: { pname = "clientsession"; - version = "0.7.3.1"; - sha256 = "0q16brla4m5g7dmgln3awx964ms7pi1s2r21idmc0mk4rnw2rpi7"; + version = "0.7.3.2"; + sha256 = "1ml1f5sarfck39qrv4zjcbk1vwgazn32gnjm78fm047ixczi9340"; buildDepends = [ base64Bytestring cereal cryptoApi cryptocipher skein ]; From f0b4235838ef7b5546bb2725d91b89e59c86708d Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 24 Oct 2011 15:36:21 +0000 Subject: [PATCH 286/970] haskell-cprng-aes: updated to version 0.2.2 svn path=/nixpkgs/trunk/; revision=29988 --- pkgs/development/libraries/haskell/cprng-aes/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/development/libraries/haskell/cprng-aes/default.nix b/pkgs/development/libraries/haskell/cprng-aes/default.nix index 1c156f47a3f..80a04e96549 100644 --- a/pkgs/development/libraries/haskell/cprng-aes/default.nix +++ b/pkgs/development/libraries/haskell/cprng-aes/default.nix @@ -1,10 +1,10 @@ -{ cabal, cereal, cryptoApi, cryptocipher, random }: +{ cabal, cereal, cryptoApi, cryptocipher, entropy, random }: cabal.mkDerivation (self: { pname = "cprng-aes"; - version = "0.2.1"; - sha256 = "0q6qkvha7cckz3zjnzfsrx298arzbdavy1f73hygrd8f7n74442j"; - buildDepends = [ cereal cryptoApi cryptocipher random ]; + version = "0.2.2"; + sha256 = "0jfa9fb670bqlnkplmscz878hvdbpap47xfxvshgs102iq7rjasf"; + buildDepends = [ cereal cryptoApi cryptocipher entropy random ]; meta = { homepage = "http://github.com/vincenthz/hs-cprng-aes"; description = "Crypto Pseudo Random Number Generator using AES in counter mode"; From 663a451a06b51a2305074f99643c3a4e6c55c75d Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 24 Oct 2011 15:36:28 +0000 Subject: [PATCH 287/970] haskell-cryptohash: updated to version 0.7.4 svn path=/nixpkgs/trunk/; revision=29989 --- pkgs/development/libraries/haskell/cryptohash/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/cryptohash/default.nix b/pkgs/development/libraries/haskell/cryptohash/default.nix index 132a46be09e..4336be8318d 100644 --- a/pkgs/development/libraries/haskell/cryptohash/default.nix +++ b/pkgs/development/libraries/haskell/cryptohash/default.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "cryptohash"; - version = "0.7.3"; - sha256 = "1wjmf7ll9jady6p79066b5ib70ywvbgnbc71s76pibkg5hsvclgj"; + version = "0.7.4"; + sha256 = "1nplmwihq40jmng4r3wiyfb0i33a8wx2gmlbqajc62wny98l7sab"; isLibrary = true; isExecutable = true; buildDepends = [ cereal cryptoApi tagged ]; From 553eb023d81db43ae8170354a99bdb49f56bb046 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 24 Oct 2011 15:36:37 +0000 Subject: [PATCH 288/970] haskell-enumerator: updated to version 0.4.15 svn path=/nixpkgs/trunk/; revision=29990 --- pkgs/development/libraries/haskell/enumerator/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/enumerator/default.nix b/pkgs/development/libraries/haskell/enumerator/default.nix index 1037c570bdb..d42470637d4 100644 --- a/pkgs/development/libraries/haskell/enumerator/default.nix +++ b/pkgs/development/libraries/haskell/enumerator/default.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "enumerator"; - version = "0.4.14"; - sha256 = "06bvrr76y12r3i1xi1s98fc1v6mcmn8nzhbp80wgyi743ksqcr1d"; + version = "0.4.15"; + sha256 = "06yzf2xaadmdhgidzyp7qywd8d401f4n1qlfyx0q72nafgnlvr6v"; buildDepends = [ text transformers ]; meta = { homepage = "https://john-millikin.com/software/enumerator/"; From 942784d483d7af5555f4ab3de3ba9986b75c50fc Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 24 Oct 2011 15:36:45 +0000 Subject: [PATCH 289/970] haskell-gloss: updated to version 1.4.0.1 svn path=/nixpkgs/trunk/; revision=29991 --- pkgs/development/libraries/haskell/gloss/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/development/libraries/haskell/gloss/default.nix b/pkgs/development/libraries/haskell/gloss/default.nix index 509624321f8..6bc322bce0e 100644 --- a/pkgs/development/libraries/haskell/gloss/default.nix +++ b/pkgs/development/libraries/haskell/gloss/default.nix @@ -1,10 +1,10 @@ -{ cabal, GLUT, OpenGL }: +{ cabal, bmp, GLUT, OpenGL }: cabal.mkDerivation (self: { pname = "gloss"; - version = "1.3.4.1"; - sha256 = "0cyk75b495vq59pnfqy6ny5kb0i0zq2hwfb1q69vj0cfyiqiwjsb"; - buildDepends = [ GLUT OpenGL ]; + version = "1.4.0.1"; + sha256 = "0za7imyzfgk3ndh9db55wi7zbxrmpvshws4vywrr35b77b3nabr1"; + buildDepends = [ bmp GLUT OpenGL ]; meta = { homepage = "http://gloss.ouroborus.net"; description = "Painless 2D vector graphics, animations and simulations"; From b5819b57385fc97ff290a779bdffec9fd6d556c2 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 24 Oct 2011 15:36:50 +0000 Subject: [PATCH 290/970] haskell-skein: updated to version 0.1.0.2 svn path=/nixpkgs/trunk/; revision=29992 --- pkgs/development/libraries/haskell/skein/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/skein/default.nix b/pkgs/development/libraries/haskell/skein/default.nix index 4795c5f2f04..e197ab349e3 100644 --- a/pkgs/development/libraries/haskell/skein/default.nix +++ b/pkgs/development/libraries/haskell/skein/default.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "skein"; - version = "0.1.0.1"; - sha256 = "1i05ajmnsm0ac9cqnf1lmdaa6sxkirxv5r2h8phpapzvzwislpr8"; + version = "0.1.0.2"; + sha256 = "1ay7ri011vwvl74b9calbnav90d0r08gzqgdk8nvw1qx4slk1ibs"; buildDepends = [ cereal cryptoApi tagged ]; meta = { description = "Skein, a family of cryptographic hash functions. Includes Skein-MAC as well."; From b3f1015e6bc7ee737aff565290b8772de8390e96 Mon Sep 17 00:00:00 2001 From: Shea Levy Date: Mon, 24 Oct 2011 16:06:31 +0000 Subject: [PATCH 291/970] Linux 3.1 svn path=/nixpkgs/trunk/; revision=29993 --- pkgs/os-specific/linux/kernel/linux-3.1.nix | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/linux-3.1.nix b/pkgs/os-specific/linux/kernel/linux-3.1.nix index 4f8d08340e6..2b74c3a0ba9 100644 --- a/pkgs/os-specific/linux/kernel/linux-3.1.nix +++ b/pkgs/os-specific/linux/kernel/linux-3.1.nix @@ -200,18 +200,17 @@ in import ./generic.nix ( rec { - version = "3.1-rc8"; + version = "3.1"; - modDirVersion = "3.1.0-rc8"; + modDirVersion = "3.1.0"; preConfigure = '' substituteInPlace scripts/depmod.sh --replace '-b "$INSTALL_MOD_PATH"' "" ''; src = fetchurl { - url = "https://github.com/torvalds/linux/tarball/v${version}"; - sha256 = "1sz6snv2wavzasrswaprkjpzpll4247v4br0x2i6sndl2nqa6jz7"; - name = "v${version}.tar.gz"; + url = "mirror://kernel/linux/kernel/v3.x/linux-${version}.tar.bz2"; + sha256 = "0nck9cx66crqhw17y4vc3rfqrcz5269nwn2p5dh0qjvmihvx4wr5"; }; config = configWithPlatform stdenv.platform; From f405ee266bf05bad91e522b74802a595c1c88c86 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Mon, 24 Oct 2011 16:30:59 +0000 Subject: [PATCH 292/970] * Enable staging drivers in Linux 3.x. Staging drivers are more experimental and lower quality than regular drivers. However, there are a lot of drivers for wireless cards that we really need to have. And it doesn't really hurt to have these drivers if you don't need them. * Enable the Radeon KMS option. This shouldn't be a problem since the X driver supports KMS (I think). svn path=/nixpkgs/trunk/; revision=29994 --- pkgs/os-specific/linux/kernel/linux-3.0.nix | 7 ++++++- pkgs/os-specific/linux/kernel/linux-3.1.nix | 7 ++++++- 2 files changed, 12 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/linux-3.0.nix b/pkgs/os-specific/linux/kernel/linux-3.0.nix index d2680db30f1..f3b30b329d4 100644 --- a/pkgs/os-specific/linux/kernel/linux-3.0.nix +++ b/pkgs/os-specific/linux/kernel/linux-3.0.nix @@ -77,8 +77,9 @@ let FB_GEODE y # Video configuration - # The intel drivers already require KMS + # Enable KMS for devices whose X.org driver supports it. DRM_I915_KMS y + DRM_RADEON_KMS y # Hybrid graphics support VGA_SWITCHEROO y @@ -192,6 +193,10 @@ let CGROUP_MEM_RES_CTLR_SWAP? y DEVPTS_MULTIPLE_INSTANCES? y + # Enable staging drivers. These are somewhat experimental, but + # they generally don't hurt. + STAGING y + ${if kernelPlatform ? kernelExtraConfig then kernelPlatform.kernelExtraConfig else ""} ${extraConfig} ''; diff --git a/pkgs/os-specific/linux/kernel/linux-3.1.nix b/pkgs/os-specific/linux/kernel/linux-3.1.nix index 2b74c3a0ba9..d37887ec14a 100644 --- a/pkgs/os-specific/linux/kernel/linux-3.1.nix +++ b/pkgs/os-specific/linux/kernel/linux-3.1.nix @@ -77,8 +77,9 @@ let FB_GEODE y # Video configuration - # The intel drivers already require KMS + # Enable KMS for devices whose X.org driver supports it. DRM_I915_KMS y + DRM_RADEON_KMS y # Hybrid graphics support VGA_SWITCHEROO y @@ -192,6 +193,10 @@ let CGROUP_MEM_RES_CTLR_SWAP? y DEVPTS_MULTIPLE_INSTANCES? y + # Enable staging drivers. These are somewhat experimental, but + # they generally don't hurt. + STAGING y + ${if kernelPlatform ? kernelExtraConfig then kernelPlatform.kernelExtraConfig else ""} ${extraConfig} ''; From cb823d1c08e4088a550134f9e247d1b3955c2deb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?= Date: Mon, 24 Oct 2011 16:36:03 +0000 Subject: [PATCH 293/970] Adding mu0, maildir utils. svn path=/nixpkgs/trunk/; revision=29995 --- pkgs/tools/networking/mu0/default.nix | 25 +++++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 27 insertions(+) create mode 100644 pkgs/tools/networking/mu0/default.nix diff --git a/pkgs/tools/networking/mu0/default.nix b/pkgs/tools/networking/mu0/default.nix new file mode 100644 index 00000000000..a772f237500 --- /dev/null +++ b/pkgs/tools/networking/mu0/default.nix @@ -0,0 +1,25 @@ +{ fetchurl, stdenv, sqlite, pkgconfig, xapian, glib, gmime }: + +stdenv.mkDerivation rec { + name = "mu0-0.9.7"; + + src = fetchurl { + url = http://mu0.googlecode.com/files/mu-0.9.7.tar.gz; + sha256 = "14nyn791ficyllj9idhiq3mncwnrg71lfxk126804dxba1l90r72"; + }; + + buildInputs = [ sqlite pkgconfig xapian glib gmime ]; + + /* The tests don't pass */ + doCheck = false; + + meta = { + description = "mu is a collection of utilties for indexing and searching Maildirs"; + + licenses = [ "GPLv3+" ]; + + homepage = http://code.google.com/p/mu0/; + + platforms = stdenv.lib.platforms.all; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index d0f919a644e..bd6be112783 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -927,6 +927,8 @@ let lzop = callPackage ../tools/compression/lzop { }; + mu0 = callPackage ../tools/networking/mu0 { }; + mailutils = callPackage ../tools/networking/mailutils { guile = guile_1_8; }; From 215e6d0c7d8b3e9982eed65625c9615dc832b740 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Mon, 24 Oct 2011 17:22:10 +0000 Subject: [PATCH 294/970] * attachments.samba.org is down, and we should not depend on it anyway. svn path=/nixpkgs/trunk/; revision=29996 --- pkgs/servers/samba/default.nix | 5 +- pkgs/servers/samba/readlink.patch | 147 ++++++++++++++++++++++++++++++ 2 files changed, 148 insertions(+), 4 deletions(-) create mode 100755 pkgs/servers/samba/readlink.patch diff --git a/pkgs/servers/samba/default.nix b/pkgs/servers/samba/default.nix index 9cb27b23faa..a6ade7400e8 100644 --- a/pkgs/servers/samba/default.nix +++ b/pkgs/servers/samba/default.nix @@ -30,10 +30,7 @@ stdenv.mkDerivation rec { patches = [ # Fix for https://bugzilla.samba.org/show_bug.cgi?id=8541. - (fetchurl { - url = https://attachments.samba.org/attachment.cgi?id=7018; - sha256 = "1fmq0dx7r09pf6gdw1bcigmnx36yb80xcrh7jv0yv9m1w8m3l2w9"; - }) + ./readlink.patch ]; buildInputs = [ readline pam openldap popt iniparser libunwind fam acl cups ] diff --git a/pkgs/servers/samba/readlink.patch b/pkgs/servers/samba/readlink.patch new file mode 100755 index 00000000000..e474624c4d4 --- /dev/null +++ b/pkgs/servers/samba/readlink.patch @@ -0,0 +1,147 @@ +diff --git a/source3/include/smb.h b/source3/include/smb.h +index 3a64af7..549ebb2 100644 +--- a/source3/include/smb.h ++++ b/source3/include/smb.h +@@ -1714,6 +1714,7 @@ struct smb_file_time { + #define UCF_ALWAYS_ALLOW_WCARD_LCOMP 0x00000002 + #define UCF_COND_ALLOW_WCARD_LCOMP 0x00000004 + #define UCF_POSIX_PATHNAMES 0x00000008 ++#define UCF_UNIX_NAME_LOOKUP 0x00000010 + + /* + * smb_filename +diff --git a/source3/smbd/filename.c b/source3/smbd/filename.c +index 25301e6..691a779 100644 +--- a/source3/smbd/filename.c ++++ b/source3/smbd/filename.c +@@ -977,26 +977,39 @@ NTSTATUS unix_convert(TALLOC_CTX *ctx, + } + + /**************************************************************************** +- Check a filename - possibly calling check_reduced_name. +- This is called by every routine before it allows an operation on a filename. +- It does any final confirmation necessary to ensure that the filename is +- a valid one for the user to access. ++ Ensure a path is not vetod. + ****************************************************************************/ + +-NTSTATUS check_name(connection_struct *conn, const char *name) ++NTSTATUS check_veto_path(connection_struct *conn, const char *name) + { + if (IS_VETO_PATH(conn, name)) { + /* Is it not dot or dot dot. */ +- if (!((name[0] == '.') && (!name[1] || +- (name[1] == '.' && !name[2])))) { +- DEBUG(5,("check_name: file path name %s vetoed\n", ++ if (!(ISDOT(name) || ISDOTDOT(name))) { ++ DEBUG(5,("check_veto_path: file path name %s vetoed\n", + name)); + return map_nt_error_from_unix(ENOENT); + } + } ++ return NT_STATUS_OK; ++} ++ ++/**************************************************************************** ++ Check a filename - possibly calling check_reduced_name. ++ This is called by every routine before it allows an operation on a filename. ++ It does any final confirmation necessary to ensure that the filename is ++ a valid one for the user to access. ++****************************************************************************/ ++ ++NTSTATUS check_name(connection_struct *conn, const char *name) ++{ ++ NTSTATUS status = check_veto_path(conn, name); ++ ++ if (!NT_STATUS_IS_OK(status)) { ++ return status; ++ } + + if (!lp_widelinks(SNUM(conn)) || !lp_symlinks(SNUM(conn))) { +- NTSTATUS status = check_reduced_name(conn,name); ++ status = check_reduced_name(conn,name); + if (!NT_STATUS_IS_OK(status)) { + DEBUG(5,("check_name: name %s failed with %s\n",name, + nt_errstr(status))); +@@ -1314,6 +1327,12 @@ NTSTATUS filename_convert(TALLOC_CTX *ctx, + return status; + } + ++ if ((ucf_flags & UCF_UNIX_NAME_LOOKUP) && ++ VALID_STAT((*pp_smb_fname)->st) && ++ S_ISLNK((*pp_smb_fname)->st.st_ex_mode)) { ++ return check_veto_path(conn, (*pp_smb_fname)->base_name); ++ } ++ + status = check_name(conn, (*pp_smb_fname)->base_name); + if (!NT_STATUS_IS_OK(status)) { + DEBUG(3,("filename_convert: check_name failed " +diff --git a/source3/smbd/proto.h b/source3/smbd/proto.h +index c455ffe..1e5d891 100644 +--- a/source3/smbd/proto.h ++++ b/source3/smbd/proto.h +@@ -336,6 +336,7 @@ NTSTATUS unix_convert(TALLOC_CTX *ctx, + const char *orig_path, + struct smb_filename **smb_fname, + uint32_t ucf_flags); ++NTSTATUS check_veto_path(connection_struct *conn, const char *name); + NTSTATUS check_name(connection_struct *conn, const char *name); + int get_real_filename(connection_struct *conn, const char *path, + const char *name, TALLOC_CTX *mem_ctx, +diff --git a/source3/smbd/trans2.c b/source3/smbd/trans2.c +index 0931fff..284635d 100644 +--- a/source3/smbd/trans2.c ++++ b/source3/smbd/trans2.c +@@ -2271,6 +2271,7 @@ static void call_trans2findfirst(connection_struct *conn, + TALLOC_CTX *ctx = talloc_tos(); + struct dptr_struct *dirptr = NULL; + struct smbd_server_connection *sconn = req->sconn; ++ uint32_t ucf_flags = (UCF_SAVE_LCOMP | UCF_ALWAYS_ALLOW_WCARD_LCOMP); + + if (total_params < 13) { + reply_nterror(req, NT_STATUS_INVALID_PARAMETER); +@@ -2314,6 +2315,7 @@ close_if_end = %d requires_resume_key = %d level = 0x%x, max_data_bytes = %d\n", + reply_nterror(req, NT_STATUS_INVALID_LEVEL); + goto out; + } ++ ucf_flags |= UCF_UNIX_NAME_LOOKUP; + break; + default: + reply_nterror(req, NT_STATUS_INVALID_LEVEL); +@@ -5103,6 +5105,7 @@ static void call_trans2qfilepathinfo(connection_struct *conn, + } else { + uint32_t name_hash; + char *fname = NULL; ++ uint32_t ucf_flags = 0; + + /* qpathinfo */ + if (total_params < 7) { +@@ -5114,9 +5117,16 @@ static void call_trans2qfilepathinfo(connection_struct *conn, + + DEBUG(3,("call_trans2qfilepathinfo: TRANSACT2_QPATHINFO: level = %d\n", info_level)); + +- if (INFO_LEVEL_IS_UNIX(info_level) && !lp_unix_extensions()) { +- reply_nterror(req, NT_STATUS_INVALID_LEVEL); +- return; ++ if (INFO_LEVEL_IS_UNIX(info_level)) { ++ if (!lp_unix_extensions()) { ++ reply_nterror(req, NT_STATUS_INVALID_LEVEL); ++ return; ++ } ++ if (info_level == SMB_QUERY_FILE_UNIX_BASIC || ++ info_level == SMB_QUERY_FILE_UNIX_INFO2 || ++ info_level == SMB_QUERY_FILE_UNIX_LINK) { ++ ucf_flags |= UCF_UNIX_NAME_LOOKUP; ++ } + } + + srvstr_get_path(req, params, req->flags2, &fname, ¶ms[6], +@@ -5131,7 +5141,7 @@ static void call_trans2qfilepathinfo(connection_struct *conn, + conn, + req->flags2 & FLAGS2_DFS_PATHNAMES, + fname, +- 0, ++ ucf_flags, + NULL, + &smb_fname); + if (!NT_STATUS_IS_OK(status)) { From d7eb2167aa953145c4a59803f4af87a5ca329224 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?= Date: Mon, 24 Oct 2011 18:53:24 +0000 Subject: [PATCH 295/970] Updating opendkim svn path=/nixpkgs/trunk/; revision=29997 --- pkgs/development/libraries/opendkim/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/opendkim/default.nix b/pkgs/development/libraries/opendkim/default.nix index e77a241af72..62a343d8efc 100644 --- a/pkgs/development/libraries/opendkim/default.nix +++ b/pkgs/development/libraries/opendkim/default.nix @@ -1,10 +1,10 @@ {stdenv, fetchurl, openssl, libmilter}: stdenv.mkDerivation rec { - name = "opendkim-1.2.2"; + name = "opendkim-2.4.2"; src = fetchurl { url = "mirror://sourceforge/opendkim/files/${name}.tar.gz"; - sha256 = "01kvhm10kv17mm4zfz0zd24wzr98fxqwyzm56m2l1v262ng3l4nw"; + sha256 = "0gwgcrnl5c60sxb9z38ari2gl7vd626r3z3dcq8a6aw28pw9w2lk"; }; configureFlags="--with-openssl=${openssl} --with-milter=${libmilter}"; From f71f99ce486becd76387c04bff3e761416877ca3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?= Date: Mon, 24 Oct 2011 19:03:18 +0000 Subject: [PATCH 296/970] Updating mldonkey svn path=/nixpkgs/trunk/; revision=29998 --- pkgs/applications/networking/p2p/mldonkey/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/p2p/mldonkey/default.nix b/pkgs/applications/networking/p2p/mldonkey/default.nix index 244858757d1..16ce0d3504d 100644 --- a/pkgs/applications/networking/p2p/mldonkey/default.nix +++ b/pkgs/applications/networking/p2p/mldonkey/default.nix @@ -1,11 +1,11 @@ {stdenv, fetchurl, ocaml, zlib, bzip2, ncurses, file, gd, libpng }: stdenv.mkDerivation (rec { - name = "mldonkey-3.0.7"; + name = "mldonkey-3.1.0"; src = fetchurl { url = "mirror://sourceforge/mldonkey/${name}.tar.bz2"; - sha256 = "1m5cfx79jiym93bx789lqc1bmwrkz1b1jilhga7d994jsjcw6c2n"; + sha256 = "02038nhh6lbb714ariy2xw1vgfycr1w750zplbgwk5pa3cm163zx"; }; meta = { From e0b9bbdb27bddcaec084d6ad1b64a600f185eea3 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 24 Oct 2011 19:18:04 +0000 Subject: [PATCH 297/970] haskell-cabal-file-th: added version 0.1 svn path=/nixpkgs/trunk/; revision=29999 --- .../libraries/haskell/cabal-file-th/default.nix | 13 +++++++++++++ pkgs/top-level/haskell-packages.nix | 2 ++ 2 files changed, 15 insertions(+) create mode 100644 pkgs/development/libraries/haskell/cabal-file-th/default.nix diff --git a/pkgs/development/libraries/haskell/cabal-file-th/default.nix b/pkgs/development/libraries/haskell/cabal-file-th/default.nix new file mode 100644 index 00000000000..4fea333c6f4 --- /dev/null +++ b/pkgs/development/libraries/haskell/cabal-file-th/default.nix @@ -0,0 +1,13 @@ +{ cabal }: + +cabal.mkDerivation (self: { + pname = "cabal-file-th"; + version = "0.1"; + sha256 = "1i0k8c9kf2av0vs9qhd15kqrkzi5z89va4gp2cfkssq66y98k8p8"; + meta = { + homepage = "http://github.com/nkpart/cabal-file-th"; + description = "Template Haskell expressions for reading fields from a project's cabal file"; + license = self.stdenv.lib.licenses.bsd3; + platforms = self.ghc.meta.platforms; + }; +}) diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix index d92dca86ecd..5a1e68b2f0f 100644 --- a/pkgs/top-level/haskell-packages.nix +++ b/pkgs/top-level/haskell-packages.nix @@ -436,6 +436,8 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y); bytestringTrie = callPackage ../development/libraries/haskell/bytestring-trie {}; + cabalFileTh = callPackage ../development/libraries/haskell/cabal-file-th {}; + cairo = callPackage ../development/libraries/haskell/cairo { inherit (pkgs) cairo zlib; libc = pkgs.stdenv.gcc.libc; From 19291c77e31558f304ea0276be3e01c4094ba154 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 24 Oct 2011 19:18:10 +0000 Subject: [PATCH 298/970] haskell-hledger-web: updated to version 0.16.4 svn path=/nixpkgs/trunk/; revision=30000 --- .../libraries/haskell/hledger-web/default.nix | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/pkgs/development/libraries/haskell/hledger-web/default.nix b/pkgs/development/libraries/haskell/hledger-web/default.nix index a046e86e075..426e477fc0f 100644 --- a/pkgs/development/libraries/haskell/hledger-web/default.nix +++ b/pkgs/development/libraries/haskell/hledger-web/default.nix @@ -1,19 +1,19 @@ -{ cabal, aesonNative, blazeHtml, clientsession, cmdargs, dataObject -, dataObjectYaml, failure, fileEmbed, hamlet, hledger, hledgerLib -, HUnit, ioStorage, parsec, regexpr, safe, shakespeareCss -, shakespeareJs, shakespeareText, text, time, transformers, wai -, waiExtra, warp, yesod, yesodCore, yesodForm, yesodJson -, yesodStatic +{ cabal, aesonNative, blazeHtml, cabalFileTh, clientsession +, cmdargs, dataObject, dataObjectYaml, failure, fileEmbed, hamlet +, hledger, hledgerLib, HUnit, ioStorage, parsec, regexpr, safe +, shakespeareCss, shakespeareJs, shakespeareText, text, time +, transformers, wai, waiExtra, warp, yesod, yesodCore, yesodForm +, yesodJson, yesodStatic }: cabal.mkDerivation (self: { pname = "hledger-web"; - version = "0.16.3"; - sha256 = "0jciah0k6i4aa21hgpl1nqfyjkmm5kg5zmzmxwynvwckncy17ihg"; + version = "0.16.4"; + sha256 = "1p776fzgan9y7g03g92gsvnassc3k28l6l3gr1vd9v3fcnckg2wj"; isLibrary = true; isExecutable = true; buildDepends = [ - aesonNative blazeHtml clientsession cmdargs dataObject + aesonNative blazeHtml cabalFileTh clientsession cmdargs dataObject dataObjectYaml failure fileEmbed hamlet hledger hledgerLib HUnit ioStorage parsec regexpr safe shakespeareCss shakespeareJs shakespeareText text time transformers wai waiExtra warp yesod From 4401a2b70cf67119102f8d57d00838f55a334898 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Mon, 24 Oct 2011 23:35:53 +0000 Subject: [PATCH 299/970] * Added the Broadcom 43xx firmware. svn path=/nixpkgs/trunk/; revision=30002 --- .../linux/firmware/bcm43xx/default.nix | 27 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 29 insertions(+) create mode 100644 pkgs/os-specific/linux/firmware/bcm43xx/default.nix diff --git a/pkgs/os-specific/linux/firmware/bcm43xx/default.nix b/pkgs/os-specific/linux/firmware/bcm43xx/default.nix new file mode 100644 index 00000000000..87670cb5223 --- /dev/null +++ b/pkgs/os-specific/linux/firmware/bcm43xx/default.nix @@ -0,0 +1,27 @@ +{ stdenv, fetchsvn }: + +stdenv.mkDerivation rec { + name = "bcm43xx-firmware-610.811"; + + # For convenience, get it from the Debian SVN repo. Upstream seems to be + # https://git.kernel.org/?p=linux/kernel/git/dwmw2/linux-firmware.git;a=tree;f=brcm + src = fetchsvn { + url = svn://svn.debian.org/kernel/dists/trunk/firmware-nonfree/brcm80211/brcm; + rev = 17441; + sha256 = "0dpc3kwgrslr3i00vx9pvvk2xvcwwf24yrbh6d5gxq9r1q65p8sz"; + }; + + buildPhase = "true"; + + installPhase = '' + mkdir -p $out/brcm + for i in *.fw*; do + cp $i $out/brcm/$(echo $i | sed 's/\(.*\.fw\).*/\1/') + done + ''; + + meta = { + description = "Firmware for the Broadcom 43xx 802.11 wireless cards"; + homepage = http://linuxwireless.org/; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index bd6be112783..f24714f4dc0 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -5072,6 +5072,8 @@ let alsaUtils = callPackage ../os-specific/linux/alsa-utils { }; + bcm43xx = callPackage ../os-specific/linux/firmware/bcm43xx { }; + bluez = callPackage ../os-specific/linux/bluez { }; bridge_utils = callPackage ../os-specific/linux/bridge-utils { }; From 6638835c9399e212acdf882791d239d823f1ccef Mon Sep 17 00:00:00 2001 From: Shea Levy Date: Tue, 25 Oct 2011 06:21:27 +0000 Subject: [PATCH 300/970] Linux 3.0 svn path=/nixpkgs/trunk/; revision=30007 --- pkgs/os-specific/linux/kernel/linux-3.0.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/linux-3.0.nix b/pkgs/os-specific/linux/kernel/linux-3.0.nix index f3b30b329d4..f5ee6711f93 100644 --- a/pkgs/os-specific/linux/kernel/linux-3.0.nix +++ b/pkgs/os-specific/linux/kernel/linux-3.0.nix @@ -205,7 +205,7 @@ in import ./generic.nix ( rec { - version = "3.0.7"; + version = "3.0.8"; preConfigure = '' substituteInPlace scripts/depmod.sh --replace '-b "$INSTALL_MOD_PATH"' "" @@ -213,7 +213,7 @@ import ./generic.nix ( src = fetchurl { url = "mirror://kernel/linux/kernel/v3.x/linux-${version}.tar.bz2"; - sha256 = "1k7466p2xj3fg2kl5cy9ygd4wnd38wam64ga5nr76cz15ylgg06f"; + sha256 = "1p9sacxz430rmq5zj8pch2i0dczi5jna5g8xf4gni3w436invlaf"; }; config = configWithPlatform stdenv.platform; From e0e4770ec96d35c1f8bab4bda4a629dd747c704a Mon Sep 17 00:00:00 2001 From: Shea Levy Date: Tue, 25 Oct 2011 08:20:03 +0000 Subject: [PATCH 301/970] klibc 1.5.24 svn path=/nixpkgs/trunk/; revision=30008 --- pkgs/os-specific/linux/klibc/default.nix | 8 ++--- pkgs/os-specific/linux/klibc/make382.patch | 35 ---------------------- 2 files changed, 3 insertions(+), 40 deletions(-) delete mode 100644 pkgs/os-specific/linux/klibc/make382.patch diff --git a/pkgs/os-specific/linux/klibc/default.nix b/pkgs/os-specific/linux/klibc/default.nix index b8cd2b18bc7..d71b97b9c7d 100644 --- a/pkgs/os-specific/linux/klibc/default.nix +++ b/pkgs/os-specific/linux/klibc/default.nix @@ -3,7 +3,7 @@ assert stdenv.isLinux; let - version = "1.5.20"; + version = "1.5.24"; baseMakeFlags = ["V=1" "prefix=$out" "SHLIBDIR=$out/lib"]; in @@ -11,12 +11,10 @@ stdenv.mkDerivation { name = "klibc-${version}"; src = fetchurl { - url = "mirror://kernel/linux/libs/klibc/1.5/klibc-${version}.tar.bz2"; - sha256 = "07683dn18r3k35d6pp0sn88pqcx7dldqx3m6f2gz45i1j094qp7m"; + url = "http://ftp.eu.openbsd.org/pub/linux/libs/klibc/1.5/klibc-${version}.tar.bz2"; + sha256 = "18lm32dlj9k2ky9wwk274zmc3jndgrb41b6qm82g3lza6wlw3yki"; }; - patches = [ ./make382.patch ]; - # Trick to make this build on nix. It expects to have the kernel sources # instead of only the linux kernel headers. # So it cannot run the 'make headers_install' it wants to run. diff --git a/pkgs/os-specific/linux/klibc/make382.patch b/pkgs/os-specific/linux/klibc/make382.patch deleted file mode 100644 index e9e9aba4e79..00000000000 --- a/pkgs/os-specific/linux/klibc/make382.patch +++ /dev/null @@ -1,35 +0,0 @@ -To avoid an endless loop with gnumake 3.82 -http://www.mail-archive.com/pld-cvs-commit@lists.pld-linux.org/msg228690.html - -Index: packages/klibc/klibc-make.patch ---- klibc-1.5.19/scripts/Kbuild.include.orig 2010-08-19 09:39:45.986816591 -0200 -+++ klibc-1.5.19/scripts/Kbuild.include 2010-08-19 09:49:15.010816591 -0200 -@@ -127,7 +127,7 @@ - # >'< substitution is for echo to work, >$< substitution to preserve $ when reloading .cmd file - # note: when using inline perl scripts [perl -e '...$$t=1;...'] in $(cmd_xxx) double $$ your perl vars - # --if_changed = $(if $(strip $(filter-out $(PHONY),$?) \ -+if_changed = $(if $(strip $(filter-out $(PHONY) FORCE,$?) \ - $(call arg-check, $(cmd_$(1)), $(cmd_$@)) ), \ - @set -e; \ - $(echo-cmd) $(cmd_$(1)); \ -@@ -135,7 +135,7 @@ - - # execute the command and also postprocess generated .d dependencies - # file --if_changed_dep = $(if $(strip $(filter-out $(PHONY),$?) \ -+if_changed_dep = $(if $(strip $(filter-out $(PHONY) FORCE,$?) \ - $(filter-out FORCE $(wildcard $^),$^) \ - $(call arg-check, $(cmd_$(1)), $(cmd_$@)) ), \ - @set -e; \ -@@ -147,7 +147,7 @@ - # Usage: $(call if_changed_rule,foo) - # will check if $(cmd_foo) changed, or any of the prequisites changed, - # and if so will execute $(rule_foo) --if_changed_rule = $(if $(strip $(filter-out $(PHONY),$?) \ -+if_changed_rule = $(if $(strip $(filter-out $(PHONY) FORCE,$?) \ - $(call arg-check, $(cmd_$(1)), $(cmd_$@)) ),\ - @set -e; \ - $(rule_$(1))) From dd9e83b77faa321fe9cb8e11e79070c792d07d50 Mon Sep 17 00:00:00 2001 From: Shea Levy Date: Tue, 25 Oct 2011 08:59:39 +0000 Subject: [PATCH 302/970] Enable building full klibc as a kernelPackage svn path=/nixpkgs/trunk/; revision=30009 --- pkgs/os-specific/linux/klibc/default.nix | 23 ++++++++++++++++++++--- pkgs/top-level/all-packages.nix | 4 ++++ 2 files changed, 24 insertions(+), 3 deletions(-) diff --git a/pkgs/os-specific/linux/klibc/default.nix b/pkgs/os-specific/linux/klibc/default.nix index d71b97b9c7d..e1b8c0d2836 100644 --- a/pkgs/os-specific/linux/klibc/default.nix +++ b/pkgs/os-specific/linux/klibc/default.nix @@ -1,4 +1,13 @@ -{stdenv, fetchurl, perl, bison, mktemp, linuxHeaders, linuxHeadersCross}: +{ + stdenv, + fetchurl, + perl, + bison, + mktemp, + linuxHeaders, + linuxHeadersCross, + kernel ? null +}: assert stdenv.isLinux; @@ -20,7 +29,7 @@ stdenv.mkDerivation { # So it cannot run the 'make headers_install' it wants to run. # We don't install the headers, so klibc will not be useful as libc, but # usually in nixpkgs we only use the userspace tools comming with klibc. - prePatch = '' + prePatch = stdenv.lib.optionalString (kernel == null) '' sed -i -e /headers_install/d scripts/Kbuild.install ''; @@ -49,10 +58,18 @@ stdenv.mkDerivation { echo "CONFIG_AEABI=y" >> defconfig makeFlags=$(eval "echo $makeFlags") + '' + (if kernel == null then '' mkdir linux cp -prsd $linuxHeaders/include linux/ chmod -R u+w linux/include/ - ''; # */ + '' else '' + tar xvf ${kernel.src} + mv linux* linux + cd linux + ln -sv ${kernel}/config .config + make prepare + cd .. + ''); # Install static binaries as well. postInstall = '' diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index f24714f4dc0..0815f39f19d 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -5737,6 +5737,10 @@ let inherit kernel perl; }; + klibc = callPackage ../os-specific/linux/klibc { + linuxHeaders = glibc.kernelHeaders; + }; + splashutils = if kernel.features ? fbConDecor then pkgs.splashutils else null; From a5324f21323cb8758eb60cd10c24d79570f5567f Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Tue, 25 Oct 2011 09:27:41 +0000 Subject: [PATCH 303/970] pkgs/os-specific/linux/firmware/bcm43xx: please do not use fetchsvn in base system Replaced use of fetchsvn with fetchurl. Please note that machines behind a company firewall usually cannot access svn://-style URLs, which means that nixos-rebuild is going to fail. HTTP works fine, though. The URL I used to download the tar.gz archive is probably not stable, or rather, the tar.gz archive generated by Gitweb at that URL might have a different checksum every time it's generated. I'm not sure what else to do, though. Could a kind firmware expert please improve the situation further? Also, I wonder what is the purpose of the sed expression in the command cp $i $out/brcm/$(echo $i | sed 's/\(.*\.fw\).*/\1/') ...? The downloaded directory doesn't seem to contain any files that would match that expression? svn path=/nixpkgs/trunk/; revision=30010 --- .../os-specific/linux/firmware/bcm43xx/default.nix | 14 ++++++-------- 1 file changed, 6 insertions(+), 8 deletions(-) diff --git a/pkgs/os-specific/linux/firmware/bcm43xx/default.nix b/pkgs/os-specific/linux/firmware/bcm43xx/default.nix index 87670cb5223..36ef83581f8 100644 --- a/pkgs/os-specific/linux/firmware/bcm43xx/default.nix +++ b/pkgs/os-specific/linux/firmware/bcm43xx/default.nix @@ -1,14 +1,12 @@ -{ stdenv, fetchsvn }: +{ stdenv, fetchurl }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { name = "bcm43xx-firmware-610.811"; - # For convenience, get it from the Debian SVN repo. Upstream seems to be - # https://git.kernel.org/?p=linux/kernel/git/dwmw2/linux-firmware.git;a=tree;f=brcm - src = fetchsvn { - url = svn://svn.debian.org/kernel/dists/trunk/firmware-nonfree/brcm80211/brcm; - rev = 17441; - sha256 = "0dpc3kwgrslr3i00vx9pvvk2xvcwwf24yrbh6d5gxq9r1q65p8sz"; + src = fetchurl { + url = "https://git.kernel.org/?p=linux/kernel/git/dwmw2/linux-firmware.git;a=snapshot;h=e62f89cefb4660a16b192c57b446cac975836d05;sf=tgz"; + sha256 = "a4409c3ed21b5650da9277873e4b05228937ed65526bffd9c93d09cbdf7935b2"; + name = "brcm-e62f89cefb4660a16b192c57b446cac975836d05.tar.gz"; }; buildPhase = "true"; From c7b6e96d845173145d0c88c40157d98b184c983c Mon Sep 17 00:00:00 2001 From: Shea Levy Date: Tue, 25 Oct 2011 09:40:15 +0000 Subject: [PATCH 304/970] v86d svn path=/nixpkgs/trunk/; revision=30011 --- pkgs/os-specific/linux/v86d/default.nix | 32 +++++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 34 insertions(+) create mode 100644 pkgs/os-specific/linux/v86d/default.nix diff --git a/pkgs/os-specific/linux/v86d/default.nix b/pkgs/os-specific/linux/v86d/default.nix new file mode 100644 index 00000000000..c8924f91c57 --- /dev/null +++ b/pkgs/os-specific/linux/v86d/default.nix @@ -0,0 +1,32 @@ +{stdenv, fetchurl, klibc, kernel, withKlibc ? true}: + +stdenv.mkDerivation rec { + name = "v86d-0.1.10"; + + src = fetchurl { + url = "http://dev.gentoo.org/~spock/projects/uvesafb/archive/${name}.tar.bz2"; + sha256 = "0p3kwqjis941pns9948dxfnjnl5lwd8f2b6x794whs7g32p68jb3"; + }; + + buildInputs = stdenv.lib.optional withKlibc klibc; + + configurePhase = '' + bash ./configure $configureFlags + ''; + + configureFlags = if withKlibc then [ "--with-klibc" ] else [ "--default" ]; + + makeFlags = [ + "KDIR=${kernel}/lib/modules/${kernel.modDirVersion}/source" + "DESTDIR=$(out)" + ]; + + meta = { + description = "A userspace helper that runs x86 code in an emulated environment"; + homepage = http://dev.gentoo.org/~spock/projects/uvesafb/; + license = "BSD"; + maintainers = [ stdenv.lib.maintainers.shlevy ]; + platforms = [ "i686-linux" "x86_64-linux" ]; + }; +} + diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 0815f39f19d..1cf5ed27387 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -5775,6 +5775,8 @@ let inherit (gnome) gtkmm libglademm; }; + v86d = callPackage ../os-specific/linux/v86d { }; + virtualbox = callPackage ../applications/virtualization/virtualbox { stdenv = stdenv_32bit; inherit (gnome) libIDL; From f31cd519b6673815e7a7573c15fcfe429a82808c Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Tue, 25 Oct 2011 12:52:41 +0000 Subject: [PATCH 305/970] * Updated version of the readlink() patch. svn path=/nixpkgs/trunk/; revision=30013 --- pkgs/servers/samba/readlink.patch | 82 ++++++++++++++++++++++++++++--- 1 file changed, 76 insertions(+), 6 deletions(-) mode change 100755 => 100644 pkgs/servers/samba/readlink.patch diff --git a/pkgs/servers/samba/readlink.patch b/pkgs/servers/samba/readlink.patch old mode 100755 new mode 100644 index e474624c4d4..84c0e021b1c --- a/pkgs/servers/samba/readlink.patch +++ b/pkgs/servers/samba/readlink.patch @@ -11,9 +11,18 @@ index 3a64af7..549ebb2 100644 /* * smb_filename diff --git a/source3/smbd/filename.c b/source3/smbd/filename.c -index 25301e6..691a779 100644 +index 25301e6..b2ed239 100644 --- a/source3/smbd/filename.c +++ b/source3/smbd/filename.c +@@ -383,7 +383,7 @@ NTSTATUS unix_convert(TALLOC_CTX *ctx, + + if((!conn->case_sensitive || !(conn->fs_capabilities & + FILE_CASE_SENSITIVE_SEARCH)) && +- stat_cache_lookup(conn, &smb_fname->base_name, &dirpath, &start, ++ stat_cache_lookup(conn, posix_pathnames, &smb_fname->base_name, &dirpath, &start, + &smb_fname->st)) { + goto done; + } @@ -977,26 +977,39 @@ NTSTATUS unix_convert(TALLOC_CTX *ctx, } @@ -77,7 +86,7 @@ index 25301e6..691a779 100644 if (!NT_STATUS_IS_OK(status)) { DEBUG(3,("filename_convert: check_name failed " diff --git a/source3/smbd/proto.h b/source3/smbd/proto.h -index c455ffe..1e5d891 100644 +index c455ffe..02b5e40 100644 --- a/source3/smbd/proto.h +++ b/source3/smbd/proto.h @@ -336,6 +336,7 @@ NTSTATUS unix_convert(TALLOC_CTX *ctx, @@ -88,8 +97,59 @@ index c455ffe..1e5d891 100644 NTSTATUS check_name(connection_struct *conn, const char *name); int get_real_filename(connection_struct *conn, const char *path, const char *name, TALLOC_CTX *mem_ctx, +@@ -1037,6 +1038,7 @@ void stat_cache_add( const char *full_orig_name, + char *translated_path, + bool case_sensitive); + bool stat_cache_lookup(connection_struct *conn, ++ bool posix_paths, + char **pp_name, + char **pp_dirpath, + char **pp_start, +diff --git a/source3/smbd/statcache.c b/source3/smbd/statcache.c +index e2ccc74..e910982 100644 +--- a/source3/smbd/statcache.c ++++ b/source3/smbd/statcache.c +@@ -150,6 +150,7 @@ void stat_cache_add( const char *full_orig_name, + * Look through the stat cache for an entry + * + * @param conn A connection struct to do the stat() with. ++ * @param posix_paths Whether to lookup using stat() or lstat() + * @param name The path we are attempting to cache, modified by this routine + * to be correct as far as the cache can tell us. We assume that + * it is a talloc'ed string from top of stack, we free it if +@@ -166,6 +167,7 @@ void stat_cache_add( const char *full_orig_name, + */ + + bool stat_cache_lookup(connection_struct *conn, ++ bool posix_paths, + char **pp_name, + char **pp_dirpath, + char **pp_start, +@@ -181,6 +183,7 @@ bool stat_cache_lookup(connection_struct *conn, + char *name; + TALLOC_CTX *ctx = talloc_tos(); + struct smb_filename smb_fname; ++ int ret; + + *pp_dirpath = NULL; + *pp_start = *pp_name; +@@ -283,7 +286,13 @@ bool stat_cache_lookup(connection_struct *conn, + ZERO_STRUCT(smb_fname); + smb_fname.base_name = translated_path; + +- if (SMB_VFS_STAT(conn, &smb_fname) != 0) { ++ if (posix_paths) { ++ ret = SMB_VFS_LSTAT(conn, &smb_fname); ++ } else { ++ ret = SMB_VFS_STAT(conn, &smb_fname); ++ } ++ ++ if (ret != 0) { + /* Discard this entry - it doesn't exist in the filesystem. */ + memcache_delete(smbd_memcache(), STAT_CACHE, + data_blob_const(chk_name, strlen(chk_name))); diff --git a/source3/smbd/trans2.c b/source3/smbd/trans2.c -index 0931fff..284635d 100644 +index 0931fff..129ab01 100644 --- a/source3/smbd/trans2.c +++ b/source3/smbd/trans2.c @@ -2271,6 +2271,7 @@ static void call_trans2findfirst(connection_struct *conn, @@ -108,7 +168,17 @@ index 0931fff..284635d 100644 break; default: reply_nterror(req, NT_STATUS_INVALID_LEVEL); -@@ -5103,6 +5105,7 @@ static void call_trans2qfilepathinfo(connection_struct *conn, +@@ -2331,8 +2333,7 @@ close_if_end = %d requires_resume_key = %d level = 0x%x, max_data_bytes = %d\n", + ntstatus = filename_convert(ctx, conn, + req->flags2 & FLAGS2_DFS_PATHNAMES, + directory, +- (UCF_SAVE_LCOMP | +- UCF_ALWAYS_ALLOW_WCARD_LCOMP), ++ ucf_flags, + &mask_contains_wcard, + &smb_dname); + if (!NT_STATUS_IS_OK(ntstatus)) { +@@ -5103,6 +5104,7 @@ static void call_trans2qfilepathinfo(connection_struct *conn, } else { uint32_t name_hash; char *fname = NULL; @@ -116,7 +186,7 @@ index 0931fff..284635d 100644 /* qpathinfo */ if (total_params < 7) { -@@ -5114,9 +5117,16 @@ static void call_trans2qfilepathinfo(connection_struct *conn, +@@ -5114,9 +5116,16 @@ static void call_trans2qfilepathinfo(connection_struct *conn, DEBUG(3,("call_trans2qfilepathinfo: TRANSACT2_QPATHINFO: level = %d\n", info_level)); @@ -136,7 +206,7 @@ index 0931fff..284635d 100644 } srvstr_get_path(req, params, req->flags2, &fname, ¶ms[6], -@@ -5131,7 +5141,7 @@ static void call_trans2qfilepathinfo(connection_struct *conn, +@@ -5131,7 +5140,7 @@ static void call_trans2qfilepathinfo(connection_struct *conn, conn, req->flags2 & FLAGS2_DFS_PATHNAMES, fname, From e09dbeb845188f7dfbc5f39c6cba927ef359af9a Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Tue, 25 Oct 2011 16:43:13 +0000 Subject: [PATCH 306/970] haskell-cabal-file-th: updated to version 0.2.1 svn path=/nixpkgs/trunk/; revision=30015 --- pkgs/development/libraries/haskell/cabal-file-th/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/cabal-file-th/default.nix b/pkgs/development/libraries/haskell/cabal-file-th/default.nix index 4fea333c6f4..427e4ba2cc6 100644 --- a/pkgs/development/libraries/haskell/cabal-file-th/default.nix +++ b/pkgs/development/libraries/haskell/cabal-file-th/default.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "cabal-file-th"; - version = "0.1"; - sha256 = "1i0k8c9kf2av0vs9qhd15kqrkzi5z89va4gp2cfkssq66y98k8p8"; + version = "0.2.1"; + sha256 = "0nczwicgf6kx3lk5m7wqf1wj6ghn8jfx112dzh7jh4f4xs66nsd1"; meta = { homepage = "http://github.com/nkpart/cabal-file-th"; description = "Template Haskell expressions for reading fields from a project's cabal file"; From ebdf510f744c23a204ccfbed3a59613b0014a4e7 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Tue, 25 Oct 2011 17:06:38 +0000 Subject: [PATCH 307/970] os-specific/linux/firmware/bcm43xx: fetch files individually to avoid checksum errors in tarball svn path=/nixpkgs/trunk/; revision=30016 --- .../linux/firmware/bcm43xx/default.nix | 23 +++++++++++++------ 1 file changed, 16 insertions(+), 7 deletions(-) diff --git a/pkgs/os-specific/linux/firmware/bcm43xx/default.nix b/pkgs/os-specific/linux/firmware/bcm43xx/default.nix index 36ef83581f8..9dc67b32c53 100644 --- a/pkgs/os-specific/linux/firmware/bcm43xx/default.nix +++ b/pkgs/os-specific/linux/firmware/bcm43xx/default.nix @@ -1,20 +1,29 @@ { stdenv, fetchurl }: +let + src1 = fetchurl { + url = "https://git.kernel.org/?p=linux/kernel/git/dwmw2/linux-firmware.git;a=blob_plain;f=brcm/bcm43xx_hdr-0.fw;hb=15888a2eab052ac3d3f49334e4f6f05f347a516e"; + sha256 = "d02549964d21dd90fc35806483b9fc871d93d7d38ae1a70a9ce006103c2a3de3"; + name = "bcm43xx_hdr-0.fw"; + }; + + src2 = fetchurl { + url = "https://git.kernel.org/?p=linux/kernel/git/dwmw2/linux-firmware.git;a=blob_plain;f=brcm/bcm43xx-0.fw;hb=15888a2eab052ac3d3f49334e4f6f05f347a516e"; + sha256 = "f90f685903127e4db431fe1efccefebf77272712bd4bfe46d1d1d5825ee52797"; + name = "bcm43xx-0.fw"; + }; +in stdenv.mkDerivation { name = "bcm43xx-firmware-610.811"; - src = fetchurl { - url = "https://git.kernel.org/?p=linux/kernel/git/dwmw2/linux-firmware.git;a=snapshot;h=e62f89cefb4660a16b192c57b446cac975836d05;sf=tgz"; - sha256 = "a4409c3ed21b5650da9277873e4b05228937ed65526bffd9c93d09cbdf7935b2"; - name = "brcm-e62f89cefb4660a16b192c57b446cac975836d05.tar.gz"; - }; + unpackPhase = "true"; buildPhase = "true"; installPhase = '' mkdir -p $out/brcm - for i in *.fw*; do - cp $i $out/brcm/$(echo $i | sed 's/\(.*\.fw\).*/\1/') + for i in ${src1} ${src2}; do + cp -v $i $out/brcm/$(echo $i | sed -r -e 's|.*/[a-z0-9]+-||') done ''; From 624b8616d439593b79b0a7c538c238618a53c9ba Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?= Date: Tue, 25 Oct 2011 17:41:43 +0000 Subject: [PATCH 308/970] Enabling the ipv6 module in the sheevaplug svn path=/nixpkgs/trunk/; revision=30018 --- pkgs/top-level/platforms.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/top-level/platforms.nix b/pkgs/top-level/platforms.nix index 259b9898f36..911dff97d0c 100644 --- a/pkgs/top-level/platforms.nix +++ b/pkgs/top-level/platforms.nix @@ -65,6 +65,7 @@ rec { IP_NF_MATCH_ADDRTYPE y IP_NF_TARGET_LOG y IP_NF_MANGLE y + IPV6 m # Fail to build DRM n From b74d8fb90f7847ad488f56c4cfc1cdc7ccbad053 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?= Date: Tue, 25 Oct 2011 17:46:26 +0000 Subject: [PATCH 309/970] Making gpgme optional in mutt. A dependency of gpgme (pth) does not build on arm. svn path=/nixpkgs/trunk/; revision=30019 --- .../networking/mailreaders/mutt/default.nix | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/networking/mailreaders/mutt/default.nix b/pkgs/applications/networking/mailreaders/mutt/default.nix index 02870c70f64..5364bd445e6 100644 --- a/pkgs/applications/networking/mailreaders/mutt/default.nix +++ b/pkgs/applications/networking/mailreaders/mutt/default.nix @@ -1,11 +1,13 @@ -{ stdenv, fetchurl, ncurses, which, perl, gpgme +{ stdenv, fetchurl, ncurses, which, perl , sslSupport ? true , imapSupport ? true , headerCache ? true , saslSupport ? true +, gpgmeSupport ? true , gdbm ? null , openssl ? null , cyrus_sasl ? null +, gpgme ? null }: assert headerCache -> gdbm != null; @@ -21,17 +23,20 @@ stdenv.mkDerivation rec { }; buildInputs = [ - ncurses which perl gpgme + ncurses which perl (if headerCache then gdbm else null) (if sslSupport then openssl else null) (if saslSupport then cyrus_sasl else null) + (if gpgmeSupport then gpgme else null) ]; configureFlags = [ "--with-mailpath=" "--enable-smtp" # This allows calls with "-d N", that output debug info into ~/.muttdebug* - "--enable-debug" "--enable-pop" "--enable-imap" "--enable-gpgme" + "--enable-debug" + + "--enable-pop" "--enable-imap" # The next allows building mutt without having anything setgid # set by the installer, and removing the need for the group 'mail' @@ -41,6 +46,7 @@ stdenv.mkDerivation rec { (if sslSupport then "--with-ssl" else "--without-ssl") (if imapSupport then "--enable-imap" else "--disable-imap") (if saslSupport then "--with-sasl" else "--without-sasl") + (if gpgmeSupport then "--enable-gpgme" else "--disable-gpgme") ]; meta = { From faafa3513a37df0f989b35ff4c2e2f6e23c90d6b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?= Date: Tue, 25 Oct 2011 17:46:39 +0000 Subject: [PATCH 310/970] Adding a kernel mirror that at least has the module-init-tools of nixpkgs. svn path=/nixpkgs/trunk/; revision=30020 --- pkgs/build-support/fetchurl/mirrors.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/build-support/fetchurl/mirrors.nix b/pkgs/build-support/fetchurl/mirrors.nix index f65d7cc7fa5..cd52c1ce17c 100644 --- a/pkgs/build-support/fetchurl/mirrors.nix +++ b/pkgs/build-support/fetchurl/mirrors.nix @@ -100,6 +100,7 @@ rec { http://www.de.kernel.org/pub/ http://ramses.wh2.tu-dresden.de/pub/mirrors/kernel.org/ http://linux-kernel.uio.no/pub/ + http://kernel.osuosl.org/pub/ ]; # Mirrors of ftp://ftp.kde.org/pub/kde/. From 6582f602c994784a25afbc750ac9d478b7c3a8d4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?= Date: Tue, 25 Oct 2011 17:53:44 +0000 Subject: [PATCH 311/970] Updating gnutls, as it failed on 'make test' on arm. The new does not fail. svn path=/nixpkgs/trunk/; revision=30021 --- pkgs/development/libraries/gnutls/default.nix | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/pkgs/development/libraries/gnutls/default.nix b/pkgs/development/libraries/gnutls/default.nix index 39532c075d1..888a119bb36 100644 --- a/pkgs/development/libraries/gnutls/default.nix +++ b/pkgs/development/libraries/gnutls/default.nix @@ -1,15 +1,15 @@ { fetchurl, stdenv, xz, zlib, lzo, libtasn1, nettle -, guileBindings, guile }: +, guileBindings, guile, perl }: assert guileBindings -> guile != null; stdenv.mkDerivation rec { - name = "gnutls-3.0.2"; + name = "gnutls-3.0.4"; src = fetchurl { url = "mirror://gnu/gnutls/${name}.tar.xz"; - sha256 = "0jy0j77inv6yr7s9mnhs5kvjjmhj0ifg35145s1qn3hd9ma36nii"; + sha256 = "16mhr52c07xlkv5m5bxgr51ppjz0gqjw6rgv52ql4iyi569ffrx3"; }; configurePhase = '' @@ -22,9 +22,11 @@ stdenv.mkDerivation rec { else ""} ''; - buildInputs = [ xz zlib lzo ] + buildInputs = [ zlib lzo ] ++ stdenv.lib.optional guileBindings guile; + buildNativeInputs = [ xz perl ]; + propagatedBuildInputs = [ nettle libtasn1 ]; doCheck = true; From 3fa51ac56a90863a5ffc7e7a013b2758401f9e18 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?= Date: Tue, 25 Oct 2011 18:35:17 +0000 Subject: [PATCH 312/970] Trying to disable the references to the bootstrap-tools libgcc svn path=/nixpkgs/branches/stdenv-updates/; revision=30022 --- pkgs/development/libraries/zlib/default.nix | 4 ++++ pkgs/development/tools/misc/binutils/default.nix | 4 ++++ 2 files changed, 8 insertions(+) diff --git a/pkgs/development/libraries/zlib/default.nix b/pkgs/development/libraries/zlib/default.nix index f1b8a006ecf..631cd50dd68 100644 --- a/pkgs/development/libraries/zlib/default.nix +++ b/pkgs/development/libraries/zlib/default.nix @@ -17,6 +17,10 @@ stdenv.mkDerivation (rec { fi ''; + # As zlib takes part in the stdenv building, we don't want references + # to the bootstrap-tools libgcc (as uses to happen on arm/mips) + NIX_LDFLAGS = "-static-libgcc"; + crossAttrs = { dontStrip = if static then true else false; } // (if stdenv.cross.libc == "msvcrt" then { diff --git a/pkgs/development/tools/misc/binutils/default.nix b/pkgs/development/tools/misc/binutils/default.nix index 0dcf46397a0..59082aa2f27 100644 --- a/pkgs/development/tools/misc/binutils/default.nix +++ b/pkgs/development/tools/misc/binutils/default.nix @@ -53,6 +53,10 @@ stdenv.mkDerivation rec { done ''; + # As binutils takes part in the stdenv building, we don't want references + # to the bootstrap-tools libgcc (as uses to happen on arm/mips) + NIX_LDFLAGS = "-static-libgcc"; + configureFlags = "--disable-werror" # needed for dietlibc build + stdenv.lib.optionalString (stdenv.system == "mips64-linux") " --enable-fix-loongson2f-nop" From 0b1f1a522c655ef8b16242be975bf3314ed6dbe9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?= Date: Tue, 25 Oct 2011 18:35:41 +0000 Subject: [PATCH 313/970] Updating glibc from 2.13 to 2.14.1 svn path=/nixpkgs/branches/stdenv-updates/; revision=30023 --- .../{glibc-2.13 => glibc-2.14}/builder.sh | 0 .../{glibc-2.13 => glibc-2.14}/common.nix | 8 ++++---- .../{glibc-2.13 => glibc-2.14}/default.nix | 0 .../glibc-elf-localscope.patch | 0 .../libraries/{glibc-2.13 => glibc-2.14}/info.nix | 0 .../{glibc-2.13 => glibc-2.14}/locales-builder.sh | 0 .../{glibc-2.13 => glibc-2.14}/locales.nix | 0 .../nix-locale-archive.patch | 0 .../nss-skip-unavail.patch | 0 .../{glibc-2.13 => glibc-2.14}/rpcgen-path.patch | 0 pkgs/top-level/all-packages.nix | 14 +++++++------- 11 files changed, 11 insertions(+), 11 deletions(-) rename pkgs/development/libraries/{glibc-2.13 => glibc-2.14}/builder.sh (100%) rename pkgs/development/libraries/{glibc-2.13 => glibc-2.14}/common.nix (96%) rename pkgs/development/libraries/{glibc-2.13 => glibc-2.14}/default.nix (100%) rename pkgs/development/libraries/{glibc-2.13 => glibc-2.14}/glibc-elf-localscope.patch (100%) rename pkgs/development/libraries/{glibc-2.13 => glibc-2.14}/info.nix (100%) rename pkgs/development/libraries/{glibc-2.13 => glibc-2.14}/locales-builder.sh (100%) rename pkgs/development/libraries/{glibc-2.13 => glibc-2.14}/locales.nix (100%) rename pkgs/development/libraries/{glibc-2.13 => glibc-2.14}/nix-locale-archive.patch (100%) rename pkgs/development/libraries/{glibc-2.13 => glibc-2.14}/nss-skip-unavail.patch (100%) rename pkgs/development/libraries/{glibc-2.13 => glibc-2.14}/rpcgen-path.patch (100%) diff --git a/pkgs/development/libraries/glibc-2.13/builder.sh b/pkgs/development/libraries/glibc-2.14/builder.sh similarity index 100% rename from pkgs/development/libraries/glibc-2.13/builder.sh rename to pkgs/development/libraries/glibc-2.14/builder.sh diff --git a/pkgs/development/libraries/glibc-2.13/common.nix b/pkgs/development/libraries/glibc-2.14/common.nix similarity index 96% rename from pkgs/development/libraries/glibc-2.13/common.nix rename to pkgs/development/libraries/glibc-2.14/common.nix index 15941c2a43b..87b808cda4b 100644 --- a/pkgs/development/libraries/glibc-2.13/common.nix +++ b/pkgs/development/libraries/glibc-2.14/common.nix @@ -11,7 +11,7 @@ cross : let # For GNU/Hurd, see below. - version = if hurdHeaders != null then "20100512" else "2.13"; + version = if hurdHeaders != null then "20100512" else "2.14.1"; needsPortsNative = stdenv.isMips || stdenv.isArm; needsPortsCross = cross.arch == "mips" || cross.arch == "arm"; @@ -20,8 +20,8 @@ let else needsPortsCross; srcPorts = fetchurl { - url = "mirror://gnu/glibc/glibc-ports-2.13.tar.bz2"; - sha256 = "0npffql62m1xba15l1wkaqf2p0l2bvb33720gx28764jmq0la75i"; + url = "mirror://gnu/glibc/glibc-ports-2.14.1.tar.bz2"; + sha256 = "1acs4sd5mjzmssmd0md6dfqwnziph2am7v09mbnnd8aadpxhm0qw"; }; in @@ -148,7 +148,7 @@ stdenv.mkDerivation ({ } else fetchurl { url = "mirror://gnu/glibc/glibc-${version}.tar.bz2"; - sha256 = "1cnv319ysc8nkwpqw6f6ymb6b8hbl0nyvyx48sddkrj50lmcjwq1"; + sha256 = "0fsvf5d6sib483rp7asdy8hs0dysxqkrvw316c82hsxy7vxa51bf"; }; # `fetchurl' is a function and thus should not be passed to the diff --git a/pkgs/development/libraries/glibc-2.13/default.nix b/pkgs/development/libraries/glibc-2.14/default.nix similarity index 100% rename from pkgs/development/libraries/glibc-2.13/default.nix rename to pkgs/development/libraries/glibc-2.14/default.nix diff --git a/pkgs/development/libraries/glibc-2.13/glibc-elf-localscope.patch b/pkgs/development/libraries/glibc-2.14/glibc-elf-localscope.patch similarity index 100% rename from pkgs/development/libraries/glibc-2.13/glibc-elf-localscope.patch rename to pkgs/development/libraries/glibc-2.14/glibc-elf-localscope.patch diff --git a/pkgs/development/libraries/glibc-2.13/info.nix b/pkgs/development/libraries/glibc-2.14/info.nix similarity index 100% rename from pkgs/development/libraries/glibc-2.13/info.nix rename to pkgs/development/libraries/glibc-2.14/info.nix diff --git a/pkgs/development/libraries/glibc-2.13/locales-builder.sh b/pkgs/development/libraries/glibc-2.14/locales-builder.sh similarity index 100% rename from pkgs/development/libraries/glibc-2.13/locales-builder.sh rename to pkgs/development/libraries/glibc-2.14/locales-builder.sh diff --git a/pkgs/development/libraries/glibc-2.13/locales.nix b/pkgs/development/libraries/glibc-2.14/locales.nix similarity index 100% rename from pkgs/development/libraries/glibc-2.13/locales.nix rename to pkgs/development/libraries/glibc-2.14/locales.nix diff --git a/pkgs/development/libraries/glibc-2.13/nix-locale-archive.patch b/pkgs/development/libraries/glibc-2.14/nix-locale-archive.patch similarity index 100% rename from pkgs/development/libraries/glibc-2.13/nix-locale-archive.patch rename to pkgs/development/libraries/glibc-2.14/nix-locale-archive.patch diff --git a/pkgs/development/libraries/glibc-2.13/nss-skip-unavail.patch b/pkgs/development/libraries/glibc-2.14/nss-skip-unavail.patch similarity index 100% rename from pkgs/development/libraries/glibc-2.13/nss-skip-unavail.patch rename to pkgs/development/libraries/glibc-2.14/nss-skip-unavail.patch diff --git a/pkgs/development/libraries/glibc-2.13/rpcgen-path.patch b/pkgs/development/libraries/glibc-2.14/rpcgen-path.patch similarity index 100% rename from pkgs/development/libraries/glibc-2.13/rpcgen-path.patch rename to pkgs/development/libraries/glibc-2.14/rpcgen-path.patch diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index e31114ca573..c15f1f093d0 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -3384,7 +3384,7 @@ let glfw = callPackage ../development/libraries/glfw { }; - glibc = glibc213; + glibc = glibc214; glibc25 = callPackage ../development/libraries/glibc-2.5 { kernelHeaders = linuxHeaders_2_6_28; @@ -3408,15 +3408,15 @@ let installLocales = getConfig [ "glibc" "locales" ] false; }); - glibc213 = (callPackage ../development/libraries/glibc-2.13 { + glibc214 = (callPackage ../development/libraries/glibc-2.14 { kernelHeaders = linuxHeaders; installLocales = getConfig [ "glibc" "locales" ] false; machHeaders = null; hurdHeaders = null; gccCross = null; - }) // (if crossSystem != null then { hostDrv = glibc213Cross; } else {}); + }) // (if crossSystem != null then { hostDrv = glibc214Cross; } else {}); - glibc213Cross = forceBuildDrv (makeOverridable (import ../development/libraries/glibc-2.13) + glibc214Cross = forceBuildDrv (makeOverridable (import ../development/libraries/glibc-2.14) (let crossGNU = (crossSystem != null && crossSystem.config == "i586-pc-gnu"); in ({ inherit stdenv fetchurl; @@ -3431,7 +3431,7 @@ let then { inherit machHeaders hurdHeaders mig fetchgit; } else { })))); - glibcCross = glibc213Cross; + glibcCross = glibc214Cross; # We can choose: libcCrossChooser = name : if (name == "glibc") then glibcCross @@ -3446,9 +3446,9 @@ let installLocales = getConfig [ "glibc" "locales" ] false; }; - glibcLocales = callPackage ../development/libraries/glibc-2.13/locales.nix { }; + glibcLocales = callPackage ../development/libraries/glibc-2.14/locales.nix { }; - glibcInfo = callPackage ../development/libraries/glibc-2.13/info.nix { }; + glibcInfo = callPackage ../development/libraries/glibc-2.14/info.nix { }; glibc_multi = runCommand "${glibc.name}-multi" From 706b80c28223486d84ae1e809323fc553b271438 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?= Date: Tue, 25 Oct 2011 18:52:32 +0000 Subject: [PATCH 314/970] I wrote bad my attempt at -static-libgcc. Retrying. svn path=/nixpkgs/branches/stdenv-updates/; revision=30024 --- pkgs/development/libraries/zlib/default.nix | 2 +- pkgs/development/tools/misc/binutils/default.nix | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/zlib/default.nix b/pkgs/development/libraries/zlib/default.nix index 631cd50dd68..13157601e6f 100644 --- a/pkgs/development/libraries/zlib/default.nix +++ b/pkgs/development/libraries/zlib/default.nix @@ -19,7 +19,7 @@ stdenv.mkDerivation (rec { # As zlib takes part in the stdenv building, we don't want references # to the bootstrap-tools libgcc (as uses to happen on arm/mips) - NIX_LDFLAGS = "-static-libgcc"; + NIX_CFLAGS_COMPILE = "-static-libgcc"; crossAttrs = { dontStrip = if static then true else false; diff --git a/pkgs/development/tools/misc/binutils/default.nix b/pkgs/development/tools/misc/binutils/default.nix index 59082aa2f27..2eb9d43bcbe 100644 --- a/pkgs/development/tools/misc/binutils/default.nix +++ b/pkgs/development/tools/misc/binutils/default.nix @@ -55,7 +55,7 @@ stdenv.mkDerivation rec { # As binutils takes part in the stdenv building, we don't want references # to the bootstrap-tools libgcc (as uses to happen on arm/mips) - NIX_LDFLAGS = "-static-libgcc"; + NIX_CFLAGS_COMPILE = "-static-libgcc"; configureFlags = "--disable-werror" # needed for dietlibc build + stdenv.lib.optionalString (stdenv.system == "mips64-linux") From 621e87f821f9f5d7af243441d7816d196977857e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?= Date: Tue, 25 Oct 2011 20:34:19 +0000 Subject: [PATCH 315/970] Adding a newer dovecot svn path=/nixpkgs/trunk/; revision=30025 --- pkgs/servers/mail/dovecot/2.0.nix | 20 ++++++++++++++++++++ pkgs/top-level/all-packages.nix | 1 + 2 files changed, 21 insertions(+) create mode 100644 pkgs/servers/mail/dovecot/2.0.nix diff --git a/pkgs/servers/mail/dovecot/2.0.nix b/pkgs/servers/mail/dovecot/2.0.nix new file mode 100644 index 00000000000..a2278533dad --- /dev/null +++ b/pkgs/servers/mail/dovecot/2.0.nix @@ -0,0 +1,20 @@ +{stdenv, fetchurl, openssl, pam}: + +stdenv.mkDerivation { + name = "dovecot-2.0.15"; + + buildInputs = [openssl pam]; + + src = fetchurl { + url = http://dovecot.org/releases/2.0/dovecot-2.0.15.tar.gz; + sha256 = "03byp6alxxk65qfjjnqp6kcncs5cdiqgskx90nk9kcnynl1h6r33"; + }; + + meta = { + homepage = http://dovecot.org/; + description = "Open source IMAP and POP3 email server written with security primarily in mind"; + 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 1cf5ed27387..18339e3ea59 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -4873,6 +4873,7 @@ let dovecot = callPackage ../servers/mail/dovecot { }; dovecot_1_1_1 = callPackage ../servers/mail/dovecot/1.1.1.nix { }; + dovecot_2_0 = callPackage ../servers/mail/dovecot/2.0.nix { }; ejabberd = callPackage ../servers/xmpp/ejabberd { erlang = erlangR13B ; From 892889cf358e7858fee32e1c7fc83c53650ea706 Mon Sep 17 00:00:00 2001 From: Shea Levy Date: Tue, 25 Oct 2011 20:49:22 +0000 Subject: [PATCH 316/970] Add netperf I will add meta later, I promise, I just need to use this now svn path=/nixpkgs/trunk/; revision=30026 --- pkgs/applications/networking/netperf/default.nix | 11 +++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 13 insertions(+) create mode 100644 pkgs/applications/networking/netperf/default.nix diff --git a/pkgs/applications/networking/netperf/default.nix b/pkgs/applications/networking/netperf/default.nix new file mode 100644 index 00000000000..7ef6a86c5eb --- /dev/null +++ b/pkgs/applications/networking/netperf/default.nix @@ -0,0 +1,11 @@ +{stdenv, fetchurl}: + +stdenv.mkDerivation rec { + name = "netperf-2.5.0"; + + src = fetchurl { + url = "ftp://ftp.netperf.org/netperf/${name}.tar.bz2"; + sha256 = "1l06bb99b4wfnmq247b8rvp4kn3w6bh1m46ri4d74z22li7br545"; + }; +} + diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 18339e3ea59..120521058f4 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -899,6 +899,8 @@ let most = callPackage ../tools/misc/most { }; + netperf = callPackage ../applications/networking/netperf { }; + ninka = callPackage ../development/tools/misc/ninka { }; nodejs = callPackage ../development/web/nodejs {}; From 61c4b72f0ed70c46a2f0041db871226581763c6f Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Wed, 26 Oct 2011 09:58:19 +0000 Subject: [PATCH 317/970] coreutils: added missing xz build input svn path=/nixpkgs/branches/stdenv-updates/; revision=30028 --- pkgs/tools/misc/coreutils/default.nix | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/misc/coreutils/default.nix b/pkgs/tools/misc/coreutils/default.nix index 26c4d0fbdce..b1a740ab5f9 100644 --- a/pkgs/tools/misc/coreutils/default.nix +++ b/pkgs/tools/misc/coreutils/default.nix @@ -1,6 +1,8 @@ { stdenv, fetchurl, perl, gmp ? null , aclSupport ? false, acl ? null -, selinuxSupport? false, libselinux ? null, libsepol ? null }: +, selinuxSupport? false, libselinux ? null, libsepol ? null +, xz +}: assert aclSupport -> acl != null; assert selinuxSupport -> ( (libselinux != null) && (libsepol != null) ); @@ -13,7 +15,7 @@ stdenv.mkDerivation (rec { sha256 = "0bdh31fvd0ng2sqrrbz0a4yy084hmj76pbljksqyv4ljq4bhh4hd"; }; - buildNativeInputs = [ perl ]; + buildNativeInputs = [ perl xz ]; buildInputs = [ gmp ] ++ stdenv.lib.optional aclSupport acl ++ stdenv.lib.optional selinuxSupport libselinux From 4353727ac8e1df2ae56179716b4ffba6bfc5e0b0 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Wed, 26 Oct 2011 10:32:40 +0000 Subject: [PATCH 318/970] libtirpc: added version 0.2.2 The glibc maintainers in their wisdom have dropped RPC support. That change causes plenty of builds to fail, like PAM. Users are supposed to use libtirpc instead, which, naturally, doesn't compile with glibc 2.14. I'm adding the library anyway, just so that we have it. svn path=/nixpkgs/branches/stdenv-updates/; revision=30029 --- .../libraries/libtirpc/default.nix | 22 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 24 insertions(+) create mode 100644 pkgs/development/libraries/libtirpc/default.nix diff --git a/pkgs/development/libraries/libtirpc/default.nix b/pkgs/development/libraries/libtirpc/default.nix new file mode 100644 index 00000000000..d9678f646b8 --- /dev/null +++ b/pkgs/development/libraries/libtirpc/default.nix @@ -0,0 +1,22 @@ +{ stdenv, fetchurl }: + +let + version = "0.2.2"; +in +stdenv.mkDerivation { + name = "libtirpc-${version}"; + + src = fetchurl { + url = "mirror://sourceforge/libtirpc/libtirpc-${version}.tar.bz2"; + sha256 = "f05eb17c85d62423858b8f74512cfe66a9ae1cedf93f03c2a0a32e04f0a33705"; + }; + + meta = { + homepage = "http://sourceforge.net/projects/libtirpc/"; + description = "a port of Suns Transport-Independent RPC library to Linux"; + license = stdenv.lib.licenses.bsd3; + + platforms = stdenv.lib.platforms.linux; + maintainers = [ stdenv.lib.maintainers.simons ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index b8c5237f049..797fcb1dde3 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -907,6 +907,8 @@ let lftp = callPackage ../tools/networking/lftp { }; + libtirpc = callPackage ../development/libraries/libtirpc { }; + libtorrent = callPackage ../tools/networking/p2p/libtorrent { }; logrotate = callPackage ../tools/system/logrotate { }; From 51e5c3b73d40db54f1284f3a5b1adfe676f2e594 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Wed, 26 Oct 2011 10:47:19 +0000 Subject: [PATCH 319/970] added glibc-2.13 again svn path=/nixpkgs/branches/stdenv-updates/; revision=30030 --- .../libraries/glibc-2.13/builder.sh | 55 +++++ .../libraries/glibc-2.13/common.nix | 210 ++++++++++++++++++ .../libraries/glibc-2.13/default.nix | 83 +++++++ .../glibc-2.13/glibc-elf-localscope.patch | 82 +++++++ .../development/libraries/glibc-2.13/info.nix | 26 +++ .../libraries/glibc-2.13/locales-builder.sh | 17 ++ .../libraries/glibc-2.13/locales.nix | 47 ++++ .../glibc-2.13/nix-locale-archive.patch | 116 ++++++++++ .../glibc-2.13/nss-skip-unavail.patch | 21 ++ .../libraries/glibc-2.13/rpcgen-path.patch | 72 ++++++ 10 files changed, 729 insertions(+) create mode 100644 pkgs/development/libraries/glibc-2.13/builder.sh create mode 100644 pkgs/development/libraries/glibc-2.13/common.nix create mode 100644 pkgs/development/libraries/glibc-2.13/default.nix create mode 100644 pkgs/development/libraries/glibc-2.13/glibc-elf-localscope.patch create mode 100644 pkgs/development/libraries/glibc-2.13/info.nix create mode 100644 pkgs/development/libraries/glibc-2.13/locales-builder.sh create mode 100644 pkgs/development/libraries/glibc-2.13/locales.nix create mode 100644 pkgs/development/libraries/glibc-2.13/nix-locale-archive.patch create mode 100644 pkgs/development/libraries/glibc-2.13/nss-skip-unavail.patch create mode 100644 pkgs/development/libraries/glibc-2.13/rpcgen-path.patch diff --git a/pkgs/development/libraries/glibc-2.13/builder.sh b/pkgs/development/libraries/glibc-2.13/builder.sh new file mode 100644 index 00000000000..9a1c1490019 --- /dev/null +++ b/pkgs/development/libraries/glibc-2.13/builder.sh @@ -0,0 +1,55 @@ +# Glibc cannot have itself in its RPATH. +export NIX_NO_SELF_RPATH=1 + +source $stdenv/setup + +postConfigure() { + # Hack: get rid of the `-static' flag set by the bootstrap stdenv. + # This has to be done *after* `configure' because it builds some + # test binaries. + export NIX_CFLAGS_LINK= + export NIX_LDFLAGS_BEFORE= + + export NIX_DONT_SET_RPATH=1 + unset CFLAGS +} + + +postInstall() { + if test -n "$installLocales"; then + make -j${NIX_BUILD_CORES:-1} -l${NIX_BUILD_CORES:-1} localedata/install-locales + fi + + test -f $out/etc/ld.so.cache && rm $out/etc/ld.so.cache + + # FIXME: Use `test -n $linuxHeaders' when `kernelHeaders' has been + # renamed. + if test -z "$hurdHeaders"; then + # Include the Linux kernel headers in Glibc, except the `scsi' + # subdirectory, which Glibc provides itself. + (cd $out/include && \ + ln -sv $(ls -d $kernelHeaders/include/* | grep -v 'scsi$') .) + fi + + if test -f "$out/lib/libhurduser.so"; then + # libc.so, libhurduser.so, and libmachuser.so depend on each + # other, so add them to libc.so (a RUNPATH on libc.so.0.3 + # would be ignored by the cross-linker.) + echo "adding \`libhurduser.so' and \`libmachuser.so' to the \`libc.so' linker script..." + sed -i "$out/lib/libc.so" \ + -e"s|\(libc\.so\.[^ ]\+\>\)|\1 $out/lib/libhurduser.so $out/lib/libmachuser.so|g" + fi + + # Fix for NIXOS-54 (ldd not working on x86_64). Make a symlink + # "lib64" to "lib". + if test -n "$is64bit"; then + ln -s lib $out/lib64 + fi + + # This file, that should not remain in the glibc derivation, + # may have not been created during the preInstall + rm -f $out/lib/libgcc_s.so.1 +} + + +genericBuild diff --git a/pkgs/development/libraries/glibc-2.13/common.nix b/pkgs/development/libraries/glibc-2.13/common.nix new file mode 100644 index 00000000000..15941c2a43b --- /dev/null +++ b/pkgs/development/libraries/glibc-2.13/common.nix @@ -0,0 +1,210 @@ +/* Build configuration used to build glibc, Info files, and locale + information. */ + +cross : + +{ name, fetchurl, stdenv, installLocales ? false +, gccCross ? null, kernelHeaders ? null +, machHeaders ? null, hurdHeaders ? null, mig ? null, fetchgit ? null +, profilingLibraries ? false, meta +, preConfigure ? "", ... }@args : + +let + # For GNU/Hurd, see below. + version = if hurdHeaders != null then "20100512" else "2.13"; + + needsPortsNative = stdenv.isMips || stdenv.isArm; + needsPortsCross = cross.arch == "mips" || cross.arch == "arm"; + needsPorts = if (stdenv ? cross) && stdenv.cross != null then true + else if cross == null then needsPortsNative + else needsPortsCross; + + srcPorts = fetchurl { + url = "mirror://gnu/glibc/glibc-ports-2.13.tar.bz2"; + sha256 = "0npffql62m1xba15l1wkaqf2p0l2bvb33720gx28764jmq0la75i"; + }; + +in + +assert (cross != null) -> (gccCross != null); + +assert (mig != null) -> (machHeaders != null); +assert (machHeaders != null) -> (hurdHeaders != null); +assert (hurdHeaders != null) -> (fetchgit != null); + +stdenv.mkDerivation ({ + inherit kernelHeaders installLocales; + + # The host/target system. + crossConfig = if (cross != null) then cross.config else null; + + inherit (stdenv) is64bit; + + enableParallelBuilding = true; + + patches = + stdenv.lib.optional (fetchgit == null) + /* Fix for NIXPKGS-79: when doing host name lookups, when + nsswitch.conf contains a line like + + hosts: files mdns4_minimal [NOTFOUND=return] dns mdns4 + + don't return an error when mdns4_minimal can't be found. This + is a bug in Glibc: when a service can't be found, NSS should + continue to the next service unless "UNAVAIL=return" is set. + ("NOTFOUND=return" refers to the service returning a NOTFOUND + error, not the service itself not being found.) The reason is + that the "status" variable (while initialised to UNAVAIL) is + outside of the loop that iterates over the services, the + "files" service sets status to NOTFOUND. So when the call to + find "mdns4_minimal" fails, "status" will still be NOTFOUND, + and it will return instead of continuing to "dns". Thus, the + line + + hosts: mdns4_minimal [NOTFOUND=return] dns mdns4 + + does work because "status" will contain UNAVAIL after the + failure to find mdns4_minimal. */ + ./nss-skip-unavail.patch + ++ [ + /* Have rpcgen(1) look for cpp(1) in $PATH. */ + ./rpcgen-path.patch + + /* Allow nixos and nix handle the locale-archive. */ + ./nix-locale-archive.patch + + /* Without this patch many KDE binaries crash. */ + ./glibc-elf-localscope.patch + ]; + + postPatch = '' + # Needed for glibc to build with the gnumake 3.82 + # http://comments.gmane.org/gmane.linux.lfs.support/31227 + sed -i 's/ot \$/ot:\n\ttouch $@\n$/' manual/Makefile + + # nscd needs libgcc, and we don't want it dynamically linked + # because we don't want it to depend on bootstrap-tools libs. + echo "LDFLAGS-nscd += -static-libgcc" >> nscd/Makefile + ''; + + configureFlags = [ + "-C" + "--enable-add-ons" + "--localedir=/var/run/current-system/sw/lib/locale" + (if kernelHeaders != null + then "--with-headers=${kernelHeaders}/include" + else "--without-headers") + (if profilingLibraries + then "--enable-profile" + else "--disable-profile") + ] ++ stdenv.lib.optionals (cross != null) [ + (if cross.withTLS then "--with-tls" else "--without-tls") + (if cross.float == "soft" then "--without-fp" else "--with-fp") + "--enable-kernel=2.6.0" + "--with-__thread" + ] ++ stdenv.lib.optionals (stdenv.system == "armv5tel-linux") [ + "--host=arm-linux-gnueabi" + "--build=arm-linux-gnueabi" + "--without-fp" + + # To avoid linking with -lgcc_s (dynamic link) + # so the glibc does not depend on its compiler store path + "libc_cv_as_needed=no" + ]; + + buildInputs = stdenv.lib.optionals (cross != null) [ gccCross ] + ++ stdenv.lib.optional (mig != null) mig; + + # Needed to install share/zoneinfo/zone.tab. Set to impure /bin/sh to + # prevent a retained dependency on the bootstrap tools in the stdenv-linux + # bootstrap. + BASH_SHELL = "/bin/sh"; + + # Workaround for this bug: + # http://sourceware.org/bugzilla/show_bug.cgi?id=411 + # I.e. when gcc is compiled with --with-arch=i686, then the + # preprocessor symbol `__i686' will be defined to `1'. This causes + # the symbol __i686.get_pc_thunk.dx to be mangled. + NIX_CFLAGS_COMPILE = stdenv.lib.optionalString (stdenv.system == "i686-linux") "-U__i686"; +} + +# Remove the `gccCross' attribute so that the *native* glibc store path +# doesn't depend on whether `gccCross' is null or not. +// (removeAttrs args [ "gccCross" ]) // + +{ + name = name + "-${version}" + + stdenv.lib.optionalString (cross != null) "-${cross.config}"; + + src = + if hurdHeaders != null + then fetchgit { + # Shamefully the "official" glibc won't build on GNU, so use the one + # maintained by the Hurd folks, `tschwinge/Roger_Whittaker' branch. + # See . + url = "git://git.sv.gnu.org/hurd/glibc.git"; + sha256 = "f3590a54a9d897d121f91113949edbaaf3e30cdeacbb8d0a44de7b6564f6643e"; + rev = "df4c3faf0ccc848b5a8086c222bdb42679a9798f"; + } + else fetchurl { + url = "mirror://gnu/glibc/glibc-${version}.tar.bz2"; + sha256 = "1cnv319ysc8nkwpqw6f6ymb6b8hbl0nyvyx48sddkrj50lmcjwq1"; + }; + + # `fetchurl' is a function and thus should not be passed to the + # `derivation' primitive. + fetchurl = null; + + # Remove absolute paths from `configure' & co.; build out-of-tree. + preConfigure = '' + export PWD_P=$(type -tP pwd) + for i in configure io/ftwtest-sh; do + # Can't use substituteInPlace here because replace hasn't been + # built yet in the bootstrap. + sed -i "$i" -e "s^/bin/pwd^$PWD_P^g" + done + + ${if needsPorts then "tar xvf ${srcPorts}" else ""} + + mkdir ../build + cd ../build + + configureScript="`pwd`/../$sourceRoot/configure" + + ${preConfigure} + ''; + + meta = { + homepage = http://www.gnu.org/software/libc/; + description = "The GNU C Library"; + + longDescription = + '' Any Unix-like operating system needs a C library: the library which + defines the "system calls" and other basic facilities such as + open, malloc, printf, exit... + + The GNU C library is used as the C library in the GNU system and + most systems with the Linux kernel. + ''; + + license = "LGPLv2+"; + + maintainers = [ stdenv.lib.maintainers.ludo ]; + platforms = stdenv.lib.platforms.linux; + } // meta; +} + +// + +(if hurdHeaders != null + then { + # Work around the fact that the configure snippet that looks for + # does not honor `--with-headers=$sysheaders' and that + # glibc expects both Mach and Hurd headers to be in the same place. + CPATH = "${hurdHeaders}/include:${machHeaders}/include"; + + # `fetchgit' is a function and thus should not be passed to the + # `derivation' primitive. + fetchgit = null; + } + else { })) diff --git a/pkgs/development/libraries/glibc-2.13/default.nix b/pkgs/development/libraries/glibc-2.13/default.nix new file mode 100644 index 00000000000..31a8ef13a4f --- /dev/null +++ b/pkgs/development/libraries/glibc-2.13/default.nix @@ -0,0 +1,83 @@ +{ stdenv, fetchurl, kernelHeaders +, machHeaders ? null, hurdHeaders ? null, mig ? null, fetchgit ? null +, installLocales ? true +, profilingLibraries ? false +, gccCross ? null +}: + +assert stdenv.gcc.gcc != null; + +let + build = import ./common.nix; + cross = if gccCross != null then gccCross.target else null; +in + build cross ({ + name = "glibc"; + + inherit fetchurl stdenv kernelHeaders installLocales profilingLibraries + gccCross; + + builder = ./builder.sh; + + # When building glibc from bootstrap-tools, we need libgcc_s at RPATH for + # any program we run, because the gcc will have been placed at a new + # store path than that determined when built (as a source for the + # bootstrap-tools tarball) + # Building from a proper gcc staying in the path where it was installed, + # libgcc_s will not be at {gcc}/lib, and gcc's libgcc will be found without + # any special hack. + preInstall = '' + if [ -f ${stdenv.gcc.gcc}/lib/libgcc_s.so.1 ]; then + ensureDir $out/lib + ln -s ${stdenv.gcc.gcc}/lib/libgcc_s.so.1 $out/lib/libgcc_s.so.1 + fi + ''; + + meta.description = "The GNU C Library"; + } + + // + + (if hurdHeaders != null + then rec { + inherit machHeaders hurdHeaders mig fetchgit; + + propagatedBuildInputs = [ machHeaders hurdHeaders ]; + + passthru = { + # When building GCC itself `propagatedBuildInputs' above is not + # honored, so we pass it here so that the GCC builder can do the right + # thing. + inherit propagatedBuildInputs; + }; + } + else { }) + + // + + (if cross != null + then { + preConfigure = '' + sed -i s/-lgcc_eh//g "../$sourceRoot/Makeconfig" + + cat > config.cache << "EOF" + libc_cv_forced_unwind=yes + libc_cv_c_cleanup=yes + libc_cv_gnu89_inline=yes + # Only due to a problem in gcc configure scripts: + libc_cv_sparc64_tls=${if cross.withTLS then "yes" else "no"} + EOF + export BUILD_CC=gcc + export CC="$crossConfig-gcc" + export AR="$crossConfig-ar" + export RANLIB="$crossConfig-ranlib" + + dontStrip=1 + ''; + + # To avoid a dependency on the build system 'bash'. + preFixup = '' + rm $out/bin/{ldd,tzselect,catchsegv,xtrace} + ''; + } + else {})) diff --git a/pkgs/development/libraries/glibc-2.13/glibc-elf-localscope.patch b/pkgs/development/libraries/glibc-2.13/glibc-elf-localscope.patch new file mode 100644 index 00000000000..98f7f81087b --- /dev/null +++ b/pkgs/development/libraries/glibc-2.13/glibc-elf-localscope.patch @@ -0,0 +1,82 @@ +diff -ru a/elf/dl-close.c b/elf/dl-close.c +--- a/elf/dl-close.c 2011-02-04 00:35:03.000000000 +0100 ++++ b/elf/dl-close.c 2011-02-22 02:16:12.367883000 +0100 +@@ -180,24 +186,28 @@ + /* Signal the object is still needed. */ + l->l_idx = IDX_STILL_USED; + ++#define mark_used(dmap) \ ++ do { \ ++ if ((dmap)->l_idx != IDX_STILL_USED) \ ++ { \ ++ assert ((dmap)->l_idx >= 0 && (dmap)->l_idx < nloaded); \ ++ \ ++ if (!used[(dmap)->l_idx]) \ ++ { \ ++ used[(dmap)->l_idx] = 1; \ ++ if ((dmap)->l_idx - 1 < done_index) \ ++ done_index = (dmap)->l_idx - 1; \ ++ } \ ++ } \ ++ } while (0) ++ + /* Mark all dependencies as used. */ + if (l->l_initfini != NULL) + { + struct link_map **lp = &l->l_initfini[1]; + while (*lp != NULL) + { +- if ((*lp)->l_idx != IDX_STILL_USED) +- { +- assert ((*lp)->l_idx >= 0 && (*lp)->l_idx < nloaded); +- +- if (!used[(*lp)->l_idx]) +- { +- used[(*lp)->l_idx] = 1; +- if ((*lp)->l_idx - 1 < done_index) +- done_index = (*lp)->l_idx - 1; +- } +- } +- ++ mark_used(*lp); + ++lp; + } + } +@@ -206,19 +216,25 @@ + for (unsigned int j = 0; j < l->l_reldeps->act; ++j) + { + struct link_map *jmap = l->l_reldeps->list[j]; +- +- if (jmap->l_idx != IDX_STILL_USED) +- { +- assert (jmap->l_idx >= 0 && jmap->l_idx < nloaded); +- +- if (!used[jmap->l_idx]) +- { +- used[jmap->l_idx] = 1; +- if (jmap->l_idx - 1 < done_index) +- done_index = jmap->l_idx - 1; +- } +- } ++ mark_used(jmap); + } ++ /* And the same for owners of our scopes; normally, our last ++ scope provider would render us unused, but this can be ++ prevented by the NODELETE flag. */ ++ if (__builtin_expect(l->l_type == lt_loaded ++ && (l->l_flags_1 & DF_1_NODELETE), 0)) ++ for (size_t cnt = 0; l->l_scope[cnt] != NULL; ++cnt) ++ /* This relies on l_scope[] entries being always set either ++ to its own l_symbolic_searchlist address, or some map's ++ l_searchlist address. */ ++ if (l->l_scope[cnt] != &l->l_symbolic_searchlist) ++ { ++ struct link_map *ls = (struct link_map *) ++ ((char *) l->l_scope[cnt] ++ - offsetof (struct link_map, l_searchlist)); ++ assert (ls->l_ns == nsid); ++ mark_used(ls); ++ } + } + + /* Sort the entries. */ diff --git a/pkgs/development/libraries/glibc-2.13/info.nix b/pkgs/development/libraries/glibc-2.13/info.nix new file mode 100644 index 00000000000..84a16fefce9 --- /dev/null +++ b/pkgs/development/libraries/glibc-2.13/info.nix @@ -0,0 +1,26 @@ +{ stdenv, fetchurl, texinfo, perl }: + +let build = import ./common.nix; +in + /* null cross builder */ + build null { + name = "glibc-info"; + + inherit fetchurl stdenv; + + configureFlags = [ "--enable-add-ons" ]; + + buildInputs = [ texinfo perl ]; + + buildPhase = "make info"; + + # I don't know why the info is not generated in 'build' + # Somehow building the info still does not work, because the final + # libc.info hasn't a Top node. + installPhase = '' + ensureDir "$out/share/info" + cp -v "../$sourceRoot/manual/"*.info* "$out/share/info" + ''; + + meta.description = "GNU Info manual of the GNU C Library"; + } diff --git a/pkgs/development/libraries/glibc-2.13/locales-builder.sh b/pkgs/development/libraries/glibc-2.13/locales-builder.sh new file mode 100644 index 00000000000..d732e208fa2 --- /dev/null +++ b/pkgs/development/libraries/glibc-2.13/locales-builder.sh @@ -0,0 +1,17 @@ +# Glibc cannot have itself in its RPATH. +export NIX_NO_SELF_RPATH=1 + +source $stdenv/setup + +postConfigure() { + # Hack: get rid of the `-static' flag set by the bootstrap stdenv. + # This has to be done *after* `configure' because it builds some + # test binaries. + export NIX_CFLAGS_LINK= + export NIX_LDFLAGS_BEFORE= + + export NIX_DONT_SET_RPATH=1 + unset CFLAGS +} + +genericBuild diff --git a/pkgs/development/libraries/glibc-2.13/locales.nix b/pkgs/development/libraries/glibc-2.13/locales.nix new file mode 100644 index 00000000000..d598e0e094d --- /dev/null +++ b/pkgs/development/libraries/glibc-2.13/locales.nix @@ -0,0 +1,47 @@ +/* This function builds just the `lib/locale/locale-archive' file from + Glibc and nothing else. If `allLocales' is true, all supported + locales are included; otherwise, just the locales listed in + `locales'. See localedata/SUPPORTED in the Glibc source tree for + the list of all supported locales: + http://sourceware.org/cgi-bin/cvsweb.cgi/libc/localedata/SUPPORTED?cvsroot=glibc +*/ + +{ stdenv, fetchurl, allLocales ? true, locales ? ["en_US.UTF-8/UTF-8"] }: + +let build = import ./common.nix; +in + build null { + name = "glibc-locales"; + + inherit fetchurl stdenv; + installLocales = true; + + builder = ./locales-builder.sh; + + # Awful hack: `localedef' doesn't allow the path to `locale-archive' + # to be overriden, but you *can* specify a prefix, i.e. it will use + # //lib/locale/locale-archive. So we use + # $TMPDIR as a prefix, meaning that the locale-archive is placed in + # $TMPDIR/nix/store/...-glibc-.../lib/locale/locale-archive. + buildPhase = + '' + mkdir -p $TMPDIR/"$(dirname $(readlink -f $(type -p localedef)))/../lib/locale" + + # Hack to allow building of the locales (needed since glibc-2.12) + sed -i -e "s,^LOCALEDEF=.*,LOCALEDEF=localedef --prefix=$TMPDIR," -e \ + /library-path/d ../glibc-2*/localedata/Makefile + ${if allLocales then "" else + "echo SUPPORTED-LOCALES=\"${toString locales}\" > ../glibc-2*/localedata/SUPPORTED"} + + make localedata/install-locales \ + localedir=$out/lib/locale \ + ''; + + installPhase = + '' + ensureDir "$out/lib/locale" + cp -v "$TMPDIR/nix/store/"*"/lib/locale/locale-archive" "$out/lib/locale" + ''; + + meta.description = "Locale information for the GNU C Library"; + } diff --git a/pkgs/development/libraries/glibc-2.13/nix-locale-archive.patch b/pkgs/development/libraries/glibc-2.13/nix-locale-archive.patch new file mode 100644 index 00000000000..aca904f7ff4 --- /dev/null +++ b/pkgs/development/libraries/glibc-2.13/nix-locale-archive.patch @@ -0,0 +1,116 @@ +diff --git a/locale/loadarchive.c b/locale/loadarchive.c +index d545f17..0d8638a 100644 +--- a/locale/loadarchive.c ++++ b/locale/loadarchive.c +@@ -124,6 +124,25 @@ calculate_head_size (const struct locarhead *h) + } + + ++static int ++open_locale_archive () ++{ ++ int fd = -1; ++ char *path = getenv ("LOCALE_ARCHIVE_2_11"); ++ char *path2 = getenv ("LOCALE_ARCHIVE"); ++ const char *usualpath = "/usr/lib/locale/locale-archive"; ++ if (path) ++ fd = open_not_cancel_2 (path, O_RDONLY|O_LARGEFILE); ++ if (path2 && fd < 0) ++ fd = open_not_cancel_2 (path2, O_RDONLY|O_LARGEFILE); ++ if (fd < 0) ++ fd = open_not_cancel_2 (archfname, O_RDONLY|O_LARGEFILE); ++ if (fd < 0) ++ fd = open_not_cancel_2 (usualpath, O_RDONLY|O_LARGEFILE); ++ return fd; ++} ++ ++ + /* Find the locale *NAMEP in the locale archive, and return the + internalized data structure for its CATEGORY data. If this locale has + already been loaded from the archive, just returns the existing data +@@ -203,7 +222,7 @@ _nl_load_locale_from_archive (int category, const char **namep) + archmapped = &headmap; + + /* The archive has never been opened. */ +- fd = open_not_cancel_2 (archfname, O_RDONLY|O_LARGEFILE); ++ fd = open_locale_archive (); + if (fd < 0) + /* Cannot open the archive, for whatever reason. */ + return NULL; +@@ -394,7 +413,7 @@ _nl_load_locale_from_archive (int category, const char **namep) + if (fd == -1) + { + struct stat64 st; +- fd = open_not_cancel_2 (archfname, O_RDONLY|O_LARGEFILE); ++ fd = open_locale_archive (); + if (fd == -1) + /* Cannot open the archive, for whatever reason. */ + return NULL; +diff --git a/locale/programs/locale.c b/locale/programs/locale.c +index 77262b7..fddc00d 100644 +--- a/locale/programs/locale.c ++++ b/locale/programs/locale.c +@@ -628,6 +628,20 @@ nameentcmp (const void *a, const void *b) + ((const struct nameent *) b)->name); + } + ++static int ++open_nix_locale_archive (const char * fname, int access) ++{ ++ int fd = -1; ++ char *path = getenv ("LOCALE_ARCHIVE_2_11"); ++ char *path2 = getenv ("LOCALE_ARCHIVE"); ++ if (path) ++ fd = open64 (path, access); ++ if (path2 && fd < 0) ++ fd = open64 (path2, access); ++ if (fd < 0) ++ fd = open64 (fname, access); ++ return fd; ++} + + static int + write_archive_locales (void **all_datap, char *linebuf) +@@ -641,7 +658,7 @@ write_archive_locales (void **all_datap, char *linebuf) + int fd, ret = 0; + uint32_t cnt; + +- fd = open64 (ARCHIVE_NAME, O_RDONLY); ++ fd = open_nix_locale_archive (ARCHIVE_NAME, O_RDONLY); + if (fd < 0) + return 0; + +diff --git a/locale/programs/locarchive.c b/locale/programs/locarchive.c +index 85ba77d..3ad2af8 100644 +--- a/locale/programs/locarchive.c ++++ b/locale/programs/locarchive.c +@@ -512,6 +512,20 @@ enlarge_archive (struct locarhandle *ah, const struct locarhead *head) + *ah = new_ah; + } + ++static int ++open_nix_locale_archive (const char * fname, int access) ++{ ++ int fd = -1; ++ char *path = getenv ("LOCALE_ARCHIVE_2_11"); ++ char *path2 = getenv ("LOCALE_ARCHIVE"); ++ if (path) ++ fd = open64 (path, access); ++ if (path2 && fd < 0) ++ fd = open64 (path2, access); ++ if (fd < 0) ++ fd = open64 (fname, access); ++ return fd; ++} + + void + open_archive (struct locarhandle *ah, bool readonly) +@@ -531,7 +548,7 @@ open_archive (struct locarhandle *ah, bool readonly) + while (1) + { + /* Open the archive. We must have exclusive write access. */ +- fd = open64 (archivefname, readonly ? O_RDONLY : O_RDWR); ++ fd = open_nix_locale_archive (archivefname, readonly ? O_RDONLY : O_RDWR); + if (fd == -1) + { + /* Maybe the file does not yet exist. */ diff --git a/pkgs/development/libraries/glibc-2.13/nss-skip-unavail.patch b/pkgs/development/libraries/glibc-2.13/nss-skip-unavail.patch new file mode 100644 index 00000000000..e48dc2bc0a6 --- /dev/null +++ b/pkgs/development/libraries/glibc-2.13/nss-skip-unavail.patch @@ -0,0 +1,21 @@ +diff -ru glibc-2.11.2-orig/sysdeps/posix/getaddrinfo.c glibc-2.11.2/sysdeps/posix/getaddrinfo.c +--- glibc-2.11.2-orig/sysdeps/posix/getaddrinfo.c 2010-05-19 22:38:20.000000000 +0200 ++++ glibc-2.11.2/sysdeps/posix/getaddrinfo.c 2010-08-05 18:39:54.259556327 +0200 +@@ -505,8 +505,6 @@ + int no_data = 0; + int no_inet6_data = 0; + service_user *nip = NULL; +- enum nss_status inet6_status = NSS_STATUS_UNAVAIL; +- enum nss_status status = NSS_STATUS_UNAVAIL; + int no_more; + int old_res_options; + +@@ -702,6 +700,8 @@ + + while (!no_more) + { ++ enum nss_status inet6_status = NSS_STATUS_UNAVAIL; ++ enum nss_status status = NSS_STATUS_UNAVAIL; + no_data = 0; + nss_gethostbyname4_r fct4 + = __nss_lookup_function (nip, "gethostbyname4_r"); diff --git a/pkgs/development/libraries/glibc-2.13/rpcgen-path.patch b/pkgs/development/libraries/glibc-2.13/rpcgen-path.patch new file mode 100644 index 00000000000..fbb03dd5fad --- /dev/null +++ b/pkgs/development/libraries/glibc-2.13/rpcgen-path.patch @@ -0,0 +1,72 @@ +By default, rpcgen(1) looks for cpp(1) from a list of fixed absolute paths +(`/lib/cpp', etc.), which may only be overrided with the `-Y' option. This +patch makes it run any `cpp' command found in $PATH. + +--- glibc-2.7/sunrpc/rpc_main.c 2006-11-10 21:54:46.000000000 +0100 ++++ glibc-2.7/sunrpc/rpc_main.c 2009-04-22 14:32:10.000000000 +0200 +@@ -79,7 +79,7 @@ static const char *cmdname; + + static const char *svcclosetime = "120"; + static int cppDefined; /* explicit path for C preprocessor */ +-static const char *CPP = SUNOS_CPP; ++static const char *CPP = "cpp"; + static const char CPPFLAGS[] = "-C"; + static char *pathbuf; + static int cpp_pid; +@@ -108,7 +108,6 @@ static char *extendfile (const char *fil + static void open_output (const char *infile, const char *outfile); + static void add_warning (void); + static void clear_args (void); +-static void find_cpp (void); + static void open_input (const char *infile, const char *define); + static int check_nettype (const char *name, const char *list_to_check[]); + static void c_output (const char *infile, const char *define, +@@ -327,31 +326,6 @@ clear_args (void) + argcount = FIXEDARGS; + } + +-/* make sure that a CPP exists */ +-static void +-find_cpp (void) +-{ +- struct stat buf; +- +- if (stat (CPP, &buf) < 0) +- { /* /lib/cpp or explicit cpp does not exist */ +- if (cppDefined) +- { +- fprintf (stderr, _ ("cannot find C preprocessor: %s \n"), CPP); +- crash (); +- } +- else +- { /* try the other one */ +- CPP = SVR4_CPP; +- if (stat (CPP, &buf) < 0) +- { /* can't find any cpp */ +- fputs (_ ("cannot find any C preprocessor (cpp)\n"), stdout); +- crash (); +- } +- } +- } +-} +- + /* + * Open input file with given define for C-preprocessor + */ +@@ -370,7 +344,6 @@ open_input (const char *infile, const ch + switch (cpp_pid) + { + case 0: +- find_cpp (); + putarg (0, CPP); + putarg (1, CPPFLAGS); + addarg (define); +@@ -380,7 +353,7 @@ open_input (const char *infile, const ch + close (1); + dup2 (pd[1], 1); + close (pd[0]); +- execv (arglist[0], (char **) arglist); ++ execvp (arglist[0], (char **) arglist); + perror ("execv"); + exit (1); + case -1: From 3590b859c5e2a8b4fdff3ec06b25cf12e90a49d1 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Wed, 26 Oct 2011 10:48:55 +0000 Subject: [PATCH 320/970] Revert stdenv glibc back to version 2.13. Note that I didn't touch the glibcCross attribute! That still points to glibc 2.14. svn path=/nixpkgs/branches/stdenv-updates/; revision=30031 --- pkgs/top-level/all-packages.nix | 29 ++++++++++++++++++++++++++--- 1 file changed, 26 insertions(+), 3 deletions(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 797fcb1dde3..1caf577dec1 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -3401,7 +3401,9 @@ let glfw = callPackage ../development/libraries/glfw { }; - glibc = glibc214; + glibc = glibc213; + + glibcCross = glibc214Cross; glibc25 = callPackage ../development/libraries/glibc-2.5 { kernelHeaders = linuxHeaders_2_6_28; @@ -3425,6 +3427,29 @@ let installLocales = getConfig [ "glibc" "locales" ] false; }); + glibc213 = (callPackage ../development/libraries/glibc-2.13 { + kernelHeaders = linuxHeaders; + installLocales = getConfig [ "glibc" "locales" ] false; + machHeaders = null; + hurdHeaders = null; + gccCross = null; + }) // (if crossSystem != null then { hostDrv = glibc213Cross; } else {}); + + glibc213Cross = forceBuildDrv (makeOverridable (import ../development/libraries/glibc-2.13) + (let crossGNU = (crossSystem != null && crossSystem.config == "i586-pc-gnu"); + in ({ + inherit stdenv fetchurl; + gccCross = gccCrossStageStatic; + kernelHeaders = if crossGNU then hurdHeaders else linuxHeadersCross; + installLocales = getConfig [ "glibc" "locales" ] false; + } + + // + + (if crossGNU + then { inherit machHeaders hurdHeaders mig fetchgit; } + else { })))); + glibc214 = (callPackage ../development/libraries/glibc-2.14 { kernelHeaders = linuxHeaders; installLocales = getConfig [ "glibc" "locales" ] false; @@ -3448,8 +3473,6 @@ let then { inherit machHeaders hurdHeaders mig fetchgit; } else { })))); - glibcCross = glibc214Cross; - # We can choose: libcCrossChooser = name : if (name == "glibc") then glibcCross else if (name == "uclibc") then uclibcCross From 12ab90b047bc2be57b03cebb7c9ccb0bfa89dea2 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Wed, 26 Oct 2011 10:51:24 +0000 Subject: [PATCH 321/970] prune empty directories svn path=/nixpkgs/trunk/; revision=30032 From af640dee052611a636eee0f541ed907b0e18467f Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Wed, 26 Oct 2011 11:14:29 +0000 Subject: [PATCH 322/970] synchronize with trunk svn path=/nixpkgs/branches/stdenv-updates/; revision=30033 From eeb4d231b3cfa3355bfa0e7f7a2b0899a11cc3a5 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Wed, 26 Oct 2011 15:32:56 +0000 Subject: [PATCH 323/970] * Subversion updated to 1.7.1. svn path=/nixpkgs/trunk/; revision=30034 --- .../version-management/subversion/default.nix | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/pkgs/applications/version-management/subversion/default.nix b/pkgs/applications/version-management/subversion/default.nix index e1604ccc2e7..0199dd11302 100644 --- a/pkgs/applications/version-management/subversion/default.nix +++ b/pkgs/applications/version-management/subversion/default.nix @@ -19,13 +19,13 @@ assert compressionSupport -> neon.compressionSupport; stdenv.mkDerivation rec { - version = "1.6.17"; + version = "1.7.1"; name = "subversion-${version}"; src = fetchurl { - url = "http://subversion.tigris.org/downloads/${name}.tar.bz2"; - sha1 = "6e3ed7c87d98fdf5f0a999050ab601dcec6155a1"; + url = "mirror://apache/subversion//${name}.tar.bz2"; + sha1 = "4bfaa8e33e9eaf26a504117cd91b23805518071a"; }; buildInputs = [ zlib apr aprutil sqlite ] @@ -48,9 +48,6 @@ stdenv.mkDerivation rec { ''; postInstall = '' - ensureDir $out/share/emacs/site-lisp - cp contrib/client-side/emacs/[dp]svn*.el $out/share/emacs/site-lisp/ - if test -n "$pythonBindings"; then make swig-py swig_pydir=$(toPythonPath $out)/libsvn swig_pydir_extra=$(toPythonPath $out)/svn make install-swig-py swig_pydir=$(toPythonPath $out)/libsvn swig_pydir_extra=$(toPythonPath $out)/svn From 7c953e8bf577880cc884340edeb8883a194de0fd Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Wed, 26 Oct 2011 16:16:44 +0000 Subject: [PATCH 324/970] * Remove sed hackery that is no longer needed. (The firmware files in the Debian SVN tree had a version number attached that had to be stripped out.) svn path=/nixpkgs/trunk/; revision=30035 --- pkgs/os-specific/linux/firmware/bcm43xx/default.nix | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/pkgs/os-specific/linux/firmware/bcm43xx/default.nix b/pkgs/os-specific/linux/firmware/bcm43xx/default.nix index 9dc67b32c53..edc15a360ff 100644 --- a/pkgs/os-specific/linux/firmware/bcm43xx/default.nix +++ b/pkgs/os-specific/linux/firmware/bcm43xx/default.nix @@ -22,9 +22,8 @@ stdenv.mkDerivation { installPhase = '' mkdir -p $out/brcm - for i in ${src1} ${src2}; do - cp -v $i $out/brcm/$(echo $i | sed -r -e 's|.*/[a-z0-9]+-||') - done + cp ${src1} $out/brcm/${src1.name} + cp ${src2} $out/brcm/${src2.name} ''; meta = { From 40f93f0b3b90f9ced14825acc4ea8d03525f7fbc Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Wed, 26 Oct 2011 17:34:31 +0000 Subject: [PATCH 325/970] * Increase XEN_MAX_DOMAIN_MEMORY to support 4xlarge EC2 instances. svn path=/nixpkgs/trunk/; revision=30036 --- pkgs/os-specific/linux/kernel/linux-2.6.35.nix | 3 +++ 1 file changed, 3 insertions(+) diff --git a/pkgs/os-specific/linux/kernel/linux-2.6.35.nix b/pkgs/os-specific/linux/kernel/linux-2.6.35.nix index b08c4b9bb23..7234c61e59b 100644 --- a/pkgs/os-specific/linux/kernel/linux-2.6.35.nix +++ b/pkgs/os-specific/linux/kernel/linux-2.6.35.nix @@ -181,6 +181,9 @@ let X86_CHECK_BIOS_CORRUPTION y X86_MCE y + # Allow up to 128 GiB of RAM in Xen domains. + XEN_MAX_DOMAIN_MEMORY 128 + ${if kernelPlatform ? kernelExtraConfig then kernelPlatform.kernelExtraConfig else ""} ${extraConfig} ''; From 9de4823ff5ea0da120230ffd913f6c1cb571a442 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Wed, 26 Oct 2011 17:37:15 +0000 Subject: [PATCH 326/970] haskell-text: updated to version 0.11.1.6 svn path=/nixpkgs/trunk/; revision=30037 --- .../libraries/haskell/text/{0.11.1.5.nix => 0.11.1.6.nix} | 6 +++--- pkgs/top-level/haskell-packages.nix | 8 ++++---- 2 files changed, 7 insertions(+), 7 deletions(-) rename pkgs/development/libraries/haskell/text/{0.11.1.5.nix => 0.11.1.6.nix} (73%) diff --git a/pkgs/development/libraries/haskell/text/0.11.1.5.nix b/pkgs/development/libraries/haskell/text/0.11.1.6.nix similarity index 73% rename from pkgs/development/libraries/haskell/text/0.11.1.5.nix rename to pkgs/development/libraries/haskell/text/0.11.1.6.nix index db438a54bc2..93f8edd62ae 100644 --- a/pkgs/development/libraries/haskell/text/0.11.1.5.nix +++ b/pkgs/development/libraries/haskell/text/0.11.1.6.nix @@ -2,11 +2,11 @@ cabal.mkDerivation (self: { pname = "text"; - version = "0.11.1.5"; - sha256 = "0fxxhw932gdvaqafsbw7dfzccc43hv92yhxppzp6jrg0npbyz04l"; + version = "0.11.1.6"; + sha256 = "1c4vzxwjcmdlb8nj71g6rqdw4nhz0l17saazhw1vv8cbizmdm4m7"; buildDepends = [ deepseq ]; meta = { - homepage = "https://bitbucket.org/bos/text"; + homepage = "https://github.com/bos/text"; description = "An efficient packed Unicode text type"; license = self.stdenv.lib.licenses.bsd3; platforms = self.ghc.meta.platforms; diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix index 5a1e68b2f0f..6cc9c70ca49 100644 --- a/pkgs/top-level/haskell-packages.nix +++ b/pkgs/top-level/haskell-packages.nix @@ -143,7 +143,7 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y); zlib = self.zlib_0_5_3_1; # 7.2 ok, 7.3 ok HTTP = self.HTTP_4000_1_2; # 7.2 ok, 7.3 ok deepseq = self.deepseq_1_1_0_2; # 7.2 ok, 7.3 ok - text = self.text_0_11_1_5; # 7.2 ok, 7.3 ok + text = self.text_0_11_1_6; # 7.2 ok, 7.3 ok transformers = self.transformers_0_2_2_0; # 7.2 ok, 7.3 ok mtl = self.mtl_2_0_1_0; # 7.2 ok, 7.3 ok random = self.random_1_0_0_3; # 7.2 ok, 7.3 ok @@ -193,7 +193,7 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y); self : self.haskellPlatformArgs_2011_2_0_1 self // { haskellPlatform = self.haskellPlatform_2011_2_0_1; mtl1 = self.mtl_1_1_1_1; - text = self.text_0_11_1_5; + text = self.text_0_11_1_6; repaExamples = null; # don't pick this version of 'repa-examples' during nix-env -u }; @@ -1196,8 +1196,8 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y); text_0_11_0_5 = callPackage ../development/libraries/haskell/text/0.11.0.5.nix {}; text_0_11_0_6 = callPackage ../development/libraries/haskell/text/0.11.0.6.nix {}; - text_0_11_1_5 = callPackage ../development/libraries/haskell/text/0.11.1.5.nix {}; - text = self.text_0_11_1_5; + text_0_11_1_6 = callPackage ../development/libraries/haskell/text/0.11.1.6.nix {}; + text = self.text_0_11_1_6; thespian = callPackage ../development/libraries/haskell/thespian {}; From b072f7f2eace988295ac792d5227e9d48da81e55 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Wed, 26 Oct 2011 17:37:19 +0000 Subject: [PATCH 327/970] haskell-ConfigFile: updated to version 1.1.1 svn path=/nixpkgs/trunk/; revision=30038 --- pkgs/development/libraries/haskell/ConfigFile/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/ConfigFile/default.nix b/pkgs/development/libraries/haskell/ConfigFile/default.nix index d7a5a674bb6..d8cfb2ee407 100644 --- a/pkgs/development/libraries/haskell/ConfigFile/default.nix +++ b/pkgs/development/libraries/haskell/ConfigFile/default.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "ConfigFile"; - version = "1.1.0"; - sha256 = "0m5p56if711qi69lxw78746sb0jr5gqbmip5hdbb7lk4z5drgvhc"; + version = "1.1.1"; + sha256 = "0w2yhbnqldhmj3d98j720l4lj4d08abqcff751p2slszdm5pw1jm"; isLibrary = true; isExecutable = true; buildDepends = [ MissingH mtl parsec ]; From 4e9e385fecd6285e3a26435494db5db078f84d83 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Wed, 26 Oct 2011 17:37:22 +0000 Subject: [PATCH 328/970] haskell-Hipmunk: updated to version 5.2.0.5 svn path=/nixpkgs/trunk/; revision=30039 --- pkgs/development/libraries/haskell/Hipmunk/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/Hipmunk/default.nix b/pkgs/development/libraries/haskell/Hipmunk/default.nix index ab3fe660cfa..593831e2f29 100644 --- a/pkgs/development/libraries/haskell/Hipmunk/default.nix +++ b/pkgs/development/libraries/haskell/Hipmunk/default.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "Hipmunk"; - version = "5.2.0.4"; - sha256 = "0sa0a4hg0xp8l64dy8hnfkhvy2miv79b5550v8gkvrbqcci0qfay"; + version = "5.2.0.5"; + sha256 = "0zmc1bddpvjg11r5931hfx6va73jk1f3nb8nb1qfh86a4addp9id"; buildDepends = [ StateVar transformers ]; noHaddock = true; meta = { From fe5f8db5aa46e9034619b7bd41c529b2244abed6 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Wed, 26 Oct 2011 17:37:25 +0000 Subject: [PATCH 329/970] haskell-cabal-file-th: updated to version 0.2.1 svn path=/nixpkgs/trunk/; revision=30040 --- pkgs/development/libraries/haskell/cabal-file-th/default.nix | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/pkgs/development/libraries/haskell/cabal-file-th/default.nix b/pkgs/development/libraries/haskell/cabal-file-th/default.nix index 427e4ba2cc6..e03c10dea31 100644 --- a/pkgs/development/libraries/haskell/cabal-file-th/default.nix +++ b/pkgs/development/libraries/haskell/cabal-file-th/default.nix @@ -9,5 +9,9 @@ cabal.mkDerivation (self: { description = "Template Haskell expressions for reading fields from a project's cabal file"; license = self.stdenv.lib.licenses.bsd3; platforms = self.ghc.meta.platforms; + maintainers = [ + self.stdenv.lib.maintainers.andres + self.stdenv.lib.maintainers.simons + ]; }; }) From e85d655229438ac15d68b6968d065b94ed47f211 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Wed, 26 Oct 2011 17:37:28 +0000 Subject: [PATCH 330/970] haskell-gloss: updated to version 1.5.0.2 svn path=/nixpkgs/trunk/; revision=30041 --- pkgs/development/libraries/haskell/gloss/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/gloss/default.nix b/pkgs/development/libraries/haskell/gloss/default.nix index 6bc322bce0e..495ecee2d7a 100644 --- a/pkgs/development/libraries/haskell/gloss/default.nix +++ b/pkgs/development/libraries/haskell/gloss/default.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "gloss"; - version = "1.4.0.1"; - sha256 = "0za7imyzfgk3ndh9db55wi7zbxrmpvshws4vywrr35b77b3nabr1"; + version = "1.5.0.2"; + sha256 = "01fd5yl5wdw09xqslmx8h563k2v8dglc60902kia8b5h62xjr1w6"; buildDepends = [ bmp GLUT OpenGL ]; meta = { homepage = "http://gloss.ouroborus.net"; From 2b0c889181b958b51a45a396823254c7680269dd Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Wed, 26 Oct 2011 17:37:31 +0000 Subject: [PATCH 331/970] haskell-http-enumerator: updated to version 0.7.1.3 svn path=/nixpkgs/trunk/; revision=30042 --- .../development/libraries/haskell/http-enumerator/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/http-enumerator/default.nix b/pkgs/development/libraries/haskell/http-enumerator/default.nix index 8b868d15a82..58167a3c032 100644 --- a/pkgs/development/libraries/haskell/http-enumerator/default.nix +++ b/pkgs/development/libraries/haskell/http-enumerator/default.nix @@ -7,8 +7,8 @@ cabal.mkDerivation (self: { pname = "http-enumerator"; - version = "0.7.1.2"; - sha256 = "1jxy017vhmzwq4480r6g45mg3x1d48zckbcyqhsk40bw5i32dfmv"; + version = "0.7.1.3"; + sha256 = "1kx325vzy99xwm40jyv6dw4qrkbnp212slk04wnc5k9fspkvx2g6"; isLibrary = true; isExecutable = true; buildDepends = [ From 3a160ac25d9f15fe6e2417dae616339bea5cae1a Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Wed, 26 Oct 2011 17:39:44 +0000 Subject: [PATCH 332/970] haskell-hledger-web: updated to version 0.16.5 svn path=/nixpkgs/trunk/; revision=30043 --- pkgs/development/libraries/haskell/hledger-web/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/hledger-web/default.nix b/pkgs/development/libraries/haskell/hledger-web/default.nix index 426e477fc0f..5b697906f3b 100644 --- a/pkgs/development/libraries/haskell/hledger-web/default.nix +++ b/pkgs/development/libraries/haskell/hledger-web/default.nix @@ -8,8 +8,8 @@ cabal.mkDerivation (self: { pname = "hledger-web"; - version = "0.16.4"; - sha256 = "1p776fzgan9y7g03g92gsvnassc3k28l6l3gr1vd9v3fcnckg2wj"; + version = "0.16.5"; + sha256 = "0gqhmyl62jkz156gypzxwj46xrh5as3wrvkwrg04wfmpqrac5n06"; isLibrary = true; isExecutable = true; buildDepends = [ From bcffafa65a444a2191032986de85968d088f640c Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Wed, 26 Oct 2011 17:58:53 +0000 Subject: [PATCH 333/970] * Whitespace. svn path=/nixpkgs/trunk/; revision=30044 --- pkgs/data/documentation/man-pages/default.nix | 2 +- pkgs/lib/types.nix | 1 - 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/pkgs/data/documentation/man-pages/default.nix b/pkgs/data/documentation/man-pages/default.nix index 71c66a0794b..1376a92c134 100644 --- a/pkgs/data/documentation/man-pages/default.nix +++ b/pkgs/data/documentation/man-pages/default.nix @@ -15,6 +15,6 @@ stdenv.mkDerivation rec { meta = { description = "Linux development manual pages"; - homepage = http://kernel.org/pub/linux/docs/manpages/; + homepage = http://www.kernel.org/doc/man-pages/; }; } diff --git a/pkgs/lib/types.nix b/pkgs/lib/types.nix index 9a6bb4b24dd..c1d7240f693 100644 --- a/pkgs/lib/types.nix +++ b/pkgs/lib/types.nix @@ -148,7 +148,6 @@ rec { } ; - uniq = elemType: mkOptionType { inherit (elemType) name check iter fold docPath hasOptions; merge = list: From 0892d42613b04e3bd05b8c97ef3cb8e7009e4b43 Mon Sep 17 00:00:00 2001 From: Shea Levy Date: Thu, 27 Oct 2011 06:04:00 +0000 Subject: [PATCH 334/970] The clang static analyzer can be accessed through clang --analyze, no need for scan-build and view svn path=/nixpkgs/trunk/; revision=30051 --- pkgs/development/compilers/llvm/clang.nix | 5 ----- 1 file changed, 5 deletions(-) diff --git a/pkgs/development/compilers/llvm/clang.nix b/pkgs/development/compilers/llvm/clang.nix index 78b3219a328..8e2fa723df6 100644 --- a/pkgs/development/compilers/llvm/clang.nix +++ b/pkgs/development/compilers/llvm/clang.nix @@ -46,11 +46,6 @@ stdenv.mkDerivation { cd tools/clang ''; - postInstall = '' - install -v -m755 tools/scan-build/scan-build $out/bin - install -v -m755 tools/scan-view/scan-view $out/bin - ''; - passthru = { gcc = stdenv.gcc.gcc; }; meta = { From d2006f51a0661087623cd83f2d7689956e1bbb3d Mon Sep 17 00:00:00 2001 From: Shea Levy Date: Thu, 27 Oct 2011 06:39:45 +0000 Subject: [PATCH 335/970] Use -isystem instead of -I for system headers to avoid warnings when using -pedantic svn path=/nixpkgs/trunk/; revision=30052 --- pkgs/build-support/clang-wrapper/builder.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/build-support/clang-wrapper/builder.sh b/pkgs/build-support/clang-wrapper/builder.sh index dc039605d03..fe714a0719a 100644 --- a/pkgs/build-support/clang-wrapper/builder.sh +++ b/pkgs/build-support/clang-wrapper/builder.sh @@ -47,7 +47,7 @@ else # It's unclear if these will ever be provided by an LLVM project clangCFlags="$clangCFlags -B$basePath" - clangCFlags="$clangCFlags -I$clang/lib/clang/$clangVersion/include" + clangCFlags="$clangCFlags -isystem$clang/lib/clang/$clangVersion/include" echo "$clangCFlags" > $out/nix-support/clang-cflags clangPath="$clang/bin" From 0ccd825d817a104689bac58a7835ab9dbccc4ce0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?= Date: Thu, 27 Oct 2011 15:13:26 +0000 Subject: [PATCH 336/970] Adding an udev patch for kernels not having the accept4 call. armv5tel 3.0, for example. svn path=/nixpkgs/trunk/; revision=30053 --- pkgs/os-specific/linux/udev/173.nix | 3 +- .../linux/udev/pre-accept4-kernel.patch | 43 +++++++++++++++++++ 2 files changed, 45 insertions(+), 1 deletion(-) create mode 100644 pkgs/os-specific/linux/udev/pre-accept4-kernel.patch diff --git a/pkgs/os-specific/linux/udev/173.nix b/pkgs/os-specific/linux/udev/173.nix index ba96717e494..f5076a9ed15 100644 --- a/pkgs/os-specific/linux/udev/173.nix +++ b/pkgs/os-specific/linux/udev/173.nix @@ -44,7 +44,8 @@ stdenv.mkDerivation rec { rm -frv $out/share/gtk-doc ''; - patches = [ ./custom-rules.patch ]; + patches = [ ./custom-rules.patch ] ++ + stdenv.lib.optional (stdenv.system == "armv5tel-linux") ./pre-accept4-kernel.patch; meta = { homepage = http://www.kernel.org/pub/linux/utils/kernel/hotplug/udev.html; diff --git a/pkgs/os-specific/linux/udev/pre-accept4-kernel.patch b/pkgs/os-specific/linux/udev/pre-accept4-kernel.patch new file mode 100644 index 00000000000..2cf549d99a7 --- /dev/null +++ b/pkgs/os-specific/linux/udev/pre-accept4-kernel.patch @@ -0,0 +1,43 @@ +From: +https://github.com/archlinuxarm/PKGBUILDs/blob/master/core/udev-oxnas/pre-accept4-kernel.patch + +diff -urN a/udev/udev-ctrl.c b/udev/udev-ctrl.c +--- a/udev/udev-ctrl.c 2011-10-09 17:10:32.000000000 -0600 ++++ b/udev/udev-ctrl.c 2011-10-25 15:11:09.000000000 -0600 +@@ -15,6 +15,7 @@ + #include + #include + #include ++#include + #include + #include + #include +@@ -182,6 +183,7 @@ + struct ucred ucred; + socklen_t slen; + const int on = 1; ++ int flgs; + + conn = calloc(1, sizeof(struct udev_ctrl_connection)); + if (conn == NULL) +@@ -189,13 +191,19 @@ + conn->refcount = 1; + conn->uctrl = uctrl; + +- conn->sock = accept4(uctrl->sock, NULL, NULL, SOCK_CLOEXEC|SOCK_NONBLOCK); ++// conn->sock = accept4(uctrl->sock, NULL, NULL, SOCK_CLOEXEC|SOCK_NONBLOCK); ++ conn->sock = accept(uctrl->sock, NULL, NULL); + if (conn->sock < 0) { + if (errno != EINTR) + err(uctrl->udev, "unable to receive ctrl connection: %m\n"); + goto err; + } + ++// Since we don't have accept4 ++ flgs = fcntl(conn->sock, F_GETFL, NULL); ++ if(flgs >= 0) fcntl(conn->sock, F_SETFL, flgs | O_NONBLOCK); ++ fcntl(conn->sock, F_SETFD, FD_CLOEXEC); ++ + /* check peer credential of connection */ + slen = sizeof(ucred); + if (getsockopt(conn->sock, SOL_SOCKET, SO_PEERCRED, &ucred, &slen) < 0) { From 78ff18a538b99642d5367bdd58e63af735d15c52 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Thu, 27 Oct 2011 15:15:28 +0000 Subject: [PATCH 337/970] * ec2-api-tools updated to 1.4.4.2. svn path=/nixpkgs/trunk/; revision=30054 --- pkgs/tools/virtualization/amazon-ec2-api-tools/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/virtualization/amazon-ec2-api-tools/default.nix b/pkgs/tools/virtualization/amazon-ec2-api-tools/default.nix index d2cc7c527ec..d79afe7e90f 100644 --- a/pkgs/tools/virtualization/amazon-ec2-api-tools/default.nix +++ b/pkgs/tools/virtualization/amazon-ec2-api-tools/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, unzip, makeWrapper, jre }: stdenv.mkDerivation { - name = "ec2-api-tools-1.4.2.2"; + name = "ec2-api-tools-1.4.4.2"; src = fetchurl { url = http://s3.amazonaws.com/ec2-downloads/ec2-api-tools.zip; - sha256 = "1e0f183c1e6d90338dbf427697908167a61c66dc7761ae5a73bb849f39f701fe"; + sha256 = "03immxrrc7brbwm9nbp6dqw4bxpcb18l8rsj75nd6h2vanq2qlj4"; }; buildInputs = [ unzip makeWrapper ]; From 20ab6cfbf75d2b218b4ac0f145e6a97e21f899e4 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Thu, 27 Oct 2011 15:35:43 +0000 Subject: [PATCH 338/970] * Move perl-5.8 and perl-5.10 into perl/ per the coding conventions. svn path=/nixpkgs/branches/stdenv-updates/; revision=30055 --- .../interpreters/{perl-5.10 => perl/5.10}/default.nix | 0 .../interpreters/{perl-5.10 => perl/5.10}/no-sys-dirs.patch | 0 .../interpreters/{perl-5.10 => perl/5.10}/setup-hook.sh | 0 .../interpreters/{perl-5.8 => perl/5.8}/default.nix | 0 .../interpreters/{perl-5.8 => perl/5.8}/gcc-4.2.patch | 0 .../interpreters/{perl-5.8 => perl/5.8}/no-sys-dirs.patch | 0 .../interpreters/{perl-5.8 => perl/5.8}/setup-hook.sh | 0 pkgs/top-level/all-packages.nix | 4 ++-- 8 files changed, 2 insertions(+), 2 deletions(-) rename pkgs/development/interpreters/{perl-5.10 => perl/5.10}/default.nix (100%) rename pkgs/development/interpreters/{perl-5.10 => perl/5.10}/no-sys-dirs.patch (100%) rename pkgs/development/interpreters/{perl-5.10 => perl/5.10}/setup-hook.sh (100%) rename pkgs/development/interpreters/{perl-5.8 => perl/5.8}/default.nix (100%) rename pkgs/development/interpreters/{perl-5.8 => perl/5.8}/gcc-4.2.patch (100%) rename pkgs/development/interpreters/{perl-5.8 => perl/5.8}/no-sys-dirs.patch (100%) rename pkgs/development/interpreters/{perl-5.8 => perl/5.8}/setup-hook.sh (100%) diff --git a/pkgs/development/interpreters/perl-5.10/default.nix b/pkgs/development/interpreters/perl/5.10/default.nix similarity index 100% rename from pkgs/development/interpreters/perl-5.10/default.nix rename to pkgs/development/interpreters/perl/5.10/default.nix diff --git a/pkgs/development/interpreters/perl-5.10/no-sys-dirs.patch b/pkgs/development/interpreters/perl/5.10/no-sys-dirs.patch similarity index 100% rename from pkgs/development/interpreters/perl-5.10/no-sys-dirs.patch rename to pkgs/development/interpreters/perl/5.10/no-sys-dirs.patch diff --git a/pkgs/development/interpreters/perl-5.10/setup-hook.sh b/pkgs/development/interpreters/perl/5.10/setup-hook.sh similarity index 100% rename from pkgs/development/interpreters/perl-5.10/setup-hook.sh rename to pkgs/development/interpreters/perl/5.10/setup-hook.sh diff --git a/pkgs/development/interpreters/perl-5.8/default.nix b/pkgs/development/interpreters/perl/5.8/default.nix similarity index 100% rename from pkgs/development/interpreters/perl-5.8/default.nix rename to pkgs/development/interpreters/perl/5.8/default.nix diff --git a/pkgs/development/interpreters/perl-5.8/gcc-4.2.patch b/pkgs/development/interpreters/perl/5.8/gcc-4.2.patch similarity index 100% rename from pkgs/development/interpreters/perl-5.8/gcc-4.2.patch rename to pkgs/development/interpreters/perl/5.8/gcc-4.2.patch diff --git a/pkgs/development/interpreters/perl-5.8/no-sys-dirs.patch b/pkgs/development/interpreters/perl/5.8/no-sys-dirs.patch similarity index 100% rename from pkgs/development/interpreters/perl-5.8/no-sys-dirs.patch rename to pkgs/development/interpreters/perl/5.8/no-sys-dirs.patch diff --git a/pkgs/development/interpreters/perl-5.8/setup-hook.sh b/pkgs/development/interpreters/perl/5.8/setup-hook.sh similarity index 100% rename from pkgs/development/interpreters/perl-5.8/setup-hook.sh rename to pkgs/development/interpreters/perl/5.8/setup-hook.sh diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 1caf577dec1..dab1460816e 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -2559,11 +2559,11 @@ let # mercurial (hg) bleeding edge version octaveHG = callPackage ../development/interpreters/octave/hg.nix { }; - perl58 = callPackage ../development/interpreters/perl-5.8 { + perl58 = callPackage ../development/interpreters/perl/5.8 { impureLibcPath = if stdenv.isLinux then null else "/usr"; }; - perl510 = callPackage ../development/interpreters/perl-5.10 { + perl510 = callPackage ../development/interpreters/perl/5.10 { fetchurl = fetchurlBoot; }; From 5649122458d9959dab216556707249e8fa144ab1 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Thu, 27 Oct 2011 15:58:25 +0000 Subject: [PATCH 339/970] * Added Perl 5.14.2. svn path=/nixpkgs/branches/stdenv-updates/; revision=30057 --- .../interpreters/perl/5.14/default.nix | 60 ++++++++ .../interpreters/perl/5.14/no-sys-dirs.patch | 134 ++++++++++++++++++ .../interpreters/perl/5.14/setup-hook.sh | 5 + pkgs/top-level/all-packages.nix | 4 + 4 files changed, 203 insertions(+) create mode 100644 pkgs/development/interpreters/perl/5.14/default.nix create mode 100644 pkgs/development/interpreters/perl/5.14/no-sys-dirs.patch create mode 100644 pkgs/development/interpreters/perl/5.14/setup-hook.sh diff --git a/pkgs/development/interpreters/perl/5.14/default.nix b/pkgs/development/interpreters/perl/5.14/default.nix new file mode 100644 index 00000000000..bdd3365b8b0 --- /dev/null +++ b/pkgs/development/interpreters/perl/5.14/default.nix @@ -0,0 +1,60 @@ +{ stdenv, fetchurl }: + +let + + libc = if stdenv ? gcc && stdenv.gcc.libc != null then stdenv.gcc.libc else "/usr"; + +in + +stdenv.mkDerivation rec { + name = "perl-5.14.2"; + + src = fetchurl { + url = "mirror://cpan/src/${name}.tar.gz"; + sha256 = "1ls8cpbgnlaxfydyyqgr7pxj1hkxh9pzcdgr3dv42zdxffakb234"; + }; + + patches = + [ # Do not look in /usr etc. for dependencies. + ./no-sys-dirs.patch + ]; + + # Build a thread-safe Perl with a dynamic libperls.o. We need the + # "installstyle" option to ensure that modules are put under + # $out/lib/perl5 - this is the general default, but because $out + # contains the string "perl", Configure would select $out/lib. + # Miniperl needs -lm. perl needs -lrt. + configureFlags = + [ "-de" + "-Dcc=gcc" + "-Uinstallusrbinperl" + "-Dinstallstyle=lib/perl5" + "-Duseshrplib" + "-Dlocincpth=${libc}/include" + "-Dloclibpth=${libc}/lib" + ] + ++ stdenv.lib.optional (stdenv ? glibc) "-Dusethreads"; + + configureScript = "${stdenv.shell} ./Configure"; + + dontAddPrefix = true; + + enableParallelBuilding = true; + + preConfigure = + '' + configureFlags="$configureFlags -Dprefix=$out -Dman1dir=$out/share/man/man1 -Dman3dir=$out/share/man/man3" + + ${stdenv.lib.optionalString (stdenv.system == "armv5tel-linux") '' + configureFlagsArray=(-Dldflags="-lm -lrt") + ''} + ''; + + preBuild = stdenv.lib.optionalString (!(stdenv ? gcc && stdenv.gcc.nativeTools)) + '' + # Make Cwd work on NixOS (where we don't have a /bin/pwd). + substituteInPlace dist/Cwd/Cwd.pm --replace "'/bin/pwd'" "'$(type -tP pwd)'" + ''; + + setupHook = ./setup-hook.sh; +} diff --git a/pkgs/development/interpreters/perl/5.14/no-sys-dirs.patch b/pkgs/development/interpreters/perl/5.14/no-sys-dirs.patch new file mode 100644 index 00000000000..a7fa7725c89 --- /dev/null +++ b/pkgs/development/interpreters/perl/5.14/no-sys-dirs.patch @@ -0,0 +1,134 @@ +diff -ru perl-5.14.2-orig/Configure perl-5.14.2/Configure +--- perl-5.14.2-orig/Configure 2011-09-26 11:44:34.000000000 +0200 ++++ perl-5.14.2/Configure 2011-10-27 17:42:26.791103662 +0200 +@@ -106,15 +106,7 @@ + fi + + : Proper PATH setting +-paths='/bin /usr/bin /usr/local/bin /usr/ucb /usr/local /usr/lbin' +-paths="$paths /opt/bin /opt/local/bin /opt/local /opt/lbin" +-paths="$paths /usr/5bin /etc /usr/gnu/bin /usr/new /usr/new/bin /usr/nbin" +-paths="$paths /opt/gnu/bin /opt/new /opt/new/bin /opt/nbin" +-paths="$paths /sys5.3/bin /sys5.3/usr/bin /bsd4.3/bin /bsd4.3/usr/ucb" +-paths="$paths /bsd4.3/usr/bin /usr/bsd /bsd43/bin /opt/ansic/bin /usr/ccs/bin" +-paths="$paths /etc /usr/lib /usr/ucblib /lib /usr/ccs/lib" +-paths="$paths /sbin /usr/sbin /usr/libexec" +-paths="$paths /system/gnu_library/bin" ++paths='' + + for p in $paths + do +@@ -1311,8 +1303,7 @@ + archname='' + : Possible local include directories to search. + : Set locincpth to "" in a hint file to defeat local include searches. +-locincpth="/usr/local/include /opt/local/include /usr/gnu/include" +-locincpth="$locincpth /opt/gnu/include /usr/GNU/include /opt/GNU/include" ++locincpth="" + : + : no include file wanted by default + inclwanted='' +@@ -1328,17 +1319,12 @@ + archobjs='' + libnames='' + : change the next line if compiling for Xenix/286 on Xenix/386 +-xlibpth='/usr/lib/386 /lib/386' ++xlibpth='' + : Possible local library directories to search. +-loclibpth="/usr/local/lib /opt/local/lib /usr/gnu/lib" +-loclibpth="$loclibpth /opt/gnu/lib /usr/GNU/lib /opt/GNU/lib" ++loclibpth="" + + : general looking path for locating libraries +-glibpth="/lib /usr/lib $xlibpth" +-glibpth="$glibpth /usr/ccs/lib /usr/ucblib /usr/local/lib" +-test -f /usr/shlib/libc.so && glibpth="/usr/shlib $glibpth" +-test -f /shlib/libc.so && glibpth="/shlib $glibpth" +-test -d /usr/lib64 && glibpth="$glibpth /lib64 /usr/lib64 /usr/local/lib64" ++glibpth="" + + : Private path used by Configure to find libraries. Its value + : is prepended to libpth. This variable takes care of special +@@ -1371,8 +1357,6 @@ + libswanted="$libswanted m crypt sec util c cposix posix ucb bsd BSD" + : We probably want to search /usr/shlib before most other libraries. + : This is only used by the lib/ExtUtils/MakeMaker.pm routine extliblist. +-glibpth=`echo " $glibpth " | sed -e 's! /usr/shlib ! !'` +-glibpth="/usr/shlib $glibpth" + : Do not use vfork unless overridden by a hint file. + usevfork=false + +@@ -2380,7 +2364,6 @@ + zip + " + pth=`echo $PATH | sed -e "s/$p_/ /g"` +-pth="$pth /lib /usr/lib" + for file in $loclist; do + eval xxx=\$$file + case "$xxx" in +@@ -8390,13 +8373,8 @@ + echo " " + case "$sysman" in + '') +- syspath='/usr/share/man/man1 /usr/man/man1' +- syspath="$syspath /usr/man/mann /usr/man/manl /usr/man/local/man1" +- syspath="$syspath /usr/man/u_man/man1" +- syspath="$syspath /usr/catman/u_man/man1 /usr/man/l_man/man1" +- syspath="$syspath /usr/local/man/u_man/man1 /usr/local/man/l_man/man1" +- syspath="$syspath /usr/man/man.L /local/man/man1 /usr/local/man/man1" +- sysman=`./loc . /usr/man/man1 $syspath` ++ syspath='' ++ sysman='' + ;; + esac + if $test -d "$sysman"; then +@@ -19721,9 +19699,10 @@ + case "$full_ar" in + '') full_ar=$ar ;; + esac ++full_ar=ar + + : Store the full pathname to the sed program for use in the C program +-full_sed=$sed ++full_sed=sed + + : see what type gids are declared as in the kernel + echo " " +Only in perl-5.14.2-orig/cpan/Module-Pluggable/t/lib/EditorJunk/Plugin: Bar.pm~ +diff -ru perl-5.14.2-orig/ext/Errno/Errno_pm.PL perl-5.14.2/ext/Errno/Errno_pm.PL +--- perl-5.14.2-orig/ext/Errno/Errno_pm.PL 2011-09-26 11:44:34.000000000 +0200 ++++ perl-5.14.2/ext/Errno/Errno_pm.PL 2011-10-27 17:40:13.083352010 +0200 +@@ -137,11 +137,7 @@ + if ($dep =~ /(\S+errno\.h)/) { + $file{$1} = 1; + } +- } elsif ($^O eq 'linux' && +- $Config{gccversion} ne '' && +- $Config{gccversion} !~ /intel/i +- # might be using, say, Intel's icc +- ) { ++ } elsif (0) { + # Some Linuxes have weird errno.hs which generate + # no #file or #line directives + my $linux_errno_h = -e '/usr/include/errno.h' ? +diff -ru perl-5.14.2-orig/hints/freebsd.sh perl-5.14.2/hints/freebsd.sh +--- perl-5.14.2-orig/hints/freebsd.sh 2011-09-19 15:18:22.000000000 +0200 ++++ perl-5.14.2/hints/freebsd.sh 2011-10-27 17:40:13.083352010 +0200 +@@ -118,13 +118,13 @@ + objformat=`/usr/bin/objformat` + if [ x$objformat = xaout ]; then + if [ -e /usr/lib/aout ]; then +- libpth="/usr/lib/aout /usr/local/lib /usr/lib" +- glibpth="/usr/lib/aout /usr/local/lib /usr/lib" ++ libpth="" ++ glibpth="" + fi + lddlflags='-Bshareable' + else +- libpth="/usr/lib /usr/local/lib" +- glibpth="/usr/lib /usr/local/lib" ++ libpth="" ++ glibpth="" + ldflags="-Wl,-E " + lddlflags="-shared " + fi diff --git a/pkgs/development/interpreters/perl/5.14/setup-hook.sh b/pkgs/development/interpreters/perl/5.14/setup-hook.sh new file mode 100644 index 00000000000..6a144a7f780 --- /dev/null +++ b/pkgs/development/interpreters/perl/5.14/setup-hook.sh @@ -0,0 +1,5 @@ +addPerlLibPath () { + addToSearchPath PERL5LIB $1/lib/perl5/site_perl +} + +envHooks=(${envHooks[@]} addPerlLibPath) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index dab1460816e..326bcdcddd5 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -2567,6 +2567,10 @@ let fetchurl = fetchurlBoot; }; + perl514 = callPackage ../development/interpreters/perl/5.14 { + fetchurl = fetchurlBoot; + }; + perl = if system != "i686-cygwin" then perl510 else sysPerl; php = php5_3; From de1c91bc002d555fc5b40f928999a7cc0e15df2a Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Thu, 27 Oct 2011 16:09:22 +0000 Subject: [PATCH 340/970] * Make Perl 5.14 the default. Cross fingers. svn path=/nixpkgs/branches/stdenv-updates/; revision=30058 --- pkgs/top-level/all-packages.nix | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 326bcdcddd5..3c00d99dcff 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -2563,15 +2563,13 @@ let impureLibcPath = if stdenv.isLinux then null else "/usr"; }; - perl510 = callPackage ../development/interpreters/perl/5.10 { - fetchurl = fetchurlBoot; - }; + perl510 = callPackage ../development/interpreters/perl/5.10 { }; perl514 = callPackage ../development/interpreters/perl/5.14 { fetchurl = fetchurlBoot; }; - perl = if system != "i686-cygwin" then perl510 else sysPerl; + perl = if system != "i686-cygwin" then perl514 else sysPerl; php = php5_3; From fd394a7c4a8991df3270ff9f43b73273bde699d4 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Thu, 27 Oct 2011 16:32:46 +0000 Subject: [PATCH 341/970] * Only print "@ phase..." messages on demand since they're kind of ugly and we already print phases (with start and end markers). * Remove some stray tabs. svn path=/nixpkgs/branches/stdenv-updates/; revision=30059 --- pkgs/stdenv/generic/setup.sh | 18 +++++++++++------- 1 file changed, 11 insertions(+), 7 deletions(-) diff --git a/pkgs/stdenv/generic/setup.sh b/pkgs/stdenv/generic/setup.sh index 66be3875413..bf1642d84aa 100644 --- a/pkgs/stdenv/generic/setup.sh +++ b/pkgs/stdenv/generic/setup.sh @@ -453,8 +453,8 @@ unpackFile() { case "$curSrc" in *.tar | *.tar.* | *.tgz | *.tbz2) - # GNU tar can automatically select the decompression method - # (info "(tar) gzip"). + # GNU tar can automatically select the decompression method + # (info "(tar) gzip"). tar xvf $curSrc ;; *.zip) @@ -834,9 +834,11 @@ genericBuild() { if test "$curPhase" = installPhase -a -n "$dontInstall"; then continue; fi if test "$curPhase" = fixupPhase -a -n "$dontFixup"; then continue; fi if test "$curPhase" = distPhase -a -z "$doDist"; then continue; fi - - echo - echo "@ phase-started $out $curPhase" + + if [ -n "$tracePhases" ]; then + echo + echo "@ phase-started $out $curPhase" + fi showPhaseHeader "$curPhase" dumpVars @@ -849,8 +851,10 @@ genericBuild() { cd "${sourceRoot:-.}" fi - echo - echo "@ phase-succeeded $out $curPhase" + if [ -n "$tracePhases" ]; then + echo + echo "@ phase-succeeded $out $curPhase" + fi stopNest done From e85e73bbc8ebcfcb9415aca8bd929f8b672a82de Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Thu, 27 Oct 2011 16:42:51 +0000 Subject: [PATCH 342/970] =?UTF-8?q?*=20Operator=20precendence=20kills=20:-?= =?UTF-8?q?)=20=20GCC=20was=20accidentally=20depending=20on=20=20=20X11=20?= =?UTF-8?q?because=20of=20missing=20parentheses=20around=20a=20=E2=80=98++?= =?UTF-8?q?=E2=80=99.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit svn path=/nixpkgs/branches/stdenv-updates/; revision=30060 --- pkgs/development/compilers/gcc-4.6/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/compilers/gcc-4.6/default.nix b/pkgs/development/compilers/gcc-4.6/default.nix index c28b885c680..48b147fc863 100644 --- a/pkgs/development/compilers/gcc-4.6/default.nix +++ b/pkgs/development/compilers/gcc-4.6/default.nix @@ -209,7 +209,7 @@ stdenv.mkDerivation ({ ++ (optional (cloog != null) cloog) ++ (optional (zlib != null) zlib) ++ (optionals langJava [ boehmgc zip unzip ]) - ++ (optionals javaAwtGtk [gtk pkgconfig libart_lgpl] ++ xlibs) + ++ (optionals javaAwtGtk ([gtk pkgconfig libart_lgpl] ++ xlibs)) ++ (optionals (cross != null) [binutilsCross]) ++ (optionals langAda [gnatboot]) ++ (optionals langVhdl [gnat]) From 3cb8791cf91f95407b4db0dd39f3cb6bc208007e Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Thu, 27 Oct 2011 16:50:00 +0000 Subject: [PATCH 343/970] * Backport the GCC xlibs dependency fix. svn path=/nixpkgs/branches/stdenv-updates/; revision=30061 --- maintainers/scripts/eval-release.nix | 2 +- pkgs/development/compilers/gcc-4.4/default.nix | 2 +- pkgs/development/compilers/gcc-4.5/default.nix | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/maintainers/scripts/eval-release.nix b/maintainers/scripts/eval-release.nix index 3d4458699c7..57395f8cc68 100644 --- a/maintainers/scripts/eval-release.nix +++ b/maintainers/scripts/eval-release.nix @@ -16,7 +16,7 @@ let call = attrs: lib.flip lib.mapAttrs attrs (n: v: builtins.trace n ( - if builtins.isFunction v then maybe (v { system = "i686-linux"; }) + if builtins.isFunction v then maybe (v { system = "x86_64-linux"; }) else if builtins.isAttrs v then call v else null )); diff --git a/pkgs/development/compilers/gcc-4.4/default.nix b/pkgs/development/compilers/gcc-4.4/default.nix index 11c89c7eb6b..d962d4ac347 100644 --- a/pkgs/development/compilers/gcc-4.4/default.nix +++ b/pkgs/development/compilers/gcc-4.4/default.nix @@ -132,7 +132,7 @@ stdenv.mkDerivation ({ ++ (optional (zlib != null) zlib) ++ (optional (boehmgc != null) boehmgc) ++ (optionals langJava [zip unzip]) - ++ (optionals javaAwtGtk [gtk pkgconfig libart_lgpl] ++ xlibs) + ++ (optionals javaAwtGtk ([gtk pkgconfig libart_lgpl] ++ xlibs)) ++ (optionals (cross != null) [binutilsCross]) ++ (optionals langAda [gnatboot]) ++ (optionals langVhdl [gnat]) diff --git a/pkgs/development/compilers/gcc-4.5/default.nix b/pkgs/development/compilers/gcc-4.5/default.nix index 8d3aa658ab3..61d0af6aa4f 100644 --- a/pkgs/development/compilers/gcc-4.5/default.nix +++ b/pkgs/development/compilers/gcc-4.5/default.nix @@ -204,7 +204,7 @@ stdenv.mkDerivation ({ ++ (optional (zlib != null) zlib) ++ (optional (boehmgc != null) boehmgc) ++ (optionals langJava [zip unzip]) - ++ (optionals javaAwtGtk [gtk pkgconfig libart_lgpl] ++ xlibs) + ++ (optionals javaAwtGtk ([gtk pkgconfig libart_lgpl] ++ xlibs)) ++ (optionals (cross != null) [binutilsCross]) ++ (optionals langAda [gnatboot]) ++ (optionals langVhdl [gnat]) From 30933c30d314e120386d5bb3a08d4be0d3c1eb57 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Thu, 27 Oct 2011 17:02:15 +0000 Subject: [PATCH 344/970] * GCC updated to 4.6.2. svn path=/nixpkgs/branches/stdenv-updates/; revision=30062 --- pkgs/development/compilers/gcc-4.6/default.nix | 2 +- pkgs/development/compilers/gcc-4.6/sources.nix | 16 ++++++++-------- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/pkgs/development/compilers/gcc-4.6/default.nix b/pkgs/development/compilers/gcc-4.6/default.nix index 48b147fc863..cbbd3bdbf5d 100644 --- a/pkgs/development/compilers/gcc-4.6/default.nix +++ b/pkgs/development/compilers/gcc-4.6/default.nix @@ -44,7 +44,7 @@ assert cloog != null -> cloogppl == null; with stdenv.lib; with builtins; -let version = "4.6.1"; +let version = "4.6.2"; javaEcj = fetchurl { # The `$(top_srcdir)/ecj.jar' file is automatically picked up at # `configure' time. diff --git a/pkgs/development/compilers/gcc-4.6/sources.nix b/pkgs/development/compilers/gcc-4.6/sources.nix index e91f3facb8e..dc85ff10b51 100644 --- a/pkgs/development/compilers/gcc-4.6/sources.nix +++ b/pkgs/development/compilers/gcc-4.6/sources.nix @@ -1,31 +1,31 @@ /* Automatically generated by `update-gcc.sh', do not edit. - For GCC 4.6.1. */ + For GCC 4.6.2. */ { fetchurl, optional, version, langC, langCC, langFortran, langJava, langAda, langGo }: -assert version == "4.6.1"; +assert version == "4.6.2"; optional /* langC */ true (fetchurl { url = "mirror://gcc/releases/gcc-${version}/gcc-core-${version}.tar.bz2"; - sha256 = "0bbb8f754a31f29013f6e9ad4c755d92bb0f154a665c4b623e86ae7174d98e33"; + sha256 = "dcbf391f05277b7e09d14d54f3bdaba5515a3a8e7dd1d8af93af3f6f68455e10"; }) ++ optional langCC (fetchurl { url = "mirror://gcc/releases/gcc-${version}/gcc-g++-${version}.tar.bz2"; - sha256 = "44a91149bf4608aceb03b22209e5ec14ffe0c4003b11e3a368d6cebe5a327901"; + sha256 = "5470bea8093438cf5840fbbef3546b6dba7b0153ef6a16e142c1fba1fac6e598"; }) ++ optional langFortran (fetchurl { url = "mirror://gcc/releases/gcc-${version}/gcc-fortran-${version}.tar.bz2"; - sha256 = "a0069a4452572b46cc20f1a1b52dc839b69c1d25e19c147a782e439d6be0156b"; + sha256 = "492becd732662349eaa5e7c4e458ac009df0ccb8904df54ae295d277c4d6be6f"; }) ++ optional langJava (fetchurl { url = "mirror://gcc/releases/gcc-${version}/gcc-java-${version}.tar.bz2"; - sha256 = "728462275a0532714063803282d1ea815e35b5fd91a96f65a1f0a14da355765f"; + sha256 = "d021a16816daeb5db9a3280909d846b38cbdb4cc0d9aa47714c49b08a81d11f1"; }) ++ optional langAda (fetchurl { url = "mirror://gcc/releases/gcc-${version}/gcc-ada-${version}.tar.bz2"; - sha256 = "0e2958b7be2e7ec9d7847658262ce9276d6c75f91d53c48d7141848cfe3cd093"; + sha256 = "9ac26821ad900d02ed251b62e6a0506ee12417b506a7bb9b02ec9f09e5d9c84f"; }) ++ optional langGo (fetchurl { url = "mirror://gcc/releases/gcc-${version}/gcc-go-${version}.tar.bz2"; - sha256 = "9512347a76c46528d25295cd762f262c8265e99cee497dc2d66caddf9c021198"; + sha256 = "1cafbb254d70f60c39a62a39a3b236674e02c875a1775057ddd33ffafe0fd4e1"; }) ++ [] From f1a04fbc60eb8679333ecdcb5eb8eb7f504f2037 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Thu, 27 Oct 2011 17:05:49 +0000 Subject: [PATCH 345/970] haskell-uu-parsinglib: updated to version 2.7.2.1 svn path=/nixpkgs/trunk/; revision=30063 --- pkgs/development/libraries/haskell/uu-parsinglib/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/uu-parsinglib/default.nix b/pkgs/development/libraries/haskell/uu-parsinglib/default.nix index de2d1e1f020..ca71d1d4a6d 100644 --- a/pkgs/development/libraries/haskell/uu-parsinglib/default.nix +++ b/pkgs/development/libraries/haskell/uu-parsinglib/default.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "uu-parsinglib"; - version = "2.7.1.1"; - sha256 = "1qn3impl64cvbzyvhc73yxyibgak4dkgl1vkbrzxrxb770kb5r4p"; + version = "2.7.2.1"; + sha256 = "1dablvx1mrgwzm6fqsbgny3qf9bz3bilhip1b78b5gxrbssfpdyk"; buildDepends = [ ListLike time ]; meta = { homepage = "http://www.cs.uu.nl/wiki/bin/view/HUT/ParserCombinators"; From 8a6bba5549c8b48cff61f6a353e8c44d5dd9116a Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Thu, 27 Oct 2011 17:05:53 +0000 Subject: [PATCH 346/970] haskell-vacuum: updated to version 1.0.0.2 svn path=/nixpkgs/trunk/; revision=30064 --- pkgs/development/libraries/haskell/vacuum/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/vacuum/default.nix b/pkgs/development/libraries/haskell/vacuum/default.nix index 1c3c1df5a00..1b5b5d540fd 100644 --- a/pkgs/development/libraries/haskell/vacuum/default.nix +++ b/pkgs/development/libraries/haskell/vacuum/default.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "vacuum"; - version = "1.0.0.1"; - sha256 = "172py7nvyv66hvqmhigfm59rjb328bfzv0z11q8qdpf5w1fpvmc5"; + version = "1.0.0.2"; + sha256 = "1amlzd89952fvw1sbajf9kv3f2s2i6xbqs1zjxw442achg465y7i"; extraLibraries = [ ghcPaths ]; meta = { homepage = "http://web.archive.org/web/20100410115820/http://moonpatio.com/vacuum/"; From f4c75d125b78e8d6eb2fb80b5cc39125851996a3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andres=20L=C3=B6h?= Date: Thu, 27 Oct 2011 17:39:42 +0000 Subject: [PATCH 347/970] Generally switching to haskell-vector-0.9. The price is that gamma's current upper bound has to be patched. svn path=/nixpkgs/trunk/; revision=30066 --- .../libraries/haskell/gamma/default.nix | 3 ++ pkgs/top-level/haskell-packages.nix | 53 +++++-------------- 2 files changed, 16 insertions(+), 40 deletions(-) diff --git a/pkgs/development/libraries/haskell/gamma/default.nix b/pkgs/development/libraries/haskell/gamma/default.nix index 523b9d233ca..feb57b32a89 100755 --- a/pkgs/development/libraries/haskell/gamma/default.nix +++ b/pkgs/development/libraries/haskell/gamma/default.nix @@ -5,6 +5,9 @@ cabal.mkDerivation (self: { version = "0.7.0.1"; sha256 = "0728b5mrzmj9hkaqvikl45jyi2p9hnkl2p6l9yv7wnw557yb0gb2"; buildDepends = [ continuedFractions converge vector ]; + preConfigure = '' + sed -i 's|\(vector.*\) && < 0.8|\1|' ${self.pname}.cabal + ''; meta = { homepage = "https://github.com/mokus0/gamma"; description = "Gamma function and related functions"; diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix index 6cc9c70ca49..8bb9a4c4ad4 100644 --- a/pkgs/top-level/haskell-packages.nix +++ b/pkgs/top-level/haskell-packages.nix @@ -366,9 +366,7 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y); ACVector = callPackage ../development/libraries/haskell/AC-Vector {}; - aeson = callPackage ../development/libraries/haskell/aeson { - vector = self.vector_0_7_1; - }; + aeson = callPackage ../development/libraries/haskell/aeson {}; aesonNative = callPackage ../development/libraries/haskell/aeson-native {}; @@ -420,9 +418,7 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y); blazeHtml = callPackage ../development/libraries/haskell/blaze-html {}; - blazeTextual = callPackage ../development/libraries/haskell/blaze-textual { - vector = self.vector_0_7_1; - }; + blazeTextual = callPackage ../development/libraries/haskell/blaze-textual {}; blazeTextualNative = callPackage ../development/libraries/haskell/blaze-textual-native {}; @@ -490,9 +486,7 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y); cprngAes = callPackage ../development/libraries/haskell/cprng-aes {}; - criterion = callPackage ../development/libraries/haskell/criterion { - vector = self.vector_0_7_1; - }; + criterion = callPackage ../development/libraries/haskell/criterion {}; Crypto = callPackage ../development/libraries/haskell/Crypto {}; @@ -587,9 +581,7 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y); fingertree = callPackage ../development/libraries/haskell/fingertree {}; - gamma = callPackage ../development/libraries/haskell/gamma { - vector = self.vector_0_7_1; - }; + gamma = callPackage ../development/libraries/haskell/gamma {}; gdiff = callPackage ../development/libraries/haskell/gdiff {}; @@ -882,10 +874,7 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y); murmurHash = callPackage ../development/libraries/haskell/murmur-hash {}; - mwcRandom = callPackage ../development/libraries/haskell/mwc-random { - primitive = self.primitive_0_3_1; - vector = self.vector_0_7_1; - }; + mwcRandom = callPackage ../development/libraries/haskell/mwc-random {}; NanoProlog = callPackage ../development/libraries/haskell/NanoProlog {}; @@ -1006,9 +995,7 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y); random = null; # core package until ghc-7.2.1 random_newtime = self.random_1_0_0_2_newtime; - randomFu = callPackage ../development/libraries/haskell/random-fu { - vector = self.vector_0_7_1; - }; + randomFu = callPackage ../development/libraries/haskell/random-fu {}; randomSource = callPackage ../development/libraries/haskell/random-source {}; @@ -1082,22 +1069,15 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y); smallcheck = callPackage ../development/libraries/haskell/smallcheck {}; - snapCore = callPackage ../development/libraries/haskell/snap/core.nix { - vector = self.vector_0_7_1; - }; + snapCore = callPackage ../development/libraries/haskell/snap/core.nix {}; - snapServer = callPackage ../development/libraries/haskell/snap/server.nix { - vector = self.vector_0_7_1; - }; + snapServer = callPackage ../development/libraries/haskell/snap/server.nix {}; stateref = callPackage ../development/libraries/haskell/stateref {}; StateVar = callPackage ../development/libraries/haskell/StateVar {}; - statistics = callPackage ../development/libraries/haskell/statistics { - primitive = self.primitive_0_3_1; - vector = self.vector_0_7_1; - }; + statistics = callPackage ../development/libraries/haskell/statistics {}; streamproc = callPackage ../development/libraries/haskell/streamproc {}; @@ -1216,9 +1196,7 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y); tls = callPackage ../development/libraries/haskell/tls {}; - tlsExtra = callPackage ../development/libraries/haskell/tls-extra { - vector = self.vector_0_7_1; - }; + tlsExtra = callPackage ../development/libraries/haskell/tls-extra {}; transformers_0_2_2_0 = callPackage ../development/libraries/haskell/transformers/0.2.2.0.nix {}; transformers = self.transformers_0_2_2_0; @@ -1265,15 +1243,12 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y); }; vector = self.vector_0_9; - vectorAlgorithms = callPackage ../development/libraries/haskell/vector-algorithms { - primitive = self.primitive_0_3_1; - vector = self.vector_0_7_1; - }; + vectorAlgorithms = callPackage ../development/libraries/haskell/vector-algorithms {}; vectorSpace = callPackage ../development/libraries/haskell/vector-space {}; vty = callPackage ../development/libraries/haskell/vty { - vector = self.vector_0_7_1; + mtl = self.mtl2; }; wai = callPackage ../development/libraries/haskell/wai {}; @@ -1345,9 +1320,7 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y); yesodForm = callPackage ../development/libraries/haskell/yesod-form {}; - yesodJson = callPackage ../development/libraries/haskell/yesod-json { - vector = self.vector_0_7_1; - }; + yesodJson = callPackage ../development/libraries/haskell/yesod-json {}; yesodPersistent = callPackage ../development/libraries/haskell/yesod-persistent {}; From 4d0d7d78c5f116c59cd2736d55a5928981be5dc7 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Thu, 27 Oct 2011 18:42:32 +0000 Subject: [PATCH 348/970] =?UTF-8?q?*=20Build=20Glibc=20with=20sysconfdir?= =?UTF-8?q?=20set=20to=20/etc.=20=20This=20causes=20it=20to=20look=20for?= =?UTF-8?q?=20=20=20=E2=80=98localtime=E2=80=99=20(the=20default=20time=20?= =?UTF-8?q?zone=20definition)=20in=20/etc=20rather=20than=20=20=20$out/etc?= =?UTF-8?q?,=20allowing=20us=20to=20override=20the=20time=20zone=20globall?= =?UTF-8?q?y=20in=20NixOS.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Note that Glibc already looked in /etc for most other configuration files (e.g., /etc/hosts). svn path=/nixpkgs/branches/stdenv-updates/; revision=30069 --- pkgs/development/libraries/glibc-2.13/common.nix | 3 +++ pkgs/development/libraries/glibc-2.14/common.nix | 3 +++ 2 files changed, 6 insertions(+) diff --git a/pkgs/development/libraries/glibc-2.13/common.nix b/pkgs/development/libraries/glibc-2.13/common.nix index 15941c2a43b..d63e7e99e48 100644 --- a/pkgs/development/libraries/glibc-2.13/common.nix +++ b/pkgs/development/libraries/glibc-2.13/common.nix @@ -90,6 +90,7 @@ stdenv.mkDerivation ({ configureFlags = [ "-C" "--enable-add-ons" + "--sysconfdir=/etc" "--localedir=/var/run/current-system/sw/lib/locale" (if kernelHeaders != null then "--with-headers=${kernelHeaders}/include" @@ -111,6 +112,8 @@ stdenv.mkDerivation ({ # so the glibc does not depend on its compiler store path "libc_cv_as_needed=no" ]; + + installFlags = [ "sysconfdir=$(out)/etc" ]; buildInputs = stdenv.lib.optionals (cross != null) [ gccCross ] ++ stdenv.lib.optional (mig != null) mig; diff --git a/pkgs/development/libraries/glibc-2.14/common.nix b/pkgs/development/libraries/glibc-2.14/common.nix index 87b808cda4b..e24089fd192 100644 --- a/pkgs/development/libraries/glibc-2.14/common.nix +++ b/pkgs/development/libraries/glibc-2.14/common.nix @@ -90,6 +90,7 @@ stdenv.mkDerivation ({ configureFlags = [ "-C" "--enable-add-ons" + "--sysconfdir=/etc" "--localedir=/var/run/current-system/sw/lib/locale" (if kernelHeaders != null then "--with-headers=${kernelHeaders}/include" @@ -111,6 +112,8 @@ stdenv.mkDerivation ({ # so the glibc does not depend on its compiler store path "libc_cv_as_needed=no" ]; + + installFlags = [ "sysconfdir=$(out)/etc" ]; buildInputs = stdenv.lib.optionals (cross != null) [ gccCross ] ++ stdenv.lib.optional (mig != null) mig; From 34117268d2a6bd50696ba90b04da3add6ae02f02 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Thu, 27 Oct 2011 21:45:53 +0000 Subject: [PATCH 349/970] * Use a fork of Net::Amazon::EC2 that supports tags. svn path=/nixpkgs/trunk/; revision=30073 --- .../perl-modules/net-amazon-ec2-ipv6.patch | 31 +++++++------------ pkgs/top-level/perl-packages.nix | 8 +++-- 2 files changed, 16 insertions(+), 23 deletions(-) diff --git a/pkgs/development/perl-modules/net-amazon-ec2-ipv6.patch b/pkgs/development/perl-modules/net-amazon-ec2-ipv6.patch index 453d8f7d29e..0568aeb56bf 100644 --- a/pkgs/development/perl-modules/net-amazon-ec2-ipv6.patch +++ b/pkgs/development/perl-modules/net-amazon-ec2-ipv6.patch @@ -1,8 +1,6 @@ -Support OpenStack's DescribeInstancesV6 API call. - -diff -ru -x '*~' Net-Amazon-EC2-0.14-orig2//lib/Net/Amazon/EC2/RunningInstances.pm Net-Amazon-EC2-0.14//lib/Net/Amazon/EC2/RunningInstances.pm ---- Net-Amazon-EC2-0.14-orig2//lib/Net/Amazon/EC2/RunningInstances.pm 2010-01-24 02:12:50.000000000 +0100 -+++ Net-Amazon-EC2-0.14//lib/Net/Amazon/EC2/RunningInstances.pm 2011-06-21 17:19:36.000000000 +0200 +diff -ru stanaka-net-amazon-ec2-bc66577-orig/lib/Net/Amazon/EC2/RunningInstances.pm stanaka-net-amazon-ec2-bc66577/lib/Net/Amazon/EC2/RunningInstances.pm +--- stanaka-net-amazon-ec2-bc66577-orig/lib/Net/Amazon/EC2/RunningInstances.pm 2011-06-13 19:45:30.000000000 -0400 ++++ stanaka-net-amazon-ec2-bc66577/lib/Net/Amazon/EC2/RunningInstances.pm 2011-10-27 17:25:29.000000000 -0400 @@ -25,6 +25,10 @@ This element remains empty until the instance enters a running state. @@ -14,7 +12,7 @@ diff -ru -x '*~' Net-Amazon-EC2-0.14-orig2//lib/Net/Amazon/EC2/RunningInstances. =item image_id (required) The image id of the AMI currently running in this instance. -@@ -126,6 +130,7 @@ +@@ -134,6 +138,7 @@ has 'ami_launch_index' => ( is => 'ro', isa => 'Str', required => 0 ); has 'dns_name' => ( is => 'ro', isa => 'Maybe[Str]', required => 0 ); @@ -22,10 +20,10 @@ diff -ru -x '*~' Net-Amazon-EC2-0.14-orig2//lib/Net/Amazon/EC2/RunningInstances. has 'image_id' => ( is => 'ro', isa => 'Str', required => 1 ); has 'kernel_id' => ( is => 'ro', isa => 'Maybe[Str]', required => 1 ); has 'ramdisk_id' => ( is => 'ro', isa => 'Maybe[Str]', required => 1 ); -diff -ru -x '*~' Net-Amazon-EC2-0.14-orig2//lib/Net/Amazon/EC2.pm Net-Amazon-EC2-0.14//lib/Net/Amazon/EC2.pm ---- Net-Amazon-EC2-0.14-orig2//lib/Net/Amazon/EC2.pm 2011-06-16 16:11:53.000000000 +0200 -+++ Net-Amazon-EC2-0.14//lib/Net/Amazon/EC2.pm 2011-10-20 20:13:12.585277245 +0200 -@@ -1542,6 +1542,7 @@ +diff -ru stanaka-net-amazon-ec2-bc66577-orig/lib/Net/Amazon/EC2.pm stanaka-net-amazon-ec2-bc66577/lib/Net/Amazon/EC2.pm +--- stanaka-net-amazon-ec2-bc66577-orig/lib/Net/Amazon/EC2.pm 2011-06-13 19:45:30.000000000 -0400 ++++ stanaka-net-amazon-ec2-bc66577/lib/Net/Amazon/EC2.pm 2011-10-27 17:25:29.000000000 -0400 +@@ -1691,6 +1691,7 @@ my $self = shift; my %args = validate( @_, { InstanceId => { type => SCALAR | ARRAYREF, optional => 1 }, @@ -33,8 +31,8 @@ diff -ru -x '*~' Net-Amazon-EC2-0.14-orig2//lib/Net/Amazon/EC2.pm Net-Amazon-EC2 }); # If we have a array ref of instances lets split them out into their InstanceId.n format -@@ -1556,7 +1557,8 @@ - $args{"InstanceId.1"} = delete $args{InstanceId}; +@@ -1703,7 +1704,8 @@ + } } - my $xml = $self->_sign(Action => 'DescribeInstances', %args); @@ -43,7 +41,7 @@ diff -ru -x '*~' Net-Amazon-EC2-0.14-orig2//lib/Net/Amazon/EC2.pm Net-Amazon-EC2 my $reservations; if ( grep { defined && length } $xml->{Errors} ) { -@@ -1635,6 +1637,7 @@ +@@ -1791,6 +1793,7 @@ my $running_instance = Net::Amazon::EC2::RunningInstances->new( ami_launch_index => $instance_elem->{amiLaunchIndex}, dns_name => $instance_elem->{dnsName}, @@ -51,10 +49,3 @@ diff -ru -x '*~' Net-Amazon-EC2-0.14-orig2//lib/Net/Amazon/EC2.pm Net-Amazon-EC2 image_id => $instance_elem->{imageId}, kernel_id => $instance_elem->{kernelId}, ramdisk_id => $instance_elem->{ramdiskId}, -@@ -3866,4 +3869,4 @@ - - =head1 SEE ALSO - --Amazon EC2 API: L -\ No newline at end of file -+Amazon EC2 API: L diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 877d5aed1e1..fade01cff25 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -2402,11 +2402,13 @@ rec { }; NetAmazonEC2 = buildPerlPackage rec { - name = "Net-Amazon-EC2-0.14"; + name = "Net-Amazon-EC2-0.14-stanaka-bc66577e13"; src = fetchurl { - url = "mirror://cpan/authors/id/J/JK/JKIM/${name}.tar.gz"; - sha256 = "14am9m19ziyv12bjxljhfyl0zy120yf4gligsa9v26smb61fxyjr"; + url = https://github.com/stanaka/net-amazon-ec2/zipball/bc66577e1312e828e252937d95f9f5f637af6a0b; + sha256 = "1c0k3addkaaf4zj7z87svm9xc3c06v0r06rf5rpqmps413lqisbn"; + name = "${name}.zip"; }; + buildInputs = [ pkgs.unzip ]; patches = [ # In DescribeInstance requests, say "InstanceId.1" instead of # "InstanceId", as required by the Amazon spec. EC2 tolerates From 49456aaec2e3fe2aa8bfe1e42e4fd73a955779c5 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Thu, 27 Oct 2011 21:52:03 +0000 Subject: [PATCH 350/970] * Added Data::UUID. svn path=/nixpkgs/trunk/; revision=30074 --- pkgs/top-level/perl-packages.nix | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index fade01cff25..08a06d3e221 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -954,6 +954,14 @@ rec { propagatedBuildInputs = [TestException ClassAccessorChained]; }; + DataUUID = buildPerlPackage rec { + name = "Data-UUID-1.217"; + src = fetchurl { + url = "mirror://cpan/modules/by-module/Data/${name}.tar.gz"; + sha256 = "0vgykclw1mn06a53d8y3g7s7vanks8078dh2j4jb84djk0cw9h0q"; + }; + }; + DataVisitor = buildPerlPackage rec { name = "Data-Visitor-0.25"; src = fetchurl { From cf23b0c4e5a7daf33aa5a16dba8e0a95ea030780 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?= Date: Thu, 27 Oct 2011 22:03:41 +0000 Subject: [PATCH 351/970] Making dovecot2 not use $out/var for runtime files. svn path=/nixpkgs/trunk/; revision=30075 --- pkgs/servers/mail/dovecot/2.0.nix | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/pkgs/servers/mail/dovecot/2.0.nix b/pkgs/servers/mail/dovecot/2.0.nix index a2278533dad..15215fa06ce 100644 --- a/pkgs/servers/mail/dovecot/2.0.nix +++ b/pkgs/servers/mail/dovecot/2.0.nix @@ -10,6 +10,10 @@ stdenv.mkDerivation { sha256 = "03byp6alxxk65qfjjnqp6kcncs5cdiqgskx90nk9kcnynl1h6r33"; }; + # It will hardcode this for /var/lib/dovecot. + # http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=626211 + configureFlags = [ "--localstatedir=/var" ]; + meta = { homepage = http://dovecot.org/; description = "Open source IMAP and POP3 email server written with security primarily in mind"; From 9b9ca264d1db40734c565d352f0be2f7c3d3c2c8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?= Date: Thu, 27 Oct 2011 22:07:39 +0000 Subject: [PATCH 352/970] dovecot 2 feels hapier with zlib and bzip2 svn path=/nixpkgs/trunk/; revision=30077 --- pkgs/servers/mail/dovecot/2.0.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/mail/dovecot/2.0.nix b/pkgs/servers/mail/dovecot/2.0.nix index 15215fa06ce..80cb237f6df 100644 --- a/pkgs/servers/mail/dovecot/2.0.nix +++ b/pkgs/servers/mail/dovecot/2.0.nix @@ -1,9 +1,9 @@ -{stdenv, fetchurl, openssl, pam}: +{stdenv, fetchurl, openssl, pam, bzip2, zlib}: stdenv.mkDerivation { name = "dovecot-2.0.15"; - buildInputs = [openssl pam]; + buildInputs = [openssl pam bzip2 zlib]; src = fetchurl { url = http://dovecot.org/releases/2.0/dovecot-2.0.15.tar.gz; From 041170f5ece6eebb4b566f2c05cb50fdd0f317c1 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Fri, 28 Oct 2011 18:06:23 +0000 Subject: [PATCH 353/970] * Bump nixUnstable. svn path=/nixpkgs/trunk/; revision=30078 --- pkgs/tools/package-management/nix/unstable.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/package-management/nix/unstable.nix b/pkgs/tools/package-management/nix/unstable.nix index 6bc3f33750b..1483120e409 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.0pre29200"; + name = "nix-1.0pre30070"; src = fetchurl { - url = "http://hydra.nixos.org/build/1320284/download/4/${name}.tar.bz2"; - sha256 = "a10f65b52bcf72b9ec7bf5610e16de2d49c1cc4c008bf0a93281e8e2233fa1b1"; + url = "http://hydra.nixos.org/build/1480955/download/4/${name}.tar.bz2"; + sha256 = "71335de404ec6745418b524622527b470485fb968bf7cf10a0cb67926ee1286a"; }; buildNativeInputs = [ perl pkgconfig ]; From 629c2411cde47bf1d802b38124388e5b50f49589 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Fri, 28 Oct 2011 19:22:47 +0000 Subject: [PATCH 354/970] haskell-texmath: updated to version 0.5.0.2 svn path=/nixpkgs/trunk/; revision=30079 --- .../libraries/haskell/texmath/{0.5.0.1.nix => default.nix} | 4 ++-- pkgs/top-level/haskell-packages.nix | 4 +--- 2 files changed, 3 insertions(+), 5 deletions(-) rename pkgs/development/libraries/haskell/texmath/{0.5.0.1.nix => default.nix} (84%) diff --git a/pkgs/development/libraries/haskell/texmath/0.5.0.1.nix b/pkgs/development/libraries/haskell/texmath/default.nix similarity index 84% rename from pkgs/development/libraries/haskell/texmath/0.5.0.1.nix rename to pkgs/development/libraries/haskell/texmath/default.nix index f82e98703c7..2bfc62b9bff 100644 --- a/pkgs/development/libraries/haskell/texmath/0.5.0.1.nix +++ b/pkgs/development/libraries/haskell/texmath/default.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "texmath"; - version = "0.5.0.1"; - sha256 = "0kw23b1df7456d2h48g2p7k8nvfv80a8a70xgkq4pn7v50vqipdy"; + version = "0.5.0.2"; + sha256 = "1ysg28q1l33hi6ias5pw0qps46kbys5piczipacrp58b0cm6pvrg"; isLibrary = true; isExecutable = true; buildDepends = [ parsec syb xml ]; diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix index 8bb9a4c4ad4..349aa8fd698 100644 --- a/pkgs/top-level/haskell-packages.nix +++ b/pkgs/top-level/haskell-packages.nix @@ -1170,9 +1170,7 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y); testpack = callPackage ../development/libraries/haskell/testpack {}; - texmath_0_4 = callPackage ../development/libraries/haskell/texmath/0.4.nix {}; - texmath_0_5_0_1 = callPackage ../development/libraries/haskell/texmath/0.5.0.1.nix {}; - texmath = self.texmath_0_5_0_1; + texmath = callPackage ../development/libraries/haskell/texmath {}; text_0_11_0_5 = callPackage ../development/libraries/haskell/text/0.11.0.5.nix {}; text_0_11_0_6 = callPackage ../development/libraries/haskell/text/0.11.0.6.nix {}; From dd9dc1a3376210b019abe394894a47c809fdad35 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Fri, 28 Oct 2011 19:22:51 +0000 Subject: [PATCH 355/970] haskell-GLUT: updated to version 2.2.2.1 svn path=/nixpkgs/trunk/; revision=30080 --- .../libraries/haskell/GLUT/{2.2.2.0.nix => 2.2.2.1.nix} | 6 +++--- pkgs/top-level/haskell-packages.nix | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) rename pkgs/development/libraries/haskell/GLUT/{2.2.2.0.nix => 2.2.2.1.nix} (77%) diff --git a/pkgs/development/libraries/haskell/GLUT/2.2.2.0.nix b/pkgs/development/libraries/haskell/GLUT/2.2.2.1.nix similarity index 77% rename from pkgs/development/libraries/haskell/GLUT/2.2.2.0.nix rename to pkgs/development/libraries/haskell/GLUT/2.2.2.1.nix index 2f25c5bd1ce..3248631be3e 100644 --- a/pkgs/development/libraries/haskell/GLUT/2.2.2.0.nix +++ b/pkgs/development/libraries/haskell/GLUT/2.2.2.1.nix @@ -4,12 +4,12 @@ cabal.mkDerivation (self: { pname = "GLUT"; - version = "2.2.2.0"; - sha256 = "0hilpjwkjvpz4sz0zqa36vmx8m1yycjnqdd721mqns7lib2fnzrx"; + version = "2.2.2.1"; + sha256 = "09qpkrwpc3w173mvqwda7vi0ncpzzzrnlfa14ja7jba489a8l1mw"; buildDepends = [ OpenGL StateVar Tensor ]; extraLibraries = [ freeglut libICE libSM libXi libXmu mesa ]; meta = { - homepage = "http://www.haskell.org/HOpenGL/"; + homepage = "http://www.haskell.org/haskellwiki/Opengl"; description = "A binding for the OpenGL Utility Toolkit"; license = self.stdenv.lib.licenses.bsd3; platforms = self.ghc.meta.platforms; diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix index 349aa8fd698..15f563a32e7 100644 --- a/pkgs/top-level/haskell-packages.nix +++ b/pkgs/top-level/haskell-packages.nix @@ -623,10 +623,10 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y); GLUT_2_1_1_2 = callPackage ../development/libraries/haskell/GLUT/2.1.1.2.nix {}; GLUT_2_1_2_1 = callPackage ../development/libraries/haskell/GLUT/2.1.2.1.nix {}; - GLUT_2_2_2_0 = callPackage ../development/libraries/haskell/GLUT/2.2.2.0.nix { - OpenGL = self.OpenGL_2_4_0_1; + GLUT_2_2_2_1 = callPackage ../development/libraries/haskell/GLUT/2.2.2.1.nix { + OpenGL = self.OpenGL_2_4_0_2; }; - GLUT22 = self.GLUT_2_2_2_0; + GLUT22 = self.GLUT_2_2_2_1; GLUT = self.GLUT_2_1_1_2; gtk = callPackage ../development/libraries/haskell/gtk { From 2ac2f2fac93614732ad111a7c3b3b594649a88d4 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Fri, 28 Oct 2011 19:22:55 +0000 Subject: [PATCH 356/970] haskell-OpenGL: updated to version 2.4.0.2 svn path=/nixpkgs/trunk/; revision=30081 --- .../libraries/haskell/OpenGL/{2.4.0.1.nix => 2.4.0.2.nix} | 6 +++--- pkgs/top-level/haskell-packages.nix | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) rename pkgs/development/libraries/haskell/OpenGL/{2.4.0.1.nix => 2.4.0.2.nix} (77%) diff --git a/pkgs/development/libraries/haskell/OpenGL/2.4.0.1.nix b/pkgs/development/libraries/haskell/OpenGL/2.4.0.2.nix similarity index 77% rename from pkgs/development/libraries/haskell/OpenGL/2.4.0.1.nix rename to pkgs/development/libraries/haskell/OpenGL/2.4.0.2.nix index 2deb96d750f..73b5c741bbb 100644 --- a/pkgs/development/libraries/haskell/OpenGL/2.4.0.1.nix +++ b/pkgs/development/libraries/haskell/OpenGL/2.4.0.2.nix @@ -4,12 +4,12 @@ cabal.mkDerivation (self: { pname = "OpenGL"; - version = "2.4.0.1"; - sha256 = "0xdclf0m7qxp4157053cbsybpy7fqiiiak0g2kyf8awr7a5736n5"; + version = "2.4.0.2"; + sha256 = "00rjvm02p6h8vbyxi3ri4jkk75ki414wk5al2z2fsszjfpdl93b6"; buildDepends = [ GLURaw ObjectName OpenGLRaw StateVar Tensor ]; extraLibraries = [ libX11 mesa ]; meta = { - homepage = "http://www.haskell.org/HOpenGL/"; + homepage = "http://www.haskell.org/haskellwiki/Opengl"; description = "A binding for the OpenGL graphics system"; license = self.stdenv.lib.licenses.bsd3; platforms = self.ghc.meta.platforms; diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix index 15f563a32e7..0e3413a2563 100644 --- a/pkgs/top-level/haskell-packages.nix +++ b/pkgs/top-level/haskell-packages.nix @@ -905,8 +905,8 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y); OpenGL_2_2_1_1 = callPackage ../development/libraries/haskell/OpenGL/2.2.1.1.nix {}; OpenGL_2_2_3_0 = callPackage ../development/libraries/haskell/OpenGL/2.2.3.0.nix {}; - OpenGL_2_4_0_1 = callPackage ../development/libraries/haskell/OpenGL/2.4.0.1.nix {}; - OpenGL24 = self.OpenGL_2_4_0_1; + OpenGL_2_4_0_2 = callPackage ../development/libraries/haskell/OpenGL/2.4.0.2.nix {}; + OpenGL24 = self.OpenGL_2_4_0_2; OpenGL = self.OpenGL_2_2_1_1; OpenGLRaw = callPackage ../development/libraries/haskell/OpenGLRaw {}; From 357e506105cd9826f5b6b3006880a7f039f9a186 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Fri, 28 Oct 2011 19:22:58 +0000 Subject: [PATCH 357/970] haskell-base16-bytestring: added version 0.1.1.2 svn path=/nixpkgs/trunk/; revision=30082 --- .../haskell/base16-bytestring/default.nix | 17 +++++++++++++++++ pkgs/top-level/haskell-packages.nix | 2 ++ 2 files changed, 19 insertions(+) create mode 100644 pkgs/development/libraries/haskell/base16-bytestring/default.nix diff --git a/pkgs/development/libraries/haskell/base16-bytestring/default.nix b/pkgs/development/libraries/haskell/base16-bytestring/default.nix new file mode 100644 index 00000000000..33b7d437b33 --- /dev/null +++ b/pkgs/development/libraries/haskell/base16-bytestring/default.nix @@ -0,0 +1,17 @@ +{ cabal }: + +cabal.mkDerivation (self: { + pname = "base16-bytestring"; + version = "0.1.1.2"; + sha256 = "1isxyl52vh0lg195wq9nkr3hlmbw3d3c9aymxlz8hynz0hh1q1z0"; + meta = { + homepage = "http://github.com/mailrank/base16-bytestring"; + description = "Fast base16 (hex) encoding and deconding for ByteStrings"; + license = self.stdenv.lib.licenses.bsd3; + platforms = self.ghc.meta.platforms; + maintainers = [ + self.stdenv.lib.maintainers.andres + self.stdenv.lib.maintainers.simons + ]; + }; +}) diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix index 0e3413a2563..759cca546c9 100644 --- a/pkgs/top-level/haskell-packages.nix +++ b/pkgs/top-level/haskell-packages.nix @@ -392,6 +392,8 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y); authenticate = callPackage ../development/libraries/haskell/authenticate {}; + base16Bytestring = callPackage ../development/libraries/haskell/base16-bytestring {}; + base64String = callPackage ../development/libraries/haskell/base64-string {}; base64Bytestring = callPackage ../development/libraries/haskell/base64-bytestring {}; From 7ae5561dc283f06d6e909345d1dca1108bca3d39 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Fri, 28 Oct 2011 19:23:01 +0000 Subject: [PATCH 358/970] haskell-GLURaw: updated to version 1.1.0.1 svn path=/nixpkgs/trunk/; revision=30083 --- pkgs/development/libraries/haskell/GLURaw/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/libraries/haskell/GLURaw/default.nix b/pkgs/development/libraries/haskell/GLURaw/default.nix index c6ed00e0836..03480856669 100644 --- a/pkgs/development/libraries/haskell/GLURaw/default.nix +++ b/pkgs/development/libraries/haskell/GLURaw/default.nix @@ -2,12 +2,12 @@ cabal.mkDerivation (self: { pname = "GLURaw"; - version = "1.1.0.0"; - sha256 = "03lsskqxh2q7kbnw8hbxz5wp7zq55nwbibsb9maj4y3xpc1vprac"; + version = "1.1.0.1"; + sha256 = "0n2yazdk98ia9j65n4ac7k0lnyp9cmz51d344x0jsi0xyfckm0mq"; buildDepends = [ OpenGLRaw ]; extraLibraries = [ freeglut mesa ]; meta = { - homepage = "http://www.haskell.org/HOpenGL/"; + homepage = "http://www.haskell.org/haskellwiki/Opengl"; description = "A raw binding for the OpenGL graphics system"; license = self.stdenv.lib.licenses.bsd3; platforms = self.ghc.meta.platforms; From de38964185bcae58895cc008f45ceac187be28b0 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Fri, 28 Oct 2011 19:23:04 +0000 Subject: [PATCH 359/970] haskell-OpenGLRaw: updated to version 1.1.0.2 svn path=/nixpkgs/trunk/; revision=30084 --- pkgs/development/libraries/haskell/OpenGLRaw/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/libraries/haskell/OpenGLRaw/default.nix b/pkgs/development/libraries/haskell/OpenGLRaw/default.nix index 16863a4be15..3a86955a438 100644 --- a/pkgs/development/libraries/haskell/OpenGLRaw/default.nix +++ b/pkgs/development/libraries/haskell/OpenGLRaw/default.nix @@ -2,11 +2,11 @@ cabal.mkDerivation (self: { pname = "OpenGLRaw"; - version = "1.1.0.1"; - sha256 = "0v6zcy4xvjj5g137rwjsh6hs0ni9dfkvsqynxv4bl5s78amppqnf"; + version = "1.1.0.2"; + sha256 = "0d1rjh2vq0w1pzf3vz0mw6p0w43h3sf6034qsi89m4jkx3125fwf"; extraLibraries = [ mesa ]; meta = { - homepage = "http://www.haskell.org/HOpenGL/"; + homepage = "http://www.haskell.org/haskellwiki/Opengl"; description = "A raw binding for the OpenGL graphics system"; license = self.stdenv.lib.licenses.bsd3; platforms = self.ghc.meta.platforms; From ea0524380a4cd33294373025bc236fc65cbbbc7a Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Fri, 28 Oct 2011 19:23:07 +0000 Subject: [PATCH 360/970] haskell-snap-core: updated to version 0.6.0 svn path=/nixpkgs/trunk/; revision=30085 --- .../libraries/haskell/snap/core.nix | 24 ++++++++++--------- 1 file changed, 13 insertions(+), 11 deletions(-) diff --git a/pkgs/development/libraries/haskell/snap/core.nix b/pkgs/development/libraries/haskell/snap/core.nix index ceb18b666f9..19486310b09 100644 --- a/pkgs/development/libraries/haskell/snap/core.nix +++ b/pkgs/development/libraries/haskell/snap/core.nix @@ -1,19 +1,21 @@ -{ cabal, attoparsec, attoparsecEnumerator, blazeBuilder -, blazeBuilderEnumerator, bytestringMmap, bytestringNums -, caseInsensitive, deepseq, dlist, enumerator -, MonadCatchIOTransformers, mtl, text, time, transformers -, unixCompat, vector, zlibEnum +{ cabal, attoparsec, attoparsecEnumerator, base16Bytestring +, blazeBuilder, blazeBuilderEnumerator, bytestringMmap +, bytestringNums, caseInsensitive, deepseq, dlist, enumerator +, HUnit, MonadCatchIOTransformers, mtl, mwcRandom, regexPosix, text +, time, transformers, unixCompat, unorderedContainers, vector +, zlibEnum }: cabal.mkDerivation (self: { pname = "snap-core"; - version = "0.5.5"; - sha256 = "1md9n3f11ki87774fh3p7d6bykfdwcqz6b2yrjci4mwf1b1xppkj"; + version = "0.6.0"; + sha256 = "1rf85chybjsfva502bmjgfvhv4b6clrjg6i9ywcr3gwnk4ngw165"; buildDepends = [ - attoparsec attoparsecEnumerator blazeBuilder blazeBuilderEnumerator - bytestringMmap bytestringNums caseInsensitive deepseq dlist - enumerator MonadCatchIOTransformers mtl text time transformers - unixCompat vector zlibEnum + attoparsec attoparsecEnumerator base16Bytestring blazeBuilder + blazeBuilderEnumerator bytestringMmap bytestringNums + caseInsensitive deepseq dlist enumerator HUnit + MonadCatchIOTransformers mtl mwcRandom regexPosix text time + transformers unixCompat unorderedContainers vector zlibEnum ]; meta = { homepage = "http://snapframework.com/"; From 4d0fb1076decaaec67e63c67c7ba4151ea8ecffd Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Fri, 28 Oct 2011 19:23:09 +0000 Subject: [PATCH 361/970] haskell-snap-server: updated to version 0.6.0 svn path=/nixpkgs/trunk/; revision=30086 --- pkgs/development/libraries/haskell/snap/server.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/snap/server.nix b/pkgs/development/libraries/haskell/snap/server.nix index 838097064e7..efbb588d0d3 100644 --- a/pkgs/development/libraries/haskell/snap/server.nix +++ b/pkgs/development/libraries/haskell/snap/server.nix @@ -7,8 +7,8 @@ cabal.mkDerivation (self: { pname = "snap-server"; - version = "0.5.5"; - sha256 = "10b4y5sfgr1bxs48b78nv6hs68v6qhg008rj9qnwwdp8lxgl4hi8"; + version = "0.6.0"; + sha256 = "1a9hi252h8k6s0hf6nnla6kf3ad899q7q3q78v1ifdpr5k9nrmq2"; buildDepends = [ attoparsec attoparsecEnumerator binary blazeBuilder blazeBuilderEnumerator bytestringNums caseInsensitive directoryTree From 3b75d96027cc1062cd1d8d0b496d828c0c46de71 Mon Sep 17 00:00:00 2001 From: Shea Levy Date: Fri, 28 Oct 2011 19:49:08 +0000 Subject: [PATCH 362/970] glibc locales: Don't assume /nix/store svn path=/nixpkgs/trunk/; revision=30087 --- pkgs/development/libraries/glibc-2.12/locales.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/libraries/glibc-2.12/locales.nix b/pkgs/development/libraries/glibc-2.12/locales.nix index d598e0e094d..31a03c48d85 100644 --- a/pkgs/development/libraries/glibc-2.12/locales.nix +++ b/pkgs/development/libraries/glibc-2.12/locales.nix @@ -40,7 +40,7 @@ in installPhase = '' ensureDir "$out/lib/locale" - cp -v "$TMPDIR/nix/store/"*"/lib/locale/locale-archive" "$out/lib/locale" + cp -v "$TMPDIR/$NIX_STORE/"*"/lib/locale/locale-archive" "$out/lib/locale" ''; meta.description = "Locale information for the GNU C Library"; From a5c4b75643c498be383eb5e6b07c74e684168632 Mon Sep 17 00:00:00 2001 From: Shea Levy Date: Fri, 28 Oct 2011 21:02:34 +0000 Subject: [PATCH 363/970] reiserfsprogs: Use the kernel mirrors svn path=/nixpkgs/trunk/; revision=30088 --- pkgs/tools/filesystems/reiserfsprogs/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/tools/filesystems/reiserfsprogs/default.nix b/pkgs/tools/filesystems/reiserfsprogs/default.nix index 7cadc0dd649..2283a0c1746 100644 --- a/pkgs/tools/filesystems/reiserfsprogs/default.nix +++ b/pkgs/tools/filesystems/reiserfsprogs/default.nix @@ -4,7 +4,7 @@ stdenv.mkDerivation rec { name = "reiserfsprogs-3.6.21"; src = fetchurl { - url = "http://www.kernel.org/pub/linux/utils/fs/reiserfs/${name}.tar.bz2"; + url = "mirror://kernel/linux/utils/fs/reiserfs/${name}.tar.bz2"; sha256 = "19mqzhh6jsf2gh8zr5scqi9pyk1fwivrxncd11rqnp2148c58jam"; }; From 819198fba04394ebc3cc9aa959b3647a9a96383f Mon Sep 17 00:00:00 2001 From: Shea Levy Date: Fri, 28 Oct 2011 21:11:27 +0000 Subject: [PATCH 364/970] usbutils: The sourceforge site doesn't appear to have the tarball anymore, use kernel mirror svn path=/nixpkgs/trunk/; revision=30089 --- pkgs/os-specific/linux/usbutils/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/os-specific/linux/usbutils/default.nix b/pkgs/os-specific/linux/usbutils/default.nix index b3093b22a25..96ae5b93aa8 100644 --- a/pkgs/os-specific/linux/usbutils/default.nix +++ b/pkgs/os-specific/linux/usbutils/default.nix @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { name = "usbutils-0.86"; src = fetchurl { - url = "mirror://sourceforge/linux-usb/${name}.tar.gz"; + url = "mirror://kernel/linux/utils/usb/usbutils/${name}.tar.gz"; sha256 = "1x0jkiwrgdb8qwy21iwhxpc8k61apxqp1901h866d1ydsakbxcmk"; }; From 9afc1f6a24ce745412d502ea3e12911869c26936 Mon Sep 17 00:00:00 2001 From: Shea Levy Date: Fri, 28 Oct 2011 21:23:40 +0000 Subject: [PATCH 365/970] nuke-refs: Don't assume /nix/store svn path=/nixpkgs/trunk/; revision=30090 --- pkgs/build-support/nuke-references/builder.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/build-support/nuke-references/builder.sh b/pkgs/build-support/nuke-references/builder.sh index 429a5a8dee4..3b9324073ef 100644 --- a/pkgs/build-support/nuke-references/builder.sh +++ b/pkgs/build-support/nuke-references/builder.sh @@ -5,7 +5,7 @@ cat > $out/bin/nuke-refs < \$i.tmp + cat \$i | sed "s|$NIX_STORE/[a-z0-9]*-|$NIX_STORE/eeeeeeeeeeeeeeeeeeeeeeeeeeeeeeee-|g" > \$i.tmp if test -x \$i; then chmod +x \$i.tmp; fi mv \$i.tmp \$i fi From c33eec8e05fec1f4ea43b27f042b133aad6cf1e9 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Fri, 28 Oct 2011 21:25:09 +0000 Subject: [PATCH 366/970] * Make KDE 4.7 the default. svn path=/nixpkgs/trunk/; revision=30091 --- pkgs/top-level/all-packages.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 120521058f4..ee87e250b46 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -8009,7 +8009,7 @@ let }; - kde4 = recurseIntoAttrs pkgs.kde45; + kde4 = recurseIntoAttrs pkgs.kde47; # TODO: merge with branches/drop-kde4.5 if you want to remove KDE SC 4.5 # This branch removes kde45 and quite a few compatibility hacks From c90c831a85b6eaa17da44af06237c21dcab6d65f Mon Sep 17 00:00:00 2001 From: Shea Levy Date: Fri, 28 Oct 2011 21:28:52 +0000 Subject: [PATCH 367/970] ntfs-3g: The tuxera url isn't working svn path=/nixpkgs/trunk/; revision=30092 --- pkgs/tools/filesystems/ntfs-3g/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/tools/filesystems/ntfs-3g/default.nix b/pkgs/tools/filesystems/ntfs-3g/default.nix index c41121911e5..a39ba002d23 100644 --- a/pkgs/tools/filesystems/ntfs-3g/default.nix +++ b/pkgs/tools/filesystems/ntfs-3g/default.nix @@ -6,7 +6,7 @@ stdenv.mkDerivation rec { name = "${pname}-${version}"; src = fetchurl { - url = "http://tuxera.com/opensource/${name}.tgz"; + url = "http://pkgs.fedoraproject.org/repo/pkgs/ntfs-3g/ntfs-3g-2010.10.2.tgz/91405690f25822142cdcb43d03e62d3f/ntfs-3g-2010.10.2.tgz"; sha256 = "0wcyks4nvi1kck8i2dgwfsy5zxhil0v0xam8zbg1p592xbqygiqp"; }; From c3ef673ff114c2306ba367ed838cd73473b84866 Mon Sep 17 00:00:00 2001 From: Shea Levy Date: Fri, 28 Oct 2011 21:31:03 +0000 Subject: [PATCH 368/970] iproute2: Working URL svn path=/nixpkgs/trunk/; revision=30093 --- pkgs/os-specific/linux/iproute/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/os-specific/linux/iproute/default.nix b/pkgs/os-specific/linux/iproute/default.nix index 806efdcba6d..6fe5a0aadf2 100644 --- a/pkgs/os-specific/linux/iproute/default.nix +++ b/pkgs/os-specific/linux/iproute/default.nix @@ -4,7 +4,7 @@ stdenv.mkDerivation rec { name = "iproute2-2.6.35"; src = fetchurl { - url = "http://devresources.linux-foundation.org/dev/iproute2/download/${name}.tar.bz2"; + url = "http://pkgs.fedoraproject.org/repo/pkgs/iproute/iproute2-2.6.35.tar.bz2/b0f281b3124bf04669e18f5fe16d4934/iproute2-2.6.35.tar.bz2"; sha256 = "18why1wy0v859axgrlfxn80zmskss0410hh9rf5gn9cr29zg9cla"; }; From 0f80aa96a6a5c665753d99baf2f812cbd2c77f20 Mon Sep 17 00:00:00 2001 From: Shea Levy Date: Fri, 28 Oct 2011 23:44:49 +0000 Subject: [PATCH 369/970] s|/nix/store|$NIX_STORE| svn path=/nixpkgs/trunk/; revision=30094 --- pkgs/build-support/kernel/modules-closure.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/build-support/kernel/modules-closure.sh b/pkgs/build-support/kernel/modules-closure.sh index c1e216956e7..7faaa0122cd 100644 --- a/pkgs/build-support/kernel/modules-closure.sh +++ b/pkgs/build-support/kernel/modules-closure.sh @@ -27,7 +27,7 @@ done echo "closure:" ensureDir $out/lib/modules/"$version" for module in $closure; do - target=$(echo $module | sed "s^/nix/store/.*/lib/modules/^$out/lib/modules/^") + target=$(echo $module | sed "s^$NIX_STORE.*/lib/modules/^$out/lib/modules/^") if test -e "$target"; then continue; fi mkdir -p $(dirname $target) echo $module From 2688ba5b0ac59a6ac7daefdecb232e2cb458827c Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Sat, 29 Oct 2011 10:47:58 +0000 Subject: [PATCH 370/970] haskell-MonadCatchIO-transformers: updated to version 0.2.2.3 svn path=/nixpkgs/trunk/; revision=30100 --- .../libraries/haskell/MonadCatchIO-transformers/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/libraries/haskell/MonadCatchIO-transformers/default.nix b/pkgs/development/libraries/haskell/MonadCatchIO-transformers/default.nix index 1c992f4b571..52080c26a3b 100644 --- a/pkgs/development/libraries/haskell/MonadCatchIO-transformers/default.nix +++ b/pkgs/development/libraries/haskell/MonadCatchIO-transformers/default.nix @@ -2,12 +2,12 @@ cabal.mkDerivation (self: { pname = "MonadCatchIO-transformers"; - version = "0.2.2.2"; - sha256 = "083c0abwja447j0p8q0j15iv7bshchy83rfqw07b2hfy38467h9g"; + version = "0.2.2.3"; + sha256 = "1qwy9rrmf3kl7rb7v46n81xmrwy4xl63lfnlsiz1qc0hybjkl7m6"; buildDepends = [ extensibleExceptions transformers ]; meta = { description = "Monad-transformer compatible version of the Control.Exception module"; - license = self.stdenv.lib.licenses.publicDomain; + license = self.stdenv.lib.licenses.bsd3; platforms = self.ghc.meta.platforms; maintainers = [ self.stdenv.lib.maintainers.andres From d9f4e0f2e87715adc438275781ede8b41905effd Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Sat, 29 Oct 2011 10:48:02 +0000 Subject: [PATCH 371/970] haskell-snap-core: updated to version 0.6.0.1 svn path=/nixpkgs/trunk/; revision=30101 --- pkgs/development/libraries/haskell/snap/core.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/snap/core.nix b/pkgs/development/libraries/haskell/snap/core.nix index 19486310b09..ffdc99d2edf 100644 --- a/pkgs/development/libraries/haskell/snap/core.nix +++ b/pkgs/development/libraries/haskell/snap/core.nix @@ -8,8 +8,8 @@ cabal.mkDerivation (self: { pname = "snap-core"; - version = "0.6.0"; - sha256 = "1rf85chybjsfva502bmjgfvhv4b6clrjg6i9ywcr3gwnk4ngw165"; + version = "0.6.0.1"; + sha256 = "1vcpi56a5cia8z7n3zskhl2b7v9vkqkr87hy8n3hz5lz1lc82kkz"; buildDepends = [ attoparsec attoparsecEnumerator base16Bytestring blazeBuilder blazeBuilderEnumerator bytestringMmap bytestringNums From 908f43b020ae7f42ede0bc4a16d0e41be8e043a2 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Sat, 29 Oct 2011 10:48:05 +0000 Subject: [PATCH 372/970] haskell-snap-server: updated to version 0.6.0.1 svn path=/nixpkgs/trunk/; revision=30102 --- pkgs/development/libraries/haskell/snap/server.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/snap/server.nix b/pkgs/development/libraries/haskell/snap/server.nix index efbb588d0d3..bdfb541c3d3 100644 --- a/pkgs/development/libraries/haskell/snap/server.nix +++ b/pkgs/development/libraries/haskell/snap/server.nix @@ -7,8 +7,8 @@ cabal.mkDerivation (self: { pname = "snap-server"; - version = "0.6.0"; - sha256 = "1a9hi252h8k6s0hf6nnla6kf3ad899q7q3q78v1ifdpr5k9nrmq2"; + version = "0.6.0.1"; + sha256 = "0df6db841vwakdxmmy375g89pjsgiv0a6nas37b68gaanfcrkch3"; buildDepends = [ attoparsec attoparsecEnumerator binary blazeBuilder blazeBuilderEnumerator bytestringNums caseInsensitive directoryTree From 2492fba29f1eefb0775b79efc012d5e040d55c09 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= Date: Sun, 30 Oct 2011 00:00:11 +0000 Subject: [PATCH 373/970] gnupdate: Add `--attribute' option. * maintainers/scripts/gnu/gnupdate (open-nixpkgs): Add optional ATTRIBUTE parameter; honor it. (%options)["-A"]: New option. (gnupdate)[nixpkgs->snix]: Add ATTRIBUTE parameter and pass it down to `open-nixpkgs'. [selected-gnu-packages]: New procedure. Adjust callers accordingly. svn path=/nixpkgs/trunk/; revision=30107 --- maintainers/scripts/gnu/gnupdate | 79 ++++++++++++++++++++++---------- 1 file changed, 54 insertions(+), 25 deletions(-) diff --git a/maintainers/scripts/gnu/gnupdate b/maintainers/scripts/gnu/gnupdate index 96517f86cb8..4fbf5b6d43a 100755 --- a/maintainers/scripts/gnu/gnupdate +++ b/maintainers/scripts/gnu/gnupdate @@ -308,12 +308,17 @@ replaced by the result of their application to DERIVATIONS, a vhash." ;; DERIVATION lacks an "src" attribute. (and=> (derivation-source derivation) source-output-path)) -(define (open-nixpkgs nixpkgs) +(define* (open-nixpkgs nixpkgs #:optional attribute) + ;; Return an input pipe to the XML representation of Nixpkgs. When + ;; ATTRIBUTE is true, only that attribute is considered. (let ((script (string-append nixpkgs "/maintainers/scripts/eval-release.nix"))) - (open-pipe* OPEN_READ "nix-instantiate" - "--strict" "--eval-only" "--xml" - script))) + (apply open-pipe* OPEN_READ + "nix-instantiate" "--strict" "--eval-only" "--xml" + `(,@(if attribute + `("-A" ,attribute) + '()) + ,script)))) (define (pipe-failed? pipe) "Close pipe and return its status if it failed." @@ -963,12 +968,18 @@ pairs. Example: (\"mit-scheme-9.0.1\" . \"/gnu/mit-scheme/stable.pkg/9.0.1\"). (format #t "~%") (format #t " -x, --xml=FILE Read XML output of `nix-instantiate'~%") (format #t " from FILE.~%") + (format #t " -A, --attribute=ATTR~%") + (format #t " Update only the package pointed to by attribute~%") + (format #t " ATTR.~%") (format #t " -s, --select=SET Update only packages from SET, which may~%") (format #t " be either `all', `stdenv', or `non-stdenv'.~%") (format #t " -d, --dry-run Don't actually update Nix expressions~%") (format #t " -h, --help Give this help list.~%~%") (format #t "Report bugs to ~%") (exit 0))) + (option '(#\A "attribute") #t #f + (lambda (opt name arg result) + (alist-cons 'attribute arg result))) (option '(#\s "select") #t #f (lambda (opt name arg result) (cond ((string-ci=? arg "stdenv") @@ -994,13 +1005,14 @@ pairs. Example: (\"mit-scheme-9.0.1\" . \"/gnu/mit-scheme/stable.pkg/9.0.1\"). (define (gnupdate . args) ;; Assume Nixpkgs is under $NIXPKGS or ~/src/nixpkgs. - (define (nixpkgs->snix xml-file) + (define (nixpkgs->snix xml-file attribute) (format (current-error-port) "evaluating Nixpkgs...~%") (let* ((home (getenv "HOME")) (xml (if xml-file (open-input-file xml-file) (open-nixpkgs (or (getenv "NIXPKGS") - (string-append home "/src/nixpkgs"))))) + (string-append home "/src/nixpkgs")) + attribute))) (snix (xml->snix xml))) (if (not xml-file) (let ((status (pipe-failed? xml))) @@ -1009,7 +1021,34 @@ pairs. Example: (\"mit-scheme-9.0.1\" . \"/gnu/mit-scheme/stable.pkg/9.0.1\"). (format (current-error-port) "`nix-instantiate' failed: ~A~%" status) (exit 1))))) - snix)) + + ;; If we asked for a specific attribute, rewrap the thing in an + ;; attribute set to match the expectations of `packages-to-update' & co. + (if attribute + (match snix + (('snix loc ('derivation args ...)) + `(snix ,loc + (attribute-set + ((attribute #f ,attribute + (derivation ,@args))))))) + snix))) + + (define (selected-gnu-packages packages stdenv selection) + ;; Return the subset of PACKAGES that are/aren't in STDENV, according to + ;; SELECTION. To do that reliably, we check whether their "src" + ;; derivation is a requisite of STDENV. + (define gnu + (gnu-packages packages)) + + (case selection + ((stdenv) + gnu) + ((non-stdenv) + (filter (lambda (p) + (not (member (package-source-output-path p) + (force stdenv)))) + gnu)) + (else gnu))) (let* ((opts (args-fold (cdr args) %options (lambda (opt name arg result) @@ -1017,7 +1056,8 @@ pairs. Example: (\"mit-scheme-9.0.1\" . \"/gnu/mit-scheme/stable.pkg/9.0.1\"). (lambda (operand result) (error "extraneous argument `~A'" operand)) '())) - (snix (nixpkgs->snix (assoc-ref opts 'xml-file))) + (snix (nixpkgs->snix (assq-ref opts 'xml-file) + (assq-ref opts 'attribute))) (packages (match snix (('snix _ ('attribute-set attributes)) attributes) @@ -1026,23 +1066,12 @@ pairs. Example: (\"mit-scheme-9.0.1\" . \"/gnu/mit-scheme/stable.pkg/9.0.1\"). ;; The source tarballs that make up stdenv. (filter-map derivation-source-output-path (package-requisites (stdenv-package packages))))) - (gnu (gnu-packages packages)) - (gnu* (case (assoc-ref opts 'filter) - ;; Filter out packages that are/aren't in `stdenv'. To - ;; do that reliably, we check whether their "src" - ;; derivation is a requisite of stdenv. - ((stdenv) - (filter (lambda (p) - (member (package-source-output-path p) - (force stdenv))) - gnu)) - ((non-stdenv) - (filter (lambda (p) - (not (member (package-source-output-path p) - (force stdenv)))) - gnu)) - (else gnu))) - (updates (packages-to-update gnu*))) + (attribute (assq-ref opts 'attribute)) + (selection (assq-ref opts 'filter)) + (to-update (if attribute + packages ; already a subset + (selected-gnu-packages packages stdenv selection))) + (updates (packages-to-update to-update))) (format #t "~%~A packages to update...~%" (length updates)) (for-each (lambda (update) From 354b1a12c1f588cdfa2f35896ada4c9ba20e3a28 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= Date: Sun, 30 Oct 2011 00:00:16 +0000 Subject: [PATCH 374/970] gnupdate: Fix auto-downloading of GPG keys. * maintainers/scripts/gnu/gnupdate (gnupg-verify): Always return STATUS. svn path=/nixpkgs/trunk/; revision=30108 --- maintainers/scripts/gnu/gnupdate | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/maintainers/scripts/gnu/gnupdate b/maintainers/scripts/gnu/gnupdate index 4fbf5b6d43a..c33fc00e7ae 100755 --- a/maintainers/scripts/gnu/gnupdate +++ b/maintainers/scripts/gnu/gnupdate @@ -414,8 +414,7 @@ replaced by the result of their application to DERIVATIONS, a vhash." (define %openpgp-key-server "keys.gnupg.net") (define (gnupg-verify sig file) - "Verify signature SIG for FILE. Return a status s-exp or #f if GnuPG -failed." + "Verify signature SIG for FILE. Return a status s-exp if GnuPG failed." (define (status-line->sexp line) ;; See file `doc/DETAILS' in GnuPG. @@ -480,9 +479,10 @@ failed." (let* ((pipe (open-pipe* OPEN_READ %gpg-command "--status-fd=1" "--verify" sig file)) (status (parse-status pipe))) - (if (pipe-failed? pipe) - #f - status))) + ;; Ignore PIPE's exit status since STATUS above should contain all the + ;; info we need. + (close-pipe pipe) + status)) (define (gnupg-status-good-signature? status) "If STATUS, as returned by `gnupg-verify', denotes a good signature, return From 573c9178b551ffb417222730e614aea99e67f999 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= Date: Sun, 30 Oct 2011 00:00:20 +0000 Subject: [PATCH 375/970] gnupdate: Make `nix-prefetch-url' memoizing. * maintainers/scripts/gnu/gnupdate (memoize): New procedure. (nix-prefetch-url): Use it. svn path=/nixpkgs/trunk/; revision=30109 --- maintainers/scripts/gnu/gnupdate | 46 +++++++++++++++++++++----------- 1 file changed, 31 insertions(+), 15 deletions(-) diff --git a/maintainers/scripts/gnu/gnupdate b/maintainers/scripts/gnu/gnupdate index c33fc00e7ae..eabe3e581d8 100755 --- a/maintainers/scripts/gnu/gnupdate +++ b/maintainers/scripts/gnu/gnupdate @@ -328,21 +328,36 @@ replaced by the result of their application to DERIVATIONS, a vhash." status #f))) -(define (nix-prefetch-url url) - ;; Download URL in the Nix store and return the base32-encoded SHA256 hash - ;; of the file at URL - (let* ((pipe (open-pipe* OPEN_READ "nix-prefetch-url" url)) - (hash (read-line pipe))) - (if (or (pipe-failed? pipe) - (eof-object? hash)) - (values #f #f) - (let* ((pipe (open-pipe* OPEN_READ "nix-store" "--print-fixed-path" - "sha256" hash (basename url))) - (path (read-line pipe))) - (if (or (pipe-failed? pipe) - (eof-object? path)) - (values #f #f) - (values (string-trim-both hash) (string-trim-both path))))))) +(define (memoize proc) + "Return a memoizing version of PROC." + (let ((cache (make-hash-table))) + (lambda args + (let ((results (hash-ref cache args))) + (if results + (apply values results) + (let ((results (call-with-values (lambda () + (apply proc args)) + list))) + (hash-set! cache args results) + (apply values results))))))) + +(define nix-prefetch-url + (memoize + (lambda (url) + "Download URL in the Nix store and return the base32-encoded SHA256 hash of +the file at URL." + (let* ((pipe (open-pipe* OPEN_READ "nix-prefetch-url" url)) + (hash (read-line pipe))) + (if (or (pipe-failed? pipe) + (eof-object? hash)) + (values #f #f) + (let* ((pipe (open-pipe* OPEN_READ "nix-store" "--print-fixed-path" + "sha256" hash (basename url))) + (path (read-line pipe))) + (if (or (pipe-failed? pipe) + (eof-object? path)) + (values #f #f) + (values (string-trim-both hash) (string-trim-both path))))))))) (define (update-nix-expression file old-version old-hash @@ -926,6 +941,7 @@ pairs. Example: (\"mit-scheme-9.0.1\" . \"/gnu/mit-scheme/stable.pkg/9.0.1\"). gnu-packages)) (define (fetch-gnu project directory version archive-type) + "Download PROJECT's tarball over FTP." (let* ((server (ftp-server/directory project)) (base (string-append project "-" version ".tar." archive-type)) (url (string-append "ftp://" server "/" directory "/" base)) From e26fc2311a8ac51968894f32b7b9e410bc2cff4d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= Date: Sun, 30 Oct 2011 00:00:25 +0000 Subject: [PATCH 376/970] GNU Zile 2.4.2. svn path=/nixpkgs/trunk/; revision=30110 --- pkgs/applications/editors/zile/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/applications/editors/zile/default.nix b/pkgs/applications/editors/zile/default.nix index d8acf24cbf5..6a1762d77ff 100644 --- a/pkgs/applications/editors/zile/default.nix +++ b/pkgs/applications/editors/zile/default.nix @@ -1,14 +1,14 @@ -{ fetchurl, stdenv, ncurses, help2man }: +{ fetchurl, stdenv, ncurses, boehmgc, perl, help2man }: stdenv.mkDerivation rec { - name = "zile-2.3.24"; + name = "zile-2.4.2"; src = fetchurl { url = "mirror://gnu/zile/${name}.tar.gz"; - sha256 = "12by1f5nbk2qcq0f35aqjq5g54nsnajk2rk5060icsjc86pv52r1"; + sha256 = "0ia91c18fyssnhabfb22npmidjkx32rqfkjgxxjibvdwfja25d3k"; }; - buildInputs = [ ncurses ]; + buildInputs = [ ncurses boehmgc perl ]; buildNativeInputs = [ help2man ]; # Tests can't be run because most of them rely on the ability to From b2d282b49189154538eca3ac2c5b122a2cd81526 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= Date: Sun, 30 Oct 2011 00:00:29 +0000 Subject: [PATCH 377/970] GNU Libtool 2.4.2. svn path=/nixpkgs/trunk/; revision=30111 --- pkgs/development/tools/misc/libtool/libtool2.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/misc/libtool/libtool2.nix b/pkgs/development/tools/misc/libtool/libtool2.nix index 14848dc2352..403381af485 100644 --- a/pkgs/development/tools/misc/libtool/libtool2.nix +++ b/pkgs/development/tools/misc/libtool/libtool2.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, m4, perl, lzma }: stdenv.mkDerivation (rec { - name = "libtool-2.4"; + name = "libtool-2.4.2"; src = fetchurl { url = "mirror://gnu/libtool/${name}.tar.gz"; - sha256 = "0bpnvmqryzqpiz184phdg3z38a16ad7dd5bfbmn1jkm9cfmmgpqk"; + sha256 = "0649qfpzkswgcj9vqkkr9rn4nlcx80faxpyqscy2k1x9c94f93dk"; }; buildNativeInputs = [ lzma m4 perl ]; From 54786058b240beeae9820ce183182e3b998fbbf0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= Date: Sun, 30 Oct 2011 00:00:34 +0000 Subject: [PATCH 378/970] GNU Parallel 20111022. svn path=/nixpkgs/trunk/; revision=30112 --- pkgs/tools/misc/parallel/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/misc/parallel/default.nix b/pkgs/tools/misc/parallel/default.nix index f9a35b235fc..c104bf752fe 100644 --- a/pkgs/tools/misc/parallel/default.nix +++ b/pkgs/tools/misc/parallel/default.nix @@ -1,11 +1,11 @@ { fetchurl, stdenv, perl }: stdenv.mkDerivation rec { - name = "parallel-20110822"; + name = "parallel-20111022"; src = fetchurl { url = "mirror://gnu/parallel/${name}.tar.bz2"; - sha256 = "0ryj97b9w2mzvmnqhkh384s59v62gf0vlyj8qphiy34505x5pznb"; + sha256 = "0l9g7lg7avshjm0783abcrcmlmrqkwhzic23lk0jna0nckkd9jhk"; }; patchPhase = From 7da5374672eaba49289af698106a43900c5e9a88 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= Date: Sun, 30 Oct 2011 00:00:39 +0000 Subject: [PATCH 379/970] GNU Xorriso 1.1.6. svn path=/nixpkgs/trunk/; revision=30113 --- pkgs/tools/cd-dvd/xorriso/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/cd-dvd/xorriso/default.nix b/pkgs/tools/cd-dvd/xorriso/default.nix index 1b489f9a5ca..e8a58a1fa96 100644 --- a/pkgs/tools/cd-dvd/xorriso/default.nix +++ b/pkgs/tools/cd-dvd/xorriso/default.nix @@ -1,11 +1,11 @@ { fetchurl, stdenv, libcdio, zlib, bzip2, readline, acl }: stdenv.mkDerivation rec { - name = "xorriso-1.1.4"; + name = "xorriso-1.1.6"; src = fetchurl { url = "mirror://gnu/xorriso/${name}.tar.gz"; - sha256 = "0zxmln5kw5prqrs8bahwz4lhvl914xphsjizlz3nr9y2l39350j8"; + sha256 = "0dlavcdx1lblqy9pjlxv4krczvb23650f2zd1phy2hdxhiq6c966"; }; doCheck = true; From 9b12043e621e93d5056d2ea2365e65bdedefdefd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= Date: Sun, 30 Oct 2011 00:00:43 +0000 Subject: [PATCH 380/970] GNU FreeIPMI 1.0.8. svn path=/nixpkgs/trunk/; revision=30114 --- pkgs/tools/system/freeipmi/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/system/freeipmi/default.nix b/pkgs/tools/system/freeipmi/default.nix index 87d6a4b073f..e50cdfc9748 100644 --- a/pkgs/tools/system/freeipmi/default.nix +++ b/pkgs/tools/system/freeipmi/default.nix @@ -1,11 +1,11 @@ { fetchurl, stdenv, libgcrypt, readline }: stdenv.mkDerivation rec { - name = "freeipmi-1.0.6"; + name = "freeipmi-1.0.8"; src = fetchurl { url = "mirror://gnu/freeipmi/${name}.tar.gz"; - sha256 = "1990y1qkx1g5pb5flgzk0n7ms6ipcams576bna9hpkgg1h0rcbb6"; + sha256 = "1niasikbm599bs6r7grskypzw1jccg8i3n1i4r0id9zqcjxff6gp"; }; buildInputs = [ libgcrypt readline ]; From 1476689828ed26e4bbbaa01fe3472e029896164f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= Date: Sun, 30 Oct 2011 00:00:48 +0000 Subject: [PATCH 381/970] GNU Fdisk 1.3.0a. svn path=/nixpkgs/trunk/; revision=30115 --- pkgs/tools/system/fdisk/default.nix | 4 ++-- pkgs/top-level/all-packages.nix | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/system/fdisk/default.nix b/pkgs/tools/system/fdisk/default.nix index 3c85fa59803..5a34813d8d9 100644 --- a/pkgs/tools/system/fdisk/default.nix +++ b/pkgs/tools/system/fdisk/default.nix @@ -1,11 +1,11 @@ { fetchurl, stdenv, parted, libuuid, gettext }: stdenv.mkDerivation rec { - name = "fdisk-1.2.5"; + name = "fdisk-1.3.0a"; src = fetchurl { url = "mirror://gnu/fdisk/${name}.tar.bz2"; - sha256 = "1pwwblr85g4r6h5jwp8m5339v7f747z35bpnm945vjnw5mrch3lk"; + sha256 = "1g2zvl560f7p1hd4q50d1msy6qp7949mdkagfy8ki8cayp8fp267"; }; buildInputs = [ parted libuuid gettext ]; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index ee87e250b46..bd17d1ffad6 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -639,7 +639,7 @@ let fcron = callPackage ../tools/system/fcron { # see also cron }; - fdisk = callPackage ../tools/system/fdisk { parted = parted_2_3; }; + fdisk = callPackage ../tools/system/fdisk { }; fdm = callPackage ../tools/networking/fdm {}; From 74201c0fcb01c0a43bf90c7daa0cb160d89d9849 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= Date: Sun, 30 Oct 2011 00:00:56 +0000 Subject: [PATCH 382/970] GNU SIP Witch 1.1.2. svn path=/nixpkgs/trunk/; revision=30116 --- pkgs/servers/sip/sipwitch/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/sip/sipwitch/default.nix b/pkgs/servers/sip/sipwitch/default.nix index 2e2e24938a3..cb8c9aec3fc 100644 --- a/pkgs/servers/sip/sipwitch/default.nix +++ b/pkgs/servers/sip/sipwitch/default.nix @@ -1,11 +1,11 @@ { fetchurl, stdenv, pkgconfig, ucommon, libosip, libexosip, gnutls, zlib }: stdenv.mkDerivation rec { - name = "sipwitch-1.1.1"; + name = "sipwitch-1.1.2"; src = fetchurl { url = "mirror://gnu/sipwitch/${name}.tar.gz"; - sha256 = "14irv1zda6xjsrizc0dvy85fcjx3szbb94jkh3q4s20ywc4s41kx"; + sha256 = "1ixbzrpndhx7i0cxx02rlnhv9948pbsbbs5gdsgp6asq42vfz3f2"; }; buildInputs = [ pkgconfig ucommon libosip libexosip gnutls zlib ]; From 125680c1cb3639e4ca8bc6e5ec3b4e852e2b895b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= Date: Sun, 30 Oct 2011 00:01:05 +0000 Subject: [PATCH 383/970] GNU uCommon C++ 5.0.6. svn path=/nixpkgs/trunk/; revision=30117 --- pkgs/development/libraries/ucommon/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/libraries/ucommon/default.nix b/pkgs/development/libraries/ucommon/default.nix index af481f2ffed..4c91dee514e 100644 --- a/pkgs/development/libraries/ucommon/default.nix +++ b/pkgs/development/libraries/ucommon/default.nix @@ -1,11 +1,11 @@ { fetchurl, stdenv, gnutls, pkgconfig, zlib, libgcrypt }: stdenv.mkDerivation rec { - name = "ucommon-5.0.5"; + name = "ucommon-5.0.6"; src = fetchurl { - url = mirror://gnu/commoncpp/ucommon-5.0.5.tar.gz; - sha256 = "0rpq6qkhzcsls2rmnf1p1dnf9vyzmgw0cips3hl82mh0w5d70253"; + url = mirror://gnu/commoncpp/ucommon-5.0.6.tar.gz; + sha256 = "102djhfzs5jp10r3ajm25p1phs9cxn2dx8vycf0i8vjhmd20yp5c"; }; buildInputs = [ pkgconfig gnutls zlib ]; From c9f5cba45d611d5b26e1f8912b40f548d19ddf70 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= Date: Sun, 30 Oct 2011 00:01:10 +0000 Subject: [PATCH 384/970] GNU Libtasn1 2.10. svn path=/nixpkgs/trunk/; revision=30118 --- pkgs/development/libraries/libtasn1/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/libtasn1/default.nix b/pkgs/development/libraries/libtasn1/default.nix index 0f33174bf9f..660b02d0a93 100644 --- a/pkgs/development/libraries/libtasn1/default.nix +++ b/pkgs/development/libraries/libtasn1/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl }: stdenv.mkDerivation rec { - name = "libtasn1-2.9"; + name = "libtasn1-2.10"; src = fetchurl { url = "mirror://gnu/libtasn1/${name}.tar.gz"; - sha256 = "1i0jnk810hg88jh3bhq63yn0n2cfmpmhrdm1ypv8rc68z9anii7s"; + sha256 = "1l0622ysv68k1xazg3000m47h8dd7pbnxhik6v0kf17029ic1r0p"; }; doCheck = true; From 89df6c6c35f35b7ba99c88eed04443e673c7985a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= Date: Sun, 30 Oct 2011 00:01:15 +0000 Subject: [PATCH 385/970] GNU GLOBAL 6.1. svn path=/nixpkgs/trunk/; revision=30119 --- pkgs/development/tools/misc/global/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/misc/global/default.nix b/pkgs/development/tools/misc/global/default.nix index 93d3641de72..fef5a71201a 100644 --- a/pkgs/development/tools/misc/global/default.nix +++ b/pkgs/development/tools/misc/global/default.nix @@ -1,11 +1,11 @@ { fetchurl, stdenv, libtool, ncurses }: stdenv.mkDerivation rec { - name = "global-6.0"; + name = "global-6.1"; src = fetchurl { url = "mirror://gnu/global/${name}.tar.gz"; - sha256 = "1nwhlxd97grq8ynw7szv5lcxiqgqifiy1jqaa45664hd6bv1i5xx"; + sha256 = "1q305isw1hy2zxcg10jk1g9rmpl8x2r3nkla52jdl4dbydsg6z39"; }; buildInputs = [ libtool ncurses ]; From 461f4d0c4e2e00e3f749a502d2cec5a7298ee77a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= Date: Sun, 30 Oct 2011 00:01:20 +0000 Subject: [PATCH 386/970] GNU gengetopt 2.22.5. svn path=/nixpkgs/trunk/; revision=30120 --- pkgs/development/tools/misc/gengetopt/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/misc/gengetopt/default.nix b/pkgs/development/tools/misc/gengetopt/default.nix index 7d5f47dba39..ff4eec81d96 100644 --- a/pkgs/development/tools/misc/gengetopt/default.nix +++ b/pkgs/development/tools/misc/gengetopt/default.nix @@ -1,11 +1,11 @@ { fetchurl, stdenv }: stdenv.mkDerivation rec { - name = "gengetopt-2.22.4"; + name = "gengetopt-2.22.5"; src = fetchurl { url = "mirror://gnu/gengetopt/${name}.tar.gz"; - sha256 = "08a4wmzvin8ljdgw2c0mcz654h4hpzam2p43hsf951c0xhj6ppsf"; + sha256 = "0dr1xmlgk9q8za17wnpgghb5ifnbca5vb0w5bc6fpc2j0cjb6vrv"; }; doCheck = true; From 929841f10a49ec74a079be3272514525048e3cbb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= Date: Sun, 30 Oct 2011 00:01:24 +0000 Subject: [PATCH 387/970] GNU Wget 1.13.4. svn path=/nixpkgs/trunk/; revision=30121 --- pkgs/tools/networking/wget/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/networking/wget/default.nix b/pkgs/tools/networking/wget/default.nix index b10d25ffc94..afd741f2735 100644 --- a/pkgs/tools/networking/wget/default.nix +++ b/pkgs/tools/networking/wget/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, gettext, perl, LWP, gnutls ? null }: stdenv.mkDerivation rec { - name = "wget-1.13.3"; + name = "wget-1.13.4"; src = fetchurl { url = "mirror://gnu/wget/${name}.tar.gz"; - sha256 = "07wxl38qiy95k3hv2fd1sglgrlp6z920pr9mcfsj8dg7iaxbhppi"; + sha256 = "1kadjg63x1mm741dxdidwsn1rz0f7dkzbq59v0iww87jr45p3ir4"; }; preConfigure = From fa09c2684de3f989bdb331103266fcb87d78dbef Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= Date: Sun, 30 Oct 2011 00:01:29 +0000 Subject: [PATCH 388/970] GNU oSIP 3.6.0. svn path=/nixpkgs/trunk/; revision=30122 --- pkgs/development/libraries/osip/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/osip/default.nix b/pkgs/development/libraries/osip/default.nix index 9e270f9eec2..2c1b148251c 100644 --- a/pkgs/development/libraries/osip/default.nix +++ b/pkgs/development/libraries/osip/default.nix @@ -1,9 +1,9 @@ {stdenv, fetchurl}: stdenv.mkDerivation rec { - version = "3.5.0"; + version = "3.6.0"; src = fetchurl { url = "mirror://gnu/osip/libosip2-${version}.tar.gz"; - sha256 = "14csf6z7b802bahxd560ibx3mg2fq3ki734vf3k2vknr4jm5v5fx"; + sha256 = "1kcndqvsyxgbhkksgydvvjw15znfq6jiznvw058d21h5fq68p8f9"; }; name = "libosip2-${version}"; From bba5ca07e1504a436f52b366a465761f77f97b4f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= Date: Sun, 30 Oct 2011 00:01:33 +0000 Subject: [PATCH 389/970] GNU cflow 1.4. svn path=/nixpkgs/trunk/; revision=30123 --- pkgs/development/tools/misc/cflow/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/misc/cflow/default.nix b/pkgs/development/tools/misc/cflow/default.nix index c8cfb77d71a..041191640bd 100644 --- a/pkgs/development/tools/misc/cflow/default.nix +++ b/pkgs/development/tools/misc/cflow/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, gettext, emacs }: stdenv.mkDerivation rec { - name = "cflow-1.3"; + name = "cflow-1.4"; src = fetchurl { url = "mirror://gnu/cflow/${name}.tar.bz2"; - sha256 = "1nlmgcjsy1rl5zpqz9f8mf74faq3rm725hhpf11b8w80sniqgnnk"; + sha256 = "1jkbq97ajcf834z68hbn3xfhiz921zhn39gklml1racf0kb3jzh3"; }; patchPhase = '' From 67e7995cdc752dcb733a6ab65243bd83e7cb4e68 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= Date: Sun, 30 Oct 2011 11:51:55 +0000 Subject: [PATCH 390/970] MIT/GNU Scheme 9.1. svn path=/nixpkgs/trunk/; revision=30124 --- .../compilers/mit-scheme/default.nix | 46 ++++++++++++++----- 1 file changed, 35 insertions(+), 11 deletions(-) diff --git a/pkgs/development/compilers/mit-scheme/default.nix b/pkgs/development/compilers/mit-scheme/default.nix index 8a277f9b89e..dcbdb6518d3 100644 --- a/pkgs/development/compilers/mit-scheme/default.nix +++ b/pkgs/development/compilers/mit-scheme/default.nix @@ -1,7 +1,7 @@ -{ fetchurl, stdenv, gnum4 }: +{ fetchurl, stdenv, gnum4, texinfo, texLive, automake }: let - version = "9.0.1"; + version = "9.1"; bootstrapFromC = ! (stdenv.isi686 || stdenv.isx86_64); in stdenv.mkDerivation { @@ -15,23 +15,47 @@ stdenv.mkDerivation { if stdenv.isi686 then fetchurl { url = "mirror://gnu/mit-scheme/stable.pkg/${version}/mit-scheme-${version}-i386.tar.gz"; - sha256 = "0cfj3bawjdnpa7cbqh2f23hfpjpmryypmzkhndvdbi79a65fl0n2"; + sha256 = "1vqdy9f1lbzflr9bw0gjn4g4w3hdpnjrkiwj5aaah70flif5ndns"; } else if stdenv.isx86_64 then fetchurl { url = "mirror://gnu/mit-scheme/stable.pkg/${version}/mit-scheme-${version}-x86-64.tar.gz"; - sha256 = "0p188d7n0iqdgvra6qv5apvcsv0z2p97ry7xz5216zkc364i6mmr"; + sha256 = "1l4zxqm5r1alc6y1cky62rn8h6i40qyiba081n6phwypwxr5sd0g"; } else fetchurl { url = "mirror://gnu/mit-scheme/stable.pkg/${version}/mit-scheme-c-${version}.tar.gz"; - sha256 = "1g2mifrx0bvag0hlrbk81rkrlm1pbn688zw8b9d2i0sl5g2p1ril"; + sha256 = "1661cybycfvjjyq92gb3n1cygxfmfjdhnh3d2ha3vy6xxk9d7za9"; }; - preConfigure = "cd src"; - buildPhase = - if bootstrapFromC - then "./etc/make-liarc.sh --prefix=$out" - else "make compile-microcode"; + configurePhase = + '' cd src + ./configure --prefix="$out" - buildInputs = [ gnum4 ]; + cd ../doc + ./configure --prefix="$out" + cd .. + ''; + + buildPhase = + '' cd src + ${if bootstrapFromC + then "./etc/make-liarc.sh --prefix=$out" + else "make compile-microcode"} + + cd ../doc + + # Provide a `texinfo.tex'. + export TEXINPUTS="$(echo ${automake}/share/automake-*)" + echo "\$TEXINPUTS is \`$TEXINPUTS'" + make + + cd .. + ''; + + installPhase = + '' make install -C src + make install -C doc + ''; + + buildNativeInputs = [ gnum4 texinfo texLive automake ]; # XXX: The `check' target doesn't exist. doCheck = false; From 62a775f829987eac1d5f75187d9d8b614aec343b Mon Sep 17 00:00:00 2001 From: Shea Levy Date: Sun, 30 Oct 2011 13:55:22 +0000 Subject: [PATCH 391/970] Add the download Haskell library svn path=/nixpkgs/trunk/; revision=30125 --- .../libraries/haskell/download/default.nix | 14 ++++++++++++++ pkgs/top-level/haskell-packages.nix | 2 ++ 2 files changed, 16 insertions(+) create mode 100644 pkgs/development/libraries/haskell/download/default.nix diff --git a/pkgs/development/libraries/haskell/download/default.nix b/pkgs/development/libraries/haskell/download/default.nix new file mode 100644 index 00000000000..1ac7800a78c --- /dev/null +++ b/pkgs/development/libraries/haskell/download/default.nix @@ -0,0 +1,14 @@ +{ cabal, feed, tagsoup, xml }: + +cabal.mkDerivation (self: { + pname = "download"; + version = "0.3.2"; + sha256 = "0nhbfq8q9ckc5fnlg54l361p2jhkag9cz11v07kj9f1kwkm4d7w3"; + buildDepends = [ feed tagsoup xml ]; + meta = { + homepage = "http://code.haskell.org/~dons/code/download"; + description = "High-level file download based on URLs"; + license = self.stdenv.lib.licenses.bsd3; + platforms = self.ghc.meta.platforms; + }; +}) diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix index 759cca546c9..8f8d796769b 100644 --- a/pkgs/top-level/haskell-packages.nix +++ b/pkgs/top-level/haskell-packages.nix @@ -545,6 +545,8 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y); doubleConversion = callPackage ../development/libraries/haskell/double-conversion {}; + download = callPackage ../development/libraries/haskell/download {}; + editline = callPackage ../development/libraries/haskell/editline {}; emailValidate = callPackage ../development/libraries/haskell/email-validate {}; From 324a9ec3b6dc98d18f43a3c5820582d1b63f7940 Mon Sep 17 00:00:00 2001 From: Shea Levy Date: Sun, 30 Oct 2011 15:19:27 +0000 Subject: [PATCH 392/970] Add tagsoup-0.10.1 (needed for download-curl) svn path=/nixpkgs/trunk/; revision=30126 --- .../libraries/haskell/tagsoup/0.10.1nix | 16 ++++++++++++++++ pkgs/top-level/haskell-packages.nix | 2 ++ 2 files changed, 18 insertions(+) create mode 100644 pkgs/development/libraries/haskell/tagsoup/0.10.1nix diff --git a/pkgs/development/libraries/haskell/tagsoup/0.10.1nix b/pkgs/development/libraries/haskell/tagsoup/0.10.1nix new file mode 100644 index 00000000000..462ee658fd2 --- /dev/null +++ b/pkgs/development/libraries/haskell/tagsoup/0.10.1nix @@ -0,0 +1,16 @@ +{ cabal, mtl, network }: + +cabal.mkDerivation (self: { + pname = "tagsoup"; + version = "0.10.1"; + sha256 = "0bssfj5r790yj33q23i0lbj83xahzd9rf4jhqs21vgrpn9fqsynl"; + isLibrary = true; + isExecutable = true; + buildDepends = [ mtl network ]; + meta = { + homepage = "http://community.haskell.org/~ndm/tagsoup/"; + description = "Parsing and extracting information from (possibly malformed) HTML/XML documents"; + license = self.stdenv.lib.licenses.bsd3; + platforms = self.ghc.meta.platforms; + }; +}) diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix index 8f8d796769b..cddb40d37d2 100644 --- a/pkgs/top-level/haskell-packages.nix +++ b/pkgs/top-level/haskell-packages.nix @@ -1156,6 +1156,8 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y); tagsoup = callPackage ../development/libraries/haskell/tagsoup {}; + tagsoup_0_10_1 = callPackage ../development/libraries/haskell/tagsoup/0.10.1nix {}; + Tensor = callPackage ../development/libraries/haskell/Tensor {}; terminfo = callPackage ../development/libraries/haskell/terminfo {}; From 53bf668c0fd85ec57af489161199436fe2d8d2ae Mon Sep 17 00:00:00 2001 From: Shea Levy Date: Sun, 30 Oct 2011 15:24:00 +0000 Subject: [PATCH 393/970] Add Haskell curl bindings svn path=/nixpkgs/trunk/; revision=30128 --- pkgs/top-level/haskell-packages.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix index cddb40d37d2..6de03a0c7e1 100644 --- a/pkgs/top-level/haskell-packages.nix +++ b/pkgs/top-level/haskell-packages.nix @@ -502,6 +502,8 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y); cssText = callPackage ../development/libraries/haskell/css-text {}; + curl = callPackage ../development/libraries/haskell/curl { curl = pkgs.curl; }; + dataAccessor = callPackage ../development/libraries/haskell/data-accessor/data-accessor.nix {}; dataAccessorTemplate = callPackage ../development/libraries/haskell/data-accessor/data-accessor-template.nix {}; From 3ec73f62af44d5cb3b4ccacbaaedb82fdffd9c8e Mon Sep 17 00:00:00 2001 From: Shea Levy Date: Sun, 30 Oct 2011 15:26:55 +0000 Subject: [PATCH 394/970] Whoops, forgot the nix expression svn path=/nixpkgs/trunk/; revision=30129 --- pkgs/development/libraries/haskell/curl/default.nix | 13 +++++++++++++ 1 file changed, 13 insertions(+) create mode 100644 pkgs/development/libraries/haskell/curl/default.nix diff --git a/pkgs/development/libraries/haskell/curl/default.nix b/pkgs/development/libraries/haskell/curl/default.nix new file mode 100644 index 00000000000..43592fa8502 --- /dev/null +++ b/pkgs/development/libraries/haskell/curl/default.nix @@ -0,0 +1,13 @@ +{ cabal, curl }: + +cabal.mkDerivation (self: { + pname = "curl"; + version = "1.3.7"; + sha256 = "0i6d7732p5gn1bcvavbxcg4wd18j425mi1yjg0b29zzz3yl0qhgi"; + extraLibraries = [ curl ]; + meta = { + description = "Haskell binding to libcurl"; + license = self.stdenv.lib.licenses.bsd3; + platforms = self.ghc.meta.platforms; + }; +}) From 9bcfce124a63e971b3f6ed4bb77d058c883cf4f6 Mon Sep 17 00:00:00 2001 From: Shea Levy Date: Sun, 30 Oct 2011 15:39:13 +0000 Subject: [PATCH 395/970] Add download-curl svn path=/nixpkgs/trunk/; revision=30130 --- .../libraries/haskell/download-curl/default.nix | 14 ++++++++++++++ pkgs/top-level/haskell-packages.nix | 2 ++ 2 files changed, 16 insertions(+) create mode 100644 pkgs/development/libraries/haskell/download-curl/default.nix diff --git a/pkgs/development/libraries/haskell/download-curl/default.nix b/pkgs/development/libraries/haskell/download-curl/default.nix new file mode 100644 index 00000000000..fe391bd01bb --- /dev/null +++ b/pkgs/development/libraries/haskell/download-curl/default.nix @@ -0,0 +1,14 @@ +{ cabal, curl, feed, tagsoup, xml }: + +cabal.mkDerivation (self: { + pname = "download-curl"; + version = "0.1.3"; + sha256 = "17g5dnw4yxi4kf5x71bkk4wx1zl8yjs5dd34k6dgnw9wgkz97qw1"; + buildDepends = [ curl feed tagsoup xml ]; + meta = { + homepage = "http://code.haskell.org/~dons/code/download-curl"; + description = "High-level file download based on URLs"; + license = self.stdenv.lib.licenses.bsd3; + platforms = self.ghc.meta.platforms; + }; +}) diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix index 6de03a0c7e1..f726c7244f6 100644 --- a/pkgs/top-level/haskell-packages.nix +++ b/pkgs/top-level/haskell-packages.nix @@ -549,6 +549,8 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y); download = callPackage ../development/libraries/haskell/download {}; + downloadCurl = callPackage ../development/libraries/haskell/download-curl { tagsoup = self.tagsoup_0_10_1; }; + editline = callPackage ../development/libraries/haskell/editline {}; emailValidate = callPackage ../development/libraries/haskell/email-validate {}; From ebb773ee245748a97067d16ba4066e26bf72149e Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Sun, 30 Oct 2011 16:06:30 +0000 Subject: [PATCH 396/970] haskell-download: added meta.maintainers svn path=/nixpkgs/trunk/; revision=30131 --- pkgs/development/libraries/haskell/download/default.nix | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/pkgs/development/libraries/haskell/download/default.nix b/pkgs/development/libraries/haskell/download/default.nix index 1ac7800a78c..c0895ac2938 100644 --- a/pkgs/development/libraries/haskell/download/default.nix +++ b/pkgs/development/libraries/haskell/download/default.nix @@ -10,5 +10,9 @@ cabal.mkDerivation (self: { description = "High-level file download based on URLs"; license = self.stdenv.lib.licenses.bsd3; platforms = self.ghc.meta.platforms; + maintainers = [ + self.stdenv.lib.maintainers.andres + self.stdenv.lib.maintainers.simons + ]; }; }) From 77bf849490bcbde182382d981861f65f99dfcd00 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Sun, 30 Oct 2011 16:06:34 +0000 Subject: [PATCH 397/970] haskell-network: updated to version 2.3.0.7 svn path=/nixpkgs/trunk/; revision=30132 --- .../libraries/haskell/network/2.3.0.6.nix | 18 ------------------ .../network/{2.3.0.5.nix => 2.3.0.7.nix} | 4 ++-- pkgs/top-level/haskell-packages.nix | 7 +++---- 3 files changed, 5 insertions(+), 24 deletions(-) delete mode 100644 pkgs/development/libraries/haskell/network/2.3.0.6.nix rename pkgs/development/libraries/haskell/network/{2.3.0.5.nix => 2.3.0.7.nix} (82%) diff --git a/pkgs/development/libraries/haskell/network/2.3.0.6.nix b/pkgs/development/libraries/haskell/network/2.3.0.6.nix deleted file mode 100644 index a62a0f59773..00000000000 --- a/pkgs/development/libraries/haskell/network/2.3.0.6.nix +++ /dev/null @@ -1,18 +0,0 @@ -{ cabal, parsec }: - -cabal.mkDerivation (self: { - pname = "network"; - version = "2.3.0.6"; - sha256 = "0xdqcf7zfxpa7qmvwzxf11y61b6xn4v2jjrqpibr2pfqqr0p3gkw"; - buildDepends = [ parsec ]; - meta = { - homepage = "http://github.com/haskell/network"; - description = "Low-level networking interface"; - license = self.stdenv.lib.licenses.bsd3; - platforms = self.ghc.meta.platforms; - maintainers = [ - self.stdenv.lib.maintainers.andres - self.stdenv.lib.maintainers.simons - ]; - }; -}) diff --git a/pkgs/development/libraries/haskell/network/2.3.0.5.nix b/pkgs/development/libraries/haskell/network/2.3.0.7.nix similarity index 82% rename from pkgs/development/libraries/haskell/network/2.3.0.5.nix rename to pkgs/development/libraries/haskell/network/2.3.0.7.nix index bf9330eb256..3c0e0065ed9 100644 --- a/pkgs/development/libraries/haskell/network/2.3.0.5.nix +++ b/pkgs/development/libraries/haskell/network/2.3.0.7.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "network"; - version = "2.3.0.5"; - sha256 = "0y1sbgsffzr0skm6xl8907iclgw9vmf395zvpwgakp69i3snh1z0"; + version = "2.3.0.7"; + sha256 = "1rlzdacgaq8nv0bwczsrkw47rw4aamf9y4ynm3xjw0r3w1xcg9yv"; buildDepends = [ parsec ]; meta = { homepage = "http://github.com/haskell/network"; diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix index f726c7244f6..0a594d3c8a6 100644 --- a/pkgs/top-level/haskell-packages.nix +++ b/pkgs/top-level/haskell-packages.nix @@ -129,7 +129,7 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y); haskellSrc = self.haskellSrc_1_0_1_4; # 7.2 fails, 7.3 fails html = self.html_1_0_1_2; # 7.2 ok, 7.3 ok HUnit = self.HUnit_1_2_2_3; # 7.2 ok, 7.3 ok - network = self.network_2_3_0_5; # 7.2 ok, 7.3 ok + network = self.network_2_3_0_7; # 7.2 ok, 7.3 ok OpenGL = self.OpenGL_2_2_3_0; # 7.2 ok, 7.3 ok parallel = self.parallel_3_1_0_1; # 7.2 ok, 7.3 ok parsec = self.parsec_3_1_1; # 7.2 ok, 7.3 ok @@ -891,9 +891,8 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y); network_2_2_1_4 = callPackage ../development/libraries/haskell/network/2.2.1.4.nix {}; network_2_2_1_7 = callPackage ../development/libraries/haskell/network/2.2.1.7.nix {}; network_2_3_0_2 = callPackage ../development/libraries/haskell/network/2.3.0.2.nix {}; - network_2_3_0_5 = callPackage ../development/libraries/haskell/network/2.3.0.5.nix {}; - network_2_3_0_6 = callPackage ../development/libraries/haskell/network/2.3.0.6.nix {}; - network = self.network_2_3_0_6; + network_2_3_0_7 = callPackage ../development/libraries/haskell/network/2.3.0.7.nix {}; + network = self.network_2_3_0_7; nixosTypes = callPackage ../development/libraries/haskell/nixos-types {}; From 67d39b288c494d8b0e8ac2f1f31a341de89d7721 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Sun, 30 Oct 2011 16:06:37 +0000 Subject: [PATCH 398/970] haskell-text: updated to version 0.11.1.7 svn path=/nixpkgs/trunk/; revision=30133 --- .../libraries/haskell/text/{0.11.1.6.nix => 0.11.1.7.nix} | 4 ++-- pkgs/top-level/haskell-packages.nix | 8 ++++---- 2 files changed, 6 insertions(+), 6 deletions(-) rename pkgs/development/libraries/haskell/text/{0.11.1.6.nix => 0.11.1.7.nix} (82%) diff --git a/pkgs/development/libraries/haskell/text/0.11.1.6.nix b/pkgs/development/libraries/haskell/text/0.11.1.7.nix similarity index 82% rename from pkgs/development/libraries/haskell/text/0.11.1.6.nix rename to pkgs/development/libraries/haskell/text/0.11.1.7.nix index 93f8edd62ae..426df6de602 100644 --- a/pkgs/development/libraries/haskell/text/0.11.1.6.nix +++ b/pkgs/development/libraries/haskell/text/0.11.1.7.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "text"; - version = "0.11.1.6"; - sha256 = "1c4vzxwjcmdlb8nj71g6rqdw4nhz0l17saazhw1vv8cbizmdm4m7"; + version = "0.11.1.7"; + sha256 = "1pjllmqnl4rwa6d2mjcj2kp0w7whwxlb04rsaml7yyyk4dw97a2p"; buildDepends = [ deepseq ]; meta = { homepage = "https://github.com/bos/text"; diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix index 0a594d3c8a6..129f66b5121 100644 --- a/pkgs/top-level/haskell-packages.nix +++ b/pkgs/top-level/haskell-packages.nix @@ -143,7 +143,7 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y); zlib = self.zlib_0_5_3_1; # 7.2 ok, 7.3 ok HTTP = self.HTTP_4000_1_2; # 7.2 ok, 7.3 ok deepseq = self.deepseq_1_1_0_2; # 7.2 ok, 7.3 ok - text = self.text_0_11_1_6; # 7.2 ok, 7.3 ok + text = self.text_0_11_1_7; # 7.2 ok, 7.3 ok transformers = self.transformers_0_2_2_0; # 7.2 ok, 7.3 ok mtl = self.mtl_2_0_1_0; # 7.2 ok, 7.3 ok random = self.random_1_0_0_3; # 7.2 ok, 7.3 ok @@ -193,7 +193,7 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y); self : self.haskellPlatformArgs_2011_2_0_1 self // { haskellPlatform = self.haskellPlatform_2011_2_0_1; mtl1 = self.mtl_1_1_1_1; - text = self.text_0_11_1_6; + text = self.text_0_11_1_7; repaExamples = null; # don't pick this version of 'repa-examples' during nix-env -u }; @@ -1183,8 +1183,8 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y); text_0_11_0_5 = callPackage ../development/libraries/haskell/text/0.11.0.5.nix {}; text_0_11_0_6 = callPackage ../development/libraries/haskell/text/0.11.0.6.nix {}; - text_0_11_1_6 = callPackage ../development/libraries/haskell/text/0.11.1.6.nix {}; - text = self.text_0_11_1_6; + text_0_11_1_7 = callPackage ../development/libraries/haskell/text/0.11.1.7.nix {}; + text = self.text_0_11_1_7; thespian = callPackage ../development/libraries/haskell/thespian {}; From 8a2cef50ab883d4c7d11d81ce189f4d68a29bb0a Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Sun, 30 Oct 2011 16:06:39 +0000 Subject: [PATCH 399/970] haskell-hashable: updated to version 1.1.2.2 svn path=/nixpkgs/trunk/; revision=30134 --- pkgs/development/libraries/haskell/hashable/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/hashable/default.nix b/pkgs/development/libraries/haskell/hashable/default.nix index 5149da865c7..ba4c0312f9b 100644 --- a/pkgs/development/libraries/haskell/hashable/default.nix +++ b/pkgs/development/libraries/haskell/hashable/default.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "hashable"; - version = "1.1.2.1"; - sha256 = "1kmx3jr9cmkbapd7gywx7zvyd22nyz2mgs8lnzspp5hi7crx3wcx"; + version = "1.1.2.2"; + sha256 = "0gfg1cyd468czfv5xfhn7rz0r5s0v378c4xjlm6kkw7n10n2zg8y"; buildDepends = [ text ]; meta = { homepage = "http://github.com/tibbe/hashable"; From 3eac2b5f88828c5a216ac8f6b2392c487bb903bd Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Sun, 30 Oct 2011 16:06:42 +0000 Subject: [PATCH 400/970] haskell-simple-sendfile: updated to version 0.1.3 svn path=/nixpkgs/trunk/; revision=30135 --- .../development/libraries/haskell/simple-sendfile/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/simple-sendfile/default.nix b/pkgs/development/libraries/haskell/simple-sendfile/default.nix index fd362b44b88..f66eb3bb591 100644 --- a/pkgs/development/libraries/haskell/simple-sendfile/default.nix +++ b/pkgs/development/libraries/haskell/simple-sendfile/default.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "simple-sendfile"; - version = "0.1.2"; - sha256 = "08w5ria2x41j85z1126kddi918zdqrwmr4vwqczgzh9kdi49wv8j"; + version = "0.1.3"; + sha256 = "0n78d6bn2hsm3p6r2kc2cr5nf9v1vqs6v5i9x71f910r3kk2grm8"; buildDepends = [ network ]; meta = { description = "Cross platform library for the sendfile system call"; From e93ae189aba7d41565918a799952c0f6cff0131e Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Sun, 30 Oct 2011 16:06:45 +0000 Subject: [PATCH 401/970] haskell-skein: updated to version 0.1.0.3 svn path=/nixpkgs/trunk/; revision=30136 --- pkgs/development/libraries/haskell/skein/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/skein/default.nix b/pkgs/development/libraries/haskell/skein/default.nix index e197ab349e3..cd7f2115074 100644 --- a/pkgs/development/libraries/haskell/skein/default.nix +++ b/pkgs/development/libraries/haskell/skein/default.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "skein"; - version = "0.1.0.2"; - sha256 = "1ay7ri011vwvl74b9calbnav90d0r08gzqgdk8nvw1qx4slk1ibs"; + version = "0.1.0.3"; + sha256 = "1lag86db793l7n6zg97kn5wv31dal5sb8wig4sr7kqschxszq44d"; buildDepends = [ cereal cryptoApi tagged ]; meta = { description = "Skein, a family of cryptographic hash functions. Includes Skein-MAC as well."; From 652a24f21a2865976465fc3d44270993c90555c8 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Sun, 30 Oct 2011 16:06:47 +0000 Subject: [PATCH 402/970] haskell-curl: added meta.maintainers svn path=/nixpkgs/trunk/; revision=30137 --- pkgs/development/libraries/haskell/curl/default.nix | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/pkgs/development/libraries/haskell/curl/default.nix b/pkgs/development/libraries/haskell/curl/default.nix index 43592fa8502..c512820114f 100644 --- a/pkgs/development/libraries/haskell/curl/default.nix +++ b/pkgs/development/libraries/haskell/curl/default.nix @@ -9,5 +9,9 @@ cabal.mkDerivation (self: { description = "Haskell binding to libcurl"; license = self.stdenv.lib.licenses.bsd3; platforms = self.ghc.meta.platforms; + maintainers = [ + self.stdenv.lib.maintainers.andres + self.stdenv.lib.maintainers.simons + ]; }; }) From e15db25ff3a8b96fdab929be4f3dde0d89d4d954 Mon Sep 17 00:00:00 2001 From: Cillian de Roiste Date: Mon, 31 Oct 2011 00:25:55 +0000 Subject: [PATCH 403/970] Updating unetbootin to 563, the previous version was not working for me at all, it dropped me to a busybox shell svn path=/nixpkgs/trunk/; revision=30139 --- pkgs/tools/cd-dvd/unetbootin/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/tools/cd-dvd/unetbootin/default.nix b/pkgs/tools/cd-dvd/unetbootin/default.nix index ff5b260c9f3..20d5ae7715e 100644 --- a/pkgs/tools/cd-dvd/unetbootin/default.nix +++ b/pkgs/tools/cd-dvd/unetbootin/default.nix @@ -1,13 +1,13 @@ { stdenv, fetchurl, makeWrapper, qt4, utillinux, coreutils, which, p7zip, mtools, syslinux }: -let version = "485"; in +let version = "563"; in stdenv.mkDerivation rec { name = "unetbootin-${version}"; src = fetchurl { url = "mirror://sourceforge/unetbootin/UNetbootin/${version}/unetbootin-source-${version}.tar.gz"; - sha256 = "1nyzy1wrql0l6zkmrd1l3qqvbdkv0534axdz6vy3cyksp157jxc8"; + sha256 = "1j4ka6rjf5akhcdb4pbfdrka9zflhch97b5i42zk1cf8hd6wx939"; }; sourceRoot = "."; @@ -43,13 +43,13 @@ stdenv.mkDerivation rec { '' ensureDir $out/bin cp unetbootin $out/bin - + ensureDir $out/share/unetbootin cp unetbootin_*.qm $out/share/unetbootin ensureDir $out/share/applications cp unetbootin.desktop $out/share/applications - + wrapProgram $out/bin/unetbootin \ --prefix PATH : ${which}/bin:${p7zip}/bin:${mtools}/bin ''; From bd5e996e20abbcbf98c0f77748c83a654e9784a2 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Mon, 31 Oct 2011 14:44:32 +0000 Subject: [PATCH 404/970] =?UTF-8?q?*=20Apply=20a=20patch=20to=20fix=20the?= =?UTF-8?q?=20"max=20resident"=20size=20reported=20by=20=E2=80=98time?= =?UTF-8?q?=E2=80=99=20=20=20being=20off=20by=20a=20factor=20of=204.=20=20?= =?UTF-8?q?(The=20most=20recent=20release=20of=20=E2=80=98time=E2=80=99=20?= =?UTF-8?q?is=20=20=20from=201996=20BTW...)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit svn path=/nixpkgs/trunk/; revision=30143 --- pkgs/tools/misc/time/default.nix | 2 ++ pkgs/tools/misc/time/max-resident.patch | 16 ++++++++++++++++ 2 files changed, 18 insertions(+) create mode 100644 pkgs/tools/misc/time/max-resident.patch diff --git a/pkgs/tools/misc/time/default.nix b/pkgs/tools/misc/time/default.nix index 658afb37c03..05ab7cc7ae7 100644 --- a/pkgs/tools/misc/time/default.nix +++ b/pkgs/tools/misc/time/default.nix @@ -8,6 +8,8 @@ stdenv.mkDerivation { sha256 = "0va9063fcn7xykv658v2s9gilj2fq4rcdxx2mn2mmy1v4ndafzp3"; }; + patches = [ ./max-resident.patch ]; + meta = { description = "GNU Time, a tool that runs programs and summarizes the system resources they use"; diff --git a/pkgs/tools/misc/time/max-resident.patch b/pkgs/tools/misc/time/max-resident.patch new file mode 100644 index 00000000000..e593d833d5e --- /dev/null +++ b/pkgs/tools/misc/time/max-resident.patch @@ -0,0 +1,16 @@ +Fix the "max resident" size reported by ‘time’ being off by a factor of 4. + +From http://lists.gnu.org/archive/html/help-gnu-utils/2010-10/msg00002.html + +diff -ru -x '*~' time-1.7-orig/time.c time-1.7/time.c +--- time-1.7-orig/time.c 1996-06-13 15:38:21.000000000 -0400 ++++ time-1.7/time.c 2011-10-31 10:40:27.000000000 -0400 +@@ -392,7 +392,7 @@ + ptok ((UL) resp->ru.ru_ixrss) / MSEC_TO_TICKS (v)); + break; + case 'M': /* Maximum resident set size. */ +- fprintf (fp, "%lu", ptok ((UL) resp->ru.ru_maxrss)); ++ fprintf (fp, "%lu", (UL) resp->ru.ru_maxrss); + break; + case 'O': /* Outputs. */ + fprintf (fp, "%ld", resp->ru.ru_oublock); From edbae5f6c318becbf41766fea21cd31f8ca86dc8 Mon Sep 17 00:00:00 2001 From: Rob Vermaas Date: Mon, 31 Oct 2011 18:26:20 +0000 Subject: [PATCH 405/970] update nginx to 1.1.7 svn path=/nixpkgs/trunk/; revision=30144 --- pkgs/servers/http/nginx/default.nix | 31 ++++++++----------- pkgs/servers/http/nginx/src-for-default.nix | 9 ------ .../http/nginx/src-info-for-default.nix | 4 --- pkgs/top-level/all-packages.nix | 4 +-- 4 files changed, 14 insertions(+), 34 deletions(-) delete mode 100644 pkgs/servers/http/nginx/src-for-default.nix delete mode 100644 pkgs/servers/http/nginx/src-info-for-default.nix diff --git a/pkgs/servers/http/nginx/default.nix b/pkgs/servers/http/nginx/default.nix index 4d1d39ba417..6cdc57d11b5 100644 --- a/pkgs/servers/http/nginx/default.nix +++ b/pkgs/servers/http/nginx/default.nix @@ -1,15 +1,12 @@ -a : -let - s = import ./src-for-default.nix; - buildInputs = with a; [ - openssl zlib pcre libxml2 libxslt - ]; -in -rec { - src = a.fetchUrlFromSrcInfo s; +{ stdenv, fetchurl, openssl, zlib, pcre, libxml2, libxslt }: +stdenv.mkDerivation rec { + name = "nginx-1.1.7"; + src = fetchurl { + url = "http://nginx.org/download/${name}.tar.gz"; + sha256 = "1y0bzmrgnyqw8ghc508nipy5k46byrxc2sycqp35fdx0jmjz3h51"; + }; + buildInputs = [ openssl zlib pcre libxml2 libxslt ]; - inherit (s) name; - inherit buildInputs; configureFlags = [ "--with-http_ssl_module" "--with-http_xslt_module" @@ -21,18 +18,16 @@ rec { # "--with-http_perl_module" ]; - preConfigure = a.fullDepEntry '' - export NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE -I${a.libxml2}/include/libxml2" - '' []; + preConfigure = '' + export NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE -I${libxml2}/include/libxml2" + ''; - phaseNames = ["preConfigure" "doConfigure" "doMakeInstall"]; - meta = { description = "nginx - 'engine x' - reverse proxy and lightweight webserver"; maintainers = [ - a.lib.maintainers.raskin + stdenv.lib.maintainers.raskin ]; - platforms = with a.lib.platforms; + platforms = with stdenv.lib.platforms; all; }; } diff --git a/pkgs/servers/http/nginx/src-for-default.nix b/pkgs/servers/http/nginx/src-for-default.nix deleted file mode 100644 index 319427c0e02..00000000000 --- a/pkgs/servers/http/nginx/src-for-default.nix +++ /dev/null @@ -1,9 +0,0 @@ -rec { - version="1.0.0"; - name="nginx-1.0.0"; - hash="00f0fjkdqi0xl1kcg6d91zmvj82n8w1znp5w9v152rymxv5ddqrx"; - url="http://sysoev.ru/nginx/nginx-${version}.tar.gz"; - advertisedUrl="http://sysoev.ru/nginx/nginx-1.0.0.tar.gz"; - - -} diff --git a/pkgs/servers/http/nginx/src-info-for-default.nix b/pkgs/servers/http/nginx/src-info-for-default.nix deleted file mode 100644 index 10ba1c8cd4b..00000000000 --- a/pkgs/servers/http/nginx/src-info-for-default.nix +++ /dev/null @@ -1,4 +0,0 @@ -{ - downloadPage = "http://sysoev.ru/nginx/download.html"; - baseName = "nginx"; -} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index bd17d1ffad6..cfb2a1b3a0a 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -4929,9 +4929,7 @@ let myserver = callPackage ../servers/http/myserver { }; - nginx = builderDefsPackage (import ../servers/http/nginx) { - inherit openssl pcre zlib libxml2 libxslt; - }; + nginx = callPackage ../servers/http/nginx { }; postfix = callPackage ../servers/mail/postfix { }; From 1c509caa6f0e19a2158ed48a23794de9380fe8f9 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 31 Oct 2011 18:49:45 +0000 Subject: [PATCH 406/970] haskell-time: updated to version 1.4.0.1 svn path=/nixpkgs/trunk/; revision=30145 --- .../libraries/haskell/time/{1.4.nix => 1.4.0.1.nix} | 4 ++-- pkgs/top-level/haskell-packages.nix | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) rename pkgs/development/libraries/haskell/time/{1.4.nix => 1.4.0.1.nix} (82%) diff --git a/pkgs/development/libraries/haskell/time/1.4.nix b/pkgs/development/libraries/haskell/time/1.4.0.1.nix similarity index 82% rename from pkgs/development/libraries/haskell/time/1.4.nix rename to pkgs/development/libraries/haskell/time/1.4.0.1.nix index 5ece2f13f0d..8d9f810f724 100644 --- a/pkgs/development/libraries/haskell/time/1.4.nix +++ b/pkgs/development/libraries/haskell/time/1.4.0.1.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "time"; - version = "1.4"; - sha256 = "0y9g7kazch7747x2s4f6yp1b1ys4s0r1r1n7qsvb3dwfbfmv93pz"; + version = "1.4.0.1"; + sha256 = "046jyz2xnbg2s94d9xhpphgq93mqlky7bc50vss40wdk6l7w8aws"; buildDepends = [ deepseq ]; meta = { homepage = "http://semantic.org/TimeLib/"; diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix index 129f66b5121..6b86f63aaee 100644 --- a/pkgs/top-level/haskell-packages.nix +++ b/pkgs/top-level/haskell-packages.nix @@ -1196,7 +1196,7 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y); time_1_1_3 = callPackage ../development/libraries/haskell/time/1.1.3.nix {}; time_1_2_0_3 = callPackage ../development/libraries/haskell/time/1.2.0.3.nix {}; time_1_2_0_5 = callPackage ../development/libraries/haskell/time/1.2.0.5.nix {}; - time_1_4 = callPackage ../development/libraries/haskell/time/1.4.nix {}; + time_1_4_0_1 = callPackage ../development/libraries/haskell/time/1.4.0.1.nix {}; # time is in the core package set. It should only be necessary to # pass it explicitly in rare circumstances. time = null; From b052d41f51e3c796f58d667917450e0e05b6cf58 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 31 Oct 2011 18:49:49 +0000 Subject: [PATCH 407/970] haskell-download-curl: added meta.maintainers svn path=/nixpkgs/trunk/; revision=30146 --- pkgs/development/libraries/haskell/download-curl/default.nix | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/pkgs/development/libraries/haskell/download-curl/default.nix b/pkgs/development/libraries/haskell/download-curl/default.nix index fe391bd01bb..81e88b8f58d 100644 --- a/pkgs/development/libraries/haskell/download-curl/default.nix +++ b/pkgs/development/libraries/haskell/download-curl/default.nix @@ -10,5 +10,9 @@ cabal.mkDerivation (self: { description = "High-level file download based on URLs"; license = self.stdenv.lib.licenses.bsd3; platforms = self.ghc.meta.platforms; + maintainers = [ + self.stdenv.lib.maintainers.andres + self.stdenv.lib.maintainers.simons + ]; }; }) From 9864618daf3a7b8758e39b1619dccd0b09fd72d5 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 31 Oct 2011 18:49:52 +0000 Subject: [PATCH 408/970] haskell-hamlet: updated to version 0.10.4 svn path=/nixpkgs/trunk/; revision=30147 --- pkgs/development/libraries/haskell/hamlet/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/hamlet/default.nix b/pkgs/development/libraries/haskell/hamlet/default.nix index 9f1831a991f..4499d338885 100644 --- a/pkgs/development/libraries/haskell/hamlet/default.nix +++ b/pkgs/development/libraries/haskell/hamlet/default.nix @@ -4,8 +4,8 @@ cabal.mkDerivation (self: { pname = "hamlet"; - version = "0.10.3"; - sha256 = "1xkk8hcmfnn9y14fsrab3cv8xknhf8j6hkv668yshg8bjzz1smva"; + version = "0.10.4"; + sha256 = "10ik9rbj9srb1f7vavs5siidyybzbr4fpy3akv90qldd2xyifhxa"; buildDepends = [ blazeBuilder blazeHtml failure parsec shakespeare text ]; From 686580dc80922090df832ade8cf9f52da35f253b Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 31 Oct 2011 18:49:56 +0000 Subject: [PATCH 409/970] haskell-http-date: updated to version 0.0.1 svn path=/nixpkgs/trunk/; revision=30148 --- pkgs/development/libraries/haskell/http-date/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/http-date/default.nix b/pkgs/development/libraries/haskell/http-date/default.nix index e7dbaedb591..1fbcc40a814 100644 --- a/pkgs/development/libraries/haskell/http-date/default.nix +++ b/pkgs/development/libraries/haskell/http-date/default.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "http-date"; - version = "0.0.0"; - sha256 = "0jia05636xk9k70hqjjiny5298pkb8g7mck7zybfwvigi1fppa46"; + version = "0.0.1"; + sha256 = "1dqnglz1l6h14339nd5q8sq90fak64ab8fs9fkhf8ipg5y0pzwbd"; buildDepends = [ attoparsec ]; meta = { description = "HTTP Date parser/formatter"; From eeffbea836062fa5fe2ff0a3154b3c895f1bdce5 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 31 Oct 2011 18:49:58 +0000 Subject: [PATCH 410/970] haskell-persistent: updated to version 0.6.4 svn path=/nixpkgs/trunk/; revision=30149 --- pkgs/development/libraries/haskell/persistent/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/persistent/default.nix b/pkgs/development/libraries/haskell/persistent/default.nix index 879edcbcb7b..70677d0f336 100644 --- a/pkgs/development/libraries/haskell/persistent/default.nix +++ b/pkgs/development/libraries/haskell/persistent/default.nix @@ -4,8 +4,8 @@ cabal.mkDerivation (self: { pname = "persistent"; - version = "0.6.3"; - sha256 = "0m50z9k941bhh05jjz1268sn1bi7w8i6jzccldgnbjjvsw2xaisx"; + version = "0.6.4"; + sha256 = "149dk6i6w36rq3z6zzrcmpr0kxpp6hk0qpc43vwj0dm68nrffaqk"; buildDepends = [ blazeHtml dataObject enumerator monadControl mtl pathPieces pool text time transformers From 40571fd25f3dde5f70ead9284e85ee84eda75877 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 31 Oct 2011 18:50:01 +0000 Subject: [PATCH 411/970] haskell-shakespeare: updated to version 0.10.2 svn path=/nixpkgs/trunk/; revision=30150 --- pkgs/development/libraries/haskell/shakespeare/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/shakespeare/default.nix b/pkgs/development/libraries/haskell/shakespeare/default.nix index 1c57e45713c..bc5f3097855 100644 --- a/pkgs/development/libraries/haskell/shakespeare/default.nix +++ b/pkgs/development/libraries/haskell/shakespeare/default.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "shakespeare"; - version = "0.10.1.1"; - sha256 = "1qd5wrcr4ss5zigbb7s6c7y7qbvrnbvgdpwq985yyy71i5hwxv0a"; + version = "0.10.2"; + sha256 = "173pcdm69w1xg3vm31xh6hs9w1552cmb1pz99ri09h1ajdhf2qwc"; buildDepends = [ parsec text ]; meta = { homepage = "http://www.yesodweb.com/book/templates"; From 6d455773b03c6dabd96e73dc5c0d05c192ee6373 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 31 Oct 2011 18:50:04 +0000 Subject: [PATCH 412/970] haskell-wai-extra: updated to version 0.4.4 svn path=/nixpkgs/trunk/; revision=30151 --- .../libraries/haskell/wai-extra/default.nix | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/pkgs/development/libraries/haskell/wai-extra/default.nix b/pkgs/development/libraries/haskell/wai-extra/default.nix index 7a06bfb1958..120e1a96a26 100644 --- a/pkgs/development/libraries/haskell/wai-extra/default.nix +++ b/pkgs/development/libraries/haskell/wai-extra/default.nix @@ -1,15 +1,16 @@ { cabal, blazeBuilder, blazeBuilderEnumerator, caseInsensitive -, enumerator, httpTypes, network, text, time, transformers, wai -, zlibBindings +, dataDefault, enumerator, httpTypes, network, text, time +, transformers, wai, zlibBindings, zlibEnum }: cabal.mkDerivation (self: { pname = "wai-extra"; - version = "0.4.3"; - sha256 = "07m86khgfyyadjgq8yp9kj3ljlpkvf209b1cfz2x7n5wdq8k2wm9"; + version = "0.4.4"; + sha256 = "04mzpqa6q3ggk5r0shzc11q5qmmri566nzbsafpv2sbmiwm5s7nd"; buildDepends = [ - blazeBuilder blazeBuilderEnumerator caseInsensitive enumerator - httpTypes network text time transformers wai zlibBindings + blazeBuilder blazeBuilderEnumerator caseInsensitive dataDefault + enumerator httpTypes network text time transformers wai + zlibBindings zlibEnum ]; meta = { homepage = "http://github.com/yesodweb/wai"; From 4fb2bea7e7de767e75920030daa969e69b47ef66 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 31 Oct 2011 18:50:07 +0000 Subject: [PATCH 413/970] haskell-yesod-auth: updated to version 0.7.5 svn path=/nixpkgs/trunk/; revision=30152 --- pkgs/development/libraries/haskell/yesod-auth/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/yesod-auth/default.nix b/pkgs/development/libraries/haskell/yesod-auth/default.nix index fb74e1dfba2..c5bcd1888dd 100644 --- a/pkgs/development/libraries/haskell/yesod-auth/default.nix +++ b/pkgs/development/libraries/haskell/yesod-auth/default.nix @@ -7,8 +7,8 @@ cabal.mkDerivation (self: { pname = "yesod-auth"; - version = "0.7.4"; - sha256 = "088hhyy7fwga7hwqqwxxn12iqnz6jadq1bc9p8hdv1jy6ib769dl"; + version = "0.7.5"; + sha256 = "1njs3z01as6mamdflx2686s4qq4qwpkl0xnfdlrhswzgfpn8qqb6"; buildDepends = [ aesonNative authenticate blazeHtml controlMonadAttempt hamlet httpEnumerator mimeMail persistent persistentTemplate pureMD5 From 0cacb0a3903acb02679cacb2df263b860d78c5c3 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 31 Oct 2011 18:50:09 +0000 Subject: [PATCH 414/970] haskell-yesod-core: updated to version 0.9.3.3 svn path=/nixpkgs/trunk/; revision=30153 --- pkgs/development/libraries/haskell/yesod-core/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/yesod-core/default.nix b/pkgs/development/libraries/haskell/yesod-core/default.nix index 9319eb9a39c..20b344eb2f0 100644 --- a/pkgs/development/libraries/haskell/yesod-core/default.nix +++ b/pkgs/development/libraries/haskell/yesod-core/default.nix @@ -8,8 +8,8 @@ cabal.mkDerivation (self: { pname = "yesod-core"; - version = "0.9.3.2"; - sha256 = "1h45vgxcn4sraax5rsccksx5yz57k32d7vzpp02prz2s2x5bv3xl"; + version = "0.9.3.3"; + sha256 = "0qy926x009mci17fhlrcn758vc9lxybzfg16pb69ydzbdr9lqa77"; buildDepends = [ aesonNative blazeBuilder blazeHtml caseInsensitive cereal clientsession cookie dataObject dataObjectYaml enumerator failure From 8437718fbe4c3bb199d56331c00d0f623d162ffc Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 31 Oct 2011 18:50:12 +0000 Subject: [PATCH 415/970] haskell-yesod: updated to version 0.9.3.1 svn path=/nixpkgs/trunk/; revision=30154 --- pkgs/development/libraries/haskell/yesod/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/yesod/default.nix b/pkgs/development/libraries/haskell/yesod/default.nix index 84a5c25b91f..8e924bc2e9f 100644 --- a/pkgs/development/libraries/haskell/yesod/default.nix +++ b/pkgs/development/libraries/haskell/yesod/default.nix @@ -7,8 +7,8 @@ cabal.mkDerivation (self: { pname = "yesod"; - version = "0.9.3"; - sha256 = "1w5fml250i63qhlxkn1bidc3sminmxf98zsdzvdi42sfjx8fdkkx"; + version = "0.9.3.1"; + sha256 = "0af4nyfrpvkyr070fkg1qf4pn783n5443j8hi3wqn4i371vqsmp0"; isLibrary = true; isExecutable = true; buildDepends = [ From 4cf25b19dea47a9602e496c5901e4126bcf2b5a8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?= Date: Mon, 31 Oct 2011 21:38:30 +0000 Subject: [PATCH 416/970] Updating xpdf. svn path=/nixpkgs/trunk/; revision=30157 --- pkgs/applications/misc/xpdf/default.nix | 33 +++++-------------------- 1 file changed, 6 insertions(+), 27 deletions(-) diff --git a/pkgs/applications/misc/xpdf/default.nix b/pkgs/applications/misc/xpdf/default.nix index 8b375fb2659..8cefdd39b3a 100644 --- a/pkgs/applications/misc/xpdf/default.nix +++ b/pkgs/applications/misc/xpdf/default.nix @@ -8,40 +8,19 @@ assert enablePDFtoPPM -> freetype != null; assert useT1Lib -> t1lib != null; stdenv.mkDerivation { - name = "xpdf-3.02pl5"; + name = "xpdf-3.03"; src = fetchurl { - url = ftp://ftp.foolabs.com/pub/xpdf/xpdf-3.02.tar.gz; - sha256 = "000zq4ddbwyxiki4vdwpmxbnw5n9hsg9hvwra2p33hslyib7sfmk"; + url = ftp://ftp.foolabs.com/pub/xpdf/xpdf-3.03.tar.gz; + sha256 = "1jnfzdqc54wa73lw28kjv0m7120mksb0zkcn81jdlvijyvc67kq2"; }; buildInputs = (if enableGUI then [x11 motif] else []) ++ (if useT1Lib then [t1lib] else []); - patches = [ - (fetchurl { - url = ftp://ftp.foolabs.com/pub/xpdf/xpdf-3.02pl1.patch; - sha256 = "1wxv9l0d2kkwi961ihpdwi75whdvk7cgqxkbfym8cjj11fq17xjq"; - }) - (fetchurl { - url = ftp://ftp.foolabs.com/pub/xpdf/xpdf-3.02pl2.patch; - sha256 = "1nfrgsh9xj0vryd8h65myzd94bjz117y89gq0hzji9dqn23xihfi"; - }) - (fetchurl { - url = ftp://ftp.foolabs.com/pub/xpdf/xpdf-3.02pl3.patch; - sha256 = "0jskkv8x6dqr9zj4azaglas8cziwqqrkbbnzrpm2kzrvsbxyhk2r"; - }) - (fetchurl { - url = ftp://ftp.foolabs.com/pub/xpdf/xpdf-3.02pl4.patch; - sha256 = "1c48h7aizx0ngmzlzw0mpja1w8vqyy3pg62hyxp7c60k86al715h"; - }) - (fetchurl { - url = ftp://ftp.foolabs.com/pub/xpdf/xpdf-3.02pl5.patch; - sha256 = "1fki66pw56yr6aw38f6amrx7wxwcxbx4704pjqq7pqqr784b7z4j"; - }) - ./xpdf-3.02-protection.patch - ]; + # Debian uses '-fpermissive' to bypass some errors on char* constantness. + CXXFLAGS = "-O2 -fpermissive"; configureFlags = "--infodir=$out/share/info --mandir=$out/share/man --enable-a4-paper" @@ -54,7 +33,7 @@ stdenv.mkDerivation { if test -n \"${base14Fonts}\"; then substituteInPlace $out/etc/xpdfrc \\ --replace /usr/local/share/ghostscript/fonts ${base14Fonts} \\ - --replace '#displayFontT1' displayFontT1 + --replace '#displayFontT1' displayFontT2 fi "; From 4da7dbb56f71f03cf2457c75020b79e3f4640e76 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 31 Oct 2011 22:38:44 +0000 Subject: [PATCH 417/970] haskell-crypto-pubkey-types: added version 0.1.0 svn path=/nixpkgs/trunk/; revision=30158 --- .../haskell/crypto-pubkey-types/default.nix | 18 ++++++++++++++++++ pkgs/top-level/haskell-packages.nix | 2 ++ 2 files changed, 20 insertions(+) create mode 100644 pkgs/development/libraries/haskell/crypto-pubkey-types/default.nix diff --git a/pkgs/development/libraries/haskell/crypto-pubkey-types/default.nix b/pkgs/development/libraries/haskell/crypto-pubkey-types/default.nix new file mode 100644 index 00000000000..5f146d047be --- /dev/null +++ b/pkgs/development/libraries/haskell/crypto-pubkey-types/default.nix @@ -0,0 +1,18 @@ +{ cabal, cryptoApi }: + +cabal.mkDerivation (self: { + pname = "crypto-pubkey-types"; + version = "0.1.0"; + sha256 = "1ib5bqxydvv37l53wl6b4j6m6y904rsiamhh144lm6rmqiym26f5"; + buildDepends = [ cryptoApi ]; + meta = { + homepage = "http://github.com/vincenthz/hs-crypto-pubkey-types"; + description = "Generic cryptography Public keys algorithm types"; + license = self.stdenv.lib.licenses.bsd3; + platforms = self.ghc.meta.platforms; + maintainers = [ + self.stdenv.lib.maintainers.andres + self.stdenv.lib.maintainers.simons + ]; + }; +}) diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix index 6b86f63aaee..6c78b9c8f7b 100644 --- a/pkgs/top-level/haskell-packages.nix +++ b/pkgs/top-level/haskell-packages.nix @@ -498,6 +498,8 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y); cryptohash = callPackage ../development/libraries/haskell/cryptohash {}; + cryptoPubkeyTypes = callPackage ../development/libraries/haskell/crypto-pubkey-types {}; + csv = callPackage ../development/libraries/haskell/csv {}; cssText = callPackage ../development/libraries/haskell/css-text {}; From 0187ec70320e881f29041d1f93288b691d9e76db Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 31 Oct 2011 22:38:47 +0000 Subject: [PATCH 418/970] haskell-cprng-aes: updated to version 0.2.3 svn path=/nixpkgs/trunk/; revision=30159 --- pkgs/development/libraries/haskell/cprng-aes/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/cprng-aes/default.nix b/pkgs/development/libraries/haskell/cprng-aes/default.nix index 80a04e96549..0a40bd29575 100644 --- a/pkgs/development/libraries/haskell/cprng-aes/default.nix +++ b/pkgs/development/libraries/haskell/cprng-aes/default.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "cprng-aes"; - version = "0.2.2"; - sha256 = "0jfa9fb670bqlnkplmscz878hvdbpap47xfxvshgs102iq7rjasf"; + version = "0.2.3"; + sha256 = "1xyphzb3afvw7kpgq3b0c86b45rp5a8s870gag1lp7h686lhfnn3"; buildDepends = [ cereal cryptoApi cryptocipher entropy random ]; meta = { homepage = "http://github.com/vincenthz/hs-cprng-aes"; From a5a5dcde905f7ae72228795e83c4a16ea21b317a Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Tue, 1 Nov 2011 14:37:27 +0000 Subject: [PATCH 419/970] * Updated PostgreSQL. svn path=/nixpkgs/trunk/; revision=30162 --- pkgs/servers/sql/postgresql/8.3.x.nix | 4 ++-- pkgs/servers/sql/postgresql/8.4.x.nix | 4 ++-- pkgs/servers/sql/postgresql/9.0.x.nix | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/pkgs/servers/sql/postgresql/8.3.x.nix b/pkgs/servers/sql/postgresql/8.3.x.nix index 2c7b1808d45..b308e4e0d1e 100644 --- a/pkgs/servers/sql/postgresql/8.3.x.nix +++ b/pkgs/servers/sql/postgresql/8.3.x.nix @@ -1,13 +1,13 @@ { stdenv, fetchurl, zlib, ncurses, readline }: -let version = "8.3.12"; in +let version = "8.3.16"; in stdenv.mkDerivation rec { name = "postgresql-${version}"; src = fetchurl { url = "mirror://postgresql/source/v${version}/${name}.tar.bz2"; - sha256 = "0w7h09nx8pkpzznmz4wd1zv8dg3f6jv366rr8bf3s5g6vrvxcssr"; + sha256 = "0i17da3jz44y2xikp99qs0dac9j84hghr8rg5n7hr86ippi90180"; }; buildInputs = [ zlib ncurses readline ]; diff --git a/pkgs/servers/sql/postgresql/8.4.x.nix b/pkgs/servers/sql/postgresql/8.4.x.nix index 416f4846fd5..c3a34b3d43b 100644 --- a/pkgs/servers/sql/postgresql/8.4.x.nix +++ b/pkgs/servers/sql/postgresql/8.4.x.nix @@ -1,13 +1,13 @@ { stdenv, fetchurl, zlib, ncurses, readline }: -let version = "8.4.5"; in +let version = "8.4.9"; in stdenv.mkDerivation rec { name = "postgresql-${version}"; src = fetchurl { url = "mirror://postgresql/source/v${version}/${name}.tar.bz2"; - sha256 = "1grjazzhk0piwpb0bjmgi71wkzb8hk27h6g9l68h52lr5np2401h"; + sha256 = "12n3x2q444hfhy9nbl14yfhd58im86jmlb9b0ihqzbmq1j6wnn0x"; }; buildInputs = [ zlib ncurses readline ]; diff --git a/pkgs/servers/sql/postgresql/9.0.x.nix b/pkgs/servers/sql/postgresql/9.0.x.nix index 53d2f572e31..d49555e8ba8 100644 --- a/pkgs/servers/sql/postgresql/9.0.x.nix +++ b/pkgs/servers/sql/postgresql/9.0.x.nix @@ -1,13 +1,13 @@ { stdenv, fetchurl, zlib, readline }: -let version = "9.0.1"; in +let version = "9.0.5"; in stdenv.mkDerivation rec { name = "postgresql-${version}"; src = fetchurl { url = "mirror://postgresql/source/v${version}/${name}.tar.bz2"; - sha256 = "15iid8l7hgpa2zzdsd0msn0ps9qq1mxkzxx0fca5z117054ws42k"; + sha256 = "016mnwpcyla49qr3gglgpyjwnq1ljjbs3q0s8vlfmazfkj0fxn2n"; }; buildInputs = [ zlib readline ]; From aa98c7dc02493cd0051eebf364e5ff3f7e0ab535 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Tue, 1 Nov 2011 15:21:31 +0000 Subject: [PATCH 420/970] * Added drbd. svn path=/nixpkgs/trunk/; revision=30163 --- pkgs/os-specific/linux/drbd/default.nix | 33 +++++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 35 insertions(+) create mode 100644 pkgs/os-specific/linux/drbd/default.nix diff --git a/pkgs/os-specific/linux/drbd/default.nix b/pkgs/os-specific/linux/drbd/default.nix new file mode 100644 index 00000000000..a3c8c5606d6 --- /dev/null +++ b/pkgs/os-specific/linux/drbd/default.nix @@ -0,0 +1,33 @@ +{ stdenv, fetchurl, flex, udev }: + +assert stdenv.isLinux; + +stdenv.mkDerivation rec { + name = "drbd-8.4.0"; + + src = fetchurl { + url = "http://oss.linbit.com/drbd/8.4/${name}.tar.gz"; + sha256 = "096njwxjpwvnl259gxq6cr6n0r6ba0h5aryvgk05hqi95jx927vg"; + }; + + buildInputs = [ flex ]; + + configureFlags = "--without-distro --without-legacy_utils --without-pacemaker --localstatedir=/var --sysconfdir=/etc"; + + preConfigure = + '' + export PATH=${udev}/sbin:$PATH + substituteInPlace user/Makefile.in --replace /sbin/ $out/sbin/ + substituteInPlace scripts/drbd.rules --replace /sbin/drbdadm $out/sbin/drbdadm + ''; + + makeFlags = "SHELL=${stdenv.shell}"; + + installFlags = "localstatedir=$(TMPDIR)/var sysconfdir=$(out)/etc INITDIR=$(out)/etc/init.d"; + + meta = { + homepage = http://www.drbd.org/; + description = "Distributed Replicated Block Device, a distributed storage system for Linux"; + platforms = stdenv.lib.platforms.linux; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index cfb2a1b3a0a..53909c374a3 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -5126,6 +5126,8 @@ let inherit devicemapper; }; + drbd = callPackage ../os-specific/linux/drbd { }; + libuuid = if crossSystem != null && crossSystem.config == "i586-pc-gnu" then (utillinuxng // { From 0918b83c75d455bf24d6d541c6607c519d7d695b Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Tue, 1 Nov 2011 16:47:18 +0000 Subject: [PATCH 421/970] * Added the Docbook 4.1 SGML DTDs. * Fixed the "docbook2man --sgml" command in docbook2x. * Fixed the module-init-tools manual pages. svn path=/nixpkgs/trunk/; revision=30165 --- .../sgml+xml/schemas/sgml-dtd/docbook/4.1.nix | 33 +++++++++++++++++++ .../linux/module-init-tools/default.nix | 6 ++-- pkgs/tools/typesetting/docbook2x/default.nix | 8 +++-- pkgs/top-level/all-packages.nix | 2 ++ 4 files changed, 44 insertions(+), 5 deletions(-) create mode 100644 pkgs/data/sgml+xml/schemas/sgml-dtd/docbook/4.1.nix diff --git a/pkgs/data/sgml+xml/schemas/sgml-dtd/docbook/4.1.nix b/pkgs/data/sgml+xml/schemas/sgml-dtd/docbook/4.1.nix new file mode 100644 index 00000000000..811515ee55b --- /dev/null +++ b/pkgs/data/sgml+xml/schemas/sgml-dtd/docbook/4.1.nix @@ -0,0 +1,33 @@ +{ stdenv, fetchurl, unzip }: + +let + + src = fetchurl { + url = http://www.oasis-open.org/docbook/sgml/4.1/docbk41.zip; + sha256 = "04b3gp4zkh9c5g9kvnywdkdfkcqx3kjc04j4mpkr4xk7lgqgrany"; + }; + + isoents = fetchurl { + url = http://www.oasis-open.org/cover/ISOEnts.zip; + sha256 = "1clrkaqnvc1ja4lj8blr0rdlphngkcda3snm7b9jzvcn76d3br6w"; + }; + +in + +stdenv.mkDerivation { + name = "docbook-sgml-4.1"; + + unpackPhase = "true"; + + buildInputs = [ unzip ]; + + installPhase = + '' + o=$out/sgml/dtd/docbook-4.1 + mkdir -p $o + cd $o + unzip ${src} + unzip ${isoents} + sed -e "s/iso-/ISO/" -e "s/.gml//" -i docbook.cat + ''; +} diff --git a/pkgs/os-specific/linux/module-init-tools/default.nix b/pkgs/os-specific/linux/module-init-tools/default.nix index d29b8bee5e4..79e1111d40d 100644 --- a/pkgs/os-specific/linux/module-init-tools/default.nix +++ b/pkgs/os-specific/linux/module-init-tools/default.nix @@ -1,8 +1,8 @@ -{stdenv, fetchurl, docbook2x}: +{ stdenv, fetchurl, docbook2x, docbook_sgml_dtd_41 }: stdenv.mkDerivation rec { name = "module-init-tools-3.16"; - + src = fetchurl { url = "mirror://kernel/linux/utils/kernel/module-init-tools/${name}.tar.bz2"; sha256 = "0jxnz9ahfic79rp93l5wxcbgh4pkv85mwnjlbv1gz3jawv5cvwp1"; @@ -10,6 +10,8 @@ stdenv.mkDerivation rec { buildInputs = [ docbook2x ]; + SGML_CATALOG_FILES = "${docbook_sgml_dtd_41}/sgml/dtd/docbook-4.1/docbook.cat"; + patches = [ ./module-dir.patch ./docbook2man.patch ]; postInstall = "rm $out/sbin/insmod.static"; # don't need it diff --git a/pkgs/tools/typesetting/docbook2x/default.nix b/pkgs/tools/typesetting/docbook2x/default.nix index c02471d3e51..00dbe22aed3 100644 --- a/pkgs/tools/typesetting/docbook2x/default.nix +++ b/pkgs/tools/typesetting/docbook2x/default.nix @@ -1,10 +1,12 @@ { fetchurl, stdenv, texinfo, perl , XMLSAX, XMLParser, XMLNamespaceSupport -, groff, libxml2, libxslt, gnused, libiconv +, groff, libxml2, libxslt, gnused, libiconv, opensp +, docbook_xml_dtd_43 , makeWrapper }: stdenv.mkDerivation rec { name = "docbook2X-0.8.8"; + src = fetchurl { url = "mirror://sourceforge/docbook2x/${name}.tar.gz"; sha256 = "0ifwzk99rzjws0ixzimbvs83x6cxqk1xzmg84wa1p7bs6rypaxs0"; @@ -15,7 +17,7 @@ stdenv.mkDerivation rec { patches = [ ./db2x_texixml-to-stdout.patch ]; buildInputs = [ perl texinfo groff libxml2 libxslt makeWrapper - XMLSAX XMLParser XMLNamespaceSupport + XMLSAX XMLParser XMLNamespaceSupport opensp ] ++ (if libiconv != null then [libiconv] else []); postConfigure = '' @@ -37,7 +39,7 @@ stdenv.mkDerivation rec { --prefix PERL5LIB : \ "${XMLNamespaceSupport}/lib/perl5/site_perl" \ --prefix XML_CATALOG_FILES "\ " \ - "$out/share/docbook2X/dtd/catalog.xml\ $out/share/docbook2X/xslt/catalog.xml" + "$out/share/docbook2X/dtd/catalog.xml\ $out/share/docbook2X/xslt/catalog.xml\ ${docbook_xml_dtd_43}/xml/dtd/docbook/catalog.xml" done wrapProgram $out/bin/sgml2xml-isoent --prefix PATH : \ diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 53909c374a3..5ad6957b937 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -6180,6 +6180,8 @@ let docbook5 = callPackage ../data/sgml+xml/schemas/docbook-5.0 { }; + docbook_sgml_dtd_41 = callPackage ../data/sgml+xml/schemas/sgml-dtd/docbook/4.1.nix { }; + docbook_xml_dtd_412 = callPackage ../data/sgml+xml/schemas/xml-dtd/docbook/4.1.2.nix { }; docbook_xml_dtd_42 = callPackage ../data/sgml+xml/schemas/xml-dtd/docbook/4.2.nix { }; From 2ae62028c38deef96ca56b2a26cc814d8b1ee042 Mon Sep 17 00:00:00 2001 From: David Guibert Date: Tue, 1 Nov 2011 17:06:58 +0000 Subject: [PATCH 422/970] update libgcrypt 1.4.6 -> 1.5.0 svn path=/nixpkgs/trunk/; revision=30166 --- pkgs/development/libraries/libgcrypt/default.nix | 4 ++-- pkgs/development/libraries/libgpg-error/default.nix | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/development/libraries/libgcrypt/default.nix b/pkgs/development/libraries/libgcrypt/default.nix index 038fbef69e5..ffe7abf2877 100644 --- a/pkgs/development/libraries/libgcrypt/default.nix +++ b/pkgs/development/libraries/libgcrypt/default.nix @@ -1,11 +1,11 @@ { fetchurl, stdenv, libgpgerror }: stdenv.mkDerivation rec { - name = "libgcrypt-1.4.6"; + name = "libgcrypt-1.5.0"; src = fetchurl { url = "mirror://gnupg/libgcrypt/${name}.tar.bz2"; - sha256 = "11bbpjlqwp0nh4q76wmsk6z1812anqrj28nh6d9mcyrmdgd30jry"; + sha256 = "1ykkh7dm0gyndz7bbpvn3agijj8xb2h02m02f42hm504c18zqqjb"; }; propagatedBuildInputs = [ libgpgerror ]; diff --git a/pkgs/development/libraries/libgpg-error/default.nix b/pkgs/development/libraries/libgpg-error/default.nix index 7554ec0e2f9..3a72bc802af 100644 --- a/pkgs/development/libraries/libgpg-error/default.nix +++ b/pkgs/development/libraries/libgpg-error/default.nix @@ -1,11 +1,11 @@ {stdenv, fetchurl}: stdenv.mkDerivation rec { - name = "libgpg-error-1.7"; + name = "libgpg-error-1.8"; src = fetchurl { url = "mirror://gnupg/libgpg-error/${name}.tar.bz2"; - sha256 = "14as9cpm4k9c6lxm517s9vzqrmjmdpf8i4s41k355xc27qdk6083"; + sha256 = "1i88jl2jm8ckjzyzk7iw2dydk7sxcd27zqyl4qnrs8s7f5kz5yxx"; }; doCheck = true; From 752e53e95db5e4a6f3cbc2cd81e3f58277be5030 Mon Sep 17 00:00:00 2001 From: David Guibert Date: Tue, 1 Nov 2011 17:07:07 +0000 Subject: [PATCH 423/970] lsof 2.84 -> 2.85 svn path=/nixpkgs/trunk/; revision=30167 --- pkgs/development/tools/misc/lsof/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/misc/lsof/default.nix b/pkgs/development/tools/misc/lsof/default.nix index 628546e47a7..f679577a3f1 100644 --- a/pkgs/development/tools/misc/lsof/default.nix +++ b/pkgs/development/tools/misc/lsof/default.nix @@ -1,11 +1,11 @@ {stdenv, fetchurl}: stdenv.mkDerivation { - name = "lsof-4.84"; + name = "lsof-4.85"; src = fetchurl { - url = ftp://lsof.itap.purdue.edu/pub/tools/unix/lsof/lsof_4.84.tar.bz2; - sha256 = "09f71lrwav31nay3c4nwyslm887psn95dw02jr8vlgs4kcnkm290"; + url = ftp://lsof.itap.purdue.edu/pub/tools/unix/lsof/lsof_4.85.tar.bz2; + sha256 = "1hd1aihbzx2c2p4ps4zll6nldyf9l7js59hllnnmpi1r6pk5iaj9"; }; unpackPhase = "tar xvjf $src; cd lsof_*; tar xvf lsof_*.tar; sourceRoot=$( echo lsof_*/); "; From 2a0816fb45ee8a4f9e93341c22f387eee213cb7d Mon Sep 17 00:00:00 2001 From: David Guibert Date: Tue, 1 Nov 2011 17:07:14 +0000 Subject: [PATCH 424/970] add libjson library svn path=/nixpkgs/trunk/; revision=30168 --- pkgs/development/libraries/libjson/default.nix | 16 ++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 18 insertions(+) create mode 100644 pkgs/development/libraries/libjson/default.nix diff --git a/pkgs/development/libraries/libjson/default.nix b/pkgs/development/libraries/libjson/default.nix new file mode 100644 index 00000000000..f49c885c066 --- /dev/null +++ b/pkgs/development/libraries/libjson/default.nix @@ -0,0 +1,16 @@ +{ stdenv, fetchurl, unzip }: + +stdenv.mkDerivation rec { + name = "libjson-7.4.0"; + src = fetchurl { + url = "mirror://sourceforge/libjson/libjson_7.4.0.zip"; + sha256 = "0rd6m3r3acm7xq6f0mbyyhc3dnwmiga60cws29yjl6nx2f9h3r0x"; + }; + buildInputs = [ unzip ]; + makeFlags = "prefix=$out"; + meta = { + homepage = "http://libjson.sourceforge.net/"; + description = "A JSON reader and writer"; + longDescription = "A JSON reader and writer which is super-effiecient and usually runs circles around other JSON libraries. It's highly customizable to optimize for your particular project, and very lightweight. For Windows, OSX, or Linux. Works in any language."; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 5ad6957b937..190c25230bb 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -3720,6 +3720,8 @@ let json_glib = callPackage ../development/libraries/json-glib { }; + libjson = callPackage ../development/libraries/libjson { }; + judy = callPackage ../development/libraries/judy { }; krb5 = callPackage ../development/libraries/kerberos/krb5.nix { }; From d19ed54693c51333f4e35195de352d765d78e6ad Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Tue, 1 Nov 2011 19:03:01 +0000 Subject: [PATCH 425/970] haskell-cryptocipher: added version 0.3.0 svn path=/nixpkgs/trunk/; revision=30169 --- .../cryptocipher/{default.nix => 0.2.14.nix} | 0 .../libraries/haskell/cryptocipher/0.3.0.nix | 20 +++++++++++++++++++ pkgs/top-level/haskell-packages.nix | 4 +++- 3 files changed, 23 insertions(+), 1 deletion(-) rename pkgs/development/libraries/haskell/cryptocipher/{default.nix => 0.2.14.nix} (100%) create mode 100644 pkgs/development/libraries/haskell/cryptocipher/0.3.0.nix diff --git a/pkgs/development/libraries/haskell/cryptocipher/default.nix b/pkgs/development/libraries/haskell/cryptocipher/0.2.14.nix similarity index 100% rename from pkgs/development/libraries/haskell/cryptocipher/default.nix rename to pkgs/development/libraries/haskell/cryptocipher/0.2.14.nix diff --git a/pkgs/development/libraries/haskell/cryptocipher/0.3.0.nix b/pkgs/development/libraries/haskell/cryptocipher/0.3.0.nix new file mode 100644 index 00000000000..a1cbb48b463 --- /dev/null +++ b/pkgs/development/libraries/haskell/cryptocipher/0.3.0.nix @@ -0,0 +1,20 @@ +{ cabal, cereal, cryptoApi, cryptoPubkeyTypes, primitive, tagged +, vector +}: + +cabal.mkDerivation (self: { + pname = "cryptocipher"; + version = "0.3.0"; + sha256 = "17jbzssdbprspadz5ynyam60l5iw7s809irklfg1ii89x26mlyix"; + isLibrary = true; + isExecutable = true; + buildDepends = [ + cereal cryptoApi cryptoPubkeyTypes primitive tagged vector + ]; + meta = { + homepage = "http://github.com/vincenthz/hs-cryptocipher"; + description = "Symmetrical Block, Stream and PubKey Ciphers"; + license = self.stdenv.lib.licenses.bsd3; + platforms = self.ghc.meta.platforms; + }; +}) diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix index 6c78b9c8f7b..07061fcc2f5 100644 --- a/pkgs/top-level/haskell-packages.nix +++ b/pkgs/top-level/haskell-packages.nix @@ -494,7 +494,9 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y); cryptoApi = callPackage ../development/libraries/haskell/crypto-api {}; - cryptocipher = callPackage ../development/libraries/haskell/cryptocipher {}; + cryptocipher_0_2_14 = callPackage ../development/libraries/haskell/cryptocipher/0.2.14.nix {}; + cryptocipher_0_3_0 = callPackage ../development/libraries/haskell/cryptocipher/0.3.0.nix {}; + cryptocipher = self.cryptocipher_0_2_14; cryptohash = callPackage ../development/libraries/haskell/cryptohash {}; From 742f6e13636cf8a3d18dd795082677772915369d Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Tue, 1 Nov 2011 19:03:05 +0000 Subject: [PATCH 426/970] haskell-http-types: updated to version 0.6.6 svn path=/nixpkgs/trunk/; revision=30170 --- pkgs/development/libraries/haskell/http-types/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/http-types/default.nix b/pkgs/development/libraries/haskell/http-types/default.nix index 4966803af36..6e179063c8d 100644 --- a/pkgs/development/libraries/haskell/http-types/default.nix +++ b/pkgs/development/libraries/haskell/http-types/default.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "http-types"; - version = "0.6.5.1"; - sha256 = "1gmf5ghfm8hzifinknyk10m7ayxkn48h1l0mchi2vl6h5rg0nnca"; + version = "0.6.6"; + sha256 = "1x1jgfh399a88dc3ms6va12lvq9iih1shxmqm08xzz4fly6v4k7r"; isLibrary = true; isExecutable = true; buildDepends = [ blazeBuilder caseInsensitive text ]; From 3239966f9d8ba1c239cbf1ba2787a8cbfd2af1b4 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Tue, 1 Nov 2011 19:03:07 +0000 Subject: [PATCH 427/970] haskell-uu-parsinglib: updated to version 2.7.2.2 svn path=/nixpkgs/trunk/; revision=30171 --- pkgs/development/libraries/haskell/uu-parsinglib/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/uu-parsinglib/default.nix b/pkgs/development/libraries/haskell/uu-parsinglib/default.nix index ca71d1d4a6d..e589c4b7d38 100644 --- a/pkgs/development/libraries/haskell/uu-parsinglib/default.nix +++ b/pkgs/development/libraries/haskell/uu-parsinglib/default.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "uu-parsinglib"; - version = "2.7.2.1"; - sha256 = "1dablvx1mrgwzm6fqsbgny3qf9bz3bilhip1b78b5gxrbssfpdyk"; + version = "2.7.2.2"; + sha256 = "0na5c2l6q6mzscqha59ma8v5d0j2vh3y5vl51gb7rzwqz4a6hg95"; buildDepends = [ ListLike time ]; meta = { homepage = "http://www.cs.uu.nl/wiki/bin/view/HUT/ParserCombinators"; From 08b5baee9af963841973d98218590a5246715ebd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= Date: Tue, 1 Nov 2011 22:10:45 +0000 Subject: [PATCH 428/970] glibc/hurd: Update to latest Git; add dependency on pthread headers. svn path=/nixpkgs/trunk/; revision=30172 --- .../libraries/glibc-2.12/common.nix | 18 ++++++++---- .../libraries/glibc-2.12/default.nix | 7 +++-- pkgs/os-specific/gnu/libpthread/default.nix | 28 +++++++++++++++---- pkgs/top-level/all-packages.nix | 9 +++++- 4 files changed, 46 insertions(+), 16 deletions(-) diff --git a/pkgs/development/libraries/glibc-2.12/common.nix b/pkgs/development/libraries/glibc-2.12/common.nix index 2efe56bb214..2836267bc10 100644 --- a/pkgs/development/libraries/glibc-2.12/common.nix +++ b/pkgs/development/libraries/glibc-2.12/common.nix @@ -5,13 +5,14 @@ cross : { name, fetchurl, stdenv, installLocales ? false , gccCross ? null, kernelHeaders ? null -, machHeaders ? null, hurdHeaders ? null, mig ? null, fetchgit ? null +, machHeaders ? null, hurdHeaders ? null, hurdLibpthreadHeaders ? null +, mig ? null, fetchgit ? null , profilingLibraries ? false, meta , preConfigure ? "", ... }@args : let # For GNU/Hurd, see below. - version = if hurdHeaders != null then "20110623" else "2.12.2"; + version = if hurdHeaders != null then "20111025" else "2.12.2"; needsPortsNative = stdenv.isMips || stdenv.isArm; needsPortsCross = cross.arch == "mips" || cross.arch == "arm"; @@ -31,6 +32,7 @@ assert (cross != null) -> (gccCross != null); assert (mig != null) -> (machHeaders != null); assert (machHeaders != null) -> (hurdHeaders != null); +assert (hurdHeaders != null) -> (hurdLibpthreadHeaders != null); assert (hurdHeaders != null) -> (fetchgit != null); stdenv.mkDerivation ({ @@ -141,8 +143,8 @@ stdenv.mkDerivation ({ # maintained by the Hurd folks, `tschwinge/Roger_Whittaker' branch. # See . url = "git://git.sv.gnu.org/hurd/glibc.git"; - sha256 = "39ea53f318376cbd33e06ec23f4a393fc0801ea3aa87286b30943aa7ef7604cd"; - rev = "77a94de8d3490e73a71efc0b981356d5acb7a28a"; + sha256 = "3fb3dd7030a4b6d3e144fa94c32a0c4f46f17f94e2dfbc6bef41cfc3198725ca"; + rev = "d740cf9d201dc9ecb0335b0a585828dea9cce793"; } else fetchurl { url = "mirror://gnu/glibc/glibc-${version}.tar.bz2"; @@ -198,11 +200,15 @@ stdenv.mkDerivation ({ then { # Work around the fact that the configure snippet that looks for # does not honor `--with-headers=$sysheaders' and that - # glibc expects both Mach and Hurd headers to be in the same place. - CPATH = "${hurdHeaders}/include:${machHeaders}/include"; + # glibc expects Mach, Hurd, and pthread headers to be in the same place. + CPATH = "${hurdHeaders}/include:${machHeaders}/include:${hurdLibpthreadHeaders}/include"; # `fetchgit' is a function and thus should not be passed to the # `derivation' primitive. fetchgit = null; + + # Install NSS stuff in the right place. + # XXX: This will be needed for all new glibcs and isn't Hurd-specific. + makeFlags = ''vardbdir="$out/var/db"''; } else { })) diff --git a/pkgs/development/libraries/glibc-2.12/default.nix b/pkgs/development/libraries/glibc-2.12/default.nix index 31a8ef13a4f..251caaede6d 100644 --- a/pkgs/development/libraries/glibc-2.12/default.nix +++ b/pkgs/development/libraries/glibc-2.12/default.nix @@ -1,5 +1,6 @@ { stdenv, fetchurl, kernelHeaders -, machHeaders ? null, hurdHeaders ? null, mig ? null, fetchgit ? null +, machHeaders ? null, hurdHeaders ? null, hurdLibpthreadHeaders ? null +, mig ? null, fetchgit ? null , installLocales ? true , profilingLibraries ? false , gccCross ? null @@ -40,9 +41,9 @@ in (if hurdHeaders != null then rec { - inherit machHeaders hurdHeaders mig fetchgit; + inherit machHeaders hurdHeaders hurdLibpthreadHeaders mig fetchgit; - propagatedBuildInputs = [ machHeaders hurdHeaders ]; + propagatedBuildInputs = [ machHeaders hurdHeaders hurdLibpthreadHeaders ]; passthru = { # When building GCC itself `propagatedBuildInputs' above is not diff --git a/pkgs/os-specific/gnu/libpthread/default.nix b/pkgs/os-specific/gnu/libpthread/default.nix index 6f978b0c76d..08838f17aff 100644 --- a/pkgs/os-specific/gnu/libpthread/default.nix +++ b/pkgs/os-specific/gnu/libpthread/default.nix @@ -1,27 +1,29 @@ { fetchgit, stdenv, autoconf, automake, libtool -, machHeaders, hurdHeaders, hurd +, machHeaders, hurdHeaders, hurd, headersOnly ? false , cross ? null, gccCross ? null, glibcCross ? null }: assert (cross != null) -> (gccCross != null) && (glibcCross != null); +assert (!headersOnly) -> (hurd != null); let - date = "20100512"; + date = "20111020"; # Use the `tschwinge/Peter_Herbolzheimer' branch as prescribed in # . - rev = "c4bb52770f0b6703bef76c5abdd08663b46b4dc9"; + rev = "a7b82c3302bf9c47176648eb802a61ae2d9a16f5"; in stdenv.mkDerivation ({ - name = "libpthread-hurd-${date}"; + name = "libpthread-hurd-${if headersOnly then "headers-" else ""}${date}"; src = fetchgit { url = "git://git.sv.gnu.org/hurd/libpthread.git"; - sha256 = "1wya9kfmqgn04l995a25p4hxfwddjahfmhdzljb4cribw0bqdizg"; + sha256 = "e8300762914d927c0da4168341a5982a1057613e1af363ee68942087b2570b3d"; inherit rev; }; buildNativeInputs = [ autoconf automake libtool ]; - buildInputs = [ machHeaders hurdHeaders hurd ] + buildInputs = [ machHeaders hurdHeaders ] + ++ stdenv.lib.optional (!headersOnly) hurd ++ stdenv.lib.optional (gccCross != null) gccCross; preConfigure = "autoreconf -vfi"; @@ -37,6 +39,20 @@ stdenv.mkDerivation ({ // +(if headersOnly + then { + configureFlags = + [ "--build=i586-pc-gnu" + "ac_cv_lib_ihash_hurd_ihash_create=yes" + ]; + + buildPhase = ":"; + installPhase = "make install-data-local-headers"; + } + else { }) + +// + (if cross != null then { crossConfig = cross.config; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 190c25230bb..1d522b505e0 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -3433,7 +3433,9 @@ let // (if crossGNU - then { inherit machHeaders hurdHeaders mig fetchgit; } + then { + inherit machHeaders hurdHeaders hurdLibpthreadHeaders mig fetchgit; + } else { })))); glibcCross = glibc212Cross; @@ -5221,6 +5223,11 @@ let hurdPartedCross = null; }; + hurdLibpthreadHeaders = callPackage ../os-specific/gnu/libpthread { + headersOnly = true; + hurd = null; + }; + hurdLibpthreadCross = forceBuildDrv(import ../os-specific/gnu/libpthread { inherit fetchgit stdenv autoconf automake libtool machHeaders hurdHeaders glibcCross; From 0f6979f5b9dbb9db0b5ea605b40025f96346ab90 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= Date: Tue, 1 Nov 2011 22:10:51 +0000 Subject: [PATCH 429/970] Move GNU/Hurd package attributes under `os-specific/gnu/default.nix'. svn path=/nixpkgs/trunk/; revision=30173 --- .../libraries/glibc-2.12/common.nix | 6 +- .../libraries/glibc-2.12/default.nix | 6 +- pkgs/os-specific/gnu/default.nix | 89 ++++++++++++++++++ pkgs/top-level/all-packages.nix | 93 +++---------------- 4 files changed, 106 insertions(+), 88 deletions(-) create mode 100644 pkgs/os-specific/gnu/default.nix diff --git a/pkgs/development/libraries/glibc-2.12/common.nix b/pkgs/development/libraries/glibc-2.12/common.nix index 2836267bc10..0d56d877018 100644 --- a/pkgs/development/libraries/glibc-2.12/common.nix +++ b/pkgs/development/libraries/glibc-2.12/common.nix @@ -5,7 +5,7 @@ cross : { name, fetchurl, stdenv, installLocales ? false , gccCross ? null, kernelHeaders ? null -, machHeaders ? null, hurdHeaders ? null, hurdLibpthreadHeaders ? null +, machHeaders ? null, hurdHeaders ? null, libpthreadHeaders ? null , mig ? null, fetchgit ? null , profilingLibraries ? false, meta , preConfigure ? "", ... }@args : @@ -32,7 +32,7 @@ assert (cross != null) -> (gccCross != null); assert (mig != null) -> (machHeaders != null); assert (machHeaders != null) -> (hurdHeaders != null); -assert (hurdHeaders != null) -> (hurdLibpthreadHeaders != null); +assert (hurdHeaders != null) -> (libpthreadHeaders != null); assert (hurdHeaders != null) -> (fetchgit != null); stdenv.mkDerivation ({ @@ -201,7 +201,7 @@ stdenv.mkDerivation ({ # Work around the fact that the configure snippet that looks for # does not honor `--with-headers=$sysheaders' and that # glibc expects Mach, Hurd, and pthread headers to be in the same place. - CPATH = "${hurdHeaders}/include:${machHeaders}/include:${hurdLibpthreadHeaders}/include"; + CPATH = "${hurdHeaders}/include:${machHeaders}/include:${libpthreadHeaders}/include"; # `fetchgit' is a function and thus should not be passed to the # `derivation' primitive. diff --git a/pkgs/development/libraries/glibc-2.12/default.nix b/pkgs/development/libraries/glibc-2.12/default.nix index 251caaede6d..a57996ff35d 100644 --- a/pkgs/development/libraries/glibc-2.12/default.nix +++ b/pkgs/development/libraries/glibc-2.12/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, kernelHeaders -, machHeaders ? null, hurdHeaders ? null, hurdLibpthreadHeaders ? null +, machHeaders ? null, hurdHeaders ? null, libpthreadHeaders ? null , mig ? null, fetchgit ? null , installLocales ? true , profilingLibraries ? false @@ -41,9 +41,9 @@ in (if hurdHeaders != null then rec { - inherit machHeaders hurdHeaders hurdLibpthreadHeaders mig fetchgit; + inherit machHeaders hurdHeaders libpthreadHeaders mig fetchgit; - propagatedBuildInputs = [ machHeaders hurdHeaders hurdLibpthreadHeaders ]; + propagatedBuildInputs = [ machHeaders hurdHeaders libpthreadHeaders ]; passthru = { # When building GCC itself `propagatedBuildInputs' above is not diff --git a/pkgs/os-specific/gnu/default.nix b/pkgs/os-specific/gnu/default.nix new file mode 100644 index 00000000000..3978979d702 --- /dev/null +++ b/pkgs/os-specific/gnu/default.nix @@ -0,0 +1,89 @@ +# Packages that make up the GNU/Hurd operating system (aka. GNU). + +args@{ fetchgit, stdenv, autoconf, automake, automake111x, libtool +, texinfo, glibcCross, hurdPartedCross, libuuid +, gccCrossStageStatic, gccCrossStageFinal +, forceBuildDrv, callPackage, platform, config, crossSystem }: + +with args; + +rec { + hurdCross = forceBuildDrv(import ./hurd { + inherit fetchgit stdenv autoconf libtool texinfo machHeaders + mig glibcCross hurdPartedCross; + libuuid = libuuid.hostDrv; + automake = automake111x; + headersOnly = false; + cross = assert crossSystem != null; crossSystem; + gccCross = gccCrossStageFinal; + }); + + hurdCrossIntermediate = forceBuildDrv(import ./hurd { + inherit fetchgit stdenv autoconf libtool texinfo machHeaders + mig glibcCross; + automake = automake111x; + headersOnly = false; + cross = assert crossSystem != null; crossSystem; + + # The "final" GCC needs glibc and the Hurd libraries (libpthread in + # particular) so we first need an intermediate Hurd built with the + # intermediate GCC. + gccCross = gccCrossStageStatic; + + # This intermediate Hurd is only needed to build libpthread, which needs + # libihash, and to build Parted, which needs libstore and + # libshouldbeinlibc. + buildTarget = "libihash libstore libshouldbeinlibc"; + installTarget = "libihash-install libstore-install libshouldbeinlibc-install"; + }); + + hurdHeaders = callPackage ./hurd { + automake = automake111x; + headersOnly = true; + gccCross = null; + glibcCross = null; + libuuid = null; + hurdPartedCross = null; + }; + + libpthreadHeaders = callPackage ./libpthread { + headersOnly = true; + hurd = null; + }; + + libpthreadCross = forceBuildDrv(import ./libpthread { + inherit fetchgit stdenv autoconf automake libtool + machHeaders hurdHeaders glibcCross; + hurd = hurdCrossIntermediate; + gccCross = gccCrossStageStatic; + cross = assert crossSystem != null; crossSystem; + }); + + # In theory GNU Mach doesn't have to be cross-compiled. However, since it + # has to be built for i586 (it doesn't work on x86_64), one needs a cross + # compiler for that host. + mach = callPackage ./mach { + automake = automake111x; + }; + + machHeaders = callPackage ./mach { + automake = automake111x; + headersOnly = true; + mig = null; + }; + + mig = callPackage ./mig + (if stdenv.isLinux + then { + # Build natively, but force use of a 32-bit environment because we're + # targeting `i586-pc-gnu'. + stdenv = (import ../../stdenv { + system = "i686-linux"; + stdenvType = "i686-linux"; + allPackages = args: + import ../../top-level/all-packages.nix ({ inherit config; } // args); + inherit platform; + }).stdenv; + } + else { }); +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 1d522b505e0..1bb7cfc495b 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -1118,14 +1118,14 @@ let patchutils = callPackage ../tools/text/patchutils { }; - parted = callPackage ../tools/misc/parted { }; - parted_2_3 = callPackage ../tools/misc/parted/2.3.nix { }; + parted = callPackage ../tools/misc/parted { hurd = null; }; + parted_2_3 = callPackage ../tools/misc/parted/2.3.nix { hurd = null; }; hurdPartedCross = if crossSystem != null && crossSystem.config == "i586-pc-gnu" then (callPackage ../tools/misc/parted { # Needs the Hurd's libstore. - hurd = hurdCrossIntermediate; + hurd = gnu.hurdCrossIntermediate; # The Hurd wants a libparted.a. enableStatic = true; @@ -1808,7 +1808,7 @@ let libpthreadCross = # FIXME: Don't explicitly refer to `i586-pc-gnu'. if crossSystem != null && crossSystem.config == "i586-pc-gnu" - then hurdLibpthreadCross + then gnu.libpthreadCross else null; }); libc = libcCross; @@ -2928,21 +2928,6 @@ let ltrace = callPackage ../development/tools/misc/ltrace { }; - mig = callPackage ../os-specific/gnu/mig - (if stdenv.isLinux - then { - # Build natively, but force use of a 32-bit environment because we're - # targeting `i586-pc-gnu'. - stdenv = (import ../stdenv { - system = "i686-linux"; - stdenvType = "i686-linux"; - allPackages = args: - import ./all-packages.nix ({ inherit config; } // args); - inherit platform; - }).stdenv; - } - else { }); - mk = callPackage ../development/tools/build-managers/mk { }; noweb = callPackage ../development/tools/literate-programming/noweb { }; @@ -3426,7 +3411,7 @@ let in ({ inherit stdenv fetchurl; gccCross = gccCrossStageStatic; - kernelHeaders = if crossGNU then hurdHeaders else linuxHeadersCross; + kernelHeaders = if crossGNU then gnu.hurdHeaders else linuxHeadersCross; installLocales = getConfig [ "glibc" "locales" ] false; } @@ -3434,7 +3419,8 @@ let (if crossGNU then { - inherit machHeaders hurdHeaders hurdLibpthreadHeaders mig fetchgit; + inherit (gnu) machHeaders hurdHeaders libpthreadHeaders mig; + inherit fetchgit; } else { })))); @@ -5185,55 +5171,10 @@ let htop = callPackage ../os-specific/linux/htop { }; - hurdCross = forceBuildDrv(import ../os-specific/gnu/hurd { - inherit fetchgit stdenv autoconf libtool texinfo machHeaders - mig glibcCross hurdPartedCross; - libuuid = libuuid.hostDrv; - automake = automake111x; - headersOnly = false; - cross = assert crossSystem != null; crossSystem; - gccCross = gccCrossStageFinal; - }); - - hurdCrossIntermediate = forceBuildDrv(import ../os-specific/gnu/hurd { - inherit fetchgit stdenv autoconf libtool texinfo machHeaders - mig glibcCross; - automake = automake111x; - headersOnly = false; - cross = assert crossSystem != null; crossSystem; - - # The "final" GCC needs glibc and the Hurd libraries (libpthread in - # particular) so we first need an intermediate Hurd built with the - # intermediate GCC. - gccCross = gccCrossStageStatic; - - # This intermediate Hurd is only needed to build libpthread, which needs - # libihash, and to build Parted, which needs libstore and - # libshouldbeinlibc. - buildTarget = "libihash libstore libshouldbeinlibc"; - installTarget = "libihash-install libstore-install libshouldbeinlibc-install"; - }); - - hurdHeaders = callPackage ../os-specific/gnu/hurd { - automake = automake111x; - headersOnly = true; - gccCross = null; - glibcCross = null; - libuuid = null; - hurdPartedCross = null; - }; - - hurdLibpthreadHeaders = callPackage ../os-specific/gnu/libpthread { - headersOnly = true; - hurd = null; - }; - - hurdLibpthreadCross = forceBuildDrv(import ../os-specific/gnu/libpthread { - inherit fetchgit stdenv autoconf automake libtool - machHeaders hurdHeaders glibcCross; - hurd = hurdCrossIntermediate; - gccCross = gccCrossStageStatic; - cross = assert crossSystem != null; crossSystem; + # GNU/Hurd core packages. + gnu = recurseIntoAttrs (callPackage ../os-specific/gnu { + callPackage = newScope pkgs.gnu; + inherit platform crossSystem; }); hwdata = callPackage ../os-specific/linux/hwdata { }; @@ -5879,18 +5820,6 @@ let lvm2 = callPackage ../os-specific/linux/lvm2 { }; - # In theory GNU Mach doesn't have to be cross-compiled. However, since it - # has to be built for i586 (it doesn't work on x86_64), one needs a cross - # compiler for that host. - mach = callPackage ../os-specific/gnu/mach { - automake = automake111x; }; - - machHeaders = callPackage ../os-specific/gnu/mach { - automake = automake111x; - headersOnly = true; - mig = null; - }; - mdadm = callPackage ../os-specific/linux/mdadm { }; mingetty = callPackage ../os-specific/linux/mingetty { }; From d4b26a727a9598fa6de159535e5539f1e044599f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?= Date: Tue, 1 Nov 2011 22:33:40 +0000 Subject: [PATCH 430/970] Updating unbound. svn path=/nixpkgs/trunk/; revision=30174 --- pkgs/development/libraries/ldns/default.nix | 23 +++++++++++++++++++++ pkgs/tools/networking/unbound/default.nix | 12 ++++++----- pkgs/top-level/all-packages.nix | 2 ++ 3 files changed, 32 insertions(+), 5 deletions(-) create mode 100644 pkgs/development/libraries/ldns/default.nix diff --git a/pkgs/development/libraries/ldns/default.nix b/pkgs/development/libraries/ldns/default.nix new file mode 100644 index 00000000000..a357fccca16 --- /dev/null +++ b/pkgs/development/libraries/ldns/default.nix @@ -0,0 +1,23 @@ +{stdenv, fetchurl, openssl, perl}: + +stdenv.mkDerivation { + name = "ldns-1.6.11"; + src = fetchurl { + url = "http://www.nlnetlabs.nl/downloads/ldns/ldns-1.6.11.tar.gz"; + sha256 = "1248c9gkgfmjdmpp3lfd56vvln94ii54kbxa5iykxvcxivmbi4b8"; + }; + + patchPhase = '' + sed -i 's,\$(srcdir)/doc/doxyparse.pl,perl $(srcdir)/doc/doxyparse.pl,' Makefile.in + ''; + + buildInputs = [ openssl perl ]; + + configureFlags = [ "--with-ssl=${openssl}" ]; + + meta = { + description = "Library with the aim of simplifying DNS programming in C"; + license = "BSD"; + homepage = "http://www.nlnetlabs.nl/projects/ldns/"; + }; +} diff --git a/pkgs/tools/networking/unbound/default.nix b/pkgs/tools/networking/unbound/default.nix index 5d2e61df36b..98fc8e4d145 100644 --- a/pkgs/tools/networking/unbound/default.nix +++ b/pkgs/tools/networking/unbound/default.nix @@ -1,20 +1,22 @@ -{ stdenv, fetchurl, openssl }: +{ stdenv, fetchurl, openssl, expat, libevent, ldns }: stdenv.mkDerivation rec { - name = "unbound-1.4.1"; + name = "unbound-1.4.13"; src = fetchurl { url = "http://unbound.net/downloads/${name}.tar.gz"; - sha256 = "2573db422d7a856a3783b96698f2d5ca18a849d0bd6f0e36eb37a4f0a65b60e2"; + sha256 = "04r379gma1ghr9zjc1fmncpw8kka4f0mpcmrzidsp264aqkxriw3"; }; - buildInputs = [openssl]; + buildInputs = [openssl expat libevent ldns]; - configureFlags = "--with-ssl=${openssl}"; + configureFlags = [ "--with-ssl=${openssl}" "--with-libexpat=${expat}" + "--localstatedir=/var" ]; meta = { description = "Unbound, a validating, recursive, and caching DNS resolver."; license = "BSD"; homepage = http://www.unbound.net; + platforms = with stdenv.lib.platforms; linux; }; } diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 1bb7cfc495b..6cf0c1c95e7 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -905,6 +905,8 @@ let nodejs = callPackage ../development/web/nodejs {}; + ldns = callPackage ../development/libraries/ldns { }; + lftp = callPackage ../tools/networking/lftp { }; libtorrent = callPackage ../tools/networking/p2p/libtorrent { }; From f9667d3cd8adc82731932b123282004c3efc4064 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= Date: Tue, 1 Nov 2011 22:38:05 +0000 Subject: [PATCH 431/970] Add `meta.platforms' to various GnuPG dependencies. svn path=/nixpkgs/trunk/; revision=30175 --- pkgs/development/libraries/libassuan/default.nix | 1 + pkgs/development/libraries/libgcrypt/default.nix | 1 + pkgs/development/libraries/libgpg-error/default.nix | 3 ++- pkgs/development/libraries/pth/default.nix | 1 + 4 files changed, 5 insertions(+), 1 deletion(-) diff --git a/pkgs/development/libraries/libassuan/default.nix b/pkgs/development/libraries/libassuan/default.nix index 90ee45865ed..63bee27da78 100644 --- a/pkgs/development/libraries/libassuan/default.nix +++ b/pkgs/development/libraries/libassuan/default.nix @@ -24,5 +24,6 @@ stdenv.mkDerivation rec { homepage = http://gnupg.org; license = "LGPLv2+"; + platforms = stdenv.lib.platforms.all; }; } diff --git a/pkgs/development/libraries/libgcrypt/default.nix b/pkgs/development/libraries/libgcrypt/default.nix index ffe7abf2877..d705bd80bdc 100644 --- a/pkgs/development/libraries/libgcrypt/default.nix +++ b/pkgs/development/libraries/libgcrypt/default.nix @@ -32,5 +32,6 @@ stdenv.mkDerivation rec { license = "LGPLv2+"; homepage = http://gnupg.org/; + platforms = stdenv.lib.platforms.all; }; } diff --git a/pkgs/development/libraries/libgpg-error/default.nix b/pkgs/development/libraries/libgpg-error/default.nix index 3a72bc802af..f167ecbc2ad 100644 --- a/pkgs/development/libraries/libgpg-error/default.nix +++ b/pkgs/development/libraries/libgpg-error/default.nix @@ -23,5 +23,6 @@ stdenv.mkDerivation rec { homepage = http://gnupg.org; license = "LGPLv2+"; - }; + platforms = stdenv.lib.platforms.all; + }; } diff --git a/pkgs/development/libraries/pth/default.nix b/pkgs/development/libraries/pth/default.nix index be219f1f288..ffd81f84489 100644 --- a/pkgs/development/libraries/pth/default.nix +++ b/pkgs/development/libraries/pth/default.nix @@ -11,5 +11,6 @@ stdenv.mkDerivation rec { meta = { description = "The GNU Portable Threads library"; homepage = http://www.gnu.org/software/pth; + platforms = stdenv.lib.platforms.all; }; } From 3419ae4fdd046d24836b53c73cbe5b929193d83e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= Date: Tue, 1 Nov 2011 22:38:09 +0000 Subject: [PATCH 432/970] gnupdate: Handle GnuPG-related packages. * maintainers/scripts/gnu/gnupdate (gnu?): Check `gnupg.org'. (ftp-server/directory)[quirks]: Add libassuan. svn path=/nixpkgs/trunk/; revision=30176 --- maintainers/scripts/gnu/gnupdate | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/maintainers/scripts/gnu/gnupdate b/maintainers/scripts/gnu/gnupdate index eabe3e581d8..a0c1f338d3a 100755 --- a/maintainers/scripts/gnu/gnupdate +++ b/maintainers/scripts/gnu/gnupdate @@ -736,7 +736,8 @@ Return #t if the signature was good, #f otherwise." (('attribute _ "description" value) (string-prefix? "GNU" value)) (('attribute _ "homepage" (? string? value)) - (string-contains value "www.gnu.org")) + (or (string-contains value "gnu.org") + (string-contains value "gnupg.org"))) (('attribute _ "homepage" ((? string? value) ...)) (any (cut string-contains <> "www.gnu.org") value)) (_ #f))) @@ -769,6 +770,7 @@ Return #t if the signature was good, #f otherwise." ("libosip2" "ftp.gnu.org" "/gnu/osip" #f) ("libgcrypt" "ftp.gnupg.org" "/gcrypt" #t) ("libgpg-error" "ftp.gnupg.org" "/gcrypt" #t) + ("libassuan" "ftp.gnupg.org" "/gcrypt" #t) ("freefont-ttf" "ftp.gnu.org" "/gnu/freefont" #f) ("gnupg" "ftp.gnupg.org" "/gcrypt" #t) ("gnu-ghostscript" "ftp.gnu.org" "/gnu/ghostscript" #f) From 3447d62e640c18fc46340114ee728f29d6062923 Mon Sep 17 00:00:00 2001 From: Shea Levy Date: Wed, 2 Nov 2011 00:19:19 +0000 Subject: [PATCH 433/970] pidgin-sipe: Bump to 1.12.0 svn path=/nixpkgs/trunk/; revision=30177 --- .../pidgin-plugins/sipe/default.nix | 8 +++--- .../pidgin-plugins/sipe/fix-2.7.0.patch | 27 ------------------- 2 files changed, 3 insertions(+), 32 deletions(-) delete mode 100644 pkgs/applications/networking/instant-messengers/pidgin-plugins/sipe/fix-2.7.0.patch diff --git a/pkgs/applications/networking/instant-messengers/pidgin-plugins/sipe/default.nix b/pkgs/applications/networking/instant-messengers/pidgin-plugins/sipe/default.nix index 02fbc9643b7..e8afdb37cbc 100644 --- a/pkgs/applications/networking/instant-messengers/pidgin-plugins/sipe/default.nix +++ b/pkgs/applications/networking/instant-messengers/pidgin-plugins/sipe/default.nix @@ -1,17 +1,15 @@ { stdenv, fetchurl, pidgin, intltool, libxml2 }: -let version = "1.10.0"; in +let version = "1.12.0"; in stdenv.mkDerivation { name = "pidgin-sipe-${version}"; src = fetchurl { - url = "mirror://sourceforge/sipe/sipe/pidgin-sipe-${version}/pidgin-sipe-${version}.tar.gz"; - sha256 = "11d85qxix1dmwvzs3lx0sycsx1d5sy67r9y78fs7z716py4mg9np"; + url = "mirror://sourceforge/sipe/pidgin-sipe-${version}.tar.gz"; + sha256 = "12ki6n360v2ja961fzw4mwpgb8jdp9k21y5mbiab151867c862r6"; }; - patches = [ ./fix-2.7.0.patch ]; - meta = { description = "SIPE plugin for Pidgin IM."; homepage = http://sipe.sourceforge.net/; diff --git a/pkgs/applications/networking/instant-messengers/pidgin-plugins/sipe/fix-2.7.0.patch b/pkgs/applications/networking/instant-messengers/pidgin-plugins/sipe/fix-2.7.0.patch deleted file mode 100644 index cecfa8a18e4..00000000000 --- a/pkgs/applications/networking/instant-messengers/pidgin-plugins/sipe/fix-2.7.0.patch +++ /dev/null @@ -1,27 +0,0 @@ -From 8ad28171ac5c3fbd1917a2f52e75423c4d357b24 Mon Sep 17 00:00:00 2001 -From: David Brown -Date: Thu, 3 Jun 2010 06:40:04 -0700 -Subject: [PATCH] Fix initializer for 2.7.0 release - -The release of 2.7.0 of pidgin/purple gained two extra fields in a -structure. ---- - src/core/sipe.c | 2 ++ - 1 files changed, 2 insertions(+), 0 deletions(-) - -diff --git a/src/core/sipe.c b/src/core/sipe.c -index 45a9015..19f4237 100644 ---- a/src/core/sipe.c -+++ b/src/core/sipe.c -@@ -10683,6 +10683,8 @@ PurplePluginProtocolInfo prpl_info = - NULL, /* get_media_caps */ - #if PURPLE_VERSION_CHECK(2,7,0) - NULL, /* get_moods */ -+ NULL, /* set_public_alias */ -+ NULL, /* get_public_alias */ - #endif - #endif - #endif --- -1.7.1 - From 9567a44892e4cf953b1b50007265f8f0be5a0ad8 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Wed, 2 Nov 2011 01:42:05 +0000 Subject: [PATCH 434/970] haskell-cryptocipher: dropped obsolete version 0.2.14 svn path=/nixpkgs/trunk/; revision=30178 --- .../libraries/haskell/cryptocipher/0.2.14.nix | 20 ------------------- .../cryptocipher/{0.3.0.nix => default.nix} | 0 pkgs/top-level/haskell-packages.nix | 4 +--- 3 files changed, 1 insertion(+), 23 deletions(-) delete mode 100644 pkgs/development/libraries/haskell/cryptocipher/0.2.14.nix rename pkgs/development/libraries/haskell/cryptocipher/{0.3.0.nix => default.nix} (100%) diff --git a/pkgs/development/libraries/haskell/cryptocipher/0.2.14.nix b/pkgs/development/libraries/haskell/cryptocipher/0.2.14.nix deleted file mode 100644 index 754f728aed5..00000000000 --- a/pkgs/development/libraries/haskell/cryptocipher/0.2.14.nix +++ /dev/null @@ -1,20 +0,0 @@ -{ cabal, cereal, cryptoApi, primitive, tagged, vector }: - -cabal.mkDerivation (self: { - pname = "cryptocipher"; - version = "0.2.14"; - sha256 = "1r91d9sqc53c628z378fyah7vvmkakvxpwbslam0yhfgp2p0l23z"; - isLibrary = true; - isExecutable = true; - buildDepends = [ cereal cryptoApi primitive tagged vector ]; - meta = { - homepage = "http://github.com/vincenthz/hs-cryptocipher"; - description = "Symmetrical Block, Stream and PubKey Ciphers"; - license = self.stdenv.lib.licenses.bsd3; - platforms = self.ghc.meta.platforms; - maintainers = [ - self.stdenv.lib.maintainers.andres - self.stdenv.lib.maintainers.simons - ]; - }; -}) diff --git a/pkgs/development/libraries/haskell/cryptocipher/0.3.0.nix b/pkgs/development/libraries/haskell/cryptocipher/default.nix similarity index 100% rename from pkgs/development/libraries/haskell/cryptocipher/0.3.0.nix rename to pkgs/development/libraries/haskell/cryptocipher/default.nix diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix index 07061fcc2f5..6c78b9c8f7b 100644 --- a/pkgs/top-level/haskell-packages.nix +++ b/pkgs/top-level/haskell-packages.nix @@ -494,9 +494,7 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y); cryptoApi = callPackage ../development/libraries/haskell/crypto-api {}; - cryptocipher_0_2_14 = callPackage ../development/libraries/haskell/cryptocipher/0.2.14.nix {}; - cryptocipher_0_3_0 = callPackage ../development/libraries/haskell/cryptocipher/0.3.0.nix {}; - cryptocipher = self.cryptocipher_0_2_14; + cryptocipher = callPackage ../development/libraries/haskell/cryptocipher {}; cryptohash = callPackage ../development/libraries/haskell/cryptohash {}; From 547f7448c8f012f164fbcef5c5dfb19a0be190e8 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Wed, 2 Nov 2011 01:42:09 +0000 Subject: [PATCH 435/970] haskell-certificate: updated to version 1.0.0 svn path=/nixpkgs/trunk/; revision=30179 --- .../libraries/haskell/certificate/default.nix | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/pkgs/development/libraries/haskell/certificate/default.nix b/pkgs/development/libraries/haskell/certificate/default.nix index 46e3d078a69..1e8fca8ca29 100644 --- a/pkgs/development/libraries/haskell/certificate/default.nix +++ b/pkgs/development/libraries/haskell/certificate/default.nix @@ -1,12 +1,15 @@ -{ cabal, asn1Data, base64Bytestring, mtl, time }: +{ cabal, asn1Data, base64Bytestring, cryptoPubkeyTypes, mtl, time +}: cabal.mkDerivation (self: { pname = "certificate"; - version = "0.9.5"; - sha256 = "0nc50x4pqsrm8q6n4xjp79q4dmmglrqd8rbryza8jmcml8fchvbz"; + version = "1.0.0"; + sha256 = "1i4s1yvl765cfj7ya5rsvzqnijf307zh4i4pzcgncmr37mlkfjz2"; isLibrary = true; isExecutable = true; - buildDepends = [ asn1Data base64Bytestring mtl time ]; + buildDepends = [ + asn1Data base64Bytestring cryptoPubkeyTypes mtl time + ]; meta = { homepage = "http://github.com/vincenthz/hs-certificate"; description = "Certificates and Key Reader/Writer"; From bca247ca0f8ffeba2f85209542defcd902f881fb Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Wed, 2 Nov 2011 01:42:12 +0000 Subject: [PATCH 436/970] haskell-clientsession: updated to version 0.7.3.3 svn path=/nixpkgs/trunk/; revision=30180 --- pkgs/development/libraries/haskell/clientsession/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/clientsession/default.nix b/pkgs/development/libraries/haskell/clientsession/default.nix index a2ebb5c2d9b..d4f89de0466 100644 --- a/pkgs/development/libraries/haskell/clientsession/default.nix +++ b/pkgs/development/libraries/haskell/clientsession/default.nix @@ -3,8 +3,8 @@ cabal.mkDerivation (self: { pname = "clientsession"; - version = "0.7.3.2"; - sha256 = "1ml1f5sarfck39qrv4zjcbk1vwgazn32gnjm78fm047ixczi9340"; + version = "0.7.3.3"; + sha256 = "0cfj225hzn8fsffwnq5zq55dh9m5av1i58b4njhna7miiz6b4jsq"; buildDepends = [ base64Bytestring cereal cryptoApi cryptocipher skein ]; From 5e5a7ea1677bb4cf25a3bb51953b8ef6593db7c0 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Wed, 2 Nov 2011 01:42:15 +0000 Subject: [PATCH 437/970] haskell-cryptocipher: updated to version 0.3.0 svn path=/nixpkgs/trunk/; revision=30181 --- pkgs/development/libraries/haskell/cryptocipher/default.nix | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/pkgs/development/libraries/haskell/cryptocipher/default.nix b/pkgs/development/libraries/haskell/cryptocipher/default.nix index a1cbb48b463..a95e3ec1f64 100644 --- a/pkgs/development/libraries/haskell/cryptocipher/default.nix +++ b/pkgs/development/libraries/haskell/cryptocipher/default.nix @@ -16,5 +16,9 @@ cabal.mkDerivation (self: { description = "Symmetrical Block, Stream and PubKey Ciphers"; license = self.stdenv.lib.licenses.bsd3; platforms = self.ghc.meta.platforms; + maintainers = [ + self.stdenv.lib.maintainers.andres + self.stdenv.lib.maintainers.simons + ]; }; }) From 5ab11e58fc33aa747dbefc5c8c4852810acaa1b4 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Wed, 2 Nov 2011 01:42:17 +0000 Subject: [PATCH 438/970] haskell-happstack-server: updated to version 6.2.5 svn path=/nixpkgs/trunk/; revision=30182 --- .../libraries/haskell/happstack/happstack-server.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/happstack/happstack-server.nix b/pkgs/development/libraries/haskell/happstack/happstack-server.nix index b62c8bd0202..c8e5e12cf4b 100644 --- a/pkgs/development/libraries/haskell/happstack/happstack-server.nix +++ b/pkgs/development/libraries/haskell/happstack/happstack-server.nix @@ -5,8 +5,8 @@ cabal.mkDerivation (self: { pname = "happstack-server"; - version = "6.2.4"; - sha256 = "0lhyjaxw1qkh1pi0v14j7ya2ljrfizmxwahrhqk3sasnf2mrqycp"; + version = "6.2.5"; + sha256 = "196s8i3v55i10nkapkvzyw048flshw8mlm604548f0qjciynfjmg"; isLibrary = true; isExecutable = true; buildDepends = [ From eaf51ba7e62c226897f8b63a2db9da0e7df486d1 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Wed, 2 Nov 2011 01:42:20 +0000 Subject: [PATCH 439/970] haskell-http-enumerator: updated to version 0.7.1.4 svn path=/nixpkgs/trunk/; revision=30183 --- .../development/libraries/haskell/http-enumerator/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/http-enumerator/default.nix b/pkgs/development/libraries/haskell/http-enumerator/default.nix index 58167a3c032..55e5ff9dc41 100644 --- a/pkgs/development/libraries/haskell/http-enumerator/default.nix +++ b/pkgs/development/libraries/haskell/http-enumerator/default.nix @@ -7,8 +7,8 @@ cabal.mkDerivation (self: { pname = "http-enumerator"; - version = "0.7.1.3"; - sha256 = "1kx325vzy99xwm40jyv6dw4qrkbnp212slk04wnc5k9fspkvx2g6"; + version = "0.7.1.4"; + sha256 = "1dp3hw10wpf8izmp48jai90x7mxws05gbjqx9s24gl7y2m24q2xg"; isLibrary = true; isExecutable = true; buildDepends = [ From 949d850c632d497bd046394b0499328f6d3299ae Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Wed, 2 Nov 2011 01:42:23 +0000 Subject: [PATCH 440/970] haskell-tls-extra: updated to version 0.4.1 svn path=/nixpkgs/trunk/; revision=30184 --- pkgs/development/libraries/haskell/tls-extra/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/tls-extra/default.nix b/pkgs/development/libraries/haskell/tls-extra/default.nix index 7409d9d1b94..52cdfc5ffe4 100644 --- a/pkgs/development/libraries/haskell/tls-extra/default.nix +++ b/pkgs/development/libraries/haskell/tls-extra/default.nix @@ -4,8 +4,8 @@ cabal.mkDerivation (self: { pname = "tls-extra"; - version = "0.4.0"; - sha256 = "1incrrkvzhq7gdcrrqka0l50a7fj7nccdrin00wplm7ljl129d87"; + version = "0.4.1"; + sha256 = "0yimnq5p89jfbnk5cpa9w30zvfqs9dxxjxy2a86l8jvba5xb8068"; isLibrary = true; isExecutable = true; buildDepends = [ From c882363fceb87f8f0af915f474bea014475488ea Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Wed, 2 Nov 2011 01:42:26 +0000 Subject: [PATCH 441/970] haskell-tls: updated to version 0.8.2 svn path=/nixpkgs/trunk/; revision=30185 --- pkgs/development/libraries/haskell/tls/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/tls/default.nix b/pkgs/development/libraries/haskell/tls/default.nix index de1027dbef1..b4d6dc5e83b 100644 --- a/pkgs/development/libraries/haskell/tls/default.nix +++ b/pkgs/development/libraries/haskell/tls/default.nix @@ -4,8 +4,8 @@ cabal.mkDerivation (self: { pname = "tls"; - version = "0.8.1"; - sha256 = "1qgjzsp9f0mrkwrqzs69279q1dkz72hpazq6qp49p2xfsfzdp7dj"; + version = "0.8.2"; + sha256 = "0306f7im6dclr2h50wvb7rw9r1zc5492hgqm3m33y1nlci319qx8"; isLibrary = true; isExecutable = true; buildDepends = [ From 2a7dfdbce92c2667eb05ed975b471d23ea9a640a Mon Sep 17 00:00:00 2001 From: Sander van der Burg Date: Wed, 2 Nov 2011 13:16:18 +0000 Subject: [PATCH 442/970] Changed the default linux kernel to the 2.6.39 series svn path=/nixpkgs/trunk/; revision=30187 --- pkgs/top-level/all-packages.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 6cf0c1c95e7..170b9370e98 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -5774,7 +5774,7 @@ let # The current default kernel / kernel modules. linux = linuxPackages.kernel; - linuxPackages = linuxPackages_2_6_35; + linuxPackages = linuxPackages_2_6_39; keyutils = callPackage ../os-specific/linux/keyutils { }; From bf457edff017cc2cf42c2bc15ee464aaea7c7e11 Mon Sep 17 00:00:00 2001 From: Sander van der Burg Date: Wed, 2 Nov 2011 13:51:31 +0000 Subject: [PATCH 443/970] reverted default kernel back to 2.6.35 svn path=/nixpkgs/trunk/; revision=30188 --- pkgs/top-level/all-packages.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 170b9370e98..6cf0c1c95e7 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -5774,7 +5774,7 @@ let # The current default kernel / kernel modules. linux = linuxPackages.kernel; - linuxPackages = linuxPackages_2_6_39; + linuxPackages = linuxPackages_2_6_35; keyutils = callPackage ../os-specific/linux/keyutils { }; From 665dc49d4364d3f1156da30bef39b2abc97071b2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?= Date: Wed, 2 Nov 2011 15:00:04 +0000 Subject: [PATCH 444/970] I make qcad compile further... and more importantly, I make it fail the build if the compilation fails. It was not so. But it still needs some patching to build. svn path=/nixpkgs/trunk/; revision=30189 --- pkgs/applications/misc/qcad/default.nix | 15 ++++++- .../misc/qcad/qcad-2.0.4.0-gcc43.patch | 45 +++++++++++++++++++ 2 files changed, 58 insertions(+), 2 deletions(-) create mode 100644 pkgs/applications/misc/qcad/qcad-2.0.4.0-gcc43.patch diff --git a/pkgs/applications/misc/qcad/default.nix b/pkgs/applications/misc/qcad/default.nix index 798f9eeec20..233ee0e6551 100644 --- a/pkgs/applications/misc/qcad/default.nix +++ b/pkgs/applications/misc/qcad/default.nix @@ -19,15 +19,26 @@ stdenv.mkDerivation { buildInputs = [ qt3 libpng libXext libX11 ]; - patchPhase = '' + prePatch = '' sed -i 's/-pedantic//' mkspecs/defs.pro - patch -p1 < ${ ./qcad-2.0.4.0-1.src-intptr.patch /* taken from gentoo, fixes amd64 compilation issue */} + # patch -p1 < ${ ./qcad-2.0.4.0-1.src-intptr.patch } ''; + patches = [ + /* taken from gentoo, fixes amd64 compilation issue */ + ./qcad-2.0.4.0-1.src-intptr.patch + /* taken from gentoo, fixes gcc 4.3 or above compilation issue */ + ./qcad-2.0.4.0-gcc43.patch + ]; # probably there is more to be done. But this seems to work for now (eg see gentoo ebuild) installPhase = '' ensureDir $out/{bin,share} cp -r qcad $out/share + + # The compilation does not fail with error code. But qcad will not exist + # if it failed. + test -f $out/share/qcad/qcad + cat >> $out/bin/qcad << EOF #!/bin/sh cd $out/share/qcad diff --git a/pkgs/applications/misc/qcad/qcad-2.0.4.0-gcc43.patch b/pkgs/applications/misc/qcad/qcad-2.0.4.0-gcc43.patch new file mode 100644 index 00000000000..bc68e81c715 --- /dev/null +++ b/pkgs/applications/misc/qcad/qcad-2.0.4.0-gcc43.patch @@ -0,0 +1,45 @@ +diff -Naur qcad-2.0.4.0-1.src/dxflib/src/dl_writer_ascii.cpp qcad-2.0.4.0-1.src.new/dxflib/src/dl_writer_ascii.cpp +--- qcad-2.0.4.0-1.src/dxflib/src/dl_writer_ascii.cpp 2004-09-14 16:13:01.000000000 -0400 ++++ qcad-2.0.4.0-1.src.new/dxflib/src/dl_writer_ascii.cpp 2008-04-27 08:35:47.000000000 -0400 +@@ -30,6 +30,7 @@ + #endif // _MSC_VER > 1000 + + #include ++#include + + #include "dl_writer_ascii.h" + #include "dl_exception.h" +diff -Naur qcad-2.0.4.0-1.src/dxflib/src/dl_writer.h qcad-2.0.4.0-1.src.new/dxflib/src/dl_writer.h +--- qcad-2.0.4.0-1.src/dxflib/src/dl_writer.h 2004-09-14 16:13:01.000000000 -0400 ++++ qcad-2.0.4.0-1.src.new/dxflib/src/dl_writer.h 2008-04-27 08:35:48.000000000 -0400 +@@ -34,6 +34,7 @@ + + + #include ++#include + + #include "dl_attributes.h" + +diff -Naur qcad-2.0.4.0-1.src/qcadactions/src/rs_actionzoompan.cpp qcad-2.0.4.0-1.src.new/qcadactions/src/rs_actionzoompan.cpp +--- qcad-2.0.4.0-1.src/qcadactions/src/rs_actionzoompan.cpp 2004-09-14 16:13:03.000000000 -0400 ++++ qcad-2.0.4.0-1.src.new/qcadactions/src/rs_actionzoompan.cpp 2008-04-27 08:35:48.000000000 -0400 +@@ -28,6 +28,7 @@ + #include "rs_snapper.h" + #include "rs_point.h" + ++#include + + RS_ActionZoomPan::RS_ActionZoomPan(RS_EntityContainer& container, + RS_GraphicView& graphicView) +diff -Naur qcad-2.0.4.0-1.src/qcadlib/src/information/rs_information.h qcad-2.0.4.0-1.src.new/qcadlib/src/information/rs_information.h +--- qcad-2.0.4.0-1.src/qcadlib/src/information/rs_information.h 2004-09-14 16:13:02.000000000 -0400 ++++ qcad-2.0.4.0-1.src.new/qcadlib/src/information/rs_information.h 2008-04-27 08:35:48.000000000 -0400 +@@ -31,7 +31,7 @@ + #include "rs_line.h" + #include "rs_arc.h" + +- ++#include + + /** + * Class for getting information about entities. This includes From b931fd862d698c0a6b970f9b3725c2562c716c96 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?= Date: Wed, 2 Nov 2011 15:00:11 +0000 Subject: [PATCH 445/970] Updating scribus to 1.4.0rc6. The developers say they abandoned 1.3 long ago. svn path=/nixpkgs/trunk/; revision=30190 --- pkgs/applications/office/scribus/default.nix | 45 ++++---------------- pkgs/top-level/all-packages.nix | 2 +- 2 files changed, 9 insertions(+), 38 deletions(-) diff --git a/pkgs/applications/office/scribus/default.nix b/pkgs/applications/office/scribus/default.nix index 8123f8717a8..3c72db17e1f 100644 --- a/pkgs/applications/office/scribus/default.nix +++ b/pkgs/applications/office/scribus/default.nix @@ -1,50 +1,22 @@ { stdenv, fetchurl, pkgconfig, freetype, lcms, libtiff, libxml2 , libart_lgpl, qt, python, cups, fontconfig, libjpeg -, zlib, libpng, xorg, cairo, cmake }: - -assert stdenv.gcc.gcc != null; - -# NOTE: ! If Scribus doesn't render text try another font. - -# a lot of templates, colour palettes, colour profiles or gradients -# will be released with the next version of scribus - So don't miss them -# when upgrading this package - -let useCairo = false; in - +, zlib, libpng, xorg, cairo, podofo, aspell, boost, cmake }: stdenv.mkDerivation { - name = "scribus-1.3.3.14"; + name = "scribus-1.4.0rc6"; src = fetchurl { - url = mirror://sourceforge/scribus/scribus/1.3.3.14/scribus-1.3.3.14.tar.bz2; - sha256 = "1ig7x6vxhqgjlpnv6hkzpb6gj4yvxsrx7rw900zlp7g6zxl01iyy"; + url = mirror://sourceforge/scribus/scribus/scribus-1.4.0.rc6.tar.bz2; + sha256 = "1rrnzxjzhqj4lgyfswly501xlyvm4hsnnq7zw008v0cnkx31icli"; }; - cmakeFlags = if useCairo then "-DWANT_CAIRO=1" else ""; - - configurePhase = '' - set -x - mkdir -p build; - cd build - eval -- "cmake .. $cmakeFlags" - set +x - ''; + enableParallelBuilding = true; buildInputs = - [ pkgconfig /*<- required fro cairo only?*/ cmake freetype lcms libtiff libxml2 libart_lgpl qt + [ pkgconfig cmake freetype lcms libtiff libxml2 libart_lgpl qt python cups fontconfig xorg.libXaw xorg.libXext xorg.libX11 xorg.libXtst xorg.libXi xorg.libXinerama - libjpeg zlib libpng - ] ++ stdenv.lib.optional useCairo cairo; - - # fix rpath which is removed by cmake.. - postFixup = '' - for i in $buildNativeInputs ${stdenv.gcc.gcc}; do - [ -d "$i/lib" ] && RPATH="$RPATH:$i/lib" - [ -d "$i/lib64" ] && RPATH="$RPATH:$i/lib64" - done - patchelf --set-rpath "''\${RPATH:1}" $out/bin/scribus - ''; + libjpeg zlib libpng podofo aspell cairo + ]; meta = { maintainers = [ stdenv.lib.maintainers.marcweber ]; @@ -54,4 +26,3 @@ stdenv.mkDerivation { license = "GPLv2"; }; } - diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 6cf0c1c95e7..361f3123d65 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -7255,7 +7255,7 @@ let scribus = callPackage ../applications/office/scribus { inherit (gnome) libart_lgpl; - qt = qt3; + qt = qt4; }; seeks = callPackage ../tools/networking/p2p/seeks { }; From a6cb9725c0ed4490374076c903b4b84caf8328cf Mon Sep 17 00:00:00 2001 From: Shea Levy Date: Wed, 2 Nov 2011 15:42:29 +0000 Subject: [PATCH 446/970] Ruby 1.9.3-p0 svn path=/nixpkgs/trunk/; revision=30191 --- pkgs/development/interpreters/ruby/ruby-19.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/interpreters/ruby/ruby-19.nix b/pkgs/development/interpreters/ruby/ruby-19.nix index d5ccb19caec..d11c88d5e75 100644 --- a/pkgs/development/interpreters/ruby/ruby-19.nix +++ b/pkgs/development/interpreters/ruby/ruby-19.nix @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { src = fetchurl { url = "ftp://ftp.ruby-lang.org/pub/ruby/1.9/${name}.tar.gz"; - sha256 = "0zmxdqzprbdc5mvmba1i94mpqnqxxlh460jri7bx6i29bibigj0w"; + sha256 = "0km3ryc0cs578982x6c3y3n3xr920grnpncmznb447snwd10149v"; }; # Have `configure' avoid `/usr/bin/nroff' in non-chroot builds. @@ -44,8 +44,8 @@ stdenv.mkDerivation rec { passthru = rec { majorVersion = "1.9"; - minorVersion = "2"; - patchLevel = "290"; + minorVersion = "3"; + patchLevel = "0"; libPath = "lib/ruby/${majorVersion}"; gemPath = "lib/ruby/gems/${majorVersion}"; }; From efe6fddd599d23d8bacdad057af2c042b211ae64 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Wed, 2 Nov 2011 17:13:24 +0000 Subject: [PATCH 447/970] * Indentation. svn path=/nixpkgs/trunk/; revision=30193 --- pkgs/lib/attrsets.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/lib/attrsets.nix b/pkgs/lib/attrsets.nix index f39b46db621..fcaf4f5c9b5 100644 --- a/pkgs/lib/attrsets.nix +++ b/pkgs/lib/attrsets.nix @@ -273,6 +273,6 @@ rec { # override only the attributes that are already present in the old set # useful for deep-overriding overrideExisting = old: new: - old // listToAttrs (map (attr: nameValuePair attr (attrByPath [attr] (getAttr attr old) new)) (attrNames old)); + old // listToAttrs (map (attr: nameValuePair attr (attrByPath [attr] (getAttr attr old) new)) (attrNames old)); } From 2d2ee447fb14b4f42dc6c5d3e3a9f29785967c28 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Wed, 2 Nov 2011 17:13:38 +0000 Subject: [PATCH 448/970] * Build the legacy tools. svn path=/nixpkgs/trunk/; revision=30194 --- pkgs/os-specific/linux/drbd/default.nix | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/pkgs/os-specific/linux/drbd/default.nix b/pkgs/os-specific/linux/drbd/default.nix index a3c8c5606d6..40821a6e489 100644 --- a/pkgs/os-specific/linux/drbd/default.nix +++ b/pkgs/os-specific/linux/drbd/default.nix @@ -12,12 +12,16 @@ stdenv.mkDerivation rec { buildInputs = [ flex ]; - configureFlags = "--without-distro --without-legacy_utils --without-pacemaker --localstatedir=/var --sysconfdir=/etc"; + configureFlags = "--without-distro --without-pacemaker --localstatedir=/var --sysconfdir=/etc"; preConfigure = '' export PATH=${udev}/sbin:$PATH substituteInPlace user/Makefile.in --replace /sbin/ $out/sbin/ + substituteInPlace user/legacy/Makefile.in \ + --replace /sbin/ $out/sbin/ \ + --replace '$(DESTDIR)/lib/drbd' $out/lib/drbd + substituteInPlace user/drbdadm_usage_cnt.c --replace /lib/drbd $out/lib/drbd substituteInPlace scripts/drbd.rules --replace /sbin/drbdadm $out/sbin/drbdadm ''; From d0c3f05c131c3cab3211a8b455ab077c8d0cfc37 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Wed, 2 Nov 2011 18:54:49 +0000 Subject: [PATCH 449/970] * Apply a patch to propagate the --force flag in the legacy drbdadm to drbdsetup. Otherwise "drbdadm primary --force" won't work as expected (the kernel will say "State change failed: Need access to UpToDate data"). svn path=/nixpkgs/trunk/; revision=30195 --- pkgs/os-specific/linux/drbd/default.nix | 6 ++++-- pkgs/os-specific/linux/drbd/pass-force.patch | 15 +++++++++++++++ 2 files changed, 19 insertions(+), 2 deletions(-) create mode 100644 pkgs/os-specific/linux/drbd/pass-force.patch diff --git a/pkgs/os-specific/linux/drbd/default.nix b/pkgs/os-specific/linux/drbd/default.nix index 40821a6e489..7129b685eb9 100644 --- a/pkgs/os-specific/linux/drbd/default.nix +++ b/pkgs/os-specific/linux/drbd/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, flex, udev }: +{ stdenv, fetchurl, flex, udev, perl }: assert stdenv.isLinux; @@ -10,7 +10,9 @@ stdenv.mkDerivation rec { sha256 = "096njwxjpwvnl259gxq6cr6n0r6ba0h5aryvgk05hqi95jx927vg"; }; - buildInputs = [ flex ]; + patches = [ ./pass-force.patch ]; + + buildInputs = [ flex perl ]; configureFlags = "--without-distro --without-pacemaker --localstatedir=/var --sysconfdir=/etc"; diff --git a/pkgs/os-specific/linux/drbd/pass-force.patch b/pkgs/os-specific/linux/drbd/pass-force.patch new file mode 100644 index 00000000000..8f0201100f7 --- /dev/null +++ b/pkgs/os-specific/linux/drbd/pass-force.patch @@ -0,0 +1,15 @@ +Propagate the --force flag in the legacy drbdadm to drbdsetup. +Otherwise "drbdadm primary --force" won't work as expected (the kernel +will say "State change failed: Need access to UpToDate data"). + +diff -ru -x '*~' drbd-8.4.0-orig/user/legacy/drbdadm_main.c drbd-8.4.0/user/legacy/drbdadm_main.c +--- drbd-8.4.0-orig/user/legacy/drbdadm_main.c 2011-07-07 06:55:39.000000000 -0400 ++++ drbd-8.4.0/user/legacy/drbdadm_main.c 2011-11-02 14:51:04.000000000 -0400 +@@ -1547,6 +1547,7 @@ + for (i = 0; i < soi; i++) { + argv[NA(argc)] = setup_opts[i]; + } ++ if (force) argv[NA(argc)] = "--force"; + argv[NA(argc)] = 0; + + setenv("DRBD_RESOURCE", res->name, 1); From c1475b64315f86fa935898b495f1d595f412cb8b Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Thu, 3 Nov 2011 18:16:54 +0000 Subject: [PATCH 450/970] haskell-text: updated to version 0.11.1.9 svn path=/nixpkgs/trunk/; revision=30204 --- .../libraries/haskell/text/{0.11.1.7.nix => 0.11.1.9.nix} | 4 ++-- pkgs/top-level/haskell-packages.nix | 8 ++++---- 2 files changed, 6 insertions(+), 6 deletions(-) rename pkgs/development/libraries/haskell/text/{0.11.1.7.nix => 0.11.1.9.nix} (82%) diff --git a/pkgs/development/libraries/haskell/text/0.11.1.7.nix b/pkgs/development/libraries/haskell/text/0.11.1.9.nix similarity index 82% rename from pkgs/development/libraries/haskell/text/0.11.1.7.nix rename to pkgs/development/libraries/haskell/text/0.11.1.9.nix index 426df6de602..5b095c97e67 100644 --- a/pkgs/development/libraries/haskell/text/0.11.1.7.nix +++ b/pkgs/development/libraries/haskell/text/0.11.1.9.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "text"; - version = "0.11.1.7"; - sha256 = "1pjllmqnl4rwa6d2mjcj2kp0w7whwxlb04rsaml7yyyk4dw97a2p"; + version = "0.11.1.9"; + sha256 = "12lq9v1byrsan7rp7kywkbwp15qyganpkanmln43yylxdzdc8a2k"; buildDepends = [ deepseq ]; meta = { homepage = "https://github.com/bos/text"; diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix index 6c78b9c8f7b..69f3c28bc9d 100644 --- a/pkgs/top-level/haskell-packages.nix +++ b/pkgs/top-level/haskell-packages.nix @@ -143,7 +143,7 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y); zlib = self.zlib_0_5_3_1; # 7.2 ok, 7.3 ok HTTP = self.HTTP_4000_1_2; # 7.2 ok, 7.3 ok deepseq = self.deepseq_1_1_0_2; # 7.2 ok, 7.3 ok - text = self.text_0_11_1_7; # 7.2 ok, 7.3 ok + text = self.text_0_11_1_9; # 7.2 ok, 7.3 ok transformers = self.transformers_0_2_2_0; # 7.2 ok, 7.3 ok mtl = self.mtl_2_0_1_0; # 7.2 ok, 7.3 ok random = self.random_1_0_0_3; # 7.2 ok, 7.3 ok @@ -193,7 +193,7 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y); self : self.haskellPlatformArgs_2011_2_0_1 self // { haskellPlatform = self.haskellPlatform_2011_2_0_1; mtl1 = self.mtl_1_1_1_1; - text = self.text_0_11_1_7; + text = self.text_0_11_1_9; repaExamples = null; # don't pick this version of 'repa-examples' during nix-env -u }; @@ -1185,8 +1185,8 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y); text_0_11_0_5 = callPackage ../development/libraries/haskell/text/0.11.0.5.nix {}; text_0_11_0_6 = callPackage ../development/libraries/haskell/text/0.11.0.6.nix {}; - text_0_11_1_7 = callPackage ../development/libraries/haskell/text/0.11.1.7.nix {}; - text = self.text_0_11_1_7; + text_0_11_1_9 = callPackage ../development/libraries/haskell/text/0.11.1.9.nix {}; + text = self.text_0_11_1_9; thespian = callPackage ../development/libraries/haskell/thespian {}; From 22e1af0a3ead994aacfde3b55f4d5630c5d7fbc8 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Thu, 3 Nov 2011 18:17:03 +0000 Subject: [PATCH 451/970] haskell-base-unicode-symbols: updated to version 0.2.2.2 svn path=/nixpkgs/trunk/; revision=30205 --- .../libraries/haskell/base-unicode-symbols/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/base-unicode-symbols/default.nix b/pkgs/development/libraries/haskell/base-unicode-symbols/default.nix index 7fbddd1c43d..ab0233e1956 100644 --- a/pkgs/development/libraries/haskell/base-unicode-symbols/default.nix +++ b/pkgs/development/libraries/haskell/base-unicode-symbols/default.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "base-unicode-symbols"; - version = "0.2.2.1"; - sha256 = "095x4mlkn7i9byg6kdp2f7z0x7sizmy4lgsi0rsabazyd3d8rr9l"; + version = "0.2.2.2"; + sha256 = "13bn580r3wk7g5bq8ry04i2lvrcf576wjzlr0imli8rklkx8k3b8"; meta = { homepage = "http://haskell.org/haskellwiki/Unicode-symbols"; description = "Unicode alternatives for common functions and operators"; From 678b22a3a16ea5c953472c28a17164e124d424f1 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Thu, 3 Nov 2011 18:17:09 +0000 Subject: [PATCH 452/970] haskell-cereal: updated to version 0.3.4.0 svn path=/nixpkgs/trunk/; revision=30206 --- pkgs/development/libraries/haskell/cereal/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/cereal/default.nix b/pkgs/development/libraries/haskell/cereal/default.nix index c035b1603f1..f3d1fbbf9be 100644 --- a/pkgs/development/libraries/haskell/cereal/default.nix +++ b/pkgs/development/libraries/haskell/cereal/default.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "cereal"; - version = "0.3.3.0"; - sha256 = "0bqd5qfvbz77mq0zxgafj011hrxcanrfzvlwhf4j4dzr6yryk53y"; + version = "0.3.4.0"; + sha256 = "019fc094w2ica9ims83jacy2digbygaww5wb73xyrj3vgjw774xq"; meta = { description = "A binary serialization library"; license = self.stdenv.lib.licenses.bsd3; From bb2c5cbf707fda317e967a616f4a1d91eb19e728 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Thu, 3 Nov 2011 18:17:17 +0000 Subject: [PATCH 453/970] haskell-system-filepath: updated to version 0.4.2 svn path=/nixpkgs/trunk/; revision=30207 --- .../development/libraries/haskell/system-filepath/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/system-filepath/default.nix b/pkgs/development/libraries/haskell/system-filepath/default.nix index 3e475d6f0e5..5c39279e8a7 100644 --- a/pkgs/development/libraries/haskell/system-filepath/default.nix +++ b/pkgs/development/libraries/haskell/system-filepath/default.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "system-filepath"; - version = "0.4.1"; - sha256 = "0jb32516xiwgbvr68yrf142fnzxfhn2dwh48nfr06gz65l7y4fcx"; + version = "0.4.2"; + sha256 = "070srsvqqjix0afy5ch1zcmpnrrszkds83rv0dp0izqrlzl038mr"; buildDepends = [ text ]; meta = { homepage = "https://john-millikin.com/software/hs-filepath/"; From 583fbe814fa7bd7eef131e2a6238b40404decc4a Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Thu, 3 Nov 2011 18:17:23 +0000 Subject: [PATCH 454/970] haskell-vty: updated to version 4.7.0.6 svn path=/nixpkgs/trunk/; revision=30208 --- pkgs/development/libraries/haskell/vty/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/vty/default.nix b/pkgs/development/libraries/haskell/vty/default.nix index 8ef4c51d03d..85c3a32930d 100644 --- a/pkgs/development/libraries/haskell/vty/default.nix +++ b/pkgs/development/libraries/haskell/vty/default.nix @@ -4,8 +4,8 @@ cabal.mkDerivation (self: { pname = "vty"; - version = "4.7.0.4"; - sha256 = "1rwki3ch1r3dqzb1cxmzxn05k49ams64licl0silbhsj3qibbj53"; + version = "4.7.0.6"; + sha256 = "1jb7c4wh8pjb5salh725vxjbx29wy6ph5gvdp177piq40v3zvbg3"; buildDepends = [ deepseq mtl parallel parsec terminfo utf8String vector ]; From 15c16f50aaaad3ae652a634dc5ec94479fc33d05 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?= Date: Thu, 3 Nov 2011 18:43:48 +0000 Subject: [PATCH 455/970] Adding dnstop svn path=/nixpkgs/trunk/; revision=30209 --- pkgs/tools/networking/dnstop/default.nix | 22 ++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 24 insertions(+) create mode 100644 pkgs/tools/networking/dnstop/default.nix diff --git a/pkgs/tools/networking/dnstop/default.nix b/pkgs/tools/networking/dnstop/default.nix new file mode 100644 index 00000000000..cdab68f22ea --- /dev/null +++ b/pkgs/tools/networking/dnstop/default.nix @@ -0,0 +1,22 @@ +{ stdenv, fetchurl, libpcap, ncurses }: + +stdenv.mkDerivation { + name = "dnstop-20110502"; + + src = fetchurl { + url = http://dns.measurement-factory.com/tools/dnstop/src/dnstop-20110502.tar.gz; + sha256 = "0ra3xjf7dwvq5xm6qbqd2al35vigibihy46rsz1860qrn3wycy12"; + }; + + buildInputs = [ libpcap ncurses ]; + + preInstall = '' + ensureDir $out/share/man/man8 $out/bin + ''; + + meta = { + description = "libpcap application that displays DNS traffic on your network"; + homepage = "http://dns.measurement-factory.com/tools/dnstop"; + license = "BSD"; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 361f3123d65..1b07001287c 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -571,6 +571,8 @@ let # TODO i18n can be installed as well, implement it? }; + dnstop = callPackage ../tools/networking/dnstop { }; + dhcp = callPackage ../tools/networking/dhcp { }; dhcpcd = callPackage ../tools/networking/dhcpcd { }; From 9878098ddf1268739fe748fdf689fac2a3feb2da Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= Date: Thu, 3 Nov 2011 21:08:32 +0000 Subject: [PATCH 456/970] Add TI-RPC. svn path=/nixpkgs/trunk/; revision=30216 --- pkgs/development/libraries/ti-rpc/default.nix | 44 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 + 2 files changed, 46 insertions(+) create mode 100644 pkgs/development/libraries/ti-rpc/default.nix diff --git a/pkgs/development/libraries/ti-rpc/default.nix b/pkgs/development/libraries/ti-rpc/default.nix new file mode 100644 index 00000000000..1fbfdc58fce --- /dev/null +++ b/pkgs/development/libraries/ti-rpc/default.nix @@ -0,0 +1,44 @@ +{ fetchurl, stdenv }: + +stdenv.mkDerivation rec { + name = "libtirpc-0.1.8-1"; + + src = fetchurl { + url = "http://nfsv4.bullopensource.org/tarballs/tirpc/${name}.tar.bz2"; + sha256 = "0jf0sj2cv1rm1dm1i226ww9h93srljf8zf0yfy9mvwxg8gqnn5fy"; + }; + + preConfigure = + '' sed -es"|/etc/netconfig|$out/etc/netconfig|g" -i "Makefile.in" + ''; + preInstall = "ensureDir $out/etc"; + + doCheck = true; + + meta = { + description = "The transport-independent Sun RPC implementation (TI-RPC)"; + + longDescription = + '' Currently, NFS commands use the SunRPC routines provided by the + glibc. These routines do not support IPv6 addresses. Ulrich + Drepper, who is the maintainer of the glibc, refuses any change in + the glibc concerning the RPC. He wants the RPC to become a separate + library. Other OS (NetBSD, FreeBSD, Solarix, HP-UX, AIX) have + migrated their SunRPC library to a TI-RPC (Transport Independent + RPC) implementation. This implementation allows the support of + other transports than UDP and TCP over IPv4. FreeBSD provides a + TI-RPC library ported from NetBSD with improvments. This library + already supports IPv6. So, the FreeBSD release 5.2.1 TI-RPC has + been ported to replace the SunRPC of the glibc. + ''; + + homepage = http://nfsv4.bullopensource.org/doc/tirpc_rpcbind.php; + + # Free software license, see + # . + license = "Sun Industry Standards Source License 1.0"; + + platforms = stdenv.lib.platforms.all; + maintainers = [ stdenv.lib.maintainers.ludo ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 1b07001287c..646f3a2420d 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -911,6 +911,8 @@ let lftp = callPackage ../tools/networking/lftp { }; + libtirpc = callPackage ../development/libraries/ti-rpc { }; + libtorrent = callPackage ../tools/networking/p2p/libtorrent { }; logrotate = callPackage ../tools/system/logrotate { }; From 9d3e13f7f386215a45ece11256a3390351d799ac Mon Sep 17 00:00:00 2001 From: Rob Vermaas Date: Thu, 3 Nov 2011 23:46:50 +0000 Subject: [PATCH 457/970] remove .hg-archival.txt from nix-prefetch-hg result svn path=/nixpkgs/trunk/; revision=30217 --- pkgs/build-support/fetchhg/nix-prefetch-hg | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/build-support/fetchhg/nix-prefetch-hg b/pkgs/build-support/fetchhg/nix-prefetch-hg index 55501f41bbe..f1f648f4aeb 100755 --- a/pkgs/build-support/fetchhg/nix-prefetch-hg +++ b/pkgs/build-support/fetchhg/nix-prefetch-hg @@ -49,6 +49,7 @@ if test -z "$finalPath"; then tmpClone=$url fi hg archive -q -y -r "$rev" --cwd $tmpClone $tmpArchive + rm -f $tmpArchive/.hg_archival.txt # Compute the hash. From 0f0ca48a8d57c7e11850d697f7ddb7a9ba834aa0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?= Date: Fri, 4 Nov 2011 10:28:18 +0000 Subject: [PATCH 458/970] Adding gtmess svn path=/nixpkgs/trunk/; revision=30221 --- .../instant-messengers/gtmess/default.nix | 19 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 21 insertions(+) create mode 100644 pkgs/applications/networking/instant-messengers/gtmess/default.nix diff --git a/pkgs/applications/networking/instant-messengers/gtmess/default.nix b/pkgs/applications/networking/instant-messengers/gtmess/default.nix new file mode 100644 index 00000000000..23727c5d70e --- /dev/null +++ b/pkgs/applications/networking/instant-messengers/gtmess/default.nix @@ -0,0 +1,19 @@ +{stdenv, fetchurl, ncurses, openssl, tcl, tk}: + +stdenv.mkDerivation { + name = "gtmess-0.96"; + + src = fetchurl { + url = mirror://sourceforge/gtmess/gtmess-0.96.tar.gz; + sha256 = "0w29wyshx32485c7wazj51lvk2j9k1kn2jmwpf916r4513hwplvm"; + }; + + buildInputs = [ ncurses openssl tcl tk]; + + meta = { + description = "Console MSN Messenger client for Linux and other unix systems"; + homepage = http://gtmess.sourceforge.net/ + license = "GPLv2+"; + platforms = with stdenv.lib.platforms; linux; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 646f3a2420d..f366e943d02 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -801,6 +801,8 @@ let gtkvnc = callPackage ../tools/admin/gtk-vnc {}; + gtmess = callPackage ../applications/networking/instant-messengers/gtmess { }; + gupnp = callPackage ../development/libraries/gupnp { inherit (gnome) libsoup; }; From 6d9179983be7da32e22fad76fdc5a5cdb07710c8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?= Date: Fri, 4 Nov 2011 10:35:21 +0000 Subject: [PATCH 459/970] Semicolon svn path=/nixpkgs/trunk/; revision=30222 --- .../networking/instant-messengers/gtmess/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/applications/networking/instant-messengers/gtmess/default.nix b/pkgs/applications/networking/instant-messengers/gtmess/default.nix index 23727c5d70e..4d5b5811029 100644 --- a/pkgs/applications/networking/instant-messengers/gtmess/default.nix +++ b/pkgs/applications/networking/instant-messengers/gtmess/default.nix @@ -12,7 +12,7 @@ stdenv.mkDerivation { meta = { description = "Console MSN Messenger client for Linux and other unix systems"; - homepage = http://gtmess.sourceforge.net/ + homepage = http://gtmess.sourceforge.net/; license = "GPLv2+"; platforms = with stdenv.lib.platforms; linux; }; From d48ca86dd9e8249ac61901774185dcae877f4bc6 Mon Sep 17 00:00:00 2001 From: Michael Raskin <7c6f434c@mail.ru> Date: Fri, 4 Nov 2011 16:54:04 +0000 Subject: [PATCH 460/970] Given that this version is the dependency of OpenSSH, fix cross-build. svn path=/nixpkgs/trunk/; revision=30225 --- pkgs/development/tools/parsing/bison/bison-2.4.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/tools/parsing/bison/bison-2.4.nix b/pkgs/development/tools/parsing/bison/bison-2.4.nix index 61ce9b895db..a79a5e96381 100644 --- a/pkgs/development/tools/parsing/bison/bison-2.4.nix +++ b/pkgs/development/tools/parsing/bison/bison-2.4.nix @@ -8,7 +8,7 @@ stdenv.mkDerivation rec { sha256 = "019s3pdzggb71g7p7dgajhh53gh0h6nfl4yrzrs0jzsc37ph4lwk"; }; - buildInputs = [m4]; + buildNativeInputs = [m4]; doCheck = true; From 78070477bf6b5ba0d2f49986cc240cada4f1ab4b Mon Sep 17 00:00:00 2001 From: Michael Raskin <7c6f434c@mail.ru> Date: Fri, 4 Nov 2011 16:55:47 +0000 Subject: [PATCH 461/970] Given that this version is the dependency of OpenSSH, fix cross-build. svn path=/nixpkgs/trunk/; revision=30226 --- pkgs/development/tools/parsing/flex/flex-2.5.35.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/tools/parsing/flex/flex-2.5.35.nix b/pkgs/development/tools/parsing/flex/flex-2.5.35.nix index c200e4e7d2f..ae68bb65d7b 100644 --- a/pkgs/development/tools/parsing/flex/flex-2.5.35.nix +++ b/pkgs/development/tools/parsing/flex/flex-2.5.35.nix @@ -11,7 +11,7 @@ stdenv.mkDerivation { sha256 = "0ysff249mwhq0053bw3hxh58djc0gy7vjan2z1krrf9n5d5vvv0b"; }; buildInputs = [yacc]; - propagatedBuildInputs = [m4]; + propagatedBuildNativeInputs = [m4]; meta = { description = "A fast lexical analyser generator"; From e723b9514072a58c41f9555bf6323c38cc9ba380 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Fri, 4 Nov 2011 16:57:24 +0000 Subject: [PATCH 462/970] haskell-xml-enumerator: updated to version 0.4.3.1 svn path=/nixpkgs/trunk/; revision=30227 --- pkgs/development/libraries/haskell/xml-enumerator/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/xml-enumerator/default.nix b/pkgs/development/libraries/haskell/xml-enumerator/default.nix index 28dfbef6de4..529cf7ff8ac 100644 --- a/pkgs/development/libraries/haskell/xml-enumerator/default.nix +++ b/pkgs/development/libraries/haskell/xml-enumerator/default.nix @@ -5,8 +5,8 @@ cabal.mkDerivation (self: { pname = "xml-enumerator"; - version = "0.4.2.1"; - sha256 = "0xz0a4dk94zg0sm0gy90ymmhzrsdvmqvl3qw2xycys6pzmg51im7"; + version = "0.4.3.1"; + sha256 = "1j9950vqaanjig6wv2pk582x1znzb141p5apg05z9i0sk1w5hczh"; buildDepends = [ attoparsecText attoparsecTextEnumerator blazeBuilder blazeBuilderEnumerator dataDefault enumerator failure text From 0812835108234ea6c35066ca0cb9a35553da7b78 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Fri, 4 Nov 2011 16:57:39 +0000 Subject: [PATCH 463/970] haskell-uuagc-cabal: updated to version 1.0.0.9 svn path=/nixpkgs/trunk/; revision=30228 --- pkgs/development/tools/haskell/uuagc/cabal.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/haskell/uuagc/cabal.nix b/pkgs/development/tools/haskell/uuagc/cabal.nix index b8e1ca46f57..6e7eb904ea1 100644 --- a/pkgs/development/tools/haskell/uuagc/cabal.nix +++ b/pkgs/development/tools/haskell/uuagc/cabal.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "uuagc-cabal"; - version = "1.0.0.7"; - sha256 = "1ciypx0rrisjbwx8fc9bzkkv975646951ibqpvbxipxzvv5npy9y"; + version = "1.0.0.9"; + sha256 = "1iifzy58w50162bwj20xmldsyq0xaq0g849zgwxai26881a1jlfg"; buildDepends = [ mtl uulib ]; meta = { homepage = "http://www.cs.uu.nl/wiki/HUT/WebHome"; From c95d373b6848304a7b1cec35146f43d7237e2239 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?= Date: Fri, 4 Nov 2011 18:10:44 +0000 Subject: [PATCH 464/970] Patching gtmess; it did not build on arm. svn path=/nixpkgs/trunk/; revision=30230 --- .../instant-messengers/gtmess/default.nix | 2 ++ .../instant-messengers/gtmess/va_list.patch | 22 +++++++++++++++++++ 2 files changed, 24 insertions(+) create mode 100644 pkgs/applications/networking/instant-messengers/gtmess/va_list.patch diff --git a/pkgs/applications/networking/instant-messengers/gtmess/default.nix b/pkgs/applications/networking/instant-messengers/gtmess/default.nix index 4d5b5811029..68973b4e47f 100644 --- a/pkgs/applications/networking/instant-messengers/gtmess/default.nix +++ b/pkgs/applications/networking/instant-messengers/gtmess/default.nix @@ -10,6 +10,8 @@ stdenv.mkDerivation { buildInputs = [ ncurses openssl tcl tk]; + patches = [ ./va_list.patch ]; + meta = { description = "Console MSN Messenger client for Linux and other unix systems"; homepage = http://gtmess.sourceforge.net/; diff --git a/pkgs/applications/networking/instant-messengers/gtmess/va_list.patch b/pkgs/applications/networking/instant-messengers/gtmess/va_list.patch new file mode 100644 index 00000000000..7d4821279b2 --- /dev/null +++ b/pkgs/applications/networking/instant-messengers/gtmess/va_list.patch @@ -0,0 +1,22 @@ +diff --git a/src/client/screen.c b/src/client/screen.c +index e8fa75f..d3842ac 100644 +--- a/src/client/screen.c ++++ b/src/client/screen.c +@@ -255,7 +255,7 @@ void msg(int attr, const char *fmt, ...) + va_start(ap, fmt); + r = vmsg(attr, SML, fmt, ap); + va_end(ap); +- if (r) vmsg(C_ERR, SML, "msg(): output truncated\n", NULL); ++ if (r) msgn(C_ERR, SML, "msg(): output truncated\n"); + } + + void msgn(int attr, int size, const char *fmt, ...) +@@ -266,7 +266,7 @@ void msgn(int attr, int size, const char *fmt, ...) + va_start(ap, fmt); + r = vmsg(attr, size, fmt, ap); + va_end(ap); +- if (r) vmsg(C_ERR, SML, "msgn(): output truncated\n", NULL); ++ if (r) msgn(C_ERR, SML, "msgn(): output truncated\n"); + } + + int screen_shut() From 03e3e290bc97512960cd0a12181128ef495e28ca Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Fri, 4 Nov 2011 18:46:20 +0000 Subject: [PATCH 465/970] * Remove unused file. svn path=/nixpkgs/branches/stdenv-updates/; revision=30231 --- pkgs/development/libraries/openssl/1.x.nix | 45 ---------------------- 1 file changed, 45 deletions(-) delete mode 100644 pkgs/development/libraries/openssl/1.x.nix diff --git a/pkgs/development/libraries/openssl/1.x.nix b/pkgs/development/libraries/openssl/1.x.nix deleted file mode 100644 index eae32de30e4..00000000000 --- a/pkgs/development/libraries/openssl/1.x.nix +++ /dev/null @@ -1,45 +0,0 @@ -{ stdenv, fetchurl, perl }: - -let - opensslCrossSystem = stdenv.lib.attrByPath [ "openssl" "system" ] - (throw "openssl needs its platform name cross building" null) - stdenv.cross; -in - -stdenv.mkDerivation (rec { - name = "openssl-1.0.0"; - - src = fetchurl { - url = "http://www.openssl.org/source/${name}.tar.gz"; - sha1 = "3f800ea9fa3da1c0f576d689be7dca3d55a4cb62"; - }; - - buildNativeInputs = [ perl ]; - - configureScript = "./config"; - - configureFlags="--libdir=lib shared"; - - crossAttrs = { - preConfigure='' - export cross=$crossSystem- - ''; - configureFlags="--libdir=lib ${opensslCrossSystem} shared"; - buildPhase = '' - make CC=$crossConfig-gcc \ - AR="$crossConfig-ar r" \ - RANLIB=$crossConfig-ranlib - ''; - }; - - meta = { - homepage = http://www.openssl.org/; - description = "A cryptographic library that implements the SSL and TLS protocols"; - }; -} -// -(if stdenv.isDarwin then { - patches = ./darwin-arch.patch; -} -else { }) -) From a35804be30b9ccaf0c0407a7b39c0a758ead0c90 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Fri, 4 Nov 2011 18:48:00 +0000 Subject: [PATCH 466/970] * Another unused file. svn path=/nixpkgs/branches/stdenv-updates/; revision=30232 --- .../libraries/openssl/darwin-arch-1.patch | 16 ---------------- 1 file changed, 16 deletions(-) delete mode 100644 pkgs/development/libraries/openssl/darwin-arch-1.patch diff --git a/pkgs/development/libraries/openssl/darwin-arch-1.patch b/pkgs/development/libraries/openssl/darwin-arch-1.patch deleted file mode 100644 index ad8e86c6791..00000000000 --- a/pkgs/development/libraries/openssl/darwin-arch-1.patch +++ /dev/null @@ -1,16 +0,0 @@ -The patch is specific to nix: MacOS gcc supports -arch. ---- a/Configure -+++ b/Configure -@@ -549,9 +549,9 @@ my %table=( - "rhapsody-ppc-cc","cc:-O3 -DB_ENDIAN::(unknown):MACOSX_RHAPSODY::BN_LLONG RC4_CHAR RC4_CHUNK DES_UNROLL BF_PTR:${no_asm}::", - "darwin-ppc-cc","cc:-arch ppc -O3 -DB_ENDIAN::-D_REENTRANT:MACOSX:-Wl,-search_paths_first%:BN_LLONG RC4_CHAR RC4_CHUNK DES_UNROLL BF_PTR:${ppc32_asm}:osx32:dlfcn:darwin-shared:-fPIC -fno-common:-arch ppc -dynamiclib:.\$(SHLIB_MAJOR).\$(SHLIB_MINOR).dylib", - "darwin64-ppc-cc","cc:-arch ppc64 -O3 -DB_ENDIAN::-D_REENTRANT:MACOSX:-Wl,-search_paths_first%:SIXTY_FOUR_BIT_LONG RC4_CHAR RC4_CHUNK DES_UNROLL BF_PTR:${ppc64_asm}:osx64:dlfcn:darwin-shared:-fPIC -fno-common:-arch ppc64 -dynamiclib:.\$(SHLIB_MAJOR).\$(SHLIB_MINOR).dylib", --"darwin-i386-cc","cc:-arch i386 -O3 -fomit-frame-pointer -DL_ENDIAN::-D_REENTRANT:MACOSX:-Wl,-search_paths_first%:BN_LLONG RC4_INT RC4_CHUNK DES_UNROLL BF_PTR:${x86_asm}:macosx:dlfcn:darwin-shared:-fPIC -fno-common:-arch i386 -dynamiclib:.\$(SHLIB_MAJOR).\$(SHLIB_MINOR).dylib", --"debug-darwin-i386-cc","cc:-arch i386 -g3 -DL_ENDIAN::-D_REENTRANT:MACOSX:-Wl,-search_paths_first%:BN_LLONG RC4_INT RC4_CHUNK DES_UNROLL BF_PTR:${x86_asm}:macosx:dlfcn:darwin-shared:-fPIC -fno-common:-arch i386 -dynamiclib:.\$(SHLIB_MAJOR).\$(SHLIB_MINOR).dylib", --"darwin64-x86_64-cc","cc:-arch x86_64 -O3 -DL_ENDIAN -DMD32_REG_T=int -Wall::-D_REENTRANT:MACOSX:-Wl,-search_paths_first%:SIXTY_FOUR_BIT_LONG RC4_CHAR RC4_CHUNK DES_INT DES_UNROLL:${x86_64_asm}:macosx:dlfcn:darwin-shared:-fPIC -fno-common:-arch x86_64 -dynamiclib:.\$(SHLIB_MAJOR).\$(SHLIB_MINOR).dylib", -+"darwin-i386-cc","cc:-O3 -fomit-frame-pointer -DL_ENDIAN::-D_REENTRANT:MACOSX:-Wl,-search_paths_first%:BN_LLONG RC4_INT RC4_CHUNK DES_UNROLL BF_PTR:${x86_asm}:macosx:dlfcn:darwin-shared:-fPIC -fno-common:-dynamiclib:.\$(SHLIB_MAJOR).\$(SHLIB_MINOR).dylib", -+"debug-darwin-i386-cc","cc:-g3 -DL_ENDIAN::-D_REENTRANT:MACOSX:-Wl,-search_paths_first%:BN_LLONG RC4_INT RC4_CHUNK DES_UNROLL BF_PTR:${x86_asm}:macosx:dlfcn:darwin-shared:-fPIC -fno-common:-dynamiclib:.\$(SHLIB_MAJOR).\$(SHLIB_MINOR).dylib", -+"darwin64-x86_64-cc","cc:-O3 -DL_ENDIAN -DMD32_REG_T=int -Wall::-D_REENTRANT:MACOSX:-Wl,-search_paths_first%:SIXTY_FOUR_BIT_LONG RC4_CHAR RC4_CHUNK DES_INT DES_UNROLL:${x86_64_asm}:macosx:dlfcn:darwin-shared:-fPIC -fno-common:-dynamiclib:.\$(SHLIB_MAJOR).\$(SHLIB_MINOR).dylib", - "debug-darwin-ppc-cc","cc:-DBN_DEBUG -DREF_CHECK -DCONF_DEBUG -DCRYPTO_MDEBUG -DB_ENDIAN -g -Wall -O::-D_REENTRANT:MACOSX::BN_LLONG RC4_CHAR RC4_CHUNK DES_UNROLL BF_PTR:${ppc32_asm}:osx32:dlfcn:darwin-shared:-fPIC:-dynamiclib:.\$(SHLIB_MAJOR).\$(SHLIB_MINOR).dylib", - - ##### A/UX From a839947b85dcd648ff350438d3529be94afafa88 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Fri, 4 Nov 2011 18:48:25 +0000 Subject: [PATCH 467/970] * Make OpenSSL 1.0.0e the default. svn path=/nixpkgs/branches/stdenv-updates/; revision=30233 --- pkgs/development/libraries/openssl/1.0.0e.nix | 74 ------------------- .../development/libraries/openssl/default.nix | 18 ++++- pkgs/top-level/all-packages.nix | 3 - 3 files changed, 15 insertions(+), 80 deletions(-) delete mode 100644 pkgs/development/libraries/openssl/1.0.0e.nix diff --git a/pkgs/development/libraries/openssl/1.0.0e.nix b/pkgs/development/libraries/openssl/1.0.0e.nix deleted file mode 100644 index 01f9eca15bb..00000000000 --- a/pkgs/development/libraries/openssl/1.0.0e.nix +++ /dev/null @@ -1,74 +0,0 @@ -{ stdenv, fetchurl, perl }: - -let - name = "openssl-1.0.0e"; - - opensslCrossSystem = stdenv.lib.attrByPath [ "openssl" "system" ] - (throw "openssl needs its platform name cross building" null) - stdenv.cross; -in - -stdenv.mkDerivation { - inherit name; - - src = fetchurl { - url = "http://www.openssl.org/source/${name}.tar.gz"; - sha256 = "1xw0ffzmr4wbnb0glywgks375dvq8x87pgxmwx6vhgvkflkxqqg3"; - }; - - patches = - [ # Allow the location of the X509 certificate file (the CA - # bundle) to be set through the environment variable - # ‘OPENSSL_X509_CERT_FILE’. This is necessary because the - # default location ($out/ssl/cert.pem) doesn't exist, and - # hardcoding something like /etc/ssl/cert.pem is impure and - # cannot be overriden per-process. For security, the - # environment variable is ignored for setuid binaries. - ./cert-file.patch - ] - ++ stdenv.lib.optional stdenv.isDarwin ./darwin-arch.patch; - - buildNativeInputs = [ perl ]; - - # On x86_64-darwin, "./config" misdetects the system as - # "darwin-i386-cc". So specify the system type explicitly. - configureScript = - if stdenv.system == "x86_64-darwin" then "./Configure darwin64-x86_64-cc" else "./config"; - - configureFlags = "shared --libdir=lib"; - - makeFlags = "MANDIR=$(out)/share/man"; - - postInstall = - '' - # If we're building dynamic libraries, then don't install static - # libraries. - if [ -n "$(echo $out/lib/*.so)" ]; then - rm $out/lib/*.a - fi - ''; # */ - - crossAttrs = { - preConfigure='' - # It's configure does not like --build or --host - export configureFlags="--libdir=lib --cross-compile-prefix=${stdenv.cross.config}- shared ${opensslCrossSystem}" - ''; - - postInstall = '' - # Openssl installs readonly files, which otherwise we can't strip. - # This could at some stdenv hash change be put out of crossAttrs, too - chmod -R +w $out - - # Remove references to perl, to avoid depending on it at runtime - rm $out/bin/c_rehash $out/ssl/misc/CA.pl $out/ssl/misc/tsget - ''; - configureScript = "./Configure"; - }; - - meta = { - homepage = http://www.openssl.org/; - description = "A cryptographic library that implements the SSL and TLS protocols"; - platforms = stdenv.lib.platforms.all; - maintainers = [ stdenv.lib.maintainers.simons ]; - }; -} diff --git a/pkgs/development/libraries/openssl/default.nix b/pkgs/development/libraries/openssl/default.nix index e51b88f5bca..01f9eca15bb 100644 --- a/pkgs/development/libraries/openssl/default.nix +++ b/pkgs/development/libraries/openssl/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchurl, perl }: let - name = "openssl-1.0.0d"; + name = "openssl-1.0.0e"; opensslCrossSystem = stdenv.lib.attrByPath [ "openssl" "system" ] (throw "openssl needs its platform name cross building" null) @@ -13,10 +13,20 @@ stdenv.mkDerivation { src = fetchurl { url = "http://www.openssl.org/source/${name}.tar.gz"; - sha256 = "1nr0cf6pf8i4qsnx31kqhiqv402xgn76yhjhlbdri8ma1hgislcj"; + sha256 = "1xw0ffzmr4wbnb0glywgks375dvq8x87pgxmwx6vhgvkflkxqqg3"; }; - patches = stdenv.lib.optional stdenv.isDarwin ./darwin-arch.patch; + patches = + [ # Allow the location of the X509 certificate file (the CA + # bundle) to be set through the environment variable + # ‘OPENSSL_X509_CERT_FILE’. This is necessary because the + # default location ($out/ssl/cert.pem) doesn't exist, and + # hardcoding something like /etc/ssl/cert.pem is impure and + # cannot be overriden per-process. For security, the + # environment variable is ignored for setuid binaries. + ./cert-file.patch + ] + ++ stdenv.lib.optional stdenv.isDarwin ./darwin-arch.patch; buildNativeInputs = [ perl ]; @@ -27,6 +37,8 @@ stdenv.mkDerivation { configureFlags = "shared --libdir=lib"; + makeFlags = "MANDIR=$(out)/share/man"; + postInstall = '' # If we're building dynamic libraries, then don't install static diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index cc6a92ccb2e..a2386ed3220 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -4265,7 +4265,6 @@ let neon029 = callPackage ../development/libraries/neon/0.29.nix { compressionSupport = true; sslSupport = true; - openssl = opensslNew; }; nethack = builderDefsPackage (import ../games/nethack) { @@ -4339,8 +4338,6 @@ let fetchurl = fetchurlBoot; }; - opensslNew = callPackage ../development/libraries/openssl/1.0.0e.nix { }; - ortp = callPackage ../development/libraries/ortp { }; pangoxsl = callPackage ../development/libraries/pangoxsl { From bcfa6a78e859c5bb8b9c516498fedfb33cd4dab2 Mon Sep 17 00:00:00 2001 From: Michael Raskin <7c6f434c@mail.ru> Date: Fri, 4 Nov 2011 21:11:43 +0000 Subject: [PATCH 468/970] Fix one part of cross-Linux-PAM failure... svn path=/nixpkgs/trunk/; revision=30237 --- pkgs/os-specific/linux/pam/default.nix | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/pkgs/os-specific/linux/pam/default.nix b/pkgs/os-specific/linux/pam/default.nix index 1e2d20c1edb..e8fc1081ad3 100644 --- a/pkgs/os-specific/linux/pam/default.nix +++ b/pkgs/os-specific/linux/pam/default.nix @@ -17,6 +17,10 @@ stdenv.mkDerivation { crossAttrs = { # Skip libxcrypt cross-building, as it fails for mips and armv5tel propagatedBuildInputs = [ flex.hostDrv cracklib.hostDrv ]; + preConfigure = '' + ar x ${flex.hostDrv}/lib/libfl.a + export LDFLAGS="$LDFLAGS $PWD/libyywrap.o" + ''; }; postInstall = '' From ca92853163eca46b480fd0f6f6a38f4891fc33fd Mon Sep 17 00:00:00 2001 From: Michael Raskin <7c6f434c@mail.ru> Date: Fri, 4 Nov 2011 21:31:07 +0000 Subject: [PATCH 469/970] Make cross-buildable svn path=/nixpkgs/trunk/; revision=30238 --- pkgs/development/tools/parsing/flex/flex-2.5.35.nix | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/pkgs/development/tools/parsing/flex/flex-2.5.35.nix b/pkgs/development/tools/parsing/flex/flex-2.5.35.nix index ae68bb65d7b..66ece227c92 100644 --- a/pkgs/development/tools/parsing/flex/flex-2.5.35.nix +++ b/pkgs/development/tools/parsing/flex/flex-2.5.35.nix @@ -13,6 +13,13 @@ stdenv.mkDerivation { buildInputs = [yacc]; propagatedBuildNativeInputs = [m4]; + crossAttrs = { + preConfigure = '' + export ac_cv_func_malloc_0_nonnull=yes + export ac_cv_func_realloc_0_nonnull=yes + ''; + }; + meta = { description = "A fast lexical analyser generator"; }; From f9596a8145ff16ea2596e7290c4d17d955f24421 Mon Sep 17 00:00:00 2001 From: Michael Raskin <7c6f434c@mail.ru> Date: Fri, 4 Nov 2011 21:35:35 +0000 Subject: [PATCH 470/970] Make cross-buildable. I wonder if it will work... svn path=/nixpkgs/trunk/; revision=30239 --- pkgs/os-specific/linux/pam/default.nix | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/pkgs/os-specific/linux/pam/default.nix b/pkgs/os-specific/linux/pam/default.nix index e8fc1081ad3..1ae6ae1bfe3 100644 --- a/pkgs/os-specific/linux/pam/default.nix +++ b/pkgs/os-specific/linux/pam/default.nix @@ -19,8 +19,15 @@ stdenv.mkDerivation { propagatedBuildInputs = [ flex.hostDrv cracklib.hostDrv ]; preConfigure = '' ar x ${flex.hostDrv}/lib/libfl.a - export LDFLAGS="$LDFLAGS $PWD/libyywrap.o" + mv libyywrap.o libyywrap-target.o + ar x ${flex}/lib/libfl.a + mv libyywrap.o libyywrap-host.o + export LDFLAGS="$LDFLAGS $PWD/libyywrap-target.o" + sed -e 's/@CC@/gcc/' -i doc/specs/Makefile.in ''; + postConfigure = '' + sed -e "s@ $PWD/libyywrap-target.o@ $PWD/libyywrap-host.o@" -i doc/specs/Makefile + ''; }; postInstall = '' From 16b52399c728b08d06ce42cff75dcfb587aa54f2 Mon Sep 17 00:00:00 2001 From: Michael Raskin <7c6f434c@mail.ru> Date: Fri, 4 Nov 2011 21:53:47 +0000 Subject: [PATCH 471/970] Oops, set include dir svn path=/nixpkgs/trunk/; revision=30240 --- pkgs/os-specific/linux/pam/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/pam/default.nix b/pkgs/os-specific/linux/pam/default.nix index 1ae6ae1bfe3..1782d439c4f 100644 --- a/pkgs/os-specific/linux/pam/default.nix +++ b/pkgs/os-specific/linux/pam/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchurl, flex, cracklib, libxcrypt }: -stdenv.mkDerivation { +stdenv.mkDerivation rec { name = "linux-pam-1.1.1"; src = fetchurl { @@ -17,7 +17,7 @@ stdenv.mkDerivation { crossAttrs = { # Skip libxcrypt cross-building, as it fails for mips and armv5tel propagatedBuildInputs = [ flex.hostDrv cracklib.hostDrv ]; - preConfigure = '' + preConfigure = preConfigure + '' ar x ${flex.hostDrv}/lib/libfl.a mv libyywrap.o libyywrap-target.o ar x ${flex}/lib/libfl.a From a0cf7c24e1e928b32a271d4e3347bbf85e5f9b27 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Sat, 5 Nov 2011 00:03:44 +0000 Subject: [PATCH 472/970] git-annex: updated to version 3.20111025 svn path=/nixpkgs/trunk/; revision=30241 --- .../applications/version-management/git-and-tools/default.nix | 3 ++- .../version-management/git-and-tools/git-annex/default.nix | 4 ++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/version-management/git-and-tools/default.nix b/pkgs/applications/version-management/git-and-tools/default.nix index 6319c3592c6..3f1593899c1 100644 --- a/pkgs/applications/version-management/git-and-tools/default.nix +++ b/pkgs/applications/version-management/git-and-tools/default.nix @@ -48,7 +48,8 @@ rec { gitAnnex = lib.makeOverridable (import ./git-annex) { inherit stdenv fetchurl libuuid rsync findutils curl perl git ikiwiki which; inherit (haskellPackages) ghc MissingH utf8String pcreLight SHA dataenc - HTTP testpack monadControl hS3 mtl network hslogger hxt json QuickCheck2; + HTTP testpack monadControl hS3 mtl network hslogger hxt json; + QuickCheck2 = haskellPackages.QuickCheck_2_4_0_1; }; qgit = import ./qgit { diff --git a/pkgs/applications/version-management/git-and-tools/git-annex/default.nix b/pkgs/applications/version-management/git-and-tools/git-annex/default.nix index 5fdf9f43bb1..937c2eecd72 100644 --- a/pkgs/applications/version-management/git-and-tools/git-annex/default.nix +++ b/pkgs/applications/version-management/git-and-tools/git-annex/default.nix @@ -4,14 +4,14 @@ }: let - version = "3.20111011"; + version = "3.20111025"; in stdenv.mkDerivation { name = "git-annex-${version}"; src = fetchurl { url = "http://ftp.de.debian.org/debian/pool/main/g/git-annex/git-annex_${version}.tar.gz"; - sha256 = "6bfd8ff6784d309bc20aaae38b0edd8f71ed44255b584093a881153d8a70c01c"; + sha256 = "1ae0fd9551d3397d1b7e5bc1eba9aab47b803bac680c3d019ba6ef7cefe96d27"; }; buildInputs = [ From 4d95b41bc832a33d9a5d9a8ce8b5de16f4ffb923 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Sat, 5 Nov 2011 01:55:53 +0000 Subject: [PATCH 473/970] * curl updated to 7.22.0. Dropped the connect timeout patch because it doesn't seem necessary anymore. svn path=/nixpkgs/trunk/; revision=30243 --- .../networking/curl/connect-timeout.patch | 156 ------------------ pkgs/tools/networking/curl/default.nix | 15 +- 2 files changed, 2 insertions(+), 169 deletions(-) delete mode 100644 pkgs/tools/networking/curl/connect-timeout.patch diff --git a/pkgs/tools/networking/curl/connect-timeout.patch b/pkgs/tools/networking/curl/connect-timeout.patch deleted file mode 100644 index 1edb1f70b9b..00000000000 --- a/pkgs/tools/networking/curl/connect-timeout.patch +++ /dev/null @@ -1,156 +0,0 @@ -diff -rc curl-7.19.3-orig/lib/connect.c curl-7.19.3/lib/connect.c -*** curl-7.19.3-orig/lib/connect.c 2009-01-02 23:30:50.000000000 +0100 ---- curl-7.19.3/lib/connect.c 2009-01-21 15:04:08.000000000 +0100 -*************** -*** 115,121 **** - singleipconnect(struct connectdata *conn, - const Curl_addrinfo *ai, /* start connecting to this */ - long timeout_ms, -! bool *connected); - - /* - * Curl_timeleft() returns the amount of milliseconds left allowed for the ---- 115,122 ---- - singleipconnect(struct connectdata *conn, - const Curl_addrinfo *ai, /* start connecting to this */ - long timeout_ms, -! bool *connected, -! bool *timed_out); - - /* - * Curl_timeleft() returns the amount of milliseconds left allowed for the -*************** -*** 541,546 **** ---- 542,548 ---- - { - curl_socket_t sockfd; - Curl_addrinfo *ai; -+ bool timed_out; - - /* first close the failed socket */ - sclose(conn->sock[sockindex]); -*************** -*** 554,560 **** - ai = conn->ip_addr->ai_next; - - while(ai) { -! sockfd = singleipconnect(conn, ai, 0L, connected); - if(sockfd != CURL_SOCKET_BAD) { - /* store the new socket descriptor */ - conn->sock[sockindex] = sockfd; ---- 556,562 ---- - ai = conn->ip_addr->ai_next; - - while(ai) { -! sockfd = singleipconnect(conn, ai, 0L, connected, &timed_out); - if(sockfd != CURL_SOCKET_BAD) { - /* store the new socket descriptor */ - conn->sock[sockindex] = sockfd; -*************** -*** 714,720 **** - singleipconnect(struct connectdata *conn, - const Curl_addrinfo *ai, - long timeout_ms, -! bool *connected) - { - struct Curl_sockaddr_ex addr; - char addr_buf[128]; ---- 716,723 ---- - singleipconnect(struct connectdata *conn, - const Curl_addrinfo *ai, - long timeout_ms, -! bool *connected, -! bool *timed_out) - { - struct Curl_sockaddr_ex addr; - char addr_buf[128]; -*************** -*** 730,735 **** ---- 733,740 ---- - struct sockaddr_in6 * const sa6 = (void *)&addr.sa_addr; - #endif - -+ *timed_out = FALSE; -+ - /* - * The Curl_sockaddr_ex structure is basically libcurl's external API - * curl_sockaddr structure with enough space available to directly hold -*************** -*** 880,887 **** - infof(data, "connected\n"); - return sockfd; - } -! else if(WAITCONN_TIMEOUT == rc) - infof(data, "Timeout\n"); - else { - data->state.os_errno = error; - infof(data, "%s\n", Curl_strerror(conn, error)); ---- 885,894 ---- - infof(data, "connected\n"); - return sockfd; - } -! else if(WAITCONN_TIMEOUT == rc) { -! *timed_out = TRUE; - infof(data, "Timeout\n"); -+ } - else { - data->state.os_errno = error; - infof(data, "%s\n", Curl_strerror(conn, error)); -*************** -*** 911,918 **** - int num_addr; - Curl_addrinfo *ai; - Curl_addrinfo *curr_addr; - -- struct timeval after; - struct timeval before = Curl_tvnow(); - - /************************************************************* ---- 918,925 ---- - int num_addr; - Curl_addrinfo *ai; - Curl_addrinfo *curr_addr; -+ bool timed_out; - - struct timeval before = Curl_tvnow(); - - /************************************************************* -*************** -*** 955,973 **** - curr_addr = curr_addr->ai_next, aliasindex++) { - - /* start connecting to the IP curr_addr points to */ -! sockfd = singleipconnect(conn, curr_addr, timeout_per_addr, connected); - - if(sockfd != CURL_SOCKET_BAD) - break; - -! /* get a new timeout for next attempt */ -! after = Curl_tvnow(); -! timeout_ms -= Curl_tvdiff(after, before); -! if(timeout_ms < 0) { - failf(data, "connect() timed out!"); - return CURLE_OPERATION_TIMEDOUT; - } -- before = after; - } /* end of connect-to-each-address loop */ - - *sockconn = sockfd; /* the socket descriptor we've connected */ ---- 962,978 ---- - curr_addr = curr_addr->ai_next, aliasindex++) { - - /* start connecting to the IP curr_addr points to */ -! sockfd = singleipconnect(conn, curr_addr, timeout_per_addr, connected, &timed_out); - - if(sockfd != CURL_SOCKET_BAD) - break; - -! /* if this is the last address and it timed out, propagate the -! timeout to the caller */ -! if(!curr_addr->ai_next && timed_out) { - failf(data, "connect() timed out!"); - return CURLE_OPERATION_TIMEDOUT; - } - } /* end of connect-to-each-address loop */ - - *sockconn = sockfd; /* the socket descriptor we've connected */ diff --git a/pkgs/tools/networking/curl/default.nix b/pkgs/tools/networking/curl/default.nix index 57ce663080a..7aee342f4a3 100644 --- a/pkgs/tools/networking/curl/default.nix +++ b/pkgs/tools/networking/curl/default.nix @@ -10,11 +10,11 @@ assert sslSupport -> openssl != null; assert scpSupport -> libssh2 != null; stdenv.mkDerivation rec { - name = "curl-7.21.0"; + name = "curl-7.22.0"; src = fetchurl { url = "http://curl.haxx.se/download/${name}.tar.bz2"; - sha256 = "1fl7sh38i746b57aqjqjaykwq4rhm2p1phzrgnc2h6wm2k2b95gy"; + sha256 = "04ji7v06f33y6plvikwj283ad6fxxxjpm7as9xw25c924f3dm85x"; }; # Zlib and OpenSSL must be propagated because `libcurl.la' contains @@ -59,17 +59,6 @@ stdenv.mkDerivation rec { substituteInPlace configure --replace /usr/bin /no-such-path ''; - patches = [ - /* Fixes broken retry support when a timeout is used. The - select() system call (used to wait for the connection to come - up) can return slightly before the computed deadline (a few - milliseconds). Curl will think the problem is something else, - proceed with the next IP address (which usually doesn't exist), - then barf with a CURLE_COULDNT_CONNECT error, which is - considered non-transient so it won't retry. */ - ./connect-timeout.patch - ]; - meta = { description = "A command line tool for transferring files with URL syntax"; homepage = http://curl.haxx.se/; From 70035096a596bbfba7e10b81cf2aaa28c21760df Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?= Date: Sat, 5 Nov 2011 18:50:43 +0000 Subject: [PATCH 474/970] Updating our super-old postfix. 2.8.6 builds. I don't know if it serves well. svn path=/nixpkgs/trunk/; revision=30244 --- pkgs/servers/mail/postfix/db-linux3.patch | 39 +++++++++++++++++++++++ pkgs/servers/mail/postfix/default.nix | 14 ++++---- 2 files changed, 46 insertions(+), 7 deletions(-) create mode 100644 pkgs/servers/mail/postfix/db-linux3.patch diff --git a/pkgs/servers/mail/postfix/db-linux3.patch b/pkgs/servers/mail/postfix/db-linux3.patch new file mode 100644 index 00000000000..c9dd4646798 --- /dev/null +++ b/pkgs/servers/mail/postfix/db-linux3.patch @@ -0,0 +1,39 @@ +diff --git a/makedefs b/makedefs +index b8b98c8..94443c0 100644 +--- a/makedefs ++++ b/makedefs +@@ -341,20 +341,20 @@ EOF + esac + ;; + Linux.3*) SYSTYPE=LINUX3 +- if [ -f /usr/include/db.h ] +- then +- : we are all set +- elif [ -f /usr/include/db/db.h ] +- then +- CCARGS="$CCARGS -I/usr/include/db" +- else +- # On a properly installed system, Postfix builds +- # by including and by linking with -ldb +- echo "No include file found." 1>&2 +- echo "Install the appropriate db*-devel package first." 1>&2 +- echo "See the RELEASE_NOTES file for more information." 1>&2 +- exit 1 +- fi ++ #if [ -f /usr/include/db.h ] ++ #then ++ #: we are all set ++ #elif [ -f /usr/include/db/db.h ] ++ #then ++ #CCARGS="$CCARGS -I/usr/include/db" ++ #else ++ ## On a properly installed system, Postfix builds ++ ## by including and by linking with -ldb ++ #echo "No include file found." 1>&2 ++ #echo "Install the appropriate db*-devel package first." 1>&2 ++ #echo "See the RELEASE_NOTES file for more information." 1>&2 ++ #exit 1 ++ #fi + SYSLIBS="-ldb" + for name in nsl resolv + do diff --git a/pkgs/servers/mail/postfix/default.nix b/pkgs/servers/mail/postfix/default.nix index acd3342775f..85dd89f72d7 100644 --- a/pkgs/servers/mail/postfix/default.nix +++ b/pkgs/servers/mail/postfix/default.nix @@ -1,15 +1,15 @@ { stdenv, fetchurl, db4, glibc, openssl, cyrus_sasl -, coreutils, findutils, gnused, gnugrep +, coreutils, findutils, gnused, gnugrep, bison, perl }: assert stdenv.isLinux; stdenv.mkDerivation { - name = "postfix-2.2.11"; + name = "postfix-2.8.6"; src = fetchurl { - url = ftp://ftp.cs.uu.nl/mirror/postfix/postfix-release/official/postfix-2.2.11.tar.gz; - sha256 = "04hxpyd3h1f48fnppjwqqxbil13bcwidzpfkra2pgm7h42d9blq7"; + url = ftp://ftp.cs.uu.nl/mirror/postfix/postfix-release/official/postfix-2.8.6.tar.gz; + sha256 = "1rfsfhna5hy5lc6hkg1zc2862pdc5c1y9z6aiy8rinlmzrfplhlb"; }; installTargets = ["non-interactive-package"]; @@ -43,12 +43,12 @@ stdenv.mkDerivation { export sample_directory=$out/share/postfix/doc/samples export readme_directory=$out/share/postfix/doc - make makefiles CCARGS='-DUSE_TLS -DUSE_SASL_AUTH -DUSE_CYRUS_SASL -DHAS_DB -I${cyrus_sasl}/include/sasl' AUXLIBS='-lssl -lcrypto -lsasl2 -ldb' + make makefiles CCARGS='-DUSE_TLS -DUSE_SASL_AUTH -DUSE_CYRUS_SASL -I${cyrus_sasl}/include/sasl' AUXLIBS='-lssl -lcrypto -lsasl2 -ldb -lnsl' ''; - buildInputs = [db4 openssl cyrus_sasl]; + buildInputs = [db4 openssl cyrus_sasl bison perl]; - patches = [./postfix-2.2.9-db.patch ./postfix-2.2.9-lib.patch]; + patches = [ ./postfix-2.2.9-db.patch ./postfix-2.2.9-lib.patch ./db-linux3.patch ]; inherit glibc; } From 36c0150c1ed085a0b3585dda667635d09f87a6fd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?= Date: Sat, 5 Nov 2011 21:14:30 +0000 Subject: [PATCH 475/970] I think these changes make postfix start again. svn path=/nixpkgs/trunk/; revision=30246 --- pkgs/servers/mail/postfix/default.nix | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/mail/postfix/default.nix b/pkgs/servers/mail/postfix/default.nix index 85dd89f72d7..0fa2bf821a4 100644 --- a/pkgs/servers/mail/postfix/default.nix +++ b/pkgs/servers/mail/postfix/default.nix @@ -26,8 +26,8 @@ stdenv.mkDerivation { mkdir $out/share/postfix/conf cp conf/* $out/share/postfix/conf - sed -e 's@PATH=.*@PATH=${coreutils}/bin:${findutils}/bin:${gnused}/bin:${gnugrep}/bin:$out/sbin@' -i $out/share/postfix/conf/post-install - sed -e '2aPATH=${coreutils}/bin:${findutils}/bin:${gnused}/bin:${gnugrep}/bin:$out/sbin' -i $out/share/postfix/conf/postfix-script + sed -e 's@PATH=.*@PATH=${coreutils}/bin:${findutils}/bin:${gnused}/bin:${gnugrep}/bin:'$out'/sbin@' -i $out/share/postfix/conf/post-install $out/libexec/postfix/post-install + sed -e '2aPATH=${coreutils}/bin:${findutils}/bin:${gnused}/bin:${gnugrep}/bin:'$out'/sbin' -i $out/share/postfix/conf/postfix-script $out/libexec/postfix/postfix-script chmod a+x $out/share/postfix/conf/{postfix-script,post-install} ''; @@ -49,6 +49,12 @@ stdenv.mkDerivation { buildInputs = [db4 openssl cyrus_sasl bison perl]; patches = [ ./postfix-2.2.9-db.patch ./postfix-2.2.9-lib.patch ./db-linux3.patch ]; + + postPatch = '' + sed -i -e s,/usr/bin,/var/run/current-system/sw/bin, \ + -e s,/usr/sbin,/var/run/current-system/sw/sbin, \ + -e s,:/sbin,, src/util/sys_defs.h + ''; inherit glibc; } From 191657885267265e1d19d1044ed6c913df6dfa9c Mon Sep 17 00:00:00 2001 From: Piotr Pietraszkiewicz Date: Sat, 5 Nov 2011 22:12:18 +0000 Subject: [PATCH 476/970] made sword build against current curl (v7.22.0) by removing deprecated includes svn path=/nixpkgs/trunk/; revision=30248 --- pkgs/development/libraries/sword/default.nix | 3 +++ .../sword/dont_include_curl_types_h.patch | 24 +++++++++++++++++++ 2 files changed, 27 insertions(+) create mode 100644 pkgs/development/libraries/sword/dont_include_curl_types_h.patch diff --git a/pkgs/development/libraries/sword/default.nix b/pkgs/development/libraries/sword/default.nix index 06bd5823e87..a3684194c0f 100644 --- a/pkgs/development/libraries/sword/default.nix +++ b/pkgs/development/libraries/sword/default.nix @@ -13,6 +13,9 @@ stdenv.mkDerivation rec { buildInputs = [ pkgconfig icu cluceneCore curl ]; + # because curl/types.h disappeared since at least curl 7.21.7 + patches = [ ./dont_include_curl_types_h.patch ]; + prePatch = '' patchShebangs .; ''; diff --git a/pkgs/development/libraries/sword/dont_include_curl_types_h.patch b/pkgs/development/libraries/sword/dont_include_curl_types_h.patch new file mode 100644 index 00000000000..233d59a3243 --- /dev/null +++ b/pkgs/development/libraries/sword/dont_include_curl_types_h.patch @@ -0,0 +1,24 @@ +diff --git a/src/mgr/curlftpt.cpp b/src/mgr/curlftpt.cpp +index 7d2fd3c..046291e 100644 +--- a/src/mgr/curlftpt.cpp ++++ b/src/mgr/curlftpt.cpp +@@ -26,7 +26,6 @@ + #include + + #include +-#include + #include + + #include +diff --git a/src/mgr/curlhttpt.cpp b/src/mgr/curlhttpt.cpp +index b736050..229d4dd 100644 +--- a/src/mgr/curlhttpt.cpp ++++ b/src/mgr/curlhttpt.cpp +@@ -25,7 +25,6 @@ + #include + + #include +-#include + #include + + #include From 10128798b5570d484cb711a4c2071745da2f6629 Mon Sep 17 00:00:00 2001 From: Alexander Tsamutali Date: Sun, 6 Nov 2011 10:11:31 +0000 Subject: [PATCH 477/970] games/teeworlds: Updated to 0.6.1, added myself as maintainer. svn path=/nixpkgs/trunk/; revision=30259 --- pkgs/games/teeworlds/default.nix | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/pkgs/games/teeworlds/default.nix b/pkgs/games/teeworlds/default.nix index 35b20fff98d..7824fbd9bdf 100644 --- a/pkgs/games/teeworlds/default.nix +++ b/pkgs/games/teeworlds/default.nix @@ -1,11 +1,11 @@ { fetchurl, stdenv, python, alsaLib, libX11, mesa, SDL, lua5, zlib, bam }: stdenv.mkDerivation rec { - name = "teeworlds-0.6.0"; + name = "teeworlds-0.6.1"; src = fetchurl { - url = "http://www.teeworlds.com/files/${name}-src.tar.gz"; - sha256 = "7540ecf10624b7e4e530c44402dc2d162ff40a3fe10bf30e0bb542d3d0a6a721"; + url = "http://www.teeworlds.com/files/${name}-source.tar.gz"; + sha256 = "025rcz59mdqksja4akn888c8avj9j28rk86vw7w1licdp67x8a33"; }; # Note: Teeworlds requires Python 2.x to compile. Python 3.0 will @@ -62,5 +62,7 @@ EOF homepage = http://teeworlds.com/; license = "BSD-style, see `license.txt'"; + maintainers = with stdenv.lib.maintainers; [ astsmtl ]; + platforms = with stdenv.lib.platforms; linux; }; } From 1b9adf9951c3badbc2c5413c22734807af44a248 Mon Sep 17 00:00:00 2001 From: Alexander Tsamutali Date: Sun, 6 Nov 2011 13:54:03 +0000 Subject: [PATCH 478/970] games/xonotic: New nixbuild. svn path=/nixpkgs/trunk/; revision=30260 --- pkgs/games/xonotic/default.nix | 51 +++++++++++++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 53 insertions(+) create mode 100644 pkgs/games/xonotic/default.nix diff --git a/pkgs/games/xonotic/default.nix b/pkgs/games/xonotic/default.nix new file mode 100644 index 00000000000..8ac05d9ef72 --- /dev/null +++ b/pkgs/games/xonotic/default.nix @@ -0,0 +1,51 @@ +{ stdenv, fetchurl, unzip, SDL, libjpeg, zlib, libvorbis, curl }: +stdenv.mkDerivation rec { + name = "xonotic-0.5.0"; + src = fetchurl { + url = "http://dl.xonotic.org/${name}.zip"; + sha256 = "03vkbddffnz6ws3gkwc3qvi6icfsyiqq0dqw2vw5hj2kidm25rsq"; + }; + # Commented out things needed to build cl-release because of errors. + #buildInputs = [ libX11 libXpm libXext xf86dgaproto libXxf86dga libXxf86vm mesa ]; + buildInputs = [ unzip SDL libjpeg ]; + sourceRoot = "Xonotic/source/darkplaces"; + #patchPhase = '' + # substituteInPlace glquake.h \ + # --replace 'typedef char GLchar;' '/*typedef char GLchar;*/' + #''; + NIX_LDFLAGS=" + -rpath ${zlib}/lib + -rpath ${libvorbis}/lib + -rpath ${curl}/lib + "; + buildPhase = '' + DP_FS_BASEDIR="$out/share/xonotic" + #make DP_FS_BASEDIR=$DP_FS_BASEDIR cl-release + make DP_FS_BASEDIR=$DP_FS_BASEDIR sdl-release + make DP_FS_BASEDIR=$DP_FS_BASEDIR sv-release + ''; + installPhase = '' + ensureDir "$out/bin" + cp darkplaces-dedicated "$out/bin/xonotic-dedicated" + cp darkplaces-sdl "$out/bin/xonotic-sdl" + cd ../.. + ensureDir "$out/share/xonotic" + mv data "$out/share/xonotic" + ''; + dontPatchELF = true; + meta = { + description = "A free fast-paced first-person shooter"; + longDescription = '' + Xonotic is a free, fast-paced first-person shooter that works on + Windows, OS X and Linux. The project is geared towards providing + addictive arena shooter gameplay which is all spawned and driven + by the community itself. Xonotic is a direct successor of the + Nexuiz project with years of development between them, and it + aims to become the best possible open-source FPS of its kind. + ''; + homepage = http://www.xonotic.org; + license = with stdenv.lib.licenses; gpl2Plus; + maintainers = with stdenv.lib.maintainers; [ astsmtl ]; + platforms = with stdenv.lib.platforms; linux; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index f366e943d02..d24d24544c7 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -7889,6 +7889,8 @@ let # TODO: the corresponding nix file is missing # xracer = callPackage ../games/xracer { }; + xonotic = callPackage ../games/xonotic { }; + xsokoban = builderDefsPackage (import ../games/xsokoban) { inherit (xlibs) libX11 xproto libXpm libXt; }; From 25d6f604bb282b53759c1adc9a52c360ec37d49c Mon Sep 17 00:00:00 2001 From: Rob Vermaas Date: Sun, 6 Nov 2011 14:26:55 +0000 Subject: [PATCH 479/970] add patches for libofa and libtunepipe due to remove curl/types.h in new curl svn path=/nixpkgs/trunk/; revision=30261 --- .../libraries/libofa/curl-types.patch | 13 + pkgs/development/libraries/libofa/default.nix | 2 +- .../libraries/libtunepimp/gcc-4.x.patch | 414 ++++++++++-------- 3 files changed, 251 insertions(+), 178 deletions(-) create mode 100644 pkgs/development/libraries/libofa/curl-types.patch diff --git a/pkgs/development/libraries/libofa/curl-types.patch b/pkgs/development/libraries/libofa/curl-types.patch new file mode 100644 index 00000000000..acd8d9aeabb --- /dev/null +++ b/pkgs/development/libraries/libofa/curl-types.patch @@ -0,0 +1,13 @@ +diff -rc libofa-0.9.3/examples/protocol.cpp libofa-0.9.3-new/examples/protocol.cpp +*** libofa-0.9.3/examples/protocol.cpp 2006-05-10 14:05:42.000000000 -0400 +--- libofa-0.9.3-new/examples/protocol.cpp 2011-11-06 09:24:05.653283203 -0500 +*************** +*** 12,18 **** + #include + #include + #include +- #include + #include + + using namespace std; +--- 12,17 ---- diff --git a/pkgs/development/libraries/libofa/default.nix b/pkgs/development/libraries/libofa/default.nix index 437726d6976..6b1ceee40f1 100644 --- a/pkgs/development/libraries/libofa/default.nix +++ b/pkgs/development/libraries/libofa/default.nix @@ -5,7 +5,7 @@ stdenv.mkDerivation rec { propagatedBuildInputs = [ expat curl fftw ]; - patches = [ ./libofa-0.9.3-gcc-4.patch ./libofa-0.9.3-gcc-4.3.patch ./gcc-4.x.patch ]; + patches = [ ./libofa-0.9.3-gcc-4.patch ./libofa-0.9.3-gcc-4.3.patch ./gcc-4.x.patch ./curl-types.patch ]; src = fetchurl { url = "http://musicip-libofa.googlecode.com/files/${name}.tar.gz"; diff --git a/pkgs/development/libraries/libtunepimp/gcc-4.x.patch b/pkgs/development/libraries/libtunepimp/gcc-4.x.patch index 92219ea6f9b..aed742b0490 100644 --- a/pkgs/development/libraries/libtunepimp/gcc-4.x.patch +++ b/pkgs/development/libraries/libtunepimp/gcc-4.x.patch @@ -1,177 +1,237 @@ -diff --git a/include/tunepimp-0.5/metadata.h b/include/tunepimp-0.5/metadata.h -index f9bab5d..ea08cf5 100644 ---- a/include/tunepimp-0.5/metadata.h -+++ b/include/tunepimp-0.5/metadata.h -@@ -29,6 +29,7 @@ - - #include - #include -+#include - - #include "defs.h" - #include "tp_c.h" -diff --git a/lib/c_wrapper.cpp b/lib/c_wrapper.cpp -index 760cc08..66c6111 100644 ---- a/lib/c_wrapper.cpp -+++ b/lib/c_wrapper.cpp -@@ -43,6 +43,7 @@ - if (obj == NULL) return; - - #include -+#include - - class NotifyData - { -diff --git a/lib/fileio.cpp b/lib/fileio.cpp -index a1602da..abe2b24 100644 ---- a/lib/fileio.cpp -+++ b/lib/fileio.cpp -@@ -27,6 +27,8 @@ - - #include - #include -+#include -+#include - #include - #ifndef WIN32 - #include -@@ -122,7 +124,8 @@ int taccess(const char *pathname, int mode, const char *encoding) - - void tmktempname(const char *path, char *newPath, int newPathLen) - { -- char *ptr, *temp; -+ char *temp; -+ const char *ptr; - - temp = (char *)malloc(strlen(path) + 32); - ptr = strrchr(path, dirSepChar); -diff --git a/lib/metadata.cpp b/lib/metadata.cpp -index 0a1a70a..dcd0aa1 100644 ---- a/lib/metadata.cpp -+++ b/lib/metadata.cpp -@@ -24,8 +24,9 @@ - $Id: metadata.cpp 8359 2006-08-07 20:34:50Z luks $ - - ----------------------------------------------------------------------------*/ --#include --#include -+#include -+#include -+#include - #include "metadata.h" - #include "../config.h" - using namespace std; -diff --git a/lib/protocol.cpp b/lib/protocol.cpp -index 83e8b33..3436f80 100644 ---- a/lib/protocol.cpp -+++ b/lib/protocol.cpp -@@ -8,6 +8,7 @@ - -------------------------------------------------------------------*/ - #include - #include -+#include - #include - #include - #include -diff --git a/lib/readmeta.cpp b/lib/readmeta.cpp -index 7f325de..5e5513a 100644 ---- a/lib/readmeta.cpp -+++ b/lib/readmeta.cpp -@@ -30,7 +30,8 @@ - #endif - #endif - --#include -+#include -+#include - #ifndef WIN32 - #include - #endif -diff --git a/lib/tunepimp.cpp b/lib/tunepimp.cpp -index bf09383..f1b9b56 100644 ---- a/lib/tunepimp.cpp -+++ b/lib/tunepimp.cpp -@@ -30,7 +30,8 @@ - #endif - #endif - --#include -+#include -+#include - #include - using namespace std; - -diff --git a/lib/utf8/utf8util.cpp b/lib/utf8/utf8util.cpp -index a066956..6ea86e4 100644 ---- a/lib/utf8/utf8util.cpp -+++ b/lib/utf8/utf8util.cpp -@@ -26,6 +26,7 @@ - ----------------------------------------------------------------------------*/ - - #include -+#include - #include "utf8util.h" - #include "utf8.h" - #ifdef WIN32 -diff --git a/plugins/mp3/id3_2_3_meta.cpp b/plugins/mp3/id3_2_3_meta.cpp -index fa9a7e0..efac1c9 100644 ---- a/plugins/mp3/id3_2_3_meta.cpp -+++ b/plugins/mp3/id3_2_3_meta.cpp -@@ -26,6 +26,7 @@ - ----------------------------------------------------------------------------*/ - - #include -+#include - #include - #include - #include -diff --git a/plugins/mp3/id3_meta.cpp b/plugins/mp3/id3_meta.cpp -index d860bf6..804ca5c 100644 ---- a/plugins/mp3/id3_meta.cpp -+++ b/plugins/mp3/id3_meta.cpp -@@ -26,6 +26,7 @@ - ----------------------------------------------------------------------------*/ - - #include -+#include - #include - #include - #include -diff --git a/plugins/mp4/mp4.cpp b/plugins/mp4/mp4.cpp -index 9f741e3..dcc7ec9 100644 ---- a/plugins/mp4/mp4.cpp -+++ b/plugins/mp4/mp4.cpp -@@ -27,7 +27,8 @@ - - #include - #include --#include -+#include -+#include - #include "metadata.h" - #include "plugin.h" - #ifndef WIN32 -diff --git a/plugins/wma/wma.cpp b/plugins/wma/wma.cpp -index 3d7a50a..a28901c 100644 ---- a/plugins/wma/wma.cpp -+++ b/plugins/wma/wma.cpp -@@ -27,6 +27,7 @@ - - #include - #include -+#include - #include - #include "metadata.h" - #include "plugin.h" -diff --git a/plugins/wma/wmafile.cpp b/plugins/wma/wmafile.cpp -index 1b38af8..31fa150 100644 ---- a/plugins/wma/wmafile.cpp -+++ b/plugins/wma/wmafile.cpp -@@ -19,6 +19,7 @@ - * USA * - ***************************************************************************/ - -+#include - #include - #include - #include +diff -rc libtunepimp-0.5.3/include/tunepimp-0.5/metadata.h libtunepimp-0.5.3-new/include/tunepimp-0.5/metadata.h +*** libtunepimp-0.5.3/include/tunepimp-0.5/metadata.h 2006-11-18 05:52:08.000000000 -0500 +--- libtunepimp-0.5.3-new/include/tunepimp-0.5/metadata.h 2011-11-06 09:00:14.816684749 -0500 +*************** +*** 29,34 **** +--- 29,35 ---- + + #include + #include ++ #include + + #include "defs.h" + #include "tp_c.h" +diff -rc libtunepimp-0.5.3/lib/c_wrapper.cpp libtunepimp-0.5.3-new/lib/c_wrapper.cpp +*** libtunepimp-0.5.3/lib/c_wrapper.cpp 2006-11-18 05:52:33.000000000 -0500 +--- libtunepimp-0.5.3-new/lib/c_wrapper.cpp 2011-11-06 09:00:14.816684749 -0500 +*************** +*** 43,48 **** +--- 43,49 ---- + if (obj == NULL) return; + + #include ++ #include + + class NotifyData + { +diff -rc libtunepimp-0.5.3/lib/fileio.cpp libtunepimp-0.5.3-new/lib/fileio.cpp +*** libtunepimp-0.5.3/lib/fileio.cpp 2006-11-18 05:52:33.000000000 -0500 +--- libtunepimp-0.5.3-new/lib/fileio.cpp 2011-11-06 09:00:14.816684749 -0500 +*************** +*** 27,32 **** +--- 27,34 ---- + + #include + #include ++ #include ++ #include + #include + #ifndef WIN32 + #include +*************** +*** 122,128 **** + + void tmktempname(const char *path, char *newPath, int newPathLen) + { +! char *ptr, *temp; + + temp = (char *)malloc(strlen(path) + 32); + ptr = strrchr(path, dirSepChar); +--- 124,131 ---- + + void tmktempname(const char *path, char *newPath, int newPathLen) + { +! char *temp; +! const char *ptr; + + temp = (char *)malloc(strlen(path) + 32); + ptr = strrchr(path, dirSepChar); +diff -rc libtunepimp-0.5.3/lib/metadata.cpp libtunepimp-0.5.3-new/lib/metadata.cpp +*** libtunepimp-0.5.3/lib/metadata.cpp 2006-11-18 05:52:33.000000000 -0500 +--- libtunepimp-0.5.3-new/lib/metadata.cpp 2011-11-06 09:00:14.817684754 -0500 +*************** +*** 24,31 **** + $Id: metadata.cpp 8359 2006-08-07 20:34:50Z luks $ + + ----------------------------------------------------------------------------*/ +! #include +! #include + #include "metadata.h" + #include "../config.h" + using namespace std; +--- 24,32 ---- + $Id: metadata.cpp 8359 2006-08-07 20:34:50Z luks $ + + ----------------------------------------------------------------------------*/ +! #include +! #include +! #include + #include "metadata.h" + #include "../config.h" + using namespace std; +diff -rc libtunepimp-0.5.3/lib/protocol.cpp libtunepimp-0.5.3-new/lib/protocol.cpp +*** libtunepimp-0.5.3/lib/protocol.cpp 2006-11-28 15:25:04.000000000 -0500 +--- libtunepimp-0.5.3-new/lib/protocol.cpp 2011-11-06 09:00:23.281742454 -0500 +*************** +*** 8,18 **** + -------------------------------------------------------------------*/ + #include + #include + #include + #include + #include + #include +- #include + #include + using namespace std; + +--- 8,18 ---- + -------------------------------------------------------------------*/ + #include + #include ++ #include + #include + #include + #include + #include + #include + using namespace std; + +diff -rc libtunepimp-0.5.3/lib/readmeta.cpp libtunepimp-0.5.3-new/lib/readmeta.cpp +*** libtunepimp-0.5.3/lib/readmeta.cpp 2006-11-18 05:52:33.000000000 -0500 +--- libtunepimp-0.5.3-new/lib/readmeta.cpp 2011-11-06 09:00:14.817684754 -0500 +*************** +*** 30,36 **** + #endif + #endif + +! #include + #ifndef WIN32 + #include + #endif +--- 30,37 ---- + #endif + #endif + +! #include +! #include + #ifndef WIN32 + #include + #endif +diff -rc libtunepimp-0.5.3/lib/tunepimp.cpp libtunepimp-0.5.3-new/lib/tunepimp.cpp +*** libtunepimp-0.5.3/lib/tunepimp.cpp 2006-11-18 05:52:33.000000000 -0500 +--- libtunepimp-0.5.3-new/lib/tunepimp.cpp 2011-11-06 09:00:14.818684760 -0500 +*************** +*** 30,36 **** + #endif + #endif + +! #include + #include + using namespace std; + +--- 30,37 ---- + #endif + #endif + +! #include +! #include + #include + using namespace std; + +diff -rc libtunepimp-0.5.3/lib/utf8/utf8util.cpp libtunepimp-0.5.3-new/lib/utf8/utf8util.cpp +*** libtunepimp-0.5.3/lib/utf8/utf8util.cpp 2006-11-18 05:52:26.000000000 -0500 +--- libtunepimp-0.5.3-new/lib/utf8/utf8util.cpp 2011-11-06 09:00:14.818684760 -0500 +*************** +*** 26,31 **** +--- 26,32 ---- + ----------------------------------------------------------------------------*/ + + #include ++ #include + #include "utf8util.h" + #include "utf8.h" + #ifdef WIN32 +diff -rc libtunepimp-0.5.3/plugins/mp3/id3_2_3_meta.cpp libtunepimp-0.5.3-new/plugins/mp3/id3_2_3_meta.cpp +*** libtunepimp-0.5.3/plugins/mp3/id3_2_3_meta.cpp 2006-11-18 05:51:07.000000000 -0500 +--- libtunepimp-0.5.3-new/plugins/mp3/id3_2_3_meta.cpp 2011-11-06 09:00:14.818684760 -0500 +*************** +*** 26,31 **** +--- 26,32 ---- + ----------------------------------------------------------------------------*/ + + #include ++ #include + #include + #include + #include +diff -rc libtunepimp-0.5.3/plugins/mp3/id3_meta.cpp libtunepimp-0.5.3-new/plugins/mp3/id3_meta.cpp +*** libtunepimp-0.5.3/plugins/mp3/id3_meta.cpp 2006-11-18 05:51:07.000000000 -0500 +--- libtunepimp-0.5.3-new/plugins/mp3/id3_meta.cpp 2011-11-06 09:00:14.818684760 -0500 +*************** +*** 26,31 **** +--- 26,32 ---- + ----------------------------------------------------------------------------*/ + + #include ++ #include + #include + #include + #include +diff -rc libtunepimp-0.5.3/plugins/mp4/mp4.cpp libtunepimp-0.5.3-new/plugins/mp4/mp4.cpp +*** libtunepimp-0.5.3/plugins/mp4/mp4.cpp 2006-11-18 05:51:08.000000000 -0500 +--- libtunepimp-0.5.3-new/plugins/mp4/mp4.cpp 2011-11-06 09:00:14.819684766 -0500 +*************** +*** 27,33 **** + + #include + #include +! #include + #include "metadata.h" + #include "plugin.h" + #ifndef WIN32 +--- 27,34 ---- + + #include + #include +! #include +! #include + #include "metadata.h" + #include "plugin.h" + #ifndef WIN32 +diff -rc libtunepimp-0.5.3/plugins/wma/wma.cpp libtunepimp-0.5.3-new/plugins/wma/wma.cpp +*** libtunepimp-0.5.3/plugins/wma/wma.cpp 2006-11-18 05:51:28.000000000 -0500 +--- libtunepimp-0.5.3-new/plugins/wma/wma.cpp 2011-11-06 09:00:14.819684766 -0500 +*************** +*** 27,32 **** +--- 27,33 ---- + + #include + #include ++ #include + #include + #include "metadata.h" + #include "plugin.h" +diff -rc libtunepimp-0.5.3/plugins/wma/wmafile.cpp libtunepimp-0.5.3-new/plugins/wma/wmafile.cpp +*** libtunepimp-0.5.3/plugins/wma/wmafile.cpp 2006-11-18 05:51:28.000000000 -0500 +--- libtunepimp-0.5.3-new/plugins/wma/wmafile.cpp 2011-11-06 09:00:14.819684766 -0500 +*************** +*** 19,24 **** +--- 19,25 ---- + * USA * + ***************************************************************************/ + ++ #include + #include + #include + #include From 83acc83fb71e6a2176eb452f118bef5204bb60a1 Mon Sep 17 00:00:00 2001 From: Shea Levy Date: Sun, 6 Nov 2011 17:08:05 +0000 Subject: [PATCH 480/970] Reenable grub2_efi svn path=/nixpkgs/trunk/; revision=30262 --- pkgs/tools/misc/grub/1.9x.nix | 8 ++++++-- pkgs/top-level/all-packages.nix | 2 +- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/misc/grub/1.9x.nix b/pkgs/tools/misc/grub/1.9x.nix index 59c490b810c..14a4932f100 100644 --- a/pkgs/tools/misc/grub/1.9x.nix +++ b/pkgs/tools/misc/grub/1.9x.nix @@ -77,7 +77,11 @@ stdenv.mkDerivation rec { license = "GPLv3+"; - maintainers = [ stdenv.lib.maintainers.ludo ]; - platforms = stdenv.lib.platforms.gnu; + maintainers = with stdenv.lib.maintainers; [ ludo shlevy ]; + + platforms = if EFIsupport then + [ "i686-linux" "x86_64-linux" ] + else + stdenv.lib.platforms.gnu; }; } diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index d24d24544c7..fce97d6030b 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -789,7 +789,7 @@ let grub2 = grub19x; - # grub2_efi = callPackage ../tools/misc/grub/1.9x.nix { EFIsupport = true; }; + grub2_efi = callPackage ../tools/misc/grub/1.9x.nix { EFIsupport = true; }; gssdp = callPackage ../development/libraries/gssdp { inherit (gnome) libsoup; From 5e5dd168427a85851428774f7ba8a33cdd0fb222 Mon Sep 17 00:00:00 2001 From: Shea Levy Date: Sun, 6 Nov 2011 17:38:51 +0000 Subject: [PATCH 481/970] Remove the efi stub patch svn path=/nixpkgs/trunk/; revision=30264 --- pkgs/os-specific/linux/kernel/efi-stub.patch | 1778 ------------------ pkgs/os-specific/linux/kernel/patches.nix | 9 - pkgs/top-level/all-packages.nix | 1 - 3 files changed, 1788 deletions(-) delete mode 100644 pkgs/os-specific/linux/kernel/efi-stub.patch diff --git a/pkgs/os-specific/linux/kernel/efi-stub.patch b/pkgs/os-specific/linux/kernel/efi-stub.patch deleted file mode 100644 index 581a9fff27f..00000000000 --- a/pkgs/os-specific/linux/kernel/efi-stub.patch +++ /dev/null @@ -1,1778 +0,0 @@ -diff --git a/arch/x86/Kconfig b/arch/x86/Kconfig -index 6a47bb2..d40c876 100644 ---- a/arch/x86/Kconfig -+++ b/arch/x86/Kconfig -@@ -1466,6 +1466,13 @@ config EFI - resultant kernel should continue to boot on existing non-EFI - platforms. - -+config EFI_STUB -+ bool "EFI stub support" -+ depends on EFI -+ ---help--- -+ This kernel feature allows a bzImage to be loaded directly -+ by EFI firmware without the use of a bootloader. -+ - config SECCOMP - def_bool y - prompt "Enable seccomp to safely compute untrusted bytecode" -diff --git a/arch/x86/boot/compressed/Makefile b/arch/x86/boot/compressed/Makefile -index 09664ef..b123b9a 100644 ---- a/arch/x86/boot/compressed/Makefile -+++ b/arch/x86/boot/compressed/Makefile -@@ -23,7 +23,15 @@ LDFLAGS_vmlinux := -T - - hostprogs-y := mkpiggy - --$(obj)/vmlinux: $(obj)/vmlinux.lds $(obj)/head_$(BITS).o $(obj)/misc.o $(obj)/string.o $(obj)/cmdline.o $(obj)/early_serial_console.o $(obj)/piggy.o FORCE -+VMLINUX_OBJS = $(obj)/vmlinux.lds $(obj)/head_$(BITS).o $(obj)/misc.o \ -+ $(obj)/string.o $(obj)/cmdline.o $(obj)/early_serial_console.o \ -+ $(obj)/piggy.o -+ -+ifeq ($(CONFIG_EFI_STUB), y) -+ VMLINUX_OBJS += $(obj)/eboot.o $(obj)/efi_stub_$(BITS).o -+endif -+ -+$(obj)/vmlinux: $(VMLINUX_OBJS) FORCE - $(call if_changed,ld) - @: - -diff --git a/arch/x86/boot/compressed/eboot.c b/arch/x86/boot/compressed/eboot.c -new file mode 100644 -index 0000000..c1b494d ---- /dev/null -+++ b/arch/x86/boot/compressed/eboot.c -@@ -0,0 +1,975 @@ -+/* ----------------------------------------------------------------------- -+ * -+ * Copyright 2011 Intel Corporation; author Matt Fleming -+ * -+ * This file is part of the Linux kernel, and is made available under -+ * the terms of the GNU General Public License version 2. -+ * -+ * ----------------------------------------------------------------------- */ -+ -+#include -+#include -+#include -+#include -+ -+#define SEG_TYPE_DATA (0 << 3) -+#define SEG_TYPE_READ_WRITE (1 << 1) -+#define SEG_TYPE_CODE (1 << 3) -+#define SEG_TYPE_EXEC_READ (1 << 1) -+#define SEG_TYPE_TSS ((1 << 3) | (1 << 0)) -+#define SEG_OP_SIZE_32BIT (1 << 0) -+#define SEG_GRANULARITY_4KB (1 << 0) -+ -+#define DESC_TYPE_CODE_DATA (1 << 0) -+ -+#define EFI_PAGE_SIZE (1UL << EFI_PAGE_SHIFT) -+ -+#define PIXEL_RGB_RESERVED_8BIT_PER_COLOR 0 -+#define PIXEL_BGR_RESERVED_8BIT_PER_COLOR 1 -+#define PIXEL_BIT_MASK 2 -+#define PIXEL_BLT_ONLY 3 -+#define PIXEL_FORMAT_MAX 4 -+ -+typedef struct { -+ u32 red_mask; -+ u32 green_mask; -+ u32 blue_mask; -+ u32 reserved_mask; -+} efi_pixel_bitmask_t; -+ -+typedef struct { -+ u32 version; -+ u32 horizontal_resolution; -+ u32 vertical_resolution; -+ int pixel_format; -+ efi_pixel_bitmask_t pixel_information; -+ u32 pixels_per_scan_line; -+} __attribute__((packed)) efi_graphics_output_mode_information_t; -+ -+typedef struct { -+ u32 max_mode; -+ u32 mode; -+ unsigned long info; -+ unsigned long size_of_info; -+ u64 frame_buffer_base; -+ unsigned long frame_buffer_size; -+} __attribute__((packed)) efi_graphics_output_protocol_mode_t; -+ -+typedef struct { -+ void *query_mode; -+ unsigned long set_mode; -+ unsigned long blt; -+ efi_graphics_output_protocol_mode_t *mode; -+} efi_graphics_output_protocol_t; -+ -+typedef struct { -+ void *get_mode; -+ void *set_mode; -+ void *blt; -+} efi_uga_draw_protocol_t; -+ -+static efi_system_table_t *sys_table; -+ -+static efi_status_t low_alloc(unsigned long size, unsigned long align, -+ unsigned long *addr) -+{ -+ unsigned long map_size, key, desc_size; -+ efi_memory_desc_t *map; -+ efi_status_t status; -+ unsigned long nr_pages; -+ u32 desc_version; -+ int i; -+ -+ nr_pages = round_up(size, EFI_PAGE_SIZE) / EFI_PAGE_SIZE; -+ -+ map_size = sizeof(*map) * 32; -+ -+again: -+ /* -+ * Add an additional efi_memory_desc_t because we're doing an -+ * allocation which may be in a new descriptor region. -+ */ -+ map_size += sizeof(*map); -+ status = efi_call_phys3(sys_table->boottime->allocate_pool, -+ EFI_LOADER_DATA, map_size, (void **)&map); -+ if (status != EFI_SUCCESS) -+ goto fail; -+ -+ status = efi_call_phys5(sys_table->boottime->get_memory_map, &map_size, -+ map, &key, &desc_size, &desc_version); -+ if (status == EFI_BUFFER_TOO_SMALL) { -+ efi_call_phys1(sys_table->boottime->free_pool, map); -+ goto again; -+ } -+ -+ if (status != EFI_SUCCESS) -+ goto free_pool; -+ -+ for (i = 0; i < map_size / desc_size; i++) { -+ efi_memory_desc_t *desc; -+ u64 start, end; -+ -+ desc = (efi_memory_desc_t *)((unsigned long)map + (i * desc_size)); -+ -+ if (desc->type != EFI_CONVENTIONAL_MEMORY) -+ continue; -+ -+ if (desc->num_pages < nr_pages) -+ continue; -+ -+ start = desc->phys_addr; -+ end = start + desc->num_pages * (1UL << EFI_PAGE_SHIFT); -+ -+ /* -+ * Don't allocate at 0x0. It will confuse code that -+ * checks pointers against NULL. Skip the first 8 -+ * bytes so we start at a nice even number. -+ */ -+ if (start == 0x0) { -+ start += 8; -+ -+ /* Check for tiny memory regions */ -+ if (start >= end) -+ continue; -+ } -+ -+ start = round_up(start, align); -+ if ((start + size) > end) -+ continue; -+ -+ status = efi_call_phys4(sys_table->boottime->allocate_pages, -+ EFI_ALLOCATE_ADDRESS, EFI_LOADER_DATA, -+ nr_pages, &start); -+ if (status == EFI_SUCCESS) { -+ *addr = start; -+ break; -+ } -+ } -+ -+ if (i == map_size / desc_size) -+ status = EFI_NOT_FOUND; -+ -+free_pool: -+ efi_call_phys1(sys_table->boottime->free_pool, map); -+fail: -+ return status; -+} -+ -+static void low_free(unsigned long size, unsigned long addr) -+{ -+ unsigned long nr_pages; -+ -+ nr_pages = round_up(size, EFI_PAGE_SIZE) / EFI_PAGE_SIZE; -+ efi_call_phys2(sys_table->boottime->free_pages, addr, size); -+} -+ -+static void find_bits(unsigned long mask, u8 *pos, u8 *size) -+{ -+ u8 first, len; -+ -+ first = 0; -+ len = 0; -+ -+ if (mask) { -+ while (!(mask & 0x1)) { -+ mask = mask >> 1; -+ first++; -+ } -+ -+ while (mask & 0x1) { -+ mask = mask >> 1; -+ len++; -+ } -+ } -+ -+ *pos = first; -+ *size = len; -+} -+ -+/* -+ * See if we have Graphics Output Protocol -+ */ -+static efi_status_t setup_gop(struct screen_info *si, efi_guid_t *proto, -+ unsigned long size) -+{ -+ efi_graphics_output_protocol_t *gop, *first_gop; -+ efi_pixel_bitmask_t pixel_info; -+ unsigned long nr_gops; -+ efi_status_t status; -+ void **gop_handle; -+ u16 width, height; -+ u32 fb_base, fb_size; -+ u32 pixels_per_scan_line; -+ int pixel_format; -+ int i; -+ -+ status = efi_call_phys3(sys_table->boottime->allocate_pool, -+ EFI_LOADER_DATA, size, &gop_handle); -+ if (status != EFI_SUCCESS) -+ return status; -+ -+ status = efi_call_phys5(sys_table->boottime->locate_handle, -+ EFI_LOCATE_BY_PROTOCOL, proto, -+ NULL, &size, gop_handle); -+ if (status != EFI_SUCCESS) -+ goto free_handle; -+ -+ first_gop = NULL; -+ -+ nr_gops = size / sizeof(void *); -+ for (i = 0; i < nr_gops; i++) { -+ efi_graphics_output_mode_information_t *info; -+ efi_guid_t pciio_proto = EFI_PCI_IO_PROTOCOL_GUID; -+ void *pciio; -+ void *h = gop_handle[i]; -+ -+ status = efi_call_phys3(sys_table->boottime->handle_protocol, -+ h, proto, &gop); -+ if (status != EFI_SUCCESS) -+ continue; -+ -+ efi_call_phys3(sys_table->boottime->handle_protocol, -+ h, &pciio_proto, &pciio); -+ -+ status = efi_call_phys4(gop->query_mode, gop, -+ gop->mode->mode, &size, &info); -+ if (status == EFI_SUCCESS && (!first_gop || pciio)) { -+ /* -+ * Apple provide GOPs that are not backed by -+ * real hardware (they're used to handle -+ * multiple displays). The workaround is to -+ * search for a GOP implementing the PCIIO -+ * protocol, and if one isn't found, to just -+ * fallback to the first GOP. -+ */ -+ width = info->horizontal_resolution; -+ height = info->vertical_resolution; -+ fb_base = gop->mode->frame_buffer_base; -+ fb_size = gop->mode->frame_buffer_size; -+ pixel_format = info->pixel_format; -+ pixel_info = info->pixel_information; -+ pixels_per_scan_line = info->pixels_per_scan_line; -+ -+ /* -+ * Once we've found a GOP supporting PCIIO, -+ * don't bother looking any further. -+ */ -+ if (pciio) -+ break; -+ -+ first_gop = gop; -+ } -+ } -+ -+ /* Did we find any GOPs? */ -+ if (!first_gop) -+ goto free_handle; -+ -+ /* EFI framebuffer */ -+ si->orig_video_isVGA = VIDEO_TYPE_EFI; -+ -+ si->lfb_width = width; -+ si->lfb_height = height; -+ si->lfb_base = fb_base; -+ si->lfb_size = fb_size; -+ si->pages = 1; -+ -+ if (pixel_format == PIXEL_RGB_RESERVED_8BIT_PER_COLOR) { -+ si->lfb_depth = 32; -+ si->lfb_linelength = pixels_per_scan_line * 4; -+ si->red_size = 8; -+ si->red_pos = 0; -+ si->green_size = 8; -+ si->green_pos = 8; -+ si->blue_size = 8; -+ si->blue_pos = 16; -+ si->rsvd_size = 8; -+ si->rsvd_pos = 24; -+ } else if (pixel_format == PIXEL_BGR_RESERVED_8BIT_PER_COLOR) { -+ si->lfb_depth = 32; -+ si->lfb_linelength = pixels_per_scan_line * 4; -+ si->red_size = 8; -+ si->red_pos = 16; -+ si->green_size = 8; -+ si->green_pos = 8; -+ si->blue_size = 8; -+ si->blue_pos = 0; -+ si->rsvd_size = 8; -+ si->rsvd_pos = 24; -+ } else if (pixel_format == PIXEL_BIT_MASK) { -+ find_bits(pixel_info.red_mask, &si->red_pos, &si->red_size); -+ find_bits(pixel_info.green_mask, &si->green_pos, -+ &si->green_size); -+ find_bits(pixel_info.blue_mask, &si->blue_pos, &si->blue_size); -+ find_bits(pixel_info.reserved_mask, &si->rsvd_pos, -+ &si->rsvd_size); -+ si->lfb_depth = si->red_size + si->green_size + -+ si->blue_size + si->rsvd_size; -+ si->lfb_linelength = (pixels_per_scan_line * si->lfb_depth) / 8; -+ } else { -+ si->lfb_depth = 4; -+ si->lfb_linelength = si->lfb_width / 2; -+ si->red_size = 0; -+ si->red_pos = 0; -+ si->green_size = 0; -+ si->green_pos = 0; -+ si->blue_size = 0; -+ si->blue_pos = 0; -+ si->rsvd_size = 0; -+ si->rsvd_pos = 0; -+ } -+ -+free_handle: -+ efi_call_phys1(sys_table->boottime->free_pool, gop_handle); -+ return status; -+} -+ -+/* -+ * See if we have Universal Graphics Adapter (UGA) protocol -+ */ -+static efi_status_t setup_uga(struct screen_info *si, efi_guid_t *uga_proto, -+ unsigned long size) -+{ -+ efi_uga_draw_protocol_t *uga, *first_uga; -+ unsigned long nr_ugas; -+ efi_status_t status; -+ u32 width, height; -+ void **uga_handle = NULL; -+ int i; -+ -+ status = efi_call_phys3(sys_table->boottime->allocate_pool, -+ EFI_LOADER_DATA, size, &uga_handle); -+ if (status != EFI_SUCCESS) -+ return status; -+ -+ status = efi_call_phys5(sys_table->boottime->locate_handle, -+ EFI_LOCATE_BY_PROTOCOL, uga_proto, -+ NULL, &size, uga_handle); -+ if (status != EFI_SUCCESS) -+ goto free_handle; -+ -+ first_uga = NULL; -+ -+ nr_ugas = size / sizeof(void *); -+ for (i = 0; i < nr_ugas; i++) { -+ efi_guid_t pciio_proto = EFI_PCI_IO_PROTOCOL_GUID; -+ void *handle = uga_handle[i]; -+ u32 w, h, depth, refresh; -+ void *pciio; -+ -+ status = efi_call_phys3(sys_table->boottime->handle_protocol, -+ handle, uga_proto, &uga); -+ if (status != EFI_SUCCESS) -+ continue; -+ -+ efi_call_phys3(sys_table->boottime->handle_protocol, -+ handle, &pciio_proto, &pciio); -+ -+ status = efi_call_phys5(uga->get_mode, uga, &w, &h, -+ &depth, &refresh); -+ if (status == EFI_SUCCESS && (!first_uga || pciio)) { -+ width = w; -+ height = h; -+ -+ /* -+ * Once we've found a UGA supporting PCIIO, -+ * don't bother looking any further. -+ */ -+ if (pciio) -+ break; -+ -+ first_uga = uga; -+ } -+ } -+ -+ if (!first_uga) -+ goto free_handle; -+ -+ /* EFI framebuffer */ -+ si->orig_video_isVGA = VIDEO_TYPE_EFI; -+ -+ si->lfb_depth = 32; -+ si->lfb_width = width; -+ si->lfb_height = height; -+ -+ si->red_size = 8; -+ si->red_pos = 16; -+ si->green_size = 8; -+ si->green_pos = 8; -+ si->blue_size = 8; -+ si->blue_pos = 0; -+ si->rsvd_size = 8; -+ si->rsvd_pos = 24; -+ -+ -+free_handle: -+ efi_call_phys1(sys_table->boottime->free_pool, uga_handle); -+ return status; -+} -+ -+void setup_graphics(struct boot_params *boot_params) -+{ -+ efi_guid_t graphics_proto = EFI_GRAPHICS_OUTPUT_PROTOCOL_GUID; -+ struct screen_info *si; -+ efi_guid_t uga_proto = EFI_UGA_PROTOCOL_GUID; -+ efi_status_t status; -+ unsigned long size; -+ void **gop_handle = NULL; -+ void **uga_handle = NULL; -+ -+ si = &boot_params->screen_info; -+ memset(si, 0, sizeof(*si)); -+ -+ size = 0; -+ status = efi_call_phys5(sys_table->boottime->locate_handle, -+ EFI_LOCATE_BY_PROTOCOL, &graphics_proto, -+ NULL, &size, gop_handle); -+ if (status == EFI_BUFFER_TOO_SMALL) -+ status = setup_gop(si, &graphics_proto, size); -+ -+ if (status != EFI_SUCCESS) { -+ size = 0; -+ status = efi_call_phys5(sys_table->boottime->locate_handle, -+ EFI_LOCATE_BY_PROTOCOL, &uga_proto, -+ NULL, &size, uga_handle); -+ if (status == EFI_BUFFER_TOO_SMALL) -+ setup_uga(si, &uga_proto, size); -+ } -+} -+ -+struct initrd { -+ efi_file_handle_t *handle; -+ u64 size; -+}; -+ -+/* -+ * Check the cmdline for a LILO-style initrd= arguments. -+ * -+ * We only support loading an initrd from the same filesystem as the -+ * kernel image. -+ */ -+static efi_status_t handle_ramdisks(efi_loaded_image_t *image, -+ struct setup_header *hdr) -+{ -+ struct initrd *initrds; -+ unsigned long initrd_addr; -+ efi_guid_t fs_proto = EFI_FILE_SYSTEM_GUID; -+ u64 initrd_total; -+ efi_file_io_interface_t *io; -+ efi_file_handle_t *fh; -+ efi_status_t status; -+ int nr_initrds; -+ char *str; -+ int i, j, k; -+ -+ initrd_addr = 0; -+ initrd_total = 0; -+ -+ str = (char *)(unsigned long)hdr->cmd_line_ptr; -+ -+ j = 0; /* See close_handles */ -+ -+ if (!str || !*str) -+ return EFI_SUCCESS; -+ -+ for (nr_initrds = 0; *str; nr_initrds++) { -+ str = strstr(str, "initrd="); -+ if (!str) -+ break; -+ -+ str += 7; -+ -+ /* Skip any leading slashes */ -+ while (*str == '/' || *str == '\\') -+ str++; -+ -+ while (*str && *str != ' ' && *str != '\n') -+ str++; -+ } -+ -+ if (!nr_initrds) -+ return EFI_SUCCESS; -+ -+ status = efi_call_phys3(sys_table->boottime->allocate_pool, -+ EFI_LOADER_DATA, -+ nr_initrds * sizeof(*initrds), -+ &initrds); -+ if (status != EFI_SUCCESS) -+ goto fail; -+ -+ str = (char *)(unsigned long)hdr->cmd_line_ptr; -+ for (i = 0; i < nr_initrds; i++) { -+ struct initrd *initrd; -+ efi_file_handle_t *h; -+ efi_file_info_t *info; -+ efi_char16_t filename[256]; -+ unsigned long info_sz; -+ efi_guid_t info_guid = EFI_FILE_INFO_ID; -+ efi_char16_t *p; -+ u64 file_sz; -+ -+ str = strstr(str, "initrd="); -+ if (!str) -+ break; -+ -+ str += 7; -+ -+ initrd = &initrds[i]; -+ p = filename; -+ -+ /* Skip any leading slashes */ -+ while (*str == '/' || *str == '\\') -+ str++; -+ -+ while (*str && *str != ' ' && *str != '\n') { -+ if (p >= filename + sizeof(filename)) -+ break; -+ -+ *p++ = *str++; -+ } -+ -+ *p = '\0'; -+ -+ /* Only open the volume once. */ -+ if (!i) { -+ efi_boot_services_t *boottime; -+ -+ boottime = sys_table->boottime; -+ -+ status = efi_call_phys3(boottime->handle_protocol, -+ image->device_handle, &fs_proto, &io); -+ if (status != EFI_SUCCESS) -+ goto free_initrds; -+ -+ status = efi_call_phys2(io->open_volume, io, &fh); -+ if (status != EFI_SUCCESS) -+ goto free_initrds; -+ } -+ -+ status = efi_call_phys5(fh->open, fh, &h, filename, -+ EFI_FILE_MODE_READ, (u64)0); -+ if (status != EFI_SUCCESS) -+ goto close_handles; -+ -+ initrd->handle = h; -+ -+ info_sz = 0; -+ status = efi_call_phys4(h->get_info, h, &info_guid, -+ &info_sz, NULL); -+ if (status != EFI_BUFFER_TOO_SMALL) -+ goto close_handles; -+ -+grow: -+ status = efi_call_phys3(sys_table->boottime->allocate_pool, -+ EFI_LOADER_DATA, info_sz, &info); -+ if (status != EFI_SUCCESS) -+ goto close_handles; -+ -+ status = efi_call_phys4(h->get_info, h, &info_guid, -+ &info_sz, info); -+ if (status == EFI_BUFFER_TOO_SMALL) { -+ efi_call_phys1(sys_table->boottime->free_pool, info); -+ goto grow; -+ } -+ -+ file_sz = info->file_size; -+ efi_call_phys1(sys_table->boottime->free_pool, info); -+ -+ if (status != EFI_SUCCESS) -+ goto close_handles; -+ -+ initrd->size = file_sz; -+ initrd_total += file_sz; -+ } -+ -+ if (initrd_total) { -+ unsigned long addr; -+ -+ /* -+ * Multiple initrd's need to be at consecutive -+ * addresses in memory, so allocate enough memory for -+ * all the initrd's. -+ */ -+ status = low_alloc(initrd_total, 0x1000, &initrd_addr); -+ if (status != EFI_SUCCESS) -+ goto close_handles; -+ -+ /* We've run out of free low memory. */ -+ if (initrd_addr > hdr->initrd_addr_max) { -+ status = EFI_INVALID_PARAMETER; -+ goto free_initrd_total; -+ } -+ -+ addr = initrd_addr; -+ for (j = 0; j < nr_initrds; j++) { -+ u64 size; -+ -+ size = initrds[j].size; -+ status = efi_call_phys3(fh->read, initrds[j].handle, -+ &size, addr); -+ if (status != EFI_SUCCESS) -+ goto free_initrd_total; -+ -+ efi_call_phys1(fh->close, initrds[j].handle); -+ -+ addr += size; -+ } -+ -+ } -+ -+ efi_call_phys1(sys_table->boottime->free_pool, initrds); -+ -+ hdr->ramdisk_image = initrd_addr; -+ hdr->ramdisk_size = initrd_total; -+ -+ return status; -+ -+free_initrd_total: -+ low_free(initrd_total, initrd_addr); -+ -+close_handles: -+ for (k = j; k < nr_initrds; k++) -+ efi_call_phys1(fh->close, initrds[k].handle); -+free_initrds: -+ efi_call_phys1(sys_table->boottime->free_pool, initrds); -+fail: -+ hdr->ramdisk_image = 0; -+ hdr->ramdisk_size = 0; -+ -+ return status; -+} -+ -+/* -+ * Because the x86 boot code expects to be passed a boot_params we -+ * need to create one ourselves (usually the bootloader would create -+ * one for us). -+ */ -+static efi_status_t make_boot_params(struct boot_params *boot_params, -+ efi_loaded_image_t *image, -+ void *handle) -+{ -+ struct efi_info *efi = &boot_params->efi_info; -+ struct apm_bios_info *bi = &boot_params->apm_bios_info; -+ struct sys_desc_table *sdt = &boot_params->sys_desc_table; -+ struct e820entry *e820_map = &boot_params->e820_map[0]; -+ struct e820entry *prev = NULL; -+ struct setup_header *hdr = &boot_params->hdr; -+ unsigned long size, key, desc_size, _size; -+ efi_memory_desc_t *mem_map; -+ void *options = image->load_options; -+ u32 load_options_size = image->load_options_size; -+ int options_size = 0; -+ efi_status_t status; -+ __u32 desc_version; -+ unsigned long cmdline; -+ u8 nr_entries; -+ u16 *s2; -+ u8 *s1; -+ int i; -+ -+ hdr->type_of_loader = 0x21; -+ -+ /* Convert unicode cmdline to ascii */ -+ cmdline = 0; -+ s2 = (u16 *)options; -+ -+ if (s2) { -+ while (*s2 && *s2 != '\n' && options_size < load_options_size) { -+ s2++; -+ options_size++; -+ } -+ -+ if (options_size) { -+ if (options_size > hdr->cmdline_size) -+ options_size = hdr->cmdline_size; -+ -+ options_size++; /* NUL termination */ -+ -+ status = low_alloc(options_size, 1, &cmdline); -+ if (status != EFI_SUCCESS) -+ goto fail; -+ -+ s1 = (u8 *)(unsigned long)cmdline; -+ s2 = (u16 *)options; -+ -+ for (i = 0; i < options_size - 1; i++) -+ *s1++ = *s2++; -+ -+ *s1 = '\0'; -+ } -+ } -+ -+ hdr->cmd_line_ptr = cmdline; -+ -+ hdr->ramdisk_image = 0; -+ hdr->ramdisk_size = 0; -+ -+ status = handle_ramdisks(image, hdr); -+ if (status != EFI_SUCCESS) -+ goto free_cmdline; -+ -+ setup_graphics(boot_params); -+ -+ /* Clear APM BIOS info */ -+ memset(bi, 0, sizeof(*bi)); -+ -+ memset(sdt, 0, sizeof(*sdt)); -+ -+ memcpy(&efi->efi_loader_signature, EFI_LOADER_SIGNATURE, sizeof(__u32)); -+ -+ size = sizeof(*mem_map) * 32; -+ -+again: -+ size += sizeof(*mem_map); -+ _size = size; -+ status = low_alloc(size, 1, (unsigned long *)&mem_map); -+ if (status != EFI_SUCCESS) -+ goto free_cmdline; -+ -+ status = efi_call_phys5(sys_table->boottime->get_memory_map, &size, -+ mem_map, &key, &desc_size, &desc_version); -+ if (status == EFI_BUFFER_TOO_SMALL) { -+ low_free(_size, (unsigned long)mem_map); -+ goto again; -+ } -+ -+ if (status != EFI_SUCCESS) -+ goto free_mem_map; -+ -+ efi->efi_systab = (unsigned long)sys_table; -+ efi->efi_memdesc_size = desc_size; -+ efi->efi_memdesc_version = desc_version; -+ efi->efi_memmap = (unsigned long)mem_map; -+ efi->efi_memmap_size = size; -+ -+#ifdef CONFIG_X86_64 -+ efi->efi_systab_hi = (unsigned long)sys_table >> 32; -+ efi->efi_memmap_hi = (unsigned long)mem_map >> 32; -+#endif -+ -+ /* Might as well exit boot services now */ -+ status = efi_call_phys2(sys_table->boottime->exit_boot_services, -+ handle, key); -+ if (status != EFI_SUCCESS) -+ goto free_mem_map; -+ -+ /* Historic? */ -+ boot_params->alt_mem_k = 32 * 1024; -+ -+ /* -+ * Convert the EFI memory map to E820. -+ */ -+ nr_entries = 0; -+ for (i = 0; i < size / desc_size; i++) { -+ efi_memory_desc_t *d; -+ unsigned int e820_type = 0; -+ -+ d = (efi_memory_desc_t *)((unsigned long)mem_map + (i * desc_size)); -+ switch(d->type) { -+ case EFI_RESERVED_TYPE: -+ case EFI_RUNTIME_SERVICES_CODE: -+ case EFI_RUNTIME_SERVICES_DATA: -+ case EFI_MEMORY_MAPPED_IO: -+ case EFI_MEMORY_MAPPED_IO_PORT_SPACE: -+ case EFI_PAL_CODE: -+ e820_type = E820_RESERVED; -+ break; -+ -+ case EFI_UNUSABLE_MEMORY: -+ e820_type = E820_UNUSABLE; -+ break; -+ -+ case EFI_ACPI_RECLAIM_MEMORY: -+ e820_type = E820_ACPI; -+ break; -+ -+ case EFI_LOADER_CODE: -+ case EFI_LOADER_DATA: -+ case EFI_BOOT_SERVICES_CODE: -+ case EFI_BOOT_SERVICES_DATA: -+ case EFI_CONVENTIONAL_MEMORY: -+ e820_type = E820_RAM; -+ break; -+ -+ case EFI_ACPI_MEMORY_NVS: -+ e820_type = E820_NVS; -+ break; -+ -+ default: -+ continue; -+ } -+ -+ /* Merge adjacent mappings */ -+ if (prev && prev->type == e820_type && -+ (prev->addr + prev->size) == d->phys_addr) -+ prev->size += d->num_pages << 12; -+ else { -+ e820_map->addr = d->phys_addr; -+ e820_map->size = d->num_pages << 12; -+ e820_map->type = e820_type; -+ prev = e820_map++; -+ nr_entries++; -+ } -+ } -+ -+ boot_params->e820_entries = nr_entries; -+ -+ return EFI_SUCCESS; -+ -+free_mem_map: -+ low_free(_size, (unsigned long)mem_map); -+free_cmdline: -+ if (options_size) -+ low_free(options_size, hdr->cmd_line_ptr); -+fail: -+ return status; -+} -+ -+/* -+ * On success we return a pointer to a boot_params structure, and NULL -+ * on failure. -+ */ -+struct boot_params *efi_main(void *handle, efi_system_table_t *_table) -+{ -+ struct boot_params *boot_params; -+ unsigned long start, nr_pages; -+ struct desc_ptr *gdt, *idt; -+ efi_loaded_image_t *image; -+ struct setup_header *hdr; -+ efi_status_t status; -+ efi_guid_t proto = LOADED_IMAGE_PROTOCOL_GUID; -+ struct desc_struct *desc; -+ -+ sys_table = _table; -+ -+ /* Check if we were booted by the EFI firmware */ -+ if (sys_table->hdr.signature != EFI_SYSTEM_TABLE_SIGNATURE) -+ goto fail; -+ -+ status = efi_call_phys3(sys_table->boottime->handle_protocol, -+ handle, &proto, (void *)&image); -+ if (status != EFI_SUCCESS) -+ goto fail; -+ -+ status = low_alloc(0x4000, 1, (unsigned long *)&boot_params); -+ if (status != EFI_SUCCESS) -+ goto fail; -+ -+ memset(boot_params, 0x0, 0x4000); -+ -+ /* Copy first two sectors to boot_params */ -+ memcpy(boot_params, image->image_base, 1024); -+ -+ hdr = &boot_params->hdr; -+ -+ /* -+ * The EFI firmware loader could have placed the kernel image -+ * anywhere in memory, but the kernel has various restrictions -+ * on the max physical address it can run at. Attempt to move -+ * the kernel to boot_params.pref_address, or as close as -+ * possible to it. -+ */ -+ start = hdr->pref_address; -+ nr_pages = round_up(hdr->init_size, EFI_PAGE_SIZE) / EFI_PAGE_SIZE; -+ -+ status = efi_call_phys4(sys_table->boottime->allocate_pages, -+ EFI_ALLOCATE_ADDRESS, EFI_LOADER_DATA, -+ nr_pages, &start); -+ if (status != EFI_SUCCESS) { -+ status = low_alloc(hdr->init_size, hdr->kernel_alignment, -+ &start); -+ if (status != EFI_SUCCESS) -+ goto fail; -+ } -+ -+ hdr->code32_start = (__u32)start; -+ hdr->pref_address = (__u64)(unsigned long)image->image_base; -+ -+ memcpy((void *)start, image->image_base, image->image_size); -+ -+ status = efi_call_phys3(sys_table->boottime->allocate_pool, -+ EFI_LOADER_DATA, sizeof(*gdt), -+ (void **)&gdt); -+ if (status != EFI_SUCCESS) -+ goto fail; -+ -+ gdt->size = 0x800; -+ status = low_alloc(gdt->size, 8, (unsigned long *)&gdt->address); -+ if (status != EFI_SUCCESS) -+ goto fail; -+ -+ status = efi_call_phys3(sys_table->boottime->allocate_pool, -+ EFI_LOADER_DATA, sizeof(*idt), -+ (void **)&idt); -+ if (status != EFI_SUCCESS) -+ goto fail; -+ -+ idt->size = 0; -+ idt->address = 0; -+ -+ status = make_boot_params(boot_params, image, handle); -+ if (status != EFI_SUCCESS) -+ goto fail; -+ -+ memset((char *)gdt->address, 0x0, gdt->size); -+ desc = (struct desc_struct *)gdt->address; -+ -+ /* The first GDT is a dummy and the second is unused. */ -+ desc += 2; -+ -+ desc->limit0 = 0xffff; -+ desc->base0 = 0x0000; -+ desc->base1 = 0x0000; -+ desc->type = SEG_TYPE_CODE | SEG_TYPE_EXEC_READ; -+ desc->s = DESC_TYPE_CODE_DATA; -+ desc->dpl = 0; -+ desc->p = 1; -+ desc->limit = 0xf; -+ desc->avl = 0; -+ desc->l = 0; -+ desc->d = SEG_OP_SIZE_32BIT; -+ desc->g = SEG_GRANULARITY_4KB; -+ desc->base2 = 0x00; -+ -+ desc++; -+ desc->limit0 = 0xffff; -+ desc->base0 = 0x0000; -+ desc->base1 = 0x0000; -+ desc->type = SEG_TYPE_DATA | SEG_TYPE_READ_WRITE; -+ desc->s = DESC_TYPE_CODE_DATA; -+ desc->dpl = 0; -+ desc->p = 1; -+ desc->limit = 0xf; -+ desc->avl = 0; -+ desc->l = 0; -+ desc->d = SEG_OP_SIZE_32BIT; -+ desc->g = SEG_GRANULARITY_4KB; -+ desc->base2 = 0x00; -+ -+#ifdef CONFIG_X86_64 -+ /* Task segment value */ -+ desc++; -+ desc->limit0 = 0x0000; -+ desc->base0 = 0x0000; -+ desc->base1 = 0x0000; -+ desc->type = SEG_TYPE_TSS; -+ desc->s = 0; -+ desc->dpl = 0; -+ desc->p = 1; -+ desc->limit = 0x0; -+ desc->avl = 0; -+ desc->l = 0; -+ desc->d = 0; -+ desc->g = SEG_GRANULARITY_4KB; -+ desc->base2 = 0x00; -+#endif /* CONFIG_X86_64 */ -+ -+ asm volatile ("lidt %0" :: "m" (*idt)); -+ asm volatile ("lgdt %0" :: "m" (*gdt)); -+ -+ asm volatile("cli"); -+ -+ return boot_params; -+fail: -+ return NULL; -+} -diff --git a/arch/x86/boot/compressed/efi_stub_32.S b/arch/x86/boot/compressed/efi_stub_32.S -new file mode 100644 -index 0000000..5047cd9 ---- /dev/null -+++ b/arch/x86/boot/compressed/efi_stub_32.S -@@ -0,0 +1,87 @@ -+/* -+ * EFI call stub for IA32. -+ * -+ * This stub allows us to make EFI calls in physical mode with interrupts -+ * turned off. Note that this implementation is different from the one in -+ * arch/x86/platform/efi/efi_stub_32.S because we're _already_ in physical -+ * mode at this point. -+ */ -+ -+#include -+#include -+ -+/* -+ * efi_call_phys(void *, ...) is a function with variable parameters. -+ * All the callers of this function assure that all the parameters are 4-bytes. -+ */ -+ -+/* -+ * In gcc calling convention, EBX, ESP, EBP, ESI and EDI are all callee save. -+ * So we'd better save all of them at the beginning of this function and restore -+ * at the end no matter how many we use, because we can not assure EFI runtime -+ * service functions will comply with gcc calling convention, too. -+ */ -+ -+.text -+ENTRY(efi_call_phys) -+ /* -+ * 0. The function can only be called in Linux kernel. So CS has been -+ * set to 0x0010, DS and SS have been set to 0x0018. In EFI, I found -+ * the values of these registers are the same. And, the corresponding -+ * GDT entries are identical. So I will do nothing about segment reg -+ * and GDT, but change GDT base register in prelog and epilog. -+ */ -+ -+ /* -+ * 1. Because we haven't been relocated by this point we need to -+ * use relative addressing. -+ */ -+ call 1f -+1: popl %edx -+ subl $1b, %edx -+ -+ /* -+ * 2. Now on the top of stack is the return -+ * address in the caller of efi_call_phys(), then parameter 1, -+ * parameter 2, ..., param n. To make things easy, we save the return -+ * address of efi_call_phys in a global variable. -+ */ -+ popl %ecx -+ movl %ecx, saved_return_addr(%edx) -+ /* get the function pointer into ECX*/ -+ popl %ecx -+ movl %ecx, efi_rt_function_ptr(%edx) -+ -+ /* -+ * 3. Call the physical function. -+ */ -+ call *%ecx -+ -+ /* -+ * 4. Balance the stack. And because EAX contain the return value, -+ * we'd better not clobber it. We need to calculate our address -+ * again because %ecx and %edx are not preserved across EFI function -+ * calls. -+ */ -+ call 1f -+1: popl %edx -+ subl $1b, %edx -+ -+ movl efi_rt_function_ptr(%edx), %ecx -+ pushl %ecx -+ -+ /* -+ * 10. Push the saved return address onto the stack and return. -+ */ -+ movl saved_return_addr(%edx), %ecx -+ pushl %ecx -+ ret -+ENDPROC(efi_call_phys) -+.previous -+ -+.data -+saved_return_addr: -+ .long 0 -+efi_rt_function_ptr: -+ .long 0 -+ -diff --git a/arch/x86/boot/compressed/efi_stub_64.S b/arch/x86/boot/compressed/efi_stub_64.S -new file mode 100644 -index 0000000..cedc60d ---- /dev/null -+++ b/arch/x86/boot/compressed/efi_stub_64.S -@@ -0,0 +1 @@ -+#include "../../platform/efi/efi_stub_64.S" -diff --git a/arch/x86/boot/compressed/head_32.S b/arch/x86/boot/compressed/head_32.S -index 67a655a..a055993 100644 ---- a/arch/x86/boot/compressed/head_32.S -+++ b/arch/x86/boot/compressed/head_32.S -@@ -32,6 +32,28 @@ - - __HEAD - ENTRY(startup_32) -+#ifdef CONFIG_EFI_STUB -+ /* -+ * We don't need the return address, so set up the stack so -+ * efi_main() can find its arugments. -+ */ -+ add $0x4, %esp -+ -+ call efi_main -+ cmpl $0, %eax -+ je preferred_addr -+ movl %eax, %esi -+ call 1f -+1: -+ popl %eax -+ subl $1b, %eax -+ subl BP_pref_address(%esi), %eax -+ add BP_code32_start(%esi), %eax -+ leal preferred_addr(%eax), %eax -+ jmp *%eax -+ -+preferred_addr: -+#endif - cld - /* - * Test KEEP_SEGMENTS flag to see if the bootloader is asking -diff --git a/arch/x86/boot/compressed/head_64.S b/arch/x86/boot/compressed/head_64.S -index 35af09d..558d76c 100644 ---- a/arch/x86/boot/compressed/head_64.S -+++ b/arch/x86/boot/compressed/head_64.S -@@ -199,6 +199,26 @@ ENTRY(startup_64) - * an identity mapped page table being provied that maps our - * entire text+data+bss and hopefully all of memory. - */ -+#ifdef CONFIG_EFI_STUB -+ pushq %rsi -+ mov %rcx, %rdi -+ mov %rdx, %rsi -+ call efi_main -+ popq %rsi -+ cmpq $0,%rax -+ je preferred_addr -+ movq %rax,%rsi -+ call 1f -+1: -+ popq %rax -+ subq $1b, %rax -+ subq BP_pref_address(%rsi), %rax -+ add BP_code32_start(%esi), %eax -+ leaq preferred_addr(%rax), %rax -+ jmp *%rax -+ -+preferred_addr: -+#endif - - /* Setup data segments. */ - xorl %eax, %eax -diff --git a/arch/x86/boot/compressed/string.c b/arch/x86/boot/compressed/string.c -index 19b3e69..ffb9c5c 100644 ---- a/arch/x86/boot/compressed/string.c -+++ b/arch/x86/boot/compressed/string.c -@@ -1,2 +1,11 @@ - #include "misc.h" -+ -+int memcmp(const void *s1, const void *s2, size_t len) -+{ -+ u8 diff; -+ asm("repe; cmpsb; setnz %0" -+ : "=qm" (diff), "+D" (s1), "+S" (s2), "+c" (len)); -+ return diff; -+} -+ - #include "../string.c" -diff --git a/arch/x86/boot/header.S b/arch/x86/boot/header.S -index 93e689f..c4756f6 100644 ---- a/arch/x86/boot/header.S -+++ b/arch/x86/boot/header.S -@@ -45,6 +45,11 @@ SYSSEG = 0x1000 /* historical load address >> 4 */ - - .global bootsect_start - bootsect_start: -+#ifdef CONFIG_EFI_STUB -+ # "MZ", MS-DOS header -+ .byte 0x4d -+ .byte 0x5a -+#endif - - # Normalize the start address - ljmp $BOOTSEG, $start2 -@@ -79,6 +84,14 @@ bs_die: - # invoke the BIOS reset code... - ljmp $0xf000,$0xfff0 - -+#ifdef CONFIG_EFI_STUB -+ .org 0x3c -+ # -+ # Offset to the PE header. -+ # -+ .long pe_header -+#endif /* CONFIG_EFI_STUB */ -+ - .section ".bsdata", "a" - bugger_off_msg: - .ascii "Direct booting from floppy is no longer supported.\r\n" -@@ -87,6 +100,141 @@ bugger_off_msg: - .ascii "Remove disk and press any key to reboot . . .\r\n" - .byte 0 - -+#ifdef CONFIG_EFI_STUB -+pe_header: -+ .ascii "PE" -+ .word 0 -+ -+coff_header: -+#ifdef CONFIG_X86_32 -+ .word 0x14c # i386 -+#else -+ .word 0x8664 # x86-64 -+#endif -+ .word 2 # nr_sections -+ .long 0 # TimeDateStamp -+ .long 0 # PointerToSymbolTable -+ .long 1 # NumberOfSymbols -+ .word section_table - optional_header # SizeOfOptionalHeader -+#ifdef CONFIG_X86_32 -+ .word 0x306 # Characteristics. -+ # IMAGE_FILE_32BIT_MACHINE | -+ # IMAGE_FILE_DEBUG_STRIPPED | -+ # IMAGE_FILE_EXECUTABLE_IMAGE | -+ # IMAGE_FILE_LINE_NUMS_STRIPPED -+#else -+ .word 0x206 # Characteristics -+ # IMAGE_FILE_DEBUG_STRIPPED | -+ # IMAGE_FILE_EXECUTABLE_IMAGE | -+ # IMAGE_FILE_LINE_NUMS_STRIPPED -+#endif -+ -+optional_header: -+#ifdef CONFIG_X86_32 -+ .word 0x10b # PE32 format -+#else -+ .word 0x20b # PE32+ format -+#endif -+ .byte 0x02 # MajorLinkerVersion -+ .byte 0x14 # MinorLinkerVersion -+ -+ # Filled in by build.c -+ .long 0 # SizeOfCode -+ -+ .long 0 # SizeOfInitializedData -+ .long 0 # SizeOfUninitializedData -+ -+ # Filled in by build.c -+ .long 0x0000 # AddressOfEntryPoint -+ -+ .long 0x0000 # BaseOfCode -+#ifdef CONFIG_X86_32 -+ .long 0 # data -+#endif -+ -+extra_header_fields: -+#ifdef CONFIG_X86_32 -+ .long 0 # ImageBase -+#else -+ .quad 0 # ImageBase -+#endif -+ .long 0x1000 # SectionAlignment -+ .long 0x200 # FileAlignment -+ .word 0 # MajorOperatingSystemVersion -+ .word 0 # MinorOperatingSystemVersion -+ .word 0 # MajorImageVersion -+ .word 0 # MinorImageVersion -+ .word 0 # MajorSubsystemVersion -+ .word 0 # MinorSubsystemVersion -+ .long 0 # Win32VersionValue -+ -+ # -+ # The size of the bzImage is written in tools/build.c -+ # -+ .long 0 # SizeOfImage -+ -+ .long 0x200 # SizeOfHeaders -+ .long 0 # CheckSum -+ .word 0xa # Subsystem (EFI application) -+ .word 0 # DllCharacteristics -+#ifdef CONFIG_X86_32 -+ .long 0 # SizeOfStackReserve -+ .long 0 # SizeOfStackCommit -+ .long 0 # SizeOfHeapReserve -+ .long 0 # SizeOfHeapCommit -+#else -+ .quad 0 # SizeOfStackReserve -+ .quad 0 # SizeOfStackCommit -+ .quad 0 # SizeOfHeapReserve -+ .quad 0 # SizeOfHeapCommit -+#endif -+ .long 0 # LoaderFlags -+ .long 0x1 # NumberOfRvaAndSizes -+ -+ .quad 0 # ExportTable -+ .quad 0 # ImportTable -+ .quad 0 # ResourceTable -+ .quad 0 # ExceptionTable -+ .quad 0 # CertificationTable -+ .quad 0 # BaseRelocationTable -+ -+ # Section table -+section_table: -+ .ascii ".text" -+ .byte 0 -+ .byte 0 -+ .byte 0 -+ .long 0 -+ .long 0x0 # startup_{32,64} -+ .long 0 # Size of initialized data -+ # on disk -+ .long 0x0 # startup_{32,64} -+ .long 0 # PointerToRelocations -+ .long 0 # PointerToLineNumbers -+ .word 0 # NumberOfRelocations -+ .word 0 # NumberOfLineNumbers -+ .long 0x60500020 # Characteristics (section flags) -+ -+ # -+ # The EFI application loader requires a relocation section -+ # because EFI applications are relocatable and not having -+ # this section seems to confuse it. But since we don't need -+ # the loader to fixup any relocs for us just fill it with a -+ # single dummy reloc. -+ # -+ .ascii ".reloc" -+ .byte 0 -+ .byte 0 -+ .long reloc_end - reloc_start -+ .long reloc_start -+ .long reloc_end - reloc_start # SizeOfRawData -+ .long reloc_start # PointerToRawData -+ .long 0 # PointerToRelocations -+ .long 0 # PointerToLineNumbers -+ .word 0 # NumberOfRelocations -+ .word 0 # NumberOfLineNumbers -+ .long 0x42100040 # Characteristics (section flags) -+#endif /* CONFIG_EFI_STUB */ - - # Kernel attributes; used by setup. This is part 1 of the - # header, from the old boot sector. -@@ -318,3 +466,13 @@ die: - setup_corrupt: - .byte 7 - .string "No setup signature found...\n" -+ -+ .data -+dummy: .long 0 -+ -+ .section .reloc -+reloc_start: -+ .long dummy - reloc_start -+ .long 10 -+ .word 0 -+reloc_end: -diff --git a/arch/x86/boot/string.c b/arch/x86/boot/string.c -index 3cbc405..574dedf 100644 ---- a/arch/x86/boot/string.c -+++ b/arch/x86/boot/string.c -@@ -111,3 +111,38 @@ unsigned long long simple_strtoull(const char *cp, char **endp, unsigned int bas - - return result; - } -+ -+/** -+ * strlen - Find the length of a string -+ * @s: The string to be sized -+ */ -+size_t strlen(const char *s) -+{ -+ const char *sc; -+ -+ for (sc = s; *sc != '\0'; ++sc) -+ /* nothing */; -+ return sc - s; -+} -+ -+/** -+ * strstr - Find the first substring in a %NUL terminated string -+ * @s1: The string to be searched -+ * @s2: The string to search for -+ */ -+char *strstr(const char *s1, const char *s2) -+{ -+ size_t l1, l2; -+ -+ l2 = strlen(s2); -+ if (!l2) -+ return (char *)s1; -+ l1 = strlen(s1); -+ while (l1 >= l2) { -+ l1--; -+ if (!memcmp(s1, s2, l2)) -+ return (char *)s1; -+ s1++; -+ } -+ return NULL; -+} -diff --git a/arch/x86/boot/tools/build.c b/arch/x86/boot/tools/build.c -index fdc60a0..4e9bd6b 100644 ---- a/arch/x86/boot/tools/build.c -+++ b/arch/x86/boot/tools/build.c -@@ -135,6 +135,9 @@ static void usage(void) - - int main(int argc, char ** argv) - { -+#ifdef CONFIG_EFI_STUB -+ unsigned int file_sz, pe_header; -+#endif - unsigned int i, sz, setup_sectors; - int c; - u32 sys_size; -@@ -194,6 +197,42 @@ int main(int argc, char ** argv) - buf[0x1f6] = sys_size >> 16; - buf[0x1f7] = sys_size >> 24; - -+#ifdef CONFIG_EFI_STUB -+ file_sz = sz + i + ((sys_size * 16) - sz); -+ -+ pe_header = *(unsigned int *)&buf[0x3c]; -+ -+ /* Size of code */ -+ *(unsigned int *)&buf[pe_header + 0x1c] = file_sz; -+ -+ /* Size of image */ -+ *(unsigned int *)&buf[pe_header + 0x50] = file_sz; -+ -+#ifdef CONFIG_X86_32 -+ /* Address of entry point */ -+ *(unsigned int *)&buf[pe_header + 0x28] = i; -+ -+ /* .text size */ -+ *(unsigned int *)&buf[pe_header + 0xb0] = file_sz; -+ -+ /* .text size of initialised data */ -+ *(unsigned int *)&buf[pe_header + 0xb8] = file_sz; -+#else -+ /* -+ * Address of entry point. startup_32 is at the beginning and -+ * the 64-bit entry point (startup_64) is always 512 bytes -+ * after. -+ */ -+ *(unsigned int *)&buf[pe_header + 0x28] = i + 512; -+ -+ /* .text size */ -+ *(unsigned int *)&buf[pe_header + 0xc0] = file_sz; -+ -+ /* .text size of initialised data */ -+ *(unsigned int *)&buf[pe_header + 0xc8] = file_sz; -+#endif /* CONFIG_X86_32 */ -+#endif /* CONFIG_EFI_STUB */ -+ - crc = partial_crc32(buf, i, crc); - if (fwrite(buf, 1, i, stdout) != i) - die("Writing setup failed"); -diff --git a/arch/x86/include/asm/bootparam.h b/arch/x86/include/asm/bootparam.h -index e020d88..2f90c51 100644 ---- a/arch/x86/include/asm/bootparam.h -+++ b/arch/x86/include/asm/bootparam.h -@@ -64,6 +64,8 @@ struct setup_header { - __u32 payload_offset; - __u32 payload_length; - __u64 setup_data; -+ __u64 pref_address; -+ __u32 init_size; - } __attribute__((packed)); - - struct sys_desc_table { -diff --git a/arch/x86/include/asm/efi.h b/arch/x86/include/asm/efi.h -index 7093e4a..844f735 100644 ---- a/arch/x86/include/asm/efi.h -+++ b/arch/x86/include/asm/efi.h -@@ -3,6 +3,8 @@ - - #ifdef CONFIG_X86_32 - -+#define EFI_LOADER_SIGNATURE "EL32" -+ - extern unsigned long asmlinkage efi_call_phys(void *, ...); - - #define efi_call_phys0(f) efi_call_phys(f) -@@ -37,6 +39,8 @@ extern unsigned long asmlinkage efi_call_phys(void *, ...); - - #else /* !CONFIG_X86_32 */ - -+#define EFI_LOADER_SIGNATURE "EL64" -+ - extern u64 efi_call0(void *fp); - extern u64 efi_call1(void *fp, u64 arg1); - extern u64 efi_call2(void *fp, u64 arg1, u64 arg2); -diff --git a/arch/x86/kernel/asm-offsets.c b/arch/x86/kernel/asm-offsets.c -index 4f13faf..68de2dc 100644 ---- a/arch/x86/kernel/asm-offsets.c -+++ b/arch/x86/kernel/asm-offsets.c -@@ -67,4 +67,6 @@ void common(void) { - OFFSET(BP_hardware_subarch, boot_params, hdr.hardware_subarch); - OFFSET(BP_version, boot_params, hdr.version); - OFFSET(BP_kernel_alignment, boot_params, hdr.kernel_alignment); -+ OFFSET(BP_pref_address, boot_params, hdr.pref_address); -+ OFFSET(BP_code32_start, boot_params, hdr.code32_start); - } -diff --git a/arch/x86/kernel/setup.c b/arch/x86/kernel/setup.c -index afaf384..eca164b 100644 ---- a/arch/x86/kernel/setup.c -+++ b/arch/x86/kernel/setup.c -@@ -750,12 +750,7 @@ void __init setup_arch(char **cmdline_p) - #endif - #ifdef CONFIG_EFI - if (!strncmp((char *)&boot_params.efi_info.efi_loader_signature, --#ifdef CONFIG_X86_32 -- "EL32", --#else -- "EL64", --#endif -- 4)) { -+ EFI_LOADER_SIGNATURE, 4)) { - efi_enabled = 1; - efi_memblock_x86_reserve_range(); - } -diff --git a/arch/x86/platform/efi/efi_32.c b/arch/x86/platform/efi/efi_32.c -index 5cab48e..1156e9a 100644 ---- a/arch/x86/platform/efi/efi_32.c -+++ b/arch/x86/platform/efi/efi_32.c -@@ -44,8 +44,12 @@ void efi_call_phys_prelog(void) - { - unsigned long cr4; - unsigned long temp; -+ unsigned long phys_addr, virt_addr; - struct desc_ptr gdt_descr; - -+ virt_addr = (unsigned long)_text; -+ phys_addr = virt_addr - PAGE_OFFSET; -+ - local_irq_save(efi_rt_eflags); - - /* -@@ -57,18 +61,18 @@ void efi_call_phys_prelog(void) - - if (cr4 & X86_CR4_PAE) { - efi_bak_pg_dir_pointer[0].pgd = -- swapper_pg_dir[pgd_index(0)].pgd; -- swapper_pg_dir[0].pgd = -- swapper_pg_dir[pgd_index(PAGE_OFFSET)].pgd; -+ swapper_pg_dir[pgd_index(phys_addr)].pgd; -+ swapper_pg_dir[pgd_index(phys_addr)].pgd = -+ swapper_pg_dir[pgd_index(virt_addr)].pgd; - } else { - efi_bak_pg_dir_pointer[0].pgd = -- swapper_pg_dir[pgd_index(0)].pgd; -+ swapper_pg_dir[pgd_index(phys_addr)].pgd; - efi_bak_pg_dir_pointer[1].pgd = -- swapper_pg_dir[pgd_index(0x400000)].pgd; -- swapper_pg_dir[pgd_index(0)].pgd = -- swapper_pg_dir[pgd_index(PAGE_OFFSET)].pgd; -- temp = PAGE_OFFSET + 0x400000; -- swapper_pg_dir[pgd_index(0x400000)].pgd = -+ swapper_pg_dir[pgd_index(phys_addr + 0x400000)].pgd; -+ swapper_pg_dir[pgd_index(phys_addr)].pgd = -+ swapper_pg_dir[pgd_index(virt_addr)].pgd; -+ temp = virt_addr + 0x400000; -+ swapper_pg_dir[pgd_index(phys_addr + 0x400000)].pgd = - swapper_pg_dir[pgd_index(temp)].pgd; - } - -diff --git a/include/linux/efi.h b/include/linux/efi.h -index 2362a0b..37c3007 100644 ---- a/include/linux/efi.h -+++ b/include/linux/efi.h -@@ -109,6 +109,14 @@ typedef struct { - u32 imagesize; - } efi_capsule_header_t; - -+/* -+ * Allocation types for calls to boottime->allocate_pages. -+ */ -+#define EFI_ALLOCATE_ANY_PAGES 0 -+#define EFI_ALLOCATE_MAX_ADDRESS 1 -+#define EFI_ALLOCATE_ADDRESS 2 -+#define EFI_MAX_ALLOCATE_TYPE 3 -+ - typedef int (*efi_freemem_callback_t) (u64 start, u64 end, void *arg); - - /* -@@ -139,6 +147,57 @@ typedef struct { - } efi_time_cap_t; - - /* -+ * EFI Boot Services table -+ */ -+typedef struct { -+ efi_table_hdr_t hdr; -+ void *raise_tpl; -+ void *restore_tpl; -+ void *allocate_pages; -+ void *free_pages; -+ void *get_memory_map; -+ void *allocate_pool; -+ void *free_pool; -+ void *create_event; -+ void *set_timer; -+ void *wait_for_event; -+ void *signal_event; -+ void *close_event; -+ void *check_event; -+ void *install_protocol_interface; -+ void *reinstall_protocol_interface; -+ void *uninstall_protocol_interface; -+ void *handle_protocol; -+ void *__reserved; -+ void *register_protocol_notify; -+ void *locate_handle; -+ void *locate_device_path; -+ void *install_configuration_table; -+ void *load_image; -+ void *start_image; -+ void *exit; -+ void *unload_image; -+ void *exit_boot_services; -+ void *get_next_monotonic_count; -+ void *stall; -+ void *set_watchdog_timer; -+ void *connect_controller; -+ void *disconnect_controller; -+ void *open_protocol; -+ void *close_protocol; -+ void *open_protocol_information; -+ void *protocols_per_handle; -+ void *locate_handle_buffer; -+ void *locate_protocol; -+ void *install_multiple_protocol_interfaces; -+ void *uninstall_multiple_protocol_interfaces; -+ void *calculate_crc32; -+ void *copy_mem; -+ void *set_mem; -+ void *create_event_ex; -+} efi_boot_services_t; -+ -+/* - * Types and defines for EFI ResetSystem - */ - #define EFI_RESET_COLD 0 -@@ -236,6 +295,24 @@ typedef efi_status_t efi_query_capsule_caps_t(efi_capsule_header_t **capsules, - #define LINUX_EFI_CRASH_GUID \ - EFI_GUID( 0xcfc8fc79, 0xbe2e, 0x4ddc, 0x97, 0xf0, 0x9f, 0x98, 0xbf, 0xe2, 0x98, 0xa0 ) - -+#define LOADED_IMAGE_PROTOCOL_GUID \ -+ EFI_GUID( 0x5b1b31a1, 0x9562, 0x11d2, 0x8e, 0x3f, 0x00, 0xa0, 0xc9, 0x69, 0x72, 0x3b ) -+ -+#define EFI_GRAPHICS_OUTPUT_PROTOCOL_GUID \ -+ EFI_GUID( 0x9042a9de, 0x23dc, 0x4a38, 0x96, 0xfb, 0x7a, 0xde, 0xd0, 0x80, 0x51, 0x6a ) -+ -+#define EFI_UGA_PROTOCOL_GUID \ -+ EFI_GUID( 0x982c298b, 0xf4fa, 0x41cb, 0xb8, 0x38, 0x77, 0xaa, 0x68, 0x8f, 0xb8, 0x39 ) -+ -+#define EFI_PCI_IO_PROTOCOL_GUID \ -+ EFI_GUID( 0x4cf5b200, 0x68b8, 0x4ca5, 0x9e, 0xec, 0xb2, 0x3e, 0x3f, 0x50, 0x2, 0x9a ) -+ -+#define EFI_FILE_INFO_ID \ -+ EFI_GUID( 0x9576e92, 0x6d3f, 0x11d2, 0x8e, 0x39, 0x00, 0xa0, 0xc9, 0x69, 0x72, 0x3b ) -+ -+#define EFI_FILE_SYSTEM_GUID \ -+ EFI_GUID( 0x964e5b22, 0x6459, 0x11d2, 0x8e, 0x39, 0x00, 0xa0, 0xc9, 0x69, 0x72, 0x3b ) -+ - typedef struct { - efi_guid_t guid; - unsigned long table; -@@ -261,7 +338,7 @@ typedef struct { - unsigned long stderr_handle; - unsigned long stderr; - efi_runtime_services_t *runtime; -- unsigned long boottime; -+ efi_boot_services_t *boottime; - unsigned long nr_tables; - unsigned long tables; - } efi_system_table_t; -@@ -275,6 +352,56 @@ struct efi_memory_map { - unsigned long desc_size; - }; - -+typedef struct { -+ u32 revision; -+ void *parent_handle; -+ efi_system_table_t *system_table; -+ void *device_handle; -+ void *file_path; -+ void *reserved; -+ u32 load_options_size; -+ void *load_options; -+ void *image_base; -+ __aligned_u64 image_size; -+ unsigned int image_code_type; -+ unsigned int image_data_type; -+ unsigned long unload; -+} efi_loaded_image_t; -+ -+typedef struct { -+ u64 revision; -+ void *open_volume; -+} efi_file_io_interface_t; -+ -+typedef struct { -+ u64 size; -+ u64 file_size; -+ u64 phys_size; -+ efi_time_t create_time; -+ efi_time_t last_access_time; -+ efi_time_t modification_time; -+ __aligned_u64 attribute; -+ efi_char16_t filename[1]; -+} efi_file_info_t; -+ -+typedef struct { -+ u64 revision; -+ void *open; -+ void *close; -+ void *delete; -+ void *read; -+ void *write; -+ void *get_position; -+ void *set_position; -+ void *get_info; -+ void *set_info; -+ void *flush; -+} efi_file_handle_t; -+ -+#define EFI_FILE_MODE_READ 0x0000000000000001 -+#define EFI_FILE_MODE_WRITE 0x0000000000000002 -+#define EFI_FILE_MODE_CREATE 0x8000000000000000 -+ - #define EFI_INVALID_TABLE_ADDR (~0UL) - - /* -@@ -385,6 +512,13 @@ extern int __init efi_setup_pcdp_console(char *); - #define EFI_VARIABLE_RUNTIME_ACCESS 0x0000000000000004 - - /* -+ * The type of search to perform when calling boottime->locate_handle -+ */ -+#define EFI_LOCATE_ALL_HANDLES 0 -+#define EFI_LOCATE_BY_REGISTER_NOTIFY 1 -+#define EFI_LOCATE_BY_PROTOCOL 2 -+ -+/* - * EFI Device Path information - */ - #define EFI_DEV_HW 0x01 diff --git a/pkgs/os-specific/linux/kernel/patches.nix b/pkgs/os-specific/linux/kernel/patches.nix index 585a8c0340b..672464e8965 100644 --- a/pkgs/os-specific/linux/kernel/patches.nix +++ b/pkgs/os-specific/linux/kernel/patches.nix @@ -415,13 +415,4 @@ rec { name = "glibc-getline"; patch = ./getline.patch; }; - - efi_stub = - { - # Patch to enable making the kernel a bootable efi image to avoid - # needing a bootloader on efi systems - # From the x86/efi-stub branch of git://github.com/mfleming/linux-2.6.git - name = "efi-stub"; - patch = ./efi-stub.patch; - }; } diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index fce97d6030b..1bf59e4e34f 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -5595,7 +5595,6 @@ let kernelPatches = [ #kernelPatches.fbcondecor_2_6_38 kernelPatches.sec_perm_2_6_24 - kernelPatches.efi_stub #kernelPatches.aufs2_1_2_6_38 #kernelPatches.mips_restart_2_6_36 ]; From ff21c3f5b5ddfb39303f149bb9b239dab374d453 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Sun, 6 Nov 2011 18:36:21 +0000 Subject: [PATCH 482/970] haskell-blaze-html: updated to version 0.4.2.1 svn path=/nixpkgs/trunk/; revision=30265 --- pkgs/development/libraries/haskell/blaze-html/default.nix | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/blaze-html/default.nix b/pkgs/development/libraries/haskell/blaze-html/default.nix index 6315bade7b0..d9143635c6b 100644 --- a/pkgs/development/libraries/haskell/blaze-html/default.nix +++ b/pkgs/development/libraries/haskell/blaze-html/default.nix @@ -2,11 +2,12 @@ cabal.mkDerivation (self: { pname = "blaze-html"; - version = "0.4.2.0"; - sha256 = "098y9mzq6jr73lavv7ky58bl3aajvdg72y12varpf3v3rr4l0lb2"; + version = "0.4.2.1"; + sha256 = "0hm2jnz9n68njdrrq73a558qxl2jwcvxmy62mvf2v9q96wyp07yj"; buildDepends = [ blazeBuilder text ]; meta = { homepage = "http://jaspervdj.be/blaze"; + description = "A blazingly fast HTML combinator library for Haskell"; license = self.stdenv.lib.licenses.bsd3; platforms = self.ghc.meta.platforms; maintainers = [ From 5396f76a555981044a99d646c3646c82b1819237 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Sun, 6 Nov 2011 18:36:24 +0000 Subject: [PATCH 483/970] haskell-gamma: updated to version 0.9.0.1 svn path=/nixpkgs/trunk/; revision=30266 --- pkgs/development/libraries/haskell/gamma/default.nix | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/pkgs/development/libraries/haskell/gamma/default.nix b/pkgs/development/libraries/haskell/gamma/default.nix index feb57b32a89..7a068a25eee 100755 --- a/pkgs/development/libraries/haskell/gamma/default.nix +++ b/pkgs/development/libraries/haskell/gamma/default.nix @@ -2,12 +2,9 @@ cabal.mkDerivation (self: { pname = "gamma"; - version = "0.7.0.1"; - sha256 = "0728b5mrzmj9hkaqvikl45jyi2p9hnkl2p6l9yv7wnw557yb0gb2"; + version = "0.9.0.1"; + sha256 = "02s9m2vlrnfg26c7921x60xxmawzzk27y3czcnvs8hlk01mb1xv7"; buildDepends = [ continuedFractions converge vector ]; - preConfigure = '' - sed -i 's|\(vector.*\) && < 0.8|\1|' ${self.pname}.cabal - ''; meta = { homepage = "https://github.com/mokus0/gamma"; description = "Gamma function and related functions"; From cc2456282d90bc74e30d599f82b75349fc5d284b Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Sun, 6 Nov 2011 18:36:27 +0000 Subject: [PATCH 484/970] haskell-ghc-mtl: updated to version 1.0.1.1 svn path=/nixpkgs/trunk/; revision=30267 --- pkgs/development/libraries/haskell/ghc-mtl/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/libraries/haskell/ghc-mtl/default.nix b/pkgs/development/libraries/haskell/ghc-mtl/default.nix index 43a8deaf915..d67f455471f 100644 --- a/pkgs/development/libraries/haskell/ghc-mtl/default.nix +++ b/pkgs/development/libraries/haskell/ghc-mtl/default.nix @@ -2,11 +2,11 @@ cabal.mkDerivation (self: { pname = "ghc-mtl"; - version = "1.0.1.0"; - sha256 = "5284e0ecf99511e6263503412faf6fa809dc577c009fde63203d46405eb1b191"; + version = "1.0.1.1"; + sha256 = "04lm1g27xwwph02k3d8b51nbhi2sw8jx7arqczcqc3rygak10fpn"; buildDepends = [ MonadCatchIOMtl mtl ]; meta = { - homepage = "http://code.haskell.org/~jcpetruzza/ghc-mtl"; + homepage = "http://darcsden.com/jcpetruzza/ghc-mtl"; description = "An mtl compatible version of the Ghc-Api monads and monad-transformers"; license = self.stdenv.lib.licenses.bsd3; platforms = self.ghc.meta.platforms; From 8325085a7d3060c5700cc1b2cd38932a1f080898 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Sun, 6 Nov 2011 18:36:30 +0000 Subject: [PATCH 485/970] haskell-hint: updated to version 0.3.3.3 svn path=/nixpkgs/trunk/; revision=30268 --- pkgs/development/libraries/haskell/hint/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/libraries/haskell/hint/default.nix b/pkgs/development/libraries/haskell/hint/default.nix index ac6e81e702e..ff7101aba23 100644 --- a/pkgs/development/libraries/haskell/hint/default.nix +++ b/pkgs/development/libraries/haskell/hint/default.nix @@ -4,14 +4,14 @@ cabal.mkDerivation (self: { pname = "hint"; - version = "0.3.3.2"; - sha256 = "1qm74hjz8cxypvavcw7s094zg9ic3r1ll2lj3y159ipc79cw2sn1"; + version = "0.3.3.3"; + sha256 = "0i7d7c2786c13npbb5np3gaidsq4kkajvm3fn2gx8djrhhlrqw5l"; buildDepends = [ extensibleExceptions ghcMtl ghcPaths haskellSrc MonadCatchIOMtl mtl random utf8String ]; meta = { - homepage = "http://projects.haskell.org/hint"; + homepage = "http://darcsden.com/jcpetruzza/hint"; description = "Runtime Haskell interpreter (GHC API wrapper)"; license = self.stdenv.lib.licenses.bsd3; platforms = self.ghc.meta.platforms; From 7130820f8c651c7b44d62e5c6977597a7402171b Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Sun, 6 Nov 2011 18:36:33 +0000 Subject: [PATCH 486/970] haskell-system-fileio: updated to version 0.3.3 svn path=/nixpkgs/trunk/; revision=30269 --- pkgs/development/libraries/haskell/system-fileio/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/system-fileio/default.nix b/pkgs/development/libraries/haskell/system-fileio/default.nix index 172489f6b52..844864ac103 100644 --- a/pkgs/development/libraries/haskell/system-fileio/default.nix +++ b/pkgs/development/libraries/haskell/system-fileio/default.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "system-fileio"; - version = "0.3.2.1"; - sha256 = "0a0vkbj9z5i74g6kkz3n4ffmvinavmnak0zxsx0fck18ppdgv394"; + version = "0.3.3"; + sha256 = "0z7y99g8ij9ykpxsgdb0addyibvpv2s95i0wpx4yc7mgi8cl50bx"; buildDepends = [ systemFilepath text time ]; meta = { homepage = "https://john-millikin.com/software/hs-fileio/"; From e57615635495103bb7ec993a54a2d1ee312be4b4 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Sun, 6 Nov 2011 18:36:36 +0000 Subject: [PATCH 487/970] haskell-system-filepath: updated to version 0.4.3 svn path=/nixpkgs/trunk/; revision=30270 --- .../libraries/haskell/system-filepath/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/development/libraries/haskell/system-filepath/default.nix b/pkgs/development/libraries/haskell/system-filepath/default.nix index 5c39279e8a7..75f13c948e9 100644 --- a/pkgs/development/libraries/haskell/system-filepath/default.nix +++ b/pkgs/development/libraries/haskell/system-filepath/default.nix @@ -1,10 +1,10 @@ -{ cabal, text }: +{ cabal, deepseq, text }: cabal.mkDerivation (self: { pname = "system-filepath"; - version = "0.4.2"; - sha256 = "070srsvqqjix0afy5ch1zcmpnrrszkds83rv0dp0izqrlzl038mr"; - buildDepends = [ text ]; + version = "0.4.3"; + sha256 = "16a57dipz3aid5n22gzyd9yqmsxm98c3s6vb7minj82q9rbl5z67"; + buildDepends = [ deepseq text ]; meta = { homepage = "https://john-millikin.com/software/hs-filepath/"; description = "High-level, byte-based file and directory path manipulations"; From 5b28154e86d8a638e962193e62b2425f37a5c32c Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Sun, 6 Nov 2011 18:36:39 +0000 Subject: [PATCH 488/970] haskell-tagsoup: updated to version 0.12.4 svn path=/nixpkgs/trunk/; revision=30271 --- pkgs/development/libraries/haskell/tagsoup/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/tagsoup/default.nix b/pkgs/development/libraries/haskell/tagsoup/default.nix index e31cb09fdf4..d7efd13ea38 100644 --- a/pkgs/development/libraries/haskell/tagsoup/default.nix +++ b/pkgs/development/libraries/haskell/tagsoup/default.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "tagsoup"; - version = "0.12.3"; - sha256 = "0f41kc6kdzslyhskyql431nq0kkdzf13vn9saqi48ycajnrm1vcb"; + version = "0.12.4"; + sha256 = "0szm80sgjj173vdax7gv87mfp9xrq1w34i4v83nbvnfwrx8nis4w"; isLibrary = true; isExecutable = true; buildDepends = [ text ]; From dc4b393ded059d4cc87fb8bf5a23b56a259a0d41 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Sun, 6 Nov 2011 18:36:42 +0000 Subject: [PATCH 489/970] haskell-uniplate: updated to version 1.6.5 svn path=/nixpkgs/trunk/; revision=30272 --- pkgs/development/libraries/haskell/uniplate/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/uniplate/default.nix b/pkgs/development/libraries/haskell/uniplate/default.nix index 020fc6408f3..c3043d0d14c 100644 --- a/pkgs/development/libraries/haskell/uniplate/default.nix +++ b/pkgs/development/libraries/haskell/uniplate/default.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "uniplate"; - version = "1.6.3"; - sha256 = "14p10zhsa9ws0rn2nm0gi25bdyhhs83b6qv8bjyywb02sh15xhkw"; + version = "1.6.5"; + sha256 = "1g29jbh2clxp87p8qjihgjgi8hdqgzray34bg6hv7whsy053apqs"; buildDepends = [ hashable syb unorderedContainers ]; meta = { homepage = "http://community.haskell.org/~ndm/uniplate/"; From c03581c2bee7c502019bb1a4aa4c365f99c64e61 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Sun, 6 Nov 2011 18:36:45 +0000 Subject: [PATCH 490/970] haskell-hlint: updated to version 1.8.18 svn path=/nixpkgs/trunk/; revision=30273 --- pkgs/development/tools/haskell/hlint/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/haskell/hlint/default.nix b/pkgs/development/tools/haskell/hlint/default.nix index 53a60968860..5c2e268b5f6 100644 --- a/pkgs/development/tools/haskell/hlint/default.nix +++ b/pkgs/development/tools/haskell/hlint/default.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "hlint"; - version = "1.8.17"; - sha256 = "0p2sd24zi4a9fynib03dll8jbcc7izbmknfxv80v9j3lb2p8qj5h"; + version = "1.8.18"; + sha256 = "1dn5ca8z6cvmz8nlyb87glk2sk2pma8pjrg8yamn4vr54zq1bf7a"; isLibrary = true; isExecutable = true; buildDepends = [ From a64122818fe80f59f803f50da22516762f43b249 Mon Sep 17 00:00:00 2001 From: Michael Raskin <7c6f434c@mail.ru> Date: Sun, 6 Nov 2011 19:18:02 +0000 Subject: [PATCH 491/970] Cross-compiling TinyCC: move build helpers to buildNativeInputs svn path=/nixpkgs/trunk/; revision=30277 --- pkgs/development/compilers/tinycc/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/compilers/tinycc/default.nix b/pkgs/development/compilers/tinycc/default.nix index 1b24b7008f6..7ece90e8601 100644 --- a/pkgs/development/compilers/tinycc/default.nix +++ b/pkgs/development/compilers/tinycc/default.nix @@ -11,7 +11,7 @@ let version = "0.9.25"; in sha256 = "0dfycf80x73dz67c97j1ry29wrv35393ai5ry46i1x1fzfq6rv8v"; }; - buildInputs = [ perl texinfo ]; + buildNativeInputs = [ perl texinfo ]; patches = [ (fetchurl { From 29bdb369ab0b5557120f5e93ce9747e55f3ededa Mon Sep 17 00:00:00 2001 From: David Guibert Date: Sun, 6 Nov 2011 20:03:00 +0000 Subject: [PATCH 492/970] update cmake svn path=/nixpkgs/trunk/; revision=30278 --- pkgs/development/tools/build-managers/cmake/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/build-managers/cmake/default.nix b/pkgs/development/tools/build-managers/cmake/default.nix index c7484ee6e84..249e441be5d 100644 --- a/pkgs/development/tools/build-managers/cmake/default.nix +++ b/pkgs/development/tools/build-managers/cmake/default.nix @@ -7,7 +7,7 @@ with stdenv.lib; let os = stdenv.lib.optionalString; majorVersion = "2.8"; - minorVersion = "4"; + minorVersion = "6"; version = "${majorVersion}.${minorVersion}"; in @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { src = fetchurl { url = "${meta.homepage}files/v${majorVersion}/cmake-${version}.tar.gz"; - sha256 = "1k2kjaj3vfifb329ff7fr4hcbpbaqb66l97pshq70h7m0zwajznr"; + sha256 = "13kjfpgsrsygz693bzaf2pf9avzr1r56r6znn3zqaz9nmj0rp6g6"; }; patches = From 18fcb0f5f8babb3f9c328cea2e1cfaca3103b4e6 Mon Sep 17 00:00:00 2001 From: David Guibert Date: Sun, 6 Nov 2011 20:03:07 +0000 Subject: [PATCH 493/970] update pulseaudio 0.9.23 -> 1.1 svn path=/nixpkgs/trunk/; revision=30279 --- pkgs/development/libraries/json-c/default.nix | 14 +++++++++++++ pkgs/servers/pulseaudio/default.nix | 21 +++++++++++++------ pkgs/top-level/all-packages.nix | 2 ++ 3 files changed, 31 insertions(+), 6 deletions(-) create mode 100644 pkgs/development/libraries/json-c/default.nix diff --git a/pkgs/development/libraries/json-c/default.nix b/pkgs/development/libraries/json-c/default.nix new file mode 100644 index 00000000000..fa53cb2ddd4 --- /dev/null +++ b/pkgs/development/libraries/json-c/default.nix @@ -0,0 +1,14 @@ +{ stdenv, fetchurl}: + +stdenv.mkDerivation rec { + name = "json-c-0.9"; + src = fetchurl { + url = "http://oss.metaparadigm.com/json-c/json-c-0.9.tar.gz"; + sha256 = "0xcl8cwzm860f8m0cdzyw6slwcddni4mraw4shvr3qgqkdn4hakh"; + }; + meta = { + homepage = "http://oss.metaparadigm.com/json-c/"; + description = "A JSON implementation in C"; + longDescription = "JSON-C implements a reference counting object model that allows you to easily construct JSON objects in C, output them as JSON formatted strings and parse JSON formatted strings back into the C representation of JSON objects."; + }; +} diff --git a/pkgs/servers/pulseaudio/default.nix b/pkgs/servers/pulseaudio/default.nix index 41c819cbe3f..a8a7a543ea6 100644 --- a/pkgs/servers/pulseaudio/default.nix +++ b/pkgs/servers/pulseaudio/default.nix @@ -1,16 +1,18 @@ { stdenv, fetchurl, pkgconfig, gnum4, gdbm, libtool, glib, dbus, avahi , gconf, gtk, libX11, libICE, libSM, libXtst, libXi, intltool, gettext , alsaLib, libsamplerate, libsndfile, speex, bluez, udev -, jackaudioSupport ? false, jackaudio ? null }: +, jackaudioSupport ? false, jackaudio ? null +, xz, json_c, xextproto +}: assert jackaudioSupport -> jackaudio != null; stdenv.mkDerivation rec { - name = "pulseaudio-0.9.23"; + name = "pulseaudio-1.1"; src = fetchurl { - url = "http://freedesktop.org/software/pulseaudio/releases/${name}.tar.gz"; - sha256 = "0kms3w1i48j9368amr8wv83gk4szrnglh1biyp8jyqyb2k388gmg"; + url = "http://freedesktop.org/software/pulseaudio/releases/pulseaudio-1.1.tar.xz"; + sha256 = "1vpm0681zj2jvhbabvnmrmfxr3172k4x58kjb39y5g3fdw9k3rbg"; }; # Since `libpulse*.la' contain `-lgdbm', it must be propagated. @@ -19,7 +21,9 @@ stdenv.mkDerivation rec { buildInputs = [ pkgconfig gnum4 libtool intltool glib dbus avahi libsamplerate libsndfile speex alsaLib bluez udev - #gtk gconf libX11 libICE libSM libXtst libXi + xz json_c + #gtk gconf + libX11 libICE libSM libXtst libXi xextproto ] ++ stdenv.lib.optional jackaudioSupport jackaudio; @@ -32,6 +36,11 @@ stdenv.mkDerivation rec { # Move the udev rules under $(prefix). sed -i "src/Makefile.in" \ -e "s|udevrulesdir[[:blank:]]*=.*$|udevrulesdir = $out/lib/udev/rules.d|g" + + # don't install proximity-helper as root and setuid + sed -i "src/Makefile.in" \ + -e "s|chown root|true |" \ + -e "s|chmod r+s |true |" ''; configureFlags = '' @@ -41,7 +50,7 @@ stdenv.mkDerivation rec { ${if jackaudioSupport then "--enable-jack" else ""} ''; - installFlags = "sysconfdir=$(out)/etc"; + installFlags = "pulseconfdir=$(out)/etc dbuspolicydir=$out/etc/dbus-1/system.d xdgautostartdir=$out/etc/xdg/autostart"; enableParallelBuilding = true; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 1bf59e4e34f..a2998a50031 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -3716,6 +3716,8 @@ let json_glib = callPackage ../development/libraries/json-glib { }; + json_c = callPackage ../development/libraries/json-c { }; + libjson = callPackage ../development/libraries/libjson { }; judy = callPackage ../development/libraries/judy { }; From 84888ac3f16bf2a8a8eb5664629f49dfd0784d8e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= Date: Sun, 6 Nov 2011 21:06:05 +0000 Subject: [PATCH 494/970] glibc 2.12: Add an option to keep debugging symbols. svn path=/nixpkgs/trunk/; revision=30284 --- pkgs/development/libraries/glibc-2.12/default.nix | 15 ++++++++++++++- 1 file changed, 14 insertions(+), 1 deletion(-) diff --git a/pkgs/development/libraries/glibc-2.12/default.nix b/pkgs/development/libraries/glibc-2.12/default.nix index a57996ff35d..89e8c60b7da 100644 --- a/pkgs/development/libraries/glibc-2.12/default.nix +++ b/pkgs/development/libraries/glibc-2.12/default.nix @@ -4,6 +4,7 @@ , installLocales ? true , profilingLibraries ? false , gccCross ? null +, debugSymbols ? false }: assert stdenv.gcc.gcc != null; @@ -13,7 +14,7 @@ let cross = if gccCross != null then gccCross.target else null; in build cross ({ - name = "glibc"; + name = "glibc${if debugSymbols then "-debug" else ""}"; inherit fetchurl stdenv kernelHeaders installLocales profilingLibraries gccCross; @@ -39,6 +40,18 @@ in // + (if debugSymbols + then { + # Build with debugging symbols, but leave optimizations on and don't + # attempt to keep the build tree. + dontStrip = true; + dontCrossStrip = true; + NIX_STRIP_DEBUG = 0; + } + else {}) + + // + (if hurdHeaders != null then rec { inherit machHeaders hurdHeaders libpthreadHeaders mig fetchgit; From 3b3c1670d14df073161e84849b9a4ef8a621a9dc Mon Sep 17 00:00:00 2001 From: Michael Raskin <7c6f434c@mail.ru> Date: Sun, 6 Nov 2011 21:38:02 +0000 Subject: [PATCH 495/970] Obviously, iproute needs host flex svn path=/nixpkgs/trunk/; revision=30285 --- pkgs/os-specific/linux/iproute/default.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/os-specific/linux/iproute/default.nix b/pkgs/os-specific/linux/iproute/default.nix index 6fe5a0aadf2..cc5339ba900 100644 --- a/pkgs/os-specific/linux/iproute/default.nix +++ b/pkgs/os-specific/linux/iproute/default.nix @@ -21,7 +21,8 @@ stdenv.mkDerivation rec { + " CONFDIR=$(out)/etc DOCDIR=$(out)/share/doc/${name}" + " MANDIR=$(out)/share/man"; - buildInputs = [bison flex db4 iptables]; + buildInputs = [db4 iptables]; + buildNativeInputs = [bison flex db4]; meta = { homepage = From adc111e85f64e889a7fcfb736c5903c880063b1d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?= Date: Sun, 6 Nov 2011 21:38:34 +0000 Subject: [PATCH 496/970] Changing my email address, to one I prefer. svn path=/nixpkgs/trunk/; revision=30286 --- pkgs/lib/maintainers.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/lib/maintainers.nix b/pkgs/lib/maintainers.nix index 4cf215ee3b8..9652a32bb2e 100644 --- a/pkgs/lib/maintainers.nix +++ b/pkgs/lib/maintainers.nix @@ -27,7 +27,7 @@ simons = "Peter Simons "; thammers = "Tobias Hammerschmidt "; urkud = "Yury G. Kudryashov "; - viric = "Lluís Batlle i Rossell "; + viric = "Lluís Batlle i Rossell "; winden = "Antonio Vargas Gonzalez "; z77z = "Marco Maggesi "; } From 0efee092464c8866ef1c21d16ad0718060e05c59 Mon Sep 17 00:00:00 2001 From: Michael Raskin <7c6f434c@mail.ru> Date: Mon, 7 Nov 2011 04:26:06 +0000 Subject: [PATCH 497/970] Use correct gmp for cross-build svn path=/nixpkgs/trunk/; revision=30288 --- pkgs/development/libraries/isl/default.nix | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/pkgs/development/libraries/isl/default.nix b/pkgs/development/libraries/isl/default.nix index b6f1d45b8fa..8a59c338711 100644 --- a/pkgs/development/libraries/isl/default.nix +++ b/pkgs/development/libraries/isl/default.nix @@ -5,7 +5,7 @@ let staticFlags = if static then " --enable-static --disable-shared" else ""; in -stdenv.mkDerivation { +stdenv.mkDerivation rec { name = "isl-${version}"; src = fetchurl { @@ -17,6 +17,9 @@ stdenv.mkDerivation { dontDisableStatic = if static then true else false; configureFlags = "--with-gmp-prefix=${gmp}" + staticFlags; + crossAttrs = { + configureFlags = configureFlags + " --with-gmp-prefix=${gmp.hostDrv} "; + }; meta = { homepage = http://www.kotnet.org/~skimo/isl/; From cf77f59ce937546b07c3458810f7481463c4fc2b Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 7 Nov 2011 10:04:40 +0000 Subject: [PATCH 498/970] stellarium: updated to version 0.11.1 svn path=/nixpkgs/trunk/; revision=30289 --- pkgs/applications/science/astronomy/stellarium/default.nix | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/science/astronomy/stellarium/default.nix b/pkgs/applications/science/astronomy/stellarium/default.nix index acf7721489a..7dcc3c0b006 100644 --- a/pkgs/applications/science/astronomy/stellarium/default.nix +++ b/pkgs/applications/science/astronomy/stellarium/default.nix @@ -1,19 +1,18 @@ {stdenv, fetchurl, cmake, freetype, libpng, mesa, gettext, openssl, qt4, perl, libiconv}: let - name = "stellarium-0.11.0"; + name = "stellarium-0.11.1"; in stdenv.mkDerivation { inherit name; src = fetchurl { url = "mirror://sourceforge/stellarium/${name}.tar.gz"; - sha256 = "dbedf47dd0744fb325d67d63d1279101be7f4259af2a5e8027f1072012dd2587"; + sha256 = "1lrz52g2li92yjsrnxqqfmgjy2jmcqszwqpaq9rz9319nd1f2zpl"; }; buildInputs = [ cmake freetype libpng mesa gettext openssl qt4 perl libiconv ]; - cmakeFlags = "-DINTL_INCLUDE_DIR= -DINTL_LIBRARIES="; preConfigure = '' sed -i -e '/typedef void (\*__GLXextFuncPtr)(void);/d' src/core/external/GLee.h ''; From 74ef91cfaeb0c50507c86a9b626c25b80492aa12 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?= Date: Mon, 7 Nov 2011 15:07:19 +0000 Subject: [PATCH 499/970] Updating ntp svn path=/nixpkgs/trunk/; revision=30290 --- pkgs/tools/networking/ntp/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/networking/ntp/default.nix b/pkgs/tools/networking/ntp/default.nix index 8b7ca552545..a3b347f6423 100644 --- a/pkgs/tools/networking/ntp/default.nix +++ b/pkgs/tools/networking/ntp/default.nix @@ -3,11 +3,11 @@ assert stdenv.isLinux -> libcap != null; stdenv.mkDerivation rec { - name = "ntp-4.2.6p2"; + name = "ntp-4.2.6p4"; src = fetchurl { url = "http://www.eecis.udel.edu/~ntp/ntp_spool/ntp4/ntp-4.2/${name}.tar.gz"; - sha256 = "1n79scfvgjk8hn1fr4q2kkk6xm83k68r4p488ai09nm20dwqp2a2"; + sha256 = "1ww1hpy0yfmj13vs46d80hs48hy8ig6kn6p6d8q2syym02khxhyy"; }; configureFlags = '' From 13a3365d4a8295790dcff2058711f1e2f22250a7 Mon Sep 17 00:00:00 2001 From: "Yury G. Kudryashov" Date: Mon, 7 Nov 2011 16:48:05 +0000 Subject: [PATCH 500/970] Add cogl svn path=/nixpkgs/trunk/; revision=30291 --- pkgs/development/libraries/cogl/default.nix | 32 +++++++++++++++++++++ pkgs/top-level/all-packages.nix | 4 ++- 2 files changed, 35 insertions(+), 1 deletion(-) create mode 100644 pkgs/development/libraries/cogl/default.nix diff --git a/pkgs/development/libraries/cogl/default.nix b/pkgs/development/libraries/cogl/default.nix new file mode 100644 index 00000000000..e7ee3816210 --- /dev/null +++ b/pkgs/development/libraries/cogl/default.nix @@ -0,0 +1,32 @@ +{ stdenv, fetchurl_gnome, pkgconfig, mesa, glib, gdk_pixbuf +, pangoSupport ? true, pango, cairo +, libXfixes, libXcomposite, libXdamage, xz }: + +stdenv.mkDerivation rec { + name = src.pkgname; + + src = fetchurl_gnome { + project = "cogl"; + major = "1"; minor = "8"; patchlevel = "0"; extension = "xz"; + sha256 = "0b0arg0sjky5y4ypgh8dpznd9f1azhi1d5rhf4zbcw2mkl91qmdi"; + }; + + buildNativeInputs = [ xz pkgconfig ]; + + propagatedBuildInputs = + [ mesa glib gdk_pixbuf libXfixes libXcomposite libXdamage ]; + + buildInputs = stdenv.lib.optionals pangoSupport [ pango cairo ]; + + meta = { + description = "A small open source library for using 3D graphics hardware for rendering"; + longDescription = + '' + Cogl is a small open source library for using 3D graphics hardware for + rendering. The API departs from the flat state machine style of OpenGL + and is designed to make it easy to write orthogonal components that can + render without stepping on each others toes. + ''; + inherit (glib.meta) platforms; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index a2998a50031..163cab87423 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -3183,6 +3183,8 @@ let cminpack = callPackage ../development/libraries/cminpack { }; + cogl = callPackage ../development/libraries/cogl { }; + coin3d = callPackage ../development/libraries/coin3d { }; commoncpp2 = callPackage ../development/libraries/commoncpp2 { }; @@ -3550,7 +3552,7 @@ let gtkLibs = pkgs.gtkLibs224; - inherit (pkgs.gtkLibs) glib gtk pango cairo; + inherit (pkgs.gtkLibs) glib gtk pango cairo gdk_pixbuf; gtkLibs1x = recurseIntoAttrs (let callPackage = newScope pkgs.gtkLibs1x; in { From a1745052e04dd2c6eba2268c9e5ffbcedb94b34d Mon Sep 17 00:00:00 2001 From: "Yury G. Kudryashov" Date: Mon, 7 Nov 2011 16:48:14 +0000 Subject: [PATCH 501/970] p11-kit svn path=/nixpkgs/trunk/; revision=30292 --- pkgs/development/libraries/p11-kit/default.nix | 18 ++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 20 insertions(+) create mode 100644 pkgs/development/libraries/p11-kit/default.nix diff --git a/pkgs/development/libraries/p11-kit/default.nix b/pkgs/development/libraries/p11-kit/default.nix new file mode 100644 index 00000000000..2f735dd6feb --- /dev/null +++ b/pkgs/development/libraries/p11-kit/default.nix @@ -0,0 +1,18 @@ +{ stdenv, fetchurl }: + +stdenv.mkDerivation rec { + name = "p11-kit-0.7"; + + src = fetchurl { + url = "${meta.homepage}releases/${name}.tar.gz"; + sha256 = "1vj86kc7ir1djlb5akrr3w4x4k7h34pq2l4abwgqmcwxbm4j0lln"; + }; + + postInstall = "rm -frv $out/share/gtk-doc"; + + meta = { + homepage = http://p11-glue.freedesktop.org/; + platforms = stdenv.lib.platfroms.all; + maintainers = [ stdenv.lib.maintainers.urkud ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 163cab87423..ca48400dc24 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -4316,6 +4316,8 @@ let ortp = callPackage ../development/libraries/ortp { }; + p11_kit = callPackage ../development/libraries/p11-kit { }; + pangoxsl = callPackage ../development/libraries/pangoxsl { inherit (gtkLibs) glib pango; }; From c97639368fe57e28fad7a77a7eb07da099128a30 Mon Sep 17 00:00:00 2001 From: "Yury G. Kudryashov" Date: Mon, 7 Nov 2011 16:48:22 +0000 Subject: [PATCH 502/970] libproxy-0.4.7 svn path=/nixpkgs/trunk/; revision=30293 --- pkgs/development/libraries/libproxy/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/libproxy/default.nix b/pkgs/development/libraries/libproxy/default.nix index 08d24c834b6..8461bfef439 100644 --- a/pkgs/development/libraries/libproxy/default.nix +++ b/pkgs/development/libraries/libproxy/default.nix @@ -1,10 +1,10 @@ {stdenv, fetchurl, cmake, zlib}: stdenv.mkDerivation rec { - name = "libproxy-0.4.6"; + name = "libproxy-0.4.7"; src = fetchurl { url = "http://libproxy.googlecode.com/files/${name}.tar.gz"; - sha256 = "9ad912e63b1efca98fb442240a2bc7302e6021c1d0b1b9363327729f29462f30"; + sha256 = "15rp97g3s2xkc842p5qfm8kx3p4awvrwrpl6w71a76qk224abq4g"; }; buildInputs = [cmake zlib]; } From 27ecfa843a1e33db3cbeafd272d0bbc239c04b8b Mon Sep 17 00:00:00 2001 From: "Yury G. Kudryashov" Date: Mon, 7 Nov 2011 16:48:27 +0000 Subject: [PATCH 503/970] json-glib-0.14.0 svn path=/nixpkgs/trunk/; revision=30294 --- .../development/libraries/json-glib/default.nix | 17 +++++++---------- 1 file changed, 7 insertions(+), 10 deletions(-) diff --git a/pkgs/development/libraries/json-glib/default.nix b/pkgs/development/libraries/json-glib/default.nix index 045a35d3c37..25d2f1c4435 100644 --- a/pkgs/development/libraries/json-glib/default.nix +++ b/pkgs/development/libraries/json-glib/default.nix @@ -1,19 +1,16 @@ -{ stdenv, fetchurl, glib, pkgconfig }: +{ stdenv, fetchurl_gnome, glib, pkgconfig, xz }: -let - pname = "json-glib"; - version = "0.10.4"; -in stdenv.mkDerivation rec { - name = pname + "-" + version; + name = src.pkgname; - src = fetchurl { - url = "mirror://gnome/sources/${pname}/0.10/${name}.tar.bz2"; - sha256 = "1naydnjagxw5gsq77lhaasjzfv1kp19v6bkybg1krq7rsd0v7n7g"; + src = fetchurl_gnome { + project = "json-glib"; + major = "0"; minor = "14"; patchlevel = "0"; extension = "xz"; + sha256 = "0mpw996cyidspjwns281l5haj9i8azpkfpl4jf98lh3kcqcr07l2"; }; propagatedBuildInputs = [ glib ]; - buildInputs = [ pkgconfig ]; + buildNativeInputs = [ pkgconfig xz ]; meta = { homepage = http://live.gnome.org/JsonGlib; From b01ac075d51cd2075e274b95711b87830b150182 Mon Sep 17 00:00:00 2001 From: "Yury G. Kudryashov" Date: Mon, 7 Nov 2011 16:48:34 +0000 Subject: [PATCH 504/970] glib-2.30: add passthru.gioModuleDir svn path=/nixpkgs/trunk/; revision=30295 --- pkgs/development/libraries/glib/2.30.x.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/development/libraries/glib/2.30.x.nix b/pkgs/development/libraries/glib/2.30.x.nix index f92b9cf4cca..25f8abfeb0a 100644 --- a/pkgs/development/libraries/glib/2.30.x.nix +++ b/pkgs/development/libraries/glib/2.30.x.nix @@ -26,6 +26,8 @@ stdenv.mkDerivation rec { propagatedBuildInputs = [ zlib libffi ]; + passthru.gioModuleDir = "lib/gio/modules"; + # glib buildsystem fails to find python, thus hardcodes python2.4 in #! postInstall = ''rm -rvf $out/share/gtk-doc''; From 22726acbfcb4290b159ee145b772d8b9de64ddfb Mon Sep 17 00:00:00 2001 From: "Yury G. Kudryashov" Date: Mon, 7 Nov 2011 16:48:40 +0000 Subject: [PATCH 505/970] libical-0.47 (e.g., contains updated TZ info) svn path=/nixpkgs/trunk/; revision=30296 --- pkgs/development/libraries/libical/default.nix | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/development/libraries/libical/default.nix b/pkgs/development/libraries/libical/default.nix index ab7ee1b2da5..3774d0993c6 100644 --- a/pkgs/development/libraries/libical/default.nix +++ b/pkgs/development/libraries/libical/default.nix @@ -1,10 +1,10 @@ {stdenv, fetchurl, perl}: -stdenv.mkDerivation { - name = "libical-0.43"; +stdenv.mkDerivation rec { + name = "libical-0.47"; src = fetchurl { - url = http://superb-east.dl.sourceforge.net/sourceforge/freeassociation/libical-0.43.tar.gz; - md5 = "5f0a1feb60894d0be537aefea5647474"; + url = "mirror://sourceforge/freeassociation/${name}.tar.gz"; + sha256 = "1218vaaks9lvx31mrc8212kyngw2k68xm0914vrd77ixn55vnk5g"; }; - buildInputs = [ perl ]; + buildNativeInputs = [ perl ]; } From b8153a3ac513fbaf6820165bf71d924f0076591d Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Mon, 7 Nov 2011 17:31:10 +0000 Subject: [PATCH 506/970] * Fix typo in meta.platforms. svn path=/nixpkgs/trunk/; revision=30298 --- pkgs/development/libraries/p11-kit/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/libraries/p11-kit/default.nix b/pkgs/development/libraries/p11-kit/default.nix index 2f735dd6feb..8366636a251 100644 --- a/pkgs/development/libraries/p11-kit/default.nix +++ b/pkgs/development/libraries/p11-kit/default.nix @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { meta = { homepage = http://p11-glue.freedesktop.org/; - platforms = stdenv.lib.platfroms.all; + platforms = stdenv.lib.platforms.all; maintainers = [ stdenv.lib.maintainers.urkud ]; }; } From dd8a7b38db7c87cee5e2cc7ca5c714c398c8887d Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 7 Nov 2011 17:48:51 +0000 Subject: [PATCH 507/970] esniper: fixed build with current version of curl svn path=/nixpkgs/trunk/; revision=30299 --- pkgs/applications/networking/esniper/default.nix | 2 ++ .../esniper/fix-build-with-latest-curl.patch | 10 ++++++++++ 2 files changed, 12 insertions(+) create mode 100644 pkgs/applications/networking/esniper/fix-build-with-latest-curl.patch diff --git a/pkgs/applications/networking/esniper/default.nix b/pkgs/applications/networking/esniper/default.nix index 5aaf419d389..4c153fa6ff5 100644 --- a/pkgs/applications/networking/esniper/default.nix +++ b/pkgs/applications/networking/esniper/default.nix @@ -10,6 +10,8 @@ stdenv.mkDerivation { buildInputs = [openssl curl]; + patches = [ ./fix-build-with-latest-curl.patch ]; + postInstall = '' sed -e "2i export PATH=\"$out/bin:\$PATH\"" <"frontends/snipe" >"$out/bin/snipe" chmod 555 "$out/bin/snipe" diff --git a/pkgs/applications/networking/esniper/fix-build-with-latest-curl.patch b/pkgs/applications/networking/esniper/fix-build-with-latest-curl.patch new file mode 100644 index 00000000000..81005fd3ebe --- /dev/null +++ b/pkgs/applications/networking/esniper/fix-build-with-latest-curl.patch @@ -0,0 +1,10 @@ +--- esniper-2-26-0/http.c 2011-08-09 21:05:59.000000000 +0200 ++++ esniper/http.c 2011-08-10 00:24:43.000000000 +0200 +@@ -28,7 +28,6 @@ + #include "esniper.h" + #include + #include +-#include + #include + #include + #include From 7fdb29f0f3dc4c8fffc466ddf9a8776c6247375d Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Mon, 7 Nov 2011 17:51:04 +0000 Subject: [PATCH 508/970] * Make the X11 dependency in PulseAudio optional, just like the JACK dependency. This is important to prevent these dependencies from propagating to all PulseAudio clients. The PulseAudio server in NixOS can enable X11 support (if desired) by setting hardware.pulseaudio.package = pkgs.pulseaudio.override { x11Support = true; }; svn path=/nixpkgs/trunk/; revision=30300 --- pkgs/servers/pulseaudio/default.nix | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/pkgs/servers/pulseaudio/default.nix b/pkgs/servers/pulseaudio/default.nix index a8a7a543ea6..881d9811a40 100644 --- a/pkgs/servers/pulseaudio/default.nix +++ b/pkgs/servers/pulseaudio/default.nix @@ -1,8 +1,9 @@ { stdenv, fetchurl, pkgconfig, gnum4, gdbm, libtool, glib, dbus, avahi -, gconf, gtk, libX11, libICE, libSM, libXtst, libXi, intltool, gettext +, gconf, gtk, intltool, gettext , alsaLib, libsamplerate, libsndfile, speex, bluez, udev , jackaudioSupport ? false, jackaudio ? null -, xz, json_c, xextproto +, x11Support ? false, xlibs +, xz, json_c }: assert jackaudioSupport -> jackaudio != null; @@ -23,9 +24,9 @@ stdenv.mkDerivation rec { libsamplerate libsndfile speex alsaLib bluez udev xz json_c #gtk gconf - libX11 libICE libSM libXtst libXi xextproto ] - ++ stdenv.lib.optional jackaudioSupport jackaudio; + ++ stdenv.lib.optional jackaudioSupport jackaudio + ++ stdenv.lib.optional x11Support xlibs.xlibs; preConfigure = '' # Change the `padsp' script so that it contains the full path to From 51eab4deaa78c777bace94578e27b7483f3ed096 Mon Sep 17 00:00:00 2001 From: Shea Levy Date: Mon, 7 Nov 2011 19:24:01 +0000 Subject: [PATCH 509/970] Only build clang on Linux until the wrapper is set up for non-Linux stdenvs svn path=/nixpkgs/trunk/; revision=30302 --- pkgs/development/compilers/llvm/clang.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/compilers/llvm/clang.nix b/pkgs/development/compilers/llvm/clang.nix index 8e2fa723df6..1763e1e9e16 100644 --- a/pkgs/development/compilers/llvm/clang.nix +++ b/pkgs/development/compilers/llvm/clang.nix @@ -53,6 +53,6 @@ stdenv.mkDerivation { description = "A C language family frontend for LLVM"; license = "BSD"; maintainers = with stdenv.lib.maintainers; [viric shlevy]; - platforms = with stdenv.lib.platforms; all; + platforms = with stdenv.lib.platforms; linux; }; } From e525da59f6ca481d63b5e1c848e6d52d8638404e Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Mon, 7 Nov 2011 21:09:52 +0000 Subject: [PATCH 510/970] * SQLite 3.7.9. svn path=/nixpkgs/trunk/; revision=30304 --- pkgs/development/libraries/sqlite/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/libraries/sqlite/default.nix b/pkgs/development/libraries/sqlite/default.nix index 5475e26dcca..626e3b1297e 100644 --- a/pkgs/development/libraries/sqlite/default.nix +++ b/pkgs/development/libraries/sqlite/default.nix @@ -3,11 +3,11 @@ assert readline != null -> ncurses != null; stdenv.mkDerivation { - name = "sqlite-3.7.7.1"; + name = "sqlite-3.7.9"; src = fetchurl { - url = http://www.sqlite.org/sqlite-autoconf-3070701.tar.gz; - sha256 = "1pvf72gb6yidc4zjml3k6kwhlvvhbgmbm8hfin9y5jvvbyr3dk3x"; + url = http://www.sqlite.org/sqlite-autoconf-3070900.tar.gz; + sha1 = "a9da98a4bde4d9dae5c29a969455d11a03600e11"; }; buildInputs = [ readline ncurses ]; From ddcce29b1843e6e46d3cc656a79943d5dde8eb3e Mon Sep 17 00:00:00 2001 From: "Yury G. Kudryashov" Date: Mon, 7 Nov 2011 21:14:00 +0000 Subject: [PATCH 511/970] phonon-4.5.1 Builds against pulseaudio-1.x svn path=/nixpkgs/trunk/; revision=30306 --- pkgs/development/libraries/phonon/default.nix | 21 ++++++++++++------- 1 file changed, 13 insertions(+), 8 deletions(-) diff --git a/pkgs/development/libraries/phonon/default.nix b/pkgs/development/libraries/phonon/default.nix index 6cf63aa757a..c8eae2eac4e 100644 --- a/pkgs/development/libraries/phonon/default.nix +++ b/pkgs/development/libraries/phonon/default.nix @@ -1,21 +1,26 @@ -{ stdenv, fetchurl, cmake, automoc4, qt4 }: +{ stdenv, fetchurl, cmake, automoc4, qt4, xz }: + +let + v = "4.5.1"; +in stdenv.mkDerivation rec { - name = "phonon-4.5.0"; + name = "phonon-${v}"; src = fetchurl { - url = "mirror://kde/stable/phonon/4.5.0/src/${name}.tar.bz2"; - sha256 = "1p2jhxx3ij9xqxvzdz6fm14b83iag9sk940clgj5jnnw00x93s36"; + url = "mirror://kde/stable/phonon/${v}/src/${name}.tar.xz"; + sha256 = "1j7lw8w7h2z415vhbp2jlgv3mqwvrspf8xnzb8l0gsfanqfg1001"; }; - buildInputs = [ cmake automoc4 qt4 ]; + buildInputs = [ qt4 ]; + buildNativeInputs = [ cmake automoc4 xz ]; + + cmakeFlags = "-DPHONON_MKSPECS_DIR=mkspecs"; preConfigure = '' - substituteInPlace CMakeLists.txt \ - --replace 'PHONON_MKSPECS_DIR}' 'CMAKE_INSTALL_PREFIX}/mkspecs' substituteInPlace designer/CMakeLists.txt \ - --replace 'QT_PLUGINS_DIR}' 'CMAKE_INSTALL_PREFIX}/lib/qt4/plugins' + --replace '{QT_PLUGINS_DIR}' '{CMAKE_INSTALL_PREFIX}/lib/qt4/plugins' ''; meta = { From f5a2998c03e5035858cab0a036e8f55add872ba9 Mon Sep 17 00:00:00 2001 From: David Guibert Date: Mon, 7 Nov 2011 21:33:37 +0000 Subject: [PATCH 512/970] fix _LARGEFILE64_SOURCE in zlib svn path=/nixpkgs/trunk/; revision=30307 --- pkgs/development/libraries/zlib/default.nix | 2 ++ .../libraries/zlib/zlib-LARGEFILE64_SOURCE.patch | 14 ++++++++++++++ 2 files changed, 16 insertions(+) create mode 100644 pkgs/development/libraries/zlib/zlib-LARGEFILE64_SOURCE.patch diff --git a/pkgs/development/libraries/zlib/default.nix b/pkgs/development/libraries/zlib/default.nix index f1b8a006ecf..b4773942141 100644 --- a/pkgs/development/libraries/zlib/default.nix +++ b/pkgs/development/libraries/zlib/default.nix @@ -8,6 +8,8 @@ stdenv.mkDerivation (rec { sha256 = "0n7rlgvjn73pyil3s1l6p77m7wkc809n934rnzxv1b1za4pfar30"; }; + patches = [ ./zlib-LARGEFILE64_SOURCE.patch ]; + configureFlags = if static then "" else "--shared"; preConfigure = '' diff --git a/pkgs/development/libraries/zlib/zlib-LARGEFILE64_SOURCE.patch b/pkgs/development/libraries/zlib/zlib-LARGEFILE64_SOURCE.patch new file mode 100644 index 00000000000..ff308ba3f5e --- /dev/null +++ b/pkgs/development/libraries/zlib/zlib-LARGEFILE64_SOURCE.patch @@ -0,0 +1,14 @@ + Fix compilation with _LARGEFILE64_SOURCE + +diff -ur zlib-1.2.5.orig/zlib.h zlib-1.2.5/zlib.h +--- zlib-1.2.5.orig/zlib.h 2010-04-20 06:12:48.000000000 +0200 ++++ zlib-1.2.5/zlib.h 2010-09-27 21:20:27.398694997 +0200 +@@ -1578,7 +1578,7 @@ + # define gzoffset gzoffset64 + # define adler32_combine adler32_combine64 + # define crc32_combine crc32_combine64 +-# ifdef _LARGEFILE64_SOURCE ++# ifndef _LARGEFILE64_SOURCE + ZEXTERN gzFile ZEXPORT gzopen64 OF((const char *, const char *)); + ZEXTERN z_off_t ZEXPORT gzseek64 OF((gzFile, z_off_t, int)); + ZEXTERN z_off_t ZEXPORT gztell64 OF((gzFile)); From bb889c360545d010f2e558bdcd56a621e318bd5f Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Mon, 7 Nov 2011 22:05:46 +0000 Subject: [PATCH 513/970] * Revert both r30278 (cmake upgrade) and r30307 (zlib fix to get cmake to build). These are more appropriate to the stdenv branch. I'll apply them there. svn path=/nixpkgs/trunk/; revision=30308 --- pkgs/development/libraries/zlib/default.nix | 2 -- .../libraries/zlib/zlib-LARGEFILE64_SOURCE.patch | 14 -------------- .../tools/build-managers/cmake/default.nix | 4 ++-- 3 files changed, 2 insertions(+), 18 deletions(-) delete mode 100644 pkgs/development/libraries/zlib/zlib-LARGEFILE64_SOURCE.patch diff --git a/pkgs/development/libraries/zlib/default.nix b/pkgs/development/libraries/zlib/default.nix index b4773942141..f1b8a006ecf 100644 --- a/pkgs/development/libraries/zlib/default.nix +++ b/pkgs/development/libraries/zlib/default.nix @@ -8,8 +8,6 @@ stdenv.mkDerivation (rec { sha256 = "0n7rlgvjn73pyil3s1l6p77m7wkc809n934rnzxv1b1za4pfar30"; }; - patches = [ ./zlib-LARGEFILE64_SOURCE.patch ]; - configureFlags = if static then "" else "--shared"; preConfigure = '' diff --git a/pkgs/development/libraries/zlib/zlib-LARGEFILE64_SOURCE.patch b/pkgs/development/libraries/zlib/zlib-LARGEFILE64_SOURCE.patch deleted file mode 100644 index ff308ba3f5e..00000000000 --- a/pkgs/development/libraries/zlib/zlib-LARGEFILE64_SOURCE.patch +++ /dev/null @@ -1,14 +0,0 @@ - Fix compilation with _LARGEFILE64_SOURCE - -diff -ur zlib-1.2.5.orig/zlib.h zlib-1.2.5/zlib.h ---- zlib-1.2.5.orig/zlib.h 2010-04-20 06:12:48.000000000 +0200 -+++ zlib-1.2.5/zlib.h 2010-09-27 21:20:27.398694997 +0200 -@@ -1578,7 +1578,7 @@ - # define gzoffset gzoffset64 - # define adler32_combine adler32_combine64 - # define crc32_combine crc32_combine64 --# ifdef _LARGEFILE64_SOURCE -+# ifndef _LARGEFILE64_SOURCE - ZEXTERN gzFile ZEXPORT gzopen64 OF((const char *, const char *)); - ZEXTERN z_off_t ZEXPORT gzseek64 OF((gzFile, z_off_t, int)); - ZEXTERN z_off_t ZEXPORT gztell64 OF((gzFile)); diff --git a/pkgs/development/tools/build-managers/cmake/default.nix b/pkgs/development/tools/build-managers/cmake/default.nix index 249e441be5d..c7484ee6e84 100644 --- a/pkgs/development/tools/build-managers/cmake/default.nix +++ b/pkgs/development/tools/build-managers/cmake/default.nix @@ -7,7 +7,7 @@ with stdenv.lib; let os = stdenv.lib.optionalString; majorVersion = "2.8"; - minorVersion = "6"; + minorVersion = "4"; version = "${majorVersion}.${minorVersion}"; in @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { src = fetchurl { url = "${meta.homepage}files/v${majorVersion}/cmake-${version}.tar.gz"; - sha256 = "13kjfpgsrsygz693bzaf2pf9avzr1r56r6znn3zqaz9nmj0rp6g6"; + sha256 = "1k2kjaj3vfifb329ff7fr4hcbpbaqb66l97pshq70h7m0zwajznr"; }; patches = From 0880b96a3d04a35ddad29a347e5607693723c9e1 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Mon, 7 Nov 2011 22:54:45 +0000 Subject: [PATCH 514/970] * Apply the zlib/cmake updates from the trunk. svn path=/nixpkgs/branches/stdenv-updates/; revision=30309 --- pkgs/development/libraries/zlib/default.nix | 2 ++ .../libraries/zlib/zlib-LARGEFILE64_SOURCE.patch | 14 ++++++++++++++ .../tools/build-managers/cmake/default.nix | 4 ++-- 3 files changed, 18 insertions(+), 2 deletions(-) create mode 100644 pkgs/development/libraries/zlib/zlib-LARGEFILE64_SOURCE.patch diff --git a/pkgs/development/libraries/zlib/default.nix b/pkgs/development/libraries/zlib/default.nix index 13157601e6f..6af8126f5a9 100644 --- a/pkgs/development/libraries/zlib/default.nix +++ b/pkgs/development/libraries/zlib/default.nix @@ -8,6 +8,8 @@ stdenv.mkDerivation (rec { sha256 = "0n7rlgvjn73pyil3s1l6p77m7wkc809n934rnzxv1b1za4pfar30"; }; + patches = [ ./zlib-LARGEFILE64_SOURCE.patch ]; + configureFlags = if static then "" else "--shared"; preConfigure = '' diff --git a/pkgs/development/libraries/zlib/zlib-LARGEFILE64_SOURCE.patch b/pkgs/development/libraries/zlib/zlib-LARGEFILE64_SOURCE.patch new file mode 100644 index 00000000000..ff308ba3f5e --- /dev/null +++ b/pkgs/development/libraries/zlib/zlib-LARGEFILE64_SOURCE.patch @@ -0,0 +1,14 @@ + Fix compilation with _LARGEFILE64_SOURCE + +diff -ur zlib-1.2.5.orig/zlib.h zlib-1.2.5/zlib.h +--- zlib-1.2.5.orig/zlib.h 2010-04-20 06:12:48.000000000 +0200 ++++ zlib-1.2.5/zlib.h 2010-09-27 21:20:27.398694997 +0200 +@@ -1578,7 +1578,7 @@ + # define gzoffset gzoffset64 + # define adler32_combine adler32_combine64 + # define crc32_combine crc32_combine64 +-# ifdef _LARGEFILE64_SOURCE ++# ifndef _LARGEFILE64_SOURCE + ZEXTERN gzFile ZEXPORT gzopen64 OF((const char *, const char *)); + ZEXTERN z_off_t ZEXPORT gzseek64 OF((gzFile, z_off_t, int)); + ZEXTERN z_off_t ZEXPORT gztell64 OF((gzFile)); diff --git a/pkgs/development/tools/build-managers/cmake/default.nix b/pkgs/development/tools/build-managers/cmake/default.nix index c7484ee6e84..249e441be5d 100644 --- a/pkgs/development/tools/build-managers/cmake/default.nix +++ b/pkgs/development/tools/build-managers/cmake/default.nix @@ -7,7 +7,7 @@ with stdenv.lib; let os = stdenv.lib.optionalString; majorVersion = "2.8"; - minorVersion = "4"; + minorVersion = "6"; version = "${majorVersion}.${minorVersion}"; in @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { src = fetchurl { url = "${meta.homepage}files/v${majorVersion}/cmake-${version}.tar.gz"; - sha256 = "1k2kjaj3vfifb329ff7fr4hcbpbaqb66l97pshq70h7m0zwajznr"; + sha256 = "13kjfpgsrsygz693bzaf2pf9avzr1r56r6znn3zqaz9nmj0rp6g6"; }; patches = From 4d0b546566daa1735ebda05c0fdd32ca6ad06b86 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Mon, 7 Nov 2011 23:05:50 +0000 Subject: [PATCH 515/970] * Update Debian Squeeze to 6.0.3. svn path=/nixpkgs/trunk/; revision=30310 --- pkgs/build-support/vm/default.nix | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/pkgs/build-support/vm/default.nix b/pkgs/build-support/vm/default.nix index d3487be717c..979ceae5418 100644 --- a/pkgs/build-support/vm/default.nix +++ b/pkgs/build-support/vm/default.nix @@ -1220,22 +1220,22 @@ rec { }; debian60i386 = { - name = "debian-6.0.2.1-squeeze-i386"; - fullName = "Debian 6.0.2.1 Squeeze (i386)"; + name = "debian-6.0.3-squeeze-i386"; + fullName = "Debian 6.0.3 Squeeze (i386)"; packagesList = fetchurl { url = mirror://debian/dists/squeeze/main/binary-i386/Packages.bz2; - sha256 = "0fv1vkyaci489a8np1aaqbrwnc2d0as39hadyj9dswhm7zgfvmk1"; + sha1 = "90a55b6bb049d0777d06d5b28a1848b38678426b"; }; urlPrefix = mirror://debian; packages = commonDebianPackages; }; debian60x86_64 = { - name = "debian-6.0.2.1-squeeze-amd64"; - fullName = "Debian 6.0.2.1 Squeeze (amd64)"; + name = "debian-6.0.3-squeeze-amd64"; + fullName = "Debian 6.0.3 Squeeze (amd64)"; packagesList = fetchurl { url = mirror://debian/dists/squeeze/main/binary-amd64/Packages.bz2; - sha256 = "1hvaqsmd801syifqwhpd1aqv30xg33z8g74k5pqcqhxqzah653d5"; + sha1 = "071626063ab0a70f10200e2e27a5c7fae29fa4ad"; }; urlPrefix = mirror://debian; packages = commonDebianPackages; From 91ab98ce09f5f7d62932d198f678663d0cf40721 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Tue, 8 Nov 2011 01:30:02 +0000 Subject: [PATCH 516/970] * Update patchelf. svn path=/nixpkgs/branches/stdenv-updates/; revision=30312 --- pkgs/development/tools/misc/patchelf/0.6.nix | 16 ---------------- pkgs/development/tools/misc/patchelf/default.nix | 8 ++++---- pkgs/top-level/all-packages.nix | 3 --- 3 files changed, 4 insertions(+), 23 deletions(-) delete mode 100644 pkgs/development/tools/misc/patchelf/0.6.nix diff --git a/pkgs/development/tools/misc/patchelf/0.6.nix b/pkgs/development/tools/misc/patchelf/0.6.nix deleted file mode 100644 index 5a2a7c1d716..00000000000 --- a/pkgs/development/tools/misc/patchelf/0.6.nix +++ /dev/null @@ -1,16 +0,0 @@ -{ stdenv, fetchurl }: - -stdenv.mkDerivation rec { - name = "patchelf-0.6pre29192"; - - src = fetchurl { - url = "http://hydra.nixos.org/build/1319933/download/2/${name}.tar.bz2"; - sha256 = "1873d76994c112355f53d1ac6233ce334d0852ce67cae6b21f492b9b8e0b48b5"; - }; - - meta = { - homepage = http://nixos.org/patchelf.html; - license = "GPL"; - description = "A small utility to modify the dynamic linker and RPATH of ELF executables"; - }; -} diff --git a/pkgs/development/tools/misc/patchelf/default.nix b/pkgs/development/tools/misc/patchelf/default.nix index 43944ca9acd..857aa1cabcf 100644 --- a/pkgs/development/tools/misc/patchelf/default.nix +++ b/pkgs/development/tools/misc/patchelf/default.nix @@ -1,11 +1,11 @@ -{stdenv, fetchurl}: +{ stdenv, fetchurl }: stdenv.mkDerivation rec { - name = "patchelf-0.5"; - + name = "patchelf-0.6"; + src = fetchurl { url = "http://nixos.org/releases/patchelf/${name}/${name}.tar.bz2"; - sha256 = "24b9a850af45e1a277e234b9eb090b52305a2e1c6b02addeb3ae98b4b49d37ce"; + sha256 = "fc7e7fa95f282fc37a591a802629e0e1ed07bc2a8bf162228d9a69dd76127c01"; }; meta = { diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index a2386ed3220..d888d30eb13 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -2966,8 +2966,6 @@ let patchelf = callPackage ../development/tools/misc/patchelf { }; - patchelf06 = callPackage ../development/tools/misc/patchelf/0.6.nix { }; - peg = callPackage ../development/tools/parsing/peg { }; pmccabe = callPackage ../development/tools/misc/pmccabe { }; @@ -6388,7 +6386,6 @@ let chrome = callPackage ../applications/networking/browsers/chromium { inherit (gnome) GConf; - patchelf = patchelf06; }; chromeWrapper = wrapFirefox From 40980713983c61e04b9242bf269a3570ed0e63af Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Tue, 8 Nov 2011 10:01:14 +0000 Subject: [PATCH 517/970] gravit: cosmetic svn path=/nixpkgs/trunk/; revision=30314 --- pkgs/applications/science/astronomy/gravit/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/applications/science/astronomy/gravit/default.nix b/pkgs/applications/science/astronomy/gravit/default.nix index 8af963f84bc..388e65c9f75 100644 --- a/pkgs/applications/science/astronomy/gravit/default.nix +++ b/pkgs/applications/science/astronomy/gravit/default.nix @@ -26,7 +26,7 @@ stdenv.mkDerivation { license = "GPLv2"; longDescription = '' - Gravit is a gravity simulator which runs under Linux, Windows and + Gravit is a gravity simulator which runs under Linux, Windows and Mac OS X. It uses Newtonian physics using the Barnes-Hut N-body algorithm. Although the main goal of Gravit is to be as accurate as possible, it also creates beautiful looking gravity patterns. From d5a21a68e5862ff3604f5b657bb4031ce76129e6 Mon Sep 17 00:00:00 2001 From: Michael Raskin <7c6f434c@mail.ru> Date: Tue, 8 Nov 2011 10:07:03 +0000 Subject: [PATCH 518/970] Fix raptor build - curl dropped curl/types.h svn path=/nixpkgs/trunk/; revision=30315 --- pkgs/development/libraries/librdf/raptor.nix | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/pkgs/development/libraries/librdf/raptor.nix b/pkgs/development/libraries/librdf/raptor.nix index 738369e796a..dd19d3f179f 100644 --- a/pkgs/development/libraries/librdf/raptor.nix +++ b/pkgs/development/libraries/librdf/raptor.nix @@ -10,6 +10,10 @@ stdenv.mkDerivation rec { buildInputs = [ libxml2 curl ]; + preBuild = '' + sed -e '/curl\/types/d' -i src/*.c src/*.h + ''; + meta = { description = "The RDF Parser Toolkit"; homepage = "http://librdf.org/raptor"; From 753ef6a635e99e34bfc202d84f59ac2e9422b4f4 Mon Sep 17 00:00:00 2001 From: Michael Raskin <7c6f434c@mail.ru> Date: Tue, 8 Nov 2011 10:19:50 +0000 Subject: [PATCH 519/970] Fix gosmore build - curl dropped curl/types.h svn path=/nixpkgs/trunk/; revision=30317 --- pkgs/applications/misc/gosmore/default.nix | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/pkgs/applications/misc/gosmore/default.nix b/pkgs/applications/misc/gosmore/default.nix index 6da8ed05499..e93e2be85e3 100644 --- a/pkgs/applications/misc/gosmore/default.nix +++ b/pkgs/applications/misc/gosmore/default.nix @@ -17,7 +17,11 @@ rec { configureFlags = []; /* doConfigure should be removed if not needed */ - phaseNames = ["doConfigure" "doMakeInstall"]; + phaseNames = ["fixCurlIncludes" "doConfigure" "doMakeInstall"]; + + fixCurlIncludes = a.fullDepEntry '' + sed -e '/curl.types.h/d' -i *.{c,h,hpp,cpp} + '' ["minInit" "doUnpack"]; name = "gosmore-r21657"; meta = { From 6947317d3c1b8ffc3ee6af7802f40db220ac4b8a Mon Sep 17 00:00:00 2001 From: Michael Raskin <7c6f434c@mail.ru> Date: Tue, 8 Nov 2011 11:18:24 +0000 Subject: [PATCH 520/970] Fix xine-ui build - curl dropped curl/types.h svn path=/nixpkgs/trunk/; revision=30318 --- pkgs/applications/video/xine-ui/default.nix | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/pkgs/applications/video/xine-ui/default.nix b/pkgs/applications/video/xine-ui/default.nix index 1ac335ade00..4607c85b6a1 100644 --- a/pkgs/applications/video/xine-ui/default.nix +++ b/pkgs/applications/video/xine-ui/default.nix @@ -14,6 +14,10 @@ stdenv.mkDerivation { xlibs.libXinerama xlibs.libXi ]; + preBuild = '' + sed -e '/curl.types.h/d' -i *.c *.h */*.c */*.h */*/*.c */*/*.h + ''; + configureFlags = "--with-readline=${readline}"; NIX_LDFLAGS = "-lXext -lgcc_s"; From 169d5c32144bf2cecbd30742bb57c5dd8ec59020 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Tue, 8 Nov 2011 14:18:59 +0000 Subject: [PATCH 521/970] * Bump nixUnstable. svn path=/nixpkgs/trunk/; revision=30319 --- pkgs/tools/package-management/nix/unstable.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/package-management/nix/unstable.nix b/pkgs/tools/package-management/nix/unstable.nix index 1483120e409..1f01f6f73af 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.0pre30070"; + name = "nix-1.0pre30305"; src = fetchurl { - url = "http://hydra.nixos.org/build/1480955/download/4/${name}.tar.bz2"; - sha256 = "71335de404ec6745418b524622527b470485fb968bf7cf10a0cb67926ee1286a"; + url = "http://hydra.nixos.org/build/1524522/download/4/${name}.tar.bz2"; + sha256 = "917b22e350e1aee99e465c2df0037ce224dca625e588bb0005e3048fe07cdb9a"; }; buildNativeInputs = [ perl pkgconfig ]; From 756df1fb12ed44175f54dcb7ffa53c33b1df4f36 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Tue, 8 Nov 2011 14:54:46 +0000 Subject: [PATCH 522/970] * Remove AUFS1, it's obsolete and we don't use it anymore. svn path=/nixpkgs/trunk/; revision=30321 --- .../os-specific/linux/aufs/debian-2.6.29.diff | 133 ------------------ pkgs/os-specific/linux/aufs/default.nix | 43 ------ pkgs/top-level/all-packages.nix | 2 - 3 files changed, 178 deletions(-) delete mode 100644 pkgs/os-specific/linux/aufs/debian-2.6.29.diff delete mode 100644 pkgs/os-specific/linux/aufs/default.nix diff --git a/pkgs/os-specific/linux/aufs/debian-2.6.29.diff b/pkgs/os-specific/linux/aufs/debian-2.6.29.diff deleted file mode 100644 index 88660bc4011..00000000000 --- a/pkgs/os-specific/linux/aufs/debian-2.6.29.diff +++ /dev/null @@ -1,133 +0,0 @@ -Debian patch for aufs on 2.6.29 - ---- - -Add support for Kernel 2.6.29. - -Changes we are affected by: - 1. dentry_open() receives a new argument for passing the cred - 2. current->fsuid is now current_fsuid() - 3. disable security_inode_* calls, as they are not exported normally. Enable - them only if CONFIG_AUFS_SEC_PERM_PATCH is defined ---- a/fs/aufs25/export.c -+++ b/fs/aufs25/export.c -@@ -384,7 +384,11 @@ static struct dentry *au_lkup_by_ino(str - if (nsi_lock) - si_read_unlock(parent->d_sb); - path_get(path); -+ #if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 29) - file = dentry_open(parent, path->mnt, au_dir_roflags); -+ #else -+ file = dentry_open(parent, path->mnt, au_dir_roflags, current_cred()); -+ #endif - dentry = (void *)file; - if (IS_ERR(file)) - goto out; ---- a/fs/aufs25/file.c -+++ b/fs/aufs25/file.c -@@ -98,8 +98,13 @@ struct file *au_h_open(struct dentry *de - h_file = NULL; - if (file && au_test_nfs(h_dentry->d_sb)) - h_file = au_h_intent(dentry, bindex, file); -- if (!h_file) -+ if (!h_file) { -+ #if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 29) - h_file = dentry_open(dget(h_dentry), mntget(br->br_mnt), flags); -+ #else -+ h_file = dentry_open(dget(h_dentry), mntget(br->br_mnt), flags, current_cred()); -+ #endif -+ } - - /* - * a dirty trick for handling FMODE_EXEC and deny_write_access(). ---- a/fs/aufs25/inode.c -+++ b/fs/aufs25/inode.c -@@ -405,7 +405,11 @@ int au_test_ro(struct super_block *sb, a - - int au_test_h_perm(struct inode *h_inode, int mask, int dlgt) - { -+ #if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 29) - if (!current->fsuid) -+ #else -+ if (!current_fsuid()) -+ #endif - return 0; - /* todo: fake nameidata? */ - return vfsub_permission(h_inode, mask, NULL, dlgt); ---- a/fs/aufs25/whout.c -+++ b/fs/aufs25/whout.c -@@ -274,9 +274,15 @@ static int do_unlink_wh(struct au_hinode - * forces superio when the dir has a sticky bit. - * this may be a violation of unix fs semantics. - */ -+ #if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 29) - vfsub_args_init(&vargs, &ign, dlgt, - (h_dir->i_mode & S_ISVTX) - && wh_dentry->d_inode->i_uid != current->fsuid); -+ #else -+ vfsub_args_init(&vargs, &ign, dlgt, -+ (h_dir->i_mode & S_ISVTX) -+ && wh_dentry->d_inode->i_uid != current_fsuid()); -+ #endif - vfsub_ign_hinode(&vargs, IN_DELETE, hdir); - err = vfsub_unlink(h_dir, wh_dentry, &vargs); - AuTraceErr(err); -@@ -625,7 +631,11 @@ static void reinit_br_wh(void *arg) - struct vfsub_args vargs; - - AuTraceEnter(); -+ #if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 29) - AuDebugOn(current->fsuid); -+ #else -+ AuDebugOn(current_fsuid()); -+ #endif - - err = 0; - wbr = a->br->br_wbr; ---- a/fs/aufs25/xino.c -+++ b/fs/aufs25/xino.c -@@ -620,8 +620,13 @@ struct file *au_xino_create2(struct supe - AuErr("%.*s create err %d\n", AuLNPair(name), err); - goto out_dput; - } -+ #if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 29) - file = dentry_open(dget(dentry), mntget(base_file->f_vfsmnt), - O_RDWR | O_CREAT | O_EXCL | O_LARGEFILE); -+ #else -+ file = dentry_open(dget(dentry), mntget(base_file->f_vfsmnt), -+ O_RDWR | O_CREAT | O_EXCL | O_LARGEFILE, current_cred()); -+ #endif - if (IS_ERR(file)) { - AuErr("%.*s open err %ld\n", AuLNPair(name), PTR_ERR(file)); - goto out_dput; ---- a/fs/aufs25/i_op.c -+++ b/fs/aufs25/i_op.c -@@ -61,7 +61,7 @@ static int h_permission(struct inode *h_ - AuTraceErr(err); - } - --#if 1 /* todo: export? */ -+#ifdef CONFIG_AUFS_SEC_PERM_PATCH - if (!err) - err = au_security_inode_permission(h_inode, mask, NULL, - dlgt); -@@ -221,7 +221,7 @@ static int h_permission(struct inode *h_ - AuTraceErr(err); - } - --#if 1 /* todo: export? */ -+#ifdef CONFIG_AUFS_SEC_PERM_PATCH - if (!err) - err = au_security_inode_permission(h_inode, mask, fake_nd, - dlgt); ---- a/fs/aufs25/inode.h -+++ b/fs/aufs25/inode.h -@@ -148,7 +148,7 @@ int aufs_rename(struct inode *src_dir, s - /* dlgt.c */ - int au_security_inode_permission(struct inode *h_inode, int mask, - struct nameidata *fake_nd, int dlgt); --#else -+#elif defined(CONFIG_AUFS_SEC_PERM_PATCH) - static inline - int au_security_inode_permission(struct inode *h_inode, int mask, - struct nameidata *fake_nd, int dlgt) diff --git a/pkgs/os-specific/linux/aufs/default.nix b/pkgs/os-specific/linux/aufs/default.nix deleted file mode 100644 index 5321bfa3d6b..00000000000 --- a/pkgs/os-specific/linux/aufs/default.nix +++ /dev/null @@ -1,43 +0,0 @@ -{ stdenv, fetchurl, kernel }: - -stdenv.mkDerivation { - name = "aufs-20090414-${kernel.version}"; - - src = fetchurl { - url = http://nixos.org/tarballs/aufs-20090414.tar.bz2; - sha256 = "1jhf3kccx0m84frlgx2d0ysn1c4272dgci59dsk7vsfrf7yik526"; - }; - - buildPhase = '' - kernelVersion=$(cd ${kernel}/lib/modules && ls) - kernelBuild=$(echo ${kernel}/lib/modules/$kernelVersion/source) - tar xvfj ${kernel.src} - kernelSource=$(echo $(pwd)/linux-*) - cp -prd $kernelBuild/* $kernelSource - - export NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE -I$PWD/include" - - make KDIR=$kernelSource -f local.mk - ''; - - installPhase = '' - ensureDir $out/bin - cp util/aulchown $out/bin - - ensureDir $out/share/man/man5 - cp util/aufs.5 $out/share/man/man5 - - ensureDir $out/lib/modules/$kernelVersion/misc - cp aufs.ko $out/lib/modules/$kernelVersion/misc - ''; - - patches = [ - # Debian patch to build AUFS on 2.6.29+ - ./debian-2.6.29.diff - ]; - - meta = { - description = "Another Unionfs implementation for Linux"; - homepage = http://aufs.sourceforge.net/; - }; -} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index ca48400dc24..0b653fae810 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -5638,8 +5638,6 @@ let ati_drivers_x11 = callPackage ../os-specific/linux/ati-drivers { }; - aufs = callPackage ../os-specific/linux/aufs { }; - aufs2 = if kernel.features ? aufs2 then callPackage ../os-specific/linux/aufs2 { } else null; From b26931a48060fc6d2198a0398fac2932a8d7f1ca Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Tue, 8 Nov 2011 15:05:54 +0000 Subject: [PATCH 523/970] * Refactoring: let linuxPackages.aufs and linuxPackages.aufs_util evaluate to right AUFS for the kernel in question. svn path=/nixpkgs/trunk/; revision=30322 --- pkgs/os-specific/linux/aufs2-util/default.nix | 8 +++-- .../linux/aufs2.1-util/default.nix | 8 +++-- pkgs/os-specific/linux/aufs2.1/default.nix | 2 +- pkgs/os-specific/linux/aufs2/default.nix | 2 +- pkgs/os-specific/linux/aufs3-util/default.nix | 12 ++++--- pkgs/os-specific/linux/aufs3/default.nix | 2 +- pkgs/top-level/all-packages.nix | 36 ++++++++----------- 7 files changed, 35 insertions(+), 35 deletions(-) diff --git a/pkgs/os-specific/linux/aufs2-util/default.nix b/pkgs/os-specific/linux/aufs2-util/default.nix index 50031b7351c..501dcbf4b94 100644 --- a/pkgs/os-specific/linux/aufs2-util/default.nix +++ b/pkgs/os-specific/linux/aufs2-util/default.nix @@ -1,16 +1,18 @@ -{ stdenv, fetchurl, kernel, aufs2 }: +{ stdenv, fetchurl, kernel, aufs }: + +assert aufs != null; let version = "20100506"; in stdenv.mkDerivation { - name = "aufs2-util-${version}"; + name = "aufs2-util-${version}-${kernel.version}"; src = fetchurl { url = "http://nixos.org/tarballs/aufs2-util-git-${version}.tar.bz2"; sha256 = "0ly0c3p8fjxqbk8k5rmm1a91wg8wcrvhi1lv4aawalkkk8rqbnwk"; }; - buildInputs = [ aufs2 ]; + buildInputs = [ aufs ]; makeFlags = [ "KDIR=${kernel}/lib/modules/${kernel.version}/build" diff --git a/pkgs/os-specific/linux/aufs2.1-util/default.nix b/pkgs/os-specific/linux/aufs2.1-util/default.nix index a12a0900ca4..b399378924a 100644 --- a/pkgs/os-specific/linux/aufs2.1-util/default.nix +++ b/pkgs/os-specific/linux/aufs2.1-util/default.nix @@ -1,9 +1,11 @@ -{ stdenv, fetchgit, kernel, aufs2_1 }: +{ stdenv, fetchgit, kernel, aufs }: + +assert aufs != null; let version = "20110217"; in stdenv.mkDerivation { - name = "aufs2.1-util-${version}"; + name = "aufs2.1-util-${version}-${kernel.version}"; src = fetchgit { url = "git://git.c3sl.ufpr.br/aufs/aufs2-util.git"; @@ -11,7 +13,7 @@ stdenv.mkDerivation { sha256 = "0fce5601b67efe8b5652a813ae612348bf4503aa71056cd31a5ed0406632e364"; }; - buildInputs = [ aufs2_1 ]; + buildInputs = [ aufs ]; makeFlags = [ "KDIR=${kernel}/lib/modules/${kernel.version}/build" diff --git a/pkgs/os-specific/linux/aufs2.1/default.nix b/pkgs/os-specific/linux/aufs2.1/default.nix index d118f1f7487..9d2081346e0 100644 --- a/pkgs/os-specific/linux/aufs2.1/default.nix +++ b/pkgs/os-specific/linux/aufs2.1/default.nix @@ -8,7 +8,7 @@ let version = else "20110408"; in stdenv.mkDerivation { - name = "aufs2.1-${version}"; + name = "aufs2.1-${version}-${kernel.version}"; src = if (builtins.lessThan (builtins.compareVersions kernel.version "2.6.38") 0) diff --git a/pkgs/os-specific/linux/aufs2/default.nix b/pkgs/os-specific/linux/aufs2/default.nix index c755b993ec8..696ed57b860 100644 --- a/pkgs/os-specific/linux/aufs2/default.nix +++ b/pkgs/os-specific/linux/aufs2/default.nix @@ -5,7 +5,7 @@ assert kernel.features ? aufsBase; let version = "20100522"; in stdenv.mkDerivation { - name = "aufs2-${version}"; + name = "aufs2-${version}-${kernel.version}"; src = if (builtins.lessThan (builtins.compareVersions kernel.version "2.6.35") 0) then diff --git a/pkgs/os-specific/linux/aufs3-util/default.nix b/pkgs/os-specific/linux/aufs3-util/default.nix index 00c3e99c457..8eefc1b0f4a 100644 --- a/pkgs/os-specific/linux/aufs3-util/default.nix +++ b/pkgs/os-specific/linux/aufs3-util/default.nix @@ -1,15 +1,17 @@ -{ stdenv, fetchgit, kernel, aufs3 }: +{ stdenv, fetchgit, kernel, aufs }: + +assert aufs != null; stdenv.mkDerivation { - name = "aufs3-util-${aufs3.patch.version}"; + name = "aufs3-util-${aufs.patch.version}-${kernel.version}"; src = fetchgit { url = git://aufs.git.sourceforge.net/gitroot/aufs/aufs-util.git; - rev = aufs3.patch.utilRev; - sha256 = aufs3.patch.utilHash; + rev = aufs.patch.utilRev; + sha256 = aufs.patch.utilHash; }; - buildInputs = [ aufs3 ]; + buildInputs = [ aufs ]; makeFlags = [ "KDIR=${kernel}/lib/modules/${kernel.modDirVersion}/build" diff --git a/pkgs/os-specific/linux/aufs3/default.nix b/pkgs/os-specific/linux/aufs3/default.nix index bf73e6510f7..ec3c5aec85b 100644 --- a/pkgs/os-specific/linux/aufs3/default.nix +++ b/pkgs/os-specific/linux/aufs3/default.nix @@ -12,7 +12,7 @@ let in stdenv.mkDerivation { - name = "aufs3-${patch.version}"; + name = "aufs3-${patch.version}-${kernel.version}"; src = patch.patch.src; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 0b653fae810..0f47b7a9564 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -5638,30 +5638,24 @@ let ati_drivers_x11 = callPackage ../os-specific/linux/ati-drivers { }; - aufs2 = if kernel.features ? aufs2 then - callPackage ../os-specific/linux/aufs2 { } + aufs = + if kernel.features ? aufs2 then + callPackage ../os-specific/linux/aufs2 { } + else if kernel.features ? aufs2_1 then + callPackage ../os-specific/linux/aufs2.1 { } + else if kernel.features ? aufs3 then + callPackage ../os-specific/linux/aufs3 { } else null; - aufs2_1 = if kernel.features ? aufs2_1 then - callPackage ../os-specific/linux/aufs2.1 { } + aufs_util = + if kernel.features ? aufs2 then + callPackage ../os-specific/linux/aufs2-util { } + else if kernel.features ? aufs2_1 then + callPackage ../os-specific/linux/aufs2.1-util { } + else if kernel.features ? aufs3 then + callPackage ../os-specific/linux/aufs3-util { } else null; - - aufs3 = if kernel.features ? aufs3 then - callPackage ../os-specific/linux/aufs3 { } - else null; - - aufs2_util = if kernel.features ? aufs2 then - callPackage ../os-specific/linux/aufs2-util { } - else null; - - aufs2_1_util = if kernel.features ? aufs2_1 then - callPackage ../os-specific/linux/aufs2.1-util { } - else null; - - aufs3_util = if kernel.features ? aufs3 then - callPackage ../os-specific/linux/aufs3-util { } - else null; - + blcr = callPackage ../os-specific/linux/blcr { #libtool = libtool_1_5; # libtool 2 causes a fork bomb }; From 172c52f9e9d329c9523fe97a590a9bfa066757ea Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Tue, 8 Nov 2011 15:15:07 +0000 Subject: [PATCH 524/970] * Per the coding guidelines, put different AUFS versions in the same directory. svn path=/nixpkgs/trunk/; revision=30324 --- .../{aufs2.1-util/default.nix => aufs-util/2.1.nix} | 0 .../{aufs2-util/default.nix => aufs-util/2.nix} | 0 .../{aufs3-util/default.nix => aufs-util/3.nix} | 0 .../linux/{aufs2.1/default.nix => aufs/2.1.nix} | 0 .../linux/{aufs2/default.nix => aufs/2.nix} | 0 .../linux/{aufs3/default.nix => aufs/3.nix} | 0 pkgs/top-level/all-packages.nix | 12 ++++++------ 7 files changed, 6 insertions(+), 6 deletions(-) rename pkgs/os-specific/linux/{aufs2.1-util/default.nix => aufs-util/2.1.nix} (100%) rename pkgs/os-specific/linux/{aufs2-util/default.nix => aufs-util/2.nix} (100%) rename pkgs/os-specific/linux/{aufs3-util/default.nix => aufs-util/3.nix} (100%) rename pkgs/os-specific/linux/{aufs2.1/default.nix => aufs/2.1.nix} (100%) rename pkgs/os-specific/linux/{aufs2/default.nix => aufs/2.nix} (100%) rename pkgs/os-specific/linux/{aufs3/default.nix => aufs/3.nix} (100%) diff --git a/pkgs/os-specific/linux/aufs2.1-util/default.nix b/pkgs/os-specific/linux/aufs-util/2.1.nix similarity index 100% rename from pkgs/os-specific/linux/aufs2.1-util/default.nix rename to pkgs/os-specific/linux/aufs-util/2.1.nix diff --git a/pkgs/os-specific/linux/aufs2-util/default.nix b/pkgs/os-specific/linux/aufs-util/2.nix similarity index 100% rename from pkgs/os-specific/linux/aufs2-util/default.nix rename to pkgs/os-specific/linux/aufs-util/2.nix diff --git a/pkgs/os-specific/linux/aufs3-util/default.nix b/pkgs/os-specific/linux/aufs-util/3.nix similarity index 100% rename from pkgs/os-specific/linux/aufs3-util/default.nix rename to pkgs/os-specific/linux/aufs-util/3.nix diff --git a/pkgs/os-specific/linux/aufs2.1/default.nix b/pkgs/os-specific/linux/aufs/2.1.nix similarity index 100% rename from pkgs/os-specific/linux/aufs2.1/default.nix rename to pkgs/os-specific/linux/aufs/2.1.nix diff --git a/pkgs/os-specific/linux/aufs2/default.nix b/pkgs/os-specific/linux/aufs/2.nix similarity index 100% rename from pkgs/os-specific/linux/aufs2/default.nix rename to pkgs/os-specific/linux/aufs/2.nix diff --git a/pkgs/os-specific/linux/aufs3/default.nix b/pkgs/os-specific/linux/aufs/3.nix similarity index 100% rename from pkgs/os-specific/linux/aufs3/default.nix rename to pkgs/os-specific/linux/aufs/3.nix diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 0f47b7a9564..5f91d841821 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -5640,20 +5640,20 @@ let aufs = if kernel.features ? aufs2 then - callPackage ../os-specific/linux/aufs2 { } + callPackage ../os-specific/linux/aufs/2.nix { } else if kernel.features ? aufs2_1 then - callPackage ../os-specific/linux/aufs2.1 { } + callPackage ../os-specific/linux/aufs/2.1.nix { } else if kernel.features ? aufs3 then - callPackage ../os-specific/linux/aufs3 { } + callPackage ../os-specific/linux/aufs/3.nix { } else null; aufs_util = if kernel.features ? aufs2 then - callPackage ../os-specific/linux/aufs2-util { } + callPackage ../os-specific/linux/aufs-util/2.nix { } else if kernel.features ? aufs2_1 then - callPackage ../os-specific/linux/aufs2.1-util { } + callPackage ../os-specific/linux/aufs-util/2.1.nix { } else if kernel.features ? aufs3 then - callPackage ../os-specific/linux/aufs3-util { } + callPackage ../os-specific/linux/aufs-util/3.nix { } else null; blcr = callPackage ../os-specific/linux/blcr { From c65ff0d37dab940102c0b6ffac3b6f2363757f28 Mon Sep 17 00:00:00 2001 From: Shea Levy Date: Tue, 8 Nov 2011 16:00:19 +0000 Subject: [PATCH 525/970] Update aufs3.0, add aufs3.1 svn path=/nixpkgs/trunk/; revision=30329 --- pkgs/os-specific/linux/kernel/patches.nix | 22 ++++++++++++++++++---- pkgs/top-level/all-packages.nix | 2 +- 2 files changed, 19 insertions(+), 5 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/patches.nix b/pkgs/os-specific/linux/kernel/patches.nix index 672464e8965..ca061322c9d 100644 --- a/pkgs/os-specific/linux/kernel/patches.nix +++ b/pkgs/os-specific/linux/kernel/patches.nix @@ -297,12 +297,26 @@ rec { aufs3_0 = rec { name = "aufs3.0"; version = "3.0"; - utilRev = "a08d17d433567c7c2586c5fc2625a714b20fe155"; - utilHash = "4772c1c6a36da7bbd448057c227a9cd1856ccf72748765cf85421ab0c4e34535"; + utilRev = "cabe3601001ab3838215116c32715c9de9412e62"; + utilHash = "7fc6cfe1e69a0b2438eaee056e15d42a2d6be396a637fcfb1b89858fcecc832f"; patch = makeAufs3StandalonePatch { inherit version; - rev = "1067b9d8d64d23c70d905c9cd3c90a669e39c4d4"; - sha256 = "b508cab5987a623f057ae5fdc006c909a6bae6151af6e12fe672bf97b1a7549d"; + rev = "517b27621cdfb793959acac849dae9888338526a"; + sha256 = "8085200ac78d0c1e082d4c721a09f4a4c1d96ae86e307075836d09c3e7d502df"; + }; + features.aufsBase = true; + features.aufs3 = true; + }; + + aufs3_1 = rec { + name = "aufs3.1"; + version = "3.1"; + utilRev = "cabe3601001ab3838215116c32715c9de9412e62"; + utilHash = "7fc6cfe1e69a0b2438eaee056e15d42a2d6be396a637fcfb1b89858fcecc832f"; + patch = makeAufs3StandalonePatch { + inherit version; + rev = "7386b57432ec5e73632a5375804239b02b6c00f0"; + sha256 = "af4e9ad890e1b72d14170c97d8ead53291f09e275db600932724e6181530be2d"; }; features.aufsBase = true; features.aufs3 = true; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 5f91d841821..d694c52aa3e 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -5601,7 +5601,7 @@ let kernelPatches = [ #kernelPatches.fbcondecor_2_6_38 kernelPatches.sec_perm_2_6_24 - #kernelPatches.aufs2_1_2_6_38 + kernelPatches.aufs3_1 #kernelPatches.mips_restart_2_6_36 ]; }; From 7868432b2ed1892e3a55ccc38cefa2ee65287d42 Mon Sep 17 00:00:00 2001 From: Shea Levy Date: Tue, 8 Nov 2011 16:04:14 +0000 Subject: [PATCH 526/970] I no longer wish to maintain older aufs versions svn path=/nixpkgs/trunk/; revision=30330 --- pkgs/os-specific/linux/aufs-util/2.1.nix | 3 +-- pkgs/os-specific/linux/aufs/2.1.nix | 3 +-- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/pkgs/os-specific/linux/aufs-util/2.1.nix b/pkgs/os-specific/linux/aufs-util/2.1.nix index b399378924a..87541def9ad 100644 --- a/pkgs/os-specific/linux/aufs-util/2.1.nix +++ b/pkgs/os-specific/linux/aufs-util/2.1.nix @@ -36,8 +36,7 @@ stdenv.mkDerivation { meta = { description = "Utilities for AUFS2.1"; homepage = http://aufs.sourceforge.net/; - maintainers = [ stdenv.lib.maintainers.eelco - stdenv.lib.maintainers.shlevy ]; + maintainers = [ stdenv.lib.maintainers.eelco ]; platforms = stdenv.lib.platforms.linux; }; } diff --git a/pkgs/os-specific/linux/aufs/2.1.nix b/pkgs/os-specific/linux/aufs/2.1.nix index 9d2081346e0..f6a3a6dffc2 100644 --- a/pkgs/os-specific/linux/aufs/2.1.nix +++ b/pkgs/os-specific/linux/aufs/2.1.nix @@ -42,8 +42,7 @@ stdenv.mkDerivation { description = "Another Unionfs implementation for Linux (second generation)"; homepage = http://aufs.sourceforge.net/; maintainers = [ stdenv.lib.maintainers.eelco - stdenv.lib.maintainers.raskin - stdenv.lib.maintainers.shlevy ]; + stdenv.lib.maintainers.raskin ]; platforms = stdenv.lib.platforms.linux; }; } From d800dcc26cecd09317b68ee955a8c81226e30f3d Mon Sep 17 00:00:00 2001 From: Shea Levy Date: Tue, 8 Nov 2011 16:58:20 +0000 Subject: [PATCH 527/970] Linux 3.2-rc1 svn path=/nixpkgs/trunk/; revision=30336 --- pkgs/os-specific/linux/kernel/linux-3.2.nix | 227 ++++++++++++++++++++ pkgs/top-level/all-packages.nix | 10 + 2 files changed, 237 insertions(+) create mode 100644 pkgs/os-specific/linux/kernel/linux-3.2.nix diff --git a/pkgs/os-specific/linux/kernel/linux-3.2.nix b/pkgs/os-specific/linux/kernel/linux-3.2.nix new file mode 100644 index 00000000000..4067ee5ea85 --- /dev/null +++ b/pkgs/os-specific/linux/kernel/linux-3.2.nix @@ -0,0 +1,227 @@ +args @ { stdenv, fetchurl, userModeLinux ? false, extraConfig ? "" +, perl, mktemp, module_init_tools +, ... }: + +let + configWithPlatform = kernelPlatform : + '' + # Don't include any debug features. + DEBUG_KERNEL n + + # Support drivers that need external firmware. + STANDALONE n + + # Make /proc/config.gz available. + IKCONFIG_PROC y + + # Optimize with -O2, not -Os. + CC_OPTIMIZE_FOR_SIZE n + + # Enable the kernel's built-in memory tester. + MEMTEST y + + # Disable some expensive (?) features. + FTRACE n + KPROBES n + NUMA? n + PM_TRACE_RTC n + + # Enable various subsystems. + ACCESSIBILITY y # Accessibility support + AUXDISPLAY y # Auxiliary Display support + DONGLE y # Serial dongle support + HIPPI? y + MTD_COMPLEX_MAPPINGS y # needed for many devices + SCSI_LOWLEVEL y # enable lots of SCSI devices + SCSI_LOWLEVEL_PCMCIA y + SPI y # needed for many devices + SPI_MASTER y + WAN y + + # Networking options. + IP_PNP n + IPV6_PRIVACY y + NETFILTER_ADVANCED y + IP_VS_PROTO_TCP y + IP_VS_PROTO_UDP y + IP_VS_PROTO_ESP y + IP_VS_PROTO_AH y + IP_DCCP_CCID3 n # experimental + CLS_U32_PERF y + CLS_U32_MARK y + + # Wireless networking. + IPW2100_MONITOR y # support promiscuous mode + IPW2200_MONITOR y # support promiscuous mode + HOSTAP_FIRMWARE y # Support downloading firmware images with Host AP driver + HOSTAP_FIRMWARE_NVRAM y + ATH9K_PCI y # Detect Atheros AR9xxx cards on PCI(e) bus + ATH9K_AHB y # Ditto, AHB bus + + # Some settings to make sure that fbcondecor works - in particular, + # disable tileblitting and the drivers that need it. + + # Enable various FB devices. + FB y + FB_EFI y + FB_NVIDIA_I2C y # Enable DDC Support + FB_RIVA_I2C y + FB_ATY_CT y # Mach64 CT/VT/GT/LT (incl. 3D RAGE) support + FB_ATY_GX y # Mach64 GX support + FB_SAVAGE_I2C y + FB_SAVAGE_ACCEL y + FB_SIS_300 y + FB_SIS_315 y + FB_3DFX_ACCEL y + FB_GEODE y + + # Video configuration + # Enable KMS for devices whose X.org driver supports it. + DRM_I915_KMS y + DRM_RADEON_KMS y + # Hybrid graphics support + VGA_SWITCHEROO y + + # Sound. + SND_AC97_POWER_SAVE y # AC97 Power-Saving Mode + SND_HDA_INPUT_BEEP y # Support digital beep via input layer + SND_USB_CAIAQ_INPUT y + PSS_MIXER y # Enable PSS mixer (Beethoven ADSP-16 and other compatible) + + # USB serial devices. + USB_SERIAL_GENERIC y # USB Generic Serial Driver + USB_SERIAL_KEYSPAN_MPR y # include firmware for various USB serial devices + USB_SERIAL_KEYSPAN_USA28 y + USB_SERIAL_KEYSPAN_USA28X y + USB_SERIAL_KEYSPAN_USA28XA y + USB_SERIAL_KEYSPAN_USA28XB y + USB_SERIAL_KEYSPAN_USA19 y + USB_SERIAL_KEYSPAN_USA18X y + USB_SERIAL_KEYSPAN_USA19W y + USB_SERIAL_KEYSPAN_USA19QW y + USB_SERIAL_KEYSPAN_USA19QI y + USB_SERIAL_KEYSPAN_USA49W y + USB_SERIAL_KEYSPAN_USA49WLC y + + # Filesystem options - in particular, enable extended attributes and + # ACLs for all filesystems that support them. + EXT2_FS_XATTR y # Ext2 extended attributes + EXT2_FS_POSIX_ACL y # Ext2 POSIX Access Control Lists + EXT2_FS_SECURITY y # Ext2 Security Labels + EXT2_FS_XIP y # Ext2 execute in place support + EXT4_FS_POSIX_ACL y + EXT4_FS_SECURITY y + REISERFS_FS_XATTR y + REISERFS_FS_POSIX_ACL y + REISERFS_FS_SECURITY y + JFS_POSIX_ACL y + JFS_SECURITY y + XFS_QUOTA y + XFS_POSIX_ACL y + XFS_RT y # XFS Realtime subvolume support + OCFS2_DEBUG_MASKLOG n + BTRFS_FS_POSIX_ACL y + UBIFS_FS_XATTR y + UBIFS_FS_ADVANCED_COMPR y + NFSD_V2_ACL y + NFSD_V3 y + NFSD_V3_ACL y + NFSD_V4 y + CIFS_XATTR y + CIFS_POSIX y + + # Security related features. + STRICT_DEVMEM y # Filter access to /dev/mem + SECURITY_SELINUX_BOOTPARAM_VALUE 0 # disable SELinux by default + + # Misc. options. + 8139TOO_8129 y + 8139TOO_PIO n # PIO is slower + AIC79XX_DEBUG_ENABLE n + AIC7XXX_DEBUG_ENABLE n + AIC94XX_DEBUG n + B43_PCMCIA y + BLK_DEV_CMD640_ENHANCED y # CMD640 enhanced support + BLK_DEV_IDEACPI y # IDE ACPI support + BLK_DEV_INTEGRITY y + BSD_PROCESS_ACCT_V3 y + BT_HCIUART_BCSP y + BT_HCIUART_H4 y # UART (H4) protocol support + BT_HCIUART_LL y + BT_L2CAP y + BT_SCO y # audio support + BT_RFCOMM m + BT_RFCOMM_TTY y # RFCOMM TTY support + CRASH_DUMP n + DMAR? n # experimental + DVB_DYNAMIC_MINORS y # we use udev + FUSION y # Fusion MPT device support + IDE_GD_ATAPI y # ATAPI floppy support + IRDA_ULTRA y # Ultra (connectionless) protocol + JOYSTICK_IFORCE_232 y # I-Force Serial joysticks and wheels + JOYSTICK_IFORCE_USB y # I-Force USB joysticks and wheels + JOYSTICK_XPAD_FF y # X-Box gamepad rumble support + JOYSTICK_XPAD_LEDS y # LED Support for Xbox360 controller 'BigX' LED + LDM_PARTITION y # Windows Logical Disk Manager (Dynamic Disk) support + LEDS_TRIGGER_IDE_DISK y # LED IDE Disk Trigger + LOGIRUMBLEPAD2_FF y # Logitech Rumblepad 2 force feedback + LOGO n # not needed + MEDIA_ATTACH y + MEGARAID_NEWGEN y + MICROCODE_AMD y + MODVERSIONS y + MOUSE_PS2_ELANTECH y # Elantech PS/2 protocol extension + MTRR_SANITIZER y + NET_FC y # Fibre Channel driver support + PPP_MULTILINK y # PPP multilink support + REGULATOR y # Voltage and Current Regulator Support + SCSI_LOGGING y # SCSI logging facility + SERIAL_8250 y # 8250/16550 and compatible serial support + SLIP_COMPRESSED y # CSLIP compressed headers + SLIP_SMART y + THERMAL_HWMON y # Hardware monitoring support + USB_DEBUG n + USB_EHCI_ROOT_HUB_TT y # Root Hub Transaction Translators + X86_CHECK_BIOS_CORRUPTION y + X86_MCE y + + # Linux Containers + RT_GROUP_SCHED? y + CGROUP_DEVICE? y + CGROUP_MEM_RES_CTLR? y + CGROUP_MEM_RES_CTLR_SWAP? y + DEVPTS_MULTIPLE_INSTANCES? y + + # Enable staging drivers. These are somewhat experimental, but + # they generally don't hurt. + STAGING y + + ${if kernelPlatform ? kernelExtraConfig then kernelPlatform.kernelExtraConfig else ""} + ${extraConfig} + ''; +in + +import ./generic.nix ( + + rec { + version = "3.2-rc1"; + + modDirVersion = "3.2.0-rc1"; + + preConfigure = '' + substituteInPlace scripts/depmod.sh --replace '-b "$INSTALL_MOD_PATH"' "" + ''; + + src = fetchurl { + url = "mirror://kernel/linux/kernel/v3.x/linux-${version}.tar.bz2"; + sha256 = "0pp79njklvjzzr4wpyymqhkiq0xgz1sgil5sjms2xj583jg8c4wm"; + }; + + config = configWithPlatform stdenv.platform; + configCross = configWithPlatform stdenv.cross.platform; + + features.iwlwifi = true; + } + + // removeAttrs args ["extraConfig"] +) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index d694c52aa3e..9bfb812faae 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -5624,6 +5624,15 @@ let ''; }; + linux_3_2 = makeOverridable (import ../os-specific/linux/kernel/linux-3.2.nix) { + inherit fetchurl stdenv perl mktemp module_init_tools ubootChooser; + kernelPatches = + [ #kernelPatches.fbcondecor_2_6_38 + kernelPatches.sec_perm_2_6_24 + #kernelPatches.aufs3_1 + #kernelPatches.mips_restart_2_6_36 + ]; + }; /* Linux kernel modules are inherently tied to a specific kernel. So rather than provide specific instances of those packages for a specific kernel, we have a function that builds those packages @@ -5774,6 +5783,7 @@ let linuxPackages_nanonote_jz_2_6_34 = recurseIntoAttrs (linuxPackagesFor linux_nanonote_jz_2_6_34 pkgs.linuxPackages_nanonote_jz_2_6_34); linuxPackages_nanonote_jz_2_6_35 = recurseIntoAttrs (linuxPackagesFor linux_nanonote_jz_2_6_35 pkgs.linuxPackages_nanonote_jz_2_6_35); linuxPackages_nanonote_jz_2_6_36 = recurseIntoAttrs (linuxPackagesFor linux_nanonote_jz_2_6_36 pkgs.linuxPackages_nanonote_jz_2_6_36); + linuxPackages_3_2 = recurseIntoAttrs (linuxPackagesFor linux_3_2 pkgs.linuxPackages_3_2); # The current default kernel / kernel modules. linux = linuxPackages.kernel; From 9dcb5da174e394f798bd2708054b793f08c97c9e Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Tue, 8 Nov 2011 16:59:30 +0000 Subject: [PATCH 528/970] git-annex: updated to version 3.20111107 svn path=/nixpkgs/trunk/; revision=30337 --- .../version-management/git-and-tools/git-annex/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/version-management/git-and-tools/git-annex/default.nix b/pkgs/applications/version-management/git-and-tools/git-annex/default.nix index 937c2eecd72..cd1fe49228c 100644 --- a/pkgs/applications/version-management/git-and-tools/git-annex/default.nix +++ b/pkgs/applications/version-management/git-and-tools/git-annex/default.nix @@ -4,14 +4,14 @@ }: let - version = "3.20111025"; + version = "3.20111107"; in stdenv.mkDerivation { name = "git-annex-${version}"; src = fetchurl { url = "http://ftp.de.debian.org/debian/pool/main/g/git-annex/git-annex_${version}.tar.gz"; - sha256 = "1ae0fd9551d3397d1b7e5bc1eba9aab47b803bac680c3d019ba6ef7cefe96d27"; + sha256 = "335c90927bd3d434c1a088c6784b039fb7546810795c5d2d7d2a985cfa1e5ba0"; }; buildInputs = [ From 4473afa29712c5c115dd75ba0998a07c98ad9140 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Tue, 8 Nov 2011 17:06:06 +0000 Subject: [PATCH 529/970] haskell-xml-enumerator: updated to version 0.4.3.2 svn path=/nixpkgs/trunk/; revision=30338 --- pkgs/development/libraries/haskell/xml-enumerator/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/xml-enumerator/default.nix b/pkgs/development/libraries/haskell/xml-enumerator/default.nix index 529cf7ff8ac..ad524f53421 100644 --- a/pkgs/development/libraries/haskell/xml-enumerator/default.nix +++ b/pkgs/development/libraries/haskell/xml-enumerator/default.nix @@ -5,8 +5,8 @@ cabal.mkDerivation (self: { pname = "xml-enumerator"; - version = "0.4.3.1"; - sha256 = "1j9950vqaanjig6wv2pk582x1znzb141p5apg05z9i0sk1w5hczh"; + version = "0.4.3.2"; + sha256 = "0ahxg81fr4vf5lwbqsbhvpfczhi2fgxb7qrzd38d2zgklrh9vh7v"; buildDepends = [ attoparsecText attoparsecTextEnumerator blazeBuilder blazeBuilderEnumerator dataDefault enumerator failure text From d72fe9fee285829665108a73a0bf2f557b49d047 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?= Date: Tue, 8 Nov 2011 21:07:57 +0000 Subject: [PATCH 530/970] Adding prayer. It builds on linux x86_64, but I've not tried to run it. svn path=/nixpkgs/trunk/; revision=30347 --- pkgs/servers/prayer/default.nix | 36 +++++ pkgs/servers/prayer/install.patch | 170 +++++++++++++++++++++++ pkgs/tools/networking/uwimap/default.nix | 38 +++++ pkgs/top-level/all-packages.nix | 4 + 4 files changed, 248 insertions(+) create mode 100644 pkgs/servers/prayer/default.nix create mode 100644 pkgs/servers/prayer/install.patch create mode 100644 pkgs/tools/networking/uwimap/default.nix diff --git a/pkgs/servers/prayer/default.nix b/pkgs/servers/prayer/default.nix new file mode 100644 index 00000000000..c67d2c8a010 --- /dev/null +++ b/pkgs/servers/prayer/default.nix @@ -0,0 +1,36 @@ +{ stdenv, fetchurl, perl, openssl, db4, zlib, uwimap, htmlTidy, pam}: + +let + ssl = stdenv.lib.optionals uwimap.withSSL + "-e 's/CCLIENT_SSL_ENABLE.*= false/CCLIENT_SSL_ENABLE=true/'"; +in +stdenv.mkDerivation rec { + name = "prayer-1.3.4"; + + src = fetchurl { + url = "ftp://ftp.csx.cam.ac.uk/pub/software/email/prayer/${name}.tar.gz"; + sha256 = "0a2nmrlwdq4n5019j3mw2xbbc61s7sssjih5ql6r5rvyrrr48szc"; + }; + + buildInputs = [ openssl db4 zlib uwimap htmlTidy pam ]; + buildNativeInputs = [ perl ]; + + NIX_LDFLAGS = "-lpam"; + + patches = [ ./install.patch ]; + postPatch = '' + sed -i -e s/gmake/make/ -e 's/LDAP_ENABLE.*= true/LDAP_ENABLE=false/' \ + ${ssl} \ + -e 's/CCLIENT_LIBS=.*/CCLIENT_LIBS=-lc-client/' \ + -e 's,^PREFIX .*,PREFIX='$out, \ + Config + sed -i -e s,/usr/bin/perl,${perl}/bin/perl, \ + templates/src/*.pl + ''; + + meta = { + homepage = http://www-uxsup.csx.cam.ac.uk/~dpc22/prayer/; + description = "Yet another Webmail interface for IMAP servers on Unix systems written in C"; + license = "GPLv2+"; + }; +} diff --git a/pkgs/servers/prayer/install.patch b/pkgs/servers/prayer/install.patch new file mode 100644 index 00000000000..439202dd955 --- /dev/null +++ b/pkgs/servers/prayer/install.patch @@ -0,0 +1,170 @@ +diff --git a/accountd/Makefile b/accountd/Makefile +index c3e8107..7946776 100644 +--- a/accountd/Makefile ++++ b/accountd/Makefile +@@ -75,6 +75,6 @@ clean: + -rm -f prayer-accountd test core *.o *~ \#*\# + + install: +- $(INSTALL) -m 755 -o ${RO_USER} -g ${RW_GROUP} \ ++ $(INSTALL) -m 755 \ + prayer-accountd ${BROOT}${BIN_DIR} + +diff --git a/files/Makefile b/files/Makefile +index 743d0ed..7eff064 100644 +--- a/files/Makefile ++++ b/files/Makefile +@@ -52,20 +52,20 @@ distclean: + + install-cert: + if [ -f certs/prayer.pem ]; then \ +- $(INSTALL) -o $(RO_USER) -g $(RO_GROUP) \ ++ $(INSTALL) \ + -m $(PRIVATE_FILE) certs/prayer.pem ${BROOT}${PREFIX}/certs; \ + fi + + install-config: etc/prayer.cf +- $(INSTALL) -D -o $(RO_USER) -g $(RO_GROUP) -m $(PUBLIC_FILE) \ ++ $(INSTALL) -D -m $(PUBLIC_FILE) \ + etc/prayer.cf ${BROOT}${PRAYER_CONFIG_FILE} + + install-aconfig: +- $(INSTALL) -D -o $(RO_USER) -g $(RO_GROUP) -m $(PUBLIC_FILE) \ ++ $(INSTALL) -D -m $(PUBLIC_FILE) \ + etc/prayer-accountd.cf ${BROOT}${ACCOUNTD_CONFIG_FILE} + + install-motd: +- $(INSTALL) -o $(RO_USER) -g $(RO_GROUP) -m $(PUBLIC_FILE) \ ++ $(INSTALL) -m $(PUBLIC_FILE) \ + etc/motd.html ${BROOT}${PREFIX}/etc + + install: +@@ -83,6 +83,6 @@ install: + if [ ! -f $(BROOT)$(PREFIX)/etc/motd.html ]; then $(MAKE) install-motd; fi + + redhat-install-init.d: +- install -D -o root -g root -m 755 \ ++ install -D -m 755 \ + ./init.d/prayer $(BROOT)/etc/rc.d/init.d/prayer + #chkconfig prayer --level 2345 on +diff --git a/files/install.sh b/files/install.sh +index 8d1d1f4..0804a08 100755 +--- a/files/install.sh ++++ b/files/install.sh +@@ -2,8 +2,6 @@ + # + # $Cambridge: hermes/src/prayer/files/install.sh,v 1.7 2008/09/16 09:59:56 dpc22 Exp $ + +-PATH=/bin:/sbin/:/usr/bin:/usr/sbin +- + error=0 + + if [ "x$PREFIX" = "x" ]; then +@@ -55,24 +53,20 @@ if [ $error != 0 ]; then + exit 1 + fi + +-if [ ! -d ${VAR_PREFIX} -a `whoami` = "root" ]; then +- ${INSTALL} -d -o ${RW_USER} -g ${RW_GROUP} -m ${PRIVATE_DIR} ${VAR_PREFIX} +-fi +- + if [ ! -d ${PREFIX} ]; then +- ${INSTALL} -d -o ${RO_USER} -g ${RO_GROUP} -m ${PUBLIC_DIR} ${PREFIX} ++ ${INSTALL} -d -m ${PUBLIC_DIR} ${PREFIX} + fi + + if [ ! -d ${PREFIX}/etc ]; then +- ${INSTALL} -d -o ${RO_USER} -g ${RO_GROUP} -m ${PUBLIC_DIR} ${PREFIX}/etc ++ ${INSTALL} -d -m ${PUBLIC_DIR} ${PREFIX}/etc + fi + + if [ ! -d ${PREFIX}/certs ]; then +- ${INSTALL} -d -o ${RO_USER} -g ${RO_GROUP} -m ${PRIVATE_DIR} ${PREFIX}/certs ++ ${INSTALL} -d -m ${PRIVATE_DIR} ${PREFIX}/certs + fi + + if [ ! -d ${BIN_DIR} ]; then +- ${INSTALL} -d -o ${RO_USER} -g ${RO_GROUP} -m ${PUBLIC_DIR} ${BIN_DIR} ++ ${INSTALL} -d -m ${PUBLIC_DIR} ${BIN_DIR} + fi + + for i in icons static +@@ -83,5 +77,4 @@ do + fi + echo Copying ${i} + (tar cf - ${i}) | (cd ${PREFIX} ; tar xf -) +- (cd ${PREFIX}; chown -R ${RO_USER}:${RO_GROUP} ${i}) + done +diff --git a/servers/Makefile b/servers/Makefile +index 021aed5..5ccbd08 100644 +--- a/servers/Makefile ++++ b/servers/Makefile +@@ -107,13 +107,13 @@ clean: + -rm -f $(BIN) core *.o *.flc *~ \#*\# + + install: all +- $(INSTALL) -o $(RO_USER) -g $(RO_GROUP) -m $(PUBLIC_DIR) -d \ ++ $(INSTALL) -m $(PUBLIC_DIR) -d \ + $(BROOT)$(BIN_DIR) +- $(INSTALL) -o $(RO_USER) -g $(RO_GROUP) -m $(PUBLIC_EXEC) \ ++ $(INSTALL) -m $(PUBLIC_EXEC) \ + prayer $(BROOT)$(BIN_DIR) +- $(INSTALL) -o $(RO_USER) -g $(RO_GROUP) -m $(PUBLIC_EXEC) \ ++ $(INSTALL) -m $(PUBLIC_EXEC) \ + prayer-chroot $(BROOT)$(BIN_DIR) +- $(INSTALL) -o $(RO_USER) -g $(RO_GROUP) -m $(PUBLIC_EXEC) \ ++ $(INSTALL) -m $(PUBLIC_EXEC) \ + prayer-session $(BROOT)$(BIN_DIR) + + prayer: $(PRAYER_OBJS) prayer_main.o +diff --git a/templates/cam/Makefile b/templates/cam/Makefile +index 9f4122a..396b628 100644 +--- a/templates/cam/Makefile ++++ b/templates/cam/Makefile +@@ -124,7 +124,7 @@ _template_index.c: + $(COMPILE) $(TYPE) $@ $* + + install: +- $(INSTALL) -o $(RO_USER) -g $(RO_GROUP) -m $(PUBLIC_DIR) -d \ ++ $(INSTALL) -m $(PUBLIC_DIR) -d \ + $(BROOT)$(PREFIX)/templates/$(TYPE) + cp *.t $(BROOT)$(PREFIX)/templates/$(TYPE) + cp *.vars $(BROOT)$(PREFIX)/templates/$(TYPE) +diff --git a/templates/old/Makefile b/templates/old/Makefile +index 31016cf..288a64c 100644 +--- a/templates/old/Makefile ++++ b/templates/old/Makefile +@@ -123,7 +123,7 @@ _template_index.c: + $(COMPILE) $(TYPE) $@ $* + + install: +- $(INSTALL) -o $(RO_USER) -g $(RO_GROUP) -m $(PUBLIC_DIR) -d \ ++ $(INSTALL) -m $(PUBLIC_DIR) -d \ + $(BROOT)$(PREFIX)/templates/$(TYPE) + cp *.t $(BROOT)$(PREFIX)/templates/$(TYPE) + cp *.vars $(BROOT)$(PREFIX)/templates/$(TYPE) +diff --git a/utils/Makefile b/utils/Makefile +index 9c79916..ef82481 100644 +--- a/utils/Makefile ++++ b/utils/Makefile +@@ -72,15 +72,15 @@ clean: + -rm -f $(BIN) core *.o *.flc *~ \#*\# + + install: all +- $(INSTALL) -o $(RO_USER) -g $(RO_GROUP) -m $(PUBLIC_DIR) -d \ ++ $(INSTALL) -m $(PUBLIC_DIR) -d \ + $(BROOT)$(BIN_DIR) +- $(INSTALL) -o $(RO_USER) -g $(RO_GROUP) -m $(PUBLIC_EXEC) \ ++ $(INSTALL) -m $(PUBLIC_EXEC) \ + prayer-ssl-prune $(BROOT)$(BIN_DIR) +- $(INSTALL) -o $(RO_USER) -g $(RO_GROUP) -m $(PUBLIC_EXEC) \ ++ $(INSTALL) -m $(PUBLIC_EXEC) \ + prayer-sem-prune $(BROOT)$(BIN_DIR) +- $(INSTALL) -o $(RO_USER) -g $(RO_GROUP) -m $(PUBLIC_EXEC) \ ++ $(INSTALL) -m $(PUBLIC_EXEC) \ + prayer-db-prune $(BROOT)$(BIN_DIR) +- $(INSTALL) -o $(RO_USER) -g $(RO_GROUP) -m $(PUBLIC_EXEC) \ ++ $(INSTALL) -m $(PUBLIC_EXEC) \ + prayer-cyclog $(BROOT)$(BIN_DIR) + + prayer-ssl-prune: $(PRUNE_OBJS) diff --git a/pkgs/tools/networking/uwimap/default.nix b/pkgs/tools/networking/uwimap/default.nix new file mode 100644 index 00000000000..7d72016cfe2 --- /dev/null +++ b/pkgs/tools/networking/uwimap/default.nix @@ -0,0 +1,38 @@ +{stdenv, fetchurl, pam, openssl}: + +stdenv.mkDerivation { + name = "uw-imap-2007"; + + src = fetchurl { + url = "ftp://ftp.cac.washington.edu/imap/imap-2007f.tar.gz"; + sha256 = "0a2a00hbakh0640r2wdpnwr8789z59wnk7rfsihh3j0vbhmmmqak"; + }; + + makeFlags = "lnp"; # Linux with PAM modules + + buildInputs = [ pam openssl ]; + + patchPhase = '' + sed -i -e s,/usr/local/ssl,${openssl}, \ + src/osdep/unix/Makefile + ''; + + installPhase = '' + ensureDir $out/bin $out/lib $out/include + cp c-client/*.h c-client/linkage.c $out/include + cp c-client/c-client.a $out/lib/libc-client.a + cp mailutil/mailutil imapd/imapd dmail/dmail mlock/mlock mtest/mtest tmail/tmail \ + tools/{an,ua} $out/bin + ''; + + meta = { + homepage = http://www.washington.edu/imap/; + description = "UW IMAP toolkit - IMAP-supporting software developed by the UW"; + license = "Apache2"; + platforms = with stdenv.lib.platforms; linux; + }; + + passthru = { + withSSL = true; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 9bfb812faae..b236888398d 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -5909,6 +5909,8 @@ let powertop = callPackage ../os-specific/linux/powertop { }; + prayer = callPackage ../servers/prayer { }; + procps = callPackage ../os-specific/linux/procps { }; pwdutils = callPackage ../os-specific/linux/pwdutils { }; @@ -7416,6 +7418,8 @@ let uucp = callPackage ../tools/misc/uucp { }; + uwimap = callPackage ../tools/networking/uwimap { }; + uzbl = builderDefsPackage (import ../applications/networking/browsers/uzbl) { inherit pkgconfig webkit makeWrapper; inherit (gtkLibs) gtk glib; From 32b3de1f9602404e058f2e877a1c9785c4c1074b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?= Date: Tue, 8 Nov 2011 22:51:11 +0000 Subject: [PATCH 531/970] Updating the zlib patch to the patch proposed in the zlib-devel list regarding this issue. svn path=/nixpkgs/branches/stdenv-updates/; revision=30349 --- .../zlib/zlib-LARGEFILE64_SOURCE.patch | 81 ++++++++++++++++--- 1 file changed, 68 insertions(+), 13 deletions(-) diff --git a/pkgs/development/libraries/zlib/zlib-LARGEFILE64_SOURCE.patch b/pkgs/development/libraries/zlib/zlib-LARGEFILE64_SOURCE.patch index ff308ba3f5e..5278d81ba83 100644 --- a/pkgs/development/libraries/zlib/zlib-LARGEFILE64_SOURCE.patch +++ b/pkgs/development/libraries/zlib/zlib-LARGEFILE64_SOURCE.patch @@ -1,14 +1,69 @@ - Fix compilation with _LARGEFILE64_SOURCE +http://mail.madler.net/pipermail/zlib-devel_madler.net/2011-June/002583.html -diff -ur zlib-1.2.5.orig/zlib.h zlib-1.2.5/zlib.h ---- zlib-1.2.5.orig/zlib.h 2010-04-20 06:12:48.000000000 +0200 -+++ zlib-1.2.5/zlib.h 2010-09-27 21:20:27.398694997 +0200 -@@ -1578,7 +1578,7 @@ - # define gzoffset gzoffset64 - # define adler32_combine adler32_combine64 - # define crc32_combine crc32_combine64 --# ifdef _LARGEFILE64_SOURCE -+# ifndef _LARGEFILE64_SOURCE - ZEXTERN gzFile ZEXPORT gzopen64 OF((const char *, const char *)); - ZEXTERN z_off_t ZEXPORT gzseek64 OF((gzFile, z_off_t, int)); - ZEXTERN z_off_t ZEXPORT gztell64 OF((gzFile)); +[Zlib-devel] Possible typo in zlib.h + +Mark Adler madler at madler.net + +*** ../zlib-1.2.5/zlib.h 2010-04-19 21:12:48.000000000 -0700 +--- zlib.h 2011-02-26 21:23:30.000000000 -0800 +*************** +*** 1572,1584 **** + #endif + + #if !defined(ZLIB_INTERNAL) && _FILE_OFFSET_BITS-0 == 64 && _LFS64_LARGEFILE-0 +! # define gzopen gzopen64 +! # define gzseek gzseek64 +! # define gztell gztell64 +! # define gzoffset gzoffset64 +! # define adler32_combine adler32_combine64 +! # define crc32_combine crc32_combine64 +! # ifdef _LARGEFILE64_SOURCE + ZEXTERN gzFile ZEXPORT gzopen64 OF((const char *, const char *)); + ZEXTERN z_off_t ZEXPORT gzseek64 OF((gzFile, z_off_t, int)); + ZEXTERN z_off_t ZEXPORT gztell64 OF((gzFile)); +--- 1580,1601 ---- + #endif + + #if !defined(ZLIB_INTERNAL) && _FILE_OFFSET_BITS-0 == 64 && _LFS64_LARGEFILE-0 +! # ifdef Z_PREFIX_SET +! # define z_gzopen z_gzopen64 +! # define z_gzseek z_gzseek64 +! # define z_gztell z_gztell64 +! # define z_gzoffset z_gzoffset64 +! # define z_adler32_combine z_adler32_combine64 +! # define z_crc32_combine z_crc32_combine64 +! # else +! # define gzopen gzopen64 +! # define gzseek gzseek64 +! # define gztell gztell64 +! # define gzoffset gzoffset64 +! # define adler32_combine adler32_combine64 +! # define crc32_combine crc32_combine64 +! # endif +! # ifndef _LARGEFILE64_SOURCE + ZEXTERN gzFile ZEXPORT gzopen64 OF((const char *, const char *)); + ZEXTERN z_off_t ZEXPORT gzseek64 OF((gzFile, z_off_t, int)); + ZEXTERN z_off_t ZEXPORT gztell64 OF((gzFile)); +*** ../zlib-1.2.5/zconf.h.in 2010-04-18 10:58:06.000000000 -0700 +--- zconf.h.in 2010-07-18 09:05:49.000000000 -0700 +*************** +*** 374,380 **** + # undef _LARGEFILE64_SOURCE + #endif + +! #if defined(Z_HAVE_UNISTD_H) || defined(_LARGEFILE64_SOURCE) + # include /* for SEEK_* and off_t */ + # ifdef VMS + # include /* for off_t */ +--- 375,385 ---- + # undef _LARGEFILE64_SOURCE + #endif + +! #if defined(_LARGEFILE64_SOURCE) && _LFS64_LARGEFILE-0 +! # define Z_LARGE +! #endif +! +! #if defined(Z_HAVE_UNISTD_H) || defined(Z_LARGE) + # include /* for SEEK_* and off_t */ + # ifdef VMS + # include /* for off_t */ From fe5dd801b7400b63bbfea59f2ad5ffe343bfb63e Mon Sep 17 00:00:00 2001 From: Shea Levy Date: Wed, 9 Nov 2011 00:03:58 +0000 Subject: [PATCH 532/970] The rtl8192c firmware is back on the realtek site at a new location svn path=/nixpkgs/trunk/; revision=30350 --- pkgs/os-specific/linux/firmware/rtl8192c/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/firmware/rtl8192c/default.nix b/pkgs/os-specific/linux/firmware/rtl8192c/default.nix index 0ab7436ebff..877784d4b58 100644 --- a/pkgs/os-specific/linux/firmware/rtl8192c/default.nix +++ b/pkgs/os-specific/linux/firmware/rtl8192c/default.nix @@ -3,8 +3,8 @@ stdenv.mkDerivation rec { name = "rtl8192c-fw"; src = fetchurl { - url = "ftp://WebUser:n8W9ErCy@208.70.202.219/cn/wlan/92ce_se_de_linux_mac80211_0003.0401.2011.tar.gz"; - sha256 = "002kj6f1xaali2iwrxvirqq0hbiyb2cpf93y2xycp3qd69cp8lik"; + url = "ftp://WebUser:AxPL9s3k@202.134.71.21/cn/wlan/92ce_se_de_linux_mac80211_0004.0816.2011.tar.gz"; + sha256 = "1kg63h5rj4kja2csmqsrxjipb1wpznfbrvn9cla9d9byksy5fn64"; }; phases = [ "unpackPhase" "installPhase" ]; From 33ebbc07dd2a346c3c216acd837d7ac557ccb870 Mon Sep 17 00:00:00 2001 From: Evgeny Egorochkin Date: Wed, 9 Nov 2011 12:58:17 +0000 Subject: [PATCH 533/970] udev: fix for bluetooth devices according to https://bugs.archlinux.org/task/25356 svn path=/nixpkgs/trunk/; revision=30351 --- pkgs/os-specific/linux/udev/173.nix | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/pkgs/os-specific/linux/udev/173.nix b/pkgs/os-specific/linux/udev/173.nix index f5076a9ed15..41b17777edc 100644 --- a/pkgs/os-specific/linux/udev/173.nix +++ b/pkgs/os-specific/linux/udev/173.nix @@ -45,6 +45,10 @@ stdenv.mkDerivation rec { ''; patches = [ ./custom-rules.patch ] ++ + [(fetchurl { + url = https://bugs.archlinux.org/task/25356?getfile=7281; + sha256 = "01xib1pfdbwacgx8dqxgrf67a0mwkpm4kxy9f9v3df93v0m4pmbm"; + })] ++ stdenv.lib.optional (stdenv.system == "armv5tel-linux") ./pre-accept4-kernel.patch; meta = { From 64ee527151bce2dfa90a9bef99fda2b96ae13041 Mon Sep 17 00:00:00 2001 From: Evgeny Egorochkin Date: Wed, 9 Nov 2011 13:01:46 +0000 Subject: [PATCH 534/970] Duplicity: version bump svn path=/nixpkgs/trunk/; revision=30352 --- pkgs/tools/backup/duplicity/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/backup/duplicity/default.nix b/pkgs/tools/backup/duplicity/default.nix index 98d4c1d8c30..c4cc84ba34f 100644 --- a/pkgs/tools/backup/duplicity/default.nix +++ b/pkgs/tools/backup/duplicity/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, python, librsync, gnupg, boto, makeWrapper }: stdenv.mkDerivation { - name = "duplicity-0.6.14"; + name = "duplicity-0.6.16"; src = fetchurl { - url = http://code.launchpad.net/duplicity/0.6-series/0.6.14/+download/duplicity-0.6.14.tar.gz; - sha256 = "1h0gxi7hdz22fvah9mcavimfgahf31pixy1mx2mivncl14b45wf7"; + url = http://code.launchpad.net/duplicity/0.6-series/0.6.16/+download/duplicity-0.6.16.tar.gz; + sha256 = "0n63857swqnq7i697p615dp37bsd5bj0gvlj5ng41584zzjmv328"; }; installPhase = '' From 6d51717fcfb10d83434df784adf1957393dba321 Mon Sep 17 00:00:00 2001 From: Evgeny Egorochkin Date: Wed, 9 Nov 2011 13:01:51 +0000 Subject: [PATCH 535/970] Bangarang: fix deps to get it to compile against kde 4.7 svn path=/nixpkgs/trunk/; revision=30353 --- pkgs/applications/video/bangarang/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/video/bangarang/default.nix b/pkgs/applications/video/bangarang/default.nix index e6ff1770c46..2fe4b4d0bdc 100644 --- a/pkgs/applications/video/bangarang/default.nix +++ b/pkgs/applications/video/bangarang/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, cmake, qt4, kdelibs, automoc4, phonon, soprano, kdemultimedia, taglib, glibc, gettext }: +{ stdenv, fetchurl, cmake, qt4, kdelibs, automoc4, phonon, soprano, shared_desktop_ontologies, kdemultimedia, taglib, glibc, gettext }: stdenv.mkDerivation rec { name = "bangarang-2.0"; @@ -7,7 +7,7 @@ stdenv.mkDerivation rec { sha256 = "1fixqx56k0mk0faz35rzpdg6zaa0mvm4548rg0g7fhafl35fxzlz"; }; - buildInputs = [ cmake qt4 kdelibs automoc4 phonon soprano kdemultimedia taglib glibc gettext ]; + buildInputs = [ cmake qt4 kdelibs automoc4 phonon soprano shared_desktop_ontologies kdemultimedia taglib glibc gettext ]; meta = with stdenv.lib; { description = "A media player for KDE based on Nepomuk and Phonon"; From f8799c65fd3da012b04287b81a8b54e6c1d875fb Mon Sep 17 00:00:00 2001 From: Evgeny Egorochkin Date: Wed, 9 Nov 2011 13:01:55 +0000 Subject: [PATCH 536/970] DigiKam: fix deps svn path=/nixpkgs/trunk/; revision=30354 --- pkgs/applications/graphics/digikam/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/graphics/digikam/default.nix b/pkgs/applications/graphics/digikam/default.nix index 6d4431516f8..c9055a024f1 100644 --- a/pkgs/applications/graphics/digikam/default.nix +++ b/pkgs/applications/graphics/digikam/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, cmake, qt4, kdelibs, automoc4, phonon, qimageblitz, qca2, eigen, -kdegraphics, lcms, jasper, libgphoto2, kdepimlibs, gettext, soprano, kdeedu, +kdegraphics, lcms, jasper, libgphoto2, kdepimlibs, gettext, soprano, kdeedu, libkipi, libkdcraw, libkexiv2, liblqr1, lensfun, pkgconfig }: stdenv.mkDerivation rec { @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { }; buildInputs = [ cmake qt4 kdelibs kdegraphics automoc4 phonon qimageblitz qca2 eigen - lcms jasper libgphoto2 kdepimlibs gettext soprano kdeedu liblqr1 lensfun + lcms jasper libgphoto2 kdepimlibs gettext soprano kdeedu liblqr1 lensfun libkipi libkdcraw libkexiv2 pkgconfig ]; KDEDIRS=kdeedu; From 11426750a0ccd3a247d3a24ae9f53c35666fb1d7 Mon Sep 17 00:00:00 2001 From: Evgeny Egorochkin Date: Wed, 9 Nov 2011 14:24:14 +0000 Subject: [PATCH 537/970] Revert "DigiKam: fix deps" This commit breaks hydra evaluation for some reason, but it works locally for some reason... This reverts commit 3ba002080ab1d8e28ca1b824de01a5156487735f. svn path=/nixpkgs/trunk/; revision=30355 --- pkgs/applications/graphics/digikam/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/graphics/digikam/default.nix b/pkgs/applications/graphics/digikam/default.nix index c9055a024f1..6d4431516f8 100644 --- a/pkgs/applications/graphics/digikam/default.nix +++ b/pkgs/applications/graphics/digikam/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, cmake, qt4, kdelibs, automoc4, phonon, qimageblitz, qca2, eigen, -kdegraphics, lcms, jasper, libgphoto2, kdepimlibs, gettext, soprano, kdeedu, libkipi, libkdcraw, libkexiv2, +kdegraphics, lcms, jasper, libgphoto2, kdepimlibs, gettext, soprano, kdeedu, liblqr1, lensfun, pkgconfig }: stdenv.mkDerivation rec { @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { }; buildInputs = [ cmake qt4 kdelibs kdegraphics automoc4 phonon qimageblitz qca2 eigen - lcms jasper libgphoto2 kdepimlibs gettext soprano kdeedu liblqr1 lensfun libkipi libkdcraw libkexiv2 + lcms jasper libgphoto2 kdepimlibs gettext soprano kdeedu liblqr1 lensfun pkgconfig ]; KDEDIRS=kdeedu; From 43b5478d1ded55fbdd7ac767b078fdbe29d1da16 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Wed, 9 Nov 2011 16:44:49 +0000 Subject: [PATCH 538/970] * x11vnc updated to 0.9.13. svn path=/nixpkgs/trunk/; revision=30356 --- pkgs/tools/X11/x11vnc/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/X11/x11vnc/default.nix b/pkgs/tools/X11/x11vnc/default.nix index ceb3798f6de..04c3ad4d806 100644 --- a/pkgs/tools/X11/x11vnc/default.nix +++ b/pkgs/tools/X11/x11vnc/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, openssl, zlib, libjpeg, xorg }: stdenv.mkDerivation rec { - name = "x11vnc-0.9.12"; + name = "x11vnc-0.9.13"; src = fetchurl { url = "mirror://sourceforge/libvncserver/${name}.tar.gz"; - sha256 = "60a7cceee2c9a5f1c854340b2bae13f975ac55906237042f81f795b28a154a79"; + sha256 = "0fzib5xb1vbs8kdprr4z94v0fshj2c5hhaz69llaarwnc8p9z0pn"; }; buildInputs = From af4bbc68a27220d4b4607aaa8adf7a8fec9e30de Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Wed, 9 Nov 2011 18:00:50 +0000 Subject: [PATCH 539/970] haskell-safe: updated to version 0.3.1 svn path=/nixpkgs/trunk/; revision=30357 --- pkgs/development/libraries/haskell/safe/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/safe/default.nix b/pkgs/development/libraries/haskell/safe/default.nix index 20044e6905b..ed474bed597 100644 --- a/pkgs/development/libraries/haskell/safe/default.nix +++ b/pkgs/development/libraries/haskell/safe/default.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "safe"; - version = "0.3"; - sha256 = "174jm7nlqsgvc6namjpfknlix6yy2sf9pxnb3ifznjvx18kgc7m0"; + version = "0.3.1"; + sha256 = "0sq4fcwh9bmhi79rnxh70hqwa2k3sipqnvq0f9a78j4wg6nmm6li"; meta = { homepage = "http://community.haskell.org/~ndm/safe/"; description = "Library for safe (pattern match free) functions"; From 2fb991c7ff378b258b08d525ef4aea8d061b4d9a Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Wed, 9 Nov 2011 18:00:54 +0000 Subject: [PATCH 540/970] haskell-texmath: updated to version 0.5.0.3 svn path=/nixpkgs/trunk/; revision=30358 --- pkgs/development/libraries/haskell/texmath/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/texmath/default.nix b/pkgs/development/libraries/haskell/texmath/default.nix index 2bfc62b9bff..d25c80a1810 100644 --- a/pkgs/development/libraries/haskell/texmath/default.nix +++ b/pkgs/development/libraries/haskell/texmath/default.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "texmath"; - version = "0.5.0.2"; - sha256 = "1ysg28q1l33hi6ias5pw0qps46kbys5piczipacrp58b0cm6pvrg"; + version = "0.5.0.3"; + sha256 = "0pw3b5qvsngy0wdny8y3widkaphvjksg7mnpa8yzqfsw0rl36s0p"; isLibrary = true; isExecutable = true; buildDepends = [ parsec syb xml ]; From c761760442b819ce4da10bf4f842aca576fc21f0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?= Date: Wed, 9 Nov 2011 18:25:55 +0000 Subject: [PATCH 541/970] Adding imapproxy svn path=/nixpkgs/trunk/; revision=30360 --- pkgs/tools/networking/imapproxy/default.nix | 21 +++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 23 insertions(+) create mode 100644 pkgs/tools/networking/imapproxy/default.nix diff --git a/pkgs/tools/networking/imapproxy/default.nix b/pkgs/tools/networking/imapproxy/default.nix new file mode 100644 index 00000000000..7af7f73aad9 --- /dev/null +++ b/pkgs/tools/networking/imapproxy/default.nix @@ -0,0 +1,21 @@ +{stdenv, fetchurl, openssl, ncurses}: + +stdenv.mkDerivation rec { + name = "imapproxy-1.2.7"; + src = fetchurl { + url = mirror://sourceforge/squirrelmail/squirrelmail-imap_proxy-1.2.7.tar.bz2; + sha256 = "0j5fq755sxiz338ia93jrkiy64crv30g37pir5pxfys57q7d92nx"; + }; + + buildInputs = [ openssl ncurses ]; + + patchPhase = '' + sed -i -e 's/-o \(root\|bin\) -g \(sys\|bin\)//' Makefile.in + ''; + + meta = { + homepage = http://imapproxy.org/; + description = "It proxies IMAP transactions caching server connections"; + license = "GPLv2+"; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index b236888398d..f052eb21bb9 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -847,6 +847,8 @@ let iftop = callPackage ../tools/networking/iftop { }; + imapproxy = callPackage ../tools/networking/imapproxy { }; + imapsync = callPackage ../tools/networking/imapsync { inherit (perlPackages) MailIMAPClient; }; From 3f160bea0e9f1216bb955190391391f6f30824ff Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?= Date: Wed, 9 Nov 2011 22:59:46 +0000 Subject: [PATCH 542/970] Updating xterm. Just to have the latest. svn path=/nixpkgs/trunk/; revision=30364 --- pkgs/applications/misc/xterm/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/misc/xterm/default.nix b/pkgs/applications/misc/xterm/default.nix index e0df36efcb8..b4fab591ef4 100644 --- a/pkgs/applications/misc/xterm/default.nix +++ b/pkgs/applications/misc/xterm/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, xorg, ncurses, freetype, pkgconfig }: stdenv.mkDerivation rec { - name = "xterm-268"; + name = "xterm-276"; src = fetchurl { url = "ftp://invisible-island.net/xterm/${name}.tgz"; - sha256 = "1hr886mgr74k146fjppnq1pmg6f95l00v88cfwac3rms5lx7ckap"; + sha256 = "1k3k025z3vl91sc8i7f5lmnsb1rsblpbijri9vnxgpynw4wgrc7b"; }; buildInputs = From e85bfd3c1b5a0fb0ca3e11c11ca6e600c72a9c34 Mon Sep 17 00:00:00 2001 From: Michael Raskin <7c6f434c@mail.ru> Date: Thu, 10 Nov 2011 04:20:33 +0000 Subject: [PATCH 543/970] Update SBCL svn path=/nixpkgs/trunk/; revision=30365 --- pkgs/development/compilers/sbcl/src-for-default.nix | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/development/compilers/sbcl/src-for-default.nix b/pkgs/development/compilers/sbcl/src-for-default.nix index 364fbd621d7..304d455813e 100644 --- a/pkgs/development/compilers/sbcl/src-for-default.nix +++ b/pkgs/development/compilers/sbcl/src-for-default.nix @@ -1,9 +1,9 @@ rec { - version="1.0.51"; - name="sbcl-1.0.51"; - hash="0kh7c7pgiv0k0rsm1iysbcp0hf2148fhpixi4d8kclryzqpzl9yj"; - url="http://downloads.sourceforge.net/project/sbcl/sbcl/1.0.51/sbcl-1.0.51-source.tar.bz2"; - advertisedUrl="http://downloads.sourceforge.net/project/sbcl/sbcl/1.0.51/sbcl-1.0.51-source.tar.bz2"; + version="http://sourceforge.net/projects/sbcl/files/"; + name="sbcl-http://sourceforge.net/projects/sbcl/files/"; + hash="12raihz82vgimb1598fgyd1d91yamkvycrfyplgzcggysjhld7w8"; + url=""; + advertisedUrl="http://sourceforge.net/projects/sbcl/files/"; } From 279e5fb324061e36da2e4809d64effdbd53f2f9e Mon Sep 17 00:00:00 2001 From: Michael Raskin <7c6f434c@mail.ru> Date: Thu, 10 Nov 2011 04:31:52 +0000 Subject: [PATCH 544/970] Update Wine svn path=/nixpkgs/trunk/; revision=30366 --- pkgs/misc/emulators/wine/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/misc/emulators/wine/default.nix b/pkgs/misc/emulators/wine/default.nix index 17755a17b7b..2a6409a8fdd 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.3.29"; + name = "wine-1.3.32"; src = fetchurl { url = "mirror://sourceforge/wine/${name}.tar.bz2"; - sha256 = "1mi4xzbpqmian9q5bs6df8b1mfgnnd4mlh0kb2ynbpk7kmx0zyj1"; + sha256 = "fe1691ef8e9c5c4afeb345ad0f0b364d055cfe67a7e64b0a4a44da4d85cfa8b6"; }; gecko = fetchurl { From 2eadc91f849f16c585b4122d036e2e93df437324 Mon Sep 17 00:00:00 2001 From: Michael Raskin <7c6f434c@mail.ru> Date: Thu, 10 Nov 2011 05:18:30 +0000 Subject: [PATCH 545/970] Oops svn path=/nixpkgs/trunk/; revision=30367 --- pkgs/development/compilers/sbcl/src-for-default.nix | 10 +++++----- .../compilers/sbcl/src-info-for-default.nix | 7 +++---- 2 files changed, 8 insertions(+), 9 deletions(-) diff --git a/pkgs/development/compilers/sbcl/src-for-default.nix b/pkgs/development/compilers/sbcl/src-for-default.nix index 304d455813e..fba20ca926c 100644 --- a/pkgs/development/compilers/sbcl/src-for-default.nix +++ b/pkgs/development/compilers/sbcl/src-for-default.nix @@ -1,9 +1,9 @@ rec { - version="http://sourceforge.net/projects/sbcl/files/"; - name="sbcl-http://sourceforge.net/projects/sbcl/files/"; - hash="12raihz82vgimb1598fgyd1d91yamkvycrfyplgzcggysjhld7w8"; - url=""; - advertisedUrl="http://sourceforge.net/projects/sbcl/files/"; + version="1.0.53"; + name="sbcl-1.0.53"; + hash="02jb2pz0jlv9fcc8hln4afklz6ic3lwrwd0sszkz09zxj7d5vha9"; + url="http://downloads.sourceforge.net/project/sbcl/sbcl/1.0.53/sbcl-1.0.53-source.tar.bz2"; + advertisedUrl="http://downloads.sourceforge.net/project/sbcl/sbcl/1.0.53/sbcl-1.0.53-source.tar.bz2"; } diff --git a/pkgs/development/compilers/sbcl/src-info-for-default.nix b/pkgs/development/compilers/sbcl/src-info-for-default.nix index 4bc8516d4b9..597aded1792 100644 --- a/pkgs/development/compilers/sbcl/src-info-for-default.nix +++ b/pkgs/development/compilers/sbcl/src-info-for-default.nix @@ -1,8 +1,7 @@ { baseName = "sbcl"; - downloadPage = "http://sourceforge.net/projects/sbcl/files/"; - choiceCommand = "head -n 2| tail -n 1 | sed -e 's@/download@@;'\"$skipRedirectSF\""; - sourceRegexp = "source[.-].*tar"; + downloadPage = "http://sourceforge.net/projects/sbcl/files/sbcl/"; + choiceCommand = "head -n 1 | sed -re 's%.*/([0-9.]+)/%http://downloads.sourceforge.net/project/sbcl/sbcl/\\1/sbcl-\\1-source.tar.bz2%'"; + sourceRegexp = "[/][0-9.]+/\$"; versionExtractorSedScript = "s/.*-([0-9.rc]+)-.*/\\1/"; - blacklistRegexp = "1[.]0[.]3[012]|1[.]0[.]29[.]54[.]rc1"; } From 2627cc77a7b1e12bd5e0a453010eb0178f760c01 Mon Sep 17 00:00:00 2001 From: Michael Raskin <7c6f434c@mail.ru> Date: Thu, 10 Nov 2011 11:51:51 +0000 Subject: [PATCH 546/970] Update Racket svn path=/nixpkgs/trunk/; revision=30368 --- pkgs/development/interpreters/racket/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/interpreters/racket/default.nix b/pkgs/development/interpreters/racket/default.nix index 0b2eac45e3f..81a8c8ec696 100644 --- a/pkgs/development/interpreters/racket/default.nix +++ b/pkgs/development/interpreters/racket/default.nix @@ -4,12 +4,12 @@ stdenv.mkDerivation rec { pname = "racket"; - version = "5.1.3"; + version = "5.2"; name = "${pname}-${version}"; src = fetchurl { url = "http://download.racket-lang.org/installers/${version}/${pname}/${name}-src-unix.tgz"; - sha256 = "0dhcx6fzjc2cnhfr0j3pbq8lgxfgmhssidi62q0byiqpcm8wjd98"; + sha256 = "1viz2hq1q1wyw9jmnssg5sbgglh05fwqkhyhfbak9lb6nfbhlg5w"; }; # Various racket executables do run-time searches for these. From fa47d66e22732ed054ba9a77649397ad89179cc0 Mon Sep 17 00:00:00 2001 From: Marco Maggesi Date: Thu, 10 Nov 2011 15:35:53 +0000 Subject: [PATCH 547/970] Updated HOL Light to revision 112 svn path=/nixpkgs/trunk/; revision=30369 --- pkgs/applications/science/logic/hol_light/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/science/logic/hol_light/default.nix b/pkgs/applications/science/logic/hol_light/default.nix index d835e351cac..3f161b5249d 100644 --- a/pkgs/applications/science/logic/hol_light/default.nix +++ b/pkgs/applications/science/logic/hol_light/default.nix @@ -1,11 +1,11 @@ {stdenv, fetchsvn, writeScript, ocaml, findlib, camlp5}: stdenv.mkDerivation rec { - name = "hol_light-20110813"; + name = "hol_light-20111106"; src = fetchsvn { url = http://hol-light.googlecode.com/svn/trunk; - rev = "102"; - sha256 = "5b972672db6aa1838dc5d130accd9ab6a62030c6b0c1dc4b69e42088b1ae86c9"; + rev = "112"; + sha256 = "6c7b39ea024b2e8042c1a22a01f778caedaaf82189c9f2c1cfa8c08707151129"; }; buildInputs = [ ocaml findlib camlp5 ]; From d0c78d6a58999f18a5b8983c22828e482a7b1dea Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Thu, 10 Nov 2011 19:05:43 +0000 Subject: [PATCH 548/970] * TigerVNC updated to 1.1.0. * Build TigerVNC with TLS and PAM support. TLS support is important to support encrypted VNC servers. svn path=/nixpkgs/trunk/; revision=30372 --- pkgs/tools/admin/tigervnc/default.nix | 28 +++++++++++++-------------- 1 file changed, 13 insertions(+), 15 deletions(-) diff --git a/pkgs/tools/admin/tigervnc/default.nix b/pkgs/tools/admin/tigervnc/default.nix index dd76bdd26e8..f5384a85978 100644 --- a/pkgs/tools/admin/tigervnc/default.nix +++ b/pkgs/tools/admin/tigervnc/default.nix @@ -1,21 +1,17 @@ -{stdenv, fetchsvn, libX11, libXext, gettext, libICE, libXtst, libXi, libSM, xorgserver, -autoconf, automake, cvs, libtool, nasm, utilmacros, pixman, xkbcomp, xkeyboard_config, -fontDirectories, fontutil }: +{ stdenv, fetchurl, libX11, libXext, gettext, libICE, libXtst, libXi, libSM, xorgserver +, autoconf, automake, cvs, libtool, nasm, utilmacros, pixman, xkbcomp, xkeyboard_config +, fontDirectories, fontutil, libgcrypt, gnutls, pam }: with stdenv.lib; -stdenv.mkDerivation { - name = "tigervnc-svn-4232"; - src = fetchsvn { - url = https://tigervnc.svn.sourceforge.net/svnroot/tigervnc/trunk; - rev = 4232; - sha256 = "070lsddgx6qj7bpw4p65w54fr7z46vp8wyshv9p0fh3k5izrfnxj"; +stdenv.mkDerivation rec { + name = "tigervnc-1.1.0"; + + src = fetchurl { + url = "mirror://sourceforge/tigervnc/${name}.tar.gz"; + sha256 = "1x30s12fwv9rk0fnwwn631qq0d8rpjjx53bvzlx8c91cba170jsr"; }; - preConfigure = '' - autoreconf -vfi - ''; - configureFlags = "--enable-nls"; inherit fontDirectories; @@ -66,8 +62,10 @@ stdenv.mkDerivation { make TIGERVNC_SRCDIR=`pwd`/../.. install ''; - buildInputs = [ libX11 libXext gettext libICE libXtst libXi libSM autoconf automake cvs - libtool nasm utilmacros fontutil ] ++ xorgserver.buildNativeInputs; + buildInputs = + [ libX11 libXext gettext libICE libXtst libXi libSM autoconf automake cvs + libtool nasm utilmacros fontutil libgcrypt gnutls pam + ] ++ xorgserver.buildNativeInputs; propagatedBuildInputs = xorgserver.propagatedBuildNativeInputs; From 75b527df8e6266efd95b7ecbb893889b1686960e Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Thu, 10 Nov 2011 19:06:02 +0000 Subject: [PATCH 549/970] * Fix some hard-coded paths. svn path=/nixpkgs/trunk/; revision=30373 --- pkgs/tools/X11/x11vnc/default.nix | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/pkgs/tools/X11/x11vnc/default.nix b/pkgs/tools/X11/x11vnc/default.nix index 04c3ad4d806..909c12e9f60 100644 --- a/pkgs/tools/X11/x11vnc/default.nix +++ b/pkgs/tools/X11/x11vnc/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, openssl, zlib, libjpeg, xorg }: +{ stdenv, fetchurl, openssl, zlib, libjpeg, xorg, coreutils }: stdenv.mkDerivation rec { name = "x11vnc-0.9.13"; @@ -18,6 +18,10 @@ stdenv.mkDerivation rec { preConfigure = '' configureFlags="--mandir=$out/share/man" + + substituteInPlace x11vnc/unixpw.c \ + --replace '"/bin/su"' '"/var/setuid-wrappers/su"' \ + --replace '"/bin/true"' '"${coreutils}/bin/true"' ''; meta = { From 9908557ae0f7f4a58fa084c55ea836c3febf12af Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?= Date: Thu, 10 Nov 2011 21:19:30 +0000 Subject: [PATCH 550/970] Updating dar. svn path=/nixpkgs/trunk/; revision=30375 --- pkgs/tools/archivers/dar/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/archivers/dar/default.nix b/pkgs/tools/archivers/dar/default.nix index 49c56d075d3..e6e67bb7725 100644 --- a/pkgs/tools/archivers/dar/default.nix +++ b/pkgs/tools/archivers/dar/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, zlib, bzip2, openssl, attr }: stdenv.mkDerivation rec { - name = "dar-2.3.10"; + name = "dar-2.3.11"; src = fetchurl { url = "mirror://sourceforge/dar/${name}.tar.gz"; - sha256 = "04qzdcz97bzz414khfj82hn8s1i1ry7qxaikq8lj1069gvhc6qjn"; + sha256 = "016147f6z8k4wxym2bzgjjp54b4p82lqqwf1lvqmvgj9pbcn3wid"; }; buildInputs = [ zlib bzip2 openssl attr ]; From 1791ea091961fb7722159e84fb27d4a34b8d1c6f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?= Date: Thu, 10 Nov 2011 21:23:09 +0000 Subject: [PATCH 551/970] Another update to dar. Let's use the very latest release. svn path=/nixpkgs/trunk/; revision=30376 --- pkgs/tools/archivers/dar/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/archivers/dar/default.nix b/pkgs/tools/archivers/dar/default.nix index e6e67bb7725..a76646f23b5 100644 --- a/pkgs/tools/archivers/dar/default.nix +++ b/pkgs/tools/archivers/dar/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, zlib, bzip2, openssl, attr }: stdenv.mkDerivation rec { - name = "dar-2.3.11"; + name = "dar-2.4.2"; src = fetchurl { url = "mirror://sourceforge/dar/${name}.tar.gz"; - sha256 = "016147f6z8k4wxym2bzgjjp54b4p82lqqwf1lvqmvgj9pbcn3wid"; + sha256 = "0cvcy9xccg4wmvbpxyacwppapbq03m3pwjk8b3xmdn2h8lr1pziq"; }; buildInputs = [ zlib bzip2 openssl attr ]; From 8ce410c6f3032c3e24e74d656c1948e4b890b164 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?= Date: Thu, 10 Nov 2011 21:29:00 +0000 Subject: [PATCH 552/970] Adding more libraries to have a more featured dar. svn path=/nixpkgs/trunk/; revision=30377 --- pkgs/tools/archivers/dar/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/archivers/dar/default.nix b/pkgs/tools/archivers/dar/default.nix index a76646f23b5..f4e962f546c 100644 --- a/pkgs/tools/archivers/dar/default.nix +++ b/pkgs/tools/archivers/dar/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, zlib, bzip2, openssl, attr }: +{ stdenv, fetchurl, zlib, bzip2, openssl, attr, lzo, libgcrypt, e2fsprogs }: stdenv.mkDerivation rec { name = "dar-2.4.2"; @@ -8,7 +8,7 @@ stdenv.mkDerivation rec { sha256 = "0cvcy9xccg4wmvbpxyacwppapbq03m3pwjk8b3xmdn2h8lr1pziq"; }; - buildInputs = [ zlib bzip2 openssl attr ]; + buildInputs = [ zlib bzip2 openssl attr lzo libgcrypt e2fsprogs ]; configureFlags = "--disable-dar-static"; From e8b125999034f087c0de0956ec0d6464e9bd0189 Mon Sep 17 00:00:00 2001 From: Shea Levy Date: Thu, 10 Nov 2011 22:20:48 +0000 Subject: [PATCH 553/970] Add freetds svn path=/nixpkgs/trunk/; revision=30378 --- .../development/libraries/freetds/default.nix | 22 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 24 insertions(+) create mode 100644 pkgs/development/libraries/freetds/default.nix diff --git a/pkgs/development/libraries/freetds/default.nix b/pkgs/development/libraries/freetds/default.nix new file mode 100644 index 00000000000..d1505752715 --- /dev/null +++ b/pkgs/development/libraries/freetds/default.nix @@ -0,0 +1,22 @@ +{ stdenv, fetchurl }: + +stdenv.mkDerivation { + name = "freetds-0.91"; + + src = fetchurl { + url = ftp://ftp.ibiblio.org/pub/Linux/ALPHA/freetds/stable/freetds-stable.tgz; + sha256 = "0r946axzxs0czsmr7283w7vmk5jx3jnxxc32d2ncxsrsh2yli0ba"; + }; + + meta = { + description = '' + A set of libraries to natively talk to Microsoft SQL Server and Sybase + databases + ''; + homepage = "http://www.freetds.org"; + license = "lgpl"; + maintainers = [ stdenv.lib.maintainers.shlevy ]; + platforms = stdenv.lib.platforms.all; + }; +} + diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index f052eb21bb9..9c8270484b6 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -676,6 +676,8 @@ let guile = guile_1_8; }; + freetds = callPackage ../development/libraries/freetds { }; + ftgl = callPackage ../development/libraries/ftgl { }; fuppes = callPackage ../tools/networking/fuppes { From 75b7d02633a801a6101c1ade484f64cf8f28744d Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Thu, 10 Nov 2011 22:29:58 +0000 Subject: [PATCH 554/970] * Added oidentd, an implementation of the IDENT protocol. svn path=/nixpkgs/trunk/; revision=30379 --- pkgs/servers/identd/oidentd/default.nix | 15 +++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 17 insertions(+) create mode 100644 pkgs/servers/identd/oidentd/default.nix diff --git a/pkgs/servers/identd/oidentd/default.nix b/pkgs/servers/identd/oidentd/default.nix new file mode 100644 index 00000000000..8d7667c922e --- /dev/null +++ b/pkgs/servers/identd/oidentd/default.nix @@ -0,0 +1,15 @@ +{ stdenv, fetchurl }: + +stdenv.mkDerivation rec { + name = "oidentd-2.0.8"; + + src = fetchurl { + url = "mirror://sourceforge/ojnk/${name}.tar.gz"; + sha256 = "0vzv2086rrxcaavrm3js7aqvyc0grgaqy78x61d8s7r8hz8vwk55"; + }; + + meta = { + homepage = http://ojnk.sourceforge.net/; + description = "An implementation of the IDENT protocol"; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 9c8270484b6..f956b6f2c62 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -4985,6 +4985,8 @@ let nagiosPluginsOfficial = callPackage ../servers/monitoring/nagios/plugins/official { }; + oidentd = callPackage ../servers/identd/oidentd { }; + openfire = callPackage ../servers/xmpp/openfire { }; postgresql = postgresql83; From 6e5c0d70dbee5370082be4811e127dd42d9a3aea Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Thu, 10 Nov 2011 22:50:45 +0000 Subject: [PATCH 555/970] * Add platforms attribute. svn path=/nixpkgs/trunk/; revision=30380 --- pkgs/servers/identd/oidentd/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/servers/identd/oidentd/default.nix b/pkgs/servers/identd/oidentd/default.nix index 8d7667c922e..04ad25b3fd3 100644 --- a/pkgs/servers/identd/oidentd/default.nix +++ b/pkgs/servers/identd/oidentd/default.nix @@ -11,5 +11,6 @@ stdenv.mkDerivation rec { meta = { homepage = http://ojnk.sourceforge.net/; description = "An implementation of the IDENT protocol"; + platforms = stdenv.lib.platforms.linux; }; } From c8da189d391c59e830e77b98d922913609b7bcec Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Thu, 10 Nov 2011 23:06:58 +0000 Subject: [PATCH 556/970] * Added Firefox 8.0. * Removed Firefox 6. svn path=/nixpkgs/trunk/; revision=30382 --- .../firefox/6.0-install-sdk-bin.patch | 35 ---- .../networking/browsers/firefox/6.0.nix | 168 ------------------ .../networking/browsers/firefox/8.0.nix | 4 +- pkgs/top-level/all-packages.nix | 11 +- 4 files changed, 5 insertions(+), 213 deletions(-) delete mode 100644 pkgs/applications/networking/browsers/firefox/6.0-install-sdk-bin.patch delete mode 100644 pkgs/applications/networking/browsers/firefox/6.0.nix diff --git a/pkgs/applications/networking/browsers/firefox/6.0-install-sdk-bin.patch b/pkgs/applications/networking/browsers/firefox/6.0-install-sdk-bin.patch deleted file mode 100644 index 30fe15c6e48..00000000000 --- a/pkgs/applications/networking/browsers/firefox/6.0-install-sdk-bin.patch +++ /dev/null @@ -1,35 +0,0 @@ - -# HG changeset patch -# User Chris Coulson -# Date 1306390403 -7200 -# Node ID 99672871e93003520189cfe3a684ebbea151cb4b -# Parent 831f8e040f381ed58441d8bf413f9845f26ce08e -Bug 639554 - Install sdk/bin with make install. r=bsmedberg - -diff --git a/toolkit/mozapps/installer/packager.mk b/toolkit/mozapps/installer/packager.mk ---- a/toolkit/mozapps/installer/packager.mk -+++ b/toolkit/mozapps/installer/packager.mk -@@ -704,20 +704,22 @@ ifdef INSTALL_SDK # Here comes the hard - $(NSINSTALL) -D $(DESTDIR)$(includedir) - (cd $(DIST)/include && tar $(TAR_CREATE_FLAGS) - .) | \ - (cd $(DESTDIR)$(includedir) && tar -xf -) - $(NSINSTALL) -D $(DESTDIR)$(idldir) - (cd $(DIST)/idl && tar $(TAR_CREATE_FLAGS) - .) | \ - (cd $(DESTDIR)$(idldir) && tar -xf -) - # SDK directory is the libs + a bunch of symlinks - $(NSINSTALL) -D $(DESTDIR)$(sdkdir)/sdk/lib -+ $(NSINSTALL) -D $(DESTDIR)$(sdkdir)/sdk/bin - if test -f $(DIST)/include/xpcom-config.h; then \ - $(SYSINSTALL) $(IFLAGS1) $(DIST)/include/xpcom-config.h $(DESTDIR)$(sdkdir); \ - fi - (cd $(DIST)/sdk/lib && tar $(TAR_CREATE_FLAGS) - .) | (cd $(DESTDIR)$(sdkdir)/sdk/lib && tar -xf -) -+ (cd $(DIST)/sdk/bin && tar $(TAR_CREATE_FLAGS) - .) | (cd $(DESTDIR)$(sdkdir)/sdk/bin && tar -xf -) - $(RM) -f $(DESTDIR)$(sdkdir)/lib $(DESTDIR)$(sdkdir)/bin $(DESTDIR)$(sdkdir)/include $(DESTDIR)$(sdkdir)/include $(DESTDIR)$(sdkdir)/sdk/idl $(DESTDIR)$(sdkdir)/idl - ln -s $(sdkdir)/sdk/lib $(DESTDIR)$(sdkdir)/lib - ln -s $(installdir) $(DESTDIR)$(sdkdir)/bin - ln -s $(includedir) $(DESTDIR)$(sdkdir)/include - ln -s $(idldir) $(DESTDIR)$(sdkdir)/idl - endif # INSTALL_SDK - - make-sdk: - diff --git a/pkgs/applications/networking/browsers/firefox/6.0.nix b/pkgs/applications/networking/browsers/firefox/6.0.nix deleted file mode 100644 index df205a64fb5..00000000000 --- a/pkgs/applications/networking/browsers/firefox/6.0.nix +++ /dev/null @@ -1,168 +0,0 @@ -{ stdenv, fetchurl, pkgconfig, gtk, pango, perl, python, zip, libIDL -, libjpeg, libpng, zlib, cairo, dbus, dbus_glib, bzip2, xlibs -, freetype, fontconfig, file, alsaLib, nspr, nss, libnotify -, yasm, mesa, sqlite - -, # If you want the resulting program to call itself "Firefox" instead - # of "Shiretoko" or whatever, enable this option. However, those - # binaries may not be distributed without permission from the - # Mozilla Foundation, see - # http://www.mozilla.org/foundation/trademarks/. - enableOfficialBranding ? false -}: - -assert stdenv.gcc ? libc && stdenv.gcc.libc != null; - -rec { - - firefoxVersion = "6.0.2"; - - xulVersion = "6.0.2"; # this attribute is used by other packages - - - src = fetchurl { - url = "http://releases.mozilla.org/pub/mozilla.org/firefox/releases/${firefoxVersion}/source/firefox-${firefoxVersion}.source.tar.bz2"; - sha1 = "074eb9c1df4de0fe0a4bb9226ca3c2822c334cd6"; - }; - - - commonConfigureFlags = - [ "--enable-optimize" - "--disable-debug" - "--enable-strip" - "--with-system-jpeg" - "--with-system-zlib" - "--with-system-bz2" - "--with-system-nspr" - # "--with-system-nss" - # "--with-system-png" # <-- "--with-system-png won't work because the system's libpng doesn't have APNG support" - "--enable-system-cairo" - "--enable-system-sqlite" - "--disable-crashreporter" - "--disable-tests" - "--disable-necko-wifi" # maybe we want to enable this at some point - "--disable-installer" - "--disable-updater" - ]; - - - xulrunner = stdenv.mkDerivation rec { - name = "xulrunner-${xulVersion}"; - - inherit src; - - patches = [ ./6.0-install-sdk-bin.patch ]; - - buildInputs = - [ pkgconfig gtk perl zip libIDL libjpeg libpng zlib cairo bzip2 - python dbus dbus_glib pango freetype fontconfig xlibs.libXi - xlibs.libX11 xlibs.libXrender xlibs.libXft xlibs.libXt file - alsaLib nspr /* nss */ libnotify xlibs.pixman yasm mesa - xlibs.libXScrnSaver xlibs.scrnsaverproto - xlibs.libXext xlibs.xextproto sqlite - ]; - - configureFlags = - [ "--enable-application=xulrunner" - "--disable-javaxpcom" - ] ++ commonConfigureFlags; - - enableParallelBuilding = true; - - # Hack to work around make's idea of -lbz2 dependency - preConfigure = - '' - find . -name Makefile.in -execdir sed -i '{}' -e '1ivpath %.so ${ - stdenv.lib.concatStringsSep ":" - (map (s : s + "/lib") (buildInputs ++ [stdenv.gcc.libc])) - }' ';' - ''; - - # !!! Temporary hacks. - preBuild = - '' - ln -s Linux2.6.mk security/coreconf/Linux3.0.mk - export NIX_ENFORCE_PURITY= - ''; - - installFlags = "SKIP_GRE_REGISTRATION=1"; - - postInstall = '' - # Fix some references to /bin paths in the Xulrunner shell script. - substituteInPlace $out/bin/xulrunner \ - --replace /bin/pwd "$(type -tP pwd)" \ - --replace /bin/ls "$(type -tP ls)" - - # Fix run-mozilla.sh search - libDir=$(cd $out/lib && ls -d xulrunner-[0-9]*) - echo libDir: $libDir - test -n "$libDir" - cd $out/bin - mv xulrunner ../lib/$libDir/ - - for i in $out/lib/$libDir/*; do - file $i; - if file $i | grep executable &>/dev/null; then - ln -s $i $out/bin - fi; - done; - rm -f $out/bin/run-mozilla.sh - ''; # */ - - meta = { - description = "Mozilla Firefox XUL runner"; - homepage = http://www.mozilla.org/firefox/; - }; - - passthru = { inherit gtk; version = xulVersion; }; - }; - - - firefox = stdenv.mkDerivation rec { - name = "firefox-${firefoxVersion}"; - - inherit src; - - enableParallelBuilding = true; - - buildInputs = - [ pkgconfig gtk perl zip libIDL libjpeg zlib cairo bzip2 python - dbus dbus_glib pango freetype fontconfig alsaLib nspr libnotify - xlibs.pixman yasm mesa sqlite - ]; - - propagatedBuildInputs = [xulrunner]; - - configureFlags = - [ "--enable-application=browser" - "--with-libxul-sdk=${xulrunner}/lib/xulrunner-devel-${xulrunner.version}" - "--enable-chrome-format=jar" - ] - ++ commonConfigureFlags - ++ stdenv.lib.optional enableOfficialBranding "--enable-official-branding"; - - # Hack to work around make's idea of -lbz2 dependency - preConfigure = - '' - find . -name Makefile.in -execdir sed -i '{}' -e '1ivpath %.so ${ - stdenv.lib.concatStringsSep ":" - (map (s : s + "/lib") (buildInputs ++ [stdenv.gcc.libc])) - }' ';' - ''; - - postInstall = - '' - ln -s ${xulrunner}/lib/xulrunner-${xulrunner.version} $(echo $out/lib/firefox-*)/xulrunner - ''; # */ - - meta = { - description = "Mozilla Firefox - the browser, reloaded"; - homepage = http://www.mozilla.org/firefox/; - }; - - passthru = { - inherit gtk xulrunner nspr; - isFirefox3Like = true; - }; - }; -} diff --git a/pkgs/applications/networking/browsers/firefox/8.0.nix b/pkgs/applications/networking/browsers/firefox/8.0.nix index f6807056529..8e60fa6bbb7 100644 --- a/pkgs/applications/networking/browsers/firefox/8.0.nix +++ b/pkgs/applications/networking/browsers/firefox/8.0.nix @@ -15,14 +15,14 @@ assert stdenv.gcc ? libc && stdenv.gcc.libc != null; rec { - firefoxVersion = "8.0b1"; + firefoxVersion = "8.0"; xulVersion = "8.0"; # this attribute is used by other packages src = fetchurl { url = "http://ftp.mozilla.org/pub/mozilla.org/firefox/nightly/${firefoxVersion}-candidates/build1/source/firefox-${firefoxVersion}.source.tar.bz2"; - sha256 = "1sdahpawgngvjh4cap2vdg00ngiwji5nkb40dh5kd393wa6c8mpm"; + sha1 = "843cf4ad70d2fc4b16654c3ff9b080d3eb357452"; }; commonConfigureFlags = diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index f956b6f2c62..2d82e0e7526 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -6636,13 +6636,6 @@ let firefox50Wrapper = wrapFirefox { browser = firefox50Pkgs.firefox; }; - firefox60Pkgs = callPackage ../applications/networking/browsers/firefox/6.0.nix { - inherit (gtkLibs) gtk pango; - inherit (gnome) libIDL; - }; - - firefox60Wrapper = wrapFirefox { browser = firefox60Pkgs.firefox; }; - firefox70Pkgs = callPackage ../applications/networking/browsers/firefox/7.0.nix { inherit (gtkLibs) gtk pango; inherit (gnome) libIDL; @@ -6650,11 +6643,13 @@ let firefox70Wrapper = wrapFirefox { browser = firefox70Pkgs.firefox; }; - firefox80bPkgs = callPackage ../applications/networking/browsers/firefox/8.0.nix { + firefox80Pkgs = callPackage ../applications/networking/browsers/firefox/8.0.nix { inherit (gtkLibs) gtk pango; inherit (gnome) libIDL; }; + firefox80Wrapper = wrapFirefox { browser = firefox80Pkgs.firefox; }; + flac = callPackage ../applications/audio/flac { }; flashplayer = flashplayer10; From 1abb8f9a260e117e40eba4b06b5fd0237a3f2d26 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Thu, 10 Nov 2011 23:27:05 +0000 Subject: [PATCH 557/970] * Fix PulseAudio's config files installation paths. svn path=/nixpkgs/trunk/; revision=30383 --- pkgs/servers/pulseaudio/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/pulseaudio/default.nix b/pkgs/servers/pulseaudio/default.nix index 881d9811a40..13d0af8987c 100644 --- a/pkgs/servers/pulseaudio/default.nix +++ b/pkgs/servers/pulseaudio/default.nix @@ -26,7 +26,7 @@ stdenv.mkDerivation rec { #gtk gconf ] ++ stdenv.lib.optional jackaudioSupport jackaudio - ++ stdenv.lib.optional x11Support xlibs.xlibs; + ++ stdenv.lib.optionals x11Support [ xlibs.xlibs xlibs.libXtst xlibs.libXi ]; preConfigure = '' # Change the `padsp' script so that it contains the full path to @@ -51,7 +51,7 @@ stdenv.mkDerivation rec { ${if jackaudioSupport then "--enable-jack" else ""} ''; - installFlags = "pulseconfdir=$(out)/etc dbuspolicydir=$out/etc/dbus-1/system.d xdgautostartdir=$out/etc/xdg/autostart"; + installFlags = "sysconfdir=$(out)/etc pulseconfdir=$(out)/etc/pulse"; enableParallelBuilding = true; From 5b622e20a161503f1142549a26aeaf7317442d60 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Thu, 10 Nov 2011 23:35:58 +0000 Subject: [PATCH 558/970] * KDE 4.7.3. svn path=/nixpkgs/trunk/; revision=30384 --- pkgs/desktops/kde-4.7/default.nix | 2 +- pkgs/desktops/kde-4.7/kde-package/4.7.2.nix | 273 ------------------ pkgs/desktops/kde-4.7/kde-package/4.7.3.nix | 273 ++++++++++++++++++ .../kde-4.7/kde-package/kde-manifest.sh | 2 +- 4 files changed, 275 insertions(+), 275 deletions(-) delete mode 100644 pkgs/desktops/kde-4.7/kde-package/4.7.2.nix create mode 100644 pkgs/desktops/kde-4.7/kde-package/4.7.3.nix diff --git a/pkgs/desktops/kde-4.7/default.nix b/pkgs/desktops/kde-4.7/default.nix index aeb62fc0740..f8c4e594419 100644 --- a/pkgs/desktops/kde-4.7/default.nix +++ b/pkgs/desktops/kde-4.7/default.nix @@ -1,7 +1,7 @@ { callPackage, callPackageOrig, stdenv, qt47 }: let - release = "4.7.2"; + release = "4.7.3"; # Need callPackageOrig to avoid infinite cycle kde = callPackageOrig ./kde-package { diff --git a/pkgs/desktops/kde-4.7/kde-package/4.7.2.nix b/pkgs/desktops/kde-4.7/kde-package/4.7.2.nix deleted file mode 100644 index dafde475b24..00000000000 --- a/pkgs/desktops/kde-4.7/kde-package/4.7.2.nix +++ /dev/null @@ -1,273 +0,0 @@ -{stable=true; -hashes=builtins.listToAttrs[ - {name="blinken";value="0597y7xf6908i03mzrc4k6pfjc9fzlxc1d72rg8153j9183yadr1";} - {name="cantor";value="13cxw0iq0radipd75yl5pjs0qq3px9khjnphrwcq86ss9jivv70y";} - {name="gwenview";value="0zngbigs8g75wwfrhi5f64pxpg77fggd2d54ly4mh3kr1h79ndxs";} - {name="kalgebra";value="1dqiavpc91sk8418ahvv4knim0k0ifs1yj2c9bng4aq46kmi7wl5";} - {name="kalzium";value="0aysmjnm9iy20prx0q294szp0f9ghmj2mbcix7ds8977l630pkhm";} - {name="kamera";value="1kbfhfr3l7iffv4lb8fzik8zdx9kqskpalzr76i7awdba0qqx37n";} - {name="kanagram";value="16f37j66lpyg96f3clrh856fl4chlpmxlg3pqjp6lfad47b1191r";} - {name="kate";value="1qhvchk1kvs4a9hsd2zxfvn6hrnn883ic8ba6pvwnzvqpdaqijq4";} - {name="kbruch";value="0hxcdwyybwsxg07vl83hypn8xzpnn5747zapwv2sg2hxwkccw4sj";} - {name="kcolorchooser";value="0hp849nb3hhn48d49kdbl8b95d1l5ychgc6qwfn9nvrvhazgs51q";} - {name="kdeaccessibility";value="179k9wmy5j0iig3n0xlzpry7j0li6bv7q1wpqra5hsmlk3ns440s";} - {name="kdeadmin";value="0mycw08xw2gbqd09mz6vxwhpxmn6c2isch4kaisha61zz8rm827p";} - {name="kdeartwork";value="0cq75mz1s6qbaargdpk435bnllvk6a33zspplw33y9q4l3xyih74";} - {name="kde-baseapps";value="1yhbfr1nrdkyklyayvbfdbm1jhdyvkgic9dx1dxpbjfgv552h10i";} - {name="kdegames";value="046kk60y7ajv4vagffhnc6jpslmggs1700ds4xl5ina2vhazwl31";} - {name="kdegraphics-strigi-analyzer";value="029zw71xc2r3g5d58yv09vzwyv7zd9r87vs1sqpa8jglpysaml9j";} - {name="kdegraphics-thumbnailers";value="0sp44m3nn2vv926h91f13kar2zi30l1y445jcdinlpckbzkgyyc8";} - {name="kdelibs";value="0f4b7ycs79qx360mhwf1jsbcawhp0sp76pbk46d20g0ms8rhp9xz";} - {name="kdemultimedia";value="0078gfx96bqzj26lwyz6jpln07963v4w8qqxg5wc53sd3w8f39m5";} - {name="kdenetwork";value="0vy3ygqszy8ishb4sbipvil148yhv73r8mbj6p10lqnrrah0c5n6";} - {name="kdepim";value="0c36q3z1krwpzx2naj1gqirvsvl5sadh0an9csa2159vqyzxld8n";} - {name="kdepimlibs";value="016jazpgnpzcvxvzn43fl5ihw13ckq16ggb97fzmpahkrh01yyc2";} - {name="kdepim-runtime";value="00a89zzqh7005ig4lxz1fypdb0hmxwibs78yk0fyr5qdjdd3i90k";} - {name="kdeplasma-addons";value="0cf93s7g3zbrdmkwia0djj7x5qas2q77vgajpab8cwj3r6cnm5bi";} - {name="kde-runtime";value="0b8sq97xi0mh0iiwzrfzar3kv2dsiljq3c2bbxgvwlf942g7w5j6";} - {name="kdesdk";value="1gi0p4xgyaflkwyv8fmcjfsc6gav83k78ib8awy42cwn8bwpsdy9";} - {name="kdetoys";value="0sd9p4rldz07w6sbwsx5b1iwgpljhkycphlnj698qll2dqrjm6b1";} - {name="kdeutils";value="15igw1jnvzdr1jf6jbip1xw5lj5kpk6ffgp6wmnlyssmqj7i7snd";} - {name="kde-wallpapers";value="0hcgjrqdj1lvgy098lglca1mi77gdg4332hp494klwvmhny1j0li";} - {name="kdewebdev";value="0g4fw17pivck9av8xd6dij6q70vr4zjbr2cpngrm0nmzyl5xiky7";} - {name="kde-workspace";value="1c4y7wnizj7b9nq97yypi80ylsli7pny5pzdr477015dh1kls5va";} - {name="kgamma";value="14p5xwdlyg8za1rwp809axfnybgm0dxhxhpfr97gslqqsnncfq74";} - {name="kgeography";value="114m0bs18bjl0f1rvp2v0w6wi0zkw1qk9dy5z8axk5q8dykhxdxs";} - {name="khangman";value="07rsfx6lmhfvbm46bzl01cg3l6rbib3phwnf5xdq1b6rifw5d5ks";} - {name="kig";value="0264vyq18rx16nq62vqk1g5ip5i7gnpy9x6z6f6p6vdqfb1bankn";} - {name="kimono";value="1pkzr2d6axwrbf7n10d48fmkxa1l7i79nf39p12abkh5gy5k6rbn";} - {name="kiten";value="0clbfp5n5mvkps6f4c9jx4bfb367c3461sy6yrl35q32j2s0d7dh";} - {name="klettres";value="16ywszx3nr6lszdx6sj0cc5nv92db1j7wxn8np24ijvhvvf2qv6c";} - {name="kmplot";value="0y7zs9zacx73hbxab2w15h1rpvdsqcncpn80qkhgfg7kiw1mgnvy";} - {name="kolourpaint";value="1s2zhw4mc2pq1bzbgkd37iswz8bar38vhvind7xl14n7fmh1a456";} - {name="konsole";value="0f3dwwfcrqa0qyqhjzl7r0v5yc91j018gxbyka0633r5v657yp2a";} - {name="korundum";value="1d94rlaj89yshvywv3nwvbg7yjdysmxxv9zi4q4lfa8f210pay6b";} - {name="kross-interpreters";value="0d3gjj1mj8nzawdcn5g60khmzh8k9jxn8invzy9xcdywdbpdyda2";} - {name="kruler";value="1gb7p0b6zbcq2kjf74rcblxjyzn6ffy4pp4mfhynhcnh2fv0nniw";} - {name="ksaneplugin";value="04lzyibnxmskszrb6f3k85lxc8ifrlwy71pqy080bfxsmw6avsra";} - {name="ksnapshot";value="0rvz9vr2xaq7ixf0rm7snlhkam9cga0w10vmglsrylwi2cch1j59";} - {name="kstars";value="13xdbigh7rjcy9ycywz5h3r3q918yqsjdwf4b56w63bi89bf69yx";} - {name="ktouch";value="0xxzw58v6395vqs45n2d8865ixyjpqzjna2ahw8j0hv997x4cmc4";} - {name="kturtle";value="18hcy1zwyi1s90ypm2sh3s6myqz5hkrsjgyyiabk44rw8ikgsa8a";} - {name="kwordquiz";value="1zl21d58z8qrrs898czba902rzvz0xr9ndm1dychnrwmbzm5rjj8";} - {name="libkdcraw";value="0lzia65czgrqkl31sfzpnvpzqhrm01zx6vxr3fx0ckmz35rmy5sk";} - {name="libkdeedu";value="1bj1f92b408ccf55icsvk0yssp7ilsglcz0k1j5z1bc9lzmdfn3h";} - {name="libkexiv2";value="0wfzskm6c96cf7k6f29spxy1x2p15wkmn3r4n3qpxlc8wk4psrg1";} - {name="libkipi";value="0nf9cx0p2allmhfbl2yab5xi6mrc9gqkfmndfjdd271bwrgy4w1y";} - {name="libksane";value="0zaygvwxxs2i2jprkn6l7mmr5563523xgv19h7chfqbwg4r3y6yc";} - {name="marble";value="1i1k2shnzkr0dddd7f6l6xxfhgn0dvvx3bqk596avzpn4bsxinfr";} - {name="mobipocket";value="0j9saz9chk2v2jcpiyv3b43z8hpdf4npxfnjqhahqq71pv13fzyi";} - {name="okular";value="1qalyxr3cc78yk18601l1z4sflw5bg96jy1c1pkg79zjcdrb1n7x";} - {name="oxygen-icons";value="0814knrcisp0mpcr9fcmmbpf140s8jbdrrzw4k3rnk81vffh8w8y";} - {name="parley";value="10wkkv3fknbv7d56rnfz1vzs3npyfa9c4b7bmaqzj0399p7l1k65";} - {name="perlkde";value="1za9gvh8pvdb9wp79cf9sv1f6hn8is7nq4is9qh46k56z2pgzp92";} - {name="perlqt";value="1xindf7sb22wisvcqrfgjb6kjcx4vhapijjgkf2j9xyjlx4fiafa";} - {name="pykde4";value="1qap0n4kd247nl5bn9l1015ajpmbzwafqznf8a3i36f77yg1misf";} - {name="qtruby";value="1p1f1qkfzr5kl88pgb90slm27vi1yjxxbi62rph0qdkp9crhvgn4";} - {name="qyoto";value="1yb99hqqsrw28nf2zhaq6v3aw67qvl83jylgr47rczixdgazzqg0";} - {name="rocs";value="1lzkvww0ygq6cl6qzsnmbblbnp4lxhzvc8kiapn7ydcyas7sy21z";} - {name="smokegen";value="0yb8w6n8dyivcq97xkqxws60zqzqzh6babml1g022yb35ka4f2dk";} - {name="smokekde";value="1zqm1gxbdpvccx777v2vy200n314nrvslabf2mb1y61dxqwkvkmi";} - {name="smokeqt";value="0qhksy9z03kfmgbgvnch4vxbxyzcng0f7cy337s50cnh4rabl017";} - {name="step";value="01hdl1z7sd2a5sgx1n96anbwsvs6dmd3r4q8dpn5ha657xc38qy1";} - {name="svgpart";value="05199j918xk16bq5mmqdc2w3agrknngxsrk5gxas6rflhg8v4qz3";} -]; -modules=[ -{ - module="kdegraphics"; - split=true; - pkgs=[ - { name="gwenview"; } - { name="kamera"; } - { name="kcolorchooser"; } - { name="kdegraphics-strigi-analyzer"; sane="kdegraphics_strigi_analyzer"; } - { name="kdegraphics-thumbnailers"; sane="kdegraphics_thumbnailers"; } - { name="kgamma"; } - { name="kolourpaint"; } - { name="kruler"; } - { name="ksaneplugin"; } - { name="ksnapshot"; } - { name="libkdcraw"; } - { name="libkexiv2"; } - { name="libkipi"; } - { name="libksane"; } - { name="mobipocket"; } - { name="okular"; } - { name="svgpart"; } - ]; -} -{ - module="kdeedu"; - split=true; - pkgs=[ - { name="blinken"; } - { name="cantor"; } - { name="kalgebra"; } - { name="kalzium"; } - { name="kanagram"; } - { name="kbruch"; } - { name="kgeography"; } - { name="khangman"; } - { name="kig"; } - { name="kiten"; } - { name="klettres"; } - { name="kmplot"; } - { name="kstars"; } - { name="ktouch"; } - { name="kturtle"; } - { name="kwordquiz"; } - { name="libkdeedu"; } - { name="marble"; } - { name="parley"; } - { name="rocs"; } - { name="step"; } - ]; -} -{ - module="kdebindings"; - split=true; - pkgs=[ - { name="kimono"; } - { name="korundum"; } - { name="kross-interpreters"; sane="kross_interpreters"; } - { name="perlkde"; } - { name="perlqt"; } - { name="pykde4"; } - { name="qtruby"; } - { name="qyoto"; } - { name="smokegen"; } - { name="smokekde"; } - { name="smokeqt"; } - ]; -} -{ - module="kde-baseapps"; -sane="kde_baseapps"; split=true; - pkgs=[ - { name="kate"; } - { name="kde-baseapps"; sane="kde_baseapps"; } - { name="konsole"; } - ]; -} -{ module="kdeaccessibility"; split=false; - pkgs=[ - { name="kaccessible"; } - { name="kmag"; } - { name="kmouth"; } - { name="kmousetool"; } - { name="jovie"; } - ]; - -} -{ module="kdeadmin"; split=false; - pkgs=[ - { name="strigi-analyzer"; sane="strigi_analyzer";} - { name="kuser"; } - { name="kcron"; } - { name="ksystemlog"; } - { name="system-config-printer-kde"; sane="system_config_printer_kde";} - ]; - -} -{ module="kdeartwork"; split=false; - pkgs=[ - { name="ColorSchemes"; } - { name="IconThemes"; } - { name="emoticons"; } - { name="kscreensaver"; } - { name="kwin-styles"; sane="kwin_styles";} - { name="sounds"; } - { name="styles"; } - { name="wallpapers"; } - { name="HighResolutionWallpapers"; } - { name="WeatherWallpapers"; } - { name="desktopthemes"; } - { name="aurorae"; } - ]; - -} -{ module="kdegames"; split=false;} -{ module="kdelibs"; split=false;} -{ module="kdemultimedia"; split=false;} -{ module="kdenetwork"; split=false; - pkgs=[ - { name="kfile-plugins"; sane="kfile_plugins";} - { name="kget"; } - { name="kopete"; } - { name="krdc"; } - { name="kppp"; } - { name="krfb"; } - { name="kdnssd"; } - { name="filesharing"; } - ]; - -} -{ module="kdepim"; split=false;} -{ module="kdepimlibs"; split=false;} -{ module="kdepim-runtime"; sane="kdepim_runtime"; split=false;} -{ module="kdeplasma-addons"; sane="kdeplasma_addons"; split=false;} -{ module="kde-runtime"; sane="kde_runtime"; split=false;} -{ module="kdesdk"; split=false; - pkgs=[ - { name="cervisia"; } - { name="lokalize"; } - { name="kdeaccounts-plugin"; sane="kdeaccounts_plugin";} - { name="dolphin-plugins-svn"; sane="dolphin_plugins_svn";subdir="dolphin-plugins/svn"; } - { name="dolphin-plugins-git"; sane="dolphin_plugins_git";subdir="dolphin-plugins/git"; } - { name="kcachegrind"; } - { name="kapptemplate"; } - { name="kpartloader"; } - { name="strigi-analyzer"; sane="strigi_analyzer";} - { name="kioslave"; } - { name="okteta"; } - { name="kmtrace"; } - { name="kompare"; } - { name="kprofilemethod"; } - { name="kstartperf"; } - { name="kuiviewer"; } - { name="poxml"; } - { name="scripts"; } - { name="umbrello"; } - ]; - -} -{ module="kdetoys"; split=false; - pkgs=[ - { name="kteatime"; } - { name="ktux"; } - { name="amor"; } - ]; - -} -{ module="kdeutils"; split=false; - pkgs=[ - { name="ark"; } - { name="kcalc"; } - { name="kremotecontrol"; } - { name="kdf"; } - { name="kfloppy"; } - { name="printer-applet"; sane="printer_applet";} - { name="filelight"; } - { name="kcharselect"; } - { name="kgpg"; } - { name="ktimer"; } - { name="kwallet"; } - { name="sweeper"; } - { name="superkaramba"; } - ]; - -} -{ module="kde-wallpapers"; sane="kde_wallpapers"; split=false;} -{ module="kdewebdev"; split=false; - pkgs=[ - { name="klinkstatus"; } - { name="kfilereplace"; } - { name="kimagemapeditor"; } - { name="kommander"; } - ]; - -} -{ module="kde-workspace"; sane="kde_workspace"; split=false;} -{ module="oxygen-icons"; sane="oxygen_icons"; split=false;} -]; -} diff --git a/pkgs/desktops/kde-4.7/kde-package/4.7.3.nix b/pkgs/desktops/kde-4.7/kde-package/4.7.3.nix new file mode 100644 index 00000000000..b7bcedf922f --- /dev/null +++ b/pkgs/desktops/kde-4.7/kde-package/4.7.3.nix @@ -0,0 +1,273 @@ +{stable=true; +hashes=builtins.listToAttrs[ + {name="blinken";value="0axfl0078f9v5sly2n4xplsbjgqzh1qfxvdn3a2d6s96sh4f0cbp";} + {name="cantor";value="0gfp30r2bn6pb14nm0bd8flpki889n5pznp52a0zdrg2h0q88lbl";} + {name="gwenview";value="0wn95zz3b6241mzp0s56h5af8z6pfs8z85wbxg3xfjqhxjp59jj1";} + {name="kalgebra";value="1w3vakbwhjsqr74bvwk7a7ijwhn17mj60r525v8ll8068qq9i92r";} + {name="kalzium";value="1mdkblsppxi49i5smmakcihr6frhlfm53h26q08ylp8hw4iknhwb";} + {name="kamera";value="1izjhax6c3pmsf4qwmsxifjklf3995dki5k4mdpdy9wx95pwpal1";} + {name="kanagram";value="07vavddxpsmqbaw4y5kiag338szc7in90hvxvnycbjccdyd2ad58";} + {name="kate";value="15gw6rlmcd2dzk4n2qcwlx8j43crhb8cgsilg1bflib7q7gx6k8m";} + {name="kbruch";value="01x5ww02wmnsblkvw0pvrslh689135a83jhkzp7d6l0wfa838zx7";} + {name="kcolorchooser";value="08hb0ix4ls2x9nknlvy495b5n9a6n64v4pr9h19s9kiqxz1xwhvh";} + {name="kdeaccessibility";value="1lb0kz6w736bbqa98ybbdq89452jyw2y9lg0f9lm01kv437my8nl";} + {name="kdeadmin";value="0abhci304gcscz77zax6qxwpw5qv3gvks201vnfdivd82zxjvcq0";} + {name="kdeartwork";value="187l6bck7ywz6xsvjiighzi673p4hci446sa4g7j1kkpr334f25y";} + {name="kde-baseapps";value="1py8a6zkvzwp8lb6g9387ji1xp6aim8zlpbkl70mb8p9m5fhryz9";} + {name="kdegames";value="140a46zrnrx9c1ic2nzygxq79r8q0mhja73kpjqxyyhlci97rw9b";} + {name="kdegraphics-strigi-analyzer";value="1lyrz6wq7f0gvza84c0w5cb7djvylgdi04xcp7ggl5g9ggic68ja";} + {name="kdegraphics-thumbnailers";value="11zjbyz9h9i9kf26hnjf05lnf99viwffaw86mg6rdk59kx3k8xyh";} + {name="kdelibs";value="0rhfbfms93ipb02bjyl2dq812n14cjyv08qipkl9is9la4lnbvq0";} + {name="kdemultimedia";value="1c9hijfdl9209v1vs883gs8il1c73l36bcdwvrk48b5q30i375md";} + {name="kdenetwork";value="197gah1r98qwwvcsb0bavpryip8imf8cawvlcs08zqwqg7x7npjs";} + {name="kdepim";value="19m014yw76j7h9y9is0y0dp6pc2d85fi4yyv7v4fhfwsxdj8nvg8";} + {name="kdepimlibs";value="11svjasczgram1qr8gavp1szc4kq0172qkfm1lgb3fh4sjlc1ghi";} + {name="kdepim-runtime";value="1ygwag9mwqdd9nx7v24h2kbvjjsdb64xj74nc9szkakw9qlhbmac";} + {name="kdeplasma-addons";value="00cnphq5phh416gij23dfwdwbxmplb6rjpa1xvqkwaf53nscvl61";} + {name="kde-runtime";value="0mh3v27qg5a5l52f816va1vnk66ix01bwanql8csnx287cn123r8";} + {name="kdesdk";value="0zic4a9x07dzx2abm6m7a6z2xxrsgpljhs2icx0prh7jk657yg2h";} + {name="kdetoys";value="0cbcvn28dvg6zyzv96myr5rmqk45limi6nm116gcgdlimswh7zzd";} + {name="kdeutils";value="0f98967fmn4661nxxw3kqkj1jq7qhmac51s4da08v4cy5grh5j58";} + {name="kde-wallpapers";value="0lwaswhhw8zbhi940j5185ldq4416278zknbfsz0brj7c86iyc00";} + {name="kdewebdev";value="0dzfy9qqwlmrqj4lf7h5dv86n73r5kclharvfbqws03w4bkwbx90";} + {name="kde-workspace";value="0pmcfxkcis2x3yfra885f837kbg33c01c4bakcgmprcdyxgzq0vl";} + {name="kgamma";value="0kz9lxbxfqrq6j52p5n6c745q06606mhnn7fb6zb8m7y2g22yxay";} + {name="kgeography";value="0z7d802ggzrvjkviq72k9cg7mz3l0px5mvc66x60pq3czpik0z6f";} + {name="khangman";value="0sqbxv8nbi10fvf58xj7b3sd1x49azym99688brdz5ncx2mzffmy";} + {name="kig";value="1m7yfv30sn6m83fh9p78mhldsz8bi8sp7qcdjwr7rklzma2512i1";} + {name="kimono";value="0hmxq4rr1jyzyqjz38viwda3cd2vljclc47rml8r64px1rxgk5zj";} + {name="kiten";value="10dyr8fws4hilsmvf2xmjpm4khj30vnaqqh3wwwag9i06k3m25yh";} + {name="klettres";value="1icw3pkilm6md1xm97pwwnrznmngw0d1cglqvcpbn7kz1zxdhy6b";} + {name="kmplot";value="1dn7gqplsb5mhq6wmw09f97lvb5jpzvmfwbg6f5v9gjjjkkywhx8";} + {name="kolourpaint";value="1dhwdc9nw59i963achb58qv8sq62l73vmrcccym8pgdb4da91jms";} + {name="konsole";value="002g38lrcfzz9px9wr41xa8n8ih7par23ymrc6nn0jm3wf6873g1";} + {name="korundum";value="1mzznvc807cjdw8gvxks46pd1yg1s5v8dg691rigicvw2fafp83r";} + {name="kross-interpreters";value="084294l474b0d4zzd4s3yca5qspsbh0bqrlqxwrmqy729x6q0i5d";} + {name="kruler";value="00z2lf89bdl7av4lnn68wy49z7lfkfhrhp90hhy977i4cbrkwcpw";} + {name="ksaneplugin";value="1n2idrkrwlml3p9rlhm652783ymyc7dw628zdzq9j37d24vr7bxn";} + {name="ksnapshot";value="1mywpqscxbbi1r8hi4fjph1cxmc7pmq29yqslh7w8wkbrdafws17";} + {name="kstars";value="0g12n61xc49q7fakjcbz2qxyh28sfxwq7kpp1ffd735dxp37sgj3";} + {name="ktouch";value="0b6aiqd56jpl4j3jmx4ba5p50f2l4pjdlb7mzf3pw6wnihavsd11";} + {name="kturtle";value="1a1dvmk7zpqw9i9bn5sc849b64r7lddl3jv82rc66wqjrgi1yz57";} + {name="kwordquiz";value="026mghh8gwdf8gc42djwfc30fr14mqf2fvbb5yjjivk3sz2rsjcb";} + {name="libkdcraw";value="10hiyf8vx9nxplwgg3fgid2pjp6zbjcyrcvm1662g6mbn20aqh8c";} + {name="libkdeedu";value="1ri4pylhp34bhnm969p3wqivbp4j3jg05pacpvxp2s4x35rx8ly6";} + {name="libkexiv2";value="151wdkl743793i7zzgkicahg3ljdi4waa7vgiz6301pw0arvrxav";} + {name="libkipi";value="11877xay0l483yjisb7w4d00ivmsicrafd018xy8xiz0z221rmrx";} + {name="libksane";value="0fhriykamynjw8l8l9802nswa943zjjvc8s3n7w1wh7l90q6c5im";} + {name="marble";value="0mx5916jz2n1cdyg7krcfxk43qy5xzjiyic4x1jn4kh9qhidlfcx";} + {name="mobipocket";value="0f4b4kpagcczrkbrw2jyj5j9g06dpmiiv68g8g0g1biipdng6pfh";} + {name="okular";value="1wbnliw18ma5sz8rv88nwj6hfvgbk415ph439ggqx8lv9sq65xsc";} + {name="oxygen-icons";value="08kavrbln13aak5ahdkh6sr4l8xxdfr2hsckh8y0yz5nd90wa9qb";} + {name="parley";value="0kzhz83z16x58r1vckiwsdsyr2rndzd9d3nksyclz76bri7i2fda";} + {name="perlkde";value="1yfxlbn5abg66vwb622lr91rachhfpl91lb019afhnyglvzb6283";} + {name="perlqt";value="1xgfrxsabm68ldn3z6s2ffsl5r6iwvic8rvnrsjsqb41nlsfpisr";} + {name="pykde4";value="1jjscs3cjhnpzx3v294njyfj189wkmvq8zn201a3aqakchnl7065";} + {name="qtruby";value="097fiag2hx99xdn0i99359p00gq0qrjv6bfbhd56iqc0c6lng97j";} + {name="qyoto";value="1fi6ghn11ymhvf0fi8di8w19hyj0a7l890v6x72k6p5xbffcbgy4";} + {name="rocs";value="0b3wwm0wqgr9pnh10iy5whp33y0kp7wgwmvlyavvvplqdhigfghv";} + {name="smokegen";value="0ls8d8xjvb4414im8y8f2k6nx2xwy0mx1fkx7k8dh4xrcdvljqi5";} + {name="smokekde";value="0l2px9drgg4f0rhdsbvbin225plp5l16kr77x5nyii8anra0sjws";} + {name="smokeqt";value="15xrr3smxx5ay0axymbdrl3wjx5x7xnl5760cf04kqyi8rngggib";} + {name="step";value="1nws0phiyqg5kw4zrirjfkcw9aqsranw2b2925dfklan4c0am0il";} + {name="svgpart";value="1wy9w4h3s3ymvf5dvnm4qnpvr9wkwdkrr79j1fbqvpgmzlgia413";} +]; +modules=[ +{ + module="kdegraphics"; + split=true; + pkgs=[ + { name="gwenview"; } + { name="kamera"; } + { name="kcolorchooser"; } + { name="kdegraphics-strigi-analyzer"; sane="kdegraphics_strigi_analyzer"; } + { name="kdegraphics-thumbnailers"; sane="kdegraphics_thumbnailers"; } + { name="kgamma"; } + { name="kolourpaint"; } + { name="kruler"; } + { name="ksaneplugin"; } + { name="ksnapshot"; } + { name="libkdcraw"; } + { name="libkexiv2"; } + { name="libkipi"; } + { name="libksane"; } + { name="mobipocket"; } + { name="okular"; } + { name="svgpart"; } + ]; +} +{ + module="kdeedu"; + split=true; + pkgs=[ + { name="blinken"; } + { name="cantor"; } + { name="kalgebra"; } + { name="kalzium"; } + { name="kanagram"; } + { name="kbruch"; } + { name="kgeography"; } + { name="khangman"; } + { name="kig"; } + { name="kiten"; } + { name="klettres"; } + { name="kmplot"; } + { name="kstars"; } + { name="ktouch"; } + { name="kturtle"; } + { name="kwordquiz"; } + { name="libkdeedu"; } + { name="marble"; } + { name="parley"; } + { name="rocs"; } + { name="step"; } + ]; +} +{ + module="kdebindings"; + split=true; + pkgs=[ + { name="kimono"; } + { name="korundum"; } + { name="kross-interpreters"; sane="kross_interpreters"; } + { name="perlkde"; } + { name="perlqt"; } + { name="pykde4"; } + { name="qtruby"; } + { name="qyoto"; } + { name="smokegen"; } + { name="smokekde"; } + { name="smokeqt"; } + ]; +} +{ + module="kde-baseapps"; +sane="kde_baseapps"; split=true; + pkgs=[ + { name="kate"; } + { name="kde-baseapps"; sane="kde_baseapps"; } + { name="konsole"; } + ]; +} +{ module="kdeaccessibility"; split=false; + pkgs=[ + { name="kaccessible"; } + { name="kmag"; } + { name="kmouth"; } + { name="kmousetool"; } + { name="jovie"; } + ]; + +} +{ module="kdeadmin"; split=false; + pkgs=[ + { name="strigi-analyzer"; sane="strigi_analyzer";} + { name="kuser"; } + { name="kcron"; } + { name="ksystemlog"; } + { name="system-config-printer-kde"; sane="system_config_printer_kde";} + ]; + +} +{ module="kdeartwork"; split=false; + pkgs=[ + { name="ColorSchemes"; } + { name="IconThemes"; } + { name="emoticons"; } + { name="kscreensaver"; } + { name="kwin-styles"; sane="kwin_styles";} + { name="sounds"; } + { name="styles"; } + { name="wallpapers"; } + { name="HighResolutionWallpapers"; } + { name="WeatherWallpapers"; } + { name="desktopthemes"; } + { name="aurorae"; } + ]; + +} +{ module="kdegames"; split=false;} +{ module="kdelibs"; split=false;} +{ module="kdemultimedia"; split=false;} +{ module="kdenetwork"; split=false; + pkgs=[ + { name="kfile-plugins"; sane="kfile_plugins";} + { name="kget"; } + { name="kopete"; } + { name="krdc"; } + { name="kppp"; } + { name="krfb"; } + { name="kdnssd"; } + { name="filesharing"; } + ]; + +} +{ module="kdepim"; split=false;} +{ module="kdepimlibs"; split=false;} +{ module="kdepim-runtime"; sane="kdepim_runtime"; split=false;} +{ module="kdeplasma-addons"; sane="kdeplasma_addons"; split=false;} +{ module="kde-runtime"; sane="kde_runtime"; split=false;} +{ module="kdesdk"; split=false; + pkgs=[ + { name="cervisia"; } + { name="lokalize"; } + { name="kdeaccounts-plugin"; sane="kdeaccounts_plugin";} + { name="dolphin-plugins-svn"; sane="dolphin_plugins_svn";subdir="dolphin-plugins/svn"; } + { name="dolphin-plugins-git"; sane="dolphin_plugins_git";subdir="dolphin-plugins/git"; } + { name="kcachegrind"; } + { name="kapptemplate"; } + { name="kpartloader"; } + { name="strigi-analyzer"; sane="strigi_analyzer";} + { name="kioslave"; } + { name="okteta"; } + { name="kmtrace"; } + { name="kompare"; } + { name="kprofilemethod"; } + { name="kstartperf"; } + { name="kuiviewer"; } + { name="poxml"; } + { name="scripts"; } + { name="umbrello"; } + ]; + +} +{ module="kdetoys"; split=false; + pkgs=[ + { name="kteatime"; } + { name="ktux"; } + { name="amor"; } + ]; + +} +{ module="kdeutils"; split=false; + pkgs=[ + { name="ark"; } + { name="kcalc"; } + { name="kremotecontrol"; } + { name="kdf"; } + { name="kfloppy"; } + { name="printer-applet"; sane="printer_applet";} + { name="filelight"; } + { name="kcharselect"; } + { name="kgpg"; } + { name="ktimer"; } + { name="kwallet"; } + { name="sweeper"; } + { name="superkaramba"; } + ]; + +} +{ module="kde-wallpapers"; sane="kde_wallpapers"; split=false;} +{ module="kdewebdev"; split=false; + pkgs=[ + { name="klinkstatus"; } + { name="kfilereplace"; } + { name="kimagemapeditor"; } + { name="kommander"; } + ]; + +} +{ module="kde-workspace"; sane="kde_workspace"; split=false;} +{ module="oxygen-icons"; sane="oxygen_icons"; split=false;} +]; +} diff --git a/pkgs/desktops/kde-4.7/kde-package/kde-manifest.sh b/pkgs/desktops/kde-4.7/kde-package/kde-manifest.sh index dbb5970ab64..910394fb6a3 100755 --- a/pkgs/desktops/kde-4.7/kde-package/kde-manifest.sh +++ b/pkgs/desktops/kde-4.7/kde-package/kde-manifest.sh @@ -1,4 +1,4 @@ -#!/usr/bin/env bash +#! /bin/sh # Usage: download kde release to $dir, then run # $0 $dir From 89fb4363b46164b9b5e9aae33ce47d52ef3eec00 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Fri, 11 Nov 2011 02:21:25 +0000 Subject: [PATCH 559/970] * Oops, forgot to commit. svn path=/nixpkgs/trunk/; revision=30385 --- pkgs/desktops/kde-4.7/l10n/manifest-4.7.2.nix | 262 ------------------ pkgs/desktops/kde-4.7/l10n/manifest-4.7.3.nix | 262 ++++++++++++++++++ 2 files changed, 262 insertions(+), 262 deletions(-) delete mode 100644 pkgs/desktops/kde-4.7/l10n/manifest-4.7.2.nix create mode 100644 pkgs/desktops/kde-4.7/l10n/manifest-4.7.3.nix diff --git a/pkgs/desktops/kde-4.7/l10n/manifest-4.7.2.nix b/pkgs/desktops/kde-4.7/l10n/manifest-4.7.2.nix deleted file mode 100644 index ff89f2d8d0c..00000000000 --- a/pkgs/desktops/kde-4.7/l10n/manifest-4.7.2.nix +++ /dev/null @@ -1,262 +0,0 @@ -[ -{ - lang = "ar"; - saneName = "ar"; - sha256 = "17s0d1yr561r55b2jgj6ypmjbwv9p7ykmpv28r6lcs7smdhvazg2"; -} -{ - lang = "bg"; - saneName = "bg"; - sha256 = "1q3r15v4hqmw7hqb4bxkgp3xvvybhs4ij8j2k6ph78sl2kq0z9vg"; -} -{ - lang = "bs"; - saneName = "bs"; - sha256 = "00q0mamzkf3rn1r9dxjkbg0fcs0sg06m38d5hvvc81ia2f743qps"; -} -{ - lang = "ca"; - saneName = "ca"; - sha256 = "1k9x805ikaqxq33mxj8knxdbmba22pb7yl5r6yvgys6ffr36x4gv"; -} -{ - lang = "ca@valencia"; - saneName = "ca_valencia"; - sha256 = "0zfxlsxrwzyh6va0fc7d7xvahw51khf51w5v3yqx0c5zvkbnk5h2"; -} -{ - lang = "cs"; - saneName = "cs"; - sha256 = "1adccwlxqwdv575cckfh665ml0wx47226hmjyyp9qws8csi56c69"; -} -{ - lang = "da"; - saneName = "da"; - sha256 = "0d0zbv7f3cwzsly45ilzfz2abjp22f45ilzfmqjp4naj153c1dxi"; -} -{ - lang = "de"; - saneName = "de"; - sha256 = "02mzvz5n00dvdnw86awfd3g3s4dsbk28i6nd7hpqxz6anvasqrc1"; -} -{ - lang = "el"; - saneName = "el"; - sha256 = "00gi08mgkw9r3mbagxfx25ywcrl7h0xsgs8wvng8y098vq5bsql4"; -} -{ - lang = "en_GB"; - saneName = "en_GB"; - sha256 = "0sf7ipp0sggdfcpijhy0gymkvmlxd4yknrw5v1mcbl6hjdg4fpyr"; -} -{ - lang = "es"; - saneName = "es"; - sha256 = "0axzzwmx39rad34qnasdla014c5dvz65hvnkf184q2q2fzbsqcn4"; -} -{ - lang = "et"; - saneName = "et"; - sha256 = "080prwlf12nhbkkbkc111zsjr5j2zm0zp328s923gmrh5dfxi6c5"; -} -{ - lang = "eu"; - saneName = "eu"; - sha256 = "0vbc01xxnzpnvnrzvv3xird3g7glyls970rbq815a5f8d0svcqhz"; -} -{ - lang = "fi"; - saneName = "fi"; - sha256 = "0rhi9hc2kwh3dl3zin5l8akf1qlfc8i3yi8857f92az4crah0h7j"; -} -{ - lang = "fr"; - saneName = "fr"; - sha256 = "0jwlkiv3phlw4hinjz0hxgmcs5v9nkg2rdh96qfsmqm8qjwbgjj9"; -} -{ - lang = "ga"; - saneName = "ga"; - sha256 = "0nr7357xknsx2nn4w25yxzmhz1rij9b2i9fix9gbfrfi103p4j3d"; -} -{ - lang = "gl"; - saneName = "gl"; - sha256 = "1fvnfxyn2gdmbp6n9rrh7amzb23vwlfz0dif5c4pc17vkm733hci"; -} -{ - lang = "he"; - saneName = "he"; - sha256 = "1rmrwbfad81hhx3rvdis38mg4dvq88x3m2ypjy4vg47h7y3nzzsd"; -} -{ - lang = "hr"; - saneName = "hr"; - sha256 = "0w234ndd1rljrnxg1ws814r0kybh3ajc1x5n2m4qch1xvsq96knh"; -} -{ - lang = "hu"; - saneName = "hu"; - sha256 = "0rjaajqa3ci5qpx6zqzglzmllfnsm8knsal65bnm4msxh8s06k96"; -} -{ - lang = "ia"; - saneName = "ia"; - sha256 = "15rsn2qak7fjc3l54s1j26dlng4k31kh9qdgs68y38hsq65x4zc9"; -} -{ - lang = "id"; - saneName = "id"; - sha256 = "0dlciv1yk6vjc17506cabn722z9n0x25y2cmanafqb37ilm3ji9q"; -} -{ - lang = "is"; - saneName = "is"; - sha256 = "0iqsz23l4205p2vbm7nrhq6f4xcjnv2i8fll4zrim1fvmv8m9imb"; -} -{ - lang = "it"; - saneName = "it"; - sha256 = "1xmbw2c62d4zfarrwfdxg9ijgyly0p659ycxjqq6vq066ji728n0"; -} -{ - lang = "ja"; - saneName = "ja"; - sha256 = "1jrq9vhs7md5bjfaym5jqjhmlf0ydi9fwdhz87y03bp4cx8k17f5"; -} -{ - lang = "kk"; - saneName = "kk"; - sha256 = "1d5jl8yi8jjp1myg1d3jxh2fdf58n4lh77g50f9f4lab7xhwqiy0"; -} -{ - lang = "km"; - saneName = "km"; - sha256 = "1apxmwmsmis77y2if15npf38wd98nzl9h6qqi02mpbl2gq32hjnm"; -} -{ - lang = "kn"; - saneName = "kn"; - sha256 = "0r70d4m4x0jyq7fq3zj0dgy3v0pz25zbk20l932w3zyq6nxmaj18"; -} -{ - lang = "ko"; - saneName = "ko"; - sha256 = "0zr2ph6n2475fifanx2gisn0z29hgzcd822jy8h33qy1rysfzjv7"; -} -{ - lang = "lt"; - saneName = "lt"; - sha256 = "12vvy72nb16b0i2a8dqfq6zvbdxkanh39wqi6ysmbzxbic634lwy"; -} -{ - lang = "lv"; - saneName = "lv"; - sha256 = "1daxrnydhqcnmi0c2ag2jvdckshk9dypgpi6dchgfbffn4bqgy9p"; -} -{ - lang = "nb"; - saneName = "nb"; - sha256 = "1mjkbgd2k9g6ka811j6yphc9c7yl6hyx504k74l3qwhcd53nhixm"; -} -{ - lang = "nds"; - saneName = "nds"; - sha256 = "0vryzfy5phybffdizm4vxb3k1z04mqwhabvk7qijr536jv457s79"; -} -{ - lang = "nl"; - saneName = "nl"; - sha256 = "16w8i0ywlpyck2svahrjsgaadp18x6y26n637av23ll2albiigj3"; -} -{ - lang = "nn"; - saneName = "nn"; - sha256 = "1kq0nrj5i9kdb2rmn6wmrv0y3awjk25kqq0ls6f49nxy954nw1ch"; -} -{ - lang = "pa"; - saneName = "pa"; - sha256 = "12dqa9lbr99lmb35qb4vsl3pykn04kb95p4dw8yap380wfqr0j53"; -} -{ - lang = "pl"; - saneName = "pl"; - sha256 = "0mdcfw9v5434rrq1ix1zprvmrs3vdkl54nmaz7iz9iqlc44c44w1"; -} -{ - lang = "pt"; - saneName = "pt"; - sha256 = "08bwh2b9040wvhvq3ncih4b1s7yz1cdgchkird2zghsks34jn32j"; -} -{ - lang = "pt_BR"; - saneName = "pt_BR"; - sha256 = "145zgkslkm8y2vrxcr4zm2hv7m7mqc5h5q0vad33p6cxqpy8d0im"; -} -{ - lang = "ro"; - saneName = "ro"; - sha256 = "0w3s87h3msbjrbmil4za323jsh5wg80n4vzsvy77nhlv4a4zkd6p"; -} -{ - lang = "ru"; - saneName = "ru"; - sha256 = "1cddg14g2cdm2lfspps32ld8cbmd9qiwn78a2m6f6jsfbjh8kk0v"; -} -{ - lang = "sk"; - saneName = "sk"; - sha256 = "0wlgmfa15vk8vv9zd08dafvdd0df2j4721lnrn3pjrknbapfv76w"; -} -{ - lang = "sl"; - saneName = "sl"; - sha256 = "176x46y8fxhbs2x4zma705xz258jcxw45af5jkwskq6rq1v2nk8p"; -} -{ - lang = "sr"; - saneName = "sr"; - sha256 = "1sxrxblmyrpvjzag3z7a7ia3k1fd6n3jvqjv6mdcnzky6n4wjs35"; -} -{ - lang = "sv"; - saneName = "sv"; - sha256 = "1ni87ph5wgxydq5dyj7yw9xc6izx0gdqyqqvcbnzxxbfcg37apnx"; -} -{ - lang = "th"; - saneName = "th"; - sha256 = "1a4fn0vbb714pg15z9w9jkgmmqs0c3wl8397jg68xr6621cphpnh"; -} -{ - lang = "tr"; - saneName = "tr"; - sha256 = "09m81r5vlh9mi863wm0kmnbr881xy2qnsn2n6fy27csk91sj9g6s"; -} -{ - lang = "ug"; - saneName = "ug"; - sha256 = "191ivdzc60sz4z5d513v7m89clq214kw31r8pp16basayqvcycwg"; -} -{ - lang = "uk"; - saneName = "uk"; - sha256 = "1141213hrvw77ri5n518vj76k9whvr73vahbbrygfib3r1vml4rf"; -} -{ - lang = "wa"; - saneName = "wa"; - sha256 = "0mczkwzq5zb5s1mpl9g711lnng7j3bcfmn66zwm5is4ij4hd2swr"; -} -{ - lang = "zh_CN"; - saneName = "zh_CN"; - sha256 = "0ra5km0ddh3k3mb36drynf1wyfi05a1nf346jamx4lafsp5xai1r"; -} -{ - lang = "zh_TW"; - saneName = "zh_TW"; - sha256 = "0qbc0hs1f43aqkj92nnw5vn8b2r11y19hjhh2p8b41818dcyscyf"; -} -] diff --git a/pkgs/desktops/kde-4.7/l10n/manifest-4.7.3.nix b/pkgs/desktops/kde-4.7/l10n/manifest-4.7.3.nix new file mode 100644 index 00000000000..6cfb25eb7d8 --- /dev/null +++ b/pkgs/desktops/kde-4.7/l10n/manifest-4.7.3.nix @@ -0,0 +1,262 @@ +[ +{ + lang = "ar"; + saneName = "ar"; + sha256 = "09v1ywmalaqfq6bmlgs2594y9xxvlms14h82skw21pikx6apblv3"; +} +{ + lang = "bg"; + saneName = "bg"; + sha256 = "11hmr7742l1qs3rxahih9rql1ysp67gidvl7jn7g1haagqvc452v"; +} +{ + lang = "bs"; + saneName = "bs"; + sha256 = "1n4nvnmlfm08k76rl7dmlmvjh74amhm52hv93ama19j6xpp4a491"; +} +{ + lang = "ca"; + saneName = "ca"; + sha256 = "1082lw19k7ijhwjxs30fgl9iwrrnid17khq18zbcqwd6wm35ba89"; +} +{ + lang = "ca@valencia"; + saneName = "ca_valencia"; + sha256 = "1k3r7rby2x1azy4i19m1dg9950ac3y5p9sysmr3lv2b1z7pmszir"; +} +{ + lang = "cs"; + saneName = "cs"; + sha256 = "11sciybxc5hqsjnylrhg23ag52l0hv8f3yhrsdfkm4hbkwq5p0jp"; +} +{ + lang = "da"; + saneName = "da"; + sha256 = "1mbndwyrpykiigs24m4iqca6vaa4f8lr3mydjk7jlqycng0np4hq"; +} +{ + lang = "de"; + saneName = "de"; + sha256 = "1n2cjkhd87hdksqd5ncb86xfqyi371bpdhx1krn8r7hih3mhcfj4"; +} +{ + lang = "el"; + saneName = "el"; + sha256 = "0h4rkdarqs4ls4nybv8wrvy3l7vq23z3arrgx1g7hs3hwbbjbf7b"; +} +{ + lang = "en_GB"; + saneName = "en_GB"; + sha256 = "100kpqkkbv6b3ik30iikxwnk53r3dd1in5livrbl3xs2rwg6wyr3"; +} +{ + lang = "es"; + saneName = "es"; + sha256 = "0vmrcn6fffxjvishhjpay4vqadwlzvaqwrbbcfbalif9hqbg4jad"; +} +{ + lang = "et"; + saneName = "et"; + sha256 = "1bn0yz80fy1cflxkxn93fnpsg9rrkl7kbpicgsb0bh2m7bbmf650"; +} +{ + lang = "eu"; + saneName = "eu"; + sha256 = "0x83ql8sdrrviwqzz7di3xfhnwyswmxhpdz333yjz9i4h7v77mjj"; +} +{ + lang = "fi"; + saneName = "fi"; + sha256 = "13xls7wg5kxfiami38hcgpay8h8141h2n8isgzxsbgg67spaglvb"; +} +{ + lang = "fr"; + saneName = "fr"; + sha256 = "0gm2fry1snypk37hnf0fkn7pvc9amnjd75v1b2hm6yycmbj1w85x"; +} +{ + lang = "ga"; + saneName = "ga"; + sha256 = "1wvbds5yqq404vbi0dypxgy1x6d8if8wv3p3k9sm0ym21nsmi9yh"; +} +{ + lang = "gl"; + saneName = "gl"; + sha256 = "0g17vd95s6fxa787yq8qj6hsaaz7jpqhdybn3qmxp1phksr1abhy"; +} +{ + lang = "he"; + saneName = "he"; + sha256 = "0pfpp2jqr13szbpf34992r5mkcbdlvrfffcbjw98kfri5g88dif8"; +} +{ + lang = "hr"; + saneName = "hr"; + sha256 = "1218vvrivx8mbp275qbwl56ws3y0npx3fk7ribv5f65145xi6j5g"; +} +{ + lang = "hu"; + saneName = "hu"; + sha256 = "1996k35z7hswgvg6kva27bnkd3vgzi1z8f78k4v2xdbl9ldd2d79"; +} +{ + lang = "ia"; + saneName = "ia"; + sha256 = "1pn1f7k5wll4nq7lzw8cm76bvrdrqnl76avbglrap70hpfkiaisn"; +} +{ + lang = "id"; + saneName = "id"; + sha256 = "1hlz5db9apfxx7gq36szgb2wy75c5002jh9jz4rb4n3vcxk8j518"; +} +{ + lang = "is"; + saneName = "is"; + sha256 = "1zi0yj3jpsjc2sbv95d2g3xyndgzi2ygnl79gvs3y5rp0hmnfnv1"; +} +{ + lang = "it"; + saneName = "it"; + sha256 = "0gncff9jddsb0b40d662dy9i1xh6zwkfmrzs9byn4v1cr8k0pv38"; +} +{ + lang = "ja"; + saneName = "ja"; + sha256 = "10fb8f107cdijgnyrinz4cprk37ajq5mppyj1nzpbn2aavbnk3sp"; +} +{ + lang = "kk"; + saneName = "kk"; + sha256 = "1vk44avdhhr5k9gm29c3i79hshff82jh9gvvs9zaljfivym3m977"; +} +{ + lang = "km"; + saneName = "km"; + sha256 = "16ywhi85rw92ig9fbyy4z491gw297fn27403lwjr0n6w5ggfgv4l"; +} +{ + lang = "kn"; + saneName = "kn"; + sha256 = "0vn409r15g7fhcw1nr9z916nmwqfk427f0h8b69lcjjpx7178fcf"; +} +{ + lang = "ko"; + saneName = "ko"; + sha256 = "0i11kxx4ak0672dfaxanqfcb4im7l11ir5fj7j5a5q0pga1dkbm2"; +} +{ + lang = "lt"; + saneName = "lt"; + sha256 = "08czylyavbv1qvwja69h4qj3akf6afk43mqfizcg7bpr55fcjkfh"; +} +{ + lang = "lv"; + saneName = "lv"; + sha256 = "1a0gr5n835mrvv0wwlgnrfa4wri96jrcjpmq247mymka2v3xladv"; +} +{ + lang = "nb"; + saneName = "nb"; + sha256 = "1yd1wm5yvvqsb9l45rbznc5wms5kv6nylf9wsgvnqgr5i0sz7nxf"; +} +{ + lang = "nds"; + saneName = "nds"; + sha256 = "0nq7axb7ii03abdaydnnbmf1ay8w6qsjif51whc9rmcmrzyl3hxr"; +} +{ + lang = "nl"; + saneName = "nl"; + sha256 = "1i12779kr4hcppr6b7py4iyndczm00jlk5dca0csiq67bprap2hf"; +} +{ + lang = "nn"; + saneName = "nn"; + sha256 = "0xg2bb5kg0salhlf243zli9z91drdf1n6wxaps5rg8hiwjxmg6q8"; +} +{ + lang = "pa"; + saneName = "pa"; + sha256 = "0616csccw9lwvsnffslnm764i8lblyyvshpdiy1zd7cw599iarnl"; +} +{ + lang = "pl"; + saneName = "pl"; + sha256 = "0444gvrir26zc35x6y5k1f98ypbj53ldkh8dlwmrp3rk8zh31iyg"; +} +{ + lang = "pt"; + saneName = "pt"; + sha256 = "0knkc3j97gsgljqql2dfnl4h21gj1w5bq3s8kwxh4qjg0xvwcq3a"; +} +{ + lang = "pt_BR"; + saneName = "pt_BR"; + sha256 = "0xy7z8kj0v9wsjmyvaij43wwrpi8xzy2mp1qbg7wihck9b69y083"; +} +{ + lang = "ro"; + saneName = "ro"; + sha256 = "1v7n556fkhiqqknclcgdvya629x66m9b2j10d5l1n2vp94xicaqx"; +} +{ + lang = "ru"; + saneName = "ru"; + sha256 = "1mn6x216a19k8c7bkq9k34sb1w4v367i5fnvm4galnwxdqsw9fx6"; +} +{ + lang = "sk"; + saneName = "sk"; + sha256 = "03ivj3kz5kpz0g5n60i2n07hp407w7k4b1hnaf4y7ml7i4bld59v"; +} +{ + lang = "sl"; + saneName = "sl"; + sha256 = "1zii4282nc8zpkh75rl83c6lqiix91ppd7wcqff62bixzpb0cc6y"; +} +{ + lang = "sr"; + saneName = "sr"; + sha256 = "1ai6y814h7b1nvihq2midmir73qm5isr6gdilhq73vskh3kclp93"; +} +{ + lang = "sv"; + saneName = "sv"; + sha256 = "1lwmsfy5nbm1r2lwbwqwknwh2cm3s53gnbhhkfxzjdr0gjrnhmb2"; +} +{ + lang = "th"; + saneName = "th"; + sha256 = "074gnzmhwbbhq6hwd3vvgdppr5fab9c721bfy0qkbs41yy0wj7ag"; +} +{ + lang = "tr"; + saneName = "tr"; + sha256 = "0cb9l1b8j4d4549lab8g0rmm6yk8ika9qadxwy74skp31yavf4xk"; +} +{ + lang = "ug"; + saneName = "ug"; + sha256 = "1y32gm4p44ddz09j1hsdlbz4m2dzkcgz56w4vph6qgqc0insmwka"; +} +{ + lang = "uk"; + saneName = "uk"; + sha256 = "1gwbzvw9g70mgjbhya5r83hvkjk9030pdslxnmmqakqngyxgczgx"; +} +{ + lang = "wa"; + saneName = "wa"; + sha256 = "0v1ak6l46ixvn2d0xcl9fxz0zyy3jr1k41qrlznh3pk5c0r614dn"; +} +{ + lang = "zh_CN"; + saneName = "zh_CN"; + sha256 = "07ga520mmlsy52dfdpqsnhjbhlr0zcsh95fppwvfbw6g1snmvfh3"; +} +{ + lang = "zh_TW"; + saneName = "zh_TW"; + sha256 = "1hxcsw1v0qz1m5ryjwzpsxpf8ls45fbpmn8pmplcmx55kw0hanq3"; +} +] From 718a4ec1c597dc464a91426a6651fdac71d8df42 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Fri, 11 Nov 2011 02:28:12 +0000 Subject: [PATCH 560/970] svn path=/nixpkgs/trunk/; revision=30386 --- pkgs/top-level/release.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/top-level/release.nix b/pkgs/top-level/release.nix index d4a50a32371..06d5faa261c 100644 --- a/pkgs/top-level/release.nix +++ b/pkgs/top-level/release.nix @@ -383,8 +383,8 @@ with (import ./release-lib.nix); firefox36Pkgs.firefox = linux; firefox50Pkgs.firefox = linux; - firefox60Pkgs.firefox = linux; firefox70Pkgs.firefox = linux; + firefox80Pkgs.firefox = linux; gnome = { gnome_panel = linux; From e6cbed31eef6c59610eb0b4b0d4cdee2ed35f97e Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Fri, 11 Nov 2011 03:11:09 +0000 Subject: [PATCH 561/970] * Hard-code the path to xdpyinfo rather than expecting it to be in $PATH. This is necessary because x11vnc does a "su - ... xdpyinfo" somewhere. svn path=/nixpkgs/trunk/; revision=30387 --- pkgs/tools/X11/x11vnc/default.nix | 3 +++ 1 file changed, 3 insertions(+) diff --git a/pkgs/tools/X11/x11vnc/default.nix b/pkgs/tools/X11/x11vnc/default.nix index 909c12e9f60..71c7046b0b7 100644 --- a/pkgs/tools/X11/x11vnc/default.nix +++ b/pkgs/tools/X11/x11vnc/default.nix @@ -22,6 +22,9 @@ stdenv.mkDerivation rec { substituteInPlace x11vnc/unixpw.c \ --replace '"/bin/su"' '"/var/setuid-wrappers/su"' \ --replace '"/bin/true"' '"${coreutils}/bin/true"' + + substituteInPlace x11vnc/ssltools.h \ + --replace xdpyinfo ${xorg.xdpyinfo}/bin/xdpyinfo ''; meta = { From 94149403e522b0f1257847e1b5fd479fc077a772 Mon Sep 17 00:00:00 2001 From: Michael Raskin <7c6f434c@mail.ru> Date: Sat, 12 Nov 2011 09:38:31 +0000 Subject: [PATCH 562/970] Firefox 9.0beta1 svn path=/nixpkgs/trunk/; revision=30391 --- .../networking/browsers/firefox/9.0.nix | 180 ++++++++++++++++++ pkgs/top-level/all-packages.nix | 5 + 2 files changed, 185 insertions(+) create mode 100644 pkgs/applications/networking/browsers/firefox/9.0.nix diff --git a/pkgs/applications/networking/browsers/firefox/9.0.nix b/pkgs/applications/networking/browsers/firefox/9.0.nix new file mode 100644 index 00000000000..a0d32691451 --- /dev/null +++ b/pkgs/applications/networking/browsers/firefox/9.0.nix @@ -0,0 +1,180 @@ +{ stdenv, fetchurl, pkgconfig, gtk, pango, perl, python, zip, libIDL +, libjpeg, libpng, zlib, cairo, dbus, dbus_glib, bzip2, xlibs +, freetype, fontconfig, file, alsaLib, nspr, nss, libnotify +, yasm, mesa, sqlite, unzip + +, # If you want the resulting program to call itself "Firefox" instead + # of "Shiretoko" or whatever, enable this option. However, those + # binaries may not be distributed without permission from the + # Mozilla Foundation, see + # http://www.mozilla.org/foundation/trademarks/. + enableOfficialBranding ? false +}: + +assert stdenv.gcc ? libc && stdenv.gcc.libc != null; + +rec { + + firefoxVersion = "9.0b1"; + + xulVersion = "9.0"; # this attribute is used by other packages + + + src = fetchurl { + url = "http://ftp.mozilla.org/pub/mozilla.org/firefox/nightly/${firefoxVersion}-candidates/build1/source/firefox-${firefoxVersion}.source.tar.bz2"; + sha256 = "0mvm0bjzghqywh54fnk5qhz7fjm5d8y952sf59ypq64bhs5dh009"; + }; + + commonConfigureFlags = + [ "--enable-optimize" + "--disable-debug" + "--enable-strip" + "--with-system-jpeg" + "--with-system-zlib" + "--with-system-bz2" + "--with-system-nspr" + # "--with-system-nss" + # "--with-system-png" # <-- "--with-system-png won't work because the system's libpng doesn't have APNG support" + "--enable-system-cairo" + "--enable-system-sqlite" + "--disable-crashreporter" + "--disable-tests" + "--disable-necko-wifi" # maybe we want to enable this at some point + "--disable-installer" + "--disable-updater" + ]; + + + xulrunner = stdenv.mkDerivation rec { + name = "xulrunner-${xulVersion}"; + + inherit src; + + buildInputs = + [ pkgconfig gtk perl zip libIDL libjpeg libpng zlib cairo bzip2 + python dbus dbus_glib pango freetype fontconfig xlibs.libXi + xlibs.libX11 xlibs.libXrender xlibs.libXft xlibs.libXt file + alsaLib nspr /* nss */ libnotify xlibs.pixman yasm mesa + xlibs.libXScrnSaver xlibs.scrnsaverproto + xlibs.libXext xlibs.xextproto sqlite unzip + ]; + + configureFlags = + [ "--enable-application=xulrunner" + "--disable-javaxpcom" + ] ++ commonConfigureFlags; + + enableParallelBuilding = true; + + # Hack to work around make's idea of -lbz2 dependency + preConfigure = + '' + find . -name Makefile.in -execdir sed -i '{}' -e '1ivpath %.so ${ + stdenv.lib.concatStringsSep ":" + (map (s : s + "/lib") (buildInputs ++ [stdenv.gcc.libc])) + }' ';' + + export NIX_LDFLAGS="$NIX_LDFLAGS -L$out/lib/xulrunner-${xulVersion}" + ''; + + # !!! Temporary hack. + preBuild = + '' + export NIX_ENFORCE_PURITY= + ''; + + installFlags = "SKIP_GRE_REGISTRATION=1"; + + postInstall = '' + # Fix some references to /bin paths in the Xulrunner shell script. + substituteInPlace $out/bin/xulrunner \ + --replace /bin/pwd "$(type -tP pwd)" \ + --replace /bin/ls "$(type -tP ls)" + + # Fix run-mozilla.sh search + libDir=$(cd $out/lib && ls -d xulrunner-[0-9]*) + echo libDir: $libDir + test -n "$libDir" + cd $out/bin + mv xulrunner ../lib/$libDir/ + + for i in $out/lib/$libDir/*; do + file $i; + if file $i | grep executable &>/dev/null; then + echo -e '#! /bin/sh\n"'"$i"'" "$@"' > "$out/bin/$(basename "$i")"; + chmod a+x "$out/bin/$(basename "$i")"; + fi; + done; + for i in $out/lib/$libDir/{xpcshell,plugin-container,*.so}; do + patchelf --set-rpath "$(patchelf --print-rpath "$i"):$out/lib/$libDir" $i || true + done; + rm -f $out/bin/run-mozilla.sh + ''; # */ + + meta = { + description = "Mozilla Firefox XUL runner"; + homepage = http://www.mozilla.com/en-US/firefox/; + }; + + passthru = { inherit gtk; version = xulVersion; }; + }; + + + firefox = stdenv.mkDerivation rec { + name = "firefox-${firefoxVersion}"; + + inherit src; + + enableParallelBuilding = true; + + buildInputs = + [ pkgconfig gtk perl zip libIDL libjpeg zlib cairo bzip2 python + dbus dbus_glib pango freetype fontconfig alsaLib nspr libnotify + xlibs.pixman yasm mesa sqlite file unzip + ]; + + propagatedBuildInputs = [xulrunner]; + + configureFlags = + [ "--enable-application=browser" + "--with-libxul-sdk=${xulrunner}/lib/xulrunner-devel-${xulrunner.version}" + "--enable-chrome-format=jar" + "--disable-elf-hack" + ] + ++ commonConfigureFlags + ++ stdenv.lib.optional enableOfficialBranding "--enable-official-branding"; + + # Hack to work around make's idea of -lbz2 dependency + preConfigure = + '' + find . -name Makefile.in -execdir sed -i '{}' -e '1ivpath %.so ${ + stdenv.lib.concatStringsSep ":" + (map (s : s + "/lib") (buildInputs ++ [stdenv.gcc.libc])) + }' ';' + ''; + + postInstall = + '' + ln -s ${xulrunner}/lib/xulrunner-${xulrunner.version} $(echo $out/lib/firefox-*)/xulrunner + for j in $out/bin/*; do + i="$(readlink "$j")"; + file $i; + if file $i | grep executable &>/dev/null; then + rm "$out/bin/$(basename "$i")" + echo -e '#! /bin/sh\n"'"$i"'" "$@"' > "$out/bin/$(basename "$i")" + chmod a+x "$out/bin/$(basename "$i")" + fi; + done; + ''; # */ + + meta = { + description = "Mozilla Firefox - the browser, reloaded"; + homepage = http://www.mozilla.com/en-US/firefox/; + }; + + passthru = { + inherit gtk xulrunner nspr; + isFirefox3Like = true; + }; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 2d82e0e7526..da6f33678f8 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -6650,6 +6650,11 @@ let firefox80Wrapper = wrapFirefox { browser = firefox80Pkgs.firefox; }; + firefox90bPkgs = callPackage ../applications/networking/browsers/firefox/9.0.nix { + inherit (gtkLibs) gtk pango; + inherit (gnome) libIDL; + }; + flac = callPackage ../applications/audio/flac { }; flashplayer = flashplayer10; From 0b322b922786dae3982646414d386b858b68f09a Mon Sep 17 00:00:00 2001 From: Evgeny Egorochkin Date: Sat, 12 Nov 2011 16:51:44 +0000 Subject: [PATCH 563/970] Spring: version bump svn path=/nixpkgs/trunk/; revision=30392 --- pkgs/games/spring/default.nix | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/pkgs/games/spring/default.nix b/pkgs/games/spring/default.nix index 1308d93c672..1599b6f7644 100644 --- a/pkgs/games/spring/default.nix +++ b/pkgs/games/spring/default.nix @@ -6,11 +6,11 @@ stdenv.mkDerivation rec { name = "spring-${version}"; - version = "0.82.6.1"; + version = "0.83.0"; src = fetchurl { - url = "mirror://sourceforge/springrts/spring_${version}_src.tar.lzma"; - sha256 = "1bi64jgc390sqc514scz80a0pdgc5n9kx45sppky2152y725900n"; + url = "mirror://sourceforge/springrts/spring_83.0_src.tar.lzma"; + sha256 = "073x1mlzil588r8xgzc323293xmi0xbw6w0k6psxl5cs0gqrvfqa"; }; buildInputs = [ cmake lzma boost libdevil zlib p7zip openal libvorbis freetype SDL @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { --replace "which" "type -p" ''; - patches = [ ./gcc44.patch]; + #patches = [ ./gcc44.patch]; enableParallelBuilding = true; @@ -32,5 +32,6 @@ stdenv.mkDerivation rec { description = "A powerful real-time strategy(RTS) game engine"; license = licenses.gpl2; maintainers = [ maintainers.phreedom ]; + platforms = platforms.all; }; } \ No newline at end of file From 4f3ffcd0ec708e51a95b2adbd598107fcab06bae Mon Sep 17 00:00:00 2001 From: Alexander Tsamutali Date: Sat, 12 Nov 2011 17:03:44 +0000 Subject: [PATCH 564/970] development/compilers/nvidia-cg-toolkit: New nixbuild. svn path=/nixpkgs/trunk/; revision=30393 --- .../compilers/nvidia-cg-toolkit/default.nix | 43 +++++++++++++++++++ pkgs/games/mars/default.nix | 4 +- pkgs/stdenv/generic/setup.sh | 2 +- pkgs/top-level/all-packages.nix | 2 + 4 files changed, 48 insertions(+), 3 deletions(-) create mode 100644 pkgs/development/compilers/nvidia-cg-toolkit/default.nix diff --git a/pkgs/development/compilers/nvidia-cg-toolkit/default.nix b/pkgs/development/compilers/nvidia-cg-toolkit/default.nix new file mode 100644 index 00000000000..36d0cbaf23c --- /dev/null +++ b/pkgs/development/compilers/nvidia-cg-toolkit/default.nix @@ -0,0 +1,43 @@ +{ stdenv, fetchurl, patchelf }: +stdenv.mkDerivation rec { + version = "3.0"; + date = "February2011"; + name = "nvidia-cg-toolkit-${version}"; + src = + if stdenv.system == "x86_64-linux" then + fetchurl { + url = "http://developer.download.nvidia.com/cg/Cg_${version}/Cg-${version}_${date}_x86_64.tgz"; + sha256 = "07gmnzfsla3vf1kf00cj86p87h6wrdbp6ri4ycslc5kmfxsq7ypq"; + } + else if stdenv.system == "i686-linux" then + fetchurl { + url = "http://developer.download.nvidia.com/cg/Cg_${version}/Cg-${version}_${date}_x86.tgz"; + sha256 = "0hr8l0r20akbfm5j0vqv4ghl0acwjf5996pxnfxlajacl9w58nam"; + } + else null; + installPhase = '' + for b in cgc cgfxcat cginfo + do + patchelf --set-interpreter ${stdenv.glibc}/lib/ld-linux-*.so.? "bin/$b" + done + # FIXME: cgfxcat and cginfo need more patchelf + ensureDir "$out/bin/" + cp -v bin/* "$out/bin/" + ensureDir "$out/include/" + cp -v -r include/Cg/ "$out/include/" + ensureDir "$out/lib/" + [ "$system" = "x86_64-linux" ] && cp -v lib64/* "$out/lib/" + [ "$system" = "i686-linux" ] && cp -v lib/* "$out/lib/" + for mandir in man1 man3 manCg manCgFX + do + ensureDir "$out/share/man/$mandir/" + cp -v share/man/$mandir/* "$out/share/man/$mandir/" + done + ensureDir "$out/share/doc/$name/" + cp -v -r local/Cg/* "$out/share/doc/$name/" + ''; + meta = { + homepage = http://developer.nvidia.com/cg-toolkit; + license = [ "nonfree-redistributable" ]; + }; +} diff --git a/pkgs/games/mars/default.nix b/pkgs/games/mars/default.nix index 991afca6180..4dd7d0435b2 100644 --- a/pkgs/games/mars/default.nix +++ b/pkgs/games/mars/default.nix @@ -1,10 +1,10 @@ { stdenv, fetchurl, cmake, mesa, sfml_git, fribidi, taglib }: stdenv.mkDerivation rec { name = "mars-${version}"; - version = "0.7.2"; + version = "0.7.4"; src = fetchurl { url = "mirror://sourceforge/mars-game/mars_source_${version}.tar.gz"; - sha256 = "092y0y1dghkvs0syjg9cv8iq0w29hkin8bznqc8sqm21v0swk451"; + sha256 = "13a5pnsp4y2s7hpjlqfdic3a1zpd9fw3jwnzp4pr22szzby2klq7"; }; buildInputs = [ cmake mesa sfml_git fribidi taglib ]; installPhase = '' diff --git a/pkgs/stdenv/generic/setup.sh b/pkgs/stdenv/generic/setup.sh index ba06666ca89..71b405ec715 100644 --- a/pkgs/stdenv/generic/setup.sh +++ b/pkgs/stdenv/generic/setup.sh @@ -269,7 +269,7 @@ fi # Make GNU Make produce nested output. -export NIX_INDENT_MAKE=1 +#export NIX_INDENT_MAKE=1 # Normalize the NIX_BUILD_CORES variable. The value might be 0, which diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index da6f33678f8..0fc17146676 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -2349,6 +2349,8 @@ let menhir = callPackage ../development/ocaml-modules/menhir { }; + nvidia_cg_toolkit = callPackage ../development/compilers/nvidia-cg-toolkit { }; + ocaml_batteries = callPackage ../development/ocaml-modules/batteries { camomile = camomile_0_8_2; }; From 20005b7f5d22b02dd0c1faa6c5877f9e44bd985d Mon Sep 17 00:00:00 2001 From: Alexander Tsamutali Date: Sat, 12 Nov 2011 17:11:25 +0000 Subject: [PATCH 565/970] Reverting 30393. svn path=/nixpkgs/trunk/; revision=30394 --- .../compilers/nvidia-cg-toolkit/default.nix | 43 ------------------- pkgs/games/mars/default.nix | 4 +- pkgs/stdenv/generic/setup.sh | 2 +- pkgs/top-level/all-packages.nix | 2 - 4 files changed, 3 insertions(+), 48 deletions(-) delete mode 100644 pkgs/development/compilers/nvidia-cg-toolkit/default.nix diff --git a/pkgs/development/compilers/nvidia-cg-toolkit/default.nix b/pkgs/development/compilers/nvidia-cg-toolkit/default.nix deleted file mode 100644 index 36d0cbaf23c..00000000000 --- a/pkgs/development/compilers/nvidia-cg-toolkit/default.nix +++ /dev/null @@ -1,43 +0,0 @@ -{ stdenv, fetchurl, patchelf }: -stdenv.mkDerivation rec { - version = "3.0"; - date = "February2011"; - name = "nvidia-cg-toolkit-${version}"; - src = - if stdenv.system == "x86_64-linux" then - fetchurl { - url = "http://developer.download.nvidia.com/cg/Cg_${version}/Cg-${version}_${date}_x86_64.tgz"; - sha256 = "07gmnzfsla3vf1kf00cj86p87h6wrdbp6ri4ycslc5kmfxsq7ypq"; - } - else if stdenv.system == "i686-linux" then - fetchurl { - url = "http://developer.download.nvidia.com/cg/Cg_${version}/Cg-${version}_${date}_x86.tgz"; - sha256 = "0hr8l0r20akbfm5j0vqv4ghl0acwjf5996pxnfxlajacl9w58nam"; - } - else null; - installPhase = '' - for b in cgc cgfxcat cginfo - do - patchelf --set-interpreter ${stdenv.glibc}/lib/ld-linux-*.so.? "bin/$b" - done - # FIXME: cgfxcat and cginfo need more patchelf - ensureDir "$out/bin/" - cp -v bin/* "$out/bin/" - ensureDir "$out/include/" - cp -v -r include/Cg/ "$out/include/" - ensureDir "$out/lib/" - [ "$system" = "x86_64-linux" ] && cp -v lib64/* "$out/lib/" - [ "$system" = "i686-linux" ] && cp -v lib/* "$out/lib/" - for mandir in man1 man3 manCg manCgFX - do - ensureDir "$out/share/man/$mandir/" - cp -v share/man/$mandir/* "$out/share/man/$mandir/" - done - ensureDir "$out/share/doc/$name/" - cp -v -r local/Cg/* "$out/share/doc/$name/" - ''; - meta = { - homepage = http://developer.nvidia.com/cg-toolkit; - license = [ "nonfree-redistributable" ]; - }; -} diff --git a/pkgs/games/mars/default.nix b/pkgs/games/mars/default.nix index 4dd7d0435b2..991afca6180 100644 --- a/pkgs/games/mars/default.nix +++ b/pkgs/games/mars/default.nix @@ -1,10 +1,10 @@ { stdenv, fetchurl, cmake, mesa, sfml_git, fribidi, taglib }: stdenv.mkDerivation rec { name = "mars-${version}"; - version = "0.7.4"; + version = "0.7.2"; src = fetchurl { url = "mirror://sourceforge/mars-game/mars_source_${version}.tar.gz"; - sha256 = "13a5pnsp4y2s7hpjlqfdic3a1zpd9fw3jwnzp4pr22szzby2klq7"; + sha256 = "092y0y1dghkvs0syjg9cv8iq0w29hkin8bznqc8sqm21v0swk451"; }; buildInputs = [ cmake mesa sfml_git fribidi taglib ]; installPhase = '' diff --git a/pkgs/stdenv/generic/setup.sh b/pkgs/stdenv/generic/setup.sh index 71b405ec715..ba06666ca89 100644 --- a/pkgs/stdenv/generic/setup.sh +++ b/pkgs/stdenv/generic/setup.sh @@ -269,7 +269,7 @@ fi # Make GNU Make produce nested output. -#export NIX_INDENT_MAKE=1 +export NIX_INDENT_MAKE=1 # Normalize the NIX_BUILD_CORES variable. The value might be 0, which diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 0fc17146676..da6f33678f8 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -2349,8 +2349,6 @@ let menhir = callPackage ../development/ocaml-modules/menhir { }; - nvidia_cg_toolkit = callPackage ../development/compilers/nvidia-cg-toolkit { }; - ocaml_batteries = callPackage ../development/ocaml-modules/batteries { camomile = camomile_0_8_2; }; From 52e58c6c277c6e378e0afa45a186ad9be78693eb Mon Sep 17 00:00:00 2001 From: Alexander Tsamutali Date: Sat, 12 Nov 2011 17:19:45 +0000 Subject: [PATCH 566/970] development/compilers/nvidia-cg-toolkit: New nixbuild. svn path=/nixpkgs/trunk/; revision=30395 --- .../compilers/nvidia-cg-toolkit/default.nix | 43 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 + 2 files changed, 45 insertions(+) create mode 100644 pkgs/development/compilers/nvidia-cg-toolkit/default.nix diff --git a/pkgs/development/compilers/nvidia-cg-toolkit/default.nix b/pkgs/development/compilers/nvidia-cg-toolkit/default.nix new file mode 100644 index 00000000000..36d0cbaf23c --- /dev/null +++ b/pkgs/development/compilers/nvidia-cg-toolkit/default.nix @@ -0,0 +1,43 @@ +{ stdenv, fetchurl, patchelf }: +stdenv.mkDerivation rec { + version = "3.0"; + date = "February2011"; + name = "nvidia-cg-toolkit-${version}"; + src = + if stdenv.system == "x86_64-linux" then + fetchurl { + url = "http://developer.download.nvidia.com/cg/Cg_${version}/Cg-${version}_${date}_x86_64.tgz"; + sha256 = "07gmnzfsla3vf1kf00cj86p87h6wrdbp6ri4ycslc5kmfxsq7ypq"; + } + else if stdenv.system == "i686-linux" then + fetchurl { + url = "http://developer.download.nvidia.com/cg/Cg_${version}/Cg-${version}_${date}_x86.tgz"; + sha256 = "0hr8l0r20akbfm5j0vqv4ghl0acwjf5996pxnfxlajacl9w58nam"; + } + else null; + installPhase = '' + for b in cgc cgfxcat cginfo + do + patchelf --set-interpreter ${stdenv.glibc}/lib/ld-linux-*.so.? "bin/$b" + done + # FIXME: cgfxcat and cginfo need more patchelf + ensureDir "$out/bin/" + cp -v bin/* "$out/bin/" + ensureDir "$out/include/" + cp -v -r include/Cg/ "$out/include/" + ensureDir "$out/lib/" + [ "$system" = "x86_64-linux" ] && cp -v lib64/* "$out/lib/" + [ "$system" = "i686-linux" ] && cp -v lib/* "$out/lib/" + for mandir in man1 man3 manCg manCgFX + do + ensureDir "$out/share/man/$mandir/" + cp -v share/man/$mandir/* "$out/share/man/$mandir/" + done + ensureDir "$out/share/doc/$name/" + cp -v -r local/Cg/* "$out/share/doc/$name/" + ''; + meta = { + homepage = http://developer.nvidia.com/cg-toolkit; + license = [ "nonfree-redistributable" ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index da6f33678f8..c4707cf3fe7 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -2307,6 +2307,8 @@ let nasm = callPackage ../development/compilers/nasm { }; + nvidia_cg_toolkit = callPackage ../development/compilers/nvidia-cg-toolkit { }; + ocaml = ocaml_3_11_1; ocaml_3_08_0 = callPackage ../development/compilers/ocaml/3.08.0.nix { }; From accdb3b19fccb95c517fea084a3bedf37d15b515 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?= Date: Sat, 12 Nov 2011 17:29:11 +0000 Subject: [PATCH 567/970] Fixing xfontsel, so it now starts finding the dynamic libs. svn path=/nixpkgs/trunk/; revision=30396 --- pkgs/applications/misc/xfontsel/default.nix | 3 +++ 1 file changed, 3 insertions(+) diff --git a/pkgs/applications/misc/xfontsel/default.nix b/pkgs/applications/misc/xfontsel/default.nix index b875e51ecff..c81a346914c 100644 --- a/pkgs/applications/misc/xfontsel/default.nix +++ b/pkgs/applications/misc/xfontsel/default.nix @@ -13,6 +13,9 @@ stdenv.mkDerivation rec { buildInputs = [libX11 pkgconfig libXaw]; + # Without this, it gets Xmu as a dependency, but without rpath entry + NIX_LDFLAGS = "-lXmu"; + # This will not make xfontsel find its app-defaults, but at least the $out # directory will contain them. # hack: Copying the XFontSel app-defaults file to $HOME makes xfontsel work. From b92b8f3d781a207baa6d4bce199cc045280b18cc Mon Sep 17 00:00:00 2001 From: Evgeny Egorochkin Date: Sat, 12 Nov 2011 17:56:26 +0000 Subject: [PATCH 568/970] libtorrent-rasterbar: version bump svn path=/nixpkgs/trunk/; revision=30397 --- pkgs/development/libraries/libtorrent-rasterbar/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/libtorrent-rasterbar/default.nix b/pkgs/development/libraries/libtorrent-rasterbar/default.nix index 90b643c11c1..8916e926771 100644 --- a/pkgs/development/libraries/libtorrent-rasterbar/default.nix +++ b/pkgs/development/libraries/libtorrent-rasterbar/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "libtorrent-rasterbar-${version}"; - version = "0.15.4"; + version = "0.15.8"; src = fetchurl { url = "http://libtorrent.googlecode.com/files/${name}.tar.gz"; - sha256 = "1pjdn0as4h71bhm0fbjqsh1y10fbifn2hfrkhkgdsdqhz7vdbfwy"; + sha256 = "0767i20igrfadscw3vdyadd4qidybwx9h898rkaq95zlwhaygpzm"; }; buildInputs = [ boost pkgconfig openssl zlib ]; From 66bd9580f063d818167a62c7cab3de40bc83c925 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Sat, 12 Nov 2011 22:19:03 +0000 Subject: [PATCH 569/970] Added GHC 7.2.2. svn path=/nixpkgs/trunk/; revision=30398 --- pkgs/development/compilers/ghc/7.2.2.nix | 44 ++++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 6 ++++ pkgs/top-level/haskell-packages.nix | 1 + 3 files changed, 51 insertions(+) create mode 100644 pkgs/development/compilers/ghc/7.2.2.nix diff --git a/pkgs/development/compilers/ghc/7.2.2.nix b/pkgs/development/compilers/ghc/7.2.2.nix new file mode 100644 index 00000000000..358f41dcf08 --- /dev/null +++ b/pkgs/development/compilers/ghc/7.2.2.nix @@ -0,0 +1,44 @@ +{stdenv, fetchurl, ghc, perl, gmp, ncurses, darwinInstallNameToolUtility}: + +stdenv.mkDerivation rec { + version = "7.2.2"; + name = "ghc-${version}"; + + src = fetchurl { + url = "http://haskell.org/ghc/dist/${version}/${name}-src.tar.bz2"; + sha256 = "0g87d3z9275dniaqzkf56qfgzp1msd89nqqhhm2gkc6iga072spz"; + }; + + buildInputs = [ghc perl gmp ncurses] ++ + (if stdenv.isDarwin then [darwinInstallNameToolUtility] else []); + + buildMK = '' + libraries/integer-gmp_CONFIGURE_OPTS += --configure-option=--with-gmp-libraries="${gmp}/lib" + libraries/integer-gmp_CONFIGURE_OPTS += --configure-option=--with-gmp-includes="${gmp}/include" + ''; + + preConfigure = '' + echo "${buildMK}" > mk/build.mk + sed -i -e 's|-isysroot /Developer/SDKs/MacOSX10.5.sdk||' configure + ''; + + configureFlags=[ + "--with-gcc=${stdenv.gcc}/bin/gcc" + ]; + + # required, because otherwise all symbols from HSffi.o are stripped, and + # that in turn causes GHCi to abort + stripDebugFlags=["-S" "--keep-file-symbols"]; + + meta = { + homepage = "http://haskell.org/ghc"; + description = "The Glasgow Haskell Compiler"; + maintainers = [ + stdenv.lib.maintainers.marcweber + stdenv.lib.maintainers.andres + stdenv.lib.maintainers.simons + ]; + platforms = ghc.meta.platforms; + }; + +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index c4707cf3fe7..6e76d730a6a 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -2211,6 +2211,12 @@ let (if stdenv.isDarwin then ghc704Binary else ghc6121Binary) (x : x.ghc721Prefs) false false lowPrio); + haskellPackages_ghc722 = + recurseIntoAttrs + (haskellPackagesFun ../development/compilers/ghc/7.2.2.nix + (if stdenv.isDarwin then ghc704Binary else ghc6121Binary) + (x : x.ghc722Prefs) false false lowPrio); + # Reasonably current HEAD snapshot. Should *always* be lowPrio. haskellPackages_ghcHEAD = haskellPackagesFun ../development/compilers/ghc/head.nix diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix index 69f3c28bc9d..95b17115b2f 100644 --- a/pkgs/top-level/haskell-packages.nix +++ b/pkgs/top-level/haskell-packages.nix @@ -89,6 +89,7 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y); ghc703Prefs = super : super // super.haskellPlatformDefaults_2011_2_0_1 super; ghc704Prefs = super : super // super.haskellPlatformDefaults_2011_2_0_1 super; # link ghc721Prefs = super : super // super.haskellPlatformDefaults_future super; + ghc722Prefs = super : super // super.haskellPlatformDefaults_future super; ghcHEADPrefs = super : super // super.haskellPlatformDefaults_future super; # link # GHC and its wrapper From 8157570495b8c3db386db7900caff500856de945 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Sat, 12 Nov 2011 22:19:11 +0000 Subject: [PATCH 570/970] all-packages.nix: strip trailing whitespace svn path=/nixpkgs/trunk/; revision=30399 --- pkgs/top-level/all-packages.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 6e76d730a6a..a6aeee713df 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -5145,7 +5145,7 @@ let }; drbd = callPackage ../os-specific/linux/drbd { }; - + libuuid = if crossSystem != null && crossSystem.config == "i586-pc-gnu" then (utillinuxng // { @@ -5670,7 +5670,7 @@ let callPackage ../os-specific/linux/aufs/3.nix { } else null; - aufs_util = + aufs_util = if kernel.features ? aufs2 then callPackage ../os-specific/linux/aufs-util/2.nix { } else if kernel.features ? aufs2_1 then @@ -5678,7 +5678,7 @@ let else if kernel.features ? aufs3 then callPackage ../os-specific/linux/aufs-util/3.nix { } else null; - + blcr = callPackage ../os-specific/linux/blcr { #libtool = libtool_1_5; # libtool 2 causes a fork bomb }; From 2741c168fe3233672658d8e1d0f89da9b8ac9fdc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= Date: Sat, 12 Nov 2011 23:55:35 +0000 Subject: [PATCH 571/970] GCC 4.5: Provide the right system include directory on GNU/Hurd. svn path=/nixpkgs/trunk/; revision=30400 --- pkgs/development/compilers/gcc-4.5/default.nix | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/pkgs/development/compilers/gcc-4.5/default.nix b/pkgs/development/compilers/gcc-4.5/default.nix index 19efa57af8e..b3bd431fbc9 100644 --- a/pkgs/development/compilers/gcc-4.5/default.nix +++ b/pkgs/development/compilers/gcc-4.5/default.nix @@ -175,6 +175,12 @@ stdenv.mkDerivation ({ echo "augmenting \`LIB_SPEC' in \`${gnu_h}' with \`${extraLibSpec}'..." sed -i "${gnu_h}" \ -es'|LIB_SPEC *"\(.*\)$|LIB_SPEC "${extraLibSpec} \1|g' + + echo "setting \`NATIVE_SYSTEM_HEADER_DIR' and \`STANDARD_INCLUDE_DIR' to \`${libc}/include'..." + sed -i "${gnu_h}" \ + -es'|#define STANDARD_INCLUDE_DIR.*$|#define STANDARD_INCLUDE_DIR "${libc}/include"|g' + sed -i gcc/config/t-gnu \ + -es'|NATIVE_SYSTEM_HEADER_DIR.*$|NATIVE_SYSTEM_HEADER_DIR = ${libc}/include|g' '' else if cross != null || stdenv.gcc.libc != null then # On NixOS, use the right path to the dynamic linker instead of From ea3ac07d9255657c049eecb350754b12ff6c7e89 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= Date: Sat, 12 Nov 2011 23:55:41 +0000 Subject: [PATCH 572/970] GCC 4.5: Allow `libcCross != null && cross == null' for `gcc.hostDrv'. svn path=/nixpkgs/trunk/; revision=30401 --- pkgs/development/compilers/gcc-4.5/default.nix | 6 ++++-- pkgs/top-level/all-packages.nix | 10 ++++++++++ 2 files changed, 14 insertions(+), 2 deletions(-) diff --git a/pkgs/development/compilers/gcc-4.5/default.nix b/pkgs/development/compilers/gcc-4.5/default.nix index b3bd431fbc9..5f99ad89434 100644 --- a/pkgs/development/compilers/gcc-4.5/default.nix +++ b/pkgs/development/compilers/gcc-4.5/default.nix @@ -147,13 +147,15 @@ stdenv.mkDerivation ({ postPatch = if (stdenv.system == "i586-pc-gnu" + || (libcCross != null) # e.g., building `gcc.hostDrv' || (cross != null && cross.config == "i586-pc-gnu" && libcCross != null)) then # On GNU/Hurd glibc refers to Hurd & Mach headers and libpthread is not # in glibc, so add the right `-I' flags to the default spec string. + assert libcCross != null -> libpthreadCross != null; let - libc = if cross != null then libcCross else stdenv.glibc; + libc = if libcCross != null then libcCross else stdenv.glibc; gnu_h = "gcc/config/gnu.h"; i386_gnu_h = "gcc/config/i386/gnu.h"; extraCPPDeps = @@ -186,7 +188,7 @@ stdenv.mkDerivation ({ # On NixOS, use the right path to the dynamic linker instead of # `/lib/ld*.so'. let - libc = if (cross != null && libcCross != null) then libcCross else stdenv.gcc.libc; + libc = if (libcCross != null) then libcCross else stdenv.gcc.libc; in '' echo "fixing the \`GLIBC_DYNAMIC_LINKER' and \`UCLIBC_DYNAMIC_LINKER' macros..." for header in "gcc/config/"*-gnu.h "gcc/config/"*"/"*.h diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index a6aeee713df..1b3f1b4b672 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -1847,6 +1847,16 @@ let # bootstrapping a profiled compiler does not work in the sheevaplug: # http://gcc.gnu.org/bugzilla/show_bug.cgi?id=43944 profiledCompiler = if stdenv.system == "armv5tel-linux" then false else true; + + # When building `gcc.hostDrv' (a "Canadian cross", with host == target + # and host != build), `cross' must be null but the cross-libc must still + # be passed. + cross = null; + libcCross = if crossSystem != null then libcCross else null; + libpthreadCross = + if crossSystem != null && crossSystem.config == "i586-pc-gnu" + then gnu.libpthreadCross + else null; })); gcc46_real = lowPrio (wrapGCC (callPackage ../development/compilers/gcc-4.6 { From f68d9d7c294dac066c9dc117053d9b5a8d6e36c9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= Date: Sat, 12 Nov 2011 23:55:48 +0000 Subject: [PATCH 573/970] GCC 4.6: Better separate native and host build inputs. svn path=/nixpkgs/trunk/; revision=30402 --- pkgs/development/compilers/gcc-4.6/default.nix | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/pkgs/development/compilers/gcc-4.6/default.nix b/pkgs/development/compilers/gcc-4.6/default.nix index 6b484a09877..71ca99b3c13 100644 --- a/pkgs/development/compilers/gcc-4.6/default.nix +++ b/pkgs/development/compilers/gcc-4.6/default.nix @@ -202,17 +202,18 @@ stdenv.mkDerivation ({ inherit noSysDirs profiledCompiler staticCompiler langJava crossStageStatic libcCross crossMingw; - buildNativeInputs = [ texinfo which ] - ++ optional langJava perl; + buildNativeInputs = [ texinfo which gettext ] + ++ (optional (perl != null) perl) + ++ (optional javaAwtGtk pkgconfig) + ++ (optionals langTreelang [bison flex]); - buildInputs = [ gmp mpfr mpc libelf gettext ] + buildInputs = [ gmp mpfr mpc libelf ] ++ (optional (ppl != null) ppl) ++ (optional (cloogppl != null) cloogppl) ++ (optional (cloog != null) cloog) - ++ (optionals langTreelang [bison flex]) ++ (optional (zlib != null) zlib) ++ (optionals langJava [ boehmgc zip unzip ]) - ++ (optionals javaAwtGtk [gtk pkgconfig libart_lgpl] ++ xlibs) + ++ (optionals javaAwtGtk [ gtk libart_lgpl ] ++ xlibs) ++ (optionals (cross != null) [binutilsCross]) ++ (optionals langAda [gnatboot]) ++ (optionals langVhdl [gnat]) From 6c90f914633ecc97bb67820595c0ace4138b3879 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= Date: Sat, 12 Nov 2011 23:55:53 +0000 Subject: [PATCH 574/970] GCC 4.5: Fix the Canadian cross, aka. `gcc45.hostDrv'. svn path=/nixpkgs/trunk/; revision=30403 --- pkgs/development/compilers/gcc-4.5/default.nix | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/pkgs/development/compilers/gcc-4.5/default.nix b/pkgs/development/compilers/gcc-4.5/default.nix index 5f99ad89434..d5791d08ecf 100644 --- a/pkgs/development/compilers/gcc-4.5/default.nix +++ b/pkgs/development/compilers/gcc-4.5/default.nix @@ -395,6 +395,13 @@ stdenv.mkDerivation ({ }; } +// optionalAttrs (cross != null || libcCross != null) { + # `builder.sh' sets $CPP, which leads configure to use "gcc -E" instead of, + # say, "i586-pc-gnu-gcc -E" when building `gcc.hostDrv'. + # FIXME: Fix `builder.sh' directly in the next stdenv-update. + postUnpack = "unset CPP"; +} + // optionalAttrs (cross != null && cross.libc == "msvcrt" && crossStageStatic) { makeFlags = [ "all-gcc" "all-target-libgcc" ]; installTargets = "install-gcc install-target-libgcc"; From a875b4bc1e110e912d49db1af991efee21e54dc2 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Sun, 13 Nov 2011 01:37:52 +0000 Subject: [PATCH 575/970] haskell-epic: updated to version 0.9 svn path=/nixpkgs/trunk/; revision=30404 --- pkgs/development/compilers/epic/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/compilers/epic/default.nix b/pkgs/development/compilers/epic/default.nix index b4a53df9433..377a7377a32 100644 --- a/pkgs/development/compilers/epic/default.nix +++ b/pkgs/development/compilers/epic/default.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "epic"; - version = "0.1.13"; - sha256 = "00rdprgndrvssrjlp6jh5jak2rxq6bcd2dknldx6i8h1cq6i69rb"; + version = "0.9"; + sha256 = "0bxvabzizq0msj0fy02vqj0pylq4cbymsypi6w2babwykscrdgm0"; isLibrary = true; isExecutable = true; buildDepends = [ mtl ]; From ca23e0c9418be9989bf6248b5d133d27c44e6e14 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Sun, 13 Nov 2011 01:37:57 +0000 Subject: [PATCH 576/970] haskell-HaskellForMaths: updated to version 0.4.1 svn path=/nixpkgs/trunk/; revision=30405 --- .../development/libraries/haskell/HaskellForMaths/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/HaskellForMaths/default.nix b/pkgs/development/libraries/haskell/HaskellForMaths/default.nix index d4e1532b101..e55619fb3ab 100644 --- a/pkgs/development/libraries/haskell/HaskellForMaths/default.nix +++ b/pkgs/development/libraries/haskell/HaskellForMaths/default.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "HaskellForMaths"; - version = "0.4.0"; - sha256 = "1x6kac1im07cpb1014ci8v222q66w2g3gr1wdcv2yvdi5g24ymbp"; + version = "0.4.1"; + sha256 = "0jwdxz5wqayx196giv7nj5j0k9zw50x555ig6xj00cladvplvh9h"; buildDepends = [ random ]; meta = { homepage = "http://haskellformaths.blogspot.com/"; From 5b0b90f9f394ae0df4f9d177eb02f7349859d241 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Sun, 13 Nov 2011 01:38:00 +0000 Subject: [PATCH 577/970] haskell-certificate: updated to version 1.0.1 svn path=/nixpkgs/trunk/; revision=30406 --- pkgs/development/libraries/haskell/certificate/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/certificate/default.nix b/pkgs/development/libraries/haskell/certificate/default.nix index 1e8fca8ca29..33b36578bc8 100644 --- a/pkgs/development/libraries/haskell/certificate/default.nix +++ b/pkgs/development/libraries/haskell/certificate/default.nix @@ -3,8 +3,8 @@ cabal.mkDerivation (self: { pname = "certificate"; - version = "1.0.0"; - sha256 = "1i4s1yvl765cfj7ya5rsvzqnijf307zh4i4pzcgncmr37mlkfjz2"; + version = "1.0.1"; + sha256 = "0rv9gs316ng86zv5njcfj96zplbrn317vypnyv7sz28v4k4vha10"; isLibrary = true; isExecutable = true; buildDepends = [ From 8b23854f56bb80c33e26f82371b4beda1d4d27c5 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Sun, 13 Nov 2011 01:38:03 +0000 Subject: [PATCH 578/970] haskell-hxt: updated to version 9.1.5 svn path=/nixpkgs/trunk/; revision=30407 --- pkgs/development/libraries/haskell/hxt/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/hxt/default.nix b/pkgs/development/libraries/haskell/hxt/default.nix index 88112a1f089..979fa3c11e9 100644 --- a/pkgs/development/libraries/haskell/hxt/default.nix +++ b/pkgs/development/libraries/haskell/hxt/default.nix @@ -4,8 +4,8 @@ cabal.mkDerivation (self: { pname = "hxt"; - version = "9.1.4"; - sha256 = "1dqnxb1dikw74l02sb6q193ipk9qfwqlgvcd362705mdqzai124c"; + version = "9.1.5"; + sha256 = "0w0l86y8q2391dvqn112f2s0infm1zzqnlp9hhwcx8jg2slsxbcm"; buildDepends = [ binary deepseq HUnit hxtCharproperties hxtRegexXmlschema hxtUnicode network parsec From d2464a9fe1d96f54b75c388a840a0d2f9db11dc1 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Sun, 13 Nov 2011 01:38:06 +0000 Subject: [PATCH 579/970] haskell-terminfo: updated to version 0.3.2.3 svn path=/nixpkgs/trunk/; revision=30408 --- pkgs/development/libraries/haskell/terminfo/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/terminfo/default.nix b/pkgs/development/libraries/haskell/terminfo/default.nix index 240b72d7a8f..66212bbe385 100644 --- a/pkgs/development/libraries/haskell/terminfo/default.nix +++ b/pkgs/development/libraries/haskell/terminfo/default.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "terminfo"; - version = "0.3.2.2"; - sha256 = "1370vxvv32aarmk64yvwb8rav523xk7fg5h65cgxvn4ppjqv0f51"; + version = "0.3.2.3"; + sha256 = "06y2vx7d4hl55p3p1c7yj2lx8yaw14c5h2qclj8m5xg2wkifnf5f"; buildDepends = [ extensibleExceptions ]; extraLibraries = [ ncurses ]; meta = { From 3e4045ee9fdbb9f42bb06e751c0a5792516c0aa3 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Sun, 13 Nov 2011 01:38:09 +0000 Subject: [PATCH 580/970] haskell-haskell-src: added version 1.0.1.5 svn path=/nixpkgs/trunk/; revision=30409 --- .../libraries/haskell/haskell-src/1.0.1.5.nix | 18 ++++++++++++++++++ pkgs/top-level/haskell-packages.nix | 5 +++-- 2 files changed, 21 insertions(+), 2 deletions(-) create mode 100644 pkgs/development/libraries/haskell/haskell-src/1.0.1.5.nix diff --git a/pkgs/development/libraries/haskell/haskell-src/1.0.1.5.nix b/pkgs/development/libraries/haskell/haskell-src/1.0.1.5.nix new file mode 100644 index 00000000000..dd62d57a02a --- /dev/null +++ b/pkgs/development/libraries/haskell/haskell-src/1.0.1.5.nix @@ -0,0 +1,18 @@ +{ cabal, happy, syb }: + +cabal.mkDerivation (self: { + pname = "haskell-src"; + version = "1.0.1.5"; + sha256 = "1ay3i2sbrp0pzg6fagg8gqrwq5lcnm5jb5sr11frbk274a82cdwz"; + buildDepends = [ syb ]; + buildTools = [ happy ]; + meta = { + description = "Support for manipulating Haskell source code"; + license = self.stdenv.lib.licenses.bsd3; + platforms = self.ghc.meta.platforms; + maintainers = [ + self.stdenv.lib.maintainers.andres + self.stdenv.lib.maintainers.simons + ]; + }; +}) diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix index 95b17115b2f..3dc22ab3557 100644 --- a/pkgs/top-level/haskell-packages.nix +++ b/pkgs/top-level/haskell-packages.nix @@ -127,7 +127,7 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y); cgi = self.cgi_3001_1_7_4; # 7.2 ok, 7.3 ok fgl = self.fgl_5_4_2_4; # 7.2 ok, 7.3 ok GLUT = self.GLUT_2_1_2_1; # 7.2 ok, 7.3 ok - haskellSrc = self.haskellSrc_1_0_1_4; # 7.2 fails, 7.3 fails + haskellSrc = self.haskellSrc_1_0_1_5; # 7.2 fails, 7.3 fails html = self.html_1_0_1_2; # 7.2 ok, 7.3 ok HUnit = self.HUnit_1_2_2_3; # 7.2 ok, 7.3 ok network = self.network_2_3_0_7; # 7.2 ok, 7.3 ok @@ -683,7 +683,8 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y); haskellSrc_1_0_1_3 = callPackage ../development/libraries/haskell/haskell-src/1.0.1.3.nix {}; haskellSrc_1_0_1_4 = callPackage ../development/libraries/haskell/haskell-src/1.0.1.4.nix {}; - haskellSrc = self.haskellSrc_1_0_1_3; + haskellSrc_1_0_1_5 = callPackage ../development/libraries/haskell/haskell-src/1.0.1.5.nix {}; + haskellSrc = self.haskellSrc_1_0_1_5; # The old version is required for Agda. haskellSrcExts_1_11_1 = callPackage ../development/libraries/haskell/haskell-src-exts/1.11.1.nix {}; From 612fd5de821a6c68de7d8d3472e336439a00fee6 Mon Sep 17 00:00:00 2001 From: Michael Raskin <7c6f434c@mail.ru> Date: Sun, 13 Nov 2011 13:54:04 +0000 Subject: [PATCH 581/970] Do not apply Hurd-specific fixes for simple cross-Linux. Unfortunately, still no luck with my ARM device svn path=/nixpkgs/trunk/; revision=30410 --- pkgs/development/compilers/gcc-4.5/default.nix | 1 - 1 file changed, 1 deletion(-) diff --git a/pkgs/development/compilers/gcc-4.5/default.nix b/pkgs/development/compilers/gcc-4.5/default.nix index d5791d08ecf..1e4a98805ba 100644 --- a/pkgs/development/compilers/gcc-4.5/default.nix +++ b/pkgs/development/compilers/gcc-4.5/default.nix @@ -147,7 +147,6 @@ stdenv.mkDerivation ({ postPatch = if (stdenv.system == "i586-pc-gnu" - || (libcCross != null) # e.g., building `gcc.hostDrv' || (cross != null && cross.config == "i586-pc-gnu" && libcCross != null)) then From eb3c58cd646c5b76a2843c6db76a906d991f9df2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?= Date: Sun, 13 Nov 2011 14:33:31 +0000 Subject: [PATCH 582/970] Adding libchop. I want to try it. Why didn't ludo add this, I don't know. :) svn path=/nixpkgs/trunk/; revision=30411 --- .../development/libraries/libchop/default.nix | 39 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 + 2 files changed, 41 insertions(+) create mode 100644 pkgs/development/libraries/libchop/default.nix diff --git a/pkgs/development/libraries/libchop/default.nix b/pkgs/development/libraries/libchop/default.nix new file mode 100644 index 00000000000..53deebc8190 --- /dev/null +++ b/pkgs/development/libraries/libchop/default.nix @@ -0,0 +1,39 @@ +{ fetchurl, stdenv, zlib, bzip2, libgcrypt, gdbm, gperf, tdb, gnutls, db4, + libuuid, lzo, pkgconfig }: + +stdenv.mkDerivation rec { + name = "libchop-0.5"; + + src = fetchurl { + url = "http://download.savannah.gnu.org/releases/libchop/libchop-0.5.tar.gz"; + sha256 = "0i7gl0c99pf6794bbwm3iha6a0bciqq969mgwwv6gm9phiiy5s8b"; + }; + + buildInputs = [ zlib libgcrypt gdbm gperf bzip2 db4 tdb gnutls libuuid lzo + pkgconfig ]; + + doCheck = true; + + meta = { + description = "The GNU Transport Layer Security Library"; + + longDescription = '' + GnuTLS is a project that aims to develop a library which + provides a secure layer, over a reliable transport + layer. Currently the GnuTLS library implements the proposed + standards by the IETF's TLS working group. + + Quoting from the TLS protocol specification: + + "The TLS protocol provides communications privacy over the + Internet. The protocol allows client/server applications to + communicate in a way that is designed to prevent eavesdropping, + tampering, or message forgery." + ''; + + homepage = http://nongnu.org/libchop/; + license = "GPLv3+"; + + maintainers = [ stdenv.lib.maintainers.ludo stdenv.lib.maintainers.viric ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 1b3f1b4b672..f4909a41df4 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -3804,6 +3804,8 @@ let inherit (gnome) gtk glib libsoup; }; + libchop = callPackage ../development/libraries/libchop { }; + libcm = callPackage ../development/libraries/libcm { }; libctemplate = callPackage ../development/libraries/libctemplate { }; From fa97f540015f485faa6fecf0dbd4b4f41cdd96ef Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= Date: Sun, 13 Nov 2011 14:39:15 +0000 Subject: [PATCH 583/970] GCC 4.5: Fix `gcc45.hostDrv' for GNU. This fixes a regression introduced in r30410 ("Do not apply Hurd-specific fixes for simple cross-Linux. Unfortunately, still no luck with my ARM device"). svn path=/nixpkgs/trunk/; revision=30412 --- pkgs/development/compilers/gcc-4.5/default.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/development/compilers/gcc-4.5/default.nix b/pkgs/development/compilers/gcc-4.5/default.nix index 1e4a98805ba..950243bebe7 100644 --- a/pkgs/development/compilers/gcc-4.5/default.nix +++ b/pkgs/development/compilers/gcc-4.5/default.nix @@ -147,6 +147,8 @@ stdenv.mkDerivation ({ postPatch = if (stdenv.system == "i586-pc-gnu" + || (libcCross != null # e.g., building `gcc.hostDrv' + && libcCross.crossConfig == "i586-pc-gnu") || (cross != null && cross.config == "i586-pc-gnu" && libcCross != null)) then From ac443637fec5f9f363146c9dd14279d93f1890e4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?= Date: Sun, 13 Nov 2011 14:56:14 +0000 Subject: [PATCH 584/970] Fixing the description of libchop; it had the reminiscences of the gnutls default.nix I used as base. svn path=/nixpkgs/trunk/; revision=30413 --- .../development/libraries/libchop/default.nix | 19 +++---------------- 1 file changed, 3 insertions(+), 16 deletions(-) diff --git a/pkgs/development/libraries/libchop/default.nix b/pkgs/development/libraries/libchop/default.nix index 53deebc8190..be6bc429301 100644 --- a/pkgs/development/libraries/libchop/default.nix +++ b/pkgs/development/libraries/libchop/default.nix @@ -15,25 +15,12 @@ stdenv.mkDerivation rec { doCheck = true; meta = { - description = "The GNU Transport Layer Security Library"; - - longDescription = '' - GnuTLS is a project that aims to develop a library which - provides a secure layer, over a reliable transport - layer. Currently the GnuTLS library implements the proposed - standards by the IETF's TLS working group. - - Quoting from the TLS protocol specification: - - "The TLS protocol provides communications privacy over the - Internet. The protocol allows client/server applications to - communicate in a way that is designed to prevent eavesdropping, - tampering, or message forgery." - ''; + description = "Set of utilities and library for data backup and distributed storage"; homepage = http://nongnu.org/libchop/; license = "GPLv3+"; - maintainers = [ stdenv.lib.maintainers.ludo stdenv.lib.maintainers.viric ]; + maintainers = [ stdenv.lib.maintainers.ludo + stdenv.lib.maintainers.viric ]; }; } From db1b4e2edc6dbcf97de0cd74af0c3c1a5846dc8f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= Date: Sun, 13 Nov 2011 21:28:29 +0000 Subject: [PATCH 585/970] GNU Zile: Fix cross-compilation. svn path=/nixpkgs/trunk/; revision=30414 --- pkgs/applications/editors/zile/default.nix | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/editors/zile/default.nix b/pkgs/applications/editors/zile/default.nix index 6a1762d77ff..0d588e537bb 100644 --- a/pkgs/applications/editors/zile/default.nix +++ b/pkgs/applications/editors/zile/default.nix @@ -8,13 +8,16 @@ stdenv.mkDerivation rec { sha256 = "0ia91c18fyssnhabfb22npmidjkx32rqfkjgxxjibvdwfja25d3k"; }; - buildInputs = [ ncurses boehmgc perl ]; - buildNativeInputs = [ help2man ]; + buildInputs = [ ncurses boehmgc ]; + buildNativeInputs = [ help2man perl ]; # Tests can't be run because most of them rely on the ability to # fiddle with the terminal. doCheck = false; + # XXX: Work around cross-compilation-unfriendly `gl_FUNC_FSTATAT' macro. + preConfigure = "export gl_cv_func_fstatat_zero_flag=yes"; + meta = { description = "GNU Zile, a lightweight Emacs clone"; From e98264fe8f09795f337608758a9d6cd8cf620050 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= Date: Sun, 13 Nov 2011 21:28:35 +0000 Subject: [PATCH 586/970] GNU Guile: Fix cross-compilation. svn path=/nixpkgs/trunk/; revision=30415 --- pkgs/development/interpreters/guile/default.nix | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/pkgs/development/interpreters/guile/default.nix b/pkgs/development/interpreters/guile/default.nix index 33349605736..839de3c053d 100644 --- a/pkgs/development/interpreters/guile/default.nix +++ b/pkgs/development/interpreters/guile/default.nix @@ -14,11 +14,8 @@ rec { sha256 = "14rhlpxxa4v5y3gl992l7lnd5qnqawx0a84idnwq0w2qviwcvsyj"; }; - buildNativeInputs = [ xz ]; - buildInputs = - [ makeWrapper gawk readline libtool libunistring - libffi pkgconfig - ]; + buildNativeInputs = [ xz makeWrapper gawk pkgconfig ]; + buildInputs = [ readline libtool libunistring libffi ]; propagatedBuildInputs = [ gmp boehmgc ] # XXX: These ones aren't normally needed here, but since @@ -27,6 +24,11 @@ rec { # see below. ++ [ libtool libunistring ]; + # A native Guile 2.0 is needed to cross-build Guile. + selfBuildNativeInput = true; + + enableParallelBuilding = true; + patches = stdenv.lib.optionals (coverageAnalysis != null) [ ./gcov-file-name.patch ./disable-gc-sensitive-tests.patch ]; From c62c1739446cc99bbfbf4a8fa88bdadb1965a1bb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= Date: Sun, 13 Nov 2011 22:15:58 +0000 Subject: [PATCH 587/970] GNU Guile: Disable GC-sensitive tests. The "Unused modules are removed" test happens to fail sometimes on i686-linux. svn path=/nixpkgs/trunk/; revision=30416 --- pkgs/development/interpreters/guile/default.nix | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/pkgs/development/interpreters/guile/default.nix b/pkgs/development/interpreters/guile/default.nix index 839de3c053d..bb64d35f8a4 100644 --- a/pkgs/development/interpreters/guile/default.nix +++ b/pkgs/development/interpreters/guile/default.nix @@ -29,9 +29,8 @@ rec { enableParallelBuilding = true; - patches = - stdenv.lib.optionals (coverageAnalysis != null) - [ ./gcov-file-name.patch ./disable-gc-sensitive-tests.patch ]; + patches = [ ./disable-gc-sensitive-tests.patch ] ++ + (stdenv.lib.optional (coverageAnalysis != null) ./gcov-file-name.patch); postInstall = '' wrapProgram $out/bin/guile-snarf --prefix PATH : "${gawk}/bin" From c9e8f6fc40bcd5842678fcd2c2e22668fb20fe0c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= Date: Sun, 13 Nov 2011 22:25:30 +0000 Subject: [PATCH 588/970] libchop: Attempt to fix bug in Guile bindings; augment the expression. svn path=/nixpkgs/trunk/; revision=30417 --- .../development/libraries/libchop/default.nix | 38 +++++++++++++++---- .../libchop/guile-ascii-deserialize.patch | 15 ++++++++ 2 files changed, 45 insertions(+), 8 deletions(-) create mode 100644 pkgs/development/libraries/libchop/guile-ascii-deserialize.patch diff --git a/pkgs/development/libraries/libchop/default.nix b/pkgs/development/libraries/libchop/default.nix index be6bc429301..cc4eef6bf2a 100644 --- a/pkgs/development/libraries/libchop/default.nix +++ b/pkgs/development/libraries/libchop/default.nix @@ -1,26 +1,48 @@ -{ fetchurl, stdenv, zlib, bzip2, libgcrypt, gdbm, gperf, tdb, gnutls, db4, - libuuid, lzo, pkgconfig }: +{ fetchurl, stdenv, zlib, bzip2, libgcrypt, gdbm, gperf, tdb, gnutls, db4 +, libuuid, lzo, pkgconfig, guile }: stdenv.mkDerivation rec { name = "libchop-0.5"; src = fetchurl { - url = "http://download.savannah.gnu.org/releases/libchop/libchop-0.5.tar.gz"; + url = "mirror://savannah/libchop/${name}.tar.gz"; sha256 = "0i7gl0c99pf6794bbwm3iha6a0bciqq969mgwwv6gm9phiiy5s8b"; }; - buildInputs = [ zlib libgcrypt gdbm gperf bzip2 db4 tdb gnutls libuuid lzo - pkgconfig ]; + patches = [ ./guile-ascii-deserialize.patch ]; + + buildNativeInputs = [ pkgconfig gperf ]; + buildInputs = + [ zlib bzip2 lzo + libgcrypt + gdbm db4 tdb + gnutls libuuid + guile + ]; doCheck = true; meta = { - description = "Set of utilities and library for data backup and distributed storage"; + description = "libchop, tools & library for data backup and distributed storage"; + + longDescription = + '' Libchop is a set of utilities and library for data backup and + distributed storage. Its main application is chop-backup, an + encrypted backup program that supports data integrity checks, + versioning at little cost, distribution among several sites, + selective sharing of stored data, adaptive compression, and more. + The library itself, which chop-backup builds upon, implements + storage techniques such as content-based addressing, content hash + keys, Merkle trees, similarity detection, and lossless compression. + It makes it easy to combine them in different ways. The + ‘chop-archiver’ and ‘chop-block-server’ tools, illustrated in the + manual, provide direct access to these facilities from the command + line. It is written in C and has Guile (Scheme) bindings. + ''; homepage = http://nongnu.org/libchop/; license = "GPLv3+"; - maintainers = [ stdenv.lib.maintainers.ludo - stdenv.lib.maintainers.viric ]; + maintainers = with stdenv.lib.maintainers; [ ludo viric ]; }; } diff --git a/pkgs/development/libraries/libchop/guile-ascii-deserialize.patch b/pkgs/development/libraries/libchop/guile-ascii-deserialize.patch new file mode 100644 index 00000000000..6a2e67d870c --- /dev/null +++ b/pkgs/development/libraries/libchop/guile-ascii-deserialize.patch @@ -0,0 +1,15 @@ +This fixes `deserialize-object/ascii'. + +diff --git a/guile2/chop/objects.scm b/guile2/chop/objects.scm +index 1849195..1aa521d 100644 +--- a/guile2/chop/objects.scm ++++ b/guile2/chop/objects.scm +@@ -133,7 +133,7 @@ + + (define (deserialize-object/ascii class str) + "Deserialize STR and return a new instance of CLASS that corresponds." +- (%deserialize-object class (string->utf8 str) %ascii)) ++ (%deserialize-object class (string->pointer str) %ascii)) + + (define (deserialize-object/binary class bv) + "Deserialize BV and return a new instance of CLASS that corresponds." From 82c276606e85a6df793f832aa3279f9f5174a2ae Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= Date: Sun, 13 Nov 2011 23:22:30 +0000 Subject: [PATCH 589/970] libchop: Build on Hydra. svn path=/nixpkgs/trunk/; revision=30418 --- pkgs/development/libraries/libchop/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/development/libraries/libchop/default.nix b/pkgs/development/libraries/libchop/default.nix index cc4eef6bf2a..f5b7f72f08f 100644 --- a/pkgs/development/libraries/libchop/default.nix +++ b/pkgs/development/libraries/libchop/default.nix @@ -44,5 +44,6 @@ stdenv.mkDerivation rec { license = "GPLv3+"; maintainers = with stdenv.lib.maintainers; [ ludo viric ]; + platforms = stdenv.lib.platforms.gnu; }; } From 54e4f2d5b51acd958a21e0977bbef0fdad9900fb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= Date: Mon, 14 Nov 2011 09:57:13 +0000 Subject: [PATCH 590/970] Cross-build Guile 2.0 for GNU. svn path=/nixpkgs/trunk/; revision=30419 --- pkgs/top-level/release-cross.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/top-level/release-cross.nix b/pkgs/top-level/release-cross.nix index de9532d712a..b5ab32cbf69 100644 --- a/pkgs/top-level/release-cross.nix +++ b/pkgs/top-level/release-cross.nix @@ -195,6 +195,7 @@ in { gnumake.hostDrv = nativePlatforms; gnused.hostDrv = nativePlatforms; guile_1_8.hostDrv = nativePlatforms; + guile.hostDrv = nativePlatforms; libffi.hostDrv = nativePlatforms; libtool.hostDrv = nativePlatforms; libunistring.hostDrv = nativePlatforms; From 45388a9ae1639b8752652ffcde4f7d91f9594441 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?= Date: Mon, 14 Nov 2011 09:59:26 +0000 Subject: [PATCH 591/970] Updating aMSN. svn path=/nixpkgs/trunk/; revision=30420 --- .../instant-messengers/amsn/builder.sh | 11 ----------- .../instant-messengers/amsn/default.nix | 18 +++++++++++------- 2 files changed, 11 insertions(+), 18 deletions(-) delete mode 100644 pkgs/applications/networking/instant-messengers/amsn/builder.sh diff --git a/pkgs/applications/networking/instant-messengers/amsn/builder.sh b/pkgs/applications/networking/instant-messengers/amsn/builder.sh deleted file mode 100644 index 4f7680b29d9..00000000000 --- a/pkgs/applications/networking/instant-messengers/amsn/builder.sh +++ /dev/null @@ -1,11 +0,0 @@ -source $stdenv/setup - -echo $libstdcpp -echo "-L$libstdcpp/lib" -LDFLAGS="-L$libstdcpp/lib" -CPPFLAGS="-L$libstdcpp/include" -CFLAGS="-lm" - -configureFlags="--with-tcl=$tcl/lib --with-tk=$tk/lib --enable-static" - -genericBuild diff --git a/pkgs/applications/networking/instant-messengers/amsn/default.nix b/pkgs/applications/networking/instant-messengers/amsn/default.nix index 330d7e9d281..07aa20ff1f3 100644 --- a/pkgs/applications/networking/instant-messengers/amsn/default.nix +++ b/pkgs/applications/networking/instant-messengers/amsn/default.nix @@ -1,15 +1,19 @@ -{stdenv, fetchurl, which, tcl, tk, x11, libstdcpp }: +{stdenv, fetchurl, which, tcl, tk, x11, libpng, libjpeg, makeWrapper}: stdenv.mkDerivation { - name = "amsn-0.96"; - builder = ./builder.sh; + name = "amsn-0.98.4"; src = fetchurl { - url = mirror://sourceforge/amsn/amsn-0.96.tar.bz2; - md5 = "3df6b0d34ef1997a47c0b8af29b2547a"; + url = mirror://sourceforge/amsn/amsn-0.98.4-src.tar.gz; + sha256 = "1kcn1hc6bvgy4svf5l3j5psdrvsmy0p3r33fn7gzcinqdf3xfgqx"; }; - inherit tcl tk libstdcpp; - buildInputs = [which tcl tk x11 ]; + configureFlags = "--with-tcl=${tcl}/lib --with-tk=${tk}/lib --enable-static"; + + buildInputs = [which tcl tk x11 libpng libjpeg makeWrapper]; + + postInstall = '' + wrapProgram $out/bin/amsn --prefix PATH : ${tk}/bin + ''; meta = { homepage = http://amsn-project.net; From 1c63e1ca838a0726f88d66395bb094395a42a0e7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?= Date: Mon, 14 Nov 2011 09:59:30 +0000 Subject: [PATCH 592/970] a change I missed for the amsn update. svn path=/nixpkgs/trunk/; revision=30421 --- pkgs/top-level/all-packages.nix | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index f4909a41df4..cb0d0d8395d 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -6275,9 +6275,7 @@ let adobeReader = callPackage_i686 ../applications/misc/adobe-reader { }; - amsn = callPackage ../applications/networking/instant-messengers/amsn { - libstdcpp = gcc33.gcc; - }; + amsn = callPackage ../applications/networking/instant-messengers/amsn { }; antiword = callPackage ../applications/office/antiword {}; From 1a4f43c7b3982a32339f6e860f18681941354c56 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 14 Nov 2011 15:11:23 +0000 Subject: [PATCH 593/970] wireshark: updated to version 1.6.2 svn path=/nixpkgs/trunk/; revision=30426 --- .../networking/sniffers/wireshark/default.nix | 39 +++++++++++++++---- 1 file changed, 32 insertions(+), 7 deletions(-) diff --git a/pkgs/applications/networking/sniffers/wireshark/default.nix b/pkgs/applications/networking/sniffers/wireshark/default.nix index 53710c54eaf..aca0203ca6c 100644 --- a/pkgs/applications/networking/sniffers/wireshark/default.nix +++ b/pkgs/applications/networking/sniffers/wireshark/default.nix @@ -1,12 +1,37 @@ -{stdenv, fetchurl, perl, pkgconfig, gtk, libpcap, flex, bison}: +{ stdenv, fetchurl, perl, pkgconfig, gtk, libpcap, flex, bison +, gnutls, libgcrypt, glib, zlib, libxml2, libxslt, adns, geoip +, heimdal, python, lynx, lua5 +}: -stdenv.mkDerivation rec { - version = "1.4.2"; +let + version = "1.6.2"; +in +stdenv.mkDerivation { name = "wireshark-${version}"; + src = fetchurl { - url = "http://www.wireshark.org/download/src/${name}.tar.bz2"; - sha256 = "1cj9n3yhahj6pabx1h1gas6b6dhwsljjz2w3ngky3a4g6bnf3ij4"; + url = "mirror://sourceforge/wireshark/wireshark-${version}.tar.bz2"; + sha256 = "0zqy8ws05xz36y49azf5lrwzgfz26h7f8d27xjc89hlqrqagahsk"; + }; + + buildInputs = [perl pkgconfig gtk libpcap flex bison gnutls libgcrypt + glib zlib libxml2 libxslt adns geoip heimdal python lynx lua5 + ]; + + configureFlags = "--disable-usr-local --with-ssl --enable-threads --enable-packet-editor"; + + meta = { + homepage = "http://sourceforge.net/projects/wireshark/"; + description = "a powerful network protocol analyzer"; + license = stdenv.lib.licenses.gpl2; + + longDescription = '' + Wireshark (formerly known as "Etherreal") is a powerful network + protocol analyzer developed by an international team of networking + experts. It runs on UNIX, OS X and Windows. + ''; + + platforms = stdenv.lib.platforms.linux; + maintainers = [ stdenv.lib.maintainers.simons ]; }; - configureFlags = "--with-pcap=${libpcap}"; - buildInputs = [perl pkgconfig gtk libpcap flex bison]; } From 9a9df48782bc84bb1a87e71b1d25360d8a5c311d Mon Sep 17 00:00:00 2001 From: Shea Levy Date: Mon, 14 Nov 2011 16:55:50 +0000 Subject: [PATCH 594/970] Linux 3.0.9 and 3.1.1 svn path=/nixpkgs/trunk/; revision=30427 --- pkgs/os-specific/linux/kernel/linux-3.0.nix | 4 ++-- pkgs/os-specific/linux/kernel/linux-3.1.nix | 6 ++---- 2 files changed, 4 insertions(+), 6 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/linux-3.0.nix b/pkgs/os-specific/linux/kernel/linux-3.0.nix index f5ee6711f93..acdaf60a5fc 100644 --- a/pkgs/os-specific/linux/kernel/linux-3.0.nix +++ b/pkgs/os-specific/linux/kernel/linux-3.0.nix @@ -205,7 +205,7 @@ in import ./generic.nix ( rec { - version = "3.0.8"; + version = "3.0.9"; preConfigure = '' substituteInPlace scripts/depmod.sh --replace '-b "$INSTALL_MOD_PATH"' "" @@ -213,7 +213,7 @@ import ./generic.nix ( src = fetchurl { url = "mirror://kernel/linux/kernel/v3.x/linux-${version}.tar.bz2"; - sha256 = "1p9sacxz430rmq5zj8pch2i0dczi5jna5g8xf4gni3w436invlaf"; + sha256 = "1dcn371za577fxw64vk9ry69bihf16l1hk6rs380qnhr6msxr478"; }; config = configWithPlatform stdenv.platform; diff --git a/pkgs/os-specific/linux/kernel/linux-3.1.nix b/pkgs/os-specific/linux/kernel/linux-3.1.nix index d37887ec14a..a06fd35b807 100644 --- a/pkgs/os-specific/linux/kernel/linux-3.1.nix +++ b/pkgs/os-specific/linux/kernel/linux-3.1.nix @@ -205,9 +205,7 @@ in import ./generic.nix ( rec { - version = "3.1"; - - modDirVersion = "3.1.0"; + version = "3.1.1"; preConfigure = '' substituteInPlace scripts/depmod.sh --replace '-b "$INSTALL_MOD_PATH"' "" @@ -215,7 +213,7 @@ import ./generic.nix ( src = fetchurl { url = "mirror://kernel/linux/kernel/v3.x/linux-${version}.tar.bz2"; - sha256 = "0nck9cx66crqhw17y4vc3rfqrcz5269nwn2p5dh0qjvmihvx4wr5"; + sha256 = "01ymsdq0c4fv1yxvxh17ccmsj8xl308j1n6rzrknaswb7gz2xp60"; }; config = configWithPlatform stdenv.platform; From ab07a41756789b3648676e3d3685dbf58cfd6089 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andres=20L=C3=B6h?= Date: Mon, 14 Nov 2011 16:57:26 +0000 Subject: [PATCH 595/970] Added haskell-bytestring-lexing. svn path=/nixpkgs/trunk/; revision=30428 --- .../haskell/bytestring-lexing/default.nix | 18 ++++++++++++++++++ pkgs/top-level/haskell-packages.nix | 2 ++ 2 files changed, 20 insertions(+) create mode 100644 pkgs/development/libraries/haskell/bytestring-lexing/default.nix diff --git a/pkgs/development/libraries/haskell/bytestring-lexing/default.nix b/pkgs/development/libraries/haskell/bytestring-lexing/default.nix new file mode 100644 index 00000000000..446a628dd05 --- /dev/null +++ b/pkgs/development/libraries/haskell/bytestring-lexing/default.nix @@ -0,0 +1,18 @@ +{ cabal, alex }: + +cabal.mkDerivation (self: { + pname = "bytestring-lexing"; + version = "0.2.1"; + sha256 = "0pibn4phfp346i6i8zwic5zlbq9lqa6ifyx6bdl3p5c8jy3v23r9"; + buildTools = [ alex ]; + meta = { + homepage = "http://code.haskell.org/~dons/code/bytestring-lexing"; + description = "Parse literals efficiently from bytestrings"; + license = self.stdenv.lib.licenses.bsd3; + platforms = self.ghc.meta.platforms; + maintainers = [ + self.stdenv.lib.maintainers.andres + self.stdenv.lib.maintainers.simons + ]; + }; +}) diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix index 3dc22ab3557..bbcfe9289e3 100644 --- a/pkgs/top-level/haskell-packages.nix +++ b/pkgs/top-level/haskell-packages.nix @@ -431,6 +431,8 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y); bytestringNums = callPackage ../development/libraries/haskell/bytestring-nums {}; + bytestringLexing = callPackage ../development/libraries/haskell/bytestring-lexing {}; + bytestringMmap = callPackage ../development/libraries/haskell/bytestring-mmap {}; bytestringTrie = callPackage ../development/libraries/haskell/bytestring-trie {}; From 63d36b5185544d168fdec43cce34a775f184f87a Mon Sep 17 00:00:00 2001 From: Piotr Pietraszkiewicz Date: Mon, 14 Nov 2011 20:03:43 +0000 Subject: [PATCH 596/970] Version bump - Gource 0.37 svn path=/nixpkgs/trunk/; revision=30429 --- pkgs/tools/misc/gource/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/misc/gource/default.nix b/pkgs/tools/misc/gource/default.nix index 30e5a73685e..9ec8961f268 100644 --- a/pkgs/tools/misc/gource/default.nix +++ b/pkgs/tools/misc/gource/default.nix @@ -1,11 +1,11 @@ {stdenv, fetchurl, SDL, ftgl, pkgconfig, libpng, libjpeg, pcre, SDL_image, glew, mesa}: stdenv.mkDerivation { - name = "gource-0.28"; + name = "gource-0.37"; src = fetchurl { - url = http://gource.googlecode.com/files/gource-0.28.tar.gz; - sha256 = "09538vcf9n21qx4cmcjrki6ilayvm4x6s0zdf00mrd1h0bklhxn3"; + url = http://gource.googlecode.com/files/gource-0.37.tar.gz; + sha256 = "03kd9nn65cl1p2jgn6pvpxmvnfscz3c8jqds90fsc0z37ij2iiyn"; }; buildInputs = [glew SDL ftgl pkgconfig libpng libjpeg pcre SDL_image mesa]; From 175f3b3e628e45197eb654c1bf99e12898184a2b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= Date: Mon, 14 Nov 2011 20:10:01 +0000 Subject: [PATCH 597/970] libchop: Add patches that fix the whole thing. svn path=/nixpkgs/trunk/; revision=30430 --- .../0001-tests-Simplify-deserialize.c.patch | 103 ++++++++++++++++++ ...sh-Fix-off-by-n-in-ASCII-deserializa.patch | 47 ++++++++ .../libchop/0003-fix-test-makefile.patch | 19 ++++ ...xport-XDG_CACHE_HOME-in-utils-backup.patch | 25 +++++ .../development/libraries/libchop/default.nix | 7 +- .../libchop/guile-ascii-deserialize.patch | 15 --- 6 files changed, 200 insertions(+), 16 deletions(-) create mode 100644 pkgs/development/libraries/libchop/0001-tests-Simplify-deserialize.c.patch create mode 100644 pkgs/development/libraries/libchop/0002-block-indexer-hash-Fix-off-by-n-in-ASCII-deserializa.patch create mode 100644 pkgs/development/libraries/libchop/0003-fix-test-makefile.patch create mode 100644 pkgs/development/libraries/libchop/0004-tests-Export-XDG_CACHE_HOME-in-utils-backup.patch delete mode 100644 pkgs/development/libraries/libchop/guile-ascii-deserialize.patch diff --git a/pkgs/development/libraries/libchop/0001-tests-Simplify-deserialize.c.patch b/pkgs/development/libraries/libchop/0001-tests-Simplify-deserialize.c.patch new file mode 100644 index 00000000000..137f127e8de --- /dev/null +++ b/pkgs/development/libraries/libchop/0001-tests-Simplify-deserialize.c.patch @@ -0,0 +1,103 @@ +From cb343e4e0421ba89651c884939238eec74e826f6 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= +Date: Mon, 14 Nov 2011 17:28:53 +0100 +Subject: [PATCH 1/2] tests: Simplify `deserialize.c'. + +* tests/interfaces/deserialize.c (pair)[serial_size]: Remove field. + (ascii_serials): Adjust accordingly. + (check_serial_deserial): Use `strlen (pair->serial)' instead of + `pair->serial_size'. +--- + tests/interfaces/deserialize.c | 20 +++++++++----------- + 1 files changed, 9 insertions(+), 11 deletions(-) + +diff --git a/tests/interfaces/deserialize.c b/tests/interfaces/deserialize.c +index 80c610d..6e9b765 100644 +--- a/tests/interfaces/deserialize.c ++++ b/tests/interfaces/deserialize.c +@@ -24,12 +24,12 @@ + + #include + #include ++#include + + struct pair + { + const char *const class_name; + const char *const serial; +- size_t serial_size; + }; + + static const struct pair ascii_serials[] = +@@ -37,16 +37,14 @@ static const struct pair ascii_serials[] = + { + "chk_index_handle", + "zqoimseyv5r4cpj3ab64o6y2j6cbatkz5picnvidsyafwnvtrvbq====,grqqeqcihncuevm7xnmnkfp3ukkruk2e/4a", +- 92 + }, + + { + "hash_index_handle", + "3q2hrigwtmsmvqi64cy2yw7szh66drvf/122", +- 36 + }, + +- { NULL, NULL, 0 } ++ { NULL, NULL } + }; + + /* Check whether we can serialize/deserialize PAIR. */ +@@ -59,7 +57,7 @@ check_serial_deserial (const struct pair *pair) + chop_object_t *object; + const chop_class_t *klass; + chop_buffer_t buffer; +- char with_trailing_junk[pair->serial_size + sizeof junk + 1]; ++ char with_trailing_junk[strlen (pair->serial) + sizeof junk + 1]; + size_t read; + + test_stage ("instance of `%s'", pair->class_name); +@@ -73,17 +71,17 @@ check_serial_deserial (const struct pair *pair) + test_stage_intermediate ("with trailing NUL"); + err = chop_object_deserialize (object, klass, + CHOP_SERIAL_ASCII, +- pair->serial, pair->serial_size, ++ pair->serial, strlen (pair->serial), + &read); + + test_check_errcode (err, "deserializing"); +- test_assert (read == pair->serial_size); ++ test_assert (read == strlen (pair->serial)); + + err = chop_object_serialize (object, CHOP_SERIAL_ASCII, &buffer); + test_check_errcode (err, "serializing"); + + test_assert (!strncmp (chop_buffer_content (&buffer), pair->serial, +- pair->serial_size)); ++ strlen (pair->serial))); + + chop_object_destroy (object); + chop_buffer_clear (&buffer); +@@ -96,17 +94,17 @@ check_serial_deserial (const struct pair *pair) + + err = chop_object_deserialize (object, klass, + CHOP_SERIAL_ASCII, +- with_trailing_junk, pair->serial_size, ++ with_trailing_junk, strlen (pair->serial), + &read); + + test_check_errcode (err, "deserializing with trailing junk"); +- test_assert (read == pair->serial_size); ++ test_assert (read == strlen (pair->serial)); + + err = chop_object_serialize (object, CHOP_SERIAL_ASCII, &buffer); + test_check_errcode (err, "serializing (trailing junk)"); + + test_assert (!strncmp (chop_buffer_content (&buffer), pair->serial, +- pair->serial_size)); ++ strlen (pair->serial))); + + test_stage_result (1); + } +-- +1.7.6 + diff --git a/pkgs/development/libraries/libchop/0002-block-indexer-hash-Fix-off-by-n-in-ASCII-deserializa.patch b/pkgs/development/libraries/libchop/0002-block-indexer-hash-Fix-off-by-n-in-ASCII-deserializa.patch new file mode 100644 index 00000000000..4013f714880 --- /dev/null +++ b/pkgs/development/libraries/libchop/0002-block-indexer-hash-Fix-off-by-n-in-ASCII-deserializa.patch @@ -0,0 +1,47 @@ +From 8b2d0b3792e4c0535ff7241cf3770232618cdefc Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= +Date: Mon, 14 Nov 2011 17:34:10 +0100 +Subject: [PATCH 2/2] block-indexer-hash: Fix off-by-n in ASCII + deserialization of the block indexer. + +* src/block-indexer-hash.c (hbi_deserialize): Don't read beyond SIZE. + +* tests/interfaces/deserialize.c (ascii_serials): Add a + `hash_block_indexer' example. +--- + src/block-indexer-hash.c | 2 +- + tests/interfaces/deserialize.c | 5 +++++ + 2 files changed, 6 insertions(+), 1 deletions(-) + +diff --git a/src/block-indexer-hash.c b/src/block-indexer-hash.c +index 858ddd7..db7d6b4 100644 +--- a/src/block-indexer-hash.c ++++ b/src/block-indexer-hash.c +@@ -638,7 +638,7 @@ hbi_deserialize (const char *buffer, size_t size, chop_serial_method_t method, + size_t name_len = 0; + const char *end = buffer; + +- while (isalnum (*end)) ++ while (isalnum (*end) && end - buffer < size) + { + if (name_len >= sizeof (name)) + return CHOP_DESERIAL_CORRUPT_INPUT; +diff --git a/tests/interfaces/deserialize.c b/tests/interfaces/deserialize.c +index 6e9b765..af7015e 100644 +--- a/tests/interfaces/deserialize.c ++++ b/tests/interfaces/deserialize.c +@@ -44,6 +44,11 @@ static const struct pair ascii_serials[] = + "3q2hrigwtmsmvqi64cy2yw7szh66drvf/122", + }, + ++ { ++ "hash_block_indexer", ++ "SHA1" ++ }, ++ + { NULL, NULL } + }; + +-- +1.7.6 + diff --git a/pkgs/development/libraries/libchop/0003-fix-test-makefile.patch b/pkgs/development/libraries/libchop/0003-fix-test-makefile.patch new file mode 100644 index 00000000000..f8b4a0dff5c --- /dev/null +++ b/pkgs/development/libraries/libchop/0003-fix-test-makefile.patch @@ -0,0 +1,19 @@ +commit c1d42668b6fa0777df99c349a9b3826c186f3b9d +Author: Ludovic Courtès +Date: Sat Nov 5 00:03:00 2011 +0100 + + Define $GUILE_LOAD_COMPILED_PATH when running tests. + + * tests/Makefile.am (TESTS_ENVIRONMENT): Define + $GUILE_LOAD_COMPILED_PATH. + +diff -ubB --show-c-function /tmp/nix-build-bzqif52j6ypbhrkyg13ikc1wzscg2h7s-libchop-0.5.drv-0/libchop-0.5/tests/Makefile.in.orig /tmp/nix-build-bzqif52j6ypbhrkyg13ikc1wzscg2h7s-libchop-0.5.drv-0/libchop-0.5/tests/Makefile.in +--- libchop-0.5/tests/Makefile.in 2011-11-14 17:42:14.000000000 +0100 ++++ libchop-0.5/tests/Makefile.in 2011-11-14 17:42:17.000000000 +0100 +@@ -1048,6 +1048,7 @@ TESTS = $(check_PROGRAMS) $(check_SCRIPT + TESTS_ENVIRONMENT = \ + PATH="$(top_builddir)/utils:$$PATH" \ + GUILE_LOAD_PATH="$(abs_top_srcdir)/guile2:$(abs_top_builddir)/guile2:$$GUILE_LOAD_PATH" \ ++ GUILE_LOAD_COMPILED_PATH="$(abs_top_builddir)/guile2:$$GUILE_LOAD_COMPILED_PATH" \ + libchop_libdir="$(abs_top_builddir)/src" \ + top_srcdir="$(abs_top_srcdir)" srcdir="$(abs_srcdir)/utils" diff --git a/pkgs/development/libraries/libchop/0004-tests-Export-XDG_CACHE_HOME-in-utils-backup.patch b/pkgs/development/libraries/libchop/0004-tests-Export-XDG_CACHE_HOME-in-utils-backup.patch new file mode 100644 index 00000000000..1a6c1bf289c --- /dev/null +++ b/pkgs/development/libraries/libchop/0004-tests-Export-XDG_CACHE_HOME-in-utils-backup.patch @@ -0,0 +1,25 @@ +From 55effc94ec10100673edc1400bc8cb086fd8dc3b Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= +Date: Mon, 14 Nov 2011 17:56:46 +0100 +Subject: [PATCH] tests: Export $XDG_CACHE_HOME in `utils/backup'. + +* tests/utils/backup (XDG_CACHE_HOME): Export. +--- + tests/utils/backup | 1 + + 1 files changed, 1 insertions(+), 0 deletions(-) + +diff --git a/tests/utils/backup b/tests/utils/backup +index d8db141..171060f 100755 +--- a/tests/utils/backup ++++ b/tests/utils/backup +@@ -21,6 +21,7 @@ source "${srcdir:-$PWD}/lib.sh" + DB_FILE=",,backup.db" + TMP_FILE=",,backup.tmp" + XDG_CACHE_HOME="$PWD/backup-cache" ++export XDG_CACHE_HOME + + chop_CLEANUP_HOOK='rm -rf "$XDG_CACHE_HOME" "$DB_FILE" "$TMP_FILE"' + +-- +1.7.6 + diff --git a/pkgs/development/libraries/libchop/default.nix b/pkgs/development/libraries/libchop/default.nix index f5b7f72f08f..2d6f64a3057 100644 --- a/pkgs/development/libraries/libchop/default.nix +++ b/pkgs/development/libraries/libchop/default.nix @@ -9,7 +9,12 @@ stdenv.mkDerivation rec { sha256 = "0i7gl0c99pf6794bbwm3iha6a0bciqq969mgwwv6gm9phiiy5s8b"; }; - patches = [ ./guile-ascii-deserialize.patch ]; + patches = + [ ./0001-tests-Simplify-deserialize.c.patch + ./0002-block-indexer-hash-Fix-off-by-n-in-ASCII-deserializa.patch + ./0003-fix-test-makefile.patch + ./0004-tests-Export-XDG_CACHE_HOME-in-utils-backup.patch + ]; buildNativeInputs = [ pkgconfig gperf ]; buildInputs = diff --git a/pkgs/development/libraries/libchop/guile-ascii-deserialize.patch b/pkgs/development/libraries/libchop/guile-ascii-deserialize.patch deleted file mode 100644 index 6a2e67d870c..00000000000 --- a/pkgs/development/libraries/libchop/guile-ascii-deserialize.patch +++ /dev/null @@ -1,15 +0,0 @@ -This fixes `deserialize-object/ascii'. - -diff --git a/guile2/chop/objects.scm b/guile2/chop/objects.scm -index 1849195..1aa521d 100644 ---- a/guile2/chop/objects.scm -+++ b/guile2/chop/objects.scm -@@ -133,7 +133,7 @@ - - (define (deserialize-object/ascii class str) - "Deserialize STR and return a new instance of CLASS that corresponds." -- (%deserialize-object class (string->utf8 str) %ascii)) -+ (%deserialize-object class (string->pointer str) %ascii)) - - (define (deserialize-object/binary class bv) - "Deserialize BV and return a new instance of CLASS that corresponds." From d161032cc18cf3398245a4268be6b35dcbe56b3a Mon Sep 17 00:00:00 2001 From: Shea Levy Date: Mon, 14 Nov 2011 20:27:09 +0000 Subject: [PATCH 598/970] Fix freetds description svn path=/nixpkgs/trunk/; revision=30431 --- pkgs/development/libraries/freetds/default.nix | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/pkgs/development/libraries/freetds/default.nix b/pkgs/development/libraries/freetds/default.nix index d1505752715..87a7f879be8 100644 --- a/pkgs/development/libraries/freetds/default.nix +++ b/pkgs/development/libraries/freetds/default.nix @@ -9,10 +9,8 @@ stdenv.mkDerivation { }; meta = { - description = '' - A set of libraries to natively talk to Microsoft SQL Server and Sybase - databases - ''; + description = + "Libraries to natively talk to Microsoft SQL Server and Sybase databases"; homepage = "http://www.freetds.org"; license = "lgpl"; maintainers = [ stdenv.lib.maintainers.shlevy ]; From 5da8244a142c20ac2556899cfe7c2c2fdbf8b082 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Tue, 15 Nov 2011 17:54:46 +0000 Subject: [PATCH 599/970] haskell-th-extras: added version 0.0.0.1 svn path=/nixpkgs/trunk/; revision=30432 --- .../libraries/haskell/th-extras/default.nix | 14 ++++++++++++++ pkgs/top-level/haskell-packages.nix | 2 ++ 2 files changed, 16 insertions(+) create mode 100644 pkgs/development/libraries/haskell/th-extras/default.nix diff --git a/pkgs/development/libraries/haskell/th-extras/default.nix b/pkgs/development/libraries/haskell/th-extras/default.nix new file mode 100644 index 00000000000..341a2b5f569 --- /dev/null +++ b/pkgs/development/libraries/haskell/th-extras/default.nix @@ -0,0 +1,14 @@ +{ cabal, syb }: + +cabal.mkDerivation (self: { + pname = "th-extras"; + version = "0.0.0.1"; + sha256 = "13d9fs48z87inma3kg9b7lfjp3h8j85fav6awd1zj3i2nl214hff"; + buildDepends = [ syb ]; + meta = { + homepage = "https://github.com/mokus0/th-extras"; + description = "A grab bag of useful functions for use with Template Haskell"; + license = self.stdenv.lib.licenses.publicDomain; + platforms = self.ghc.meta.platforms; + }; +}) diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix index bbcfe9289e3..aba5d50524e 100644 --- a/pkgs/top-level/haskell-packages.nix +++ b/pkgs/top-level/haskell-packages.nix @@ -1194,6 +1194,8 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y); thespian = callPackage ../development/libraries/haskell/thespian {}; + thExtras = callPackage ../development/libraries/haskell/th-extras {}; + thLift = callPackage ../development/libraries/haskell/th-lift {}; threadmanager = callPackage ../development/libraries/haskell/threadmanager {}; From 5a1ea61368d0c317abaf67a610915ebe87e89b7e Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Tue, 15 Nov 2011 17:54:50 +0000 Subject: [PATCH 600/970] haskell-cairo: updated to version 0.12.2 svn path=/nixpkgs/trunk/; revision=30433 --- pkgs/development/libraries/haskell/cairo/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/cairo/default.nix b/pkgs/development/libraries/haskell/cairo/default.nix index aa7fae51544..32d62dad8d0 100644 --- a/pkgs/development/libraries/haskell/cairo/default.nix +++ b/pkgs/development/libraries/haskell/cairo/default.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "cairo"; - version = "0.12.1"; - sha256 = "0krclr32cn3vq3cmwhmxz7wzams92iliq44p6s4nj9jg4928cgfk"; + version = "0.12.2"; + sha256 = "1sa0xfx14y4imq3bd9l0rqrmxls3l9yga249a31zfhcinnr1j9db"; buildDepends = [ mtl ]; buildTools = [ gtk2hsBuildtools ]; extraLibraries = [ cairo libc pkgconfig zlib ]; From c61a1f1a1ac79b8945666b9fcb38bf50c2164f84 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Tue, 15 Nov 2011 17:54:53 +0000 Subject: [PATCH 601/970] haskell-flexible-defaults: updated to version 0.0.0.3 svn path=/nixpkgs/trunk/; revision=30434 --- .../libraries/haskell/flexible-defaults/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/development/libraries/haskell/flexible-defaults/default.nix b/pkgs/development/libraries/haskell/flexible-defaults/default.nix index b552ab51e2e..3c7e45ce0d5 100755 --- a/pkgs/development/libraries/haskell/flexible-defaults/default.nix +++ b/pkgs/development/libraries/haskell/flexible-defaults/default.nix @@ -1,10 +1,10 @@ -{ cabal, transformers }: +{ cabal, thExtras, transformers }: cabal.mkDerivation (self: { pname = "flexible-defaults"; - version = "0.0.0.2"; - sha256 = "0hr3x4hlah6pd88xvr9lgvz1v4pyxpyv6q9zms96jkm5wc4mkbwx"; - buildDepends = [ transformers ]; + version = "0.0.0.3"; + sha256 = "1s0dz61bqzzbxqvn9i8zwaccsha15als45zzjs2yc11r3m151dla"; + buildDepends = [ thExtras transformers ]; meta = { homepage = "https://github.com/mokus0/flexible-defaults"; description = "Generate default function implementations for complex type classes"; From 27c001669f4a4855d0afde5d47e6233750bf58c7 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Tue, 15 Nov 2011 17:54:56 +0000 Subject: [PATCH 602/970] haskell-glib: updated to version 0.12.2 svn path=/nixpkgs/trunk/; revision=30435 --- pkgs/development/libraries/haskell/glib/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/glib/default.nix b/pkgs/development/libraries/haskell/glib/default.nix index 445f7122809..c60c776e60f 100644 --- a/pkgs/development/libraries/haskell/glib/default.nix +++ b/pkgs/development/libraries/haskell/glib/default.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "glib"; - version = "0.12.1"; - sha256 = "0lsgpbd08w64npc0xsnxg8n4vj2hdnjvs55h4lhgc61p05q9gv52"; + version = "0.12.2"; + sha256 = "0p1d6j23yf30824q5gn7pw7s47hs4rnaqs69d2hn2pnzpc1ml3c6"; buildTools = [ gtk2hsBuildtools ]; extraLibraries = [ libc pkgconfig ]; pkgconfigDepends = [ glib ]; From 3596f8f1e1f2a11f89f245a41221a6d9c503539b Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Tue, 15 Nov 2011 17:55:00 +0000 Subject: [PATCH 603/970] haskell-gtk: updated to version 0.12.2 svn path=/nixpkgs/trunk/; revision=30436 --- pkgs/development/libraries/haskell/gtk/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/gtk/default.nix b/pkgs/development/libraries/haskell/gtk/default.nix index e3fac24865b..346caa1b72e 100644 --- a/pkgs/development/libraries/haskell/gtk/default.nix +++ b/pkgs/development/libraries/haskell/gtk/default.nix @@ -4,8 +4,8 @@ cabal.mkDerivation (self: { pname = "gtk"; - version = "0.12.1"; - sha256 = "007wxxff2ibfi3848yjxg7hqgpiqpn0zpyivjvjv0zphk1d2j9sv"; + version = "0.12.2"; + sha256 = "0qjhy2adbqv03qbmh6ydga4axvj263n5srwpfrw4v5gk34fvyj9w"; buildDepends = [ cairo glib mtl pango ]; buildTools = [ gtk2hsBuildtools ]; extraLibraries = [ libc pkgconfig ]; From c0ffdcf4bb3936685f5fa4f5612d74079426deaf Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Tue, 15 Nov 2011 17:55:03 +0000 Subject: [PATCH 604/970] haskell-happstack-hamlet: updated to version 6.2.1 svn path=/nixpkgs/trunk/; revision=30437 --- .../libraries/haskell/happstack/happstack-hamlet.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/happstack/happstack-hamlet.nix b/pkgs/development/libraries/haskell/happstack/happstack-hamlet.nix index 3eccba4eb38..edd9b19b067 100644 --- a/pkgs/development/libraries/haskell/happstack/happstack-hamlet.nix +++ b/pkgs/development/libraries/haskell/happstack/happstack-hamlet.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "happstack-hamlet"; - version = "6.2.0"; - sha256 = "1y3nc6z9y96fci25dc6w66l0qlnkz29kr29dpd2sjnhpqm0kvzsc"; + version = "6.2.1"; + sha256 = "1ypw3lcrbkfkk8k45642kmgj0wjwz7vi3szslii6dirycg99jwkv"; buildDepends = [ hamlet happstackServer text ]; meta = { homepage = "http://www.happstack.com/"; From 89cebd31d3f36285791f09524bcf8e8d1db8835f Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Tue, 15 Nov 2011 17:55:06 +0000 Subject: [PATCH 605/970] haskell-pango: updated to version 0.12.2 svn path=/nixpkgs/trunk/; revision=30438 --- pkgs/development/libraries/haskell/pango/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/pango/default.nix b/pkgs/development/libraries/haskell/pango/default.nix index 2bf090ab746..99e4d04f774 100644 --- a/pkgs/development/libraries/haskell/pango/default.nix +++ b/pkgs/development/libraries/haskell/pango/default.nix @@ -3,8 +3,8 @@ cabal.mkDerivation (self: { pname = "pango"; - version = "0.12.1"; - sha256 = "0bfwgz2wx0hw9lrf9fdc0pic7xjkiqnv1wr1lfp55gm2qhakz83w"; + version = "0.12.2"; + sha256 = "0kf9sw2ajqlvv9n685fbif7c8x1qnz4w3y3xqql3a1rv6s3kmqba"; buildDepends = [ cairo glib mtl ]; buildTools = [ gtk2hsBuildtools ]; extraLibraries = [ libc pkgconfig ]; From f35da231177a9476529059950baf5ddecf75e477 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Tue, 15 Nov 2011 17:55:09 +0000 Subject: [PATCH 606/970] haskell-random-source: updated to version 0.3.0.2 svn path=/nixpkgs/trunk/; revision=30439 --- .../libraries/haskell/random-source/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/development/libraries/haskell/random-source/default.nix b/pkgs/development/libraries/haskell/random-source/default.nix index 7bf8a225956..caa4b65814c 100755 --- a/pkgs/development/libraries/haskell/random-source/default.nix +++ b/pkgs/development/libraries/haskell/random-source/default.nix @@ -1,14 +1,14 @@ { cabal, flexibleDefaults, mersenneRandomPure64, mtl, mwcRandom -, random, stateref, syb +, random, stateref, syb, thExtras }: cabal.mkDerivation (self: { pname = "random-source"; - version = "0.3"; - sha256 = "08nj7mq8gjj9rv1zmkr2m30z295k5b352103wb1ag1ryw5wyzg1n"; + version = "0.3.0.2"; + sha256 = "0sp39bj7rqg4w4rc4d4zgj0f77c23z4xc47p55chy12znc4frlp2"; buildDepends = [ flexibleDefaults mersenneRandomPure64 mtl mwcRandom random stateref - syb + syb thExtras ]; meta = { homepage = "https://github.com/mokus0/random-fu"; From ce87cf8033871015cea92ca60e639804f1da4469 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Tue, 15 Nov 2011 17:55:12 +0000 Subject: [PATCH 607/970] haskell-safe: updated to version 0.3.2 svn path=/nixpkgs/trunk/; revision=30440 --- pkgs/development/libraries/haskell/safe/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/safe/default.nix b/pkgs/development/libraries/haskell/safe/default.nix index ed474bed597..434ed10a337 100644 --- a/pkgs/development/libraries/haskell/safe/default.nix +++ b/pkgs/development/libraries/haskell/safe/default.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "safe"; - version = "0.3.1"; - sha256 = "0sq4fcwh9bmhi79rnxh70hqwa2k3sipqnvq0f9a78j4wg6nmm6li"; + version = "0.3.2"; + sha256 = "1gblidpsz2zyr5aw5c9ggxzx3firdz7s7iai9vf9gc5mv9vnnggv"; meta = { homepage = "http://community.haskell.org/~ndm/safe/"; description = "Library for safe (pattern match free) functions"; From 692efb76e43abeb8a8a6246118a49fde760bda08 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Wed, 16 Nov 2011 14:37:11 +0000 Subject: [PATCH 608/970] mercurial: updated to version 2.0 svn path=/nixpkgs/trunk/; revision=30443 --- .../version-management/mercurial/default.nix | 15 ++++++++++----- 1 file changed, 10 insertions(+), 5 deletions(-) diff --git a/pkgs/applications/version-management/mercurial/default.nix b/pkgs/applications/version-management/mercurial/default.nix index e263d7556c0..8d4a45a496c 100644 --- a/pkgs/applications/version-management/mercurial/default.nix +++ b/pkgs/applications/version-management/mercurial/default.nix @@ -1,18 +1,21 @@ -{ stdenv, fetchurl, python, makeWrapper, docutils +{ stdenv, fetchurl, python, makeWrapper, docutils, unzip , guiSupport ? false, tk ? null, ssl, curses }: -stdenv.mkDerivation rec { - name = "mercurial-1.9.2"; +let + name = "mercurial-2.0"; +in +stdenv.mkDerivation { + inherit name; src = fetchurl { url = "http://mercurial.selenic.com/release/${name}.tar.gz"; - sha256 = "481309264d8528a871aab013068c48fa3a6072b016a4095a22230cfdfb8bb9aa"; + sha256 = "1565ns768vgvsqx6pn5q9r2670lmvq8y4zy0jwgwfx2h9n5bgymg"; }; inherit python; # pass it so that the same version can be used in hg2git pythonPackages = [ ssl curses ]; - buildInputs = [ python makeWrapper docutils ]; + buildInputs = [ python makeWrapper docutils unzip ]; makeFlags = "PREFIX=$(out)"; @@ -42,6 +45,8 @@ stdenv.mkDerivation rec { chmod u+x $out/share/cgi-bin/hgweb.cgi ''; + doCheck = false; # The test suite fails, unfortunately. Not sure why. + meta = { description = "A fast, lightweight SCM system for very large distributed projects"; homepage = http://www.selenic.com/mercurial/; From 1ff3207641c6d1586c3f2754c8d3f5221240695d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?= Date: Wed, 16 Nov 2011 14:43:04 +0000 Subject: [PATCH 609/970] Updating libchop to 0.5.1 svn path=/nixpkgs/trunk/; revision=30444 --- .../0001-tests-Simplify-deserialize.c.patch | 103 ------------------ ...sh-Fix-off-by-n-in-ASCII-deserializa.patch | 47 -------- .../libchop/0003-fix-test-makefile.patch | 19 ---- ...xport-XDG_CACHE_HOME-in-utils-backup.patch | 25 ----- .../development/libraries/libchop/default.nix | 11 +- 5 files changed, 2 insertions(+), 203 deletions(-) delete mode 100644 pkgs/development/libraries/libchop/0001-tests-Simplify-deserialize.c.patch delete mode 100644 pkgs/development/libraries/libchop/0002-block-indexer-hash-Fix-off-by-n-in-ASCII-deserializa.patch delete mode 100644 pkgs/development/libraries/libchop/0003-fix-test-makefile.patch delete mode 100644 pkgs/development/libraries/libchop/0004-tests-Export-XDG_CACHE_HOME-in-utils-backup.patch diff --git a/pkgs/development/libraries/libchop/0001-tests-Simplify-deserialize.c.patch b/pkgs/development/libraries/libchop/0001-tests-Simplify-deserialize.c.patch deleted file mode 100644 index 137f127e8de..00000000000 --- a/pkgs/development/libraries/libchop/0001-tests-Simplify-deserialize.c.patch +++ /dev/null @@ -1,103 +0,0 @@ -From cb343e4e0421ba89651c884939238eec74e826f6 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= -Date: Mon, 14 Nov 2011 17:28:53 +0100 -Subject: [PATCH 1/2] tests: Simplify `deserialize.c'. - -* tests/interfaces/deserialize.c (pair)[serial_size]: Remove field. - (ascii_serials): Adjust accordingly. - (check_serial_deserial): Use `strlen (pair->serial)' instead of - `pair->serial_size'. ---- - tests/interfaces/deserialize.c | 20 +++++++++----------- - 1 files changed, 9 insertions(+), 11 deletions(-) - -diff --git a/tests/interfaces/deserialize.c b/tests/interfaces/deserialize.c -index 80c610d..6e9b765 100644 ---- a/tests/interfaces/deserialize.c -+++ b/tests/interfaces/deserialize.c -@@ -24,12 +24,12 @@ - - #include - #include -+#include - - struct pair - { - const char *const class_name; - const char *const serial; -- size_t serial_size; - }; - - static const struct pair ascii_serials[] = -@@ -37,16 +37,14 @@ static const struct pair ascii_serials[] = - { - "chk_index_handle", - "zqoimseyv5r4cpj3ab64o6y2j6cbatkz5picnvidsyafwnvtrvbq====,grqqeqcihncuevm7xnmnkfp3ukkruk2e/4a", -- 92 - }, - - { - "hash_index_handle", - "3q2hrigwtmsmvqi64cy2yw7szh66drvf/122", -- 36 - }, - -- { NULL, NULL, 0 } -+ { NULL, NULL } - }; - - /* Check whether we can serialize/deserialize PAIR. */ -@@ -59,7 +57,7 @@ check_serial_deserial (const struct pair *pair) - chop_object_t *object; - const chop_class_t *klass; - chop_buffer_t buffer; -- char with_trailing_junk[pair->serial_size + sizeof junk + 1]; -+ char with_trailing_junk[strlen (pair->serial) + sizeof junk + 1]; - size_t read; - - test_stage ("instance of `%s'", pair->class_name); -@@ -73,17 +71,17 @@ check_serial_deserial (const struct pair *pair) - test_stage_intermediate ("with trailing NUL"); - err = chop_object_deserialize (object, klass, - CHOP_SERIAL_ASCII, -- pair->serial, pair->serial_size, -+ pair->serial, strlen (pair->serial), - &read); - - test_check_errcode (err, "deserializing"); -- test_assert (read == pair->serial_size); -+ test_assert (read == strlen (pair->serial)); - - err = chop_object_serialize (object, CHOP_SERIAL_ASCII, &buffer); - test_check_errcode (err, "serializing"); - - test_assert (!strncmp (chop_buffer_content (&buffer), pair->serial, -- pair->serial_size)); -+ strlen (pair->serial))); - - chop_object_destroy (object); - chop_buffer_clear (&buffer); -@@ -96,17 +94,17 @@ check_serial_deserial (const struct pair *pair) - - err = chop_object_deserialize (object, klass, - CHOP_SERIAL_ASCII, -- with_trailing_junk, pair->serial_size, -+ with_trailing_junk, strlen (pair->serial), - &read); - - test_check_errcode (err, "deserializing with trailing junk"); -- test_assert (read == pair->serial_size); -+ test_assert (read == strlen (pair->serial)); - - err = chop_object_serialize (object, CHOP_SERIAL_ASCII, &buffer); - test_check_errcode (err, "serializing (trailing junk)"); - - test_assert (!strncmp (chop_buffer_content (&buffer), pair->serial, -- pair->serial_size)); -+ strlen (pair->serial))); - - test_stage_result (1); - } --- -1.7.6 - diff --git a/pkgs/development/libraries/libchop/0002-block-indexer-hash-Fix-off-by-n-in-ASCII-deserializa.patch b/pkgs/development/libraries/libchop/0002-block-indexer-hash-Fix-off-by-n-in-ASCII-deserializa.patch deleted file mode 100644 index 4013f714880..00000000000 --- a/pkgs/development/libraries/libchop/0002-block-indexer-hash-Fix-off-by-n-in-ASCII-deserializa.patch +++ /dev/null @@ -1,47 +0,0 @@ -From 8b2d0b3792e4c0535ff7241cf3770232618cdefc Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= -Date: Mon, 14 Nov 2011 17:34:10 +0100 -Subject: [PATCH 2/2] block-indexer-hash: Fix off-by-n in ASCII - deserialization of the block indexer. - -* src/block-indexer-hash.c (hbi_deserialize): Don't read beyond SIZE. - -* tests/interfaces/deserialize.c (ascii_serials): Add a - `hash_block_indexer' example. ---- - src/block-indexer-hash.c | 2 +- - tests/interfaces/deserialize.c | 5 +++++ - 2 files changed, 6 insertions(+), 1 deletions(-) - -diff --git a/src/block-indexer-hash.c b/src/block-indexer-hash.c -index 858ddd7..db7d6b4 100644 ---- a/src/block-indexer-hash.c -+++ b/src/block-indexer-hash.c -@@ -638,7 +638,7 @@ hbi_deserialize (const char *buffer, size_t size, chop_serial_method_t method, - size_t name_len = 0; - const char *end = buffer; - -- while (isalnum (*end)) -+ while (isalnum (*end) && end - buffer < size) - { - if (name_len >= sizeof (name)) - return CHOP_DESERIAL_CORRUPT_INPUT; -diff --git a/tests/interfaces/deserialize.c b/tests/interfaces/deserialize.c -index 6e9b765..af7015e 100644 ---- a/tests/interfaces/deserialize.c -+++ b/tests/interfaces/deserialize.c -@@ -44,6 +44,11 @@ static const struct pair ascii_serials[] = - "3q2hrigwtmsmvqi64cy2yw7szh66drvf/122", - }, - -+ { -+ "hash_block_indexer", -+ "SHA1" -+ }, -+ - { NULL, NULL } - }; - --- -1.7.6 - diff --git a/pkgs/development/libraries/libchop/0003-fix-test-makefile.patch b/pkgs/development/libraries/libchop/0003-fix-test-makefile.patch deleted file mode 100644 index f8b4a0dff5c..00000000000 --- a/pkgs/development/libraries/libchop/0003-fix-test-makefile.patch +++ /dev/null @@ -1,19 +0,0 @@ -commit c1d42668b6fa0777df99c349a9b3826c186f3b9d -Author: Ludovic Courtès -Date: Sat Nov 5 00:03:00 2011 +0100 - - Define $GUILE_LOAD_COMPILED_PATH when running tests. - - * tests/Makefile.am (TESTS_ENVIRONMENT): Define - $GUILE_LOAD_COMPILED_PATH. - -diff -ubB --show-c-function /tmp/nix-build-bzqif52j6ypbhrkyg13ikc1wzscg2h7s-libchop-0.5.drv-0/libchop-0.5/tests/Makefile.in.orig /tmp/nix-build-bzqif52j6ypbhrkyg13ikc1wzscg2h7s-libchop-0.5.drv-0/libchop-0.5/tests/Makefile.in ---- libchop-0.5/tests/Makefile.in 2011-11-14 17:42:14.000000000 +0100 -+++ libchop-0.5/tests/Makefile.in 2011-11-14 17:42:17.000000000 +0100 -@@ -1048,6 +1048,7 @@ TESTS = $(check_PROGRAMS) $(check_SCRIPT - TESTS_ENVIRONMENT = \ - PATH="$(top_builddir)/utils:$$PATH" \ - GUILE_LOAD_PATH="$(abs_top_srcdir)/guile2:$(abs_top_builddir)/guile2:$$GUILE_LOAD_PATH" \ -+ GUILE_LOAD_COMPILED_PATH="$(abs_top_builddir)/guile2:$$GUILE_LOAD_COMPILED_PATH" \ - libchop_libdir="$(abs_top_builddir)/src" \ - top_srcdir="$(abs_top_srcdir)" srcdir="$(abs_srcdir)/utils" diff --git a/pkgs/development/libraries/libchop/0004-tests-Export-XDG_CACHE_HOME-in-utils-backup.patch b/pkgs/development/libraries/libchop/0004-tests-Export-XDG_CACHE_HOME-in-utils-backup.patch deleted file mode 100644 index 1a6c1bf289c..00000000000 --- a/pkgs/development/libraries/libchop/0004-tests-Export-XDG_CACHE_HOME-in-utils-backup.patch +++ /dev/null @@ -1,25 +0,0 @@ -From 55effc94ec10100673edc1400bc8cb086fd8dc3b Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= -Date: Mon, 14 Nov 2011 17:56:46 +0100 -Subject: [PATCH] tests: Export $XDG_CACHE_HOME in `utils/backup'. - -* tests/utils/backup (XDG_CACHE_HOME): Export. ---- - tests/utils/backup | 1 + - 1 files changed, 1 insertions(+), 0 deletions(-) - -diff --git a/tests/utils/backup b/tests/utils/backup -index d8db141..171060f 100755 ---- a/tests/utils/backup -+++ b/tests/utils/backup -@@ -21,6 +21,7 @@ source "${srcdir:-$PWD}/lib.sh" - DB_FILE=",,backup.db" - TMP_FILE=",,backup.tmp" - XDG_CACHE_HOME="$PWD/backup-cache" -+export XDG_CACHE_HOME - - chop_CLEANUP_HOOK='rm -rf "$XDG_CACHE_HOME" "$DB_FILE" "$TMP_FILE"' - --- -1.7.6 - diff --git a/pkgs/development/libraries/libchop/default.nix b/pkgs/development/libraries/libchop/default.nix index 2d6f64a3057..a736aec1600 100644 --- a/pkgs/development/libraries/libchop/default.nix +++ b/pkgs/development/libraries/libchop/default.nix @@ -2,20 +2,13 @@ , libuuid, lzo, pkgconfig, guile }: stdenv.mkDerivation rec { - name = "libchop-0.5"; + name = "libchop-0.5.1"; src = fetchurl { url = "mirror://savannah/libchop/${name}.tar.gz"; - sha256 = "0i7gl0c99pf6794bbwm3iha6a0bciqq969mgwwv6gm9phiiy5s8b"; + sha256 = "1sfq4ibzc9fjmq7ga96k05lr77cyizxnipa3bzm5d22jwal1x3ib"; }; - patches = - [ ./0001-tests-Simplify-deserialize.c.patch - ./0002-block-indexer-hash-Fix-off-by-n-in-ASCII-deserializa.patch - ./0003-fix-test-makefile.patch - ./0004-tests-Export-XDG_CACHE_HOME-in-utils-backup.patch - ]; - buildNativeInputs = [ pkgconfig gperf ]; buildInputs = [ zlib bzip2 lzo From 0093d96841e1c7f605e04b09082284a8a98ac538 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= Date: Wed, 16 Nov 2011 14:48:27 +0000 Subject: [PATCH 610/970] GNU Wget: Prepare for cross-compilation of a stripped-down version. svn path=/nixpkgs/trunk/; revision=30445 --- pkgs/tools/networking/wget/default.nix | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/pkgs/tools/networking/wget/default.nix b/pkgs/tools/networking/wget/default.nix index afd741f2735..799c5e9dd85 100644 --- a/pkgs/tools/networking/wget/default.nix +++ b/pkgs/tools/networking/wget/default.nix @@ -8,7 +8,7 @@ stdenv.mkDerivation rec { sha256 = "1kadjg63x1mm741dxdidwsn1rz0f7dkzbq59v0iww87jr45p3ir4"; }; - preConfigure = + preConfigure = stdenv.lib.optionalString doCheck '' for i in "doc/texi2pod.pl" "tests/run-px" "util/rmold.pl" do sed -i "$i" -e 's|/usr/bin.*perl|${perl}/bin/perl|g' @@ -21,16 +21,17 @@ stdenv.mkDerivation rec { done ''; - buildInputs = [ gettext perl ] - ++ stdenv.lib.optional doCheck LWP + buildNativeInputs = [ gettext ]; + buildInputs = + stdenv.lib.optionals doCheck [ perl LWP ] ++ stdenv.lib.optional (gnutls != null) gnutls; configureFlags = if gnutls != null then "--with-ssl=gnutls" - else ""; + else "--without-ssl"; - doCheck = true; + doCheck = (perl != null); meta = { description = "GNU Wget, a tool for retrieving files using HTTP, HTTPS, and FTP"; From bb002fc12163ed1c8ad68198053be71b331c41f4 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Wed, 16 Nov 2011 16:31:02 +0000 Subject: [PATCH 611/970] * Unbreak the Nixpkgs tarball. svn path=/nixpkgs/trunk/; revision=30447 --- .../compilers/nvidia-cg-toolkit/default.nix | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/pkgs/development/compilers/nvidia-cg-toolkit/default.nix b/pkgs/development/compilers/nvidia-cg-toolkit/default.nix index 36d0cbaf23c..8bb201f975e 100644 --- a/pkgs/development/compilers/nvidia-cg-toolkit/default.nix +++ b/pkgs/development/compilers/nvidia-cg-toolkit/default.nix @@ -1,8 +1,14 @@ { stdenv, fetchurl, patchelf }: + +assert stdenv ? glibc; + stdenv.mkDerivation rec { version = "3.0"; + date = "February2011"; + name = "nvidia-cg-toolkit-${version}"; + src = if stdenv.system == "x86_64-linux" then fetchurl { @@ -14,7 +20,8 @@ stdenv.mkDerivation rec { url = "http://developer.download.nvidia.com/cg/Cg_${version}/Cg-${version}_${date}_x86.tgz"; sha256 = "0hr8l0r20akbfm5j0vqv4ghl0acwjf5996pxnfxlajacl9w58nam"; } - else null; + else throw "nvidia-cg-toolkit does not support platform ${stdenv.system}"; + installPhase = '' for b in cgc cgfxcat cginfo do @@ -36,6 +43,7 @@ stdenv.mkDerivation rec { ensureDir "$out/share/doc/$name/" cp -v -r local/Cg/* "$out/share/doc/$name/" ''; + meta = { homepage = http://developer.nvidia.com/cg-toolkit; license = [ "nonfree-redistributable" ]; From 8f5e72912ec652699f7263dd35eac2ec1b5b82ab Mon Sep 17 00:00:00 2001 From: Rob Vermaas Date: Wed, 16 Nov 2011 18:21:23 +0000 Subject: [PATCH 612/970] use older sqlite for perlPackages.DBDSQLite svn path=/nixpkgs/trunk/; revision=30449 --- pkgs/top-level/perl-packages.nix | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 08a06d3e221..2fd8970b15c 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -1056,7 +1056,13 @@ rec { DBDSQLite = import ../development/perl-modules/DBD-SQLite { inherit fetchurl buildPerlPackage DBI; - inherit (pkgs) sqlite; + sqlite = pkgs.lib.overrideDerivation pkgs.sqlite (args: { + name = "sqlite-3.7.7.1"; + src = fetchurl { + url = http://www.sqlite.org/sqlite-autoconf-3070701.tar.gz; + sha256 = "1pvf72gb6yidc4zjml3k6kwhlvvhbgmbm8hfin9y5jvvbyr3dk3x"; + }; + }); }; DBDmysql = import ../development/perl-modules/DBD-mysql { From f9a103164d203fa8b488fb875cfc7eb6f93ae209 Mon Sep 17 00:00:00 2001 From: Rob Vermaas Date: Wed, 16 Nov 2011 18:23:44 +0000 Subject: [PATCH 613/970] sqlite 3.7.9 breaks DBDSqlite, added local override for now, didn't want to add extra variant in all-packages svn path=/nixpkgs/trunk/; revision=30450 --- pkgs/top-level/perl-packages.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 2fd8970b15c..facb711ecf8 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -1056,6 +1056,8 @@ rec { DBDSQLite = import ../development/perl-modules/DBD-SQLite { inherit fetchurl buildPerlPackage DBI; + + # sqlite-3.7.9 breaks DBDSQLite, overriding locally for now sqlite = pkgs.lib.overrideDerivation pkgs.sqlite (args: { name = "sqlite-3.7.7.1"; src = fetchurl { From 4231e7ba5eee17fb962293329cc1532a420e185c Mon Sep 17 00:00:00 2001 From: Shea Levy Date: Wed, 16 Nov 2011 18:33:12 +0000 Subject: [PATCH 614/970] openssl: Fix hurd-x86 cross-build Now the install phase fails. svn path=/nixpkgs/trunk/; revision=30451 --- pkgs/development/libraries/openssl/default.nix | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/pkgs/development/libraries/openssl/default.nix b/pkgs/development/libraries/openssl/default.nix index e51b88f5bca..fc748100325 100644 --- a/pkgs/development/libraries/openssl/default.nix +++ b/pkgs/development/libraries/openssl/default.nix @@ -6,6 +6,12 @@ let opensslCrossSystem = stdenv.lib.attrByPath [ "openssl" "system" ] (throw "openssl needs its platform name cross building" null) stdenv.cross; + + # openssl only defines _GNU_SOURCE on Linux by default, but we need it on GNU + hurdGNUSourcePatch = fetchurl { + url = http://patch-tracker.debian.org/patch/series/dl/openssl/1.0.0e-2.1/gnu_source.patch; + sha256 = "0zp4x8bql92fbqywnigqfsfj2vvabb66wv6g6zgzh0y6js1ic4pn"; + }; in stdenv.mkDerivation { @@ -42,6 +48,8 @@ stdenv.mkDerivation { export configureFlags="--libdir=lib --cross-compile-prefix=${stdenv.cross.config}- shared ${opensslCrossSystem}" ''; + patches = stdenv.lib.optional (opensslCrossSystem == "hurd-x86") hurdGNUSourcePatch; + postInstall = '' # Openssl installs readonly files, which otherwise we can't strip. # This could at some stdenv hash change be put out of crossAttrs, too From b597d8bfb6ada257826ab17bc65583f839067b1a Mon Sep 17 00:00:00 2001 From: Shea Levy Date: Wed, 16 Nov 2011 19:03:52 +0000 Subject: [PATCH 615/970] openssl: Fix target settings when building for GNU/hurd GNU/hurd cross-build succeeds now! svn path=/nixpkgs/trunk/; revision=30452 --- pkgs/development/libraries/openssl/default.nix | 12 ++++++++++-- pkgs/development/libraries/openssl/hurd-target.patch | 12 ++++++++++++ 2 files changed, 22 insertions(+), 2 deletions(-) create mode 100644 pkgs/development/libraries/openssl/hurd-target.patch diff --git a/pkgs/development/libraries/openssl/default.nix b/pkgs/development/libraries/openssl/default.nix index fc748100325..c8b7aece86e 100644 --- a/pkgs/development/libraries/openssl/default.nix +++ b/pkgs/development/libraries/openssl/default.nix @@ -7,7 +7,6 @@ let (throw "openssl needs its platform name cross building" null) stdenv.cross; - # openssl only defines _GNU_SOURCE on Linux by default, but we need it on GNU hurdGNUSourcePatch = fetchurl { url = http://patch-tracker.debian.org/patch/series/dl/openssl/1.0.0e-2.1/gnu_source.patch; sha256 = "0zp4x8bql92fbqywnigqfsfj2vvabb66wv6g6zgzh0y6js1ic4pn"; @@ -48,7 +47,16 @@ stdenv.mkDerivation { export configureFlags="--libdir=lib --cross-compile-prefix=${stdenv.cross.config}- shared ${opensslCrossSystem}" ''; - patches = stdenv.lib.optional (opensslCrossSystem == "hurd-x86") hurdGNUSourcePatch; + patches = stdenv.lib.optionals (opensslCrossSystem == "hurd-x86") [ + # OpenSSL only defines _GNU_SOURCE on Linux, but we need it on GNU + hurdGNUSourcePatch + + # Use the target settings from Debian's "debian-hurd-i386" target. + # see http://patch-tracker.debian.org/patch/series/view/openssl/1.0.0e-2.1/debian-targets.patch + # In particular, this sets the shared library extension properly so that + # make install succeeds + ./hurd-target.patch + ]; postInstall = '' # Openssl installs readonly files, which otherwise we can't strip. diff --git a/pkgs/development/libraries/openssl/hurd-target.patch b/pkgs/development/libraries/openssl/hurd-target.patch new file mode 100644 index 00000000000..399a37a69ed --- /dev/null +++ b/pkgs/development/libraries/openssl/hurd-target.patch @@ -0,0 +1,12 @@ +diff -Naur openssl-1.0.0d-orig/Configure openssl-1.0.0d/Configure +--- openssl-1.0.0d-orig/Configure 2010-11-30 17:19:26.000000000 -0500 ++++ openssl-1.0.0d/Configure 2011-11-16 13:52:57.614416683 -0500 +@@ -563,7 +563,7 @@ + "newsos4-gcc","gcc:-O -DB_ENDIAN::(unknown):NEWS4:-lmld -liberty:BN_LLONG RC4_CHAR RC4_CHUNK DES_PTR DES_RISC1 DES_UNROLL BF_PTR::::", + + ##### GNU Hurd +-"hurd-x86", "gcc:-DL_ENDIAN -DTERMIOS -O3 -fomit-frame-pointer -march=i486 -Wall::-D_REENTRANT::-ldl:BN_LLONG ${x86_gcc_des} ${x86_gcc_opts}:${x86_elf_asm}:dlfcn:linux-shared:-fPIC", ++"hurd-x86","gcc:-DL_ENDIAN -DTERMIOS -O3 -Wa,--noexecstack -g -mtune=i486 -Wall::-D_REENTRANT::-ldl:BN_LLONG ${x86_gcc_des} ${x86_gcc_opts}:${x86_elf_asm}:dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)", + + ##### OS/2 EMX + "OS2-EMX", "gcc::::::::", From d818fb3333f39ed49fe0a5d907bfb7d4c8314f6a Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Wed, 16 Nov 2011 20:07:59 +0000 Subject: [PATCH 616/970] haskell-th-extras: added missing maintainers field svn path=/nixpkgs/trunk/; revision=30453 --- pkgs/development/libraries/haskell/th-extras/default.nix | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/pkgs/development/libraries/haskell/th-extras/default.nix b/pkgs/development/libraries/haskell/th-extras/default.nix index 341a2b5f569..9a5f4a32cda 100644 --- a/pkgs/development/libraries/haskell/th-extras/default.nix +++ b/pkgs/development/libraries/haskell/th-extras/default.nix @@ -10,5 +10,9 @@ cabal.mkDerivation (self: { description = "A grab bag of useful functions for use with Template Haskell"; license = self.stdenv.lib.licenses.publicDomain; platforms = self.ghc.meta.platforms; + maintainers = [ + self.stdenv.lib.maintainers.andres + self.stdenv.lib.maintainers.simons + ]; }; }) From a28940d9d542f3d7f2a5f88c4f2701a1818cf153 Mon Sep 17 00:00:00 2001 From: Shea Levy Date: Wed, 16 Nov 2011 20:21:07 +0000 Subject: [PATCH 617/970] sqlite: Use {C,LD}FLAGS instead of NIX_CFLAGS_* Now the flags are used when cross-building, too svn path=/nixpkgs/trunk/; revision=30454 --- pkgs/development/libraries/sqlite/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/sqlite/default.nix b/pkgs/development/libraries/sqlite/default.nix index 626e3b1297e..5d256bc7024 100644 --- a/pkgs/development/libraries/sqlite/default.nix +++ b/pkgs/development/libraries/sqlite/default.nix @@ -14,8 +14,8 @@ stdenv.mkDerivation { configureFlags = "--enable-threadsafe"; - NIX_CFLAGS_COMPILE = "-DSQLITE_ENABLE_COLUMN_METADATA=1 -DSQLITE_SECURE_DELETE=1 -DSQLITE_ENABLE_UNLOCK_NOTIFY=1"; - NIX_CFLAGS_LINK = if readline != null then "-lncurses" else ""; + CFLAGS = "-DSQLITE_ENABLE_COLUMN_METADATA=1 -DSQLITE_SECURE_DELETE=1 -DSQLITE_ENABLE_UNLOCK_NOTIFY=1"; + LDFLAGS = if readline != null then "-lncurses" else ""; meta = { homepage = http://www.sqlite.org/; From e895fe5e2fdeea03810a309b08426b6aacdb7c2e Mon Sep 17 00:00:00 2001 From: Shea Levy Date: Wed, 16 Nov 2011 20:21:58 +0000 Subject: [PATCH 618/970] Use gc, dbi, and dbd-sqlite when cross-building nix The dbi and dbd-sqlite may be hacks since they're not cross-built, I'm not certain svn path=/nixpkgs/trunk/; revision=30455 --- pkgs/tools/package-management/nix/unstable.nix | 3 +++ 1 file changed, 3 insertions(+) diff --git a/pkgs/tools/package-management/nix/unstable.nix b/pkgs/tools/package-management/nix/unstable.nix index 1f01f6f73af..da70ed6bb0f 100644 --- a/pkgs/tools/package-management/nix/unstable.nix +++ b/pkgs/tools/package-management/nix/unstable.nix @@ -31,6 +31,9 @@ stdenv.mkDerivation rec { '' --with-store-dir=${storeDir} --localstatedir=${stateDir} --with-bzip2=${bzip2.hostDrv} --with-sqlite=${sqlite.hostDrv} + --enable-gc + --with-dbi=${perlPackages.DBI}/lib/perl5/site_perl + --with-dbd-sqlite=${perlPackages.DBDSQLite}/lib/perl5/site_perl --disable-init-state CFLAGS=-O3 CXXFLAGS=-O3 ''; From 10cbd003966e67ad4ae40a82ba1a8496cd239536 Mon Sep 17 00:00:00 2001 From: Shea Levy Date: Wed, 16 Nov 2011 21:04:02 +0000 Subject: [PATCH 619/970] Allow cross-compiling configurations to explicitly give a system string when cross-building nix svn path=/nixpkgs/trunk/; revision=30458 --- pkgs/tools/package-management/nix/unstable.nix | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/pkgs/tools/package-management/nix/unstable.nix b/pkgs/tools/package-management/nix/unstable.nix index da70ed6bb0f..921e902e061 100644 --- a/pkgs/tools/package-management/nix/unstable.nix +++ b/pkgs/tools/package-management/nix/unstable.nix @@ -36,7 +36,9 @@ stdenv.mkDerivation rec { --with-dbd-sqlite=${perlPackages.DBDSQLite}/lib/perl5/site_perl --disable-init-state CFLAGS=-O3 CXXFLAGS=-O3 - ''; + '' + stdenv.lib.optionalString ( + stdenv.cross ? nix && stdenv.cross.nix ? system + ) ''--with-system=${stdenv.cross.nix.system}''; doCheck = false; }; From f469a69b439a76e1e54aa52516ef8808a8724602 Mon Sep 17 00:00:00 2001 From: Shea Levy Date: Wed, 16 Nov 2011 21:04:58 +0000 Subject: [PATCH 620/970] Explicitly provide a nix system string when building nixUnstable.hostDrv for gnu svn path=/nixpkgs/trunk/; revision=30459 --- pkgs/top-level/release-cross.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/top-level/release-cross.nix b/pkgs/top-level/release-cross.nix index b5ab32cbf69..536cfb81d58 100644 --- a/pkgs/top-level/release-cross.nix +++ b/pkgs/top-level/release-cross.nix @@ -176,6 +176,7 @@ let platform = pkgs.platforms.pc; libc = "glibc"; openssl.system = "hurd-x86"; # Nix depends on OpenSSL. + nix.system = "i686-gnu"; # Hack until nix is more cross-compile aware }; in { crossGNU = mapTestOnCross crossSystem { From 86e8dcc34ba1743f1ae0333b68edb6856e2af14b Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Thu, 17 Nov 2011 12:05:52 +0000 Subject: [PATCH 621/970] * Bump nixUnstable. svn path=/nixpkgs/trunk/; revision=30460 --- pkgs/tools/package-management/nix/unstable.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/package-management/nix/unstable.nix b/pkgs/tools/package-management/nix/unstable.nix index 921e902e061..8235565f7a6 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.0pre30305"; + name = "nix-1.0pre30457"; src = fetchurl { - url = "http://hydra.nixos.org/build/1524522/download/4/${name}.tar.bz2"; - sha256 = "917b22e350e1aee99e465c2df0037ce224dca625e588bb0005e3048fe07cdb9a"; + url = "http://hydra.nixos.org/build/1554072/download/4/${name}.tar.bz2"; + sha256 = "d95b0577c1ab9646f2b5f0f37a96e5822013cd8046265c5608ea8acfab7ba602"; }; buildNativeInputs = [ perl pkgconfig ]; From e2fd2c4e23ff7a8ec9b5be41db8fd4638f604d13 Mon Sep 17 00:00:00 2001 From: Rob Vermaas Date: Fri, 18 Nov 2011 02:10:14 +0000 Subject: [PATCH 622/970] openvpn: enable option to use password files svn path=/nixpkgs/trunk/; revision=30461 --- pkgs/tools/networking/openvpn/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/tools/networking/openvpn/default.nix b/pkgs/tools/networking/openvpn/default.nix index b9285a8c219..bfcc1c16dab 100644 --- a/pkgs/tools/networking/openvpn/default.nix +++ b/pkgs/tools/networking/openvpn/default.nix @@ -11,6 +11,7 @@ stdenv.mkDerivation rec { buildInputs = [ iproute lzo openssl ]; configureFlags = '' + --enable-password-save --with-ifconfig-path=${nettools}/sbin/ifconfig --with-iproute-path=${iproute}/sbin/ip --with-route-path=${nettools}/sbin/route From a456047fc168e9c3ae69633a8a37fc2d4a3cd5c6 Mon Sep 17 00:00:00 2001 From: Rob Vermaas Date: Fri, 18 Nov 2011 02:40:33 +0000 Subject: [PATCH 623/970] update chrome svn path=/nixpkgs/trunk/; revision=30462 --- .../networking/browsers/chromium/default.nix | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/pkgs/applications/networking/browsers/chromium/default.nix b/pkgs/applications/networking/browsers/chromium/default.nix index bd98d48ffa7..0be1d4dc48d 100644 --- a/pkgs/applications/networking/browsers/chromium/default.nix +++ b/pkgs/applications/networking/browsers/chromium/default.nix @@ -1,5 +1,5 @@ { GConf, alsaLib, bzip2, cairo, cups, dbus, dbus_glib, expat -, fetchurl, ffmpeg, fontconfig, freetype, gtkLibs, libX11 +, fetchurl, ffmpeg, fontconfig, freetype, gtkLibs, libX11, libXfixes , libXScrnSaver, libXdamage, libXext, libXrender, libXt, libXtst , libgcrypt, libjpeg, libpng, makeWrapper, nspr, nss, patchelf , stdenv, unzip, zlib, pam, pcre }: @@ -7,23 +7,23 @@ assert stdenv.system == "i686-linux" || stdenv.system == "x86_64-linux" ; stdenv.mkDerivation rec { - name = "chromium-16.0.879.0-pre${version}"; + name = "chromium-17.0.943.0-pre${version}"; # To determine the latest revision, get # ‘http://commondatastorage.googleapis.com/chromium-browser-continuous/Linux/LAST_CHANGE’. # For the version number, see ‘about:config’. - version = "100626"; + version = "110566"; src = if stdenv.system == "x86_64-linux" then fetchurl { url = "http://commondatastorage.googleapis.com/chromium-browser-continuous/Linux_x64/${version}/chrome-linux.zip"; - sha256 = "1dymz7h9v5hkivn6qn26bnj1waw60z3mngh8g46yvvc5xn4npc3l"; + sha256 = "0pi2qbcvqy9gn2s0bfqlam3mj5ghnnnkrbxrrjl63737377an7ha"; } else if stdenv.system == "i686-linux" then fetchurl { url = "http://commondatastorage.googleapis.com/chromium-browser-continuous/Linux/${version}/chrome-linux.zip"; - sha256 = "0zqaj90lfzdddbs6sjygmyxlh8nw3xfr9xw450g9cabg6a2sh7ca"; + sha256 = "0mk8ikgz97i69qy1cy3cqw4a2ff2ixjzyw5i86fmrq7m1f156yva"; } else throw "Chromium is not supported on this platform."; @@ -34,7 +34,7 @@ stdenv.mkDerivation rec { libPath = stdenv.lib.makeLibraryPath [ GConf alsaLib bzip2 cairo cups dbus dbus_glib expat - ffmpeg fontconfig freetype libX11 libXScrnSaver + ffmpeg fontconfig freetype libX11 libXScrnSaver libXfixes libXdamage libXext libXrender libXt libXtst libgcrypt libjpeg libpng nspr stdenv.gcc.gcc zlib stdenv.gcc.libc gtkLibs.glib gtkLibs.gtk gtkLibs.gdk_pixbuf gtkLibs.pango From 581511a0b4399d9dd413489bfa4f6e922dabe598 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Fri, 18 Nov 2011 14:46:29 +0000 Subject: [PATCH 624/970] boost: update to version 1.48 svn path=/nixpkgs/trunk/; revision=30463 --- pkgs/development/libraries/boost/1.48.nix | 91 +++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 5 +- 2 files changed, 93 insertions(+), 3 deletions(-) create mode 100644 pkgs/development/libraries/boost/1.48.nix diff --git a/pkgs/development/libraries/boost/1.48.nix b/pkgs/development/libraries/boost/1.48.nix new file mode 100644 index 00000000000..2adc0191cc0 --- /dev/null +++ b/pkgs/development/libraries/boost/1.48.nix @@ -0,0 +1,91 @@ +{ stdenv, fetchurl, icu, expat, zlib, bzip2, python +, enableRelease ? true +, enableDebug ? false +, enableSingleThreaded ? false +, enableMultiThreaded ? true +, enableShared ? true +, enableStatic ? false +, enablePIC ? false +, enableExceptions ? false +}: + +let + + variant = stdenv.lib.concatStringsSep "," + (stdenv.lib.optional enableRelease "release" ++ + stdenv.lib.optional enableDebug "debug"); + + threading = stdenv.lib.concatStringsSep "," + (stdenv.lib.optional enableSingleThreaded "single" ++ + stdenv.lib.optional enableMultiThreaded "multi"); + + link = stdenv.lib.concatStringsSep "," + (stdenv.lib.optional enableShared "shared" ++ + stdenv.lib.optional enableStatic "static"); + + # To avoid library name collisions + finalLayout = if ((enableRelease && enableDebug) || + (enableSingleThreaded && enableMultiThreaded) || + (enableShared && enableStatic)) then + "tagged" else "system"; + + cflags = if (enablePIC && enableExceptions) then + "cflags=-fPIC -fexceptions cxxflags=-fPIC linkflags=-fPIC" + else if (enablePIC) then + "cflags=-fPIC cxxflags=-fPIC linkflags=-fPIC" + else if (enableExceptions) then + "cflags=-fexceptions" + else + ""; +in + +stdenv.mkDerivation { + name = "boost-1.48.0"; + + meta = { + homepage = "http://boost.org/"; + description = "Boost C++ Library Collection"; + license = "boost-license"; + + platforms = stdenv.lib.platforms.unix; + maintainers = [ stdenv.lib.maintainers.simons ]; + }; + + src = fetchurl { + url = "mirror://sourceforge/boost/boost_1_48_0.tar.bz2"; + sha256 = "1njsircy5xfj5rws10w8vq2s0603z2i31p9wgbawr4wkssr59whv"; + }; + + # See . + patches = [ ./boost_filesystem.patch ]; + + enableParallelBuilding = true; + + buildInputs = [icu expat zlib bzip2 python]; + + configureScript = "./bootstrap.sh"; + configureFlags = "--with-icu=${icu} --with-python=${python}/bin/python"; + + buildPhase = "./b2 -j$NIX_BUILD_CORES -sEXPAT_INCLUDE=${expat}/include -sEXPAT_LIBPATH=${expat}/lib --layout=${finalLayout} variant=${variant} threading=${threading} link=${link} ${cflags} install"; + + installPhase = ":"; + + crossAttrs = rec { + buildInputs = [ expat.hostDrv zlib.hostDrv bzip2.hostDrv ]; + # all buildInputs set previously fell into propagatedBuildInputs, as usual, so we have to + # override them. + propagatedBuildInputs = buildInputs; + # We want to substitute the contents of configureFlags, removing thus the + # usual --build and --host added on cross building. + preConfigure = '' + export configureFlags="--prefix=$out --without-icu" + ''; + buildPhase = '' + set -x + cat << EOF > user-config.jam + using gcc : cross : $crossConfig-g++ ; + EOF + ./b2 -j$NIX_BUILD_CORES -sEXPAT_INCLUDE=${expat.hostDrv}/include -sEXPAT_LIBPATH=${expat.hostDrv}/lib --layout=${finalLayout} --user-config=user-config.jam toolset=gcc-cross variant=${variant} threading=${threading} link=${link} ${cflags} --without-python install + ''; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index cb0d0d8395d..1b4980235bf 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -3126,9 +3126,8 @@ let boost144 = callPackage ../development/libraries/boost/1.44.nix { }; boost146 = callPackage ../development/libraries/boost/1.46.nix { }; boost147 = callPackage ../development/libraries/boost/1.47.nix { }; - # 1.47.0 doesn't compile on Darwin. The issue is probably trivial to - # fix, but no-one has done it yet. - boost = if stdenv.isDarwin then boost146 else boost147; + boost148 = callPackage ../development/libraries/boost/1.48.nix { }; + boost = boost148; # A Boost build with all library variants enabled. Very large (about 250 MB). boostFull = appendToName "full" (boost.override { From 70b5cbe5584bd93e3db5df88178b6bf6c1114689 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Fri, 18 Nov 2011 17:07:17 +0000 Subject: [PATCH 625/970] * libvirt updated to 0.9.7. svn path=/nixpkgs/trunk/; revision=30464 --- pkgs/development/libraries/libvirt/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/libvirt/default.nix b/pkgs/development/libraries/libvirt/default.nix index 451c2f28a8f..bf4d858f023 100644 --- a/pkgs/development/libraries/libvirt/default.nix +++ b/pkgs/development/libraries/libvirt/default.nix @@ -3,14 +3,14 @@ , libtasn1, ebtables, libgcrypt }: -let version = "0.9.2"; in +let version = "0.9.7"; in stdenv.mkDerivation { name = "libvirt-${version}"; src = fetchurl { url = "http://libvirt.org/sources/libvirt-${version}.tar.gz"; - sha256 = "0f4z85whrjfjjfd9rmpn57sib42sh599g0cjvq2bdbrbafx1z1cs"; + sha256 = "08xg0pfjqfia37xby9187ycsxkrxaz99w9rcq206cz8pwnzhbzr9"; }; buildInputs = From 13551f95b520143537b6d2d464b4754812a4aea3 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Fri, 18 Nov 2011 17:07:40 +0000 Subject: [PATCH 626/970] * Fix the download site for Python nose. svn path=/nixpkgs/trunk/; revision=30465 --- pkgs/top-level/python-packages.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 3c1622847be..d9cc483ef3a 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -962,12 +962,12 @@ let pythonPackages = python.modules // rec { }; }); - nose = buildPythonPackage { + nose = buildPythonPackage rec { name = "nose-1.0.0"; src = fetchurl { - url = http://somethingaboutorange.com/mrl/projects/nose/nose-1.0.0.tar.gz; - sha256 = "0qm6q232h5r071gwfkiszkmfqc60k7abl15bk495lcdkk62m91db"; + url = "http://pypi.python.org/packages/source/n/nose/${name}.tar.gz"; + md5 = "47a4784c817afa6ef11a505b574584ed"; }; # Fails with ‘This platform lacks a functioning sem_open From 34a00e28dafe753e3f756d28fa3ab86f24517382 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Fri, 18 Nov 2011 17:41:21 +0000 Subject: [PATCH 627/970] * On FreeBSD, bash is usually installed in /usr/local. svn path=/nixpkgs/trunk/; revision=30467 --- pkgs/stdenv/native/default.nix | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/pkgs/stdenv/native/default.nix b/pkgs/stdenv/native/default.nix index 1f2117ebba0..88b3c17b582 100644 --- a/pkgs/stdenv/native/default.nix +++ b/pkgs/stdenv/native/default.nix @@ -1,10 +1,14 @@ -{system, allPackages ? import ../../..}: +{ system, allPackages ? import ../../.. }: rec { - shell = "/bin/bash"; + shell = + if system == "i686-freebsd" || system == "x86_64-freebsd" + then "/usr/local/bin/bash" + else "/bin/bash"; - path = (if system == "i386-sunos" then [ "/usr/gnu" ] else []) ++ + path = + (if system == "i386-sunos" then [ "/usr/gnu" ] else []) ++ (if system == "i686-netbsd" then [ "/usr/pkg" ] else []) ++ ["/" "/usr" "/usr/local"]; @@ -88,6 +92,7 @@ rec { preHook = if system == "i686-darwin" || system == "powerpc-darwin" || system == "x86_64-darwin" then prehookDarwin else if system == "i686-freebsd" then prehookFreeBSD else + if system == "x86_64-freebsd" then prehookFreeBSD else if system == "i686-openbsd" then prehookOpenBSD else if system == "i686-netbsd" then prehookNetBSD else prehookBase; From ca45069a2309a32e8092bd3574c918857243ec4e Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Fri, 18 Nov 2011 18:30:12 +0000 Subject: [PATCH 628/970] haskell-base16-bytestring: updated to version 0.1.1.3 svn path=/nixpkgs/trunk/; revision=30468 --- .../libraries/haskell/base16-bytestring/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/development/libraries/haskell/base16-bytestring/default.nix b/pkgs/development/libraries/haskell/base16-bytestring/default.nix index 33b7d437b33..b95052d02d9 100644 --- a/pkgs/development/libraries/haskell/base16-bytestring/default.nix +++ b/pkgs/development/libraries/haskell/base16-bytestring/default.nix @@ -2,11 +2,11 @@ cabal.mkDerivation (self: { pname = "base16-bytestring"; - version = "0.1.1.2"; - sha256 = "1isxyl52vh0lg195wq9nkr3hlmbw3d3c9aymxlz8hynz0hh1q1z0"; + version = "0.1.1.3"; + sha256 = "0v08fnkykvd6y6in6f9a808vk2gfd9pf0wd7rr28z6wwxm5d2x6l"; meta = { - homepage = "http://github.com/mailrank/base16-bytestring"; - description = "Fast base16 (hex) encoding and deconding for ByteStrings"; + homepage = "http://github.com/bos/base16-bytestring"; + description = "Fast base16 (hex) encoding and decoding for ByteStrings"; license = self.stdenv.lib.licenses.bsd3; platforms = self.ghc.meta.platforms; maintainers = [ From 3656ca6d5b6e40d8f8eaf64ca4890b8b61a6375b Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Fri, 18 Nov 2011 18:30:18 +0000 Subject: [PATCH 629/970] haskell-blaze-textual: updated to version 0.2.0.5 svn path=/nixpkgs/trunk/; revision=30469 --- .../libraries/haskell/blaze-textual/default.nix | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/development/libraries/haskell/blaze-textual/default.nix b/pkgs/development/libraries/haskell/blaze-textual/default.nix index deb1e3caa78..b5924d7c73b 100644 --- a/pkgs/development/libraries/haskell/blaze-textual/default.nix +++ b/pkgs/development/libraries/haskell/blaze-textual/default.nix @@ -1,12 +1,12 @@ -{ cabal, blazeBuilder, doubleConversion, text, time, vector }: +{ cabal, blazeBuilder, text, time, vector }: cabal.mkDerivation (self: { pname = "blaze-textual"; - version = "0.2.0.4"; - sha256 = "0bifxyzm35xvlqry06iv6pqgx1d33jnrvpmn4wnydkyg1r7q3k9v"; - buildDepends = [ blazeBuilder doubleConversion text time vector ]; + version = "0.2.0.5"; + sha256 = "0rl41idjmrw227yi2x6nk2rlm93rgzz2y7jvz2yvmya2ihrppzjf"; + buildDepends = [ blazeBuilder text time vector ]; meta = { - homepage = "http://github.com/mailrank/blaze-textual"; + homepage = "http://github.com/bos/blaze-textual"; description = "Fast rendering of common datatypes"; license = self.stdenv.lib.licenses.bsd3; platforms = self.ghc.meta.platforms; From 4851602a03d91ee2531510d946a5b90139d246c3 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Fri, 18 Nov 2011 18:30:21 +0000 Subject: [PATCH 630/970] haskell-criterion: updated to version 0.5.1.1 svn path=/nixpkgs/trunk/; revision=30470 --- pkgs/development/libraries/haskell/criterion/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/criterion/default.nix b/pkgs/development/libraries/haskell/criterion/default.nix index f567569a6f6..41957fe4e20 100644 --- a/pkgs/development/libraries/haskell/criterion/default.nix +++ b/pkgs/development/libraries/haskell/criterion/default.nix @@ -4,8 +4,8 @@ cabal.mkDerivation (self: { pname = "criterion"; - version = "0.5.1.0"; - sha256 = "0v43dm1d84zvn32q89dq0nh4dvqr4r6fjdzwcjac0mjics3iy29d"; + version = "0.5.1.1"; + sha256 = "0gxl6xym01lvblkdsqigx4p13nc9y7hcvyrqz0kvnvcf2f9x4qvp"; buildDepends = [ aeson deepseq mtl mwcRandom parsec statistics time vector vectorAlgorithms From 0d7b744419c83c0bb7bb2eef664e888b888668c7 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Fri, 18 Nov 2011 18:30:24 +0000 Subject: [PATCH 631/970] haskell-double-conversion: updated to version 0.2.0.3 svn path=/nixpkgs/trunk/; revision=30471 --- .../libraries/haskell/double-conversion/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/libraries/haskell/double-conversion/default.nix b/pkgs/development/libraries/haskell/double-conversion/default.nix index 4f1bf34dc29..ee84665ad63 100644 --- a/pkgs/development/libraries/haskell/double-conversion/default.nix +++ b/pkgs/development/libraries/haskell/double-conversion/default.nix @@ -2,11 +2,11 @@ cabal.mkDerivation (self: { pname = "double-conversion"; - version = "0.2.0.1"; - sha256 = "146ijcv55k0lqlw8y4nz7p5kjpwry2jzbqmkan904pnlcfv4a60a"; + version = "0.2.0.3"; + sha256 = "17ny1gvd622rnqjvlrmcpgw3wlabrsc6d046d4ii6xv299z97qw9"; buildDepends = [ text ]; meta = { - homepage = "https://github.com/mailrank/double-conversion"; + homepage = "https://github.com/bos/double-conversion"; description = "Fast conversion between double precision floating point and text"; license = self.stdenv.lib.licenses.bsd3; platforms = self.ghc.meta.platforms; From 410bd9f46a7a6b85808d32708d082c3d2b2b0f62 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Fri, 18 Nov 2011 18:30:27 +0000 Subject: [PATCH 632/970] haskell-graphviz: updated to version 2999.12.0.4 svn path=/nixpkgs/trunk/; revision=30472 --- pkgs/development/libraries/haskell/graphviz/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/graphviz/default.nix b/pkgs/development/libraries/haskell/graphviz/default.nix index 9e1ab17a940..006e0c3266f 100644 --- a/pkgs/development/libraries/haskell/graphviz/default.nix +++ b/pkgs/development/libraries/haskell/graphviz/default.nix @@ -4,8 +4,8 @@ cabal.mkDerivation (self: { pname = "graphviz"; - version = "2999.12.0.3"; - sha256 = "0qvkmklf2wxac6j01fnh8r352b52xzhr8wryk1b9119wvcbli8md"; + version = "2999.12.0.4"; + sha256 = "02yg5c02k3sdrcq5srzpdvlzs6cnrns67576qzr8n7ynhpvard73"; isLibrary = true; isExecutable = true; buildDepends = [ From a04e0f79ef4c59128e1da91846c52863e0c1d129 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Fri, 18 Nov 2011 18:30:30 +0000 Subject: [PATCH 633/970] haskell-safe: updated to version 0.3.3 svn path=/nixpkgs/trunk/; revision=30473 --- pkgs/development/libraries/haskell/safe/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/safe/default.nix b/pkgs/development/libraries/haskell/safe/default.nix index 434ed10a337..067b7c4cf67 100644 --- a/pkgs/development/libraries/haskell/safe/default.nix +++ b/pkgs/development/libraries/haskell/safe/default.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "safe"; - version = "0.3.2"; - sha256 = "1gblidpsz2zyr5aw5c9ggxzx3firdz7s7iai9vf9gc5mv9vnnggv"; + version = "0.3.3"; + sha256 = "0ig9laq1p4iic24smjb304mvlsvdyn90lvxh64c4p75c8g459489"; meta = { homepage = "http://community.haskell.org/~ndm/safe/"; description = "Library for safe (pattern match free) functions"; From fad0086cbefd3614512f38d3eb0c2a0b9acfa436 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Fri, 18 Nov 2011 18:30:33 +0000 Subject: [PATCH 634/970] haskell-tagsoup: updated to version 0.12.5 svn path=/nixpkgs/trunk/; revision=30474 --- pkgs/development/libraries/haskell/tagsoup/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/tagsoup/default.nix b/pkgs/development/libraries/haskell/tagsoup/default.nix index d7efd13ea38..a8dfe9b83c9 100644 --- a/pkgs/development/libraries/haskell/tagsoup/default.nix +++ b/pkgs/development/libraries/haskell/tagsoup/default.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "tagsoup"; - version = "0.12.4"; - sha256 = "0szm80sgjj173vdax7gv87mfp9xrq1w34i4v83nbvnfwrx8nis4w"; + version = "0.12.5"; + sha256 = "1l7c0mk8b6rfk5i8h6j3pa4qma8lvmjk40jjxdj2b0wznyr907dm"; isLibrary = true; isExecutable = true; buildDepends = [ text ]; From b8fe19cf6eed07bde9b8e4013a2f7e8054f32832 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Fri, 18 Nov 2011 18:30:37 +0000 Subject: [PATCH 635/970] haskell-uu-parsinglib: updated to version 2.7.3 svn path=/nixpkgs/trunk/; revision=30475 --- pkgs/development/libraries/haskell/uu-parsinglib/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/uu-parsinglib/default.nix b/pkgs/development/libraries/haskell/uu-parsinglib/default.nix index e589c4b7d38..82a4d71bdfa 100644 --- a/pkgs/development/libraries/haskell/uu-parsinglib/default.nix +++ b/pkgs/development/libraries/haskell/uu-parsinglib/default.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "uu-parsinglib"; - version = "2.7.2.2"; - sha256 = "0na5c2l6q6mzscqha59ma8v5d0j2vh3y5vl51gb7rzwqz4a6hg95"; + version = "2.7.3"; + sha256 = "18387pq6mqg6mns1cd16d22h98mx1xnz584q8w3rmn4cndrk3883"; buildDepends = [ ListLike time ]; meta = { homepage = "http://www.cs.uu.nl/wiki/bin/view/HUT/ParserCombinators"; From 1c0ae7e8ed65ae36ce1ef61f71160daa22a60909 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Fri, 18 Nov 2011 18:37:20 +0000 Subject: [PATCH 636/970] git: updated to version 1.7.7.3 svn path=/nixpkgs/trunk/; revision=30476 --- .../version-management/git-and-tools/git/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/version-management/git-and-tools/git/default.nix b/pkgs/applications/version-management/git-and-tools/git/default.nix index eb5daae67e2..62b8e8d2ea4 100644 --- a/pkgs/applications/version-management/git-and-tools/git/default.nix +++ b/pkgs/applications/version-management/git-and-tools/git/default.nix @@ -8,7 +8,7 @@ }: let - version = "1.7.7"; + version = "1.7.7.3"; svn = subversionClient.override { perlBindings = true; }; in stdenv.mkDerivation { @@ -16,7 +16,7 @@ stdenv.mkDerivation { src = fetchurl { url = "http://git-core.googlecode.com/files/git-${version}.tar.gz"; - sha256 = "1xkpyd6mff4m8kmk4vkwi7snr2ff2nmrmsa5hf9bk2a93v07p5ss"; + sha256 = "dc9d773004cdae17453e330a02de630a1beeeb404d0601b9e8c1aef0a0efd100"; }; patches = [ ./docbook2texi.patch ]; From ab25775f1ca15606ad124c67ec174efa99ba52d2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= Date: Sat, 19 Nov 2011 14:27:37 +0000 Subject: [PATCH 637/970] release-cross: Adjust to `gnu.' renaming. svn path=/nixpkgs/trunk/; revision=30477 --- pkgs/top-level/release-cross.nix | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/pkgs/top-level/release-cross.nix b/pkgs/top-level/release-cross.nix index 536cfb81d58..4088fc088dc 100644 --- a/pkgs/top-level/release-cross.nix +++ b/pkgs/top-level/release-cross.nix @@ -180,8 +180,9 @@ let }; in { crossGNU = mapTestOnCross crossSystem { - hurdCross = nativePlatforms; - mach.hostDrv = nativePlatforms; + gnu.hurdCross = nativePlatforms; + gnu.mach.hostDrv = nativePlatforms; + gnu.mig = nativePlatforms; coreutils.hostDrv = nativePlatforms; ed.hostDrv = nativePlatforms; From 2d99f951be62d6cd20823a17885ae3f330313ddd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= Date: Sat, 19 Nov 2011 14:27:46 +0000 Subject: [PATCH 638/970] GNU Hurd: Update. svn path=/nixpkgs/trunk/; revision=30478 --- pkgs/os-specific/gnu/hurd/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/os-specific/gnu/hurd/default.nix b/pkgs/os-specific/gnu/hurd/default.nix index bc5e79e8ef3..ca1c71053e5 100644 --- a/pkgs/os-specific/gnu/hurd/default.nix +++ b/pkgs/os-specific/gnu/hurd/default.nix @@ -10,8 +10,8 @@ assert (hurdPartedCross != null) -> (libuuid != null); let # Unfortunately we can't use `master@{DATE}', see # . - date = "20110516"; - rev = "ffd73488f9eecdb9da40e15f5fdcebf392cb88f8"; + date = "20111115"; + rev = "969fbb646ffd89a482302e303eaded79781c3331"; suffix = if headersOnly then "-headers" else (if buildTarget != "all" @@ -23,7 +23,7 @@ stdenv.mkDerivation ({ src = fetchgit { url = "git://git.sv.gnu.org/hurd/hurd.git"; - sha256 = "6527e85347fe387bd3119fbf2ea07590a35ecad9eec14bb00cd6a443507111a9"; + sha256 = "b7f57ec2c6dcaf35ec03fb7979eb5506180ce4c6e2edf60a587f12ac5b11f004"; inherit rev; }; From 2c41dc1c06fd8932227b55df1bae5ee06c8287c6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= Date: Sat, 19 Nov 2011 14:33:37 +0000 Subject: [PATCH 639/970] release-cross: Remove `--with-system' hack for cross-building Nix. svn path=/nixpkgs/trunk/; revision=30479 --- pkgs/top-level/release-cross.nix | 1 - 1 file changed, 1 deletion(-) diff --git a/pkgs/top-level/release-cross.nix b/pkgs/top-level/release-cross.nix index 4088fc088dc..b7fbdc78421 100644 --- a/pkgs/top-level/release-cross.nix +++ b/pkgs/top-level/release-cross.nix @@ -176,7 +176,6 @@ let platform = pkgs.platforms.pc; libc = "glibc"; openssl.system = "hurd-x86"; # Nix depends on OpenSSL. - nix.system = "i686-gnu"; # Hack until nix is more cross-compile aware }; in { crossGNU = mapTestOnCross crossSystem { From 351ff3583de67063e2ae19be45703f9526675a73 Mon Sep 17 00:00:00 2001 From: Evgeny Egorochkin Date: Sat, 19 Nov 2011 17:12:00 +0000 Subject: [PATCH 640/970] TorChat: packaged svn path=/nixpkgs/trunk/; revision=30480 --- .../instant-messengers/torchat/default.nix | 38 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 4 ++ 2 files changed, 42 insertions(+) create mode 100644 pkgs/applications/networking/instant-messengers/torchat/default.nix diff --git a/pkgs/applications/networking/instant-messengers/torchat/default.nix b/pkgs/applications/networking/instant-messengers/torchat/default.nix new file mode 100644 index 00000000000..a63b2045276 --- /dev/null +++ b/pkgs/applications/networking/instant-messengers/torchat/default.nix @@ -0,0 +1,38 @@ +{ stdenv, fetchurl, python, unzip, wxPython, wrapPython, tor }: +stdenv.mkDerivation rec { + + name = "torchat-${version}"; + version = "0.9.9.550"; + + src = fetchurl { + url = "http://torchat.googlecode.com/files/torchat-source-${version}.zip"; + sha256 = "01z0vrmflcmb146m04b66zihkd22aqnxz2vr4x23z1q5mlwylmq2"; + }; + + buildInputs = [ python unzip wxPython wrapPython ]; + pythonPath = [ wxPython ]; + + preConfigure = "rm portable.txt"; + preUnpack = "sourceRoot=`pwd`/src"; + + installPhase = '' + substituteInPlace "Tor/tor.sh" --replace "tor -f" "${tor}/bin/tor -f" + + wrapPythonPrograms + + ensureDir $out/lib/torchat + cp -rf * $out/lib/torchat + makeWrapper ${python}/bin/python $out/bin/torchat \ + --set PYTHONPATH $out/lib/torchat:$program_PYTHONPATH \ + --run "cd $out/lib/torchat" \ + --add-flags "-O $out/lib/torchat/torchat.py" + ''; + + meta = with stdenv.lib; { + homepage = http://code.google.com/p/torchat/; + description = "instant messaging application on top of the Tor network and it's location hidden services"; + license = licenses.gpl3; + maintainers = [ maintainers.phreedom ]; + platforms = platforms.all; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 1b4980235bf..f18acb25749 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -7417,6 +7417,10 @@ let tla = callPackage ../applications/version-management/arch { }; + torchat = callPackage ../applications/networking/instant-messengers/torchat { + wrapPython = pythonPackages.wrapPython; + }; + transmission = callPackage ../applications/networking/p2p/transmission { }; trayer = callPackage ../applications/window-managers/trayer { From a148b889f1dd85ca6cec34b624fe8b4778433ffd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= Date: Sat, 19 Nov 2011 18:28:10 +0000 Subject: [PATCH 641/970] GDB: Allow cross-compilation for GNU. svn path=/nixpkgs/trunk/; revision=30481 --- pkgs/development/tools/misc/gdb/default.nix | 24 ++++++++++++++++----- pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 21 insertions(+), 5 deletions(-) diff --git a/pkgs/development/tools/misc/gdb/default.nix b/pkgs/development/tools/misc/gdb/default.nix index 7da5ac31e2a..0e22aed5887 100644 --- a/pkgs/development/tools/misc/gdb/default.nix +++ b/pkgs/development/tools/misc/gdb/default.nix @@ -4,16 +4,28 @@ # Set it to true to fetch the latest release/branchpoint from git. , bleedingEdgeVersion ? false +# Additional dependencies for GNU/Hurd. +, mig ? null, hurd ? null + # needed for the git version , flex, bison }: let - basename = - if bleedingEdgeVersion - then "gdb-7.3.20110726" - else "gdb-7.3.1"; + basename = + if bleedingEdgeVersion + then "gdb-7.3.20110726" + else "gdb-7.3.1"; + + # Whether (cross-)building for GNU/Hurd. This is an approximation since + # having `stdenv ? cross' doesn't tell us if we're building `hostDrv' and + # `buildDrv'. + isGNU = + stdenv.system == "i586-pc-gnu" + || (stdenv ? cross && stdenv.cross.config == "i586-pc-gnu"); in +assert isGNU -> mig != null && hurd != null; + stdenv.mkDerivation rec { name = basename + stdenv.lib.optionalString (target != null) ("-" + target.config); @@ -34,9 +46,11 @@ stdenv.mkDerivation rec { # I think python is not a native input, but I leave it # here while I will not need it cross building buildNativeInputs = [ texinfo python ] - ++ stdenv.lib.optionals bleedingEdgeVersion [ flex bison ]; + ++ stdenv.lib.optional isGNU mig + ++ stdenv.lib.optionals bleedingEdgeVersion [ flex bison ]; buildInputs = [ ncurses readline gmp mpfr expat ] + ++ stdenv.lib.optional isGNU hurd ++ stdenv.lib.optional doCheck dejagnu; configureFlags = with stdenv.lib; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index f18acb25749..81d1c5aa256 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -3042,6 +3042,8 @@ let gdb = callPackage ../development/tools/misc/gdb { readline = readline5; + hurd = gnu.hurdCross; + inherit (gnu) mig; }; gdbCross = callPackage ../development/tools/misc/gdb { From 9b2bd7479f4376292fd66cee36fed4d12498f31c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= Date: Sat, 19 Nov 2011 18:28:16 +0000 Subject: [PATCH 642/970] Shadow: Make Linux-PAM optional; allow cross-compilation. svn path=/nixpkgs/trunk/; revision=30482 --- pkgs/os-specific/linux/shadow/default.nix | 21 +++++++++++++++------ 1 file changed, 15 insertions(+), 6 deletions(-) diff --git a/pkgs/os-specific/linux/shadow/default.nix b/pkgs/os-specific/linux/shadow/default.nix index e4722f26d2b..fec9fe3da61 100644 --- a/pkgs/os-specific/linux/shadow/default.nix +++ b/pkgs/os-specific/linux/shadow/default.nix @@ -1,22 +1,31 @@ -{ stdenv, fetchurl, pam, glibc }: - +{ stdenv, fetchurl, pam ? null, glibcCross ? null }: + +let + glibc = if stdenv ? cross + then glibcCross + else stdenv.glibc; +in stdenv.mkDerivation rec { name = "shadow-4.1.4.2"; - + src = fetchurl { url = "http://pkg-shadow.alioth.debian.org/releases/${name}.tar.bz2"; sha256 = "1449ny7pdnwkavg92wvibapnkgdq5pas38nvl1m5xa37g5m7z64p"; }; - buildInputs = [ pam ]; + buildInputs = stdenv.lib.optional (pam != null && stdenv.isLinux) pam; patches = [ ./no-sanitize-env.patch ./su-name.patch ./keep-path.patch ]; - preBuild = + # Assume System V `setpgrp (void)', which is the default on GNU variants + # (`AC_FUNC_SETPGRP' is not cross-compilation capable.) + preConfigure = "export ac_cv_func_setpgrp_void=yes"; + + preBuild = assert glibc != null; '' substituteInPlace lib/nscd.c --replace /usr/sbin/nscd ${glibc}/sbin/nscd ''; - + meta = { homepage = http://pkg-shadow.alioth.debian.org/; description = "Suite containing authentication-related tools such as passwd and su"; From d3a8263552f12491059f044702f737967e2ef870 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= Date: Sat, 19 Nov 2011 20:13:02 +0000 Subject: [PATCH 643/970] GNU Shishi: Use GnuTLS 2.x. svn path=/nixpkgs/trunk/; revision=30483 --- pkgs/top-level/all-packages.nix | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 81d1c5aa256..9d54a412f22 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -5036,7 +5036,10 @@ let samba = callPackage ../servers/samba { }; - shishi = callPackage ../servers/shishi { }; + shishi = callPackage ../servers/shishi { + # GNU Shishi 1.0.0 fails to build with GnuTLS 3.x. + gnutls = gnutls2; + }; sipwitch = callPackage ../servers/sip/sipwitch { }; From ef41b48dcb3a0827c856a2965674887f126c3192 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= Date: Sat, 19 Nov 2011 20:37:44 +0000 Subject: [PATCH 644/970] GDB: Check for `stdenv.system == "i686-gnu"'. Reported by Shea Levy, thanks! svn path=/nixpkgs/trunk/; revision=30484 --- pkgs/development/tools/misc/gdb/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/tools/misc/gdb/default.nix b/pkgs/development/tools/misc/gdb/default.nix index 0e22aed5887..cd2eb6cc02d 100644 --- a/pkgs/development/tools/misc/gdb/default.nix +++ b/pkgs/development/tools/misc/gdb/default.nix @@ -20,7 +20,7 @@ let # having `stdenv ? cross' doesn't tell us if we're building `hostDrv' and # `buildDrv'. isGNU = - stdenv.system == "i586-pc-gnu" + stdenv.system == "i686-gnu" || (stdenv ? cross && stdenv.cross.config == "i586-pc-gnu"); in From 32f1cfcd265b294108c7789edb0f7d12420b3314 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Sun, 20 Nov 2011 10:13:34 +0000 Subject: [PATCH 645/970] haskell-xmonad: updated to version 0.10 svn path=/nixpkgs/trunk/; revision=30485 --- .../window-managers/xmonad/default.nix | 16 ++++++---------- 1 file changed, 6 insertions(+), 10 deletions(-) diff --git a/pkgs/applications/window-managers/xmonad/default.nix b/pkgs/applications/window-managers/xmonad/default.nix index 76b9b37456e..a10cd7de5a3 100644 --- a/pkgs/applications/window-managers/xmonad/default.nix +++ b/pkgs/applications/window-managers/xmonad/default.nix @@ -1,12 +1,13 @@ -{cabal, X11, mtl, xmessage, syb}: +{ cabal, extensibleExceptions, mtl, utf8String, X11 }: cabal.mkDerivation (self: { pname = "xmonad"; - name = "${self.fname}"; - version = "0.9.2"; - sha256 = "07w5k3pqmybjn0zh2nr1glp69685xg2fhj3z9zxb37x5nzss7kdd"; + version = "0.10"; + sha256 = "19z5y36pybsm93x6hlj5hzyys9r4ag7hkdib5spsnryk2mv72xj6"; + isLibrary = true; + isExecutable = true; + buildDepends = [ extensibleExceptions mtl utf8String X11 ]; noHaddock = true; - propagatedBuildInputs = [X11 mtl syb]; meta = { homepage = "http://xmonad.org"; description = "A tiling window manager"; @@ -17,9 +18,4 @@ cabal.mkDerivation (self: { self.stdenv.lib.maintainers.simons ]; }; - - preConfigure = '' - substituteInPlace XMonad/Core.hs --replace \ - '"xmessage"' '"${xmessage}/bin/xmessage"' - ''; }) From 589be8e7546896c88635c53a06d5213715dea3e8 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Sun, 20 Nov 2011 10:13:43 +0000 Subject: [PATCH 646/970] haskell-xmonad-contrib: updated to version 0.10 svn path=/nixpkgs/trunk/; revision=30486 --- pkgs/applications/window-managers/xmonad/xmonad-contrib.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/window-managers/xmonad/xmonad-contrib.nix b/pkgs/applications/window-managers/xmonad/xmonad-contrib.nix index 7ca5e2b17fd..6bb06f7d4a5 100644 --- a/pkgs/applications/window-managers/xmonad/xmonad-contrib.nix +++ b/pkgs/applications/window-managers/xmonad/xmonad-contrib.nix @@ -4,8 +4,8 @@ cabal.mkDerivation (self: { pname = "xmonad-contrib"; - version = "0.9.2"; - sha256 = "06hg5j4w8iz62wmyygq4c7xcbi9dxlhhh3dbic438cjk7c0w1h5p"; + version = "0.10"; + sha256 = "0lp7qr69rpjy4s3knhdgh2bp6zs81xp0az1lisv4a2i7i1ys7hfq"; buildDepends = [ extensibleExceptions mtl random utf8String X11 X11Xft xmonad ]; From 0a872860d77fbb0feda1dfaab71ab4aec0c2a1d8 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Sun, 20 Nov 2011 10:13:48 +0000 Subject: [PATCH 647/970] haskell-smallcheck: updated to version 0.5 svn path=/nixpkgs/trunk/; revision=30487 --- pkgs/development/libraries/haskell/smallcheck/default.nix | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/smallcheck/default.nix b/pkgs/development/libraries/haskell/smallcheck/default.nix index a4106ea8002..b4775394946 100644 --- a/pkgs/development/libraries/haskell/smallcheck/default.nix +++ b/pkgs/development/libraries/haskell/smallcheck/default.nix @@ -2,9 +2,10 @@ cabal.mkDerivation (self: { pname = "smallcheck"; - version = "0.4"; - sha256 = "0nq13jm3akrmgk6n2clisip16v0jf1xkm0hm678v63s87hxqb1ma"; + version = "0.5"; + sha256 = "10bmaifpkd5h3fp76cgbbc21q6nd0v8b3f80fjnb1ggg5zqs10dv"; meta = { + homepage = "https://github.com/feuerbach/smallcheck"; description = "Another lightweight testing library in Haskell"; license = self.stdenv.lib.licenses.bsd3; platforms = self.ghc.meta.platforms; From 59fa8fc940ee0186179ab4bd40c3a27414e7789d Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Sun, 20 Nov 2011 10:21:38 +0000 Subject: [PATCH 648/970] xmonad: patch source code to refer to xmessage(1) using its complete path svn path=/nixpkgs/trunk/; revision=30488 --- pkgs/applications/window-managers/xmonad/default.nix | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/pkgs/applications/window-managers/xmonad/default.nix b/pkgs/applications/window-managers/xmonad/default.nix index a10cd7de5a3..c89088e400b 100644 --- a/pkgs/applications/window-managers/xmonad/default.nix +++ b/pkgs/applications/window-managers/xmonad/default.nix @@ -1,4 +1,4 @@ -{ cabal, extensibleExceptions, mtl, utf8String, X11 }: +{ cabal, extensibleExceptions, mtl, utf8String, X11, xmessage }: cabal.mkDerivation (self: { pname = "xmonad"; @@ -18,4 +18,9 @@ cabal.mkDerivation (self: { self.stdenv.lib.maintainers.simons ]; }; + + preConfigure = '' + substituteInPlace XMonad/Core.hs --replace \ + '"xmessage"' '"${xmessage}/bin/xmessage"' + ''; }) From 5598fcf36c27315759b549928dc8d19836da582b Mon Sep 17 00:00:00 2001 From: Alexander Tsamutali Date: Sun, 20 Nov 2011 17:10:54 +0000 Subject: [PATCH 649/970] games/warzone2100: Updated to 2.3.9. svn path=/nixpkgs/trunk/; revision=30490 --- pkgs/games/warzone2100/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/games/warzone2100/default.nix b/pkgs/games/warzone2100/default.nix index 0d655736467..7468ccdd2b8 100644 --- a/pkgs/games/warzone2100/default.nix +++ b/pkgs/games/warzone2100/default.nix @@ -3,11 +3,11 @@ }: stdenv.mkDerivation rec { pname = "warzone2100"; - version = "2.3.7"; + version = "2.3.9"; name = "${pname}-${version}"; src = fetchurl { url = "mirror://sourceforge/${pname}/${name}.tar.gz"; - sha256 = "157v3jqaj0l910y8bcr9zpl0inx8g2942nm8zdnnn16gklf9mb26"; + sha256 = "1nvs4slnl75b64pf9gwcpbra56jzcbxyv83fis5pki69aavkp14y"; }; buildInputs = [ bison flex gettext pkgconfig SDL libpng libtheora openal popt physfs mesa quesoglc zip unzip From b555892dff04400f11fb1017c5224bd2de1d2caf Mon Sep 17 00:00:00 2001 From: Florian Friesdorf Date: Sun, 20 Nov 2011 19:22:53 +0000 Subject: [PATCH 650/970] notmuch-0.9 svn path=/nixpkgs/trunk/; revision=30491 --- pkgs/applications/networking/mailreaders/notmuch/default.nix | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/mailreaders/notmuch/default.nix b/pkgs/applications/networking/mailreaders/notmuch/default.nix index dcaaf01c336..70eed03b934 100644 --- a/pkgs/applications/networking/mailreaders/notmuch/default.nix +++ b/pkgs/applications/networking/mailreaders/notmuch/default.nix @@ -1,11 +1,11 @@ { fetchurl, stdenv, bash, emacs, gdb, git, glib, gmime, gnupg1, pkgconfig, talloc, xapian }: stdenv.mkDerivation rec { - name = "notmuch-0.8"; + name = "notmuch-0.9"; src = fetchurl { url = "http://notmuchmail.org/releases/${name}.tar.gz"; - sha256 = "f40bcdc6447cae9f76d5b4e70ab70d87e4a813cd123b524c1dc3155a3371a949"; + sha256 = "e6f1046941d2894d143cb7c19d4810f97946f98742f6d9b8a7208ddb858c57e4"; }; buildInputs = [ bash emacs gdb git glib gmime gnupg1 pkgconfig talloc xapian ]; @@ -13,6 +13,7 @@ stdenv.mkDerivation rec { patchPhase = '' (cd test && for prg in \ aggregate-results.sh \ + atomicity \ author-order \ basic \ crypto \ From e0f38af4e32c0a634b692614f1cc8b2d8d8734e4 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Sun, 20 Nov 2011 19:25:13 +0000 Subject: [PATCH 651/970] haskell-blaze-html: updated to version 0.4.2.2 svn path=/nixpkgs/trunk/; revision=30493 --- pkgs/development/libraries/haskell/blaze-html/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/blaze-html/default.nix b/pkgs/development/libraries/haskell/blaze-html/default.nix index d9143635c6b..2e8a5868d12 100644 --- a/pkgs/development/libraries/haskell/blaze-html/default.nix +++ b/pkgs/development/libraries/haskell/blaze-html/default.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "blaze-html"; - version = "0.4.2.1"; - sha256 = "0hm2jnz9n68njdrrq73a558qxl2jwcvxmy62mvf2v9q96wyp07yj"; + version = "0.4.2.2"; + sha256 = "1fg0qgqml7ar3m0as9sk9zc260j2jvdsf5cdfrsify5l62ip060f"; buildDepends = [ blazeBuilder text ]; meta = { homepage = "http://jaspervdj.be/blaze"; From 244816121329a1a25acb091bba8e43d61c3fc02b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= Date: Sun, 20 Nov 2011 20:42:05 +0000 Subject: [PATCH 652/970] stdenv adapters: Use `toString' instead of `exprToString'. svn path=/nixpkgs/trunk/; revision=30494 --- pkgs/stdenv/adapters.nix | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) diff --git a/pkgs/stdenv/adapters.nix b/pkgs/stdenv/adapters.nix index 311d967c0a3..4c6cd24a973 100644 --- a/pkgs/stdenv/adapters.nix +++ b/pkgs/stdenv/adapters.nix @@ -302,7 +302,7 @@ rec { else null; in - builtins.trace "@:drv:${toString drvPath}:${builtins.exprToString license}:@" + builtins.trace "@:drv:${toString drvPath}:${builtins.toString license}:@" val; in pkg // { outPath = printDrvPath pkg.outPath; @@ -338,12 +338,10 @@ rec { validate = arg: if licensePred license then arg - else abort " - Error while building ${builtins.unsafeDiscardStringContext pkg.drvPath}: - The license predicate is not verified. - - bad license: ${builtins.exprToString license} - "; + else abort '' + while building ${builtins.unsafeDiscardStringContext pkg.drvPath}: + license `${builtins.toString license}' does not pass the predicate. + ''; in pkg // { outPath = validate pkg.outPath; From 36da53ebc3ce84964b86786d15f1f47e4a9db938 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= Date: Sun, 20 Nov 2011 20:42:24 +0000 Subject: [PATCH 653/970] Adobe Reader: Set `meta.license'. svn path=/nixpkgs/trunk/; revision=30495 --- pkgs/applications/misc/adobe-reader/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/applications/misc/adobe-reader/default.nix b/pkgs/applications/misc/adobe-reader/default.nix index 6182931de96..e56982a6680 100644 --- a/pkgs/applications/misc/adobe-reader/default.nix +++ b/pkgs/applications/misc/adobe-reader/default.nix @@ -28,5 +28,6 @@ stdenv.mkDerivation { meta = { description = "Adobe Reader, a viewer for PDF documents"; homepage = http://www.adobe.com/products/reader; + license = "unfree"; }; } From 4122bd643e29232cae238c97f020a91c3c26c65b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= Date: Sun, 20 Nov 2011 20:53:15 +0000 Subject: [PATCH 654/970] validateLicenses: Warn about derivations lacking licensing information. svn path=/nixpkgs/trunk/; revision=30496 --- pkgs/stdenv/adapters.nix | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/pkgs/stdenv/adapters.nix b/pkgs/stdenv/adapters.nix index 4c6cd24a973..a1e8aafd7bc 100644 --- a/pkgs/stdenv/adapters.nix +++ b/pkgs/stdenv/adapters.nix @@ -330,16 +330,22 @@ rec { { mkDerivation = args: let pkg = stdenv.mkDerivation args; + drv = builtins.unsafeDiscardStringContext pkg.drvPath; license = if pkg ? meta && pkg.meta ? license then pkg.meta.license + else if pkg ? outputHash then + # Fixed-output derivations such as source tarballs usually + # don't have licensing information, but that's OK. + null else - null; + builtins.trace + "warning: ${drv} lacks licensing information" null; validate = arg: if licensePred license then arg else abort '' - while building ${builtins.unsafeDiscardStringContext pkg.drvPath}: + while building ${drv}: license `${builtins.toString license}' does not pass the predicate. ''; From 1b8c781a0c56283e28dc9e79b38e8d279b6fbbbf Mon Sep 17 00:00:00 2001 From: Florian Friesdorf Date: Sun, 20 Nov 2011 21:48:56 +0000 Subject: [PATCH 655/970] add dtach-0.8 svn path=/nixpkgs/trunk/; revision=30497 --- pkgs/tools/misc/dtach/default.nix | 32 +++++++++++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 34 insertions(+) create mode 100644 pkgs/tools/misc/dtach/default.nix diff --git a/pkgs/tools/misc/dtach/default.nix b/pkgs/tools/misc/dtach/default.nix new file mode 100644 index 00000000000..d203419cd69 --- /dev/null +++ b/pkgs/tools/misc/dtach/default.nix @@ -0,0 +1,32 @@ +{ stdenv, fetchurl }: + +stdenv.mkDerivation rec { + name = "dtach-0.8"; + + src = fetchurl { + url = "mirror://sourceforge/project/dtach/dtach/0.8/dtach-0.8.tar.gz"; + sha256 = "16614ebddf8ab2811d3dc0e7f329c7de88929ac6a9632d4cb4aef7fe11b8f2a9"; + }; + + installPhase = '' + ensureDir $out/bin + cp dtach $out/bin/dtach + ''; + + meta = { + homepage = http://dtach.sourceforge.net/; + description = "A program that emulates the detach feature of screen"; + + longDescription = ''dtach is a tiny program that emulates the + detach feature of screen, allowing you to run a program in an + environment that is protected from the controlling terminal and + attach to it later. dtach does not keep track of the contents of + the screen, and thus works best with programs that know how to + redraw themselves.''; + + license = stdenv.lib.licenses.gpl2Plus; + + platforms = stdenv.lib.platforms.unix; + maintainers = [ stdenv.lib.maintainers.chaoflow ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 9d54a412f22..46409086d33 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -603,6 +603,8 @@ let zlib = zlibStatic; }; + dtach = callPackage ../tools/misc/dtach { }; + duplicity = callPackage ../tools/backup/duplicity { inherit (pythonPackages) boto; gnupg = gnupg1; From 50bfde368eceb8f109198e09cc6a723ca8e68b9a Mon Sep 17 00:00:00 2001 From: Florian Friesdorf Date: Sun, 20 Nov 2011 21:49:06 +0000 Subject: [PATCH 656/970] notmuch use license path instead of string svn path=/nixpkgs/trunk/; revision=30498 --- pkgs/applications/networking/mailreaders/notmuch/default.nix | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/pkgs/applications/networking/mailreaders/notmuch/default.nix b/pkgs/applications/networking/mailreaders/notmuch/default.nix index 70eed03b934..9cf5909575b 100644 --- a/pkgs/applications/networking/mailreaders/notmuch/default.nix +++ b/pkgs/applications/networking/mailreaders/notmuch/default.nix @@ -53,11 +53,8 @@ stdenv.mkDerivation rec { meta = { description = "Notmuch -- The mail indexer"; - longDescription = ""; - - license = "GPLv3"; - + license = stdenv.lib.licenses.gpl3; maintainers = [ stdenv.lib.maintainers.chaoflow ]; platforms = stdenv.lib.platforms.gnu; # arbitrary choice }; From b781b722ab73f3b7cc365f751143f522de85a1fe Mon Sep 17 00:00:00 2001 From: Florian Friesdorf Date: Sun, 20 Nov 2011 21:49:13 +0000 Subject: [PATCH 657/970] xapian(-bindings) use license path instead of string svn path=/nixpkgs/trunk/; revision=30499 --- pkgs/development/libraries/xapian/bindings/default.nix | 2 +- pkgs/development/libraries/xapian/default.nix | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/xapian/bindings/default.nix b/pkgs/development/libraries/xapian/bindings/default.nix index 7dee0da9eed..d111f870069 100644 --- a/pkgs/development/libraries/xapian/bindings/default.nix +++ b/pkgs/development/libraries/xapian/bindings/default.nix @@ -68,7 +68,7 @@ composableDerivation.composableDerivation {} rec { meta = { description = "Bindings for the Xapian library"; homepage = xapian.meta.homepage; - license = "GPLv2+"; + license = stdenv.lib.licenses.gpl2Plus; maintainers = [ stdenv.lib.maintainers.chaoflow ]; }; } diff --git a/pkgs/development/libraries/xapian/default.nix b/pkgs/development/libraries/xapian/default.nix index ac86c24af6c..bd9bb220b78 100644 --- a/pkgs/development/libraries/xapian/default.nix +++ b/pkgs/development/libraries/xapian/default.nix @@ -13,7 +13,7 @@ stdenv.mkDerivation { meta = { description = "Xapian Probabilistic Information Retrieval library"; homepage = "http://xapian.org"; - license = "GPLv2+"; + license = stdenv.lib.licenses.gpl2Plus; maintainers = [ stdenv.lib.maintainers.chaoflow ]; }; } From aea0ac2543a25faa4621f70bb0414b098d427970 Mon Sep 17 00:00:00 2001 From: Florian Friesdorf Date: Sun, 20 Nov 2011 21:49:20 +0000 Subject: [PATCH 658/970] xapian(-bindings)-1.2.7 svn path=/nixpkgs/trunk/; revision=30500 --- pkgs/development/libraries/xapian/bindings/default.nix | 6 +++--- pkgs/development/libraries/xapian/default.nix | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/pkgs/development/libraries/xapian/bindings/default.nix b/pkgs/development/libraries/xapian/bindings/default.nix index d111f870069..bb7643330a0 100644 --- a/pkgs/development/libraries/xapian/bindings/default.nix +++ b/pkgs/development/libraries/xapian/bindings/default.nix @@ -5,11 +5,11 @@ let inherit (composableDerivation) wwf; in composableDerivation.composableDerivation {} rec { - name = "xapian-bindings-1.2.5"; + name = "xapian-bindings-1.2.7"; src = fetchurl { - url = "http://oligarchy.co.uk/xapian/1.2.5/${name}.tar.gz"; - sha256 = "0d723af62b8d633cd49fdf92058a4985061659454b390c0c08db05fa4f7fb09c"; + url = "http://oligarchy.co.uk/xapian/1.2.7/${name}.tar.gz"; + sha256 = "c9f63ad7a032c260f0617e029327d7b05dd986d91af401032268a9f7b2eabde8"; }; buildInputs = [ xapian pkgconfig zlib ]; diff --git a/pkgs/development/libraries/xapian/default.nix b/pkgs/development/libraries/xapian/default.nix index bd9bb220b78..ac27962b8c5 100644 --- a/pkgs/development/libraries/xapian/default.nix +++ b/pkgs/development/libraries/xapian/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, libuuid, zlib }: stdenv.mkDerivation { - name = "xapian-1.2.5"; + name = "xapian-1.2.7"; src = fetchurl { - url = http://oligarchy.co.uk/xapian/1.2.5/xapian-core-1.2.5.tar.gz; - sha256 = "392ccfccb4372725be24509e5ee95a7422f07c3d47d0cbdbb8545e789cc936f7"; + url = http://oligarchy.co.uk/xapian/1.2.7/xapian-core-1.2.7.tar.gz; + sha256 = "6ce8cb3502f35245ec0cb0dcf579ce4f65c015a2f2e8d1b4c388c95f58278c89"; }; buildInputs = [ libuuid zlib ]; From 176bcf9453f960c8a79d64a9f3e40f3681574a04 Mon Sep 17 00:00:00 2001 From: Shea Levy Date: Sun, 20 Nov 2011 21:51:17 +0000 Subject: [PATCH 659/970] libidn: Don't run tests on darwin, something is wrong with the testing script svn path=/nixpkgs/trunk/; revision=30501 --- pkgs/development/libraries/libidn/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/libraries/libidn/default.nix b/pkgs/development/libraries/libidn/default.nix index 7510c6be899..faf3f1c3dbc 100644 --- a/pkgs/development/libraries/libidn/default.nix +++ b/pkgs/development/libraries/libidn/default.nix @@ -8,7 +8,7 @@ stdenv.mkDerivation rec { sha256 = "1vc8yni7sg5iq1ijg9l558pa4v6c1v5l57zc024lgxcmhy35wxig"; }; - doCheck = true; + doCheck = ! stdenv.isDarwin; meta = { homepage = http://www.gnu.org/software/libidn/; From 7c5f627645bafd66ce9c8f50ae1ed2c1f39170cb Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Mon, 21 Nov 2011 13:58:46 +0000 Subject: [PATCH 660/970] * Sigh. Nixpkgs broken again... svn path=/nixpkgs/trunk/; revision=30505 --- pkgs/os-specific/linux/shadow/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/os-specific/linux/shadow/default.nix b/pkgs/os-specific/linux/shadow/default.nix index fec9fe3da61..21bea65bfff 100644 --- a/pkgs/os-specific/linux/shadow/default.nix +++ b/pkgs/os-specific/linux/shadow/default.nix @@ -3,7 +3,7 @@ let glibc = if stdenv ? cross then glibcCross - else stdenv.glibc; + else assert stdenv ? glib; stdenv.glibc; in stdenv.mkDerivation rec { name = "shadow-4.1.4.2"; From cf4a0bdce9783de271cc668a4c13cd09a7af6afc Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Mon, 21 Nov 2011 14:05:26 +0000 Subject: [PATCH 661/970] svn path=/nixpkgs/trunk/; revision=30506 --- pkgs/os-specific/linux/shadow/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/os-specific/linux/shadow/default.nix b/pkgs/os-specific/linux/shadow/default.nix index 21bea65bfff..f14b249d514 100644 --- a/pkgs/os-specific/linux/shadow/default.nix +++ b/pkgs/os-specific/linux/shadow/default.nix @@ -3,7 +3,7 @@ let glibc = if stdenv ? cross then glibcCross - else assert stdenv ? glib; stdenv.glibc; + else assert stdenv ? glibc; stdenv.glibc; in stdenv.mkDerivation rec { name = "shadow-4.1.4.2"; From 5abed12234b39120cb0e509114838fb56d7ff41f Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Mon, 21 Nov 2011 14:11:04 +0000 Subject: [PATCH 662/970] * i386-sunos -> i686-solaris. svn path=/nixpkgs/trunk/; revision=30507 --- pkgs/development/libraries/ncurses/default.nix | 2 +- pkgs/development/tools/misc/autoconf/default.nix | 2 +- pkgs/stdenv/generic/default.nix | 3 ++- pkgs/stdenv/native/default.nix | 8 ++++---- pkgs/top-level/all-packages.nix | 2 +- 5 files changed, 9 insertions(+), 8 deletions(-) diff --git a/pkgs/development/libraries/ncurses/default.nix b/pkgs/development/libraries/ncurses/default.nix index 6e15dca01f3..b503493ac88 100644 --- a/pkgs/development/libraries/ncurses/default.nix +++ b/pkgs/development/libraries/ncurses/default.nix @@ -8,7 +8,7 @@ let , but this is left as an exercise to the reader. So disable them for now. */ - cxx = stdenv.system != "i386-sunos"; + cxx = stdenv.system != "i686-solaris"; in stdenv.mkDerivation (rec { name = "ncurses-5.7"; diff --git a/pkgs/development/tools/misc/autoconf/default.nix b/pkgs/development/tools/misc/autoconf/default.nix index 82f8b110054..ce18fd1a377 100644 --- a/pkgs/development/tools/misc/autoconf/default.nix +++ b/pkgs/development/tools/misc/autoconf/default.nix @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { # details. # There are many test failures on `i386-pc-solaris2.11'. doCheck = (stdenv.system != "i686-cygwin" - && stdenv.system != "i386-sunos"); + && stdenv.system != "i686-solaris"); # Don't fixup "#! /bin/sh" in Autoconf, otherwise it will use the # "fixed" path in generated files! diff --git a/pkgs/stdenv/generic/default.nix b/pkgs/stdenv/generic/default.nix index c4d6a3666d0..436b912d8d6 100644 --- a/pkgs/stdenv/generic/default.nix +++ b/pkgs/stdenv/generic/default.nix @@ -98,7 +98,8 @@ let || result.system == "powerpc-linux" || result.system == "armv5tel-linux" || result.system == "mips64-linux"; - isSunOS = result.system == "i386-sunos"; + isSunOS = result.system == "i686-solaris" + || result.system == "x86_64-solaris"; isCygwin = result.system == "i686-cygwin"; isFreeBSD = result.system == "i686-freebsd" || result.system == "x86_64-freebsd"; diff --git a/pkgs/stdenv/native/default.nix b/pkgs/stdenv/native/default.nix index 88b3c17b582..9d3b60d67a5 100644 --- a/pkgs/stdenv/native/default.nix +++ b/pkgs/stdenv/native/default.nix @@ -3,12 +3,12 @@ rec { shell = - if system == "i686-freebsd" || system == "x86_64-freebsd" - then "/usr/local/bin/bash" + if system == "i686-freebsd" || system == "x86_64-freebsd" then "/usr/local/bin/bash" + else if system == "i686-solaris" then "/usr/bin/bash" else "/bin/bash"; path = - (if system == "i386-sunos" then [ "/usr/gnu" ] else []) ++ + (if system == "i686-solaris" then [ "/usr/gnu" ] else []) ++ (if system == "i686-netbsd" then [ "/usr/pkg" ] else []) ++ ["/" "/usr" "/usr/local"]; @@ -115,7 +115,7 @@ rec { name = "gcc-native"; nativeTools = true; nativeLibc = true; - nativePrefix = if system == "i386-sunos" then "/usr/gnu" else "/usr"; + nativePrefix = if system == "i686-solaris" then "/usr/gnu" else "/usr"; stdenv = stdenvBoot0; }; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 46409086d33..f4c9f1a9adf 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -2787,7 +2787,7 @@ let automake111x = callPackage ../development/tools/misc/automake/automake-1.11.x.nix { doCheck = !stdenv.isArm && !stdenv.isCygwin # Some of the parallel tests seem to hang on `i386-pc-solaris2.11'. - && stdenv.system != "i386-sunos"; + && stdenv.system != "i686-solaris"; }; automoc4 = callPackage ../development/tools/misc/automoc4 { }; From eb38ca06bf9853da520309e662b7a8fed1d5600c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?= Date: Mon, 21 Nov 2011 14:47:28 +0000 Subject: [PATCH 663/970] Updating giv. svn path=/nixpkgs/trunk/; revision=30508 --- pkgs/applications/graphics/giv/default.nix | 6 ++-- pkgs/applications/graphics/giv/union.patch | 38 ---------------------- 2 files changed, 3 insertions(+), 41 deletions(-) delete mode 100644 pkgs/applications/graphics/giv/union.patch diff --git a/pkgs/applications/graphics/giv/default.nix b/pkgs/applications/graphics/giv/default.nix index d32ef5bbebc..a9eab8e00f8 100644 --- a/pkgs/applications/graphics/giv/default.nix +++ b/pkgs/applications/graphics/giv/default.nix @@ -2,11 +2,11 @@ pcre, cfitsio, perl, gob2, vala, libtiff }: stdenv.mkDerivation rec { - name = "giv-0.9.19"; + name = "giv-0.9.20"; src = fetchurl { url = "mirror://sourceforge/giv/${name}.tar.gz"; - sha256 = "07sgpp4k27417ymavcvil4waq6ac2mj08g42g1l52l435xm5mnh7"; + sha256 = "09s659vvv26nw9vaw3a766al8yq6np7p0xb4iw907921j6nbqp7z"; }; # It built code to be put in a shared object without -fPIC @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { sed -i s,/usr/local,$out, SConstruct ''; - patches = [ ./build.patch ./union.patch ]; + patches = [ ./build.patch ]; buildPhase = "scons"; diff --git a/pkgs/applications/graphics/giv/union.patch b/pkgs/applications/graphics/giv/union.patch deleted file mode 100644 index f12fce03613..00000000000 --- a/pkgs/applications/graphics/giv/union.patch +++ /dev/null @@ -1,38 +0,0 @@ -Already reported uptream - -diff --git a/src/giv-data.h b/src/giv-data.h -index 64e7696..d34bfe4 100644 ---- a/src/giv-data.h -+++ b/src/giv-data.h -@@ -88,7 +88,7 @@ typedef struct - typedef struct - { - gint op; -- union -+ struct - { - struct - { -diff --git a/src/giv_types.h b/src/giv_types.h -index 02abebe..c3cfb78 100644 ---- a/src/giv_types.h -+++ b/src/giv_types.h -@@ -11,13 +11,11 @@ typedef struct { - - typedef struct { - gint op; -- union { -- struct { -- gdouble x,y; -- } point; -- double arc_dev; -- text_mark_t *text_object; -- } data; -+ struct { -+ gdouble x,y; -+ } point; -+ double arc_dev; -+ text_mark_t *text_object; - } point_t; - - typedef struct { From 2a91cfa02777d193dd49248b37d32a94813cd86f Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Mon, 21 Nov 2011 14:55:58 +0000 Subject: [PATCH 664/970] * /bin and /usr/bin are the same on OpenSolaris so the special case is unnecessary. svn path=/nixpkgs/trunk/; revision=30509 --- pkgs/stdenv/native/default.nix | 1 - 1 file changed, 1 deletion(-) diff --git a/pkgs/stdenv/native/default.nix b/pkgs/stdenv/native/default.nix index 9d3b60d67a5..bdf342b2c64 100644 --- a/pkgs/stdenv/native/default.nix +++ b/pkgs/stdenv/native/default.nix @@ -4,7 +4,6 @@ rec { shell = if system == "i686-freebsd" || system == "x86_64-freebsd" then "/usr/local/bin/bash" - else if system == "i686-solaris" then "/usr/bin/bash" else "/bin/bash"; path = From 47e2f1c82027bb4fa7e136b8cffbbf11b3d0081a Mon Sep 17 00:00:00 2001 From: Rob Vermaas Date: Mon, 21 Nov 2011 15:41:19 +0000 Subject: [PATCH 665/970] update nixUnstable svn path=/nixpkgs/trunk/; revision=30511 --- pkgs/tools/package-management/nix/unstable.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/package-management/nix/unstable.nix b/pkgs/tools/package-management/nix/unstable.nix index 8235565f7a6..d8056962d47 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.0pre30457"; + name = "nix-1.0pre30510"; src = fetchurl { - url = "http://hydra.nixos.org/build/1554072/download/4/${name}.tar.bz2"; - sha256 = "d95b0577c1ab9646f2b5f0f37a96e5822013cd8046265c5608ea8acfab7ba602"; + url = "http://hydra.nixos.org/build/1563803/download/4/${name}.tar.bz2"; + sha256 = "22f6b686a47e136d48c0d3b91a1311a30d39539e1282c664872dca6967e91384"; }; buildNativeInputs = [ perl pkgconfig ]; From 80dc05cc9a7148099af7beb88900a096a530b20c Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 21 Nov 2011 17:54:29 +0000 Subject: [PATCH 666/970] haskell-xmonad-extras: updated to version 0.10 svn path=/nixpkgs/trunk/; revision=30513 --- .../window-managers/xmonad/xmonad-extras.nix | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/pkgs/applications/window-managers/xmonad/xmonad-extras.nix b/pkgs/applications/window-managers/xmonad/xmonad-extras.nix index 0461933a7bc..bfc00131e71 100644 --- a/pkgs/applications/window-managers/xmonad/xmonad-extras.nix +++ b/pkgs/applications/window-managers/xmonad/xmonad-extras.nix @@ -1,13 +1,14 @@ -{ cabal, hint, mtl, network, parsec, random, split, X11, xmonad -, xmonadContrib +{ cabal, hint, mtl, network, parsec, random, regexPosix, split, X11 +, xmonad, xmonadContrib }: cabal.mkDerivation (self: { pname = "xmonad-extras"; - version = "0.9.2"; - sha256 = "54b41a4c59ff3d68b3a214d727fb5675fa7c1b90090d99e58ecae62b3dfdd701"; + version = "0.10"; + sha256 = "0pxvzqcwva64xlrw21wxxc8zq8w36rgg58a12j6kz47ivwkin27g"; buildDepends = [ - hint mtl network parsec random split X11 xmonad xmonadContrib + hint mtl network parsec random regexPosix split X11 xmonad + xmonadContrib ]; configureFlags = "-f-with_hlist -f-with_mpd"; noHaddock = true; From 4d33d402c114ed6b8e81a4c4d8ac2b4ab7cd2e72 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 21 Nov 2011 17:54:34 +0000 Subject: [PATCH 667/970] haskell-enumerator: updated to version 0.4.16 svn path=/nixpkgs/trunk/; revision=30514 --- pkgs/development/libraries/haskell/enumerator/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/enumerator/default.nix b/pkgs/development/libraries/haskell/enumerator/default.nix index d42470637d4..12e801516a6 100644 --- a/pkgs/development/libraries/haskell/enumerator/default.nix +++ b/pkgs/development/libraries/haskell/enumerator/default.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "enumerator"; - version = "0.4.15"; - sha256 = "06yzf2xaadmdhgidzyp7qywd8d401f4n1qlfyx0q72nafgnlvr6v"; + version = "0.4.16"; + sha256 = "16556x3km4si7gvprf7xmsiqw1ygjwavhbgh32fmzf7709bpqnhs"; buildDepends = [ text transformers ]; meta = { homepage = "https://john-millikin.com/software/enumerator/"; From 5ffe6771adf4dde8ad067ff1a533c6f0fbf3cd51 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 21 Nov 2011 18:02:22 +0000 Subject: [PATCH 668/970] haskell-libmpd: added version 0.6.0 svn path=/nixpkgs/trunk/; revision=30515 --- .../libraries/haskell/libmpd/default.nix | 16 ++++++++++++++++ pkgs/top-level/haskell-packages.nix | 2 ++ 2 files changed, 18 insertions(+) create mode 100644 pkgs/development/libraries/haskell/libmpd/default.nix diff --git a/pkgs/development/libraries/haskell/libmpd/default.nix b/pkgs/development/libraries/haskell/libmpd/default.nix new file mode 100644 index 00000000000..846d697eb7f --- /dev/null +++ b/pkgs/development/libraries/haskell/libmpd/default.nix @@ -0,0 +1,16 @@ +{ cabal, mtl, network, time, utf8String }: + +cabal.mkDerivation (self: { + pname = "libmpd"; + version = "0.6.0"; + sha256 = "1ln7kfiv75ykihym9ska4mvy0mrghs4swsrrkvmbh562nqmv4fvm"; + isLibrary = true; + isExecutable = true; + buildDepends = [ mtl network time utf8String ]; + meta = { + homepage = "http://github.com/joachifm/libmpd-haskell"; + description = "An MPD client library"; + license = "LGPL"; + platforms = self.ghc.meta.platforms; + }; +}) diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix index aba5d50524e..a46687e8342 100644 --- a/pkgs/top-level/haskell-packages.nix +++ b/pkgs/top-level/haskell-packages.nix @@ -831,6 +831,8 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y); leksahServer = callPackage ../development/libraries/haskell/leksah/leksah-server.nix {}; + libmpd = callPackage ../development/libraries/haskell/libmpd {}; + ListLike = callPackage ../development/libraries/haskell/ListLike {}; ltk = callPackage ../development/libraries/haskell/ltk {}; From d471371bd0845b3cceb140532780371462aab8fa Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 21 Nov 2011 18:02:24 +0000 Subject: [PATCH 669/970] haskell-xmonad-extras: enable mpd and hlist extras svn path=/nixpkgs/trunk/; revision=30516 --- .../window-managers/xmonad/xmonad-extras.nix | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/pkgs/applications/window-managers/xmonad/xmonad-extras.nix b/pkgs/applications/window-managers/xmonad/xmonad-extras.nix index bfc00131e71..fb1e59d36e9 100644 --- a/pkgs/applications/window-managers/xmonad/xmonad-extras.nix +++ b/pkgs/applications/window-managers/xmonad/xmonad-extras.nix @@ -1,5 +1,5 @@ -{ cabal, hint, mtl, network, parsec, random, regexPosix, split, X11 -, xmonad, xmonadContrib +{ cabal, hint, HList, libmpd, mtl, network, parsec, random +, regexPosix, split, X11, xmonad, xmonadContrib }: cabal.mkDerivation (self: { @@ -7,10 +7,9 @@ cabal.mkDerivation (self: { version = "0.10"; sha256 = "0pxvzqcwva64xlrw21wxxc8zq8w36rgg58a12j6kz47ivwkin27g"; buildDepends = [ - hint mtl network parsec random regexPosix split X11 xmonad - xmonadContrib + hint HList libmpd mtl network parsec random regexPosix split X11 + xmonad xmonadContrib ]; - configureFlags = "-f-with_hlist -f-with_mpd"; noHaddock = true; meta = { homepage = "http://projects.haskell.org/xmonad-extras"; From fc337ed33cacbcc48c7c03a178d8b22fbb1eb507 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 21 Nov 2011 18:09:36 +0000 Subject: [PATCH 670/970] haskell-vector-space: updated to version 0.8.0 svn path=/nixpkgs/trunk/; revision=30517 --- pkgs/development/libraries/haskell/vector-space/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/vector-space/default.nix b/pkgs/development/libraries/haskell/vector-space/default.nix index 3cc44a018f0..b9ba9bae525 100644 --- a/pkgs/development/libraries/haskell/vector-space/default.nix +++ b/pkgs/development/libraries/haskell/vector-space/default.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "vector-space"; - version = "0.7.8"; - sha256 = "195g9zsb73w4a0fcfz0kank6gyqajww0qiqivr4fy0bik2nsr6ry"; + version = "0.8.0"; + sha256 = "1wd8psw2s98m8yfr8mam5abz2bhvxz1r78w703hgca8rr6hiaz0g"; buildDepends = [ Boolean MemoTrie NumInstances ]; meta = { homepage = "http://haskell.org/haskellwiki/vector-space"; From 7779b6245e376f38c0375907bd7d59e905d237ef Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 21 Nov 2011 18:09:38 +0000 Subject: [PATCH 671/970] haskell-cabal2nix: updated to version 1.19 svn path=/nixpkgs/trunk/; revision=30518 --- pkgs/development/tools/haskell/cabal2nix/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/haskell/cabal2nix/default.nix b/pkgs/development/tools/haskell/cabal2nix/default.nix index 983555bec43..b6c6eed67ad 100644 --- a/pkgs/development/tools/haskell/cabal2nix/default.nix +++ b/pkgs/development/tools/haskell/cabal2nix/default.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "cabal2nix"; - version = "1.18"; - sha256 = "1bx9gv5nxz68p8rimai6gy05l84f7n3rajacvg6dak9nsrnbl95i"; + version = "1.19"; + sha256 = "0fvd8h9dymz6l4fw2955ir6w4fcz7kdpl38kbd5ddk99q886035i"; isLibrary = false; isExecutable = true; buildDepends = [ hackageDb HTTP mtl nixosTypes regexPosix ]; From d844bc8bdbf3dae2bc0caebc7cf12633b5e590ef Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 21 Nov 2011 18:09:41 +0000 Subject: [PATCH 672/970] haskell-libmpd: added meta.maintainers attribute svn path=/nixpkgs/trunk/; revision=30519 --- pkgs/development/libraries/haskell/libmpd/default.nix | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/pkgs/development/libraries/haskell/libmpd/default.nix b/pkgs/development/libraries/haskell/libmpd/default.nix index 846d697eb7f..b9fcaa86002 100644 --- a/pkgs/development/libraries/haskell/libmpd/default.nix +++ b/pkgs/development/libraries/haskell/libmpd/default.nix @@ -12,5 +12,9 @@ cabal.mkDerivation (self: { description = "An MPD client library"; license = "LGPL"; platforms = self.ghc.meta.platforms; + maintainers = [ + self.stdenv.lib.maintainers.andres + self.stdenv.lib.maintainers.simons + ]; }; }) From 2ef1290de3db4043a28cf2c6e0db88a85b43b5fd Mon Sep 17 00:00:00 2001 From: Karn Kallio Date: Tue, 22 Nov 2011 04:38:14 +0000 Subject: [PATCH 673/970] koffice does not build with boost 1.48; use 1.47 instead. svn path=/nixpkgs/trunk/; revision=30520 --- pkgs/top-level/all-packages.nix | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index f4c9f1a9adf..45e298d6358 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -8066,7 +8066,9 @@ let inherit (pkgs.gtkLibs) gdk_pixbuf; }; - koffice = callPackage ../applications/office/koffice { }; + koffice = callPackage ../applications/office/koffice { + boost = boost147; + }; konq_plugins = callPackage ../applications/networking/browsers/konq-plugins { }; From 67653f93faf968b76e7d5f6f41878794ac243c86 Mon Sep 17 00:00:00 2001 From: Karn Kallio Date: Tue, 22 Nov 2011 06:13:18 +0000 Subject: [PATCH 674/970] Wesnoth does not build with boost 1.48 svn path=/nixpkgs/trunk/; revision=30521 --- pkgs/top-level/all-packages.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 45e298d6358..8b4120b5539 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -6113,6 +6113,7 @@ let wesnoth = callPackage ../games/wesnoth { inherit (gtkLibs) pango; lua = lua5; + boost = boost147; }; wirelesstools = callPackage ../os-specific/linux/wireless-tools { }; From ea96ea5d2f19c5bb87dec7918939d1fefce37405 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= Date: Tue, 22 Nov 2011 08:45:25 +0000 Subject: [PATCH 675/970] GCC 4.5: Fix cross-compilation to MinGW. svn path=/nixpkgs/trunk/; revision=30522 --- pkgs/development/compilers/gcc-4.5/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/development/compilers/gcc-4.5/default.nix b/pkgs/development/compilers/gcc-4.5/default.nix index 950243bebe7..0948e94702e 100644 --- a/pkgs/development/compilers/gcc-4.5/default.nix +++ b/pkgs/development/compilers/gcc-4.5/default.nix @@ -148,6 +148,7 @@ stdenv.mkDerivation ({ postPatch = if (stdenv.system == "i586-pc-gnu" || (libcCross != null # e.g., building `gcc.hostDrv' + && libcCross ? crossConfig && libcCross.crossConfig == "i586-pc-gnu") || (cross != null && cross.config == "i586-pc-gnu" && libcCross != null)) From 050ea140223dfb8b290f7078707163c93339bbea Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Tue, 22 Nov 2011 12:59:22 +0000 Subject: [PATCH 676/970] * DBLaTeX updated to 0.3.2. svn path=/nixpkgs/trunk/; revision=30523 --- pkgs/misc/tex/dblatex/default.nix | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) diff --git a/pkgs/misc/tex/dblatex/default.nix b/pkgs/misc/tex/dblatex/default.nix index 911c461bfba..05f4bd7a9fa 100644 --- a/pkgs/misc/tex/dblatex/default.nix +++ b/pkgs/misc/tex/dblatex/default.nix @@ -1,20 +1,18 @@ -{stdenv, fetchurl, python, libxslt, tetex}: +{ stdenv, fetchurl, python, libxslt, tetex }: stdenv.mkDerivation rec { - name = "dblatex-0.2.12"; + name = "dblatex-0.3.2"; src = fetchurl { url = "mirror://sourceforge/dblatex/${name}.tar.bz2"; - sha256 = "1wjghrlcn7hkr70nnyzzag1z57l5b1ck8i3r8zl7bw2rsrvqmyz2"; + sha256 = "0jg2acv2lyrbw06l8rr0id75lj1pws7xbsmryq58r3n13xzb1p7b"; }; buildPhase = "true"; - installPhase = " - python ./setup.py install --prefix=$out - "; + installPhase = "python ./setup.py install --prefix=$out"; - buildInputs = [python libxslt tetex]; + buildInputs = [ python libxslt tetex ]; meta = { description = "A program to convert DocBook to DVI, PostScript or PDF via LaTeX or ConTeXt"; From 350e31a223578ab0e08b1937e17da6a3873c3496 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Tue, 22 Nov 2011 15:47:56 +0000 Subject: [PATCH 677/970] * Added CatalystX::Script::Server::Starman, plus some Perl package updates. svn path=/nixpkgs/trunk/; revision=30528 --- pkgs/top-level/perl-packages.nix | 126 ++++++++++++++++++++----------- 1 file changed, 82 insertions(+), 44 deletions(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index facb711ecf8..0266295f355 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -389,10 +389,10 @@ rec { }; CatalystRuntime = buildPerlPackage rec{ - name = "Catalyst-Runtime-5.90003"; + name = "Catalyst-Runtime-5.90006"; src = fetchurl { url = "mirror://cpan/authors/id/B/BO/BOBTFISH/${name}.tar.gz"; - sha256 = "0i53d208gf9bg6zasa8ya0nk3wik1crfrkw9rmbxsba16i5nm101"; + sha256 = "01afjgcc5lqaw6gmzwym8n09q8nksj4jdl2z25m64sfiv1gdyx2w"; }; buildInputs = [ TestException ]; propagatedBuildInputs = @@ -517,10 +517,10 @@ rec { }; CatalystViewDownload = buildPerlPackage rec { - name = "Catalyst-View-Download-0.06"; + name = "Catalyst-View-Download-0.07"; src = fetchurl { url = "mirror://cpan/modules/by-module/Catalyst/${name}.tar.gz"; - sha256 = "0l9jvc4sqchhpmhn70lm46k2avdsdk19i9wgas1awhzyr445c0b3"; + sha256 = "1c6k4x6az0fkany16zlyaqhlp7bcx922vl4qzd3z707vs6pc06rz"; }; buildInputs = [ TestWWWMechanizeCatalyst TestUseOk ]; propagatedBuildInputs = [ CatalystRuntime TextCSV XMLSimple ]; @@ -554,7 +554,17 @@ rec { sha256 = "0a2mhfgv0kqmaxf2crs8mqk44lyhd9qcwlpzhrc0b0dh4z503mr4"; }; propagatedBuildInputs = - [ CatalystRuntime MooseXTraitsPluggable NamespaceAutoclean ListMoreUtils ]; + [ CatalystRuntime MooseXTraitsPluggable NamespaceAutoclean ListMoreUtils ]; + }; + + CatalystXScriptServerStarman = buildPerlPackage rec { + name = "CatalystX-Script-Server-Starman-0.01"; + src = fetchurl { + url = "mirror://cpan/modules/by-module/CatalystX/${name}.tar.gz"; + sha256 = "18hpp35bjyw65x564m1m82mr0nmff6836vfjqdwf2lwsb4n8s4xr"; + }; + buildInputs = [ TestWWWMechanizeCatalyst ]; + propagatedBuildInputs = [ CatalystRuntime Starman ]; }; CGICookieXS = buildPerlPackage rec { @@ -720,13 +730,23 @@ rec { }; ClassLoad = buildPerlPackage rec { - name = "Class-Load-0.08"; + name = "Class-Load-0.12"; src = fetchurl { url = "mirror://cpan/modules/by-module/Class/${name}.tar.gz"; - sha256 = "0qyxa5dd75dxna7y995wx589p7smsybcqkg1rach2cg04yff0dh1"; + sha256 = "0siw8hyqnmn0flk1hbd6fnnfqlhkgfr1d5442rri1d8a0rs1a36r"; }; buildInputs = [ TestFatal ]; - propagatedBuildInputs = [ DataOptList ]; + propagatedBuildInputs = [ DataOptList PackageStash ModuleRuntime ]; + }; + + ClassLoadXS = buildModule rec { + name = "Class-Load-XS-0.03"; + src = fetchurl { + url = "mirror://cpan/modules/by-module/Class/${name}.tar.gz"; + sha256 = "1k3fffm4z6hvml5gqh27p7l78xs220s2d7ybd2a42akxrx8gk9r8"; + }; + buildInputs = [ TestFatal ]; + propagatedBuildInputs = [ ClassLoad ]; }; ClassUnload = buildPerlPackage rec { @@ -2229,17 +2249,48 @@ rec { propagatedBuildInputs = [ version ]; }; + ModulePluggable = buildPerlPackage rec { + name = "Module-Pluggable-3.9"; + src = fetchurl { + url = "mirror://cpan/authors/id/S/SI/SIMONW/${name}.tar.gz"; + sha256 = "0psryh1dz828zly92db9zcv905n82in2awixzqngqhzg4y7fg4wc"; + }; + patches = [ + # !!! merge this patch into Perl itself (which contains Module::Pluggable as well) + ../development/perl-modules/module-pluggable.patch + ]; + }; + + ModulePluggableFast = buildPerlPackage { + name = "Module-Pluggable-Fast-0.18"; + src = fetchurl { + url = mirror://cpan/authors/id/S/SR/SRI/Module-Pluggable-Fast-0.18.tar.gz; + sha256 = "140c311x2darrc2p1drbkafv7qwhzdcff4ad300n6whsx4dfp6wr"; + }; + propagatedBuildInputs = [UNIVERSALrequire]; + }; + + ModuleRuntime = buildPerlPackage rec { + name = "Module-Runtime-0.011"; + src = fetchurl { + url = "mirror://cpan/modules/by-module/Module/${name}.tar.gz"; + sha256 = "0hbpn2jd11gsni77aw189ss4q83jlcvcxr49x9j28bh36hjgif7s"; + }; + propagatedBuildInputs = [ ParamsClassify ]; + }; + Moose = buildPerlPackage rec { - name = "Moose-2.0202"; + name = "Moose-2.0401"; src = fetchurl { url = "mirror://cpan/authors/id/D/DO/DOY/${name}.tar.gz"; - sha256 = "1xp0052ig06f5axw9djrq5ws8r9mcs4g1qs55yzgynl2hjrkazi4"; + sha256 = "07mx4xqfl0bk21kk49gs86ba3wcviarfx9yhxxw96pmaxd0l932i"; }; buildInputs = [ TestFatal TestRequires ]; propagatedBuildInputs = [ DataOptList DevelGlobalDestruction DistCheckConflicts EvalClosure ListMoreUtils MROCompat PackageDeprecationManager PackageStash PackageStashXS ParamsUtil SubExporter SubName TaskWeaken TryTiny + ClassLoad ClassLoadXS ]; }; @@ -2330,14 +2381,13 @@ rec { }; MooseXTraits = buildPerlPackage rec { - name = "MooseX-Traits-0.06"; + name = "MooseX-Traits-0.11"; src = fetchurl { url = "mirror://cpan/authors/id/F/FL/FLORA/${name}.tar.gz"; - sha256 = "1iqp4xyyz8v8668v3v1nqf35pi30xvysyjq1d2hz9i7nh2zbvlwf"; + sha256 = "0sqmpf2kw25847fwrrwpcfhrq694bgs8jbix7qxp9qyjm769np6n"; }; - propagatedBuildInputs = [ - ClassMOP Moose TestException TestUseOk - ]; + buildInputs = [ TestException TestUseOk ]; + propagatedBuildInputs = [ ClassMOP Moose NamespaceAutoclean ]; }; MooseXTraitsPluggable = buildPerlPackage rec { @@ -2352,10 +2402,10 @@ rec { }; MooseXTypes = buildPerlPackage rec { - name = "MooseX-Types-0.28"; + name = "MooseX-Types-0.30"; src = fetchurl { url = "mirror://cpan/authors/id/D/DR/DROLSKY/${name}.tar.gz"; - sha256 = "0wjqdxd2qlzgrvi4z2rl82xns9kh7m4chf9yzkj5il9g9gprwl57"; + sha256 = "1c9z30fbk2h11xkgq8v2idnpaqay3m7ig9bb8scnawgrm49v2f4l"; }; buildInputs = [ TestFatal TestRequires ]; propagatedBuildInputs = @@ -2574,24 +2624,33 @@ rec { }; PackageStash = buildPerlPackage rec { - name = "Package-Stash-0.31"; + name = "Package-Stash-0.33"; src = fetchurl { url = "mirror://cpan/authors/id/D/DO/DOY/${name}.tar.gz"; - sha256 = "0m5mibmy49gjhb5kvgyg2cfzs4d1ghav75f19x80s3bv6vr0ls6x"; + sha256 = "0md52rqgcnvspg3l2hvwc31jilq4gkbdwgr5h32gy1hmslaxhpzn"; }; buildInputs = [ TestFatal TestRequires ]; propagatedBuildInputs = [ DistCheckConflicts PackageDeprecationManager PackageStashXS ]; }; PackageStashXS = buildPerlPackage rec { - name = "Package-Stash-XS-0.23"; + name = "Package-Stash-XS-0.25"; src = fetchurl { url = "mirror://cpan/authors/id/D/DO/DOY/${name}.tar.gz"; - sha256 = "0dr86sbpb67dxbq64ix48f0n3dgac820ibci4xy4hbijja6lzwj6"; + sha256 = "1i45mhd17sfq41j62r8kkx2d2f4mi0sp6vl86mmk8a4ssq85i73k"; }; buildInputs = [ TestFatal ]; }; + ParamsClassify = buildPerlPackage rec { + name = "Params-Classify-0.013"; + src = fetchurl { + url = "mirror://cpan/modules/by-module/Params/${name}.tar.gz"; + sha256 = "1d4ysd95flszrxrnjgy6s7b80jkagjsb939h42i2hix4q20sy0a1"; + }; + buildInputs = [ ExtUtilsParseXS ]; + }; + ParamsUtil = buildPerlPackage rec { name = "Params-Util-1.01"; src = fetchurl { @@ -2716,10 +2775,10 @@ rec { }; Plack = buildPerlPackage rec { - name = "Plack-0.9984"; + name = "Plack-0.9985"; src = fetchurl { url = "mirror://cpan/authors/id/M/MI/MIYAGAWA/${name}.tar.gz"; - sha256 = "0xx200va9l6zimp2ybvbh1l3m80cdw03mfxqqf9k6v7cqvxir6pz"; + sha256 = "0cik1iwpwky7aliwi59z93ykd13ysp4xg5dps1vd4dhqylkn4ns8"; }; buildInputs = [ TestRequires TestTCP HTTPRequestAsCGI ]; propagatedBuildInputs = @@ -2764,27 +2823,6 @@ rec { }; }; - ModulePluggable = buildPerlPackage rec { - name = "Module-Pluggable-3.9"; - src = fetchurl { - url = "mirror://cpan/authors/id/S/SI/SIMONW/${name}.tar.gz"; - sha256 = "0psryh1dz828zly92db9zcv905n82in2awixzqngqhzg4y7fg4wc"; - }; - patches = [ - # !!! merge this patch into Perl itself (which contains Module::Pluggable as well) - ../development/perl-modules/module-pluggable.patch - ]; - }; - - ModulePluggableFast = buildPerlPackage { - name = "Module-Pluggable-Fast-0.18"; - src = fetchurl { - url = mirror://cpan/authors/id/S/SR/SRI/Module-Pluggable-Fast-0.18.tar.gz; - sha256 = "140c311x2darrc2p1drbkafv7qwhzdcff4ad300n6whsx4dfp6wr"; - }; - propagatedBuildInputs = [UNIVERSALrequire]; - }; - PadWalker = buildPerlPackage rec { name = "PadWalker-1.9"; src = fetchurl { From df05356c05c70b7396afe6afab13b8380da6a179 Mon Sep 17 00:00:00 2001 From: Shea Levy Date: Tue, 22 Nov 2011 17:05:18 +0000 Subject: [PATCH 678/970] Linux 3.1.2 svn path=/nixpkgs/trunk/; revision=30529 --- pkgs/os-specific/linux/kernel/linux-3.1.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/linux-3.1.nix b/pkgs/os-specific/linux/kernel/linux-3.1.nix index a06fd35b807..ad6a76a6816 100644 --- a/pkgs/os-specific/linux/kernel/linux-3.1.nix +++ b/pkgs/os-specific/linux/kernel/linux-3.1.nix @@ -205,7 +205,7 @@ in import ./generic.nix ( rec { - version = "3.1.1"; + version = "3.1.2"; preConfigure = '' substituteInPlace scripts/depmod.sh --replace '-b "$INSTALL_MOD_PATH"' "" @@ -213,7 +213,7 @@ import ./generic.nix ( src = fetchurl { url = "mirror://kernel/linux/kernel/v3.x/linux-${version}.tar.bz2"; - sha256 = "01ymsdq0c4fv1yxvxh17ccmsj8xl308j1n6rzrknaswb7gz2xp60"; + sha256 = "1h1k2rdk3a2vsjcm0vd0ihflv8znq09vzvllxzlw6fy1awfkainb"; }; config = configWithPlatform stdenv.platform; From 327715f5dfc0b3e3710b47ef3095ba457ba8ec74 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Tue, 22 Nov 2011 18:09:33 +0000 Subject: [PATCH 679/970] * Remove missing packages. svn path=/nixpkgs/trunk/; revision=30532 --- pkgs/top-level/release.nix | 5 ----- 1 file changed, 5 deletions(-) diff --git a/pkgs/top-level/release.nix b/pkgs/top-level/release.nix index 06d5faa261c..7381c23de7e 100644 --- a/pkgs/top-level/release.nix +++ b/pkgs/top-level/release.nix @@ -435,29 +435,24 @@ with (import ./release-lib.nix); */ linuxPackages_2_6_25 = { - aufs = linux; kernel = linux; }; linuxPackages_2_6_27 = { - aufs = linux; kernel = linux; virtualbox = linux; virtualboxGuestAdditions = linux; }; linuxPackages_2_6_28 = { - aufs = linux; kernel = linux; }; linuxPackages_2_6_29 = { - aufs = linux; kernel = linux; }; linuxPackages_2_6_31 = { - aufs = linux; kernel = linux; }; From d91e0ada98d8b8b5a493ee164eb73fa5b22248f4 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Tue, 22 Nov 2011 19:33:22 +0000 Subject: [PATCH 680/970] haskell-libmpd: updated to version 0.7.0 svn path=/nixpkgs/trunk/; revision=30533 --- pkgs/development/libraries/haskell/libmpd/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/libmpd/default.nix b/pkgs/development/libraries/haskell/libmpd/default.nix index b9fcaa86002..758a068453d 100644 --- a/pkgs/development/libraries/haskell/libmpd/default.nix +++ b/pkgs/development/libraries/haskell/libmpd/default.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "libmpd"; - version = "0.6.0"; - sha256 = "1ln7kfiv75ykihym9ska4mvy0mrghs4swsrrkvmbh562nqmv4fvm"; + version = "0.7.0"; + sha256 = "03bp3bpf1zr8srbzxjhppj7pba0h1if9lga7x5nvhlgc6p7799nw"; isLibrary = true; isExecutable = true; buildDepends = [ mtl network time utf8String ]; From 9670a4fdb19d3d2193474ce34903adaa07ec28ee Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Tue, 22 Nov 2011 20:16:23 +0000 Subject: [PATCH 681/970] haskell-packages: changed happy and haddock attributes to refer to the latest versions respectively. This change won't have much of an effect, though, because we override these attributes based on the compiler version that's used. svn path=/nixpkgs/trunk/; revision=30534 --- pkgs/top-level/haskell-packages.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix index a46687e8342..7bb0490b1e5 100644 --- a/pkgs/top-level/haskell-packages.nix +++ b/pkgs/top-level/haskell-packages.nix @@ -1407,12 +1407,12 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y); haddock_2_7_2 = callPackage ../development/tools/documentation/haddock/2.7.2.nix {}; haddock_2_9_2 = callPackage ../development/tools/documentation/haddock/2.9.2.nix {}; haddock_2_9_4 = callPackage ../development/tools/documentation/haddock/2.9.4.nix {}; - haddock = self.haddock_2_7_2; + haddock = self.haddock_2_9_4; happy_1_18_4 = callPackage ../development/tools/parsing/happy/1.18.4.nix {}; happy_1_18_5 = callPackage ../development/tools/parsing/happy/1.18.5.nix {}; happy_1_18_6 = callPackage ../development/tools/parsing/happy/1.18.6.nix {}; - happy = self.happy_1_18_4; + happy = self.happy_1_18_6; happyMeta = callPackage ../development/tools/haskell/happy-meta {}; From 68aaf3c843bc805b6ab7a21383766ff18786e1b3 Mon Sep 17 00:00:00 2001 From: Shea Levy Date: Wed, 23 Nov 2011 02:39:09 +0000 Subject: [PATCH 682/970] Include Apple's libtool in darwin-cctools-wrapper Packages which need GNU libtool should explicitly include it in buildInputs svn path=/nixpkgs/trunk/; revision=30535 --- pkgs/build-support/native-darwin-cctools-wrapper/builder.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/build-support/native-darwin-cctools-wrapper/builder.sh b/pkgs/build-support/native-darwin-cctools-wrapper/builder.sh index 411cb867a98..c79b3709ee8 100644 --- a/pkgs/build-support/native-darwin-cctools-wrapper/builder.sh +++ b/pkgs/build-support/native-darwin-cctools-wrapper/builder.sh @@ -1,6 +1,6 @@ source $stdenv/setup ensureDir $out/bin -for i in ar as c++filt gprof ld nm nmedit ranlib size strings strip dsymutil; do +for i in ar as c++filt gprof ld nm nmedit ranlib size strings strip dsymutil libtool; do ln -s /usr/bin/$i $out/bin/ done From 58fbba200cf978134b492e85359d8b439ba889cc Mon Sep 17 00:00:00 2001 From: Shea Levy Date: Wed, 23 Nov 2011 06:32:17 +0000 Subject: [PATCH 683/970] Add optional yaml support to ruby svn path=/nixpkgs/trunk/; revision=30536 --- pkgs/development/interpreters/ruby/ruby-19.nix | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/pkgs/development/interpreters/ruby/ruby-19.nix b/pkgs/development/interpreters/ruby/ruby-19.nix index d11c88d5e75..82e45a01c16 100644 --- a/pkgs/development/interpreters/ruby/ruby-19.nix +++ b/pkgs/development/interpreters/ruby/ruby-19.nix @@ -4,6 +4,7 @@ , gdbm, gdbmSupport ? true , ncurses, readline, cursesSupport ? false , groff, docSupport ? false +, libyaml, yamlSupport ? false }: let @@ -28,7 +29,8 @@ stdenv.mkDerivation rec { ++ (op docSupport groff ) ++ (op zlibSupport zlib) ++ (op opensslSupport openssl) - ++ (op gdbmSupport gdbm); + ++ (op gdbmSupport gdbm) + ++ (op yamlSupport libyaml); configureFlags = ["--enable-shared" "--enable-pthread"]; From 80fb6938eb6ff99399c76e12c09b0320960ee459 Mon Sep 17 00:00:00 2001 From: Shea Levy Date: Wed, 23 Nov 2011 06:41:03 +0000 Subject: [PATCH 684/970] Update rubygems svn path=/nixpkgs/trunk/; revision=30537 --- .../interpreters/ruby/generated.nix | 156 ++++++++++-------- 1 file changed, 84 insertions(+), 72 deletions(-) diff --git a/pkgs/development/interpreters/ruby/generated.nix b/pkgs/development/interpreters/ruby/generated.nix index 9615c30ff65..c1c49d7bf76 100644 --- a/pkgs/development/interpreters/ruby/generated.nix +++ b/pkgs/development/interpreters/ruby/generated.nix @@ -3,12 +3,12 @@ g: # Get dependencies from patched gems { aliases = { - actionmailer = g.actionmailer_3_1_1; - actionpack = g.actionpack_3_1_1; - activemodel = g.activemodel_3_1_1; - activerecord = g.activerecord_3_1_1; - activeresource = g.activeresource_3_1_1; - activesupport = g.activesupport_3_1_1; + actionmailer = g.actionmailer_3_1_3; + actionpack = g.actionpack_3_1_3; + activemodel = g.activemodel_3_1_3; + activerecord = g.activerecord_3_1_3; + activeresource = g.activeresource_3_1_3; + activesupport = g.activesupport_3_1_3; arel = g.arel_2_2_1; builder = g.builder_3_0_0; bundler = g.bundler_1_0_21; @@ -17,92 +17,92 @@ g: # Get dependencies from patched gems i18n = g.i18n_0_6_0; json = g.json_1_6_1; mail = g.mail_2_3_0; - mime_types = g.mime_types_1_16; + mime_types = g.mime_types_1_17_2; multi_json = g.multi_json_1_0_3; nix = g.nix_0_1_1; - polyglot = g.polyglot_0_3_2; - rack = g.rack_1_3_4; + polyglot = g.polyglot_0_3_3; + rack = g.rack_1_3_5; rack_cache = g.rack_cache_1_1; rack_mount = g.rack_mount_0_8_3; rack_ssl = g.rack_ssl_1_3_2; rack_test = g.rack_test_0_6_1; - rails = g.rails_3_1_1; - railties = g.railties_3_1_1; - rake = g.rake_0_9_2; - rdoc = g.rdoc_3_10; - sprockets = g.sprockets_2_0_2; + rails = g.rails_3_1_3; + railties = g.railties_3_1_3; + rake = g.rake_0_9_2_2; + rdoc = g.rdoc_3_11; + sprockets = g.sprockets_2_0_3; thor = g.thor_0_14_6; tilt = g.tilt_1_3_3; treetop = g.treetop_1_4_10; - tzinfo = g.tzinfo_0_3_30; + tzinfo = g.tzinfo_0_3_31; }; gem_nix_args = [ ''nix'' ''rails'' ''rake'' ]; gems = { - actionmailer_3_1_1 = { + actionmailer_3_1_3 = { basename = ''actionmailer''; meta = { description = ''Email composition, delivery, and receiving framework (part of Rails).''; homepage = ''http://www.rubyonrails.org''; longDescription = ''Email on Rails. Compose, deliver, receive, and test emails using the familiar controller/view pattern. First-class support for multipart email and attachments.''; }; - name = ''actionmailer-3.1.1''; + name = ''actionmailer-3.1.3''; requiredGems = [ g.mail_2_3_0 ]; - sha256 = ''0aa5vpaw8kr7id21wgslxjyxy9bygl5mjkjyn9mqg8qg7182dp0d''; + sha256 = ''04qjgf8irg2srqa9j0ahxpydx42h9dymiabfiyzwy0h3wayg2qyj''; }; - actionpack_3_1_1 = { + actionpack_3_1_3 = { basename = ''actionpack''; meta = { description = ''Web-flow and rendering framework putting the VC in MVC (part of Rails).''; homepage = ''http://www.rubyonrails.org''; longDescription = ''Web apps on Rails. Simple, battle-tested conventions for building and testing MVC web applications. Works with any Rack-compatible server.''; }; - name = ''actionpack-3.1.1''; - requiredGems = [ g.activemodel_3_1_1 g.rack_cache_1_1 g.rack_test_0_6_1 g.rack_mount_0_8_3 g.sprockets_2_0_2 g.erubis_2_7_0 ]; - sha256 = ''0hh4ndbi9kvkp1srad324vd9i7nhi8vqc0vhfh044jzwq1dvbqc6''; + name = ''actionpack-3.1.3''; + requiredGems = [ g.activemodel_3_1_3 g.rack_cache_1_1 g.rack_test_0_6_1 g.rack_mount_0_8_3 g.sprockets_2_0_3 g.erubis_2_7_0 ]; + sha256 = ''1awhqxdfg2zcb0b34jwq3sm2favay94n4glqywqzrn85wkf47a2q''; }; - activemodel_3_1_1 = { + activemodel_3_1_3 = { basename = ''activemodel''; meta = { description = ''A toolkit for building modeling frameworks (part of Rails).''; homepage = ''http://www.rubyonrails.org''; longDescription = ''A toolkit for building modeling frameworks like Active Record and Active Resource. Rich support for attributes, callbacks, validations, observers, serialization, internationalization, and testing.''; }; - name = ''activemodel-3.1.1''; + name = ''activemodel-3.1.3''; requiredGems = [ g.builder_3_0_0 g.i18n_0_6_0 ]; - sha256 = ''0r7zlzswf1vdhk97lll6kv64l0nya2li9gai19vd4qclh4m2n9n1''; + sha256 = ''1kpkr1gwvjbxc8q3n1ps1j8zf7m1258swb9n5zm5igr6j0d803a3''; }; - activerecord_3_1_1 = { + activerecord_3_1_3 = { basename = ''activerecord''; meta = { description = ''Object-relational mapper framework (part of Rails).''; homepage = ''http://www.rubyonrails.org''; longDescription = ''Databases on Rails. Build a persistent domain model by mapping database tables to Ruby classes. Strong conventions for associations, validations, aggregations, migrations, and testing come baked-in.''; }; - name = ''activerecord-3.1.1''; - requiredGems = [ g.arel_2_2_1 g.tzinfo_0_3_30 ]; - sha256 = ''1zab48wj04nyl01kkmmj23l5lwjid5mkhd92hpr3qf1r82zcj983''; + name = ''activerecord-3.1.3''; + requiredGems = [ g.arel_2_2_1 g.tzinfo_0_3_31 ]; + sha256 = ''0z2p51hm12alg6axih2mhxjsj8vmnvdqp3wwzcg9bbkp3fc368w0''; }; - activeresource_3_1_1 = { + activeresource_3_1_3 = { basename = ''activeresource''; meta = { description = ''REST modeling framework (part of Rails).''; homepage = ''http://www.rubyonrails.org''; longDescription = ''REST on Rails. Wrap your RESTful web app with Ruby classes and work with them like Active Record models.''; }; - name = ''activeresource-3.1.1''; + name = ''activeresource-3.1.3''; requiredGems = [ ]; - sha256 = ''04wk4s5a5iiyhd90m6bfs0vl92h3yf85vypfp79y3n0ybq7hd27w''; + sha256 = ''0hf3fi6zwk9zqzgk4rr95ax9mfzfkzpq28qw7fm2av6841wl54fg''; }; - activesupport_3_1_1 = { + activesupport_3_1_3 = { basename = ''activesupport''; meta = { description = ''A toolkit of support libraries and Ruby core extensions extracted from the Rails framework.''; homepage = ''http://www.rubyonrails.org''; longDescription = ''A toolkit of support libraries and Ruby core extensions extracted from the Rails framework. Rich support for multibyte strings, internationalization, time zones, and testing.''; }; - name = ''activesupport-3.1.1''; + name = ''activesupport-3.1.3''; requiredGems = [ g.multi_json_1_0_3 ]; - sha256 = ''1d9c0iqsngp7sib5jjvs2zlq8xwzi2yfc0kp6s9a7y6rm9k5f9f2''; + sha256 = ''19na7857adshdsswsgygky30r985ng100z3n78scd65481zcgb9z''; }; arel_2_2_1 = { basename = ''arel''; @@ -213,19 +213,33 @@ simple to do. Currently the following builder objects are supported: longDescription = ''A really Ruby Mail handler.''; }; name = ''mail-2.3.0''; - requiredGems = [ g.mime_types_1_16 g.treetop_1_4_10 ]; + requiredGems = [ g.mime_types_1_17_2 g.treetop_1_4_10 ]; sha256 = ''1cnid9wn5wy0d2shx4ykvgd5jrvgq55yal8i51b47d4037n1yr53''; }; - mime_types_1_16 = { + mime_types_1_17_2 = { basename = ''mime_types''; meta = { - description = ''Manages a MIME Content-Type database that will return the Content-Type for a given filename.''; + description = ''This library allows for the identification of a file's likely MIME content type''; homepage = ''http://mime-types.rubyforge.org/''; - longDescription = ''MIME::Types for Ruby originally based on and synchronized with MIME::Types for Perl by Mark Overmeer, copyright 2001 - 2009. As of version 1.15, the data format for the MIME::Type list has changed and the synchronization will no longer happen.''; + longDescription = ''This library allows for the identification of a file's likely MIME content +type. This is release 1.17.2. The identification of MIME content type is based +on a file's filename extensions. + +MIME::Types for Ruby originally based on and synchronized with MIME::Types for +Perl by Mark Overmeer, copyright 2001 - 2009. As of version 1.15, the data +format for the MIME::Type list has changed and the synchronization will no +longer happen. + +Homepage:: http://mime-types.rubyforge.org/ +GitHub:: http://github.com/halostatue/mime-types/ +Copyright:: 2002 - 2011, Austin Ziegler + Based in part on prior work copyright Mark Overmeer + +:include: License.rdoc''; }; - name = ''mime-types-1.16''; + name = ''mime-types-1.17.2''; requiredGems = [ ]; - sha256 = ''1slp7g2xv9ygcapqv13qgh3g6ipx5k5c3imb5sdyh0b9ip5s34y3''; + sha256 = ''0i4pmx86xbnlrhbbm9znnyfglmb21vwjvh262c6qw3m19w6ifs6p''; }; multi_json_1_0_3 = { basename = ''multi_json''; @@ -249,7 +263,7 @@ simple to do. Currently the following builder objects are supported: requiredGems = [ ]; sha256 = ''0kwrbkkg0gxibhsz9dpd5zabcf2wqsicg28yiazyb3dc9dslk26k''; }; - polyglot_0_3_2 = { + polyglot_0_3_3 = { basename = ''polyglot''; meta = { description = ''Augment 'require' to load non-Ruby file types''; @@ -259,11 +273,11 @@ The Polyglot library allows a Ruby module to register a loader for the file type associated with a filename extension, and it augments 'require' to find and load matching files.''; }; - name = ''polyglot-0.3.2''; + name = ''polyglot-0.3.3''; requiredGems = [ ]; - sha256 = ''0m2ni5bcwfmhjwndhy115zgcvq0wdf3hk0hal1sfidfz9vbd0hyz''; + sha256 = ''082zmail2h3cxd9z1wnibhk6aj4sb1f3zzwra6kg9bp51kx2c00v''; }; - rack_1_3_4 = { + rack_1_3_5 = { basename = ''rack''; meta = { description = ''a modular Ruby webserver interface''; @@ -277,9 +291,9 @@ middleware) into a single method call. Also see http://rack.rubyforge.org. ''; }; - name = ''rack-1.3.4''; + name = ''rack-1.3.5''; requiredGems = [ ]; - sha256 = ''17wil1sf8pinmbzlf05sfw48ry6x1hmgxq1im8fagjrf3p2rnzrl''; + sha256 = ''1qg5nqd3a8v52hfcr9885vyfc9sscykp72by1xb1c090l5pc68hp''; }; rack_cache_1_1 = { basename = ''rack_cache''; @@ -289,7 +303,7 @@ Also see http://rack.rubyforge.org. longDescription = ''HTTP Caching for Rack''; }; name = ''rack-cache-1.1''; - requiredGems = [ g.rack_1_3_4 ]; + requiredGems = [ g.rack_1_3_5 ]; sha256 = ''08jlym48qwfj7wddv0vpjj3vlc03q8wvbya24zbrjj8grgfgrvrl''; }; rack_mount_0_8_3 = { @@ -330,42 +344,40 @@ request helpers feature.''; requiredGems = [ ]; sha256 = ''0hq5q8fjhbb7szzrj7k0l21z025c4qsxqzd5qmgivikhymw10ws0''; }; - rails_3_1_1 = { + rails_3_1_3 = { basename = ''rails''; meta = { description = ''Full-stack web application framework.''; homepage = ''http://www.rubyonrails.org''; longDescription = ''Ruby on Rails is a full-stack web framework optimized for programmer happiness and sustainable productivity. It encourages beautiful code by favoring convention over configuration.''; }; - name = ''rails-3.1.1''; - requiredGems = [ g.activesupport_3_1_1 g.actionpack_3_1_1 g.activerecord_3_1_1 g.activeresource_3_1_1 g.actionmailer_3_1_1 g.railties_3_1_1 g.bundler_1_0_21 ]; - sha256 = ''0w8ab71f4b78mq8q7kbb5bfwsbzy4mnp82jckzwndkhxf9141js2''; + name = ''rails-3.1.3''; + requiredGems = [ g.activesupport_3_1_3 g.actionpack_3_1_3 g.activerecord_3_1_3 g.activeresource_3_1_3 g.actionmailer_3_1_3 g.railties_3_1_3 g.bundler_1_0_21 ]; + sha256 = ''07p8agfarj5nz8v1nlg1rfqy1cnqxhpakxhadfhk4sqrzlp2a5z8''; }; - railties_3_1_1 = { + railties_3_1_3 = { basename = ''railties''; meta = { description = ''Tools for creating, working with, and running Rails applications.''; homepage = ''http://www.rubyonrails.org''; longDescription = ''Rails internals: application bootup, plugins, generators, and rake tasks.''; }; - name = ''railties-3.1.1''; - requiredGems = [ g.rake_0_9_2 g.thor_0_14_6 g.rack_ssl_1_3_2 g.rdoc_3_10 ]; - sha256 = ''0xvspkv63xvm47daw13dn7p1nzhmlk0zmyw4mznazp44zvzkli63''; + name = ''railties-3.1.3''; + requiredGems = [ g.rake_0_9_2_2 g.thor_0_14_6 g.rack_ssl_1_3_2 g.rdoc_3_11 ]; + sha256 = ''07kgr9nzvgwpjqwssiknlqds1a9mj74g1hqpwsj6720x4pk9r13h''; }; - rake_0_9_2 = { + rake_0_9_2_2 = { basename = ''rake''; meta = { description = ''Ruby based make-like utility.''; homepage = ''http://rake.rubyforge.org''; - longDescription = '' Rake is a Make-like program implemented in Ruby. Tasks - and dependencies are specified in standard Ruby syntax. -''; + longDescription = ''Rake is a Make-like program implemented in Ruby. Tasks and dependencies arespecified in standard Ruby syntax.''; }; - name = ''rake-0.9.2''; + name = ''rake-0.9.2.2''; requiredGems = [ ]; - sha256 = ''1348lm18j0rki4zjgb4rgplai32j0izkvbbi66lk7n0z89dm4ny5''; + sha256 = ''19n4qp5gzbcqy9ajh56kgwqv9p9w2hnczhyvaqz0nlvk9diyng6q''; }; - rdoc_3_10 = { + rdoc_3_11 = { basename = ''rdoc''; meta = { description = ''RDoc produces HTML and command-line documentation for Ruby projects''; @@ -376,20 +388,20 @@ documentation. See RDoc for a description of RDoc's markup and basic use.''; }; - name = ''rdoc-3.10''; + name = ''rdoc-3.11''; requiredGems = [ g.json_1_6_1 ]; - sha256 = ''16cx357w9s9ijyl8pzd947dr6n7wnmm6cd0yxm4cy0hbjqafpn1k''; + sha256 = ''0wq8525v21pxcnwgn5ypblcsb0xasnicjnqqd7mrrfqm2g3k2frm''; }; - sprockets_2_0_2 = { + sprockets_2_0_3 = { basename = ''sprockets''; meta = { description = ''Rack-based asset packaging system''; homepage = ''http://getsprockets.org/''; longDescription = ''Sprockets is a Rack-based asset packaging system that concatenates and serves JavaScript, CoffeeScript, CSS, LESS, Sass, and SCSS.''; }; - name = ''sprockets-2.0.2''; + name = ''sprockets-2.0.3''; requiredGems = [ g.hike_1_2_1 g.tilt_1_3_3 ]; - sha256 = ''1wwpixlql2p9jq497g97iv0iw2fni7sldcxvfzz65df07pi54624''; + sha256 = ''1az22a7vjfhfglbn02np8lci6ww1lzgzs0i9qlfwx87ybp2227bi''; }; thor_0_14_6 = { basename = ''thor''; @@ -420,19 +432,19 @@ See RDoc for a description of RDoc's markup and basic use.''; homepage = ''http://functionalform.blogspot.com''; }; name = ''treetop-1.4.10''; - requiredGems = [ g.polyglot_0_3_2 ]; + requiredGems = [ g.polyglot_0_3_3 ]; sha256 = ''01f4w7fm6phhdbkx7bp0b58hrk3x4b0a63p2vvjbxm5gi2gv9ap2''; }; - tzinfo_0_3_30 = { + tzinfo_0_3_31 = { basename = ''tzinfo''; meta = { description = ''Daylight-savings aware timezone library''; homepage = ''http://tzinfo.rubyforge.org/''; longDescription = ''TZInfo is a Ruby library that uses the standard tz (Olson) database to provide daylight savings aware transformations between times in different time zones.''; }; - name = ''tzinfo-0.3.30''; + name = ''tzinfo-0.3.31''; requiredGems = [ ]; - sha256 = ''13zzcbbwkz5h9v7ik1xmwlp1bwnn5qpm37b3h2p2csa2j2n7nbaj''; + sha256 = ''1kwc25c1x8cvryjhpp8sx20vrd8h9g9gsl7p5393a88544qy41hb''; }; }; } From 1193eabfa13254b7d29ce7db24b7d38579045158 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Wed, 23 Nov 2011 09:21:20 +0000 Subject: [PATCH 685/970] git-annex: updated to version 3.20111122 svn path=/nixpkgs/trunk/; revision=30538 --- .../version-management/git-and-tools/git-annex/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/version-management/git-and-tools/git-annex/default.nix b/pkgs/applications/version-management/git-and-tools/git-annex/default.nix index cd1fe49228c..ead61030ea2 100644 --- a/pkgs/applications/version-management/git-and-tools/git-annex/default.nix +++ b/pkgs/applications/version-management/git-and-tools/git-annex/default.nix @@ -4,14 +4,14 @@ }: let - version = "3.20111107"; + version = "3.20111122"; in stdenv.mkDerivation { name = "git-annex-${version}"; src = fetchurl { url = "http://ftp.de.debian.org/debian/pool/main/g/git-annex/git-annex_${version}.tar.gz"; - sha256 = "335c90927bd3d434c1a088c6784b039fb7546810795c5d2d7d2a985cfa1e5ba0"; + sha256 = "b63fdd1fb890a388b9da8cc1037cefcb58e38ab4c7e3f27a7aec169ecbde6d2c"; }; buildInputs = [ From 6c02d31c689e8768ea9886ac0fe5d234e8660d0d Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Wed, 23 Nov 2011 15:59:09 +0000 Subject: [PATCH 686/970] * Bump. svn path=/nixpkgs/trunk/; revision=30544 --- pkgs/tools/package-management/nix/unstable.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/package-management/nix/unstable.nix b/pkgs/tools/package-management/nix/unstable.nix index d8056962d47..a9ff2eb769a 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.0pre30510"; + name = "nix-1.0pre30543"; src = fetchurl { - url = "http://hydra.nixos.org/build/1563803/download/4/${name}.tar.bz2"; - sha256 = "22f6b686a47e136d48c0d3b91a1311a30d39539e1282c664872dca6967e91384"; + url = "http://hydra.nixos.org/build/1568572/download/4/${name}.tar.bz2"; + sha256 = "72add30fe142c32aacc1c992456e663645685cf14d36ffa356bd469480cae4c3"; }; buildNativeInputs = [ perl pkgconfig ]; From 7a7fb5bc5a01155a96c0ae21c7d297f7c89b6fb4 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Thu, 24 Nov 2011 11:55:15 +0000 Subject: [PATCH 687/970] * Firefox 8.0.1. * Make Firefox 8 the default. svn path=/nixpkgs/trunk/; revision=30546 --- pkgs/applications/networking/browsers/firefox/8.0.nix | 6 +++--- pkgs/top-level/all-packages.nix | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/applications/networking/browsers/firefox/8.0.nix b/pkgs/applications/networking/browsers/firefox/8.0.nix index 8e60fa6bbb7..f7f715cb85b 100644 --- a/pkgs/applications/networking/browsers/firefox/8.0.nix +++ b/pkgs/applications/networking/browsers/firefox/8.0.nix @@ -15,14 +15,14 @@ assert stdenv.gcc ? libc && stdenv.gcc.libc != null; rec { - firefoxVersion = "8.0"; + firefoxVersion = "8.0.1"; - xulVersion = "8.0"; # this attribute is used by other packages + xulVersion = "8.0.1"; # this attribute is used by other packages src = fetchurl { url = "http://ftp.mozilla.org/pub/mozilla.org/firefox/nightly/${firefoxVersion}-candidates/build1/source/firefox-${firefoxVersion}.source.tar.bz2"; - sha1 = "843cf4ad70d2fc4b16654c3ff9b080d3eb357452"; + sha1 = "0dd207c5cee9d53114c55aa23eeca36b754bc128"; }; commonConfigureFlags = diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 8b4120b5539..63171c0f8a4 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -6645,7 +6645,7 @@ let firefoxWrapper = wrapFirefox { browser = pkgs.firefox; }; - firefoxPkgs = pkgs.firefox70Pkgs; + firefoxPkgs = pkgs.firefox80Pkgs; firefox36Pkgs = callPackage ../applications/networking/browsers/firefox/3.6.nix { inherit (gtkLibs) gtk pango; From b9214d9c8ca40c36392a939cd88b1ef607e09b00 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Thu, 24 Nov 2011 13:48:16 +0000 Subject: [PATCH 688/970] * Move libcgroup from libcg/ to libcgroup/. svn path=/nixpkgs/trunk/; revision=30547 --- pkgs/os-specific/linux/{libcg => libcgroup}/default.nix | 7 ++++--- pkgs/top-level/all-packages.nix | 2 +- 2 files changed, 5 insertions(+), 4 deletions(-) rename pkgs/os-specific/linux/{libcg => libcgroup}/default.nix (66%) diff --git a/pkgs/os-specific/linux/libcg/default.nix b/pkgs/os-specific/linux/libcgroup/default.nix similarity index 66% rename from pkgs/os-specific/linux/libcg/default.nix rename to pkgs/os-specific/linux/libcgroup/default.nix index 14f96eb15ae..aa73867122f 100644 --- a/pkgs/os-specific/linux/libcg/default.nix +++ b/pkgs/os-specific/linux/libcgroup/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchurl, pam, yacc, flex}: +{ stdenv, fetchurl, pam, yacc, flex }: stdenv.mkDerivation rec { name = "libcgroup-0.37.1"; @@ -11,9 +11,10 @@ stdenv.mkDerivation rec { buildInputs = [ pam ]; buildNativeInputs = [ yacc flex ]; + meta = { - description = "library that abstracts the control group file system in Linux"; - homepage = "http://libcg.sourceforge.net"; + description = "Library and tools to manage Linux's cgroup resource management system"; + homepage = http://libcg.sourceforge.net/; license = "LGPL"; platforms = stdenv.lib.platforms.linux; }; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 63171c0f8a4..ef1bae59922 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -5261,7 +5261,7 @@ let libatasmart = callPackage ../os-specific/linux/libatasmart { }; - libcgroup = callPackage ../os-specific/linux/libcg { }; + libcgroup = callPackage ../os-specific/linux/libcgroup { }; libnl = callPackage ../os-specific/linux/libnl { }; From ec390f4bbb19f4f0fd889f666772723caebb2d4a Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Thu, 24 Nov 2011 14:22:13 +0000 Subject: [PATCH 689/970] * Fix incorrect URL. svn path=/nixpkgs/trunk/; revision=30548 --- pkgs/applications/networking/browsers/firefox/8.0.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/applications/networking/browsers/firefox/8.0.nix b/pkgs/applications/networking/browsers/firefox/8.0.nix index f7f715cb85b..e56d2f1e1e6 100644 --- a/pkgs/applications/networking/browsers/firefox/8.0.nix +++ b/pkgs/applications/networking/browsers/firefox/8.0.nix @@ -21,7 +21,7 @@ rec { src = fetchurl { - url = "http://ftp.mozilla.org/pub/mozilla.org/firefox/nightly/${firefoxVersion}-candidates/build1/source/firefox-${firefoxVersion}.source.tar.bz2"; + url = "http://releases.mozilla.org/pub/mozilla.org/firefox/releases/${firefoxVersion}/source/firefox-${firefoxVersion}.source.tar.bz2"; sha1 = "0dd207c5cee9d53114c55aa23eeca36b754bc128"; }; From ab017a58c591801ddcfe209e9a0067f404f9dff5 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Thu, 24 Nov 2011 17:54:55 +0000 Subject: [PATCH 690/970] * Enable PROC_EVENTS, since it's required by libcgroup's cgrulesengd to monitor process creation. svn path=/nixpkgs/trunk/; revision=30549 --- pkgs/os-specific/linux/kernel/linux-2.6.35.nix | 5 +++++ pkgs/os-specific/linux/kernel/linux-3.0.nix | 5 +++++ pkgs/os-specific/linux/kernel/linux-3.1.nix | 5 +++++ pkgs/os-specific/linux/kernel/linux-3.2.nix | 5 +++++ 4 files changed, 20 insertions(+) diff --git a/pkgs/os-specific/linux/kernel/linux-2.6.35.nix b/pkgs/os-specific/linux/kernel/linux-2.6.35.nix index 7234c61e59b..e0a9a28d1bc 100644 --- a/pkgs/os-specific/linux/kernel/linux-2.6.35.nix +++ b/pkgs/os-specific/linux/kernel/linux-2.6.35.nix @@ -184,6 +184,11 @@ let # Allow up to 128 GiB of RAM in Xen domains. XEN_MAX_DOMAIN_MEMORY 128 + # PROC_EVENTS requires that the netlink connector is not built + # as a module. This is required by libcgroup's cgrulesengd. + CONNECTOR y + PROC_EVENTS y + ${if kernelPlatform ? kernelExtraConfig then kernelPlatform.kernelExtraConfig else ""} ${extraConfig} ''; diff --git a/pkgs/os-specific/linux/kernel/linux-3.0.nix b/pkgs/os-specific/linux/kernel/linux-3.0.nix index acdaf60a5fc..6474e5de4d6 100644 --- a/pkgs/os-specific/linux/kernel/linux-3.0.nix +++ b/pkgs/os-specific/linux/kernel/linux-3.0.nix @@ -197,6 +197,11 @@ let # they generally don't hurt. STAGING y + # PROC_EVENTS requires that the netlink connector is not built + # as a module. This is required by libcgroup's cgrulesengd. + CONNECTOR y + PROC_EVENTS y + ${if kernelPlatform ? kernelExtraConfig then kernelPlatform.kernelExtraConfig else ""} ${extraConfig} ''; diff --git a/pkgs/os-specific/linux/kernel/linux-3.1.nix b/pkgs/os-specific/linux/kernel/linux-3.1.nix index ad6a76a6816..720a5fa15f2 100644 --- a/pkgs/os-specific/linux/kernel/linux-3.1.nix +++ b/pkgs/os-specific/linux/kernel/linux-3.1.nix @@ -197,6 +197,11 @@ let # they generally don't hurt. STAGING y + # PROC_EVENTS requires that the netlink connector is not built + # as a module. This is required by libcgroup's cgrulesengd. + CONNECTOR y + PROC_EVENTS y + ${if kernelPlatform ? kernelExtraConfig then kernelPlatform.kernelExtraConfig else ""} ${extraConfig} ''; diff --git a/pkgs/os-specific/linux/kernel/linux-3.2.nix b/pkgs/os-specific/linux/kernel/linux-3.2.nix index 4067ee5ea85..50174526596 100644 --- a/pkgs/os-specific/linux/kernel/linux-3.2.nix +++ b/pkgs/os-specific/linux/kernel/linux-3.2.nix @@ -196,6 +196,11 @@ let # they generally don't hurt. STAGING y + # PROC_EVENTS requires that the netlink connector is not built + # as a module. This is required by libcgroup's cgrulesengd. + CONNECTOR y + PROC_EVENTS y + ${if kernelPlatform ? kernelExtraConfig then kernelPlatform.kernelExtraConfig else ""} ${extraConfig} ''; From 0d124624e8bc2e44e30a5acea50b45f3d979799e Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Thu, 24 Nov 2011 18:14:28 +0000 Subject: [PATCH 691/970] * NVIDIA driver updated to 290.10. svn path=/nixpkgs/trunk/; revision=30550 --- pkgs/os-specific/linux/nvidia-x11/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/os-specific/linux/nvidia-x11/default.nix b/pkgs/os-specific/linux/nvidia-x11/default.nix index 1fc65eb35ed..5b829db09cd 100644 --- a/pkgs/os-specific/linux/nvidia-x11/default.nix +++ b/pkgs/os-specific/linux/nvidia-x11/default.nix @@ -7,7 +7,7 @@ with stdenv.lib; -let versionNumber = "285.05.09"; in +let versionNumber = "290.10"; in stdenv.mkDerivation { name = "nvidia-x11-${versionNumber}${optionalString (!libsOnly) "-${kernel.version}"}"; @@ -18,12 +18,12 @@ stdenv.mkDerivation { if stdenv.system == "i686-linux" then fetchurl { url = "http://us.download.nvidia.com/XFree86/Linux-x86/${versionNumber}/NVIDIA-Linux-x86-${versionNumber}.run"; - sha256 = "15kgsfpv0jigm1v3vnhcagni694lqm55kqysslmvb090nsczl0yf"; + sha256 = "1amdqmgi8rf8mafc5d8jnw6rk1bxrmxc5jm4wm2p8xqzm99qzglr"; } else if stdenv.system == "x86_64-linux" then fetchurl { url = "http://us.download.nvidia.com/XFree86/Linux-x86_64/${versionNumber}/NVIDIA-Linux-x86_64-${versionNumber}-no-compat32.run"; - sha256 = "1zkgsjkhbx6dfmhhbflghbysr3icwfb5p6210xnhfss5dp2cvbwl"; + sha256 = "01d4cci1ipnamrxisdvsxjr6d4qbj257b46y0glm6grnw11i3x2g"; } else throw "nvidia-x11 does not support platform ${stdenv.system}"; From 845f2a8658af89c96c66a5989cf383a09ba8c56e Mon Sep 17 00:00:00 2001 From: Russell O'Connor Date: Thu, 24 Nov 2011 19:43:03 +0000 Subject: [PATCH 692/970] adding camlp5 as a propogated build input to ulex 0.8 matita and ulex must build against the same version of camlp5, so in an attempt to force them to always be the same I am adding a propgatedBuildInput to ulex. Granted Matita still requires camlp5_traditional and this is less obvious in the matita file now, so I am not entirely sure this is the right design choice. svn path=/nixpkgs/trunk/; revision=30552 --- pkgs/applications/science/logic/matita/default.nix | 4 ++-- pkgs/development/ocaml-modules/ulex/0.8/default.nix | 2 ++ pkgs/top-level/all-packages.nix | 1 - 3 files changed, 4 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/science/logic/matita/default.nix b/pkgs/applications/science/logic/matita/default.nix index 6ac672193e2..92e9479d9a4 100644 --- a/pkgs/applications/science/logic/matita/default.nix +++ b/pkgs/applications/science/logic/matita/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchurl, ocaml, camlp5, findlib, gdome2, ocaml_expat, gmetadom, ocaml_http, lablgtk, lablgtkmathview, ocaml_mysql, ocaml_sqlite3, ocamlnet, ulex08, camlzip, ocaml_pcre }: +{stdenv, fetchurl, ocaml, findlib, gdome2, ocaml_expat, gmetadom, ocaml_http, lablgtk, lablgtkmathview, ocaml_mysql, ocaml_sqlite3, ocamlnet, ulex08, camlzip, ocaml_pcre }: let ocaml_version = (builtins.parseDrvName ocaml.name).version; @@ -15,7 +15,7 @@ stdenv.mkDerivation { sha256 = "04sxklfak71khy1f07ks5c6163jbpxv6fmaw03fx8gwwlvpmzglh"; }; - buildInputs = [ocaml camlp5 findlib gdome2 ocaml_expat gmetadom ocaml_http lablgtk lablgtkmathview ocaml_mysql ocaml_sqlite3 ocamlnet ulex08 camlzip ocaml_pcre ]; + buildInputs = [ocaml findlib gdome2 ocaml_expat gmetadom ocaml_http lablgtk lablgtkmathview ocaml_mysql ocaml_sqlite3 ocamlnet ulex08 camlzip ocaml_pcre ]; postPatch = '' BASH=$(type -tp bash) diff --git a/pkgs/development/ocaml-modules/ulex/0.8/default.nix b/pkgs/development/ocaml-modules/ulex/0.8/default.nix index 169f3bfad8c..e996b6223b1 100644 --- a/pkgs/development/ocaml-modules/ulex/0.8/default.nix +++ b/pkgs/development/ocaml-modules/ulex/0.8/default.nix @@ -21,6 +21,8 @@ stdenv.mkDerivation { patches = [ ./meta_version.patch ./camlp5.patch ]; + propagatedBuildInputs = [ camlp5 ]; + buildFlags = "all all.opt"; meta = { diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index ef1bae59922..789edc93593 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -8240,7 +8240,6 @@ let matita = callPackage ../applications/science/logic/matita { inherit (ocamlPackages) findlib lablgtk ocaml_expat gmetadom ocaml_http lablgtkmathview ocaml_mysql ocaml_sqlite3 ocamlnet ulex08 camlzip ocaml_pcre; - camlp5 = ocamlPackages.camlp5_transitional; }; minisat = callPackage ../applications/science/logic/minisat {}; From c9b2f32c458c5099cd3a88cfbf516d1c4d0b7a8f Mon Sep 17 00:00:00 2001 From: Russell O'Connor Date: Thu, 24 Nov 2011 19:48:20 +0000 Subject: [PATCH 693/970] Updating bitcoin to version 0.5.0. svn path=/nixpkgs/trunk/; revision=30553 --- pkgs/applications/misc/bitcoin/default.nix | 30 ++++++++++----------- pkgs/tools/networking/miniupnpc/default.nix | 4 +-- pkgs/top-level/all-packages.nix | 4 +-- 3 files changed, 17 insertions(+), 21 deletions(-) diff --git a/pkgs/applications/misc/bitcoin/default.nix b/pkgs/applications/misc/bitcoin/default.nix index 9d9ddb056da..20a9bb99168 100644 --- a/pkgs/applications/misc/bitcoin/default.nix +++ b/pkgs/applications/misc/bitcoin/default.nix @@ -1,32 +1,30 @@ -{ fetchurl, stdenv, openssl, db4, boost, zlib, glib, libSM, gtk, wxGTK, miniupnpc }: +{ fetchurl, stdenv, openssl, db4, boost, zlib, miniupnpc, qt4 }: stdenv.mkDerivation rec { - version = "0.3.24"; + version = "0.5.0"; name = "bitcoin-${version}"; src = fetchurl { - url = "mirror://sourceforge/project/bitcoin/Bitcoin/${name}/${name}-src.tar.gz"; - sha256 = "18n8i37c478b275m2x82411i1fsw8l34qm1k65ynnw38fpaj4h3r"; + url = " https://github.com/bitcoin/bitcoin/tarball/v${version}"; + sha256 = "146q0ijvdmk9iidmavzkpdgflnfi86ahqkwdvxpf5gmfqdd53yqx"; }; - buildInputs = [ openssl db4 boost zlib glib libSM gtk wxGTK miniupnpc ]; + buildInputs = [ openssl db4 boost zlib miniupnpc qt4 ]; - preConfigure = '' + unpackCmd = "tar xvf $curSrc"; + + buildPhase = '' + qmake + make cd src - substituteInPlace makefile.unix \ - --replace "-Wl,-Bstatic" "" \ - --replace "-Wl,-Bdynamic" "" \ - --replace "DEBUGFLAGS=-g -D__WXDEBUG__" "DEBUGFLAGS=" \ + make -f makefile.unix + cd .. ''; - makefile = "makefile.unix"; - - buildFlags = "bitcoin bitcoind"; - installPhase = '' ensureDir $out/bin - cp bitcoin $out/bin - cp bitcoind $out/bin + cp bitcoin-qt $out/bin + cp src/bitcoind $out/bin ''; meta = { diff --git a/pkgs/tools/networking/miniupnpc/default.nix b/pkgs/tools/networking/miniupnpc/default.nix index 19ef811713a..1039cadb3ee 100644 --- a/pkgs/tools/networking/miniupnpc/default.nix +++ b/pkgs/tools/networking/miniupnpc/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl }: stdenv.mkDerivation rec { - name = "miniupnpc-1.5"; + name = "miniupnpc-1.6"; src = fetchurl { url = "http://miniupnp.free.fr/files/download.php?file=${name}.tar.gz"; - sha256 = "0mx950lfxcjpsfny8qcjx6phb74v4zw1rlj99xicd4icx5j0w3s4"; + sha256 = "151rh46axl44y7bbflb43pnj52gvlfnkxfgrn2jvai5gwrbbgmmv"; }; installFlags = "PREFIX=$(out) INSTALLPREFIX=$(out)"; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 789edc93593..e0c77757b35 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -6339,9 +6339,7 @@ let bitcoin = callPackage ../applications/misc/bitcoin { boost = boost144; - wxGTK = wxGTK290; - db4 = db47; - inherit (xlibs) libSM; + db4 = db48; }; bitlbee = callPackage ../applications/networking/instant-messengers/bitlbee { From a31ff3d00917e2daea4610d52793663fe17e36e0 Mon Sep 17 00:00:00 2001 From: Russell O'Connor Date: Thu, 24 Nov 2011 19:53:42 +0000 Subject: [PATCH 694/970] Forgot to add picosat to the all-packages.nix in revision 29869. Now I'm adding it. svn path=/nixpkgs/trunk/; revision=30554 --- pkgs/top-level/all-packages.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index e0c77757b35..2c715b650ac 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -8244,6 +8244,8 @@ let opensmt = callPackage ../applications/science/logic/opensmt { }; + picosat = callPackage ../applications/science/logic/picosat {}; + prover9 = callPackage ../applications/science/logic/prover9 { }; satallax = callPackage ../applications/science/logic/satallax {}; From a85f739d1a63e03b309a13d8667879a997622231 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Fri, 25 Nov 2011 12:35:33 +0000 Subject: [PATCH 695/970] * Add a patch to prevent Starman from changing its process name to "starman worker" or "starman master". This prevented libcgroup from determining the process name correctly. svn path=/nixpkgs/trunk/; revision=30556 --- .../starman-dont-change-name.patch | 23 +++++++++++++++++++ pkgs/top-level/perl-packages.nix | 1 + 2 files changed, 24 insertions(+) create mode 100644 pkgs/development/perl-modules/starman-dont-change-name.patch diff --git a/pkgs/development/perl-modules/starman-dont-change-name.patch b/pkgs/development/perl-modules/starman-dont-change-name.patch new file mode 100644 index 00000000000..82454cfdd16 --- /dev/null +++ b/pkgs/development/perl-modules/starman-dont-change-name.patch @@ -0,0 +1,23 @@ +Changing the process name breaks applying libcgroup rules, so don't do it. + +diff -ru -x '*~' Starman-0.2014-orig/lib/Starman/Server.pm Starman-0.2014/lib/Starman/Server.pm +--- Starman-0.2014-orig/lib/Starman/Server.pm 2011-08-27 01:19:43.000000000 +0200 ++++ Starman-0.2014/lib/Starman/Server.pm 2011-11-25 13:30:24.570434653 +0100 +@@ -100,7 +100,7 @@ + + sub run_parent { + my $self = shift; +- $0 = "starman master " . join(" ", @{$self->{options}{argv} || []}); ++ #$0 = "starman master " . join(" ", @{$self->{options}{argv} || []}); + $self->SUPER::run_parent(@_); + } + +@@ -113,7 +113,7 @@ + DEBUG && warn "[$$] Initializing the PSGI app\n"; + $self->{app} = $self->{options}->{psgi_app_builder}->(); + } +- $0 = "starman worker " . join(" ", @{$self->{options}{argv} || []}); ++ #$0 = "starman worker " . join(" ", @{$self->{options}{argv} || []}); + } + + sub post_accept_hook { diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 0266295f355..a993171ff8c 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -3024,6 +3024,7 @@ rec { url = "mirror://cpan/modules/by-module/Plack/${name}.tar.gz"; sha256 = "0hf3wpm2q4zcgjahjrpkkzy4fn74vkddg9yqs7p97xb290pvlbki"; }; + patches = [ ../development/perl-modules/starman-dont-change-name.patch ]; buildInputs = [ TestRequires TestTCP ]; propagatedBuildInputs = [ Plack DataDump HTTPParserXS NetServer ]; doCheck = false; # binds to various TCP ports1 From 6dfbee96ebd66c2477c426617877c5f5d2c2e00c Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Fri, 25 Nov 2011 13:44:24 +0000 Subject: [PATCH 696/970] haskell-hashtables: added version 1.0.0.0 svn path=/nixpkgs/trunk/; revision=30558 --- .../libraries/haskell/hashtables/default.nix | 18 ++++++++++++++++++ pkgs/top-level/haskell-packages.nix | 2 ++ 2 files changed, 20 insertions(+) create mode 100644 pkgs/development/libraries/haskell/hashtables/default.nix diff --git a/pkgs/development/libraries/haskell/hashtables/default.nix b/pkgs/development/libraries/haskell/hashtables/default.nix new file mode 100644 index 00000000000..809b0cefbf7 --- /dev/null +++ b/pkgs/development/libraries/haskell/hashtables/default.nix @@ -0,0 +1,18 @@ +{ cabal, hashable, primitive, vector }: + +cabal.mkDerivation (self: { + pname = "hashtables"; + version = "1.0.0.0"; + sha256 = "1i7hf7cfj1gqkb4h00a4frflxw3af7rdd1h0pdlv18clinsk6668"; + buildDepends = [ hashable primitive vector ]; + meta = { + homepage = "http://github.com/gregorycollins/hashtables"; + description = "Mutable hash tables in the ST monad"; + license = self.stdenv.lib.licenses.bsd3; + platforms = self.ghc.meta.platforms; + maintainers = [ + self.stdenv.lib.maintainers.andres + self.stdenv.lib.maintainers.simons + ]; + }; +}) diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix index 7bb0490b1e5..4f7da41cdb4 100644 --- a/pkgs/top-level/haskell-packages.nix +++ b/pkgs/top-level/haskell-packages.nix @@ -677,6 +677,8 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y); hashedStorage = callPackage ../development/libraries/haskell/hashed-storage {}; + hashtables = callPackage ../development/libraries/haskell/hashtables {}; + haskeline = callPackage ../development/libraries/haskell/haskeline {}; haskelineClass = callPackage ../development/libraries/haskell/haskeline-class {}; From ed494478f7e157aa46e662601a1b0ebeb3b74d80 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Fri, 25 Nov 2011 13:44:30 +0000 Subject: [PATCH 697/970] haskell-happy: added version 1.18.8 svn path=/nixpkgs/trunk/; revision=30559 --- .../tools/parsing/happy/1.18.8.nix | 21 +++++++++++++++++++ pkgs/top-level/haskell-packages.nix | 5 +++-- 2 files changed, 24 insertions(+), 2 deletions(-) create mode 100644 pkgs/development/tools/parsing/happy/1.18.8.nix diff --git a/pkgs/development/tools/parsing/happy/1.18.8.nix b/pkgs/development/tools/parsing/happy/1.18.8.nix new file mode 100644 index 00000000000..b1ba0b165dd --- /dev/null +++ b/pkgs/development/tools/parsing/happy/1.18.8.nix @@ -0,0 +1,21 @@ +{ cabal, mtl, perl }: + +cabal.mkDerivation (self: { + pname = "happy"; + version = "1.18.8"; + sha256 = "1mqdawxszmdk71fbl8ljxz7jyhai00sflaw0gahp039n44mrspam"; + isLibrary = false; + isExecutable = true; + buildDepends = [ mtl ]; + buildTools = [ perl ]; + meta = { + homepage = "http://www.haskell.org/happy/"; + description = "Happy is a parser generator for Haskell"; + license = self.stdenv.lib.licenses.bsd3; + platforms = self.ghc.meta.platforms; + maintainers = [ + self.stdenv.lib.maintainers.andres + self.stdenv.lib.maintainers.simons + ]; + }; +}) diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix index 4f7da41cdb4..366bf2e904e 100644 --- a/pkgs/top-level/haskell-packages.nix +++ b/pkgs/top-level/haskell-packages.nix @@ -150,7 +150,7 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y); random = self.random_1_0_0_3; # 7.2 ok, 7.3 ok cabalInstall = self.cabalInstall_0_10_2; # 7.2 fails, 7.3 fails alex = self.alex_3_0_1; # 7.2 ok, 7.3 ok - happy = self.happy_1_18_6; # 7.2 ok, 7.3 ok + happy = self.happy_1_18_8; # 7.2 ok, 7.3 ok haddock = self.haddock_2_9_2; # 7.2 fails, 7.3 fails }; @@ -1414,7 +1414,8 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y); happy_1_18_4 = callPackage ../development/tools/parsing/happy/1.18.4.nix {}; happy_1_18_5 = callPackage ../development/tools/parsing/happy/1.18.5.nix {}; happy_1_18_6 = callPackage ../development/tools/parsing/happy/1.18.6.nix {}; - happy = self.happy_1_18_6; + happy_1_18_8 = callPackage ../development/tools/parsing/happy/1.18.8.nix {}; + happy = self.happy_1_18_8; happyMeta = callPackage ../development/tools/haskell/happy-meta {}; From 167ec73929ad95acf670d927ec506222dea933b1 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Fri, 25 Nov 2011 13:44:35 +0000 Subject: [PATCH 698/970] haskell-Agda-executable: updated to version 2.3.0 svn path=/nixpkgs/trunk/; revision=30560 --- pkgs/development/compilers/Agda-executable/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/compilers/Agda-executable/default.nix b/pkgs/development/compilers/Agda-executable/default.nix index 02b1f0bfa93..1b772b8dc71 100644 --- a/pkgs/development/compilers/Agda-executable/default.nix +++ b/pkgs/development/compilers/Agda-executable/default.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "Agda-executable"; - version = "2.2.10"; - sha256 = "0jjlbz5vaz1pasfws1cy8wvllzdzv3sxm2lfj6bckl93kdrxlpy6"; + version = "2.3.0"; + sha256 = "1n1ak6z2vh356k9mk0zkiv6dqp9dvx97a7r21b0xnhwkmh3f8p5p"; isLibrary = false; isExecutable = true; buildDepends = [ Agda ]; From 6555a444d764dabfc417c40052f39c19ea80d7b1 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Fri, 25 Nov 2011 13:44:40 +0000 Subject: [PATCH 699/970] haskell-Agda: updated to version 2.3.0 svn path=/nixpkgs/trunk/; revision=30561 --- pkgs/development/libraries/haskell/Agda/default.nix | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/pkgs/development/libraries/haskell/Agda/default.nix b/pkgs/development/libraries/haskell/Agda/default.nix index eb40a854e32..724dabbab1b 100644 --- a/pkgs/development/libraries/haskell/Agda/default.nix +++ b/pkgs/development/libraries/haskell/Agda/default.nix @@ -1,15 +1,16 @@ -{ cabal, alex, binary, happy, haskeline, haskellSrcExts, mtl -, QuickCheck, syb, xhtml, zlib +{ cabal, alex, binary, happy, hashable, hashtables, haskeline +, haskellSrcExts, mtl, QuickCheck, syb, xhtml, zlib }: cabal.mkDerivation (self: { pname = "Agda"; - version = "2.2.10"; - sha256 = "1bh96g5c6b6jzaf3m9gm0vr64avgi86kb45p8i1vg1jbfjdbdlsw"; + version = "2.3.0"; + sha256 = "1p0cwf3d146z73gp49cm8fmk33hcbjsvyijbakm1871ssc5i73k0"; isLibrary = true; isExecutable = true; buildDepends = [ - binary haskeline haskellSrcExts mtl QuickCheck syb xhtml zlib + binary hashable hashtables haskeline haskellSrcExts mtl QuickCheck + syb xhtml zlib ]; buildTools = [ alex happy ]; meta = { From d683b4a22b7caf85fbde29cd465d39d3fe0ba76b Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Fri, 25 Nov 2011 13:44:44 +0000 Subject: [PATCH 700/970] haskell-gloss: updated to version 1.5.2.1 svn path=/nixpkgs/trunk/; revision=30562 --- pkgs/development/libraries/haskell/gloss/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/gloss/default.nix b/pkgs/development/libraries/haskell/gloss/default.nix index 495ecee2d7a..1b9fbb03da4 100644 --- a/pkgs/development/libraries/haskell/gloss/default.nix +++ b/pkgs/development/libraries/haskell/gloss/default.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "gloss"; - version = "1.5.0.2"; - sha256 = "01fd5yl5wdw09xqslmx8h563k2v8dglc60902kia8b5h62xjr1w6"; + version = "1.5.2.1"; + sha256 = "1mwk9gnkbjr76f9g79ixxlwzpsvmhflp5c8a0584fyypjg2r33n3"; buildDepends = [ bmp GLUT OpenGL ]; meta = { homepage = "http://gloss.ouroborus.net"; From 53510bff9a73c40189b8c5b1ae172205b1b49912 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Fri, 25 Nov 2011 13:44:48 +0000 Subject: [PATCH 701/970] haskell-hakyll: updated to version 3.2.2.0 svn path=/nixpkgs/trunk/; revision=30563 --- .../libraries/haskell/hakyll/default.nix | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/pkgs/development/libraries/haskell/hakyll/default.nix b/pkgs/development/libraries/haskell/hakyll/default.nix index 310e872b528..2fcb709f207 100644 --- a/pkgs/development/libraries/haskell/hakyll/default.nix +++ b/pkgs/development/libraries/haskell/hakyll/default.nix @@ -1,14 +1,15 @@ -{ cabal, binary, blazeHtml, cryptohash, hamlet, mtl, pandoc, parsec -, regexBase, regexPcre, snapCore, snapServer, tagsoup, time +{ cabal, binary, blazeHtml, citeprocHs, cryptohash, hamlet, mtl +, pandoc, parsec, regexBase, regexPcre, snapCore, snapServer +, tagsoup, time }: cabal.mkDerivation (self: { pname = "hakyll"; - version = "3.2.0.10"; - sha256 = "1hdivw1smfkxza5jl8gm84gnzb5a9sgc2lcas3hikv968p9c1yry"; + version = "3.2.2.0"; + sha256 = "0z7q99j3zqhck085s99sbj1qksra3rsmwimf44j49b59nqrn50va"; buildDepends = [ - binary blazeHtml cryptohash hamlet mtl pandoc parsec regexBase - regexPcre snapCore snapServer tagsoup time + binary blazeHtml citeprocHs cryptohash hamlet mtl pandoc parsec + regexBase regexPcre snapCore snapServer tagsoup time ]; meta = { homepage = "http://jaspervdj.be/hakyll"; From 83027a49c926e7c2859fd6ff0cf01d21c2edbe8f Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Fri, 25 Nov 2011 13:44:52 +0000 Subject: [PATCH 702/970] haskell-src-exts: dropped obsolete version 1.9.6 svn path=/nixpkgs/trunk/; revision=30564 --- .../haskell/haskell-src-exts/1.9.6.nix | 19 ------------------- .../{1.11.1.nix => default.nix} | 0 pkgs/top-level/haskell-packages.nix | 10 ++-------- 3 files changed, 2 insertions(+), 27 deletions(-) delete mode 100644 pkgs/development/libraries/haskell/haskell-src-exts/1.9.6.nix rename pkgs/development/libraries/haskell/haskell-src-exts/{1.11.1.nix => default.nix} (100%) diff --git a/pkgs/development/libraries/haskell/haskell-src-exts/1.9.6.nix b/pkgs/development/libraries/haskell/haskell-src-exts/1.9.6.nix deleted file mode 100644 index 42b69258397..00000000000 --- a/pkgs/development/libraries/haskell/haskell-src-exts/1.9.6.nix +++ /dev/null @@ -1,19 +0,0 @@ -{ cabal, cpphs, happy }: - -cabal.mkDerivation (self: { - pname = "haskell-src-exts"; - version = "1.9.6"; - sha256 = "1bdbjwhzms962ncwiszp82a8m6jkgz6d9cns5585kipy9n224d3h"; - buildDepends = [ cpphs ]; - buildTools = [ happy ]; - meta = { - homepage = "http://code.haskell.org/haskell-src-exts"; - description = "Manipulating Haskell source: abstract syntax, lexer, parser, and pretty-printer"; - license = self.stdenv.lib.licenses.bsd3; - platforms = self.ghc.meta.platforms; - maintainers = [ - self.stdenv.lib.maintainers.andres - self.stdenv.lib.maintainers.simons - ]; - }; -}) diff --git a/pkgs/development/libraries/haskell/haskell-src-exts/1.11.1.nix b/pkgs/development/libraries/haskell/haskell-src-exts/default.nix similarity index 100% rename from pkgs/development/libraries/haskell/haskell-src-exts/1.11.1.nix rename to pkgs/development/libraries/haskell/haskell-src-exts/default.nix diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix index 366bf2e904e..a2674b10f41 100644 --- a/pkgs/top-level/haskell-packages.nix +++ b/pkgs/top-level/haskell-packages.nix @@ -360,10 +360,7 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y); # Haskell libraries. - Agda = callPackage ../development/libraries/haskell/Agda { - syb = self.syb02; - haskellSrcExts = self.haskellSrcExts_1_9_6; - }; + Agda = callPackage ../development/libraries/haskell/Agda {}; ACVector = callPackage ../development/libraries/haskell/AC-Vector {}; @@ -690,10 +687,7 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y); haskellSrc_1_0_1_5 = callPackage ../development/libraries/haskell/haskell-src/1.0.1.5.nix {}; haskellSrc = self.haskellSrc_1_0_1_5; - # The old version is required for Agda. - haskellSrcExts_1_11_1 = callPackage ../development/libraries/haskell/haskell-src-exts/1.11.1.nix {}; - haskellSrcExts_1_9_6 = callPackage ../development/libraries/haskell/haskell-src-exts/1.9.6.nix {}; - haskellSrcExts = self.haskellSrcExts_1_11_1; + haskellSrcExts = callPackage ../development/libraries/haskell/haskell-src-exts/default.nix {}; haskellSrcMeta = callPackage ../development/libraries/haskell/haskell-src-meta {}; From a7b50dc5de0bcb3fda7b256ffce7e1a6026654ca Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Fri, 25 Nov 2011 17:01:54 +0000 Subject: [PATCH 703/970] * Do an "exec" to get rid of an unnecessary shell. svn path=/nixpkgs/trunk/; revision=30566 --- pkgs/applications/networking/browsers/firefox/8.0.nix | 2 +- pkgs/applications/networking/browsers/firefox/9.0.nix | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/browsers/firefox/8.0.nix b/pkgs/applications/networking/browsers/firefox/8.0.nix index e56d2f1e1e6..823d6e0cbd2 100644 --- a/pkgs/applications/networking/browsers/firefox/8.0.nix +++ b/pkgs/applications/networking/browsers/firefox/8.0.nix @@ -161,7 +161,7 @@ rec { file $i; if file $i | grep executable &>/dev/null; then rm "$out/bin/$(basename "$i")" - echo -e '#! /bin/sh\n"'"$i"'" "$@"' > "$out/bin/$(basename "$i")" + echo -e '#! /bin/sh\nexec "'"$i"'" "$@"' > "$out/bin/$(basename "$i")" chmod a+x "$out/bin/$(basename "$i")" fi; done; diff --git a/pkgs/applications/networking/browsers/firefox/9.0.nix b/pkgs/applications/networking/browsers/firefox/9.0.nix index a0d32691451..f14eb05899d 100644 --- a/pkgs/applications/networking/browsers/firefox/9.0.nix +++ b/pkgs/applications/networking/browsers/firefox/9.0.nix @@ -161,7 +161,7 @@ rec { file $i; if file $i | grep executable &>/dev/null; then rm "$out/bin/$(basename "$i")" - echo -e '#! /bin/sh\n"'"$i"'" "$@"' > "$out/bin/$(basename "$i")" + echo -e '#! /bin/sh\nexec "'"$i"'" "$@"' > "$out/bin/$(basename "$i")" chmod a+x "$out/bin/$(basename "$i")" fi; done; From 88a8730beb1315297f96b816239524185839c2b2 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Sat, 26 Nov 2011 13:06:36 +0000 Subject: [PATCH 704/970] haskell-iteratee: added version 0.8.7.3 svn path=/nixpkgs/trunk/; revision=30572 --- .../libraries/haskell/iteratee/default.nix | 23 +++++++++++++++++++ pkgs/top-level/haskell-packages.nix | 2 ++ 2 files changed, 25 insertions(+) create mode 100644 pkgs/development/libraries/haskell/iteratee/default.nix diff --git a/pkgs/development/libraries/haskell/iteratee/default.nix b/pkgs/development/libraries/haskell/iteratee/default.nix new file mode 100644 index 00000000000..e56ff8890b6 --- /dev/null +++ b/pkgs/development/libraries/haskell/iteratee/default.nix @@ -0,0 +1,23 @@ +{ cabal, ListLike, MonadCatchIOTransformers, parallel, transformers +}: + +cabal.mkDerivation (self: { + pname = "iteratee"; + version = "0.8.7.3"; + sha256 = "1aqrqsd4q3isvv8dxaq61sgkns6lr7xabmllxp717f1jrnij7f54"; + isLibrary = true; + isExecutable = true; + buildDepends = [ + ListLike MonadCatchIOTransformers parallel transformers + ]; + meta = { + homepage = "http://www.tiresiaspress.us/haskell/iteratee"; + description = "Iteratee-based I/O"; + license = self.stdenv.lib.licenses.bsd3; + platforms = self.ghc.meta.platforms; + maintainers = [ + self.stdenv.lib.maintainers.andres + self.stdenv.lib.maintainers.simons + ]; + }; +}) diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix index a2674b10f41..d73aac05155 100644 --- a/pkgs/top-level/haskell-packages.nix +++ b/pkgs/top-level/haskell-packages.nix @@ -802,6 +802,8 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y); parsec = self.parsec2; }; + iteratee = callPackage ../development/libraries/haskell/iteratee {}; + ivor = callPackage ../development/libraries/haskell/ivor {}; jpeg = callPackage ../development/libraries/haskell/jpeg {}; From 499b2c47d9f419f01e1bf9e9faf50942c8d03a5c Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Sat, 26 Nov 2011 13:06:42 +0000 Subject: [PATCH 705/970] haskell-hakyll: updated to version 3.2.3.0 svn path=/nixpkgs/trunk/; revision=30573 --- pkgs/development/libraries/haskell/hakyll/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/hakyll/default.nix b/pkgs/development/libraries/haskell/hakyll/default.nix index 2fcb709f207..9fc4246442b 100644 --- a/pkgs/development/libraries/haskell/hakyll/default.nix +++ b/pkgs/development/libraries/haskell/hakyll/default.nix @@ -5,8 +5,8 @@ cabal.mkDerivation (self: { pname = "hakyll"; - version = "3.2.2.0"; - sha256 = "0z7q99j3zqhck085s99sbj1qksra3rsmwimf44j49b59nqrn50va"; + version = "3.2.3.0"; + sha256 = "15s66sr6y7k01yy01411r38hg1vyyv7yqaj8s44n5qzl0yln9gq8"; buildDepends = [ binary blazeHtml citeprocHs cryptohash hamlet mtl pandoc parsec regexBase regexPcre snapCore snapServer tagsoup time From bf394d80ec1d03bbed699c42f98bdba2ab71913c Mon Sep 17 00:00:00 2001 From: Marco Maggesi Date: Sat, 26 Nov 2011 18:45:15 +0000 Subject: [PATCH 706/970] Update url for Isabelle2011 svn path=/nixpkgs/trunk/; revision=30574 --- pkgs/applications/science/logic/isabelle/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/applications/science/logic/isabelle/default.nix b/pkgs/applications/science/logic/isabelle/default.nix index 5705262f377..7cfe5f92736 100644 --- a/pkgs/applications/science/logic/isabelle/default.nix +++ b/pkgs/applications/science/logic/isabelle/default.nix @@ -12,7 +12,7 @@ stdenv.mkDerivation { inherit name theories; src = fetchurl { - url = "http://www.cl.cam.ac.uk/research/hvg/${pname}/dist/${name}.tar.gz"; + url = http://isabelle.in.tum.de/website-Isabelle2011/dist/Isabelle2011.tar.gz; sha256 = "ea85eb2a859891be387f020b2e45f8c9a0bd1d8bbc3902f28a429e9c61cb0b6a"; }; From 8d4b5bcd0c36cf7eed50a8b58d29f8a0eb654071 Mon Sep 17 00:00:00 2001 From: Marco Maggesi Date: Sat, 26 Nov 2011 19:39:14 +0000 Subject: [PATCH 707/970] Upgrade camlp5 to version 6.02.3-1 (contributed by Russell O'Connor). Keep the old version 5.15 to allow a smooth migration. svn path=/nixpkgs/trunk/; revision=30575 --- pkgs/development/tools/ocaml/camlp5/5.15.nix | 44 +++++++++++++++++++ .../tools/ocaml/camlp5/default.nix | 11 ++++- pkgs/top-level/all-packages.nix | 20 ++++++--- 3 files changed, 68 insertions(+), 7 deletions(-) create mode 100644 pkgs/development/tools/ocaml/camlp5/5.15.nix diff --git a/pkgs/development/tools/ocaml/camlp5/5.15.nix b/pkgs/development/tools/ocaml/camlp5/5.15.nix new file mode 100644 index 00000000000..7247041cb1d --- /dev/null +++ b/pkgs/development/tools/ocaml/camlp5/5.15.nix @@ -0,0 +1,44 @@ +{stdenv, fetchurl, ocaml, transitional ? false}: + +let + ocaml_version = (builtins.parseDrvName ocaml.name).version; + pname = "camlp5"; + version = "5.15"; + webpage = http://pauillac.inria.fr/~ddr/camlp5/; + metafile = ./META; +in + +stdenv.mkDerivation { + + name = "${pname}${if transitional then "_transitional" else ""}-${version}"; + + src = fetchurl { + url = "${webpage}/distrib/src/${pname}-${version}.tgz"; + sha256 = "1sx5wlfpydqskm97gp7887p3avbl3vanlmrwj35wx5mbzj6kn9nq"; + }; + + buildInputs = [ ocaml ]; + + prefixKey = "-prefix "; + + preConfigure = "configureFlagsArray=(" + (if transitional then "--transitional" else "--strict") + + " --libdir $out/lib/ocaml/${ocaml_version}/site-lib)"; + + buildFlags = "world.opt"; + + postInstall = "cp ${metafile} $out/lib/ocaml/${ocaml_version}/site-lib/camlp5/META"; + + meta = { + description = "Preprocessor-pretty-printer for OCaml"; + longDescription = '' + Camlp5 is a preprocessor and pretty-printer for OCaml programs. + It also provides parsing and printing tools. + ''; + homepage = "${webpage}"; + license = "BSD"; + platforms = ocaml.meta.platforms; + maintainers = [ + stdenv.lib.maintainers.z77z + ]; + }; +} diff --git a/pkgs/development/tools/ocaml/camlp5/default.nix b/pkgs/development/tools/ocaml/camlp5/default.nix index 7247041cb1d..315bca38f36 100644 --- a/pkgs/development/tools/ocaml/camlp5/default.nix +++ b/pkgs/development/tools/ocaml/camlp5/default.nix @@ -3,7 +3,7 @@ let ocaml_version = (builtins.parseDrvName ocaml.name).version; pname = "camlp5"; - version = "5.15"; + version = "6.02.3"; webpage = http://pauillac.inria.fr/~ddr/camlp5/; metafile = ./META; in @@ -14,9 +14,16 @@ stdenv.mkDerivation { src = fetchurl { url = "${webpage}/distrib/src/${pname}-${version}.tgz"; - sha256 = "1sx5wlfpydqskm97gp7887p3avbl3vanlmrwj35wx5mbzj6kn9nq"; + sha256 = "1z9bwh267117br0vlhirv9yy2niqp2n25zfnl14wg6kgg9bqx7rj"; }; + patches = fetchurl { + url = "${webpage}/distrib/src/patch-${version}-1"; + sha256 = "159qpvr07mnn72yqwx24c6mw7hs6bl77capsii7apg9dcxar8w7v"; + }; + + patchFlags = "-p 0"; + buildInputs = [ ocaml ]; prefixKey = "-prefix "; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 2c715b650ac..dd577a0c472 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -2342,12 +2342,22 @@ let camlidl = callPackage ../development/tools/ocaml/camlidl { }; - camlp5_strict = callPackage ../development/tools/ocaml/camlp5 { }; + camlp5_5_strict = callPackage ../development/tools/ocaml/camlp5/5.15.nix { }; - camlp5_transitional = callPackage ../development/tools/ocaml/camlp5 { + camlp5_5_transitional = callPackage ../development/tools/ocaml/camlp5/5.15.nix { transitional = true; }; + camlp5_6_strict = callPackage ../development/tools/ocaml/camlp5 { }; + + camlp5_6_transitional = callPackage ../development/tools/ocaml/camlp5 { + transitional = true; + }; + + camlp5_strict = camlp5_6_strict; + + camlp5_transitional = camlp5_6_transitional; + camlzip = callPackage ../development/ocaml-modules/camlzip { }; camomile_0_8_2 = callPackage ../development/ocaml-modules/camomile/0.8.2.nix { }; @@ -2398,7 +2408,7 @@ let ounit = callPackage ../development/ocaml-modules/ounit { }; ulex08 = callPackage ../development/ocaml-modules/ulex/0.8 { - camlp5 = camlp5_transitional; + camlp5 = camlp5_5_transitional; }; }; @@ -8206,7 +8216,7 @@ let coq = callPackage ../applications/science/logic/coq { inherit (ocamlPackages) findlib lablgtk; - camlp5 = ocamlPackages.camlp5_transitional; + camlp5 = ocamlPackages.camlp5_5_transitional; }; cvc3 = callPackage ../applications/science/logic/cvc3 {}; @@ -8253,7 +8263,7 @@ let spass = callPackage ../applications/science/logic/spass {}; ssreflect = callPackage ../applications/science/logic/ssreflect { - camlp5 = ocamlPackages.camlp5_transitional; + camlp5 = ocamlPackages.camlp5_5_transitional; }; tptp = callPackage ../applications/science/logic/tptp {}; From 59346f354a8244e41d674c4b794ace210536f1bf Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Sun, 27 Nov 2011 12:48:40 +0000 Subject: [PATCH 708/970] haskell-http-types: updated to version 0.6.7 svn path=/nixpkgs/trunk/; revision=30576 --- pkgs/development/libraries/haskell/http-types/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/http-types/default.nix b/pkgs/development/libraries/haskell/http-types/default.nix index 6e179063c8d..1006d2fd2c3 100644 --- a/pkgs/development/libraries/haskell/http-types/default.nix +++ b/pkgs/development/libraries/haskell/http-types/default.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "http-types"; - version = "0.6.6"; - sha256 = "1x1jgfh399a88dc3ms6va12lvq9iih1shxmqm08xzz4fly6v4k7r"; + version = "0.6.7"; + sha256 = "04bmw5k9gvlh7x4ggmwz7pdc1ik3va0v4icg7nv47ab2w2pn88pb"; isLibrary = true; isExecutable = true; buildDepends = [ blazeBuilder caseInsensitive text ]; From 23d4fe544f9d332886fb7eb03357d74e6335735b Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Sun, 27 Nov 2011 12:48:44 +0000 Subject: [PATCH 709/970] haskell-clientsession: updated to version 0.7.3.4 svn path=/nixpkgs/trunk/; revision=30577 --- .../libraries/haskell/clientsession/default.nix | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/pkgs/development/libraries/haskell/clientsession/default.nix b/pkgs/development/libraries/haskell/clientsession/default.nix index d4f89de0466..108fe980887 100644 --- a/pkgs/development/libraries/haskell/clientsession/default.nix +++ b/pkgs/development/libraries/haskell/clientsession/default.nix @@ -1,12 +1,13 @@ -{ cabal, base64Bytestring, cereal, cryptoApi, cryptocipher, skein +{ cabal, base64Bytestring, cereal, cryptoApi, cryptocipher, entropy +, skein }: cabal.mkDerivation (self: { pname = "clientsession"; - version = "0.7.3.3"; - sha256 = "0cfj225hzn8fsffwnq5zq55dh9m5av1i58b4njhna7miiz6b4jsq"; + version = "0.7.3.4"; + sha256 = "16blm8p0c2hk06yn5f5qmrrxwsrsdv7l7x1s07ygn8s9jmb9xyqr"; buildDepends = [ - base64Bytestring cereal cryptoApi cryptocipher skein + base64Bytestring cereal cryptoApi cryptocipher entropy skein ]; meta = { homepage = "http://github.com/snoyberg/clientsession/tree/master"; From 9ac48a630ebcd9993f4f68e74b8e46f3aa397ebb Mon Sep 17 00:00:00 2001 From: Karn Kallio Date: Sun, 27 Nov 2011 23:58:46 +0000 Subject: [PATCH 710/970] Add OPA to Nixpkgs. svn path=/nixpkgs/trunk/; revision=30578 --- pkgs/development/compilers/opa/default.nix | 63 +++++++++++++ pkgs/development/compilers/opa/libdir.patch | 93 +++++++++++++++++++ pkgs/development/compilers/opa/locate.patch | 14 +++ pkgs/development/ocaml-modules/cryptokit/META | 8 -- .../ocaml-modules/cryptokit/default.nix | 30 ++---- .../ocaml-modules/cryptokit/makefile.patch | 21 ----- .../ocaml-modules/ocamlgraph/default.nix | 40 ++++++++ .../ocaml-modules/ocamlgraph/destdir.patch | 13 +++ .../ocaml-modules/ulex/default.nix | 2 + pkgs/top-level/all-packages.nix | 6 ++ 10 files changed, 238 insertions(+), 52 deletions(-) create mode 100644 pkgs/development/compilers/opa/default.nix create mode 100644 pkgs/development/compilers/opa/libdir.patch create mode 100644 pkgs/development/compilers/opa/locate.patch delete mode 100644 pkgs/development/ocaml-modules/cryptokit/META delete mode 100644 pkgs/development/ocaml-modules/cryptokit/makefile.patch create mode 100644 pkgs/development/ocaml-modules/ocamlgraph/default.nix create mode 100644 pkgs/development/ocaml-modules/ocamlgraph/destdir.patch diff --git a/pkgs/development/compilers/opa/default.nix b/pkgs/development/compilers/opa/default.nix new file mode 100644 index 00000000000..3f6e3956f36 --- /dev/null +++ b/pkgs/development/compilers/opa/default.nix @@ -0,0 +1,63 @@ +{ stdenv, fetchurl, which, ocaml, perl, jdk +, findlib, ocaml_ssl, openssl, cryptokit, camlzip, ulex +, ocamlgraph, coreutils, zlib, ncurses, makeWrapper +, gcc, binutils, gnumake } : + +stdenv.mkDerivation rec { + pname = "opa"; + version = "962"; + name = "${pname}-${version}"; + + src = fetchurl { + url = "https://github.com/MLstate/opalang/tarball/v${version}"; + name = "opa-${version}.tar.gz"; + sha256 = "0g4kq2kxbld0iqlzb076b7g43d8fh4sfxam615z15mbk1jcvpf9l"; + }; + + # Paths so the opa compiler code generation will use the same programs as were + # used to build opa. + codeGeneratorPaths = "${ocaml}/bin:${gcc}/bin:${binutils}/bin:${gnumake}/bin"; + + prePatch = '' + find . -type f -exec sed -i 's@/usr/bin/env@${coreutils}/bin/env@' {} \; + find . -type f -exec sed -i 's@/usr/bin/perl@${perl}/bin/perl@' {} \; + ''; + + patches = [ ./locate.patch ./libdir.patch ]; + + preConfigure = '' + configureFlags="$configureFlags -prefix $out" + ''; + + dontAddPrefix = true; + + configureFlags = "-ocamlfind ${findlib}/bin/ocamlfind -openssl ${openssl}/lib"; + + buildInputs = [ which ocaml perl jdk findlib ocaml_ssl openssl cryptokit camlzip ulex + ocamlgraph coreutils zlib ncurses makeWrapper gcc binutils gnumake ]; + + postInstall = '' + # Have compiler use same tools for code generation as used to build it. + for p in $out/bin/opa ; do + wrapProgram $p --prefix PATH ":" "${codeGeneratorPaths}" ; + done + + # Install emacs mode. + ensureDir $out/share/emacs/site-lisp/opa + install -m 0644 -v ./utils/emacs/{opa-mode.el,site-start.el} $out/share/emacs/site-lisp/opa + ''; + + meta = { + description = "Opa is a concise and elegant language for writing distributed web applications. Both client and server sides."; + longDescription = '' + Opa is a new generation of web development platform that lets you write distributed + web applications using a single technology. Among the the many features of Opa are these: + Opa is concise, simple, concurrent, dynamically distributed, and secure. + ''; + + homepage = http://opalang.org/; + license = stdenv.lib.licenses.gpl3; + maintainers = [ stdenv.lib.maintainers.kkallio ]; + platforms = "x86_64-linux"; + }; +} diff --git a/pkgs/development/compilers/opa/libdir.patch b/pkgs/development/compilers/opa/libdir.patch new file mode 100644 index 00000000000..05c8a89afa8 --- /dev/null +++ b/pkgs/development/compilers/opa/libdir.patch @@ -0,0 +1,93 @@ +These patches have the compiler place path flags in various places so that +ocaml and c libraries are found in their Nixpkgs locations. + +diff -x '*~' -Naur MLstate-opalang-6b295a9//build_rules.ml MLstate-opalang-6b295a9-new//build_rules.ml +--- MLstate-opalang-6b295a9//build_rules.ml 2011-11-21 08:07:04.000000000 -0430 ++++ MLstate-opalang-6b295a9-new//build_rules.ml 2011-11-27 00:34:35.845277134 -0430 +@@ -373,7 +373,11 @@ + | Some dep -> dep::list + ) (tags_of_pathname (env "%.opa_plugin")) [] + in +- let lib_dir s = [A"--ml";A"-I";A"--ml";P (if Pathname.exists s then ".." / s else ("+"^s))] in ++ let cryptokitdir_opt = function ++ | Some path -> path ++ | None -> "" ++ in ++ let lib_dir s = [A"--ml";A"-I";A"--ml";P (if Pathname.exists s then ".." / s else (if s = "cryptokit" then (cryptokitdir_opt Config.Libdir.cryptokit) else ("+"^s)))] in + let include_dirs = List.flatten (List.map lib_dir caml_use_lib) in + let files = List.map ((^) path) files in + build_list build files; +diff -x '*~' -Naur MLstate-opalang-6b295a9//config.mli MLstate-opalang-6b295a9-new//config.mli +--- MLstate-opalang-6b295a9//config.mli 2011-11-21 08:07:04.000000000 -0430 ++++ MLstate-opalang-6b295a9-new//config.mli 2011-11-27 00:30:39.312443906 -0430 +@@ -43,6 +43,9 @@ + (** Flag for Dbm present *) + val has_dbm : bool + ++(** openssh link directory *) ++val openssl : string option ++ + (** library directories, if the libs are enabled *) + val libnatpmp : (string*string*string) option (** name of the lib, lib dir, include dir *) + +diff -x '*~' -Naur MLstate-opalang-6b295a9//configure MLstate-opalang-6b295a9-new//configure +--- MLstate-opalang-6b295a9//configure 2011-11-21 08:07:04.000000000 -0430 ++++ MLstate-opalang-6b295a9-new//configure 2011-11-27 00:40:52.496151405 -0430 +@@ -27,6 +27,7 @@ + + NO_CAMLIDL=1 + NO_DBM=1 ++CONFIG_LIB_OPENSSL="" + + while [ $# -gt 0 ]; do + case "$1" in +@@ -51,6 +52,11 @@ + shift + OCAMLOPT=$1 + ;; ++ -openssl) ++ if [ $# -lt 2 ]; then echo "Error: option $1 requires an argument" >&2; exit 1; fi ++ shift ++ CONFIG_LIB_OPENSSL=$1 ++ ;; + -ocamlfind) + if [ $# -lt 2 ]; then echo "Error: option $1 requires an argument" >&2; exit 1; fi + shift +@@ -647,6 +653,8 @@ + let miniupnpc = $(camlopt "$HAS_MINIUPNPC" "$(camlstrtuple "${MINIUPNPC[@]}")") + let has_dbm = $(camlbool "$HAS_DBM") + ++let openssl = $(camlopt "$CONFIG_LIB_OPENSSL" '"'"$CONFIG_LIB_OPENSSL"'"') ++ + let available = [ $TAGS_LIST] + let all_tags = [ $(for t in $ALL_TAGS_LIST; do echo -n "\"$t\"; "; done)] + +diff -x '*~' -Naur MLstate-opalang-6b295a9//qml2ocaml/qml2ocamlOptions.ml MLstate-opalang-6b295a9-new//qml2ocaml/qml2ocamlOptions.ml +--- MLstate-opalang-6b295a9//qml2ocaml/qml2ocamlOptions.ml 2011-11-21 08:07:04.000000000 -0430 ++++ MLstate-opalang-6b295a9-new//qml2ocaml/qml2ocamlOptions.ml 2011-11-27 00:32:57.721442828 -0430 +@@ -44,6 +44,7 @@ + + let options_linker = + ["-w a"] ++ @ (match Config.openssl with | Some dir -> ["-ccopt"; "-L"^dir] | None -> []) + @ (if Base.is_windows then + ["-cclib"; "Dnsapi.lib"; "-cclib"; "libeay32.lib"; "-cclib"; "ssleay32.lib" (*; "ssl_stubs.obj" *)] + else []) +@@ -51,11 +52,13 @@ + (** + Absolute path for include directory, will be passed with the option -I to the ocaml compiler. + *) ++ let uselibdirpath = fun po p -> match po with | Some path -> path | None -> p ++ + let server_include_dir = [ +- "+zip" ; "+site-lib/zip" ; "+site-lib/camlzip" ; +- "+ssl" ; "+site-lib/ssl" ; +- "+cryptokit"; "+site-lib/cryptokit" ; +- "+ulex" ; "+site-lib/ulex" ; ++ uselibdirpath Config.Libdir.camlzip "+zip" ; "+site-lib/zip" ; "+site-lib/camlzip" ; ++ uselibdirpath Config.Libdir.ssl "+ssl" ; "+site-lib/ssl" ; ++ uselibdirpath Config.Libdir.cryptokit "+cryptokit"; "+site-lib/cryptokit" ; ++ uselibdirpath Config.Libdir.ulex "+ulex" ; "+site-lib/ulex" ; + ] @ ( + if Config.has_dbm then [ + "+dbm" ; "+site-lib/dbm" ; diff --git a/pkgs/development/compilers/opa/locate.patch b/pkgs/development/compilers/opa/locate.patch new file mode 100644 index 00000000000..e67e6bab260 --- /dev/null +++ b/pkgs/development/compilers/opa/locate.patch @@ -0,0 +1,14 @@ +Needed to have ocamlfind discover ocamlgraph with Nixpkgs. + +diff -x '*~' -Naur MLstate-opalang-ee92891/configure MLstate-opalang-ee92891-new//configure +--- MLstate-opalang-ee92891/configure 2011-09-30 05:41:18.000000000 -0430 ++++ MLstate-opalang-ee92891-new//configure 2011-11-24 13:47:01.332558705 -0430 +@@ -567,7 +567,7 @@ + fi + + # - checking ocamlgraph +-if ! CONFIG_LIB_OCAMLGRAPH=$(locate-ocaml-lib "Graph" "ocamlgraph/graph") ++if ! CONFIG_LIB_OCAMLGRAPH=$(locate-ocaml-lib "Graph" "ocamlgraph" "graph") + then lib-not-found "ocamlgraph" "libocamlgraph-ocaml-dev" + fi + diff --git a/pkgs/development/ocaml-modules/cryptokit/META b/pkgs/development/ocaml-modules/cryptokit/META deleted file mode 100644 index 661170835fd..00000000000 --- a/pkgs/development/ocaml-modules/cryptokit/META +++ /dev/null @@ -1,8 +0,0 @@ -# Specifications for the "cryptokit" library: -requires = "" -description = "A library of cryptographic primitives for OCaml" -version = "1.3" -directory = "^" - -archive(byte) = "cryptokit.cma" -archive(native) = "cryptokit.cmxa" diff --git a/pkgs/development/ocaml-modules/cryptokit/default.nix b/pkgs/development/ocaml-modules/cryptokit/default.nix index f4ba9a8d7d7..8aa3f2ba77e 100644 --- a/pkgs/development/ocaml-modules/cryptokit/default.nix +++ b/pkgs/development/ocaml-modules/cryptokit/default.nix @@ -1,40 +1,24 @@ -{stdenv, fetchurl, zlib, ocaml}: +{stdenv, fetchurl, zlib, ocaml, findlib, ncurses}: let ocaml_version = (builtins.parseDrvName ocaml.name).version; - version = "1.3"; + version = "1.5"; in stdenv.mkDerivation { name = "cryptokit-${version}"; src = fetchurl { - url = "http://forge.ocamlcore.org/frs/download.php/326/" + + url = "http://forge.ocamlcore.org/frs/download.php/639/" + "cryptokit-${version}.tar.gz"; - sha256 = "0kqrlxkpzrj2qpniy6mhn7gx3n29s86vk4q0im2hqpxi9knkkwwy"; + sha256 = "1r5kbsbsicrbpdrdim7h8xg2b1a8qg8sxig9q6cywzm57r33lj72"; }; - buildInputs = [zlib ocaml]; + buildInputs = [zlib ocaml findlib ncurses]; - patches = [ ./makefile.patch ]; + buildFlags = "setup.data build"; - configurePhase = '' - export INSTALLDIR="$out/lib/ocaml/${ocaml_version}/site-lib/cryptokit" - substituteInPlace Makefile \ - --subst-var-by ZLIB_LIBDIR "${zlib}/lib" \ - --subst-var-by ZLIB_INCLUDE "${zlib}/include" \ - --subst-var INSTALLDIR - ''; - - buildFlags = "all allopt"; - - doCheck = true; - - checkTarget = "test"; - - preInstall = "ensureDir $INSTALLDIR"; - - postInstall = "cp -a ${./META} $INSTALLDIR/META"; + preBuild = "ensureDir $out/lib/ocaml/${ocaml_version}/site-lib/cryptokit"; meta = { homepage = "http://pauillac.inria.fr/~xleroy/software.html"; diff --git a/pkgs/development/ocaml-modules/cryptokit/makefile.patch b/pkgs/development/ocaml-modules/cryptokit/makefile.patch deleted file mode 100644 index b4a82c7d677..00000000000 --- a/pkgs/development/ocaml-modules/cryptokit/makefile.patch +++ /dev/null @@ -1,21 +0,0 @@ -diff -Nuar cryptokit-1.3/Makefile cryptokit-1.3.nixos/Makefile ---- cryptokit-1.3/Makefile 2005-04-20 15:19:54.000000000 +0200 -+++ cryptokit-1.3.nixos/Makefile 2010-08-17 15:22:07.000000000 +0200 -@@ -9,14 +9,13 @@ - - # The directory containing the Zlib library (libz.a or libz.so) - # Leave blank if you don't have Zlib. --ZLIB_LIBDIR=/usr/lib --#ZLIB_LIBDIR=/usr/lib64 # for x86-64 Linux -+ZLIB_LIBDIR=@ZLIB_LIBDIR@ - - # The directory containing the Zlib header file (zlib.h) --ZLIB_INCLUDE=/usr/include -+ZLIB_INCLUDE=@ZLIB_INCLUDE@ - - # Where to install the library. By default: OCaml's standard library directory. --INSTALLDIR=`$(OCAMLC) -where` -+INSTALLDIR=@INSTALLDIR@ - - # Flags for the C compiler. - CFLAGS=-O -I$(ZLIB_INCLUDE) $(ZLIB) diff --git a/pkgs/development/ocaml-modules/ocamlgraph/default.nix b/pkgs/development/ocaml-modules/ocamlgraph/default.nix new file mode 100644 index 00000000000..92a46573117 --- /dev/null +++ b/pkgs/development/ocaml-modules/ocamlgraph/default.nix @@ -0,0 +1,40 @@ +{stdenv, fetchurl, ocaml, findlib }: + +let + ocaml_version = (builtins.parseDrvName ocaml.name).version; + version = "1.8.1"; +in + +stdenv.mkDerivation { + name = "ocamlgraph-${version}"; + + src = fetchurl { + url = "http://ocamlgraph.lri.fr/download/ocamlgraph-${version}.tar.gz"; + sha256 = "0hrba69wvw9b42irkvjf6q7zzw12v5nyyc33yaq3jlf1qbzqhqxs"; + }; + + buildInputs = [ ocaml findlib ]; + + patches = ./destdir.patch; + + postPatch = '' + sed -i 's@$(DESTDIR)$(OCAMLLIB)/ocamlgraph@$(DESTDIR)/lib/ocaml/${ocaml_version}/site-lib/ocamlgraph@' Makefile.in + ''; + + createFindlibDestdir = true; + + buildPhase = '' + make all + make install-findlib + ''; + + meta = { + homepage = http://ocamlgraph.lri.fr/; + description = "ocamlgraph is a graph library for Objective Caml."; + license = "GNU Library General Public License version 2, with the special exception on linking described in file LICENSE"; + platforms = ocaml.meta.platforms; + maintainers = [ + stdenv.lib.maintainers.kkallio + ]; + }; +} diff --git a/pkgs/development/ocaml-modules/ocamlgraph/destdir.patch b/pkgs/development/ocaml-modules/ocamlgraph/destdir.patch new file mode 100644 index 00000000000..38fca1c491f --- /dev/null +++ b/pkgs/development/ocaml-modules/ocamlgraph/destdir.patch @@ -0,0 +1,13 @@ +diff -Naur -x '*~' ocamlgraph-1.8.1/Makefile.in ocamlgraph-1.8.1-new//Makefile.in +--- ocamlgraph-1.8.1/Makefile.in 2011-10-17 09:57:03.000000000 -0430 ++++ ocamlgraph-1.8.1-new//Makefile.in 2011-11-24 13:01:22.626004819 -0430 +@@ -16,8 +16,8 @@ + ########################################################################## + + # Where to install the binaries +-DESTDIR = + prefix =@prefix@ ++DESTDIR=$(prefix) + exec_prefix=@exec_prefix@ + datarootdir=@datarootdir@ + BINDIR =$(DESTDIR)@bindir@ diff --git a/pkgs/development/ocaml-modules/ulex/default.nix b/pkgs/development/ocaml-modules/ulex/default.nix index aee65a6e2ee..19beeec1ec5 100644 --- a/pkgs/development/ocaml-modules/ulex/default.nix +++ b/pkgs/development/ocaml-modules/ulex/default.nix @@ -15,6 +15,8 @@ stdenv.mkDerivation { sha256 = "0fjlkwps14adfgxdrbb4yg65fhyimplvjjs1xqj5np197cig67x0"; }; + createFindlibDestdir = true; + buildInputs = [ocaml findlib]; buildFlags = "all all.opt"; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index dd577a0c472..408cd2e7c4c 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -2387,6 +2387,8 @@ let ocaml_expat = callPackage ../development/ocaml-modules/expat { }; + ocamlgraph = callPackage ../development/ocaml-modules/ocamlgraph { }; + ocaml_http = callPackage ../development/ocaml-modules/http { }; ocaml_lwt = callPackage ../development/ocaml-modules/lwt { }; @@ -2405,8 +2407,12 @@ let ocaml_ssl = callPackage ../development/ocaml-modules/ssl { }; + opa = callPackage ../development/compilers/opa { }; + ounit = callPackage ../development/ocaml-modules/ounit { }; + ulex = callPackage ../development/ocaml-modules/ulex { }; + ulex08 = callPackage ../development/ocaml-modules/ulex/0.8 { camlp5 = camlp5_5_transitional; }; From df41a6b63fd3d33b2f3e2921fbce2e17ae8f2281 Mon Sep 17 00:00:00 2001 From: Rob Vermaas Date: Mon, 28 Nov 2011 14:54:50 +0000 Subject: [PATCH 711/970] update strategoxt 1.8 svn path=/nixpkgs/trunk/; revision=30581 --- pkgs/development/compilers/strategoxt/0.18.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/compilers/strategoxt/0.18.nix b/pkgs/development/compilers/strategoxt/0.18.nix index 898923b48ac..edb3c2691c6 100644 --- a/pkgs/development/compilers/strategoxt/0.18.nix +++ b/pkgs/development/compilers/strategoxt/0.18.nix @@ -41,11 +41,11 @@ rec { strategoxt = stdenv.mkDerivation rec { - name = "strategoxt-1.8pre21839"; + name = "strategoxt-1.8pre23644"; src = fetchurl { - url = http://hydra.nixos.org/build/1030762/download/1/strategoxt-1.8pre21839.tar.gz; - sha256 = "b84012ac75dfd031e5356f07ea9202b9e660de48e07de0b8e1c93ac39c073b24"; + url = http://hydra.nixos.org/build/1569309/download/1/strategoxt-1.8pre23644.tar.gz; + sha256 = "9c900d132e7a8790e914aa78598c376f8ed05947c62b9d05df617ba2eae29381"; }; buildInputs = [pkgconfig aterm sdf getopt]; From c13ff671a2356f3c0ef46b3d7db88b8634ccb64c Mon Sep 17 00:00:00 2001 From: Karn Kallio Date: Mon, 28 Nov 2011 15:12:02 +0000 Subject: [PATCH 712/970] Update urweb compiler to release 20111127. svn path=/nixpkgs/trunk/; revision=30582 --- pkgs/development/compilers/urweb/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/compilers/urweb/default.nix b/pkgs/development/compilers/urweb/default.nix index 44067e4207d..2c197a1be57 100644 --- a/pkgs/development/compilers/urweb/default.nix +++ b/pkgs/development/compilers/urweb/default.nix @@ -2,23 +2,23 @@ stdenv.mkDerivation rec { pname = "urweb"; - version = "20110917"; + version = "20111127"; name = "${pname}-${version}"; src = fetchurl { url = "http://www.impredicative.com/ur/${name}.tgz"; - sha256 = "1qgb25bwpdcs303q7yz1dm577xyy5pzzyvaqabhkvhbgxmlcpl73"; + sha256 = "1mhicigbi434fdr4gim4dswnmff9dldszh93g2w2542nlxvn9lbj"; }; buildInputs = [ stdenv.gcc file openssl mlton mysql postgresql sqlite ]; prePatch = '' sed -e 's@/usr/bin/file@${file}/bin/file@g' -i configure - sed -e 's@gcc @${stdenv.gcc}/bin/gcc @g' -i src/compiler.sml ''; preConfigure = '' + export CC="${stdenv.gcc}/bin/gcc"; export CCARGS="-I$out/include \ -L${mysql}/lib/mysql -L${postgresql}/lib -L${sqlite}/lib"; From 7501456c94559d3cbf64c3b69bdfcc6b3f97e916 Mon Sep 17 00:00:00 2001 From: Shea Levy Date: Mon, 28 Nov 2011 15:49:14 +0000 Subject: [PATCH 713/970] Platforms needs to be a list Should this really be x86_64-linux only? Why? svn path=/nixpkgs/trunk/; revision=30583 --- pkgs/development/compilers/opa/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/compilers/opa/default.nix b/pkgs/development/compilers/opa/default.nix index 3f6e3956f36..6df16e44c3d 100644 --- a/pkgs/development/compilers/opa/default.nix +++ b/pkgs/development/compilers/opa/default.nix @@ -58,6 +58,6 @@ stdenv.mkDerivation rec { homepage = http://opalang.org/; license = stdenv.lib.licenses.gpl3; maintainers = [ stdenv.lib.maintainers.kkallio ]; - platforms = "x86_64-linux"; + platforms = [ "x86_64-linux" ]; }; } From 96e436d6a3f15c21dff48d007c79eb9f1a930941 Mon Sep 17 00:00:00 2001 From: Karn Kallio Date: Mon, 28 Nov 2011 15:52:46 +0000 Subject: [PATCH 714/970] Opa does not compile with ocaml before version 3.12.0 svn path=/nixpkgs/trunk/; revision=30584 --- pkgs/top-level/all-packages.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 408cd2e7c4c..464d87efc04 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -2407,8 +2407,6 @@ let ocaml_ssl = callPackage ../development/ocaml-modules/ssl { }; - opa = callPackage ../development/compilers/opa { }; - ounit = callPackage ../development/ocaml-modules/ounit { }; ulex = callPackage ../development/ocaml-modules/ulex { }; @@ -2423,6 +2421,8 @@ let ocamlPackages_3_11_1 = mkOcamlPackages ocaml_3_11_1 pkgs.ocamlPackages_3_11_1; ocamlPackages_3_12_0 = mkOcamlPackages ocaml_3_12_0 pkgs.ocamlPackages_3_12_0; + opa = let callPackage = newScope pkgs.ocamlPackages_3_12_0; in callPackage ../development/compilers/opa { }; + opencxx = callPackage ../development/compilers/opencxx { gcc = gcc33; }; From 36ae9193c48a6034410b4eac6347bea8c57524d7 Mon Sep 17 00:00:00 2001 From: Michael Raskin <7c6f434c@mail.ru> Date: Mon, 28 Nov 2011 15:58:45 +0000 Subject: [PATCH 715/970] Fix tmux cross-build svn path=/nixpkgs/trunk/; revision=30585 --- pkgs/tools/misc/tmux/default.nix | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/pkgs/tools/misc/tmux/default.nix b/pkgs/tools/misc/tmux/default.nix index 10793753ab5..da54c185410 100644 --- a/pkgs/tools/misc/tmux/default.nix +++ b/pkgs/tools/misc/tmux/default.nix @@ -12,6 +12,12 @@ stdenv.mkDerivation rec { makeFlags = "PREFIX=\${out}"; + crossAttrs = { + preBuild = '' + makeFlags=" $makeFlags CC=${stdenv.cross.config}-gcc " + ''; + }; + buildInputs = [ ncurses libevent ]; meta = { From 438305146e715cdb95638062b1fc7808a323d82c Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 28 Nov 2011 18:11:27 +0000 Subject: [PATCH 716/970] haskell-xmonad-extras: updated to version 0.10.1 svn path=/nixpkgs/trunk/; revision=30586 --- pkgs/applications/window-managers/xmonad/xmonad-extras.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/window-managers/xmonad/xmonad-extras.nix b/pkgs/applications/window-managers/xmonad/xmonad-extras.nix index fb1e59d36e9..249310b6411 100644 --- a/pkgs/applications/window-managers/xmonad/xmonad-extras.nix +++ b/pkgs/applications/window-managers/xmonad/xmonad-extras.nix @@ -4,8 +4,8 @@ cabal.mkDerivation (self: { pname = "xmonad-extras"; - version = "0.10"; - sha256 = "0pxvzqcwva64xlrw21wxxc8zq8w36rgg58a12j6kz47ivwkin27g"; + version = "0.10.1"; + sha256 = "17rac0xjw1zw1jlc1rpq54vg50xscb3b98knk4gkb8bv1khpgz27"; buildDepends = [ hint HList libmpd mtl network parsec random regexPosix split X11 xmonad xmonadContrib From 79518845f3278c84a273ab74699f580115640c6f Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 28 Nov 2011 18:11:31 +0000 Subject: [PATCH 717/970] haskell-authenticate: updated to version 0.10.3 svn path=/nixpkgs/trunk/; revision=30587 --- .../libraries/haskell/authenticate/default.nix | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/pkgs/development/libraries/haskell/authenticate/default.nix b/pkgs/development/libraries/haskell/authenticate/default.nix index ca178c3fa36..2a6fcc1a2cb 100644 --- a/pkgs/development/libraries/haskell/authenticate/default.nix +++ b/pkgs/development/libraries/haskell/authenticate/default.nix @@ -1,4 +1,4 @@ -{ cabal, aesonNative, attoparsec, base64Bytestring, blazeBuilder +{ cabal, aeson, attoparsec, base64Bytestring, blazeBuilder , caseInsensitive, enumerator, failure, httpEnumerator, httpTypes , network, random, RSA, SHA, tagsoup, text, time, tls, transformers , xmlEnumerator @@ -6,12 +6,12 @@ cabal.mkDerivation (self: { pname = "authenticate"; - version = "0.10.2.2"; - sha256 = "10w13wcd8cwaf4ifxllsiijwza2ys4a5zyhjcbl4938609p60hi8"; + version = "0.10.3"; + sha256 = "1sp8yanb8wray3pnakaj7jqsxirjw6ds2f1j2p72p9hn3kcf4255"; buildDepends = [ - aesonNative attoparsec base64Bytestring blazeBuilder - caseInsensitive enumerator failure httpEnumerator httpTypes network - random RSA SHA tagsoup text time tls transformers xmlEnumerator + aeson attoparsec base64Bytestring blazeBuilder caseInsensitive + enumerator failure httpEnumerator httpTypes network random RSA SHA + tagsoup text time tls transformers xmlEnumerator ]; meta = { homepage = "http://github.com/snoyberg/authenticate/tree/master"; From e568054eec4c67fc738da40520aa4adb3c9f07da Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 28 Nov 2011 18:11:34 +0000 Subject: [PATCH 718/970] haskell-clientsession: updated to version 0.7.3.5 svn path=/nixpkgs/trunk/; revision=30588 --- .../libraries/haskell/clientsession/default.nix | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/pkgs/development/libraries/haskell/clientsession/default.nix b/pkgs/development/libraries/haskell/clientsession/default.nix index 108fe980887..f65a993a14e 100644 --- a/pkgs/development/libraries/haskell/clientsession/default.nix +++ b/pkgs/development/libraries/haskell/clientsession/default.nix @@ -1,13 +1,14 @@ -{ cabal, base64Bytestring, cereal, cryptoApi, cryptocipher, entropy -, skein +{ cabal, base64Bytestring, cereal, cprngAes, cryptoApi +, cryptocipher, entropy, skein }: cabal.mkDerivation (self: { pname = "clientsession"; - version = "0.7.3.4"; - sha256 = "16blm8p0c2hk06yn5f5qmrrxwsrsdv7l7x1s07ygn8s9jmb9xyqr"; + version = "0.7.3.5"; + sha256 = "0j5vwlmc9vz2zrwpjfjxfz1hl94zc1dbs8jm55dnd6c043i5ag4w"; buildDepends = [ - base64Bytestring cereal cryptoApi cryptocipher entropy skein + base64Bytestring cereal cprngAes cryptoApi cryptocipher entropy + skein ]; meta = { homepage = "http://github.com/snoyberg/clientsession/tree/master"; From afc59c79e3f30302c0a67fe55846fac7a64b66f8 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 28 Nov 2011 18:11:37 +0000 Subject: [PATCH 719/970] haskell-cookie: updated to version 0.3.0.2 svn path=/nixpkgs/trunk/; revision=30589 --- pkgs/development/libraries/haskell/cookie/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/cookie/default.nix b/pkgs/development/libraries/haskell/cookie/default.nix index dce5b245a78..698c643d339 100644 --- a/pkgs/development/libraries/haskell/cookie/default.nix +++ b/pkgs/development/libraries/haskell/cookie/default.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "cookie"; - version = "0.3.0.1"; - sha256 = "1gqz2q09fnbk8scd164mg02jsdh0sg5g06grr627qsjy583i2ad7"; + version = "0.3.0.2"; + sha256 = "123ylraxcavj82qcvrbfpb172k8zl5qgzh2byv84did1f1dz0ris"; buildDepends = [ blazeBuilder text time ]; meta = { homepage = "http://github.com/snoyberg/cookie"; From 99ad21b75291a24ca66e6a811cc9c9a7b9374e6f Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 28 Nov 2011 18:11:40 +0000 Subject: [PATCH 720/970] haskell-data-object: updated to version 0.3.1.8 svn path=/nixpkgs/trunk/; revision=30590 --- pkgs/development/libraries/haskell/data-object/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/data-object/default.nix b/pkgs/development/libraries/haskell/data-object/default.nix index 2c774c8c79f..fb2c013da8d 100644 --- a/pkgs/development/libraries/haskell/data-object/default.nix +++ b/pkgs/development/libraries/haskell/data-object/default.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "data-object"; - version = "0.3.1.7"; - sha256 = "0b4jai09nx3h2vfj5f2q1wp0wldvkjygyzkgrrc6hnsfx2qv8qf7"; + version = "0.3.1.8"; + sha256 = "0v7kn6rv71fhf2l7ll7plzr90irm2fyp25lskv2zwazp4swhw52x"; buildDepends = [ failure text time ]; meta = { homepage = "http://github.com/snoyberg/data-object/tree/master"; From d5fe66a5f8412c71e5215cdc9c434034d579894c Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 28 Nov 2011 18:11:43 +0000 Subject: [PATCH 721/970] haskell-hamlet: updated to version 0.10.5 svn path=/nixpkgs/trunk/; revision=30591 --- pkgs/development/libraries/haskell/hamlet/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/hamlet/default.nix b/pkgs/development/libraries/haskell/hamlet/default.nix index 4499d338885..15d219830a4 100644 --- a/pkgs/development/libraries/haskell/hamlet/default.nix +++ b/pkgs/development/libraries/haskell/hamlet/default.nix @@ -4,8 +4,8 @@ cabal.mkDerivation (self: { pname = "hamlet"; - version = "0.10.4"; - sha256 = "10ik9rbj9srb1f7vavs5siidyybzbr4fpy3akv90qldd2xyifhxa"; + version = "0.10.5"; + sha256 = "0kizy0qij6zbayrbb3gr4iqys1551ax5c8w5lvh6chg3ypl1i1m3"; buildDepends = [ blazeBuilder blazeHtml failure parsec shakespeare text ]; From a795977032a597f1e77d6406083abf10958cf78d Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 28 Nov 2011 18:11:46 +0000 Subject: [PATCH 722/970] haskell-http-enumerator: updated to version 0.7.1.5 svn path=/nixpkgs/trunk/; revision=30592 --- .../development/libraries/haskell/http-enumerator/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/http-enumerator/default.nix b/pkgs/development/libraries/haskell/http-enumerator/default.nix index 55e5ff9dc41..c6b2702c6e1 100644 --- a/pkgs/development/libraries/haskell/http-enumerator/default.nix +++ b/pkgs/development/libraries/haskell/http-enumerator/default.nix @@ -7,8 +7,8 @@ cabal.mkDerivation (self: { pname = "http-enumerator"; - version = "0.7.1.4"; - sha256 = "1dp3hw10wpf8izmp48jai90x7mxws05gbjqx9s24gl7y2m24q2xg"; + version = "0.7.1.5"; + sha256 = "1ycbw6r7nsp59ncchrsb60qyyvf74pf43fyr44invhv1hjh5cb61"; isLibrary = true; isExecutable = true; buildDepends = [ From 1985f35266cd7cc48cfcc629db6a3b0b5b5e72e7 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 28 Nov 2011 18:11:49 +0000 Subject: [PATCH 723/970] haskell-mime-mail: updated to version 0.4 svn path=/nixpkgs/trunk/; revision=30593 --- pkgs/development/libraries/haskell/mime-mail/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/mime-mail/default.nix b/pkgs/development/libraries/haskell/mime-mail/default.nix index 7651d36aca8..1b3f3c30a14 100644 --- a/pkgs/development/libraries/haskell/mime-mail/default.nix +++ b/pkgs/development/libraries/haskell/mime-mail/default.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "mime-mail"; - version = "0.3.0.3"; - sha256 = "0aag2mj1jchgwgnlh6hmv9qz78qjxffn1b52nwl6257sk0qv6va6"; + version = "0.4"; + sha256 = "0hlyk3mypn9iw7g8hhn528ycbm3qayiczwf4paw0sxd6xsg9a28s"; buildDepends = [ blazeBuilder dataenc random text ]; meta = { homepage = "http://github.com/snoyberg/mime-mail"; From f853680ab381d065fa220d77ed9eb98529c332ca Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 28 Nov 2011 18:11:52 +0000 Subject: [PATCH 724/970] haskell-shakespeare-css: updated to version 0.10.3 svn path=/nixpkgs/trunk/; revision=30594 --- .../development/libraries/haskell/shakespeare-css/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/shakespeare-css/default.nix b/pkgs/development/libraries/haskell/shakespeare-css/default.nix index 65f2debed9c..64add15ad59 100644 --- a/pkgs/development/libraries/haskell/shakespeare-css/default.nix +++ b/pkgs/development/libraries/haskell/shakespeare-css/default.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "shakespeare-css"; - version = "0.10.2"; - sha256 = "181bknfws2s7jygy527w93v07i04xf1pwyfmylva59p0z45adlb4"; + version = "0.10.3"; + sha256 = "1r0m1pqgg43dmc1gb1aj99hyk1jw0ciln9k7q3mq8vwc602kfd5r"; buildDepends = [ parsec shakespeare text ]; meta = { homepage = "http://www.yesodweb.com/book/templates"; From e60933dbf0d25b3fbef52840c1f71866d920b562 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 28 Nov 2011 18:11:54 +0000 Subject: [PATCH 725/970] haskell-shakespeare-js: updated to version 0.10.3 svn path=/nixpkgs/trunk/; revision=30595 --- pkgs/development/libraries/haskell/shakespeare-js/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/shakespeare-js/default.nix b/pkgs/development/libraries/haskell/shakespeare-js/default.nix index 5a402840d71..a4a20c98b19 100644 --- a/pkgs/development/libraries/haskell/shakespeare-js/default.nix +++ b/pkgs/development/libraries/haskell/shakespeare-js/default.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "shakespeare-js"; - version = "0.10.2"; - sha256 = "1yyqfp2lj8vq7x2a74wrgm7kx6zp1djp67bls9ip74kxi24dbznv"; + version = "0.10.3"; + sha256 = "1xz4jf91dfz60dji31d3hyy1k01hk0v41pb8qmi598jylk9iz1r2"; buildDepends = [ shakespeare text ]; meta = { homepage = "http://www.yesodweb.com/book/templates"; From cf95e5ea37bc3f2377f233179cd0d24954d1f248 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 28 Nov 2011 18:11:57 +0000 Subject: [PATCH 726/970] haskell-shakespeare-text: updated to version 0.10.3 svn path=/nixpkgs/trunk/; revision=30596 --- .../libraries/haskell/shakespeare-text/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/shakespeare-text/default.nix b/pkgs/development/libraries/haskell/shakespeare-text/default.nix index 58ffa1404fc..26ce04559ec 100644 --- a/pkgs/development/libraries/haskell/shakespeare-text/default.nix +++ b/pkgs/development/libraries/haskell/shakespeare-text/default.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "shakespeare-text"; - version = "0.10.2"; - sha256 = "04n1aflg4b5byfsg494d4dskx25nyy0a654wl4cxz8920sl7qpha"; + version = "0.10.3"; + sha256 = "0w3qf0zykdi5ixjcp0l9zdgwhbnnljn6ib88xkai05xkm6wzh06s"; buildDepends = [ shakespeare text ]; meta = { homepage = "http://www.yesodweb.com/book/templates"; From 4891e226d004aeb64617195523436532c91c351f Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 28 Nov 2011 18:12:00 +0000 Subject: [PATCH 727/970] haskell-wai-app-static: updated to version 0.3.5.1 svn path=/nixpkgs/trunk/; revision=30597 --- pkgs/development/libraries/haskell/wai-app-static/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/wai-app-static/default.nix b/pkgs/development/libraries/haskell/wai-app-static/default.nix index 2ef32922346..2cb4ae16ce7 100644 --- a/pkgs/development/libraries/haskell/wai-app-static/default.nix +++ b/pkgs/development/libraries/haskell/wai-app-static/default.nix @@ -5,8 +5,8 @@ cabal.mkDerivation (self: { pname = "wai-app-static"; - version = "0.3.4"; - sha256 = "0jxlm0qfv59c3q6ngvr94rzrn01byfn3wak208ws18xhk14cv058"; + version = "0.3.5.1"; + sha256 = "0pk7biyfg8za2i85vawgf3mxglbhk7bfl9xmiswqk6ppwwq2q4xb"; buildDepends = [ base64Bytestring blazeBuilder blazeHtml cryptohash fileEmbed httpDate httpTypes text time transformers unixCompat wai From 8477d6d8eb2a0c63bbcd80934f0c8f2c832e2e50 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 28 Nov 2011 18:12:03 +0000 Subject: [PATCH 728/970] haskell-wai-extra: updated to version 0.4.5.1 svn path=/nixpkgs/trunk/; revision=30598 --- pkgs/development/libraries/haskell/wai-extra/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/wai-extra/default.nix b/pkgs/development/libraries/haskell/wai-extra/default.nix index 120e1a96a26..53ed1003904 100644 --- a/pkgs/development/libraries/haskell/wai-extra/default.nix +++ b/pkgs/development/libraries/haskell/wai-extra/default.nix @@ -5,8 +5,8 @@ cabal.mkDerivation (self: { pname = "wai-extra"; - version = "0.4.4"; - sha256 = "04mzpqa6q3ggk5r0shzc11q5qmmri566nzbsafpv2sbmiwm5s7nd"; + version = "0.4.5.1"; + sha256 = "1aq0zvxyk5hgdvpydvf8hlvv61ilrsmbmdaxhiq46waaabxqgdfc"; buildDepends = [ blazeBuilder blazeBuilderEnumerator caseInsensitive dataDefault enumerator httpTypes network text time transformers wai From e505446635bb01445b9591bdb830738c69d6686d Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 28 Nov 2011 18:12:06 +0000 Subject: [PATCH 729/970] haskell-wai: updated to version 0.4.3 svn path=/nixpkgs/trunk/; revision=30599 --- pkgs/development/libraries/haskell/wai/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/wai/default.nix b/pkgs/development/libraries/haskell/wai/default.nix index d85d3629cae..b118d794563 100644 --- a/pkgs/development/libraries/haskell/wai/default.nix +++ b/pkgs/development/libraries/haskell/wai/default.nix @@ -4,8 +4,8 @@ cabal.mkDerivation (self: { pname = "wai"; - version = "0.4.2"; - sha256 = "18w4wzryyqcqqihwckbz92smkqhhxh3lmi0kgxkcgivyzvhd2jqy"; + version = "0.4.3"; + sha256 = "08dmsl90ibs6a4sadsd2dhf5mssf5jswk6n2jv19q5sg3dra4m84"; buildDepends = [ blazeBuilder enumerator httpTypes network text transformers ]; From 6aac906e03b04d330343e017d01e6b60778e50d9 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 28 Nov 2011 18:12:09 +0000 Subject: [PATCH 730/970] haskell-warp: updated to version 0.4.6.1 svn path=/nixpkgs/trunk/; revision=30600 --- pkgs/development/libraries/haskell/warp/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/libraries/haskell/warp/default.nix b/pkgs/development/libraries/haskell/warp/default.nix index b461e36d33f..f036c9bc1ed 100644 --- a/pkgs/development/libraries/haskell/warp/default.nix +++ b/pkgs/development/libraries/haskell/warp/default.nix @@ -5,14 +5,14 @@ cabal.mkDerivation (self: { pname = "warp"; - version = "0.4.5"; - sha256 = "0ql9a7qa6ivsvgr66hgj6bs8c3y8rr320kk1cxq9qbpi00gy5j8b"; + version = "0.4.6.1"; + sha256 = "0gybcxfg619nws0j3ybimd8qg2knb1byk8cpcsdligp4yifp4qwd"; buildDepends = [ blazeBuilder blazeBuilderEnumerator caseInsensitive enumerator httpTypes network simpleSendfile transformers unixCompat wai ]; meta = { - homepage = "http://github.com/snoyberg/warp"; + homepage = "http://github.com/yesodweb/wai"; description = "A fast, light-weight web server for WAI applications"; license = self.stdenv.lib.licenses.bsd3; platforms = self.ghc.meta.platforms; From b124d45401d708444f3b0c38aa7c1c5c510a1581 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 28 Nov 2011 18:12:12 +0000 Subject: [PATCH 731/970] haskell-yesod-auth: updated to version 0.7.6.1 svn path=/nixpkgs/trunk/; revision=30601 --- pkgs/development/libraries/haskell/yesod-auth/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/development/libraries/haskell/yesod-auth/default.nix b/pkgs/development/libraries/haskell/yesod-auth/default.nix index c5bcd1888dd..698df5e0112 100644 --- a/pkgs/development/libraries/haskell/yesod-auth/default.nix +++ b/pkgs/development/libraries/haskell/yesod-auth/default.nix @@ -1,4 +1,4 @@ -{ cabal, aesonNative, authenticate, blazeHtml, controlMonadAttempt +{ cabal, aeson, authenticate, blazeHtml, controlMonadAttempt , hamlet, httpEnumerator, mimeMail, persistent, persistentTemplate , pureMD5, pwstoreFast, random, SHA, shakespeareCss, text , transformers, wai, yesodCore, yesodForm, yesodJson @@ -7,10 +7,10 @@ cabal.mkDerivation (self: { pname = "yesod-auth"; - version = "0.7.5"; - sha256 = "1njs3z01as6mamdflx2686s4qq4qwpkl0xnfdlrhswzgfpn8qqb6"; + version = "0.7.6.1"; + sha256 = "11x4vs332727x7sbl5w98a5ga709kl53fp9xrqv7c7qrlphiknzy"; buildDepends = [ - aesonNative authenticate blazeHtml controlMonadAttempt hamlet + aeson authenticate blazeHtml controlMonadAttempt hamlet httpEnumerator mimeMail persistent persistentTemplate pureMD5 pwstoreFast random SHA shakespeareCss text transformers wai yesodCore yesodForm yesodJson yesodPersistent From e6bf916dfffb4478497a6a1bd963cb2da6657c46 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 28 Nov 2011 18:12:16 +0000 Subject: [PATCH 732/970] haskell-yesod-core: updated to version 0.9.3.4 svn path=/nixpkgs/trunk/; revision=30602 --- .../libraries/haskell/yesod-core/default.nix | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/pkgs/development/libraries/haskell/yesod-core/default.nix b/pkgs/development/libraries/haskell/yesod-core/default.nix index 20b344eb2f0..203729c7108 100644 --- a/pkgs/development/libraries/haskell/yesod-core/default.nix +++ b/pkgs/development/libraries/haskell/yesod-core/default.nix @@ -1,19 +1,19 @@ -{ cabal, aesonNative, blazeBuilder, blazeHtml, caseInsensitive -, cereal, clientsession, cookie, dataObject, dataObjectYaml -, enumerator, failure, hamlet, httpTypes, monadControl, parsec -, pathPieces, random, shakespeare, shakespeareCss, shakespeareJs +{ cabal, aeson, blazeBuilder, blazeHtml, caseInsensitive, cereal +, clientsession, cookie, dataObject, dataObjectYaml, enumerator +, failure, hamlet, httpTypes, monadControl, parsec, pathPieces +, random, shakespeare, shakespeareCss, shakespeareJs , strictConcurrency, text, time, transformers, vector, wai , waiExtra }: cabal.mkDerivation (self: { pname = "yesod-core"; - version = "0.9.3.3"; - sha256 = "0qy926x009mci17fhlrcn758vc9lxybzfg16pb69ydzbdr9lqa77"; + version = "0.9.3.4"; + sha256 = "1hnzmbspdj15480n0r4r1gayapwwz3d5r3hzj5k4qd9975lyxcw1"; buildDepends = [ - aesonNative blazeBuilder blazeHtml caseInsensitive cereal - clientsession cookie dataObject dataObjectYaml enumerator failure - hamlet httpTypes monadControl parsec pathPieces random shakespeare + aeson blazeBuilder blazeHtml caseInsensitive cereal clientsession + cookie dataObject dataObjectYaml enumerator failure hamlet + httpTypes monadControl parsec pathPieces random shakespeare shakespeareCss shakespeareJs strictConcurrency text time transformers vector wai waiExtra ]; From dda986c5165f21ba94a82356de2b251761fbbd46 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 28 Nov 2011 18:12:18 +0000 Subject: [PATCH 733/970] haskell-yesod-form: updated to version 0.3.4 svn path=/nixpkgs/trunk/; revision=30603 --- pkgs/development/libraries/haskell/yesod-form/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/yesod-form/default.nix b/pkgs/development/libraries/haskell/yesod-form/default.nix index 133d45c6c19..7ed924fb07b 100644 --- a/pkgs/development/libraries/haskell/yesod-form/default.nix +++ b/pkgs/development/libraries/haskell/yesod-form/default.nix @@ -5,8 +5,8 @@ cabal.mkDerivation (self: { pname = "yesod-form"; - version = "0.3.3"; - sha256 = "1lym9h7xr26i36n62cvbdyzjxna1p0alyhx9qhi5zhg0xz4nd3xq"; + version = "0.3.4"; + sha256 = "05hvffzhwb6x6cmpvpf60hbzm4lvn7gp47rvspm5k6y6d999az3l"; buildDepends = [ blazeBuilder blazeHtml dataDefault emailValidate hamlet network persistent shakespeareCss shakespeareJs text time transformers wai From f5ac7019cc89ec987accc0b7189456e9f307bff0 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 28 Nov 2011 18:12:21 +0000 Subject: [PATCH 734/970] haskell-yesod-json: updated to version 0.2.2 svn path=/nixpkgs/trunk/; revision=30604 --- pkgs/development/libraries/haskell/yesod-json/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/development/libraries/haskell/yesod-json/default.nix b/pkgs/development/libraries/haskell/yesod-json/default.nix index 2e5df42d9da..cdaa793b150 100644 --- a/pkgs/development/libraries/haskell/yesod-json/default.nix +++ b/pkgs/development/libraries/haskell/yesod-json/default.nix @@ -1,10 +1,10 @@ -{ cabal, aesonNative, shakespeareJs, text, vector, yesodCore }: +{ cabal, aeson, shakespeareJs, text, vector, yesodCore }: cabal.mkDerivation (self: { pname = "yesod-json"; - version = "0.2.1"; - sha256 = "1d710pqrdafyz8s0spd19vwvx5v9kwy44wb0byz3445jhi3kwn88"; - buildDepends = [ aesonNative shakespeareJs text vector yesodCore ]; + version = "0.2.2"; + sha256 = "11n34wg0jjamghd93ild48rzganbwzbqf6shv8lyy1lsm2jl8q0v"; + buildDepends = [ aeson shakespeareJs text vector yesodCore ]; meta = { homepage = "http://www.yesodweb.com/"; description = "Generate content for Yesod using the aeson package"; From 10d5176d4ef6d331fc538257688180b225ffe26b Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 28 Nov 2011 18:12:24 +0000 Subject: [PATCH 735/970] haskell-yesod-persistent: updated to version 0.2.2 svn path=/nixpkgs/trunk/; revision=30605 --- .../libraries/haskell/yesod-persistent/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/yesod-persistent/default.nix b/pkgs/development/libraries/haskell/yesod-persistent/default.nix index 187780f9ebb..00b5fb317fd 100644 --- a/pkgs/development/libraries/haskell/yesod-persistent/default.nix +++ b/pkgs/development/libraries/haskell/yesod-persistent/default.nix @@ -4,8 +4,8 @@ cabal.mkDerivation (self: { pname = "yesod-persistent"; - version = "0.2.1"; - sha256 = "1ka8jsxr7i5rcjxnv82ykq34yqxqzxdvk4b3ck7pbvx2a4g7bxw9"; + version = "0.2.2"; + sha256 = "0pgvckyn3l9ggw77hmdpxfx5iwdk36fcfx464rqfzdy28agax47c"; buildDepends = [ failure persistent persistentTemplate transformers yesodCore ]; From 6697cb0c0ff34ae8520d2db43ffe09913f1ecace Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 28 Nov 2011 18:12:28 +0000 Subject: [PATCH 736/970] haskell-yesod-static: updated to version 0.3.2 svn path=/nixpkgs/trunk/; revision=30606 --- pkgs/development/libraries/haskell/yesod-static/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/yesod-static/default.nix b/pkgs/development/libraries/haskell/yesod-static/default.nix index 0f700667f34..65cb5493181 100644 --- a/pkgs/development/libraries/haskell/yesod-static/default.nix +++ b/pkgs/development/libraries/haskell/yesod-static/default.nix @@ -5,8 +5,8 @@ cabal.mkDerivation (self: { pname = "yesod-static"; - version = "0.3.1.2"; - sha256 = "0r72xspxq7122k9vird4yqqzrn6p4xgzvxid7ig62zdxjlw1p36j"; + version = "0.3.2"; + sha256 = "0m0fws0bwhf1cyw1a3cg85mhdjr9pv35a39671jsqkkvmmxiixlf"; buildDepends = [ base64Bytestring cereal enumerator fileEmbed httpTypes pureMD5 text transformers unixCompat wai waiAppStatic yesodCore From 4386f5bfa36d52be5e45b7b8ba07507e34cedcb2 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 28 Nov 2011 18:12:31 +0000 Subject: [PATCH 737/970] haskell-yesod: updated to version 0.9.3.2 svn path=/nixpkgs/trunk/; revision=30607 --- pkgs/development/libraries/haskell/yesod/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/yesod/default.nix b/pkgs/development/libraries/haskell/yesod/default.nix index 8e924bc2e9f..a1b0bbd434d 100644 --- a/pkgs/development/libraries/haskell/yesod/default.nix +++ b/pkgs/development/libraries/haskell/yesod/default.nix @@ -7,8 +7,8 @@ cabal.mkDerivation (self: { pname = "yesod"; - version = "0.9.3.1"; - sha256 = "0af4nyfrpvkyr070fkg1qf4pn783n5443j8hi3wqn4i371vqsmp0"; + version = "0.9.3.2"; + sha256 = "1dwdjf7iydbpnbfpixjmw90dbb25030mv1s2a9cmbpdg70dzzknp"; isLibrary = true; isExecutable = true; buildDepends = [ From 5876576633a0b787c9e9af35f3fe166b6f19f20c Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 28 Nov 2011 18:12:33 +0000 Subject: [PATCH 738/970] haskell-hlint: updated to version 1.8.19 svn path=/nixpkgs/trunk/; revision=30608 --- pkgs/development/tools/haskell/hlint/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/haskell/hlint/default.nix b/pkgs/development/tools/haskell/hlint/default.nix index 5c2e268b5f6..a3b5296f01e 100644 --- a/pkgs/development/tools/haskell/hlint/default.nix +++ b/pkgs/development/tools/haskell/hlint/default.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "hlint"; - version = "1.8.18"; - sha256 = "1dn5ca8z6cvmz8nlyb87glk2sk2pma8pjrg8yamn4vr54zq1bf7a"; + version = "1.8.19"; + sha256 = "0nbj5nkwmiadkp7h8nbx2xg79mvgd97hm9wk0nmfv9ncwnkz9xcc"; isLibrary = true; isExecutable = true; buildDepends = [ From 15f77a015e4851740710347304cffe94733be54d Mon Sep 17 00:00:00 2001 From: Michael Raskin <7c6f434c@mail.ru> Date: Tue, 29 Nov 2011 05:13:20 +0000 Subject: [PATCH 739/970] Update fakeroot svn path=/nixpkgs/trunk/; revision=30610 --- pkgs/tools/system/fakeroot/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/system/fakeroot/default.nix b/pkgs/tools/system/fakeroot/default.nix index e9c4f416509..d80b35e1a11 100644 --- a/pkgs/tools/system/fakeroot/default.nix +++ b/pkgs/tools/system/fakeroot/default.nix @@ -1,11 +1,11 @@ {stdenv, fetchurl}: stdenv.mkDerivation { - name = "fakeroot-1.14.5"; + name = "fakeroot-1.18.1"; src = fetchurl { - url = http://ftp.de.debian.org/debian/pool/main/f/fakeroot/fakeroot_1.14.5.orig.tar.bz2; - sha256 = "0s5f785qsh057z05l9i5k1h9cbj9x26ki37l4wh4iyabjhschddh"; + url = http://ftp.de.debian.org/debian/pool/main/f/fakeroot/fakeroot_1.18.1.orig.tar.bz2; + sha256 = "0h5jsw715a9hv32cb1m1bajy26l7xxrbgrk6qk1b6m91lxh6rnw9"; }; meta = { From 25f6c6ca6eea4c66c4ec51260c0bf02c2ffbfeb6 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Tue, 29 Nov 2011 14:19:35 +0000 Subject: [PATCH 740/970] * Re-enable the CFQ scheduler as a builtin module (as was the case in 2.6.32). svn path=/nixpkgs/trunk/; revision=30617 --- pkgs/os-specific/linux/kernel/linux-2.6.35.nix | 5 +++++ pkgs/os-specific/linux/kernel/linux-3.0.nix | 5 +++++ pkgs/os-specific/linux/kernel/linux-3.1.nix | 5 +++++ pkgs/os-specific/linux/kernel/linux-3.2.nix | 5 +++++ 4 files changed, 20 insertions(+) diff --git a/pkgs/os-specific/linux/kernel/linux-2.6.35.nix b/pkgs/os-specific/linux/kernel/linux-2.6.35.nix index e0a9a28d1bc..a6d03db9b86 100644 --- a/pkgs/os-specific/linux/kernel/linux-2.6.35.nix +++ b/pkgs/os-specific/linux/kernel/linux-2.6.35.nix @@ -18,6 +18,11 @@ let # Enable the kernel's built-in memory tester. MEMTEST y + # Include the CFQ I/O scheduler in the kernel, rather than as a + # module, so that the initrd gets a good I/O scheduler. + IOSCHED_CFQ y + BLK_CGROUP y # required by CFQ + # Disable some expensive (?) features. FTRACE n KPROBES n diff --git a/pkgs/os-specific/linux/kernel/linux-3.0.nix b/pkgs/os-specific/linux/kernel/linux-3.0.nix index 6474e5de4d6..557223e6260 100644 --- a/pkgs/os-specific/linux/kernel/linux-3.0.nix +++ b/pkgs/os-specific/linux/kernel/linux-3.0.nix @@ -20,6 +20,11 @@ let # Enable the kernel's built-in memory tester. MEMTEST y + # Include the CFQ I/O scheduler in the kernel, rather than as a + # module, so that the initrd gets a good I/O scheduler. + IOSCHED_CFQ y + BLK_CGROUP y # required by CFQ + # Disable some expensive (?) features. FTRACE n KPROBES n diff --git a/pkgs/os-specific/linux/kernel/linux-3.1.nix b/pkgs/os-specific/linux/kernel/linux-3.1.nix index 720a5fa15f2..8688d805054 100644 --- a/pkgs/os-specific/linux/kernel/linux-3.1.nix +++ b/pkgs/os-specific/linux/kernel/linux-3.1.nix @@ -20,6 +20,11 @@ let # Enable the kernel's built-in memory tester. MEMTEST y + # Include the CFQ I/O scheduler in the kernel, rather than as a + # module, so that the initrd gets a good I/O scheduler. + IOSCHED_CFQ y + BLK_CGROUP y # required by CFQ + # Disable some expensive (?) features. FTRACE n KPROBES n diff --git a/pkgs/os-specific/linux/kernel/linux-3.2.nix b/pkgs/os-specific/linux/kernel/linux-3.2.nix index 50174526596..0e3ace5c384 100644 --- a/pkgs/os-specific/linux/kernel/linux-3.2.nix +++ b/pkgs/os-specific/linux/kernel/linux-3.2.nix @@ -20,6 +20,11 @@ let # Enable the kernel's built-in memory tester. MEMTEST y + # Include the CFQ I/O scheduler in the kernel, rather than as a + # module, so that the initrd gets a good I/O scheduler. + IOSCHED_CFQ y + BLK_CGROUP y # required by CFQ + # Disable some expensive (?) features. FTRACE n KPROBES n From 752203c3ca62b58f93593fa042b8c17c880d4c58 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Tue, 29 Nov 2011 14:49:32 +0000 Subject: [PATCH 741/970] * Remove broken tux-on-ice kernels. svn path=/nixpkgs/trunk/; revision=30619 --- pkgs/os-specific/linux/kernel/patches.nix | 53 ++++++----------------- pkgs/top-level/all-packages.nix | 28 ------------ 2 files changed, 14 insertions(+), 67 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/patches.nix b/pkgs/os-specific/linux/kernel/patches.nix index ca061322c9d..9fb597be72c 100644 --- a/pkgs/os-specific/linux/kernel/patches.nix +++ b/pkgs/os-specific/linux/kernel/patches.nix @@ -36,24 +36,24 @@ let }; }; - makeAufs3StandalonePatch = {version, rev, sha256}: + makeAufs3StandalonePatch = {version, rev, sha256}: - stdenv.mkDerivation { - name = "aufs3-standalone-${version}.patch"; + stdenv.mkDerivation { + name = "aufs3-standalone-${version}.patch"; - src = fetchgit { - url = git://aufs.git.sourceforge.net/gitroot/aufs/aufs3-standalone.git; - inherit sha256 rev; - }; - - phases = [ "unpackPhase" "installPhase" ]; - - #Instructions from http://aufs.git.sourceforge.net/git/gitweb.cgi?p=aufs/aufs3-standalone.git;a=blob;f=Documentation/filesystems/aufs/README;h=b8cf077635b323d1b454266366f05f476bbd09cb;hb=1067b9d8d64d23c70d905c9cd3c90a669e39c4d4 - installPhase = '' - cat aufs3-base.patch aufs3-proc_map.patch aufs3-standalone.patch > $out - ''; + src = fetchgit { + url = git://aufs.git.sourceforge.net/gitroot/aufs/aufs3-standalone.git; + inherit sha256 rev; }; + phases = [ "unpackPhase" "installPhase" ]; + + # Instructions from http://aufs.git.sourceforge.net/git/gitweb.cgi?p=aufs/aufs3-standalone.git;a=blob;f=Documentation/filesystems/aufs/README;h=b8cf077635b323d1b454266366f05f476bbd09cb;hb=1067b9d8d64d23c70d905c9cd3c90a669e39c4d4 + installPhase = '' + cat aufs3-base.patch aufs3-proc_map.patch aufs3-standalone.patch > $out + ''; + }; + in rec { @@ -397,31 +397,6 @@ rec { patch = ./guruplug-mach-type.patch; }; - tuxonice_2_6_34 = makeTuxonicePatch { - version = "3.2-rc2"; - kernelVersion = "2.6.34"; - sha256 = "0bagqinmky1kmvg3vw8cdysqklxrsfjm7gqrpxviq9jq8vyycviz"; - }; - - tuxonice_2_6_35 = makeTuxonicePatch { - version = "3.2-rc2"; - kernelVersion = "2.6.35"; - sha256 = "00jbrqq6p1lyvli835wczc0vqsn0z73jpb2aak3ak0vgnvsxw37q"; - }; - - tuxonice_2_6_36 = makeTuxonicePatch { - version = "3.2-rc2"; - kernelVersion = "2.6.36"; - sha256 = "1vcw3gpjdghnkli46j37pc6rp8mqk8dh688jv8rppzsry0ll7b7k"; - }; - - tuxonice_2_6_37 = makeTuxonicePatch { - version = "3.2-rc2"; - kernelVersion = "2.6.37"; - url = "http://tuxonice.net/files/current-tuxonice-for-2.6.37.patch_0.bz2"; - sha256 = "0acllabvbm9pmjnh0zx9mgnp47xbrl9ih6i037c85h0ymnjsxdhk"; - }; - glibc_getline = { # Patch to work around conflicting types for the `getline' function diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 464d87efc04..1df28d6f432 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -5478,12 +5478,6 @@ let ]; }; - linux_2_6_34_tuxonice = linux_2_6_34.override (attrs: { - kernelPatches = attrs.kernelPatches ++ [ - kernelPatches.tuxonice_2_6_34 - ]; - }); - linux_2_6_35 = makeOverridable (import ../os-specific/linux/kernel/linux-2.6.35.nix) { inherit fetchurl stdenv perl mktemp module_init_tools ubootChooser; kernelPatches = @@ -5495,12 +5489,6 @@ let kernelPatches.sheevaplug_modules_2_6_35; }; - linux_2_6_35_tuxonice = linux_2_6_35.override (attrs: { - kernelPatches = attrs.kernelPatches ++ [ - kernelPatches.tuxonice_2_6_35 - ]; - }); - linux_nanonote_jz_2_6_34 = makeOverridable (import ../os-specific/linux/kernel/linux-nanonote-jz-2.6.34.nix) { inherit fetchurl fetchsvn stdenv perl mktemp module_init_tools ubootChooser; @@ -5551,12 +5539,6 @@ let ]; }; - linux_2_6_36_tuxonice = linux_2_6_36.override (attrs: { - kernelPatches = attrs.kernelPatches ++ [ - kernelPatches.tuxonice_2_6_36 - ]; - }); - linux_2_6_37 = makeOverridable (import ../os-specific/linux/kernel/linux-2.6.37.nix) { inherit fetchurl stdenv perl mktemp module_init_tools ubootChooser; kernelPatches = @@ -5568,12 +5550,6 @@ let ]; }; - linux_2_6_37_tuxonice = linux_2_6_37.override (attrs: { - kernelPatches = attrs.kernelPatches ++ [ - kernelPatches.tuxonice_2_6_37 - ]; - }); - linux_2_6_38 = makeOverridable (import ../os-specific/linux/kernel/linux-2.6.38.nix) { inherit fetchurl stdenv perl mktemp module_init_tools ubootChooser; kernelPatches = @@ -5813,13 +5789,9 @@ let recurseIntoAttrs (linuxPackagesFor linux_2_6_32_xen pkgs.linuxPackages_2_6_32_xen); linuxPackages_2_6_33 = recurseIntoAttrs (linuxPackagesFor linux_2_6_33 pkgs.linuxPackages_2_6_33); linuxPackages_2_6_34 = recurseIntoAttrs (linuxPackagesFor linux_2_6_34 pkgs.linuxPackages_2_6_34); - linuxPackages_2_6_34_tuxonice = recurseIntoAttrs (linuxPackagesFor linux_2_6_34_tuxonice pkgs.linuxPackages_2_6_34_tuxonice); linuxPackages_2_6_35 = recurseIntoAttrs (linuxPackagesFor linux_2_6_35 pkgs.linuxPackages_2_6_35); - linuxPackages_2_6_35_tuxonice = recurseIntoAttrs (linuxPackagesFor linux_2_6_35_tuxonice pkgs.linuxPackages_2_6_35_tuxonice); linuxPackages_2_6_36 = recurseIntoAttrs (linuxPackagesFor linux_2_6_36 pkgs.linuxPackages_2_6_36); - linuxPackages_2_6_36_tuxonice = recurseIntoAttrs (linuxPackagesFor linux_2_6_36_tuxonice pkgs.linuxPackages_2_6_36_tuxonice); linuxPackages_2_6_37 = recurseIntoAttrs (linuxPackagesFor linux_2_6_37 pkgs.linuxPackages_2_6_37); - linuxPackages_2_6_37_tuxonice = recurseIntoAttrs (linuxPackagesFor linux_2_6_37_tuxonice pkgs.linuxPackages_2_6_37_tuxonice); linuxPackages_2_6_38 = recurseIntoAttrs (linuxPackagesFor linux_2_6_38 pkgs.linuxPackages_2_6_38); linuxPackages_2_6_38_ati = recurseIntoAttrs (linuxPackagesFor linux_2_6_38_ati pkgs.linuxPackages_2_6_38); linuxPackages_2_6_39 = recurseIntoAttrs (linuxPackagesFor linux_2_6_39 pkgs.linuxPackages_2_6_39); From 5717d2f6911706f28975040702c22db77625f7ae Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Tue, 29 Nov 2011 15:32:37 +0000 Subject: [PATCH 742/970] haskell-asn1-data: updated to version 0.6.1.1 svn path=/nixpkgs/trunk/; revision=30620 --- pkgs/development/libraries/haskell/asn1-data/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/asn1-data/default.nix b/pkgs/development/libraries/haskell/asn1-data/default.nix index 6337ab40890..7ba67e5ce79 100644 --- a/pkgs/development/libraries/haskell/asn1-data/default.nix +++ b/pkgs/development/libraries/haskell/asn1-data/default.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "asn1-data"; - version = "0.6.1"; - sha256 = "1kj1h1z4ix8kdxq5838xk70sgz9rq0vdii5nli1rcycx3y2ipi84"; + version = "0.6.1.1"; + sha256 = "13l7gcrgngr2bdr7hxh1wbsh21q7nc5bdknz0gpzjf65297g44an"; isLibrary = true; isExecutable = true; buildDepends = [ From f2c5a458bcff10192ef10826ab10b662928a49fd Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Tue, 29 Nov 2011 15:32:41 +0000 Subject: [PATCH 743/970] haskell-clientsession: updated to version 0.7.3.6 svn path=/nixpkgs/trunk/; revision=30621 --- .../libraries/haskell/clientsession/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/development/libraries/haskell/clientsession/default.nix b/pkgs/development/libraries/haskell/clientsession/default.nix index f65a993a14e..32e88cbf2cf 100644 --- a/pkgs/development/libraries/haskell/clientsession/default.nix +++ b/pkgs/development/libraries/haskell/clientsession/default.nix @@ -1,14 +1,14 @@ { cabal, base64Bytestring, cereal, cprngAes, cryptoApi -, cryptocipher, entropy, skein +, cryptocipher, entropy, skein, tagged }: cabal.mkDerivation (self: { pname = "clientsession"; - version = "0.7.3.5"; - sha256 = "0j5vwlmc9vz2zrwpjfjxfz1hl94zc1dbs8jm55dnd6c043i5ag4w"; + version = "0.7.3.6"; + sha256 = "04cvws7h2pm3rk8p2yj1pqkf9vjqq65hxg9sjldg7zhxdjgq1hgc"; buildDepends = [ base64Bytestring cereal cprngAes cryptoApi cryptocipher entropy - skein + skein tagged ]; meta = { homepage = "http://github.com/snoyberg/clientsession/tree/master"; From ddd28ba45217e99e3d3efe46125fcc872485a102 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Tue, 29 Nov 2011 15:32:44 +0000 Subject: [PATCH 744/970] haskell-http-enumerator: updated to version 0.7.1.6 svn path=/nixpkgs/trunk/; revision=30622 --- .../development/libraries/haskell/http-enumerator/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/http-enumerator/default.nix b/pkgs/development/libraries/haskell/http-enumerator/default.nix index c6b2702c6e1..8fc9e03fdba 100644 --- a/pkgs/development/libraries/haskell/http-enumerator/default.nix +++ b/pkgs/development/libraries/haskell/http-enumerator/default.nix @@ -7,8 +7,8 @@ cabal.mkDerivation (self: { pname = "http-enumerator"; - version = "0.7.1.5"; - sha256 = "1ycbw6r7nsp59ncchrsb60qyyvf74pf43fyr44invhv1hjh5cb61"; + version = "0.7.1.6"; + sha256 = "0jkjysg89i5fajnmxpg0x5swgvz80ms00j6awd8dsn3mrsaw9x34"; isLibrary = true; isExecutable = true; buildDepends = [ From b9bbcf90f115a40d5d8388a61ac798f9a58249f6 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Tue, 29 Nov 2011 15:32:48 +0000 Subject: [PATCH 745/970] haskell-iteratee: updated to version 0.8.7.4 svn path=/nixpkgs/trunk/; revision=30623 --- pkgs/development/libraries/haskell/iteratee/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/iteratee/default.nix b/pkgs/development/libraries/haskell/iteratee/default.nix index e56ff8890b6..e7e690654e0 100644 --- a/pkgs/development/libraries/haskell/iteratee/default.nix +++ b/pkgs/development/libraries/haskell/iteratee/default.nix @@ -3,8 +3,8 @@ cabal.mkDerivation (self: { pname = "iteratee"; - version = "0.8.7.3"; - sha256 = "1aqrqsd4q3isvv8dxaq61sgkns6lr7xabmllxp717f1jrnij7f54"; + version = "0.8.7.4"; + sha256 = "08smgb4xad8zpjzjrpjpv3vindhwgbcsf4rgipnrpyvz6mrg4w9i"; isLibrary = true; isExecutable = true; buildDepends = [ From fff3298d7592aadc36631512161498c1f59a5be9 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Tue, 29 Nov 2011 15:32:52 +0000 Subject: [PATCH 746/970] haskell-hlint: updated to version 1.8.20 svn path=/nixpkgs/trunk/; revision=30624 --- pkgs/development/tools/haskell/hlint/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/haskell/hlint/default.nix b/pkgs/development/tools/haskell/hlint/default.nix index a3b5296f01e..1e4b04db04a 100644 --- a/pkgs/development/tools/haskell/hlint/default.nix +++ b/pkgs/development/tools/haskell/hlint/default.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "hlint"; - version = "1.8.19"; - sha256 = "0nbj5nkwmiadkp7h8nbx2xg79mvgd97hm9wk0nmfv9ncwnkz9xcc"; + version = "1.8.20"; + sha256 = "0nkvlvax2yv8lqq7axnghdw38fj6r44y78ss23yxqqav7q046vyh"; isLibrary = true; isExecutable = true; buildDepends = [ From f3b7b7d69e3f88d24bc79704a244bb4fa1d26bb2 Mon Sep 17 00:00:00 2001 From: Shea Levy Date: Tue, 29 Nov 2011 16:47:28 +0000 Subject: [PATCH 747/970] Linux 3.1.4 svn path=/nixpkgs/trunk/; revision=30625 --- pkgs/os-specific/linux/kernel/linux-3.1.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/linux-3.1.nix b/pkgs/os-specific/linux/kernel/linux-3.1.nix index 8688d805054..fbbcf5aaf52 100644 --- a/pkgs/os-specific/linux/kernel/linux-3.1.nix +++ b/pkgs/os-specific/linux/kernel/linux-3.1.nix @@ -215,7 +215,7 @@ in import ./generic.nix ( rec { - version = "3.1.2"; + version = "3.1.4"; preConfigure = '' substituteInPlace scripts/depmod.sh --replace '-b "$INSTALL_MOD_PATH"' "" @@ -223,7 +223,7 @@ import ./generic.nix ( src = fetchurl { url = "mirror://kernel/linux/kernel/v3.x/linux-${version}.tar.bz2"; - sha256 = "1h1k2rdk3a2vsjcm0vd0ihflv8znq09vzvllxzlw6fy1awfkainb"; + sha256 = "0wd43q1m11d4s5ab2kwnga4jvi5racqwlg4pmcp4fqim0q8jl9g6"; }; config = configWithPlatform stdenv.platform; From 46d3cd449fcaf76c73570834ec4ecc1bb7adb6c2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= Date: Tue, 29 Nov 2011 22:54:00 +0000 Subject: [PATCH 748/970] Samba: Add a cross-compilable variant. svn path=/nixpkgs/trunk/; revision=30627 --- pkgs/servers/samba/default.nix | 45 +++++++++++++++++++-------------- pkgs/top-level/all-packages.nix | 9 +++++++ 2 files changed, 35 insertions(+), 19 deletions(-) diff --git a/pkgs/servers/samba/default.nix b/pkgs/servers/samba/default.nix index a6ade7400e8..42d577c55fa 100644 --- a/pkgs/servers/samba/default.nix +++ b/pkgs/servers/samba/default.nix @@ -1,5 +1,6 @@ -{ stdenv, fetchurl, readline, pam, openldap, popt, iniparser, libunwind, fam -, acl, cups +{ stdenv, fetchurl, readline, pam ? null, openldap ? null +, popt, iniparser, libunwind +, fam ? null , acl ? null, cups ? null , useKerberos ? false, kerberos ? null, winbind ? true # Eg. smbclient and smbspool require a smb.conf file. @@ -14,11 +15,7 @@ }: -let - - useWith = flag: option: if flag then "--with-"+option else ""; - -in +assert useKerberos -> kerberos != null; stdenv.mkDerivation rec { name = "samba-3.6.1"; @@ -38,19 +35,29 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; - preConfigure = "cd source3"; + postPatch = + # XXX: Awful hack to allow cross-compilation. + '' sed -i source3/configure \ + -e 's/^as_fn_error \("cannot run test program while cross compiling\)/$as_echo \1/g' + ''; - configureFlags = '' - --with-pam - --with-aio-support - --with-pam_smbpass - --disable-swat - --with-configdir=${configDir} - --with-fhs - --localstatedir=/var - ${useWith winbind "winbind"} - ${if stdenv.gcc.libc != null then "--with-libiconv=${stdenv.gcc.libc}" else ""} - ''; + preConfigure = + '' cd source3 + export samba_cv_CC_NEGATIVE_ENUM_VALUES=yes + export libreplace_cv_HAVE_GETADDRINFO=yes + export ac_cv_file__proc_sys_kernel_core_pattern=no # XXX: true on Linux, false elsewhere + ''; + + configureFlags = + stdenv.lib.optionals (pam != null) [ "--with-pam" "--with-pam_smbpass" ] + ++ [ "--with-aio-support" + "--disable-swat" + "--with-configdir=${configDir}" + "--with-fhs" + "--localstatedir=/var" + ] + ++ (stdenv.lib.optional winbind "--with-winbind") + ++ (stdenv.lib.optional (stdenv.gcc.libc != null) "--with-libiconv=${stdenv.gcc.libc}"); # Need to use a DESTDIR because `make install' tries to write in /var and /etc. installFlags = "DESTDIR=$(TMPDIR)/inst"; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 1df28d6f432..79c3b6c59b1 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -5054,6 +5054,15 @@ let samba = callPackage ../servers/samba { }; + # A lightweight Samba, useful for non-Linux-based OSes. + samba_light = callPackage ../servers/samba { + pam = null; + fam = null; + cups = null; + acl = null; + openldap = null; + }; + shishi = callPackage ../servers/shishi { # GNU Shishi 1.0.0 fails to build with GnuTLS 3.x. gnutls = gnutls2; From 8404afcfe430da27302a8d1c91f2990c5616b8e0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= Date: Tue, 29 Nov 2011 22:54:12 +0000 Subject: [PATCH 749/970] GCC 4.6: Incorporate changes made in 4.5 to support cross-builds to GNU. svn path=/nixpkgs/trunk/; revision=30628 --- pkgs/development/compilers/gcc-4.6/builder.sh | 5 ----- pkgs/development/compilers/gcc-4.6/default.nix | 14 ++++++++++++-- 2 files changed, 12 insertions(+), 7 deletions(-) diff --git a/pkgs/development/compilers/gcc-4.6/builder.sh b/pkgs/development/compilers/gcc-4.6/builder.sh index 8e1b3c8e407..6cd64bc58f2 100644 --- a/pkgs/development/compilers/gcc-4.6/builder.sh +++ b/pkgs/development/compilers/gcc-4.6/builder.sh @@ -5,11 +5,6 @@ export NIX_FIXINC_DUMMY=$NIX_BUILD_TOP/dummy mkdir $NIX_FIXINC_DUMMY -# libstdc++ needs this; otherwise it will use /lib/cpp, which is a Bad -# Thing. -export CPP="gcc -E" -export CXXCPP="g++ -E" - if test "$staticCompiler" = "1"; then EXTRA_LDFLAGS="-static" else diff --git a/pkgs/development/compilers/gcc-4.6/default.nix b/pkgs/development/compilers/gcc-4.6/default.nix index 71ca99b3c13..03d3b235f10 100644 --- a/pkgs/development/compilers/gcc-4.6/default.nix +++ b/pkgs/development/compilers/gcc-4.6/default.nix @@ -153,13 +153,17 @@ stdenv.mkDerivation ({ postPatch = if (stdenv.system == "i586-pc-gnu" + || (libcCross != null # e.g., building `gcc.hostDrv' + && libcCross ? crossConfig + && libcCross.crossConfig == "i586-pc-gnu") || (cross != null && cross.config == "i586-pc-gnu" && libcCross != null)) then # On GNU/Hurd glibc refers to Hurd & Mach headers and libpthread is not # in glibc, so add the right `-I' flags to the default spec string. + assert libcCross != null -> libpthreadCross != null; let - libc = if cross != null then libcCross else stdenv.glibc; + libc = if libcCross != null then libcCross else stdenv.glibc; gnu_h = "gcc/config/gnu.h"; i386_gnu_h = "gcc/config/i386/gnu.h"; extraCPPDeps = @@ -181,12 +185,18 @@ stdenv.mkDerivation ({ echo "augmenting \`LIB_SPEC' in \`${gnu_h}' with \`${extraLibSpec}'..." sed -i "${gnu_h}" \ -es'|LIB_SPEC *"\(.*\)$|LIB_SPEC "${extraLibSpec} \1|g' + + echo "setting \`NATIVE_SYSTEM_HEADER_DIR' and \`STANDARD_INCLUDE_DIR' to \`${libc}/include'..." + sed -i "${gnu_h}" \ + -es'|#define STANDARD_INCLUDE_DIR.*$|#define STANDARD_INCLUDE_DIR "${libc}/include"|g' + sed -i gcc/config/t-gnu \ + -es'|NATIVE_SYSTEM_HEADER_DIR.*$|NATIVE_SYSTEM_HEADER_DIR = ${libc}/include|g' '' else if cross != null || stdenv.gcc.libc != null then # On NixOS, use the right path to the dynamic linker instead of # `/lib/ld*.so'. let - libc = if (cross != null && libcCross != null) then libcCross else stdenv.gcc.libc; + libc = if (libcCross != null) then libcCross else stdenv.gcc.libc; in '' echo "fixing the \`GLIBC_DYNAMIC_LINKER' and \`UCLIBC_DYNAMIC_LINKER' macros..." for header in "gcc/config/"*-gnu.h "gcc/config/"*"/"*.h From 05a447e462c7ce300aad03061e3a715489b0b9eb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= Date: Tue, 29 Nov 2011 22:54:22 +0000 Subject: [PATCH 750/970] Cross-build GCC 4.6 for GNU on Hydra. svn path=/nixpkgs/trunk/; revision=30629 --- pkgs/top-level/release-cross.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/top-level/release-cross.nix b/pkgs/top-level/release-cross.nix index b7fbdc78421..37af6543721 100644 --- a/pkgs/top-level/release-cross.nix +++ b/pkgs/top-level/release-cross.nix @@ -190,6 +190,7 @@ in { boehmgc.hostDrv = nativePlatforms; findutils.hostDrv = nativePlatforms; gcc.hostDrv = nativePlatforms; + gcc46.hostDrv = nativePlatforms; gdb.hostDrv = nativePlatforms; gmp.hostDrv = nativePlatforms; gnugrep.hostDrv = nativePlatforms; From d10ed1b45b4eac9d8916dd3b6fed6a8155644395 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Tue, 29 Nov 2011 22:56:29 +0000 Subject: [PATCH 751/970] * Bump. svn path=/nixpkgs/trunk/; revision=30630 --- pkgs/tools/package-management/nix/unstable.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/package-management/nix/unstable.nix b/pkgs/tools/package-management/nix/unstable.nix index a9ff2eb769a..1e7a7f87288 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.0pre30543"; + name = "nix-1.0pre30626"; src = fetchurl { - url = "http://hydra.nixos.org/build/1568572/download/4/${name}.tar.bz2"; - sha256 = "72add30fe142c32aacc1c992456e663645685cf14d36ffa356bd469480cae4c3"; + url = "http://hydra.nixos.org/build/1575015/download/4/${name}.tar.bz2"; + sha256 = "a0ab32125224fa544d0e1979bbb4d1a1ef35b0a6047396e66629f4a8f8187b77"; }; buildNativeInputs = [ perl pkgconfig ]; From 7471f5371f834ba3c92ac4e050b1db227ad81348 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Tue, 29 Nov 2011 22:59:38 +0000 Subject: [PATCH 752/970] * Oops, forgot to commit. svn path=/nixpkgs/trunk/; revision=30631 --- pkgs/top-level/perl-packages.nix | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index a993171ff8c..1cd47d4597d 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -409,6 +409,15 @@ rec { ]; }; + CatalystPluginAccessLog = buildPerlPackage rec { + name = "Catalyst-Plugin-AccessLog-1.04"; + src = fetchurl { + url = "mirror://cpan/modules/by-module/Catalyst/${name}.tar.gz"; + sha256 = "1cbbg6fviyv398lyhmv14ya0v0h0xs04d29zz9r49vzsbw6shy33"; + }; + propagatedBuildInputs = [ CatalystRuntime DateTime ]; + }; + CatalystPluginAuthentication = buildPerlPackage rec { name = "Catalyst-Plugin-Authentication-0.10018"; src = fetchurl { From e3323c43111cda7810c9a6df804c8995a9d15e5c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= Date: Wed, 30 Nov 2011 11:19:07 +0000 Subject: [PATCH 753/970] ISL 0.08, with some simplifications. svn path=/nixpkgs/trunk/; revision=30632 --- pkgs/development/libraries/isl/default.nix | 23 ++++++++-------------- 1 file changed, 8 insertions(+), 15 deletions(-) diff --git a/pkgs/development/libraries/isl/default.nix b/pkgs/development/libraries/isl/default.nix index 8a59c338711..b7e7ee413b9 100644 --- a/pkgs/development/libraries/isl/default.nix +++ b/pkgs/development/libraries/isl/default.nix @@ -1,31 +1,24 @@ {stdenv, fetchurl, gmp, static ? false}: -let - version = "0.06"; - staticFlags = if static then " --enable-static --disable-shared" else ""; -in - stdenv.mkDerivation rec { - name = "isl-${version}"; - + name = "isl-0.08"; + src = fetchurl { - url = "http://www.kotnet.org/~skimo/isl/isl-${version}.tar.bz2"; - sha256 = "0w1i1m94w0jkmm0bzlp08c4r97j7yp0d7crxf28524b9mgbg0mwk"; + url = "http://www.kotnet.org/~skimo/isl/${name}.tar.bz2"; + sha256 = "16rqvajcp9x6j76mg9q6bprqkgsm1zprx50j90s6v996y7ww3j9l"; }; buildInputs = [ gmp ]; - dontDisableStatic = if static then true else false; - configureFlags = "--with-gmp-prefix=${gmp}" + staticFlags; - crossAttrs = { - configureFlags = configureFlags + " --with-gmp-prefix=${gmp.hostDrv} "; - }; + dontDisableStatic = static; + configureFlags = + stdenv.lib.optionals static [ " --enable-static" "--disable-shared" ]; meta = { homepage = http://www.kotnet.org/~skimo/isl/; license = "LGPLv2.1"; description = "A library for manipulating sets and relations of integer points bounded by linear constraints."; maintainers = [ stdenv.lib.maintainers.shlevy ]; + platforms = stdenv.lib.platforms.all; }; } - From a90a55309f50a163be0e98d8c184b2a62e7231c7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= Date: Wed, 30 Nov 2011 14:25:54 +0000 Subject: [PATCH 754/970] ISL: Downgrade to 0.07 so that CLooG builds. svn path=/nixpkgs/trunk/; revision=30634 --- pkgs/development/libraries/isl/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/isl/default.nix b/pkgs/development/libraries/isl/default.nix index b7e7ee413b9..2261baba030 100644 --- a/pkgs/development/libraries/isl/default.nix +++ b/pkgs/development/libraries/isl/default.nix @@ -1,11 +1,11 @@ {stdenv, fetchurl, gmp, static ? false}: stdenv.mkDerivation rec { - name = "isl-0.08"; + name = "isl-0.07"; # CLooG 0.16.3 fails to build with ISL 0.08. src = fetchurl { url = "http://www.kotnet.org/~skimo/isl/${name}.tar.bz2"; - sha256 = "16rqvajcp9x6j76mg9q6bprqkgsm1zprx50j90s6v996y7ww3j9l"; + sha256 = "0kpxmvhrwwdygqqafqzjf9xiksq7paac2x24g9jhr3f9ajj3zkyx"; }; buildInputs = [ gmp ]; From 80067c9a0ff2fd321449c045d8ffa321c9332cd3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= Date: Wed, 30 Nov 2011 14:25:59 +0000 Subject: [PATCH 755/970] CLooG 0.16.3, along with simplifications. svn path=/nixpkgs/trunk/; revision=30635 --- pkgs/development/libraries/cloog/default.nix | 20 ++++++-------------- 1 file changed, 6 insertions(+), 14 deletions(-) diff --git a/pkgs/development/libraries/cloog/default.nix b/pkgs/development/libraries/cloog/default.nix index 93af6d18b14..7bd0d68c3ec 100644 --- a/pkgs/development/libraries/cloog/default.nix +++ b/pkgs/development/libraries/cloog/default.nix @@ -1,31 +1,23 @@ { fetchurl, stdenv, gmp, isl, static ? false }: -let - staticFlags = - assert static -> isl.dontDisableStatic == true; - if static then "--enable-static --disable-shared" else ""; - -in +assert static -> isl.dontDisableStatic; stdenv.mkDerivation rec { - name = "cloog-0.16.2"; + name = "cloog-0.16.3"; src = fetchurl { url = "http://www.bastoul.net/cloog/pages/download/count.php3?url=./${name}.tar.gz"; - sha256 = "1w9n9lsq18k65fywwbbvhkgl917053w1kvqw0xhlwcma0v59m6mx"; + sha256 = "0lzbsszfzsr0jfwkccfbsvx913d2yc45dqwa472plmxkhbwykmc9"; }; buildInputs = [ gmp ]; propagatedBuildInputs = [ isl ]; - configureFlags = "--with-isl=system --with-isl-prefix=${isl}" + staticFlags; - - dontDisableStatic = if static then true else false; + configureFlags = [ "--with-isl=system" ] + ++ (stdenv.lib.optionals static [ "--enable-static" "--disable-shared" ]); - crossAttrs = { - configureFlags = "--with-isl=system --with-isl-prefix=${isl.hostDrv}" + staticFlags; - }; + dontDisableStatic = static; doCheck = true; From ccd4e5596711baa5a47f11e28ce84cac91cc9020 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Wed, 30 Nov 2011 14:26:22 +0000 Subject: [PATCH 756/970] * Remove nixPerl, it's obsolete. svn path=/nixpkgs/trunk/; revision=30636 --- pkgs/top-level/perl-packages.nix | 11 ----------- 1 file changed, 11 deletions(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 1cd47d4597d..21353664ac4 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -2587,17 +2587,6 @@ rec { propagatedBuildInputs = [JSONAny Encode LWP CryptSSLeay]; }; - nixPerl = buildPerlPackage { - name = "Nix-1.0pre29083"; - src = fetchsvn { - url = https://svn.nixos.org/repos/nix/nix-perl/trunk; - rev = 29083; - sha256 = "02wfy4l355s57w7lrynbwx97nlxvasx3xfsn72gla0i8mg6pdgaw"; - }; - NIX_PREFIX = pkgs.nixUnstable; - doCheck = false; # tests currently don't work - }; - NumberCompare = buildPerlPackage rec { name = "Number-Compare-0.01"; src = fetchurl { From a56033ea14d6cbd804727990eb84bf6d121d0e78 Mon Sep 17 00:00:00 2001 From: Sander van der Burg Date: Wed, 30 Nov 2011 14:44:29 +0000 Subject: [PATCH 757/970] Bumped virtualbox version to 4.1.6 svn path=/nixpkgs/trunk/; revision=30637 --- pkgs/applications/virtualization/virtualbox/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/virtualization/virtualbox/default.nix b/pkgs/applications/virtualization/virtualbox/default.nix index 6fd4f9d148e..d435f53e109 100644 --- a/pkgs/applications/virtualization/virtualbox/default.nix +++ b/pkgs/applications/virtualization/virtualbox/default.nix @@ -4,14 +4,14 @@ , xorriso, makeself, perl, jdk }: -let version = "4.1.2"; in +let version = "4.1.6"; in stdenv.mkDerivation { name = "virtualbox-${version}-${kernel.version}"; src = fetchurl { url = "http://download.virtualbox.org/virtualbox/${version}/VirtualBox-${version}.tar.bz2"; - sha256 = "1g3nqlxk4bxkq5yqwk0mrn50mz5y0kxpcn0hq5f81bbb9niglc5h"; + sha256 = "0zmbq0h9g4lamzmxqg281nr9pp88606dxh2dsw6vy1m86g5kfham"; }; buildInputs = [iasl dev86 libxslt libxml2 xproto libX11 libXext libXcursor qt4 libIDL SDL hal libcap glib kernel python alsaLib curl pam xorriso makeself perl jdk ]; From dd4841e8335ab3c16f01499433baa08b9f09a3e2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= Date: Thu, 1 Dec 2011 10:59:26 +0000 Subject: [PATCH 758/970] OpenSSL: Fix compilation on x86_64-freebsd. svn path=/nixpkgs/trunk/; revision=30642 --- pkgs/development/libraries/openssl/default.nix | 4 +++- .../libraries/openssl/freebsd-x86_64-asm.patch | 16 ++++++++++++++++ 2 files changed, 19 insertions(+), 1 deletion(-) create mode 100644 pkgs/development/libraries/openssl/freebsd-x86_64-asm.patch diff --git a/pkgs/development/libraries/openssl/default.nix b/pkgs/development/libraries/openssl/default.nix index c8b7aece86e..45d269a918b 100644 --- a/pkgs/development/libraries/openssl/default.nix +++ b/pkgs/development/libraries/openssl/default.nix @@ -21,7 +21,9 @@ stdenv.mkDerivation { sha256 = "1nr0cf6pf8i4qsnx31kqhiqv402xgn76yhjhlbdri8ma1hgislcj"; }; - patches = stdenv.lib.optional stdenv.isDarwin ./darwin-arch.patch; + patches = + stdenv.lib.optional stdenv.isDarwin ./darwin-arch.patch + ++ stdenv.lib.optional (stdenv.system == "x86_64-freebsd") ./freebsd-x86_64-asm.patch; buildNativeInputs = [ perl ]; diff --git a/pkgs/development/libraries/openssl/freebsd-x86_64-asm.patch b/pkgs/development/libraries/openssl/freebsd-x86_64-asm.patch new file mode 100644 index 00000000000..f52e4dac25f --- /dev/null +++ b/pkgs/development/libraries/openssl/freebsd-x86_64-asm.patch @@ -0,0 +1,16 @@ +Patch for . +Fixes compilation on FreeBSD 8.2 with GNU Make 3.81. + +diff --git a/crypto/perlasm/x86_64-xlate.pl b/crypto/perlasm/x86_64-xlate.pl +index e47116b..dc500ae 100755 +--- a/crypto/perlasm/x86_64-xlate.pl ++++ b/crypto/perlasm/x86_64-xlate.pl +@@ -66,7 +66,7 @@ if ($flavour =~ /\./) { $output = $flavour; undef $flavour; } + my ($outdev,$outino,@junk)=stat($output); + + open STDOUT,">$output" || die "can't open $output: $!" +- if ($stddev!=$outdev || $stdino!=$outino); ++ if (!defined($outdev) || $stddev!=$outdev || $stdino!=$outino); + } + + my $gas=1; $gas=0 if ($output =~ /\.asm$/); From d7cac3194e9677d8da27298b13aea0cd69bcc0c8 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Thu, 1 Dec 2011 11:26:49 +0000 Subject: [PATCH 759/970] bridge-utils: updated to version 1.5 svn path=/nixpkgs/trunk/; revision=30643 --- pkgs/os-specific/linux/bridge-utils/default.nix | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/pkgs/os-specific/linux/bridge-utils/default.nix b/pkgs/os-specific/linux/bridge-utils/default.nix index cadc49195e3..029f7ed6e29 100644 --- a/pkgs/os-specific/linux/bridge-utils/default.nix +++ b/pkgs/os-specific/linux/bridge-utils/default.nix @@ -1,18 +1,21 @@ { stdenv, fetchurl, autoconf, automake }: -stdenv.mkDerivation rec { - name = "bridge-utils-1.4"; +let + name = "bridge-utils-1.5"; +in +stdenv.mkDerivation { + inherit name; src = fetchurl { url = "mirror://sourceforge/bridge/${name}.tar.gz"; - sha256 = "0csrvpjx1n5fzscdrc0xky3rnaxi90rylqciha5sl0n3pklpasc7"; + sha256 = "42f9e5fb8f6c52e63a98a43b81bd281c227c529f194913e1c51ec48a393b6688"; }; buildInputs = [ autoconf automake ]; preConfigure = "autoreconf"; - meta = { + meta = { description = "http://sourceforge.net/projects/bridge/"; homepage = [ "http://www.linux-foundation.org/en/Net:Bridge/" "http://sourceforge.net/projects/bridge/" ]; license = "GPL"; From f8e579bcf07eaf28f662b49a8e992bb4d025e433 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Thu, 1 Dec 2011 13:34:55 +0000 Subject: [PATCH 760/970] haskell-syb: added version 0.3.5 svn path=/nixpkgs/trunk/; revision=30644 --- .../development/libraries/haskell/syb/0.3.5.nix | 17 +++++++++++++++++ pkgs/top-level/haskell-packages.nix | 4 ++-- 2 files changed, 19 insertions(+), 2 deletions(-) create mode 100644 pkgs/development/libraries/haskell/syb/0.3.5.nix diff --git a/pkgs/development/libraries/haskell/syb/0.3.5.nix b/pkgs/development/libraries/haskell/syb/0.3.5.nix new file mode 100644 index 00000000000..f15911c08bd --- /dev/null +++ b/pkgs/development/libraries/haskell/syb/0.3.5.nix @@ -0,0 +1,17 @@ +{ cabal }: + +cabal.mkDerivation (self: { + pname = "syb"; + version = "0.3.5"; + sha256 = "17gwhn0rqjf9zkx1dsmsaj41qdjlk4mq5lzpqkgy3slq30nwwwbr"; + meta = { + homepage = "http://www.cs.uu.nl/wiki/GenericProgramming/SYB"; + description = "Scrap Your Boilerplate"; + license = self.stdenv.lib.licenses.bsd3; + platforms = self.ghc.meta.platforms; + maintainers = [ + self.stdenv.lib.maintainers.andres + self.stdenv.lib.maintainers.simons + ]; + }; +}) diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix index d73aac05155..41beedc1083 100644 --- a/pkgs/top-level/haskell-packages.nix +++ b/pkgs/top-level/haskell-packages.nix @@ -139,7 +139,7 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y); regexCompat = self.regexCompat_0_93_1; # 7.2 ok, 7.3 ok regexPosix = self.regexPosix_0_94_4; # 7.2 ok, 7.3 ok stm = self.stm_2_2_0_1; # 7.2 ok, 7.3 ok - syb = self.syb_0_3_3; # 7.2 ok, 7.3 ok + syb = self.syb_0_3_5; # 7.2 ok, 7.3 ok xhtml = self.xhtml_3000_2_0_1; # 7.2 ok, 7.3 ok zlib = self.zlib_0_5_3_1; # 7.2 ok, 7.3 ok HTTP = self.HTTP_4000_1_2; # 7.2 ok, 7.3 ok @@ -1098,7 +1098,7 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y); syb_0_2_2 = callPackage ../development/libraries/haskell/syb/0.2.2.nix {}; syb_0_3 = callPackage ../development/libraries/haskell/syb/0.3.nix {}; - syb_0_3_3 = callPackage ../development/libraries/haskell/syb/0.3.3.nix {}; + syb_0_3_5 = callPackage ../development/libraries/haskell/syb/0.3.5.nix {}; syb02 = self.syb_0_2_2; syb03 = self.syb_0_3; syb = null; # by default, we assume that syb ships with GHC, which is From 43e2eb6b05b48179b869092204b8473338ecd971 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Thu, 1 Dec 2011 13:34:58 +0000 Subject: [PATCH 761/970] haskell-hashtables: updated to version 1.0.1.0 svn path=/nixpkgs/trunk/; revision=30645 --- pkgs/development/libraries/haskell/hashtables/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/hashtables/default.nix b/pkgs/development/libraries/haskell/hashtables/default.nix index 809b0cefbf7..ece171abe35 100644 --- a/pkgs/development/libraries/haskell/hashtables/default.nix +++ b/pkgs/development/libraries/haskell/hashtables/default.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "hashtables"; - version = "1.0.0.0"; - sha256 = "1i7hf7cfj1gqkb4h00a4frflxw3af7rdd1h0pdlv18clinsk6668"; + version = "1.0.1.0"; + sha256 = "0a2cfm649smryxfkv61yd8vjl1wyly468xa1l4jb50jxzyyw42z5"; buildDepends = [ hashable primitive vector ]; meta = { homepage = "http://github.com/gregorycollins/hashtables"; From 66b26b18d9e1b70b63531833c61248e6c3182840 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Thu, 1 Dec 2011 13:35:04 +0000 Subject: [PATCH 762/970] haskell-http-enumerator: updated to version 0.7.1.7 svn path=/nixpkgs/trunk/; revision=30646 --- .../development/libraries/haskell/http-enumerator/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/http-enumerator/default.nix b/pkgs/development/libraries/haskell/http-enumerator/default.nix index 8fc9e03fdba..e6db8be2c71 100644 --- a/pkgs/development/libraries/haskell/http-enumerator/default.nix +++ b/pkgs/development/libraries/haskell/http-enumerator/default.nix @@ -7,8 +7,8 @@ cabal.mkDerivation (self: { pname = "http-enumerator"; - version = "0.7.1.6"; - sha256 = "0jkjysg89i5fajnmxpg0x5swgvz80ms00j6awd8dsn3mrsaw9x34"; + version = "0.7.1.7"; + sha256 = "0w6sz37miyl6jxwl6zq9440bx4avrr56alq26cbm0qxa824nnpih"; isLibrary = true; isExecutable = true; buildDepends = [ From e457ccf647af681c036ffb11c9eaa3f89be1b1a8 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Thu, 1 Dec 2011 13:35:07 +0000 Subject: [PATCH 763/970] haskell-persistent: updated to version 0.6.4.1 svn path=/nixpkgs/trunk/; revision=30647 --- pkgs/development/libraries/haskell/persistent/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/persistent/default.nix b/pkgs/development/libraries/haskell/persistent/default.nix index 70677d0f336..bab533f6db1 100644 --- a/pkgs/development/libraries/haskell/persistent/default.nix +++ b/pkgs/development/libraries/haskell/persistent/default.nix @@ -4,8 +4,8 @@ cabal.mkDerivation (self: { pname = "persistent"; - version = "0.6.4"; - sha256 = "149dk6i6w36rq3z6zzrcmpr0kxpp6hk0qpc43vwj0dm68nrffaqk"; + version = "0.6.4.1"; + sha256 = "06l04yb49iiw4lyyy1vk138v3g2jh8xwd4bzpcagkh62jrvq559a"; buildDepends = [ blazeHtml dataObject enumerator monadControl mtl pathPieces pool text time transformers From 608c56e845822438e0485d6f903d83b6b55f4d74 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Thu, 1 Dec 2011 13:35:10 +0000 Subject: [PATCH 764/970] haskell-tls: updated to version 0.8.3 svn path=/nixpkgs/trunk/; revision=30648 --- pkgs/development/libraries/haskell/tls/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/tls/default.nix b/pkgs/development/libraries/haskell/tls/default.nix index b4d6dc5e83b..45925be982b 100644 --- a/pkgs/development/libraries/haskell/tls/default.nix +++ b/pkgs/development/libraries/haskell/tls/default.nix @@ -4,8 +4,8 @@ cabal.mkDerivation (self: { pname = "tls"; - version = "0.8.2"; - sha256 = "0306f7im6dclr2h50wvb7rw9r1zc5492hgqm3m33y1nlci319qx8"; + version = "0.8.3"; + sha256 = "0l02kx06bf3p8rjz82d3x7cz61rh5vpb9147f4csbzfb1sgh5mzy"; isLibrary = true; isExecutable = true; buildDepends = [ From 3e6968a624c9ff5020eeb01e504229118f759b4d Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Thu, 1 Dec 2011 13:35:14 +0000 Subject: [PATCH 765/970] haskell-HTTP: updated to version 4000.2.1 svn path=/nixpkgs/trunk/; revision=30649 --- .../libraries/haskell/HTTP/3001.1.5.nix | 18 ------------------ .../HTTP/{4000.1.2.nix => 4000.2.1.nix} | 6 +++--- pkgs/top-level/haskell-packages.nix | 7 +++---- 3 files changed, 6 insertions(+), 25 deletions(-) delete mode 100644 pkgs/development/libraries/haskell/HTTP/3001.1.5.nix rename pkgs/development/libraries/haskell/HTTP/{4000.1.2.nix => 4000.2.1.nix} (73%) diff --git a/pkgs/development/libraries/haskell/HTTP/3001.1.5.nix b/pkgs/development/libraries/haskell/HTTP/3001.1.5.nix deleted file mode 100644 index d16db78d8f4..00000000000 --- a/pkgs/development/libraries/haskell/HTTP/3001.1.5.nix +++ /dev/null @@ -1,18 +0,0 @@ -{ cabal, network, parsec }: - -cabal.mkDerivation (self: { - pname = "HTTP"; - version = "3001.1.5"; - sha256 = "e34d9f979bafbbf2e45bf90a9ee9bfd291f3c67c291a250cc0a6378431578aeb"; - buildDepends = [ network parsec ]; - meta = { - homepage = "http://www.haskell.org/http/"; - description = "A library for client-side HTTP"; - license = self.stdenv.lib.licenses.bsd3; - platforms = self.ghc.meta.platforms; - maintainers = [ - self.stdenv.lib.maintainers.andres - self.stdenv.lib.maintainers.simons - ]; - }; -}) diff --git a/pkgs/development/libraries/haskell/HTTP/4000.1.2.nix b/pkgs/development/libraries/haskell/HTTP/4000.2.1.nix similarity index 73% rename from pkgs/development/libraries/haskell/HTTP/4000.1.2.nix rename to pkgs/development/libraries/haskell/HTTP/4000.2.1.nix index 5dcb4cbe618..a707189ed5e 100644 --- a/pkgs/development/libraries/haskell/HTTP/4000.1.2.nix +++ b/pkgs/development/libraries/haskell/HTTP/4000.2.1.nix @@ -2,11 +2,11 @@ cabal.mkDerivation (self: { pname = "HTTP"; - version = "4000.1.2"; - sha256 = "19vcy8xinrvn01caly6sg1p1yvbbf7nwq10kxmnwqssnl4h5cwn8"; + version = "4000.2.1"; + sha256 = "01076rk7ly5228pszn54x4nqc6rqq1xw11ij9ajvhzf419islh0a"; buildDepends = [ mtl network parsec ]; meta = { - homepage = "http://projects.haskell.org/http/"; + homepage = "https://github.com/haskell/HTTP"; description = "A library for client-side HTTP"; license = self.stdenv.lib.licenses.bsd3; platforms = self.ghc.meta.platforms; diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix index 41beedc1083..3e34504434c 100644 --- a/pkgs/top-level/haskell-packages.nix +++ b/pkgs/top-level/haskell-packages.nix @@ -142,7 +142,7 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y); syb = self.syb_0_3_5; # 7.2 ok, 7.3 ok xhtml = self.xhtml_3000_2_0_1; # 7.2 ok, 7.3 ok zlib = self.zlib_0_5_3_1; # 7.2 ok, 7.3 ok - HTTP = self.HTTP_4000_1_2; # 7.2 ok, 7.3 ok + HTTP = self.HTTP_4000_2_1; # 7.2 ok, 7.3 ok deepseq = self.deepseq_1_1_0_2; # 7.2 ok, 7.3 ok text = self.text_0_11_1_9; # 7.2 ok, 7.3 ok transformers = self.transformers_0_2_2_0; # 7.2 ok, 7.3 ok @@ -691,12 +691,11 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y); haskellSrcMeta = callPackage ../development/libraries/haskell/haskell-src-meta {}; - HTTP_3001_1_5 = callPackage ../development/libraries/haskell/HTTP/3001.1.5.nix {}; HTTP_4000_0_6 = callPackage ../development/libraries/haskell/HTTP/4000.0.6.nix {}; HTTP_4000_0_9 = callPackage ../development/libraries/haskell/HTTP/4000.0.9.nix {}; HTTP_4000_1_1 = callPackage ../development/libraries/haskell/HTTP/4000.1.1.nix {}; - HTTP_4000_1_2 = callPackage ../development/libraries/haskell/HTTP/4000.1.2.nix {}; - HTTP = self.HTTP_4000_0_6; + HTTP_4000_2_1 = callPackage ../development/libraries/haskell/HTTP/4000.2.1.nix {}; + HTTP = self.HTTP_4000_2_1; hackageDb = callPackage ../development/libraries/haskell/hackage-db {}; From 104c28a738e9bc3b629356b0bae5ffead74caf2d Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Thu, 1 Dec 2011 13:35:18 +0000 Subject: [PATCH 766/970] haskell-authenticate: updated to version 0.10.3.1 svn path=/nixpkgs/trunk/; revision=30650 --- .../libraries/haskell/authenticate/default.nix | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/pkgs/development/libraries/haskell/authenticate/default.nix b/pkgs/development/libraries/haskell/authenticate/default.nix index 2a6fcc1a2cb..3a55192b76a 100644 --- a/pkgs/development/libraries/haskell/authenticate/default.nix +++ b/pkgs/development/libraries/haskell/authenticate/default.nix @@ -1,17 +1,18 @@ { cabal, aeson, attoparsec, base64Bytestring, blazeBuilder , caseInsensitive, enumerator, failure, httpEnumerator, httpTypes , network, random, RSA, SHA, tagsoup, text, time, tls, transformers -, xmlEnumerator +, unorderedContainers, xmlEnumerator }: cabal.mkDerivation (self: { pname = "authenticate"; - version = "0.10.3"; - sha256 = "1sp8yanb8wray3pnakaj7jqsxirjw6ds2f1j2p72p9hn3kcf4255"; + version = "0.10.3.1"; + sha256 = "01xqqnvy2xjcgnp5qq5xiqm1whxywa31cgd79mm290i2r4baiq8s"; buildDepends = [ aeson attoparsec base64Bytestring blazeBuilder caseInsensitive enumerator failure httpEnumerator httpTypes network random RSA SHA - tagsoup text time tls transformers xmlEnumerator + tagsoup text time tls transformers unorderedContainers + xmlEnumerator ]; meta = { homepage = "http://github.com/snoyberg/authenticate/tree/master"; From 95c759a5369e66fc20db6935b14a1e00448e834b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?= Date: Thu, 1 Dec 2011 20:17:42 +0000 Subject: [PATCH 767/970] Fixing xpdf, so it finds the pdf base fonts now. svn path=/nixpkgs/trunk/; revision=30658 --- pkgs/applications/misc/xpdf/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/applications/misc/xpdf/default.nix b/pkgs/applications/misc/xpdf/default.nix index 8cefdd39b3a..d653c972850 100644 --- a/pkgs/applications/misc/xpdf/default.nix +++ b/pkgs/applications/misc/xpdf/default.nix @@ -33,7 +33,7 @@ stdenv.mkDerivation { if test -n \"${base14Fonts}\"; then substituteInPlace $out/etc/xpdfrc \\ --replace /usr/local/share/ghostscript/fonts ${base14Fonts} \\ - --replace '#displayFontT1' displayFontT2 + --replace '#fontFile' fontFile fi "; From 6aa48df3d20e4a3a7aa47d500fce94d00ca08788 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= Date: Thu, 1 Dec 2011 22:43:10 +0000 Subject: [PATCH 768/970] Hydra: Comment out for now. svn path=/nixpkgs/trunk/; revision=30659 --- pkgs/top-level/all-packages.nix | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 79c3b6c59b1..33dfe437e2e 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -841,9 +841,12 @@ let httpfs2 = callPackage ../tools/filesystems/httpfs { }; - hydra = callPackage ../development/tools/misc/hydra { - nix = nixUnstable; - }; + # FIXME: This Hydra snapshot is outdated and depends on the `nixPerl', + # which no longer exists. + # + # hydra = callPackage ../development/tools/misc/hydra { + # nix = nixUnstable; + # }; iasl = callPackage ../development/compilers/iasl { }; From 57b602b5aeec3b0cb7162b28c85ded5d1f35bced Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= Date: Thu, 1 Dec 2011 22:43:17 +0000 Subject: [PATCH 769/970] Remove GNU IceCat 4, which never built. svn path=/nixpkgs/trunk/; revision=30660 --- .../networking/browsers/icecat-4/default.nix | 118 ------------------ .../browsers/icecat-4/rpath-link.patch | 14 --- .../icecat-4/skip-gre-registration.patch | 12 -- pkgs/top-level/all-packages.nix | 26 ---- 4 files changed, 170 deletions(-) delete mode 100644 pkgs/applications/networking/browsers/icecat-4/default.nix delete mode 100644 pkgs/applications/networking/browsers/icecat-4/rpath-link.patch delete mode 100644 pkgs/applications/networking/browsers/icecat-4/skip-gre-registration.patch diff --git a/pkgs/applications/networking/browsers/icecat-4/default.nix b/pkgs/applications/networking/browsers/icecat-4/default.nix deleted file mode 100644 index 9de1b4525a9..00000000000 --- a/pkgs/applications/networking/browsers/icecat-4/default.nix +++ /dev/null @@ -1,118 +0,0 @@ -{ fetchurl, stdenv, xz, pkgconfig, gtk, pango, perl, python, ply, zip, libIDL -, libjpeg, libpng, zlib, cairo, dbus, dbus_glib, bzip2, xlibs, alsaLib -, libnotify, gnome_vfs, libgnomeui -, freetype, fontconfig, wirelesstools ? null, pixman -, application ? "browser" }: - -# Build the WiFi stuff on Linux-based systems. -# FIXME: Disable for now until it can actually be built: -# http://thread.gmane.org/gmane.comp.gnu.gnuzilla/1376 . -#assert stdenv.isLinux -> (wirelesstools != null); - -let version = "4.0.1.1"; in -stdenv.mkDerivation { - name = "icecat-${version}"; - - src = fetchurl { - url = "mirror://gnu/gnuzilla/${version}/icecat-${version}.tar.xz"; - sha256 = "1f1y1834pv8f5fmfb5d4d5gj2v7bxsk3k9b9g832bwq0h5203yvg"; - }; - - buildInputs = - [ xz libgnomeui libnotify gnome_vfs alsaLib - pkgconfig gtk perl zip libIDL libjpeg libpng zlib cairo bzip2 pixman - python ply dbus dbus_glib pango freetype fontconfig - xlibs.libXi xlibs.libX11 xlibs.libXrender xlibs.libXft xlibs.libXt - ] - ++ (stdenv.lib.optional false /* stdenv.isLinux */ wirelesstools); - - patches = [ - ./skip-gre-registration.patch ./rpath-link.patch - ]; - - configureFlags = - [ "--enable-application=${application}" - "--enable-libxul" - "--disable-javaxpcom" - - "--enable-optimize" - "--disable-debug" - "--enable-strip" - "--with-system-jpeg" - "--with-system-zlib" - "--with-system-bz2" - # "--with-system-png" # <-- "--with-system-png won't work because the system's libpng doesn't have APNG support" - "--enable-system-cairo" - #"--enable-system-sqlite" # <-- this seems to be discouraged - "--disable-crashreporter" - ] - ++ (stdenv.lib.optional true /* (!stdenv.isLinux) */ "--disable-necko-wifi"); - - postInstall = '' - export dontPatchELF=1; - - # Strip some more stuff - strip -S "$out/lib/"*"/"* || true - - # This fixes starting IceCat when there already is a running - # instance. The `icecat' wrapper script actually expects to be - # in the same directory as `run-mozilla.sh', apparently. - libDir=$(cd $out/lib && ls -d icecat-[0-9]*) - test -n "$libDir" - - if [ -f "$out/bin/icecat" ] - then - # Fix references to /bin paths in the IceCat shell script. - substituteInPlace $out/bin/icecat \ - --replace /bin/pwd "$(type -tP pwd)" \ - --replace /bin/ls "$(type -tP ls)" - - cd $out/bin - mv icecat ../lib/$libDir/ - ln -s ../lib/$libDir/icecat . - - # Register extensions etc. - echo "running \`icecat -register'..." - (cd $out/lib/$libDir && LD_LIBRARY_PATH=. ./icecat-bin -register) || false - fi - - if [ -f "$out/lib/$libDir/xpidl" ] - then - # XulRunner's IDL compiler. - echo "linking \`xpidl'..." - ln -s "$out/lib/$libDir/xpidl" "$out/bin" - fi - - # Put the GNU IceCat icon in the right place. - ensureDir "$out/lib/$libDir/chrome/icons/default" - ln -s ../../../icons/default.xpm "$out/lib/$libDir/chrome/icons/default/" - ''; - - enableParallelBuilding = true; - - meta = { - description = "GNU IceCat, a free web browser based on Mozilla Firefox"; - - longDescription = '' - Gnuzilla is the GNU version of the Mozilla suite, and GNU IceCat - is the GNU version of the Firefox browser. Its main advantage - is an ethical one: it is entirely free software. While the - source code from the Mozilla project is free software, the - binaries that they release include additional non-free software. - Also, they distribute and recommend non-free software as - plug-ins. In addition, GNU IceCat includes some privacy - protection features. - ''; - - homepage = http://www.gnu.org/software/gnuzilla/; - licenses = [ "GPLv2+" "LGPLv2+" "MPLv1+" ]; - - maintainers = [ stdenv.lib.maintainers.ludo ]; - platforms = stdenv.lib.platforms.gnu; - }; - - passthru = { - inherit gtk version; - isFirefox3Like = true; - }; -} diff --git a/pkgs/applications/networking/browsers/icecat-4/rpath-link.patch b/pkgs/applications/networking/browsers/icecat-4/rpath-link.patch deleted file mode 100644 index d50784f13ee..00000000000 --- a/pkgs/applications/networking/browsers/icecat-4/rpath-link.patch +++ /dev/null @@ -1,14 +0,0 @@ -Without this patch, IceCat ends up linking with -`-Wl,-rpath-link=/bin -Wl-,-rpath-link=/lib'. - ---- icecat-3.5/js/src/configure 2009-07-04 18:03:01.000000000 +0200 -+++ icecat-3.5/js/src/configure 2009-07-13 18:34:30.000000000 +0200 -@@ -4775,7 +4775,6 @@ HOST_AR='$(AR)' - HOST_AR_FLAGS='$(AR_FLAGS)' - - MOZ_JS_LIBS='-L$(libdir) -lmozjs' --MOZ_FIX_LINK_PATHS='-Wl,-rpath-link,$(LIBXUL_DIST)/bin -Wl,-rpath-link,$(PREFIX)/lib' - - MOZ_COMPONENT_NSPR_LIBS='-L$(LIBXUL_DIST)/bin $(NSPR_LIBS)' - MOZ_XPCOM_OBSOLETE_LIBS='-L$(LIBXUL_DIST)/lib -lxpcom_compat' - diff --git a/pkgs/applications/networking/browsers/icecat-4/skip-gre-registration.patch b/pkgs/applications/networking/browsers/icecat-4/skip-gre-registration.patch deleted file mode 100644 index d1fb4e3f30a..00000000000 --- a/pkgs/applications/networking/browsers/icecat-4/skip-gre-registration.patch +++ /dev/null @@ -1,12 +0,0 @@ -Skip "GRE" registration since that assumes write access to `/etc'. - ---- icecat-3.0.1-g1/xulrunner/installer/Makefile.in 2008-07-27 12:52:16.000000000 +0200 -+++ icecat-3.0.1-g1/xulrunner/installer/Makefile.in 2008-09-08 17:19:17.000000000 +0200 -@@ -71,6 +71,7 @@ $(MOZILLA_VERSION).system.conf: $(topsrc - printf "[%s]\nGRE_PATH=%s\nxulrunner=true\nabi=%s" \ - $(MOZILLA_VERSION) $(installdir) $(TARGET_XPCOM_ABI)> $@ - -+SKIP_GRE_REGISTRATION = yes - ifndef SKIP_GRE_REGISTRATION - # to register xulrunner per-user, override this with $HOME/.gre.d - regdir = /etc/gre.d diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 33dfe437e2e..da73e7dc12b 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -6875,32 +6875,6 @@ let icecat3Wrapper = wrapFirefox { browser = icecat3Xul; browserName = "icecat"; desktopName = "IceCat"; }; - icecat4 = lowPrio (import ../applications/networking/browsers/icecat-4 { - inherit fetchurl stdenv xz pkgconfig perl zip libjpeg libpng zlib cairo - python dbus dbus_glib freetype fontconfig bzip2 xlibs alsaLib libnotify - wirelesstools; - inherit (gnome) libIDL libgnomeui gnome_vfs gtk pango; - inherit (xlibs) pixman; - inherit (pythonPackages) ply; - }); - - icecatXulrunner4 = lowPrio (import ../applications/networking/browsers/icecat-4 { - application = "xulrunner"; - inherit fetchurl stdenv xz pkgconfig perl zip libjpeg libpng zlib cairo - python dbus dbus_glib freetype fontconfig bzip2 xlibs alsaLib libnotify - wirelesstools; - inherit (gnome) libIDL libgnomeui gnome_vfs gtk pango; - inherit (xlibs) pixman; - inherit (pythonPackages) ply; - }); - - icecat4Xul = - (symlinkJoin "icecat-with-xulrunner-${icecat4.version}" - [ icecat4 icecatXulrunner4 ]) - // { inherit (icecat4) gtk meta; }; - - icecat4Wrapper = wrapFirefox { browser = icecat4Xul; browserName = "icecat"; desktopName = "IceCat"; }; - icewm = callPackage ../applications/window-managers/icewm { inherit (gtkLibs) gtk; }; From 81835f2a2f3e002febcb78faf9b02451b0647794 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= Date: Thu, 1 Dec 2011 22:43:24 +0000 Subject: [PATCH 770/970] GNU dbm 1.10. svn path=/nixpkgs/trunk/; revision=30661 --- pkgs/development/libraries/gdbm/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/gdbm/default.nix b/pkgs/development/libraries/gdbm/default.nix index 807e6a6a2a8..3b982582b54 100644 --- a/pkgs/development/libraries/gdbm/default.nix +++ b/pkgs/development/libraries/gdbm/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl }: stdenv.mkDerivation rec { - name = "gdbm-1.9.1"; + name = "gdbm-1.10"; src = fetchurl { url = "mirror://gnu/gdbm/${name}.tar.gz"; - sha256 = "1vcs39nhvwyicjfx4qc17k54n22azla5yjr9yachcavp6wk8a9b0"; + sha256 = "0h9lfzdjc2yl849y0byg51h6xfjg0y7vg9jnsw3gpfwlbd617y13"; }; doCheck = true; From 2f87b70323fb96b6042f1894fddfd5e03a8c399c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= Date: Thu, 1 Dec 2011 22:43:31 +0000 Subject: [PATCH 771/970] GNU Parallel 20111122. svn path=/nixpkgs/trunk/; revision=30662 --- pkgs/tools/misc/parallel/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/misc/parallel/default.nix b/pkgs/tools/misc/parallel/default.nix index c104bf752fe..621bc79a277 100644 --- a/pkgs/tools/misc/parallel/default.nix +++ b/pkgs/tools/misc/parallel/default.nix @@ -1,11 +1,11 @@ { fetchurl, stdenv, perl }: stdenv.mkDerivation rec { - name = "parallel-20111022"; + name = "parallel-20111122"; src = fetchurl { url = "mirror://gnu/parallel/${name}.tar.bz2"; - sha256 = "0l9g7lg7avshjm0783abcrcmlmrqkwhzic23lk0jna0nckkd9jhk"; + sha256 = "1czcflprhbhyj3mj7dc986gll0kfc6n8qiqazclph172rbq3acpd"; }; patchPhase = From 5b766d16b64a87c4c306d755c9c18e77145e7efb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= Date: Thu, 1 Dec 2011 22:43:40 +0000 Subject: [PATCH 772/970] GNU Libtasn1 2.11. svn path=/nixpkgs/trunk/; revision=30663 --- pkgs/development/libraries/libtasn1/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/libtasn1/default.nix b/pkgs/development/libraries/libtasn1/default.nix index 660b02d0a93..edaae75a66b 100644 --- a/pkgs/development/libraries/libtasn1/default.nix +++ b/pkgs/development/libraries/libtasn1/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl }: stdenv.mkDerivation rec { - name = "libtasn1-2.10"; + name = "libtasn1-2.11"; src = fetchurl { url = "mirror://gnu/libtasn1/${name}.tar.gz"; - sha256 = "1l0622ysv68k1xazg3000m47h8dd7pbnxhik6v0kf17029ic1r0p"; + sha256 = "1yws0xfys6fm7ywb3pr8ncl3gr37iky7454if8dbzsicq5vkrm7l"; }; doCheck = true; From 170399a8589b00fe12fbbe6b45942873fee54d08 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= Date: Thu, 1 Dec 2011 22:43:46 +0000 Subject: [PATCH 773/970] GNU Xorriso 1.1.8. svn path=/nixpkgs/trunk/; revision=30664 --- pkgs/tools/cd-dvd/xorriso/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/cd-dvd/xorriso/default.nix b/pkgs/tools/cd-dvd/xorriso/default.nix index e8a58a1fa96..4936bca1ba1 100644 --- a/pkgs/tools/cd-dvd/xorriso/default.nix +++ b/pkgs/tools/cd-dvd/xorriso/default.nix @@ -1,11 +1,11 @@ { fetchurl, stdenv, libcdio, zlib, bzip2, readline, acl }: stdenv.mkDerivation rec { - name = "xorriso-1.1.6"; + name = "xorriso-1.1.8"; src = fetchurl { url = "mirror://gnu/xorriso/${name}.tar.gz"; - sha256 = "0dlavcdx1lblqy9pjlxv4krczvb23650f2zd1phy2hdxhiq6c966"; + sha256 = "1pnmjk2nvxg54zrm4mha6vvgi6sl5xzznqcfzrlrvgsdy5liwb4x"; }; doCheck = true; From 95696578a9c2e8b47e4940a024e7888a9af9f10e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= Date: Thu, 1 Dec 2011 22:43:53 +0000 Subject: [PATCH 774/970] GNU wdiff 1.10. svn path=/nixpkgs/trunk/; revision=30665 --- pkgs/tools/text/wdiff/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/text/wdiff/default.nix b/pkgs/tools/text/wdiff/default.nix index 5f1fe24bc83..0d0576ee4a7 100644 --- a/pkgs/tools/text/wdiff/default.nix +++ b/pkgs/tools/text/wdiff/default.nix @@ -1,14 +1,14 @@ { stdenv, fetchurl, which, screen }: let - name = "wdiff-1.0.1"; + name = "wdiff-1.1.0"; in stdenv.mkDerivation { inherit name; src = fetchurl { url = "mirror://gnu/wdiff/${name}.tar.gz"; - sha256 = "1jyg8vmdlazpcwii8a1ddbc0sxcklp9cvj5y0x9zqaybvwzg9r4l"; + sha256 = "1lg5lz78xij4jjifv8fj68ixr9mha1c5vp8xzyg6rdx6ynkvnm5i"; }; # Required for the compile-time for the test suite. From be5e1088f6cdb4fdefd086c4a167ce21b57e96e0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= Date: Thu, 1 Dec 2011 22:43:58 +0000 Subject: [PATCH 775/970] GnuTLS 3.0.8. svn path=/nixpkgs/trunk/; revision=30666 --- pkgs/development/libraries/gnutls/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/gnutls/default.nix b/pkgs/development/libraries/gnutls/default.nix index 888a119bb36..3cd8e718021 100644 --- a/pkgs/development/libraries/gnutls/default.nix +++ b/pkgs/development/libraries/gnutls/default.nix @@ -5,11 +5,11 @@ assert guileBindings -> guile != null; stdenv.mkDerivation rec { - name = "gnutls-3.0.4"; + name = "gnutls-3.0.8"; src = fetchurl { url = "mirror://gnu/gnutls/${name}.tar.xz"; - sha256 = "16mhr52c07xlkv5m5bxgr51ppjz0gqjw6rgv52ql4iyi569ffrx3"; + sha256 = "0qcp7jm8c2fyk5kdb4fgyrv9hb745mcf066vwmlb8dchx15ijkms"; }; configurePhase = '' From dee4d2f6af176f4deb8d0c8e270aaea1fc9a49b3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= Date: Thu, 1 Dec 2011 22:44:04 +0000 Subject: [PATCH 776/970] gnupdate: Support signatures with expired keys. * maintainers/scripts/gnu/gnupdate (gnupg-verify)[expkeysig-rx]: New variable. Recognize signatures with expired keys. (gnupg-status-good-signature?): Recognize `expired-key-signature' as good. svn path=/nixpkgs/trunk/; revision=30667 --- maintainers/scripts/gnu/gnupdate | 17 ++++++++++++----- 1 file changed, 12 insertions(+), 5 deletions(-) diff --git a/maintainers/scripts/gnu/gnupdate b/maintainers/scripts/gnu/gnupdate index a0c1f338d3a..6f677425b23 100755 --- a/maintainers/scripts/gnu/gnupdate +++ b/maintainers/scripts/gnu/gnupdate @@ -441,6 +441,8 @@ the file at URL." (define validsig-rx (make-regexp "^\\[GNUPG:\\] VALIDSIG ([[:xdigit:]]+) ([[:digit:]]{4}-[[:digit:]]{2}-[[:digit:]]{2}) ([[:digit:]]+) .*$")) + (define expkeysig-rx ; good signature, but expired key + (make-regexp "^\\[GNUPG:\\] EXPKEYSIG ([[:xdigit:]]+) (.*)$")) (define errsig-rx (make-regexp "^\\[GNUPG:\\] ERRSIG ([[:xdigit:]]+) ([^ ]+) ([^ ]+) ([^ ]+) ([[:digit:]]+) ([[:digit:]]+)")) @@ -450,20 +452,25 @@ the file at URL." (lambda (match) `(signature-id ,(match:substring match 1) ; sig id ,(match:substring match 2) ; date - ,(string->number ; timestamp + ,(string->number ; timestamp (match:substring match 3))))) ((regexp-exec goodsig-rx line) => (lambda (match) - `(good-signature ,(match:substring match 1) ; key id + `(good-signature ,(match:substring match 1) ; key id ,(match:substring match 2)))) ; user name ((regexp-exec validsig-rx line) => (lambda (match) `(valid-signature ,(match:substring match 1) ; fingerprint ,(match:substring match 2) ; sig creation date - ,(string->number ; timestamp + ,(string->number ; timestamp (match:substring match 3))))) + ((regexp-exec expkeysig-rx line) + => + (lambda (match) + `(expired-key-signature ,(match:substring match 1) ; fingerprint + ,(match:substring match 2)))) ; user name ((regexp-exec errsig-rx line) => (lambda (match) @@ -471,7 +478,7 @@ the file at URL." ,(match:substring match 2) ; pubkey algo ,(match:substring match 3) ; hash algo ,(match:substring match 4) ; sig class - ,(string->number ; timestamp + ,(string->number ; timestamp (match:substring match 5)) ,(let ((rc (string->number ; return code @@ -504,7 +511,7 @@ the file at URL." a key-id/user pair; return #f otherwise." (any (lambda (sexp) (match sexp - (('good-signature key-id user) + (((or 'good-signature 'expired-key-signature) key-id user) (cons key-id user)) (_ #f))) status)) From 6b920275b8e365a699525a87f9c6a84e8a5c3a12 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= Date: Thu, 1 Dec 2011 22:44:10 +0000 Subject: [PATCH 777/970] GNU FreeIPMI 1.0.9. svn path=/nixpkgs/trunk/; revision=30668 --- pkgs/tools/system/freeipmi/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/system/freeipmi/default.nix b/pkgs/tools/system/freeipmi/default.nix index e50cdfc9748..2330de1d11e 100644 --- a/pkgs/tools/system/freeipmi/default.nix +++ b/pkgs/tools/system/freeipmi/default.nix @@ -1,11 +1,11 @@ { fetchurl, stdenv, libgcrypt, readline }: stdenv.mkDerivation rec { - name = "freeipmi-1.0.8"; + name = "freeipmi-1.0.9"; src = fetchurl { url = "mirror://gnu/freeipmi/${name}.tar.gz"; - sha256 = "1niasikbm599bs6r7grskypzw1jccg8i3n1i4r0id9zqcjxff6gp"; + sha256 = "00ix8cigf6nl5kg95hla43kf27jkb3lljhcihbfriwq0wrghcfx4"; }; buildInputs = [ libgcrypt readline ]; From 842be0d04df1744ef75332bfa0f4b6f4f1b7c2bc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= Date: Thu, 1 Dec 2011 22:44:16 +0000 Subject: [PATCH 778/970] libassuan 2.0.2. svn path=/nixpkgs/trunk/; revision=30669 --- pkgs/development/libraries/libassuan/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/libassuan/default.nix b/pkgs/development/libraries/libassuan/default.nix index 63bee27da78..c9b02d1cef2 100644 --- a/pkgs/development/libraries/libassuan/default.nix +++ b/pkgs/development/libraries/libassuan/default.nix @@ -1,11 +1,11 @@ { fetchurl, stdenv, pth, libgpgerror }: stdenv.mkDerivation rec { - name = "libassuan-2.0.0"; + name = "libassuan-2.0.2"; src = fetchurl { url = "mirror://gnupg/libassuan/${name}.tar.bz2"; - sha256 = "13vzs4jxscnlskwzd3wpqwnfb5f0hwqc75rbi8j9f42bs6q08apx"; + sha256 = "1n5lfpafq9sjb3r06lw7vrrjmbs3p035zfakx7ff5bfb7niwpq31"; }; propagatedBuildInputs = [ pth libgpgerror ]; From a941c7f9ac2c1c623f4ac8014f1d29b64a45acd3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= Date: Thu, 1 Dec 2011 22:44:23 +0000 Subject: [PATCH 779/970] libgpg-error 1.10. svn path=/nixpkgs/trunk/; revision=30670 --- pkgs/development/libraries/libgpg-error/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/libgpg-error/default.nix b/pkgs/development/libraries/libgpg-error/default.nix index f167ecbc2ad..255057b5134 100644 --- a/pkgs/development/libraries/libgpg-error/default.nix +++ b/pkgs/development/libraries/libgpg-error/default.nix @@ -1,11 +1,11 @@ {stdenv, fetchurl}: stdenv.mkDerivation rec { - name = "libgpg-error-1.8"; + name = "libgpg-error-1.10"; src = fetchurl { url = "mirror://gnupg/libgpg-error/${name}.tar.bz2"; - sha256 = "1i88jl2jm8ckjzyzk7iw2dydk7sxcd27zqyl4qnrs8s7f5kz5yxx"; + sha256 = "0cal3jdnzdailr13qcy74grfbplbghkgr3qwk6qjjp4bass2j1jj"; }; doCheck = true; From ccc5902325f121e71200a690bbf865993b995a7d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= Date: Thu, 1 Dec 2011 22:44:29 +0000 Subject: [PATCH 780/970] GNU recutils 1.4. svn path=/nixpkgs/trunk/; revision=30671 --- pkgs/tools/misc/recutils/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/misc/recutils/default.nix b/pkgs/tools/misc/recutils/default.nix index 307c60bd611..95ced6784ae 100644 --- a/pkgs/tools/misc/recutils/default.nix +++ b/pkgs/tools/misc/recutils/default.nix @@ -1,11 +1,11 @@ { fetchurl, stdenv, gettext, emacs, curl, check, bc }: stdenv.mkDerivation rec { - name = "recutils-1.3"; + name = "recutils-1.4"; src = fetchurl { url = "mirror://gnu/recutils/${name}.tar.gz"; - sha256 = "0ywf939vw4zbpq6dmvw656fhkx8izma99pr1akzh8hs2rc9sp2pr"; + sha256 = "1kakmzmkdkgqmvqfzrpkwjjkg492rk3k7xfgnwcjacap9l79z9pv"; }; doCheck = true; From 41b0c4e18c8e2a00dec322735506865da547a418 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= Date: Thu, 1 Dec 2011 22:44:34 +0000 Subject: [PATCH 781/970] GNU uCommon C++ 5.0.7. svn path=/nixpkgs/trunk/; revision=30672 --- pkgs/development/libraries/ucommon/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/libraries/ucommon/default.nix b/pkgs/development/libraries/ucommon/default.nix index 4c91dee514e..cca5c5aaa9f 100644 --- a/pkgs/development/libraries/ucommon/default.nix +++ b/pkgs/development/libraries/ucommon/default.nix @@ -1,11 +1,11 @@ { fetchurl, stdenv, gnutls, pkgconfig, zlib, libgcrypt }: stdenv.mkDerivation rec { - name = "ucommon-5.0.6"; + name = "ucommon-5.0.7"; src = fetchurl { - url = mirror://gnu/commoncpp/ucommon-5.0.6.tar.gz; - sha256 = "102djhfzs5jp10r3ajm25p1phs9cxn2dx8vycf0i8vjhmd20yp5c"; + url = mirror://gnu/commoncpp/ucommon-5.0.7.tar.gz; + sha256 = "0zr4zjwb62dpq7aa88vclhv2y8j7glkq693kwmb8agfx0fv8nkny"; }; buildInputs = [ pkgconfig gnutls zlib ]; From ae01577943d234870e004dfdbe699b40a77a4e10 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= Date: Thu, 1 Dec 2011 22:44:39 +0000 Subject: [PATCH 782/970] GNU ccRTP 2.0.2. svn path=/nixpkgs/trunk/; revision=30673 --- pkgs/development/libraries/ccrtp/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/libraries/ccrtp/default.nix b/pkgs/development/libraries/ccrtp/default.nix index 8b16af37932..5610588ea41 100644 --- a/pkgs/development/libraries/ccrtp/default.nix +++ b/pkgs/development/libraries/ccrtp/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, openssl, pkgconfig, libgcrypt, ucommon }: stdenv.mkDerivation { - name = "ccrtp-2.0.1"; + name = "ccrtp-2.0.2"; src = fetchurl { - url = mirror://gnu/ccrtp/ccrtp-2.0.1.tar.gz; - sha256 = "0wksiq55zq8yvjgzkaxyg15w9kfr4sni8a0yqk11qdqpl8x0al9x"; + url = mirror://gnu/ccrtp/ccrtp-2.0.2.tar.gz; + sha256 = "1n42nscqwryz9f0jpg8lnv22x9m8mzr6rqir9cvbgm1r2skwjh4f"; }; buildInputs = [ openssl pkgconfig libgcrypt ucommon ]; From 0f269354fbfb428da83f2403690378ec8781f82a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= Date: Thu, 1 Dec 2011 22:44:44 +0000 Subject: [PATCH 783/970] GNU libidn 1.23. svn path=/nixpkgs/trunk/; revision=30674 --- pkgs/development/libraries/libidn/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/libidn/default.nix b/pkgs/development/libraries/libidn/default.nix index faf3f1c3dbc..3c72382dea4 100644 --- a/pkgs/development/libraries/libidn/default.nix +++ b/pkgs/development/libraries/libidn/default.nix @@ -1,11 +1,11 @@ { fetchurl, stdenv }: stdenv.mkDerivation rec { - name = "libidn-1.22"; + name = "libidn-1.23"; src = fetchurl { url = "mirror://gnu/libidn/${name}.tar.gz"; - sha256 = "1vc8yni7sg5iq1ijg9l558pa4v6c1v5l57zc024lgxcmhy35wxig"; + sha256 = "0sjy1k35x3r5vfkd5j21gy0xdlzg9svm74wn3hpfbfhyhmsjvd15"; }; doCheck = ! stdenv.isDarwin; From a9e422a5d772ed71245dbd82976348e6782daea5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= Date: Thu, 1 Dec 2011 22:44:53 +0000 Subject: [PATCH 784/970] GNU GSS 1.0.2. svn path=/nixpkgs/trunk/; revision=30675 --- pkgs/development/libraries/gss/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/gss/default.nix b/pkgs/development/libraries/gss/default.nix index ded3fccca7b..4959a70ca63 100644 --- a/pkgs/development/libraries/gss/default.nix +++ b/pkgs/development/libraries/gss/default.nix @@ -1,11 +1,11 @@ { fetchurl, stdenv, shishi }: stdenv.mkDerivation rec { - name = "gss-1.0.1"; + name = "gss-1.0.2"; src = fetchurl { url = "mirror://gnu/gss/${name}.tar.gz"; - sha256 = "05g9p45gmd0332ly19g13rbi0wdx447imw42f22482rdr8vpy9m0"; + sha256 = "1qa8lbkzi6ilfggx7mchfzjnchvhwi68rck3jf9j4425ncz7zsd9"; }; buildInputs = [ shishi ]; From cd22d77614d840ac45e4f8aec8a67bce4bded751 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= Date: Thu, 1 Dec 2011 22:44:59 +0000 Subject: [PATCH 785/970] GNU SIP Witch 1.1.3. svn path=/nixpkgs/trunk/; revision=30676 --- pkgs/servers/sip/sipwitch/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/sip/sipwitch/default.nix b/pkgs/servers/sip/sipwitch/default.nix index cb8c9aec3fc..57b4a5ca17c 100644 --- a/pkgs/servers/sip/sipwitch/default.nix +++ b/pkgs/servers/sip/sipwitch/default.nix @@ -1,11 +1,11 @@ { fetchurl, stdenv, pkgconfig, ucommon, libosip, libexosip, gnutls, zlib }: stdenv.mkDerivation rec { - name = "sipwitch-1.1.2"; + name = "sipwitch-1.1.3"; src = fetchurl { url = "mirror://gnu/sipwitch/${name}.tar.gz"; - sha256 = "1ixbzrpndhx7i0cxx02rlnhv9948pbsbbs5gdsgp6asq42vfz3f2"; + sha256 = "0g1vx8xsmna0c7sqck8pv44312r4qrk82ky3j99p82ckbqj1sqjv"; }; buildInputs = [ pkgconfig ucommon libosip libexosip gnutls zlib ]; From 3053de47763498ca0e33278224b5e0e6255d4ca0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= Date: Thu, 1 Dec 2011 23:20:31 +0000 Subject: [PATCH 786/970] MIT/GNU Scheme 9.1.1. svn path=/nixpkgs/trunk/; revision=30677 --- pkgs/development/compilers/mit-scheme/default.nix | 13 ++----------- 1 file changed, 2 insertions(+), 11 deletions(-) diff --git a/pkgs/development/compilers/mit-scheme/default.nix b/pkgs/development/compilers/mit-scheme/default.nix index dcbdb6518d3..c19581debbf 100644 --- a/pkgs/development/compilers/mit-scheme/default.nix +++ b/pkgs/development/compilers/mit-scheme/default.nix @@ -1,7 +1,7 @@ { fetchurl, stdenv, gnum4, texinfo, texLive, automake }: let - version = "9.1"; + version = "9.1.1"; bootstrapFromC = ! (stdenv.isi686 || stdenv.isx86_64); in stdenv.mkDerivation { @@ -15,7 +15,7 @@ stdenv.mkDerivation { if stdenv.isi686 then fetchurl { url = "mirror://gnu/mit-scheme/stable.pkg/${version}/mit-scheme-${version}-i386.tar.gz"; - sha256 = "1vqdy9f1lbzflr9bw0gjn4g4w3hdpnjrkiwj5aaah70flif5ndns"; + sha256 = "1bigzzk0k08lggyzqp4rmyvbqhhs3ld4c7drfp22d5qnkbvvzh4g"; } else if stdenv.isx86_64 then fetchurl { url = "mirror://gnu/mit-scheme/stable.pkg/${version}/mit-scheme-${version}-x86-64.tar.gz"; @@ -25,15 +25,6 @@ stdenv.mkDerivation { sha256 = "1661cybycfvjjyq92gb3n1cygxfmfjdhnh3d2ha3vy6xxk9d7za9"; }; - configurePhase = - '' cd src - ./configure --prefix="$out" - - cd ../doc - ./configure --prefix="$out" - cd .. - ''; - buildPhase = '' cd src ${if bootstrapFromC From 32eff94091fac1d83de2b3881c0cf5a63a7442ae Mon Sep 17 00:00:00 2001 From: Michael Raskin <7c6f434c@mail.ru> Date: Fri, 2 Dec 2011 04:16:58 +0000 Subject: [PATCH 787/970] Pass all configureFlags - including cross-build options, for example svn path=/nixpkgs/trunk/; revision=30678 --- pkgs/tools/admin/tigervnc/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/tools/admin/tigervnc/default.nix b/pkgs/tools/admin/tigervnc/default.nix index f5384a85978..aadbc5a9da1 100644 --- a/pkgs/tools/admin/tigervnc/default.nix +++ b/pkgs/tools/admin/tigervnc/default.nix @@ -46,7 +46,7 @@ stdenv.mkDerivation rec { done patch -p1 < ../xserver18.patch autoreconf -vfi - ./configure --prefix=$out --disable-xinerama --disable-xvfb --disable-xnest --disable-xorg --disable-dmx --disable-dri --disable-dri2 --disable-glx + ./configure $configureFlags --disable-xinerama --disable-xvfb --disable-xnest --disable-xorg --disable-dmx --disable-dri --disable-dri2 --disable-glx make TIGERVNC_SRCDIR=`pwd`/../.. popd ''; From 3b1a603782bb57b23496ec372dd3fb3aa3f940c4 Mon Sep 17 00:00:00 2001 From: Michael Raskin <7c6f434c@mail.ru> Date: Fri, 2 Dec 2011 05:50:08 +0000 Subject: [PATCH 788/970] Propagate buildNativeInputs without changing their types svn path=/nixpkgs/trunk/; revision=30679 --- pkgs/tools/admin/tigervnc/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/tools/admin/tigervnc/default.nix b/pkgs/tools/admin/tigervnc/default.nix index aadbc5a9da1..843dc0bc44f 100644 --- a/pkgs/tools/admin/tigervnc/default.nix +++ b/pkgs/tools/admin/tigervnc/default.nix @@ -67,7 +67,7 @@ stdenv.mkDerivation rec { libtool nasm utilmacros fontutil libgcrypt gnutls pam ] ++ xorgserver.buildNativeInputs; - propagatedBuildInputs = xorgserver.propagatedBuildNativeInputs; + propagatedBuildNativeInputs = xorgserver.propagatedBuildNativeInputs; meta = { homepage = http://www.tigervnc.org/; From 791aaf035701d3888671683101146ab7c3d073e7 Mon Sep 17 00:00:00 2001 From: Michael Raskin <7c6f434c@mail.ru> Date: Fri, 2 Dec 2011 05:50:53 +0000 Subject: [PATCH 789/970] Use Xorg buildNativeInputs correctly svn path=/nixpkgs/trunk/; revision=30680 --- pkgs/tools/admin/tigervnc/default.nix | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/pkgs/tools/admin/tigervnc/default.nix b/pkgs/tools/admin/tigervnc/default.nix index 843dc0bc44f..201adcb1b97 100644 --- a/pkgs/tools/admin/tigervnc/default.nix +++ b/pkgs/tools/admin/tigervnc/default.nix @@ -65,7 +65,9 @@ stdenv.mkDerivation rec { buildInputs = [ libX11 libXext gettext libICE libXtst libXi libSM autoconf automake cvs libtool nasm utilmacros fontutil libgcrypt gnutls pam - ] ++ xorgserver.buildNativeInputs; + ]; + + buildNativeInputs = xorgserver.buildNativeInputs; propagatedBuildNativeInputs = xorgserver.propagatedBuildNativeInputs; From a435c6b5c7114c687d1c17e1c5144aa03f546175 Mon Sep 17 00:00:00 2001 From: Michael Raskin <7c6f434c@mail.ru> Date: Fri, 2 Dec 2011 06:01:50 +0000 Subject: [PATCH 790/970] Pass default configureFlags (i.e. cross-build flags) to gnutls build svn path=/nixpkgs/trunk/; revision=30681 --- pkgs/development/libraries/gnutls/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/libraries/gnutls/default.nix b/pkgs/development/libraries/gnutls/default.nix index 3cd8e718021..da2cc138bf7 100644 --- a/pkgs/development/libraries/gnutls/default.nix +++ b/pkgs/development/libraries/gnutls/default.nix @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { }; configurePhase = '' - ./configure --prefix="$out" \ + ./configure $configureFlags \ --disable-dependency-tracking --enable-fast-install \ --without-p11-kit \ --with-lzo --with-libtasn1-prefix="${libtasn1}" \ From a6da9f24c744b6a455138ab1bf07ff3dc845d9c0 Mon Sep 17 00:00:00 2001 From: Michael Raskin <7c6f434c@mail.ru> Date: Fri, 2 Dec 2011 06:02:40 +0000 Subject: [PATCH 791/970] Fix more incorrect native/target buildInput split in tigervnc; current stumbling block is gnutls svn path=/nixpkgs/trunk/; revision=30682 --- pkgs/tools/admin/tigervnc/default.nix | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/admin/tigervnc/default.nix b/pkgs/tools/admin/tigervnc/default.nix index 201adcb1b97..6658b85c79f 100644 --- a/pkgs/tools/admin/tigervnc/default.nix +++ b/pkgs/tools/admin/tigervnc/default.nix @@ -63,11 +63,12 @@ stdenv.mkDerivation rec { ''; buildInputs = - [ libX11 libXext gettext libICE libXtst libXi libSM autoconf automake cvs + [ libX11 libXext gettext libICE libXtst libXi libSM libtool nasm utilmacros fontutil libgcrypt gnutls pam ]; - buildNativeInputs = xorgserver.buildNativeInputs; + buildNativeInputs = + [ autoconf automake cvs ] ++ xorgserver.buildNativeInputs; propagatedBuildNativeInputs = xorgserver.propagatedBuildNativeInputs; From 03b8dad4b9d7d0931f1d6fbd94adc22745e3463b Mon Sep 17 00:00:00 2001 From: Michael Raskin <7c6f434c@mail.ru> Date: Fri, 2 Dec 2011 06:21:27 +0000 Subject: [PATCH 792/970] Oops, sorry svn path=/nixpkgs/trunk/; revision=30683 --- pkgs/development/libraries/gnutls/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/libraries/gnutls/default.nix b/pkgs/development/libraries/gnutls/default.nix index da2cc138bf7..3cd8e718021 100644 --- a/pkgs/development/libraries/gnutls/default.nix +++ b/pkgs/development/libraries/gnutls/default.nix @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { }; configurePhase = '' - ./configure $configureFlags \ + ./configure --prefix="$out" \ --disable-dependency-tracking --enable-fast-install \ --without-p11-kit \ --with-lzo --with-libtasn1-prefix="${libtasn1}" \ From 36c7f3d280e1060e2e6cccd8d7f1d7a23bb12a95 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Fri, 2 Dec 2011 11:46:33 +0000 Subject: [PATCH 793/970] Dropped obsolete Haskell packages attoparsec-text and attoparsec-text-enumerator. svn path=/nixpkgs/trunk/; revision=30684 --- .../attoparsec-text-enumerator/default.nix | 17 ----------------- .../haskell/attoparsec-text/default.nix | 18 ------------------ pkgs/top-level/haskell-packages.nix | 4 ---- 3 files changed, 39 deletions(-) delete mode 100644 pkgs/development/libraries/haskell/attoparsec-text-enumerator/default.nix delete mode 100644 pkgs/development/libraries/haskell/attoparsec-text/default.nix diff --git a/pkgs/development/libraries/haskell/attoparsec-text-enumerator/default.nix b/pkgs/development/libraries/haskell/attoparsec-text-enumerator/default.nix deleted file mode 100644 index bcc9e8b1a6f..00000000000 --- a/pkgs/development/libraries/haskell/attoparsec-text-enumerator/default.nix +++ /dev/null @@ -1,17 +0,0 @@ -{ cabal, attoparsecText, enumerator, text }: - -cabal.mkDerivation (self: { - pname = "attoparsec-text-enumerator"; - version = "0.2.0.0"; - sha256 = "149ipf5qh7wzjrnv98h6j94djr0ndzg8s4rs8h7kzbii21ynmzz5"; - buildDepends = [ attoparsecText enumerator text ]; - meta = { - description = "Convert an attoparsec-text parser into an iteratee"; - license = self.stdenv.lib.licenses.mit; - platforms = self.ghc.meta.platforms; - maintainers = [ - self.stdenv.lib.maintainers.andres - self.stdenv.lib.maintainers.simons - ]; - }; -}) diff --git a/pkgs/development/libraries/haskell/attoparsec-text/default.nix b/pkgs/development/libraries/haskell/attoparsec-text/default.nix deleted file mode 100644 index 5ff16e30c18..00000000000 --- a/pkgs/development/libraries/haskell/attoparsec-text/default.nix +++ /dev/null @@ -1,18 +0,0 @@ -{ cabal, attoparsec, text }: - -cabal.mkDerivation (self: { - pname = "attoparsec-text"; - version = "0.8.5.1"; - sha256 = "1in0ziqjf2hvlv6yay2b5xkm35j1szzwdfapn5mpflv64qi33i0z"; - buildDepends = [ attoparsec text ]; - meta = { - homepage = "http://patch-tag.com/r/felipe/attoparsec-text/home"; - description = "Fast combinator parsing for texts"; - license = self.stdenv.lib.licenses.bsd3; - platforms = self.ghc.meta.platforms; - maintainers = [ - self.stdenv.lib.maintainers.andres - self.stdenv.lib.maintainers.simons - ]; - }; -}) diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix index 3e34504434c..4a04ee4e905 100644 --- a/pkgs/top-level/haskell-packages.nix +++ b/pkgs/top-level/haskell-packages.nix @@ -384,10 +384,6 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y); attoparsecEnumerator = callPackage ../development/libraries/haskell/attoparsec/enumerator.nix {}; - attoparsecText = callPackage ../development/libraries/haskell/attoparsec-text {}; - - attoparsecTextEnumerator = callPackage ../development/libraries/haskell/attoparsec-text-enumerator {}; - authenticate = callPackage ../development/libraries/haskell/authenticate {}; base16Bytestring = callPackage ../development/libraries/haskell/base16-bytestring {}; From 4a1793ef4890d5d773df6c48144368a607229108 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Fri, 2 Dec 2011 11:46:37 +0000 Subject: [PATCH 794/970] haskell-hastache: added version 0.2.4 svn path=/nixpkgs/trunk/; revision=30685 --- .../libraries/haskell/hastache/default.nix | 18 ++++++++++++++++++ pkgs/top-level/haskell-packages.nix | 2 ++ 2 files changed, 20 insertions(+) create mode 100644 pkgs/development/libraries/haskell/hastache/default.nix diff --git a/pkgs/development/libraries/haskell/hastache/default.nix b/pkgs/development/libraries/haskell/hastache/default.nix new file mode 100644 index 00000000000..ac9515348db --- /dev/null +++ b/pkgs/development/libraries/haskell/hastache/default.nix @@ -0,0 +1,18 @@ +{ cabal, blazeBuilder, mtl, syb, text, utf8String }: + +cabal.mkDerivation (self: { + pname = "hastache"; + version = "0.2.4"; + sha256 = "0881sh3vp5v8kk3rnz9dg2bnis6qy4gx5sr0sqj6xl162sbhf3yv"; + buildDepends = [ blazeBuilder mtl syb text utf8String ]; + meta = { + homepage = "http://github.com/lymar/hastache"; + description = "Haskell implementation of Mustache templates"; + license = self.stdenv.lib.licenses.bsd3; + platforms = self.ghc.meta.platforms; + maintainers = [ + self.stdenv.lib.maintainers.andres + self.stdenv.lib.maintainers.simons + ]; + }; +}) diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix index 4a04ee4e905..d06a85814be 100644 --- a/pkgs/top-level/haskell-packages.nix +++ b/pkgs/top-level/haskell-packages.nix @@ -687,6 +687,8 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y); haskellSrcMeta = callPackage ../development/libraries/haskell/haskell-src-meta {}; + hastache = callPackage ../development/libraries/haskell/hastache {}; + HTTP_4000_0_6 = callPackage ../development/libraries/haskell/HTTP/4000.0.6.nix {}; HTTP_4000_0_9 = callPackage ../development/libraries/haskell/HTTP/4000.0.9.nix {}; HTTP_4000_1_1 = callPackage ../development/libraries/haskell/HTTP/4000.1.1.nix {}; From 4e4fbd75c3c4f46048a433b1771b83f2b43f7bc1 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Fri, 2 Dec 2011 11:46:44 +0000 Subject: [PATCH 795/970] haskell-aeson: updated to version 0.4.0.0 svn path=/nixpkgs/trunk/; revision=30686 --- pkgs/development/libraries/haskell/aeson/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/libraries/haskell/aeson/default.nix b/pkgs/development/libraries/haskell/aeson/default.nix index 030f973e35e..a8305fa8477 100644 --- a/pkgs/development/libraries/haskell/aeson/default.nix +++ b/pkgs/development/libraries/haskell/aeson/default.nix @@ -4,14 +4,14 @@ cabal.mkDerivation (self: { pname = "aeson"; - version = "0.3.2.12"; - sha256 = "12dq79bd8kvl4hc493c7ff9k9xdpibnnnfgpvpxh4ljnqcqr4hcy"; + version = "0.4.0.0"; + sha256 = "1j0m7hh82ab7lg757wq75k28llfd1igawmg4g2qdia5gimm652pa"; buildDepends = [ attoparsec blazeBuilder blazeTextual deepseq hashable mtl syb text time unorderedContainers vector ]; meta = { - homepage = "http://github.com/mailrank/aeson"; + homepage = "https://github.com/bos/aeson"; description = "Fast JSON parsing and encoding"; license = self.stdenv.lib.licenses.bsd3; platforms = self.ghc.meta.platforms; From 787d6926672f3a957af9a47811900f36a8fa6e51 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Fri, 2 Dec 2011 11:46:51 +0000 Subject: [PATCH 796/970] haskell-attoparsec: updated to version 0.10.0.3 svn path=/nixpkgs/trunk/; revision=30687 --- .../libraries/haskell/attoparsec/default.nix | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/development/libraries/haskell/attoparsec/default.nix b/pkgs/development/libraries/haskell/attoparsec/default.nix index b76545143d6..501f4170a93 100644 --- a/pkgs/development/libraries/haskell/attoparsec/default.nix +++ b/pkgs/development/libraries/haskell/attoparsec/default.nix @@ -1,12 +1,12 @@ -{ cabal, deepseq }: +{ cabal, deepseq, text }: cabal.mkDerivation (self: { pname = "attoparsec"; - version = "0.9.1.2"; - sha256 = "0h9j4gn376k6j3v9l6pk7a4vxabkwk80043x6xlyxsh8p77jgj3v"; - buildDepends = [ deepseq ]; + version = "0.10.0.3"; + sha256 = "0qlmjv8fhbx0xk8vkhlm01qmqlbk7xl98vfhcnlcjjrc5wkj0pjc"; + buildDepends = [ deepseq text ]; meta = { - homepage = "https://bitbucket.org/bos/attoparsec"; + homepage = "https://github.com/bos/attoparsec"; description = "Fast combinator parsing for bytestrings"; license = self.stdenv.lib.licenses.bsd3; platforms = self.ghc.meta.platforms; From 38e7a9c77583fd8d161970a9319abb0bb6acc7da Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Fri, 2 Dec 2011 11:46:56 +0000 Subject: [PATCH 797/970] haskell-attoparsec-enumerator: updated to version 0.3 svn path=/nixpkgs/trunk/; revision=30688 --- .../libraries/haskell/attoparsec/enumerator.nix | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/pkgs/development/libraries/haskell/attoparsec/enumerator.nix b/pkgs/development/libraries/haskell/attoparsec/enumerator.nix index 7c990332a37..ad73d41f587 100644 --- a/pkgs/development/libraries/haskell/attoparsec/enumerator.nix +++ b/pkgs/development/libraries/haskell/attoparsec/enumerator.nix @@ -1,13 +1,13 @@ -{ cabal, attoparsec, enumerator }: +{ cabal, attoparsec, enumerator, text }: cabal.mkDerivation (self: { pname = "attoparsec-enumerator"; - version = "0.2.0.4"; - sha256 = "14v53vppcf4k3m4kid10pg5r3zsn894f36w1y2pzlc72w81fv3gd"; - buildDepends = [ attoparsec enumerator ]; + version = "0.3"; + sha256 = "1sfqcr1mvny9gf0zzggwvs2b20knxrbb208rzaa86ay0b5b5jw5v"; + buildDepends = [ attoparsec enumerator text ]; meta = { - homepage = "http://john-millikin.com/software/attoparsec-enumerator/"; - description = "Convert an Attoparsec parser into an iteratee"; + homepage = "https://john-millikin.com/software/attoparsec-enumerator/"; + description = "Pass input from an enumerator to an Attoparsec parser"; license = self.stdenv.lib.licenses.mit; platforms = self.ghc.meta.platforms; maintainers = [ From 6904c2a090a84a2525b4723866cfdab7781e4ca5 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Fri, 2 Dec 2011 11:47:03 +0000 Subject: [PATCH 798/970] haskell-case-insensitive: updated to version 0.4 svn path=/nixpkgs/trunk/; revision=30689 --- .../libraries/haskell/case-insensitive/default.nix | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/case-insensitive/default.nix b/pkgs/development/libraries/haskell/case-insensitive/default.nix index 8dff7eda284..88a6d7f6a21 100644 --- a/pkgs/development/libraries/haskell/case-insensitive/default.nix +++ b/pkgs/development/libraries/haskell/case-insensitive/default.nix @@ -2,10 +2,11 @@ cabal.mkDerivation (self: { pname = "case-insensitive"; - version = "0.3.0.1"; - sha256 = "0aaj7avg3rd2bvjjcny7wjdif60ikk7q49896g12jnczi5ba97ml"; + version = "0.4"; + sha256 = "0la9gzf563x03xy120n8h5f6kmn425c5chbm42ksx1g7ag1ppmd6"; buildDepends = [ hashable text ]; meta = { + homepage = "https://github.com/basvandijk/case-insensitive"; description = "Case insensitive string comparison"; license = self.stdenv.lib.licenses.bsd3; platforms = self.ghc.meta.platforms; From efe69803033699d5daa034e1acb6e48fb0089c21 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Fri, 2 Dec 2011 11:47:08 +0000 Subject: [PATCH 799/970] haskell-criterion: updated to version 0.6.0.0 svn path=/nixpkgs/trunk/; revision=30691 --- .../libraries/haskell/criterion/default.nix | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/pkgs/development/libraries/haskell/criterion/default.nix b/pkgs/development/libraries/haskell/criterion/default.nix index 41957fe4e20..e8d1c4f901b 100644 --- a/pkgs/development/libraries/haskell/criterion/default.nix +++ b/pkgs/development/libraries/haskell/criterion/default.nix @@ -1,17 +1,17 @@ -{ cabal, aeson, deepseq, mtl, mwcRandom, parsec, statistics, time -, vector, vectorAlgorithms +{ cabal, aeson, deepseq, hastache, mtl, mwcRandom, parsec +, statistics, time, transformers, vector, vectorAlgorithms }: cabal.mkDerivation (self: { pname = "criterion"; - version = "0.5.1.1"; - sha256 = "0gxl6xym01lvblkdsqigx4p13nc9y7hcvyrqz0kvnvcf2f9x4qvp"; + version = "0.6.0.0"; + sha256 = "0yi6gx9zrmljhhdfqpaylri8x71q2yzyhwwn1c377xngrskpydr9"; buildDepends = [ - aeson deepseq mtl mwcRandom parsec statistics time vector - vectorAlgorithms + aeson deepseq hastache mtl mwcRandom parsec statistics time + transformers vector vectorAlgorithms ]; meta = { - homepage = "http://bitbucket.org/bos/criterion"; + homepage = "https://github.com/bos/criterion"; description = "Robust, reliable performance measurement and analysis"; license = self.stdenv.lib.licenses.bsd3; platforms = self.ghc.meta.platforms; From 4771d7a9576cebe43fd181f67b1a3e2f94d0ebdc Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Fri, 2 Dec 2011 11:47:12 +0000 Subject: [PATCH 800/970] haskell-css-text: updated to version 0.1.1 svn path=/nixpkgs/trunk/; revision=30692 --- pkgs/development/libraries/haskell/css-text/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/development/libraries/haskell/css-text/default.nix b/pkgs/development/libraries/haskell/css-text/default.nix index efd0f641920..609eb593ebb 100644 --- a/pkgs/development/libraries/haskell/css-text/default.nix +++ b/pkgs/development/libraries/haskell/css-text/default.nix @@ -1,10 +1,10 @@ -{ cabal, attoparsecText, text }: +{ cabal, attoparsec, text }: cabal.mkDerivation (self: { pname = "css-text"; - version = "0.1.0.1"; - sha256 = "004ky2s6jmiliw8faja5kzp99i36qf56cixvn43n3pnq8gg26kfi"; - buildDepends = [ attoparsecText text ]; + version = "0.1.1"; + sha256 = "10vb08rnfq987w7wrirw8ib1kzafxaaancswm4xpw46ha3rq1m0y"; + buildDepends = [ attoparsec text ]; meta = { homepage = "http://www.yesodweb.com/"; description = "CSS parser and renderer"; From fcced1a5bfdb93067f8838e67c48019094cc6762 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Fri, 2 Dec 2011 11:47:17 +0000 Subject: [PATCH 801/970] haskell-snap-core: updated to version 0.7 svn path=/nixpkgs/trunk/; revision=30693 --- pkgs/development/libraries/haskell/snap/core.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/snap/core.nix b/pkgs/development/libraries/haskell/snap/core.nix index ffdc99d2edf..c0639515bf5 100644 --- a/pkgs/development/libraries/haskell/snap/core.nix +++ b/pkgs/development/libraries/haskell/snap/core.nix @@ -8,8 +8,8 @@ cabal.mkDerivation (self: { pname = "snap-core"; - version = "0.6.0.1"; - sha256 = "1vcpi56a5cia8z7n3zskhl2b7v9vkqkr87hy8n3hz5lz1lc82kkz"; + version = "0.7"; + sha256 = "1rplv1pg531jfmvxlhl7lz9hdhbxllk59daik013i172wglggivp"; buildDepends = [ attoparsec attoparsecEnumerator base16Bytestring blazeBuilder blazeBuilderEnumerator bytestringMmap bytestringNums From 46ec1dba4e5348b089fd895bd6ad0e5e82f3ac1c Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Fri, 2 Dec 2011 11:47:21 +0000 Subject: [PATCH 802/970] haskell-snap-server: updated to version 0.7 svn path=/nixpkgs/trunk/; revision=30694 --- pkgs/development/libraries/haskell/snap/server.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/snap/server.nix b/pkgs/development/libraries/haskell/snap/server.nix index bdfb541c3d3..da786f8a7c6 100644 --- a/pkgs/development/libraries/haskell/snap/server.nix +++ b/pkgs/development/libraries/haskell/snap/server.nix @@ -7,8 +7,8 @@ cabal.mkDerivation (self: { pname = "snap-server"; - version = "0.6.0.1"; - sha256 = "0df6db841vwakdxmmy375g89pjsgiv0a6nas37b68gaanfcrkch3"; + version = "0.7"; + sha256 = "1zvijghk7597xbmxv2x3qk92jlckwpz73c57cmfl63as5x6psxhr"; buildDepends = [ attoparsec attoparsecEnumerator binary blazeBuilder blazeBuilderEnumerator bytestringNums caseInsensitive directoryTree From ccf89a89592a3fbc245f44404d1e2874d7dc9bb1 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Fri, 2 Dec 2011 11:47:25 +0000 Subject: [PATCH 803/970] haskell-statistics: updated to version 0.10.0.1 svn path=/nixpkgs/trunk/; revision=30695 --- .../libraries/haskell/statistics/default.nix | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) diff --git a/pkgs/development/libraries/haskell/statistics/default.nix b/pkgs/development/libraries/haskell/statistics/default.nix index 18347fc374e..ad18f9cbd98 100644 --- a/pkgs/development/libraries/haskell/statistics/default.nix +++ b/pkgs/development/libraries/haskell/statistics/default.nix @@ -1,17 +1,16 @@ -{ cabal, aeson, deepseq, erf, monadPar, mwcRandom, primitive, time -, vector, vectorAlgorithms +{ cabal, deepseq, erf, monadPar, mwcRandom, primitive, vector +, vectorAlgorithms }: cabal.mkDerivation (self: { pname = "statistics"; - version = "0.9.0.0"; - sha256 = "1rwp9gkjs011lxzhkajiljs6x2a4xc8cg558kpfy9xj4q1lk43x7"; + version = "0.10.0.1"; + sha256 = "0bn131yzq3qk4dpr78i3ndsxyn7hars9jw9krfsxmin9pqr114sw"; buildDepends = [ - aeson deepseq erf monadPar mwcRandom primitive time vector - vectorAlgorithms + deepseq erf monadPar mwcRandom primitive vector vectorAlgorithms ]; meta = { - homepage = "http://bitbucket.org/bos/statistics"; + homepage = "https://github.com/bos/statistics"; description = "A library of statistical types, data, and functions"; license = self.stdenv.lib.licenses.bsd3; platforms = self.ghc.meta.platforms; From 5aa9e241d7cb081621d8ce2868049dbfa365cdab Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Fri, 2 Dec 2011 11:47:29 +0000 Subject: [PATCH 804/970] haskell-tls: updated to version 0.8.3.1 svn path=/nixpkgs/trunk/; revision=30696 --- pkgs/development/libraries/haskell/tls/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/tls/default.nix b/pkgs/development/libraries/haskell/tls/default.nix index 45925be982b..73970d1e790 100644 --- a/pkgs/development/libraries/haskell/tls/default.nix +++ b/pkgs/development/libraries/haskell/tls/default.nix @@ -4,8 +4,8 @@ cabal.mkDerivation (self: { pname = "tls"; - version = "0.8.3"; - sha256 = "0l02kx06bf3p8rjz82d3x7cz61rh5vpb9147f4csbzfb1sgh5mzy"; + version = "0.8.3.1"; + sha256 = "07441s9ll8afpkf2wb0pk8hb9i90hyzkz476jyywvi87mmg2np3m"; isLibrary = true; isExecutable = true; buildDepends = [ From 4133abe7dcffc3713661297d9924df1360693974 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Fri, 2 Dec 2011 11:47:34 +0000 Subject: [PATCH 805/970] haskell-xml-enumerator: updated to version 0.4.4 svn path=/nixpkgs/trunk/; revision=30697 --- .../libraries/haskell/xml-enumerator/default.nix | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/pkgs/development/libraries/haskell/xml-enumerator/default.nix b/pkgs/development/libraries/haskell/xml-enumerator/default.nix index ad524f53421..698279be5c6 100644 --- a/pkgs/development/libraries/haskell/xml-enumerator/default.nix +++ b/pkgs/development/libraries/haskell/xml-enumerator/default.nix @@ -1,16 +1,15 @@ -{ cabal, attoparsecText, attoparsecTextEnumerator, blazeBuilder +{ cabal, attoparsec, attoparsecEnumerator, blazeBuilder , blazeBuilderEnumerator, dataDefault, enumerator, failure, text , transformers, xmlTypes }: cabal.mkDerivation (self: { pname = "xml-enumerator"; - version = "0.4.3.2"; - sha256 = "0ahxg81fr4vf5lwbqsbhvpfczhi2fgxb7qrzd38d2zgklrh9vh7v"; + version = "0.4.4"; + sha256 = "1xz37gzk3kk9sqkcbyspcdyz7rk3afkv33g7q45ih5fbd7zkd5gm"; buildDepends = [ - attoparsecText attoparsecTextEnumerator blazeBuilder - blazeBuilderEnumerator dataDefault enumerator failure text - transformers xmlTypes + attoparsec attoparsecEnumerator blazeBuilder blazeBuilderEnumerator + dataDefault enumerator failure text transformers xmlTypes ]; meta = { homepage = "http://github.com/snoyberg/xml"; From 7bbeed560c3c9c3074cedb261fab02998f45e5d5 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Fri, 2 Dec 2011 11:47:42 +0000 Subject: [PATCH 806/970] haskell-xss-sanitize: updated to version 0.3.1 svn path=/nixpkgs/trunk/; revision=30698 --- .../libraries/haskell/xss-sanitize/default.nix | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/pkgs/development/libraries/haskell/xss-sanitize/default.nix b/pkgs/development/libraries/haskell/xss-sanitize/default.nix index e13e0e50c90..745480ecf0c 100644 --- a/pkgs/development/libraries/haskell/xss-sanitize/default.nix +++ b/pkgs/development/libraries/haskell/xss-sanitize/default.nix @@ -1,13 +1,11 @@ -{ cabal, attoparsecText, cssText, network, tagsoup, text -, utf8String -}: +{ cabal, attoparsec, cssText, network, tagsoup, text, utf8String }: cabal.mkDerivation (self: { pname = "xss-sanitize"; - version = "0.3.0.1"; - sha256 = "1rycdjl7b7bk100vgdwy6iighdqsbsyvrklp0zqbl1x45abph9pc"; + version = "0.3.1"; + sha256 = "0s8nqqx5f5b07xxlda4gh0w6vmlkhbqbz36cf6glhbhhyw27jkx5"; buildDepends = [ - attoparsecText cssText network tagsoup text utf8String + attoparsec cssText network tagsoup text utf8String ]; meta = { homepage = "http://github.com/gregwebs/haskell-xss-sanitize"; From 3c0482c614846ecb4f8622f50bc4e90c43550e9b Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Fri, 2 Dec 2011 11:47:48 +0000 Subject: [PATCH 807/970] haskell-yesod-auth: updated to version 0.7.6.2 svn path=/nixpkgs/trunk/; revision=30699 --- .../libraries/haskell/yesod-auth/default.nix | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/pkgs/development/libraries/haskell/yesod-auth/default.nix b/pkgs/development/libraries/haskell/yesod-auth/default.nix index 698df5e0112..c676e175bfb 100644 --- a/pkgs/development/libraries/haskell/yesod-auth/default.nix +++ b/pkgs/development/libraries/haskell/yesod-auth/default.nix @@ -1,19 +1,20 @@ { cabal, aeson, authenticate, blazeHtml, controlMonadAttempt , hamlet, httpEnumerator, mimeMail, persistent, persistentTemplate , pureMD5, pwstoreFast, random, SHA, shakespeareCss, text -, transformers, wai, yesodCore, yesodForm, yesodJson -, yesodPersistent +, transformers, unorderedContainers, wai, yesodCore, yesodForm +, yesodJson, yesodPersistent }: cabal.mkDerivation (self: { pname = "yesod-auth"; - version = "0.7.6.1"; - sha256 = "11x4vs332727x7sbl5w98a5ga709kl53fp9xrqv7c7qrlphiknzy"; + version = "0.7.6.2"; + sha256 = "1g865k5p7i4x78kj00ybb757xbl6vck6d7qdq9n15xg6dbfm0i23"; buildDepends = [ aeson authenticate blazeHtml controlMonadAttempt hamlet httpEnumerator mimeMail persistent persistentTemplate pureMD5 - pwstoreFast random SHA shakespeareCss text transformers wai - yesodCore yesodForm yesodJson yesodPersistent + pwstoreFast random SHA shakespeareCss text transformers + unorderedContainers wai yesodCore yesodForm yesodJson + yesodPersistent ]; meta = { homepage = "http://www.yesodweb.com/"; From 179530c7cd780d3d8ecb423d3eb6822d8aae382e Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Fri, 2 Dec 2011 11:47:55 +0000 Subject: [PATCH 808/970] haskell-yesod-json: updated to version 0.2.2.1 svn path=/nixpkgs/trunk/; revision=30700 --- .../libraries/haskell/yesod-json/default.nix | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/pkgs/development/libraries/haskell/yesod-json/default.nix b/pkgs/development/libraries/haskell/yesod-json/default.nix index cdaa793b150..167ead39dd5 100644 --- a/pkgs/development/libraries/haskell/yesod-json/default.nix +++ b/pkgs/development/libraries/haskell/yesod-json/default.nix @@ -1,10 +1,14 @@ -{ cabal, aeson, shakespeareJs, text, vector, yesodCore }: +{ cabal, aeson, shakespeareJs, text, unorderedContainers, vector +, yesodCore +}: cabal.mkDerivation (self: { pname = "yesod-json"; - version = "0.2.2"; - sha256 = "11n34wg0jjamghd93ild48rzganbwzbqf6shv8lyy1lsm2jl8q0v"; - buildDepends = [ aeson shakespeareJs text vector yesodCore ]; + version = "0.2.2.1"; + sha256 = "16l5ygj9xsg2lzw3mkn1kmq543n9w5z1g6lyl8nw5bblp66lfxq3"; + buildDepends = [ + aeson shakespeareJs text unorderedContainers vector yesodCore + ]; meta = { homepage = "http://www.yesodweb.com/"; description = "Generate content for Yesod using the aeson package"; From 582146a01a3a62eee05ce879e16564567b2328db Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Fri, 2 Dec 2011 11:47:59 +0000 Subject: [PATCH 809/970] haskell-yesod: updated to version 0.9.3.3 svn path=/nixpkgs/trunk/; revision=30701 --- pkgs/development/libraries/haskell/yesod/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/development/libraries/haskell/yesod/default.nix b/pkgs/development/libraries/haskell/yesod/default.nix index a1b0bbd434d..dc987e0214d 100644 --- a/pkgs/development/libraries/haskell/yesod/default.nix +++ b/pkgs/development/libraries/haskell/yesod/default.nix @@ -1,4 +1,4 @@ -{ cabal, attoparsecText, blazeBuilder, blazeHtml, hamlet, httpTypes +{ cabal, attoparsec, blazeBuilder, blazeHtml, hamlet, httpTypes , monadControl, parsec, shakespeareCss, shakespeareJs , shakespeareText, text, time, transformers, unixCompat, wai , waiExtra, warp, yesodAuth, yesodCore, yesodForm, yesodJson @@ -7,12 +7,12 @@ cabal.mkDerivation (self: { pname = "yesod"; - version = "0.9.3.2"; - sha256 = "1dwdjf7iydbpnbfpixjmw90dbb25030mv1s2a9cmbpdg70dzzknp"; + version = "0.9.3.3"; + sha256 = "11xjj9madb9dxk06z3izzbv3cish748hkf57k37mjsvlidbxd104"; isLibrary = true; isExecutable = true; buildDepends = [ - attoparsecText blazeBuilder blazeHtml hamlet httpTypes monadControl + attoparsec blazeBuilder blazeHtml hamlet httpTypes monadControl parsec shakespeareCss shakespeareJs shakespeareText text time transformers unixCompat wai waiExtra warp yesodAuth yesodCore yesodForm yesodJson yesodPersistent From 86bddccb91602d117c6af1a1268aa86fdb754073 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Fri, 2 Dec 2011 11:48:08 +0000 Subject: [PATCH 810/970] haskell-transformers-base: added version 0.4 svn path=/nixpkgs/trunk/; revision=30702 --- .../haskell/transformers-base/default.nix | 18 ++++++++++++++++++ pkgs/top-level/haskell-packages.nix | 2 ++ 2 files changed, 20 insertions(+) create mode 100644 pkgs/development/libraries/haskell/transformers-base/default.nix diff --git a/pkgs/development/libraries/haskell/transformers-base/default.nix b/pkgs/development/libraries/haskell/transformers-base/default.nix new file mode 100644 index 00000000000..21788575302 --- /dev/null +++ b/pkgs/development/libraries/haskell/transformers-base/default.nix @@ -0,0 +1,18 @@ +{ cabal, transformers }: + +cabal.mkDerivation (self: { + pname = "transformers-base"; + version = "0.4"; + sha256 = "1g6q1g0ddr3jjjir0h1g6bc0zpq5gxcyx4q93fidraxxz2pmfrs0"; + buildDepends = [ transformers ]; + meta = { + homepage = "https://github.com/mvv/transformers-base"; + description = "Lift computations from the bottom of a transformer stack"; + license = self.stdenv.lib.licenses.bsd3; + platforms = self.ghc.meta.platforms; + maintainers = [ + self.stdenv.lib.maintainers.andres + self.stdenv.lib.maintainers.simons + ]; + }; +}) diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix index d06a85814be..1d99fd42aaf 100644 --- a/pkgs/top-level/haskell-packages.nix +++ b/pkgs/top-level/haskell-packages.nix @@ -1213,6 +1213,8 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y); transformers_0_2_2_0 = callPackage ../development/libraries/haskell/transformers/0.2.2.0.nix {}; transformers = self.transformers_0_2_2_0; + transformersBase = callPackage ../development/libraries/haskell/transformers-base {}; + tuple = callPackage ../development/libraries/haskell/tuple {}; typeEquality = callPackage ../development/libraries/haskell/type-equality {}; From 011583604ae893b17bdd56f671dfcf662c4b00c5 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Fri, 2 Dec 2011 14:16:48 +0000 Subject: [PATCH 811/970] haskell-wai-extra: updated to version 0.4.5.2 svn path=/nixpkgs/trunk/; revision=30705 --- pkgs/development/libraries/haskell/wai-extra/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/wai-extra/default.nix b/pkgs/development/libraries/haskell/wai-extra/default.nix index 53ed1003904..a0a736deeef 100644 --- a/pkgs/development/libraries/haskell/wai-extra/default.nix +++ b/pkgs/development/libraries/haskell/wai-extra/default.nix @@ -5,8 +5,8 @@ cabal.mkDerivation (self: { pname = "wai-extra"; - version = "0.4.5.1"; - sha256 = "1aq0zvxyk5hgdvpydvf8hlvv61ilrsmbmdaxhiq46waaabxqgdfc"; + version = "0.4.5.2"; + sha256 = "05gq22il1jnvw5rcqr6gassxj29f8l4536zm6bpgk1kff8cxa3g1"; buildDepends = [ blazeBuilder blazeBuilderEnumerator caseInsensitive dataDefault enumerator httpTypes network text time transformers wai From b330b7916071667d92b91ba96e188b270df9fa2d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?= Date: Fri, 2 Dec 2011 23:14:09 +0000 Subject: [PATCH 812/970] Updating rsync. svn path=/nixpkgs/trunk/; revision=30707 --- pkgs/applications/networking/sync/rsync/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/networking/sync/rsync/default.nix b/pkgs/applications/networking/sync/rsync/default.nix index cf770213ef9..9a5ac6f2459 100644 --- a/pkgs/applications/networking/sync/rsync/default.nix +++ b/pkgs/applications/networking/sync/rsync/default.nix @@ -5,11 +5,11 @@ assert enableACLs -> acl != null; stdenv.mkDerivation { - name = "rsync-3.0.7"; + name = "rsync-3.0.9"; src = fetchurl { - url = http://rsync.samba.org/ftp/rsync/src/rsync-3.0.7.tar.gz; - sha256 = "1j77vwz6q3dvgr8w6wvigd5v4m5952czaqdvihr8di13q0b0vq4y"; + url = http://rsync.samba.org/ftp/rsync/src/rsync-3.0.9.tar.gz; + sha256 = "01bw4klqsrlhh3i9lazd485sd9qx5djvnwa21lj2h3a9sn6hzw9h"; }; buildInputs = stdenv.lib.optional enableACLs acl; From bfa4a2d3746e6570ffc029ebd88c47d60841a3b2 Mon Sep 17 00:00:00 2001 From: Michael Raskin <7c6f434c@mail.ru> Date: Sat, 3 Dec 2011 09:07:56 +0000 Subject: [PATCH 813/970] Allow cross-builds svn path=/nixpkgs/trunk/; revision=30708 --- pkgs/data/misc/xkeyboard-config/default.nix | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/pkgs/data/misc/xkeyboard-config/default.nix b/pkgs/data/misc/xkeyboard-config/default.nix index 63357fb45a3..fbe8e7ce1f5 100644 --- a/pkgs/data/misc/xkeyboard-config/default.nix +++ b/pkgs/data/misc/xkeyboard-config/default.nix @@ -8,7 +8,9 @@ stdenv.mkDerivation rec { sha256 = "0x9hkb4iqz64gcabzkdcfy4p78sdhnpjwh54g8wx5bdgy9087vpr"; }; - buildInputs = [ perl perlXMLParser xkbcomp gettext intltool ]; + buildInputs = [ gettext ]; + + buildNativeInputs = [ perl perlXMLParser intltool xkbcomp ]; patches = [ ./eo.patch ]; From fdbef21ceb8fba41b37a5c0199716bf09e7cd18f Mon Sep 17 00:00:00 2001 From: Michael Raskin <7c6f434c@mail.ru> Date: Sat, 3 Dec 2011 09:29:38 +0000 Subject: [PATCH 814/970] Adjust most things to be cross-buildable. Problem: gnutls. Solution: manually replace it with openssl while cross-building svn path=/nixpkgs/trunk/; revision=30709 --- pkgs/tools/admin/tigervnc/default.nix | 27 +++++++++++++++++++++------ 1 file changed, 21 insertions(+), 6 deletions(-) diff --git a/pkgs/tools/admin/tigervnc/default.nix b/pkgs/tools/admin/tigervnc/default.nix index 6658b85c79f..36aae068438 100644 --- a/pkgs/tools/admin/tigervnc/default.nix +++ b/pkgs/tools/admin/tigervnc/default.nix @@ -1,6 +1,12 @@ { stdenv, fetchurl, libX11, libXext, gettext, libICE, libXtst, libXi, libSM, xorgserver , autoconf, automake, cvs, libtool, nasm, utilmacros, pixman, xkbcomp, xkeyboard_config -, fontDirectories, fontutil, libgcrypt, gnutls, pam }: +, fontDirectories, fontutil, libgcrypt, gnutls, pam, flex, bison +, fixesproto, damageproto, xcmiscproto, bigreqsproto, randrproto, renderproto +, fontsproto, videoproto, compositeproto, scrnsaverproto, resourceproto +, libxkbfile, libXfont, libpciaccess +}: + + with stdenv.lib; @@ -17,9 +23,9 @@ stdenv.mkDerivation rec { inherit fontDirectories; patchPhase = '' - sed -i -e 's,$(includedir)/pixman-1,${pixman}/include/pixman-1,' unix/xserver/hw/vnc/Makefile.am - sed -i -e '/^$pidFile/a$ENV{XKB_BINDIR}="${xkbcomp}/bin";' unix/vncserver - sed -i -e '/^\$cmd \.= " -pn";/a$cmd .= " -xkbdir ${xkeyboard_config}/etc/X11/xkb";' unix/vncserver + sed -i -e 's,$(includedir)/pixman-1,${if stdenv ? cross then pixman.hostDrv else pixman}/include/pixman-1,' unix/xserver/hw/vnc/Makefile.am + sed -i -e '/^$pidFile/a$ENV{XKB_BINDIR}="${if stdenv ? cross then xkbcomp.hostDrv else xkbcomp}/bin";' unix/vncserver + sed -i -e '/^\$cmd \.= " -pn";/a$cmd .= " -xkbdir ${if stdenv ? cross then xkeyboard_config.hostDrv else xkeyboard_config}/etc/X11/xkb";' unix/vncserver fontPath= for i in $fontDirectories; do @@ -62,13 +68,22 @@ stdenv.mkDerivation rec { make TIGERVNC_SRCDIR=`pwd`/../.. install ''; + crossAttrs = { + buildInputs = (map (x : x.hostDrv) (buildInputs ++ [ + fixesproto damageproto xcmiscproto bigreqsproto randrproto renderproto + fontsproto videoproto compositeproto scrnsaverproto resourceproto + libxkbfile libXfont libpciaccess + ])); + }; + buildInputs = [ libX11 libXext gettext libICE libXtst libXi libSM - libtool nasm utilmacros fontutil libgcrypt gnutls pam + nasm libgcrypt gnutls pam pixman ]; buildNativeInputs = - [ autoconf automake cvs ] ++ xorgserver.buildNativeInputs; + [ autoconf automake cvs utilmacros fontutil libtool flex bison ] + ++ xorgserver.buildNativeInputs; propagatedBuildNativeInputs = xorgserver.propagatedBuildNativeInputs; From 43a5b41802c2d782fe36ff75479ffb2b7685bee1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?= Date: Sat, 3 Dec 2011 15:04:05 +0000 Subject: [PATCH 815/970] Updating eaglemode svn path=/nixpkgs/trunk/; revision=30711 --- pkgs/applications/misc/eaglemode/default.nix | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/applications/misc/eaglemode/default.nix b/pkgs/applications/misc/eaglemode/default.nix index adf24041483..f027588c5dc 100644 --- a/pkgs/applications/misc/eaglemode/default.nix +++ b/pkgs/applications/misc/eaglemode/default.nix @@ -1,16 +1,16 @@ { stdenv, fetchurl, perl, libX11, xineLib, libjpeg, libpng, libtiff, pkgconfig, -librsvg, glib, gtk, libXext, libXxf86vm }: +librsvg, glib, gtk, libXext, libXxf86vm, poppler }: stdenv.mkDerivation { - name = "eaglemode-0.79.0"; + name = "eaglemode-0.83.0"; src = fetchurl { - url = mirror://sourceforge/eaglemode/eaglemode-0.79.0.tar.bz2; - sha256 = "115jydig35dqkrwl3x7fv564bks13nw89vfb46bb5rlr3l4a084s"; + url = mirror://sourceforge/eaglemode/eaglemode-0.83.0.tar.bz2; + sha256 = "0rlvi9ljf3ml2l4ydkcgjjja8wk9c7h5qlpdr4x4ghh6sqq0q2x3"; }; buildInputs = [ perl libX11 xineLib libjpeg libpng libtiff pkgconfig - librsvg glib gtk libXxf86vm libXext ]; + librsvg glib gtk libXxf86vm libXext poppler ]; # The program tries to dlopen both Xxf86vm and Xext, so we use the # trick on NIX_LDFLAGS and dontPatchELF to make it find them. From 0160f222cc76c9d374b2697bcd027b9b50f362bb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?= Date: Sat, 3 Dec 2011 15:16:17 +0000 Subject: [PATCH 816/970] Adding flashplayer11. It builds fine for me on x86_64. Patch by Eduard Carreras. svn path=/nixpkgs/trunk/; revision=30712 --- .../mozilla-plugins/flashplayer-11/builder.sh | 23 +++++ .../flashplayer-11/default.nix | 88 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 7 +- 3 files changed, 117 insertions(+), 1 deletion(-) create mode 100644 pkgs/applications/networking/browsers/mozilla-plugins/flashplayer-11/builder.sh create mode 100644 pkgs/applications/networking/browsers/mozilla-plugins/flashplayer-11/default.nix diff --git a/pkgs/applications/networking/browsers/mozilla-plugins/flashplayer-11/builder.sh b/pkgs/applications/networking/browsers/mozilla-plugins/flashplayer-11/builder.sh new file mode 100644 index 00000000000..4db487f5c51 --- /dev/null +++ b/pkgs/applications/networking/browsers/mozilla-plugins/flashplayer-11/builder.sh @@ -0,0 +1,23 @@ +source $stdenv/setup + +dontStrip=1 +dontPatchELF=1 +sourceRoot=$TMPDIR + +unpackPhase() { + tar xvzf $src; + for a in *; do + if [ -d $a ]; then + cd $a + break + fi + done +} + +installPhase() { + ensureDir $out/lib/mozilla/plugins + cp -pv libflashplayer.so $out/lib/mozilla/plugins + patchelf --set-rpath "$rpath" $out/lib/mozilla/plugins/libflashplayer.so +} + +genericBuild diff --git a/pkgs/applications/networking/browsers/mozilla-plugins/flashplayer-11/default.nix b/pkgs/applications/networking/browsers/mozilla-plugins/flashplayer-11/default.nix new file mode 100644 index 00000000000..260edd360c6 --- /dev/null +++ b/pkgs/applications/networking/browsers/mozilla-plugins/flashplayer-11/default.nix @@ -0,0 +1,88 @@ +{ stdenv +, fetchurl +, zlib +, alsaLib +, curl +, nss +, nspr +, fontconfig +, freetype +, expat +, libX11 +, libXext +, libXrender +, libXt +, gtk +, glib +, pango +, cairo +, atk +, gdk_pixbuf +, debug ? false + +/* you have to add ~/mm.cfg : + + TraceOutputFileEnable=1 + ErrorReportingEnable=1 + MaxWarnings=1 + + in order to read the flash trace at ~/.macromedia/Flash_Player/Logs/flashlog.txt + Then FlashBug (a FireFox plugin) shows the log as well +*/ + +}: + +let + + src = + if stdenv.system == "x86_64-linux" then + if debug then + # no plans to provide a x86_64 version: + # http://labs.adobe.com/technologies/flashplayer10/faq.html + throw "no x86_64 debugging version available" + else { + # -> http://labs.adobe.com/downloads/flashplayer10.html + version = "11.1.102.55"; + url = http://fpdownload.macromedia.com/get/flashplayer/pdc/11.1.102.55/install_flash_player_11_linux.x86_64.tar.gz; + sha256 = "09swldv174z23pnixy9fxkw084qkl3bbrxfpf159fbjdgvwihn1l"; + } + else if stdenv.system == "i686-linux" then + if debug then { + # The debug version also contains a player + version = "11.1"; + url = http://fpdownload.macromedia.com/pub/flashplayer/updaters/11/flashplayer_11_plugin_debug.i386.tar.gz; + sha256 = "1z3649lv9sh7jnwl8d90a293nkaswagj2ynhsr4xmwiy7c0jz2lk"; + } else { + version = "11.1.102.55"; + url = "http://fpdownload.macromedia.com/get/flashplayer/pdc/11.1.102.55/install_flash_player_11_linux.i386.tar.gz"; + sha256 = "08zdnl06lqyk2k3yq4lgphqd3ci2267448mghlv1p0hjrdq253k7"; + } + else throw "Flash Player is not supported on this platform"; + +in + +stdenv.mkDerivation { + name = "flashplayer-${src.version}"; + + builder = ./builder.sh; + + src = fetchurl { inherit (src) url sha256; }; + + inherit zlib alsaLib; + + passthru = { + mozillaPlugin = "/lib/mozilla/plugins"; + }; + + rpath = stdenv.lib.makeLibraryPath + [ zlib alsaLib curl nss nspr fontconfig freetype expat libX11 + libXext libXrender libXt gtk glib pango atk cairo gdk_pixbuf + ]; + + buildPhase = ":"; + + meta = { + description = "Adobe Flash Player browser plugin"; + homepage = http://www.adobe.com/products/flashplayer/; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index da73e7dc12b..82b89d0c658 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -6680,7 +6680,7 @@ let flac = callPackage ../applications/audio/flac { }; - flashplayer = flashplayer10; + flashplayer = flashplayer11; flashplayer9 = callPackage ../applications/networking/browsers/mozilla-plugins/flashplayer-9 { inherit (gtkLibs) atk; @@ -6691,6 +6691,11 @@ let debug = getConfig ["flashplayer" "debug"] false; }; + flashplayer11 = callPackage ../applications/networking/browsers/mozilla-plugins/flashplayer-11 { + inherit (gtkLibs) atk gdk_pixbuf; + debug = getConfig ["flashplayer" "debug"] false; + }; + freecad = callPackage ../applications/graphics/freecad { boost = boost146; }; From 504bd76b0eb76c412aa0d1ee361789a72775a31b Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Sat, 3 Dec 2011 16:11:50 +0000 Subject: [PATCH 817/970] ikiwiki: updated to version 3.20111107 svn path=/nixpkgs/trunk/; revision=30713 --- pkgs/applications/misc/ikiwiki/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/misc/ikiwiki/default.nix b/pkgs/applications/misc/ikiwiki/default.nix index 7fde09c2175..46e630804c6 100644 --- a/pkgs/applications/misc/ikiwiki/default.nix +++ b/pkgs/applications/misc/ikiwiki/default.nix @@ -13,14 +13,14 @@ assert monotoneSupport -> (monotone != null); let name = "ikiwiki"; - version = "3.20110715"; + version = "3.20111107"; in stdenv.mkDerivation { name = "${name}-${version}"; src = fetchurl { url = "http://ftp.de.debian.org/debian/pool/main/i/ikiwiki/${name}_${version}.tar.gz"; - sha256 = "ef9cbe5ddf484e6b75de05cc6a5b51dfdff1f5920b1c4c66309b1409266df9c7"; + sha256 = "5b14370ec9c31138d4937eca4ba9c1f1a74515edd34071cefd0cefa37395565c"; }; buildInputs = [ perl TextMarkdown URI HTMLParser HTMLScrubber HTMLTemplate From 74d61459173e0ac7ad7aa9210985da40c5f1d285 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Sat, 3 Dec 2011 16:11:54 +0000 Subject: [PATCH 818/970] rsync: added meta.maintainers section svn path=/nixpkgs/trunk/; revision=30714 --- pkgs/applications/networking/sync/rsync/default.nix | 3 +++ 1 file changed, 3 insertions(+) diff --git a/pkgs/applications/networking/sync/rsync/default.nix b/pkgs/applications/networking/sync/rsync/default.nix index 9a5ac6f2459..924b92529a6 100644 --- a/pkgs/applications/networking/sync/rsync/default.nix +++ b/pkgs/applications/networking/sync/rsync/default.nix @@ -18,5 +18,8 @@ stdenv.mkDerivation { meta = { homepage = http://samba.anu.edu.au/rsync/; description = "A fast incremental file transfer utility"; + + platforms = stdenv.lib.platforms.unix; + maintainers = [ stdenv.lib.maintainers.simons ]; }; } From 72e5c8176e7a1ac2e9d2094ec21e90af225fe5bf Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Sat, 3 Dec 2011 16:11:57 +0000 Subject: [PATCH 819/970] rsync: stripped trailing whitespace svn path=/nixpkgs/trunk/; revision=30715 --- pkgs/applications/networking/sync/rsync/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/applications/networking/sync/rsync/default.nix b/pkgs/applications/networking/sync/rsync/default.nix index 924b92529a6..343895e0877 100644 --- a/pkgs/applications/networking/sync/rsync/default.nix +++ b/pkgs/applications/networking/sync/rsync/default.nix @@ -6,7 +6,7 @@ assert enableACLs -> acl != null; stdenv.mkDerivation { name = "rsync-3.0.9"; - + src = fetchurl { url = http://rsync.samba.org/ftp/rsync/src/rsync-3.0.9.tar.gz; sha256 = "01bw4klqsrlhh3i9lazd485sd9qx5djvnwa21lj2h3a9sn6hzw9h"; From ecf037f2f7fa2aa956e582296cb06af093f3e4db Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andres=20L=C3=B6h?= Date: Sat, 3 Dec 2011 16:19:43 +0000 Subject: [PATCH 820/970] Added a wrapper function to produce a GHC with a predefined set of packages. svn path=/nixpkgs/trunk/; revision=30716 --- .../compilers/ghc/with-packages.nix | 67 +++++++++++++++++++ pkgs/top-level/haskell-packages.nix | 9 +++ 2 files changed, 76 insertions(+) create mode 100644 pkgs/development/compilers/ghc/with-packages.nix diff --git a/pkgs/development/compilers/ghc/with-packages.nix b/pkgs/development/compilers/ghc/with-packages.nix new file mode 100644 index 00000000000..2535e28ebc1 --- /dev/null +++ b/pkgs/development/compilers/ghc/with-packages.nix @@ -0,0 +1,67 @@ +{stdenv, ghcPlain, packages ? [], makeWrapper}: + +stdenv.mkDerivation rec { + name = "ghc-${ghcPlain.version}-linkdir"; + + allPackages = stdenv.lib.closePropagation packages; + buildInputs = allPackages ++ [makeWrapper]; + propagatedBuildInputs = packages; + + unpackPhase = "true"; + + installPhase = '' + originalTopDir="${ghcPlain}/lib/ghc-${ghcPlain.version}" + originalPkgDir="$originalTopDir/package.conf.d" + linkedTopDir="$out/lib" + linkedPkgDir="$linkedTopDir/package.conf.d" + + ensureDir $out/bin + cd $out/bin + + echo "Generating wrappers ..." + + for prg in ghc ghci ghc-${ghcPlain.version} ghci-${ghcPlain.version}; do + makeWrapper ${ghcPlain}/bin/$prg $out/bin/$prg --add-flags "-B$linkedTopDir" + done + + for prg in runghc runhaskell; do + makeWrapper ${ghcPlain}/bin/$prg $out/bin/$prg --add-flags "-f $out/bin/ghc" + done + + for prg in ghc-pkg ghc-pkg-${ghcPlain.version}; do + makeWrapper ${ghcPlain}/bin/$prg $out/bin/$prg --add-flags "--global-conf $linkedPkgDir" + done + + for prg in hp2ps hpc hasktags hsc2hs haddock haddock-${ghcPlain.version}; do + test -x ${ghcPlain}/bin/$prg && ln -s ${ghcPlain}/bin/$prg $out/bin/$prg + done + + ensureDir $linkedTopDir + cd $linkedTopDir + + if test -f $originalTopDir/settings; then + echo "Linking $originalTopDir/settings ..." + ln -s $originalTopDir/settings . + fi + + ensureDir $linkedPkgDir + cd $linkedPkgDir + + echo "Linking $originalPkgDir ..." + ln -s $originalPkgDir/*.conf . + + for currentPath in ${stdenv.lib.concatStringsSep " " allPackages}; do + currentPkgDir="$currentPath/lib/ghc-pkgs/ghc-${ghcPlain.version}" + if test -d $currentPkgDir; then + echo "Linking $currentPkgDir ..." + ln -s $currentPkgDir/*.conf . + fi + done + + echo "Generating package cache ..." + ${ghcPlain}/bin/ghc-pkg --global-conf $linkedPkgDir recache + + ''; + + # inherit ghc.meta; +} diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix index 1d99fd42aaf..7a62eb070eb 100644 --- a/pkgs/top-level/haskell-packages.nix +++ b/pkgs/top-level/haskell-packages.nix @@ -107,6 +107,15 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y); ghc = ghc; }; + # An experimental wrapper around ghcPlain that does not automatically + # pick up packages from the profile, but instead has a fixed set of packages + # in its global database. The set of packages can be specified as an + # argument to this function. + + ghcWithPackages = pkgs : callPackage ../development/compilers/ghc/with-packages.nix { + packages = pkgs self; + }; + # This is the Cabal builder, the function we use to build most Haskell # packages. It isn't the Cabal library, which is a core package of GHC # and therefore not separately listed here. From 6820803223e125f0eb69dd082951ff9f8823c357 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Sat, 3 Dec 2011 16:33:49 +0000 Subject: [PATCH 821/970] haskell-hakyll: updated to version 3.2.3.1 svn path=/nixpkgs/trunk/; revision=30717 --- pkgs/development/libraries/haskell/hakyll/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/hakyll/default.nix b/pkgs/development/libraries/haskell/hakyll/default.nix index 9fc4246442b..081c343d450 100644 --- a/pkgs/development/libraries/haskell/hakyll/default.nix +++ b/pkgs/development/libraries/haskell/hakyll/default.nix @@ -5,8 +5,8 @@ cabal.mkDerivation (self: { pname = "hakyll"; - version = "3.2.3.0"; - sha256 = "15s66sr6y7k01yy01411r38hg1vyyv7yqaj8s44n5qzl0yln9gq8"; + version = "3.2.3.1"; + sha256 = "1mmzi8d5a3k4s81h5ciis32g8khxvpafps6pql65lvpp9yhicxdz"; buildDepends = [ binary blazeHtml citeprocHs cryptohash hamlet mtl pandoc parsec regexBase regexPcre snapCore snapServer tagsoup time From c420785bda5e43c896dc3d84ef83fd7fd6903d50 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Sat, 3 Dec 2011 16:33:53 +0000 Subject: [PATCH 822/970] haskell-transformers-base: updated to version 0.4.0.1 svn path=/nixpkgs/trunk/; revision=30718 --- .../libraries/haskell/transformers-base/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/transformers-base/default.nix b/pkgs/development/libraries/haskell/transformers-base/default.nix index 21788575302..6571b082281 100644 --- a/pkgs/development/libraries/haskell/transformers-base/default.nix +++ b/pkgs/development/libraries/haskell/transformers-base/default.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "transformers-base"; - version = "0.4"; - sha256 = "1g6q1g0ddr3jjjir0h1g6bc0zpq5gxcyx4q93fidraxxz2pmfrs0"; + version = "0.4.0.1"; + sha256 = "0avnnxbxh59xgxzb8vldysrbw37sim9iaiiscgjhdlscxy6yasbb"; buildDepends = [ transformers ]; meta = { homepage = "https://github.com/mvv/transformers-base"; From a87be0fb2c19679d2d2d4f07dc0876aa0d64f4fe Mon Sep 17 00:00:00 2001 From: Shea Levy Date: Sat, 3 Dec 2011 22:05:21 +0000 Subject: [PATCH 823/970] Add mornfall as a maintainer svn path=/nixpkgs/trunk/; revision=30719 --- pkgs/lib/maintainers.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/lib/maintainers.nix b/pkgs/lib/maintainers.nix index 9652a32bb2e..d377dd2e1c5 100644 --- a/pkgs/lib/maintainers.nix +++ b/pkgs/lib/maintainers.nix @@ -15,6 +15,7 @@ kkallio = "Karn Kallio "; ludo = "Ludovic Courtès "; marcweber = "Marc Weber "; + mornfall = "Petr RoÄkai "; neznalek = "Vladimír ÄŒunát "; phreedom = "Evgeny Egorochkin "; pierron = "Nicolas B. Pierron "; From 3de62cd12a7b2eedd195f2575ea0db37884b68b9 Mon Sep 17 00:00:00 2001 From: Shea Levy Date: Sat, 3 Dec 2011 22:21:00 +0000 Subject: [PATCH 824/970] Add quvi Patch submitted by mornfall svn path=/nixpkgs/trunk/; revision=30720 --- pkgs/applications/video/quvi/library.nix | 22 ++++++++++++++++++++++ pkgs/applications/video/quvi/scripts.nix | 22 ++++++++++++++++++++++ pkgs/applications/video/quvi/tool.nix | 22 ++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 6 ++++++ 4 files changed, 72 insertions(+) create mode 100644 pkgs/applications/video/quvi/library.nix create mode 100644 pkgs/applications/video/quvi/scripts.nix create mode 100644 pkgs/applications/video/quvi/tool.nix diff --git a/pkgs/applications/video/quvi/library.nix b/pkgs/applications/video/quvi/library.nix new file mode 100644 index 00000000000..bef755afed4 --- /dev/null +++ b/pkgs/applications/video/quvi/library.nix @@ -0,0 +1,22 @@ +{stdenv, fetchurl, pkgconfig, lua5, curl, quvi_scripts}: + +stdenv.mkDerivation rec { + name = "libquvi-${version}"; + version="0.4.0"; + + src = fetchurl { + url = "mirror://sourceforge/quvi/libquvi-${version}.tar.gz"; + sha256 = "15cm9j8dssn2zhplqvlw49piwfw511lia6b635byiwfniqf6dnwp"; + }; + + buildInputs = [ pkgconfig lua5 curl quvi_scripts ]; + + meta = { + description = "Quvi is a web video downloader."; + homepage = http://quvi.sf.net; + license = "LGPLv2.1+"; + platforms = stdenv.lib.platforms.linux; + maintainers = [ stdenv.lib.maintainers.mornfall ]; + }; +} + diff --git a/pkgs/applications/video/quvi/scripts.nix b/pkgs/applications/video/quvi/scripts.nix new file mode 100644 index 00000000000..9c6cd9d3137 --- /dev/null +++ b/pkgs/applications/video/quvi/scripts.nix @@ -0,0 +1,22 @@ +{stdenv, fetchurl, pkgconfig}: + +stdenv.mkDerivation rec { + name = "quvi-scripts-${version}"; + version="0.4.0"; + + src = fetchurl { + url = "mirror://sourceforge/quvi/libquvi-scripts-${version}.tar.gz"; + sha256 = "14p1sn7id4n35isaw3i3h8vsgfqlym09fih9k5xfqwsg6n7xdvq5"; + }; + + buildInputs = [ pkgconfig ]; + + meta = { + description = "Quvi is a web video downloader."; + homepage = http://quvi.sf.net; + license = "LGPLv2.1+"; + platforms = stdenv.lib.platforms.linux; + maintainers = [ stdenv.lib.maintainers.mornfall ]; + }; +} + diff --git a/pkgs/applications/video/quvi/tool.nix b/pkgs/applications/video/quvi/tool.nix new file mode 100644 index 00000000000..b2ddabfa6a8 --- /dev/null +++ b/pkgs/applications/video/quvi/tool.nix @@ -0,0 +1,22 @@ +{stdenv, fetchurl, pkgconfig, lua5, curl, quvi_scripts, libquvi}: + +stdenv.mkDerivation rec { + name = "quvi-${version}"; + version="0.4.0"; + + src = fetchurl { + url = "mirror://sourceforge/quvi/quvi-${version}.tar.gz"; + sha256 = "0qzyj55py4z7pg97794jjycq8nvrlr02072rgjzg8jgknw49hgfv"; + }; + + buildInputs = [ pkgconfig lua5 curl quvi_scripts libquvi ]; + + meta = { + description = "Quvi is a web video downloader."; + homepage = http://quvi.sf.net; + license = "LGPLv2.1+"; + platforms = stdenv.lib.platforms.linux; + maintainers = [ stdenv.lib.maintainers.mornfall ]; + }; +} + diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 82b89d0c658..dc291d23fdf 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -6751,6 +6751,12 @@ let qcad = callPackage ../applications/misc/qcad { }; + libquvi = callPackage ../applications/video/quvi/library.nix { }; + + quvi = callPackage ../applications/video/quvi/tool.nix { }; + + quvi_scripts = callPackage ../applications/video/quvi/scripts.nix { }; + qjackctl = callPackage ../applications/audio/qjackctl { }; gkrellm = callPackage ../applications/misc/gkrellm { }; From 766396a57ba497cbf95aa53dfb84f7e6b825f35f Mon Sep 17 00:00:00 2001 From: Shea Levy Date: Sat, 3 Dec 2011 22:23:57 +0000 Subject: [PATCH 825/970] bluez: Wrap the test-input program Apparently this is useful for bluetooth mice and other HID. Patch submitted by mornfall svn path=/nixpkgs/trunk/; revision=30721 --- pkgs/os-specific/linux/bluez/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/os-specific/linux/bluez/default.nix b/pkgs/os-specific/linux/bluez/default.nix index 598ee26124f..81d15a0aa0c 100644 --- a/pkgs/os-specific/linux/bluez/default.nix +++ b/pkgs/os-specific/linux/bluez/default.nix @@ -35,7 +35,7 @@ stdenv.mkDerivation rec { depending on Python etc. */ postInstall = '' pushd test - for a in simple-agent test-adapter test-device; do + for a in simple-agent test-adapter test-device test-input; do cp $a $out/bin/bluez-$a wrapProgram $out/bin/bluez-$a --prefix PYTHONPATH : ${pythonpath} done From 332afc59aabbfe95331a9c654804bdbe6df71839 Mon Sep 17 00:00:00 2001 From: Shea Levy Date: Sat, 3 Dec 2011 23:47:59 +0000 Subject: [PATCH 826/970] llvm 3.0 This probably breaks clang. I will be updating clang to 3.0 when I can svn path=/nixpkgs/trunk/; revision=30722 --- pkgs/development/compilers/llvm/default.nix | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/pkgs/development/compilers/llvm/default.nix b/pkgs/development/compilers/llvm/default.nix index c8f05bb1fd7..afc1a55b093 100644 --- a/pkgs/development/compilers/llvm/default.nix +++ b/pkgs/development/compilers/llvm/default.nix @@ -1,13 +1,13 @@ { stdenv, fetchurl, perl, groff, darwinSwVersUtility }: -let version = "2.9"; in +let version = "3.0"; in stdenv.mkDerivation { name = "llvm-${version}"; src = fetchurl { - url = "http://llvm.org/releases/${version}/llvm-${version}.tgz"; - sha256 = "0y9pgdakn3n0vf8zs6fjxjw6972nyw4rkfwwza6b8a3ll77kc4k6"; + url = "http://llvm.org/releases/${version}/llvm-${version}.tar.gz"; + sha256 = "0xq4gi7lflv8ilfckslhfvnja5693xjii1yvzz39kklr6hfv37ji"; }; buildInputs = [ perl groff ] ++ @@ -19,6 +19,8 @@ stdenv.mkDerivation { "CXX=clang++" ]; + enableParallelBuilding = true; + meta = { homepage = http://llvm.org/; description = "Collection of modular and reusable compiler and toolchain technologies"; From 8d746d0fd57107bb40cab654413d96218d76b48c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?= Date: Sun, 4 Dec 2011 00:25:58 +0000 Subject: [PATCH 827/970] Updating valgrind svn path=/nixpkgs/trunk/; revision=30723 --- pkgs/development/tools/analysis/valgrind/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/analysis/valgrind/default.nix b/pkgs/development/tools/analysis/valgrind/default.nix index a9774a84638..d0c5e624d39 100644 --- a/pkgs/development/tools/analysis/valgrind/default.nix +++ b/pkgs/development/tools/analysis/valgrind/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, perl, gdb }: stdenv.mkDerivation (rec { - name = "valgrind-3.6.1"; + name = "valgrind-3.7.0"; src = fetchurl { url = "http://valgrind.org/downloads/${name}.tar.bz2"; - sha256 = "03kaf8q49r347diryc2p1q5hxsd6hyhxikqdbydh8q7hpi7wrga9"; + sha256 = "1xnb4jiimscwriw3jd1lkk0m9x4glqpijj9jb4ngx08l1wrw0qjx"; }; # Perl is needed for `cg_annotate'. From fa135fc65566dd6a715a736bed6fab0b53222cd9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= Date: Sun, 4 Dec 2011 13:48:57 +0000 Subject: [PATCH 828/970] gnupdate: Remove quirks for GNUnet. * maintainers/scripts/gnu/gnupdate (ftp-server/directory)[quirks]: Remove GNUnet. (nixpkgs->gnu-name)[quirks]: Likewise. svn path=/nixpkgs/trunk/; revision=30724 --- maintainers/scripts/gnu/gnupdate | 2 -- 1 file changed, 2 deletions(-) diff --git a/maintainers/scripts/gnu/gnupdate b/maintainers/scripts/gnu/gnupdate index 6f677425b23..0b50677464b 100755 --- a/maintainers/scripts/gnu/gnupdate +++ b/maintainers/scripts/gnu/gnupdate @@ -781,7 +781,6 @@ Return #t if the signature was good, #f otherwise." ("freefont-ttf" "ftp.gnu.org" "/gnu/freefont" #f) ("gnupg" "ftp.gnupg.org" "/gcrypt" #t) ("gnu-ghostscript" "ftp.gnu.org" "/gnu/ghostscript" #f) - ("GNUnet" "ftp.gnu.org" "/gnu/gnunet" #f) ("mit-scheme" "ftp.gnu.org" "/gnu/mit-scheme/stable.pkg" #f) ("icecat" "ftp.gnu.org" "/gnu/gnuzilla" #f) ("source-highlight" "ftp.gnu.org" "/gnu/src-highlite" #f) @@ -805,7 +804,6 @@ Return #t if the signature was good, #f otherwise." ("gnumake" . "make") ("gnused" . "sed") ("gnutar" . "tar") - ("gnunet" . "GNUnet") ;; ftp.gnu.org/gnu/gnunet/GNUnet-x.y.tar.gz ("mitscheme" . "mit-scheme") ("texmacs" . "TeXmacs"))) From dccc3f83b3390db80bab0853b295cbf81eb2b376 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= Date: Sun, 4 Dec 2011 13:49:03 +0000 Subject: [PATCH 829/970] GNUnet 0.9.0. svn path=/nixpkgs/trunk/; revision=30725 --- .../p2p/gnunet/{0.9.nix => 0.8.nix} | 32 +++-- .../networking/p2p/gnunet/default.nix | 129 ++++++++---------- pkgs/top-level/all-packages.nix | 4 +- 3 files changed, 79 insertions(+), 86 deletions(-) rename pkgs/applications/networking/p2p/gnunet/{0.9.nix => 0.8.nix} (76%) diff --git a/pkgs/applications/networking/p2p/gnunet/0.9.nix b/pkgs/applications/networking/p2p/gnunet/0.8.nix similarity index 76% rename from pkgs/applications/networking/p2p/gnunet/0.9.nix rename to pkgs/applications/networking/p2p/gnunet/0.8.nix index 221640930d7..586146bdd9d 100644 --- a/pkgs/applications/networking/p2p/gnunet/0.9.nix +++ b/pkgs/applications/networking/p2p/gnunet/0.8.nix @@ -1,30 +1,25 @@ -{ stdenv, fetchsvn, libextractor, libmicrohttpd, libgcrypt -, zlib, gmp, curl, libtool, adns, sqlite, pkgconfig +{ stdenv, fetchurl, libextractor, libmicrohttpd, libgcrypt +, zlib, gmp, curl, libtool, guile, adns, sqlite, pkgconfig , libxml2, ncurses, gettext, findutils -, autoconf, automake , gtkSupport ? false, gtk ? null, libglade ? null , makeWrapper }: assert gtkSupport -> (gtk != null) && (libglade != null); -let - rev = "17000"; - version = "0.9-svn-${rev}"; +let version = "0.8.1b"; in stdenv.mkDerivation { name = "gnunet-${version}"; - src = fetchsvn { - url = "https://gnunet.org/svn/gnunet"; - sha256 = "17nkvykg3xb5m1y86i9lahgsic9jpj6h0nr73ywzpxpp7ql45cm4"; - inherit rev; + src = fetchurl { + url = "mirror://gnu/gnunet/GNUnet-${version}.tar.gz"; + sha256 = "0k6nrsxz5s52z6hlahb7d3sj1z0gidm79n04pf9j2ngfylp4v1bw"; }; buildInputs = [ libextractor libmicrohttpd libgcrypt gmp curl libtool - zlib adns sqlite libxml2 ncurses + zlib guile adns sqlite libxml2 ncurses pkgconfig gettext findutils - autoconf automake makeWrapper ] ++ (if gtkSupport then [ gtk libglade ] else []); @@ -47,8 +42,19 @@ in echo "$i: replacing references to \`/tmp' by \`$TMPDIR'..." substituteInPlace "$i" --replace "/tmp" "$TMPDIR" done + ''; - autoreconf -vfi + doCheck = false; + + # 1. Run tests have once GNUnet is installed. + # 2. Help programs find the numerous modules that sit under + # `$out/lib/GNUnet'. + + # FIXME: `src/transports/test_udp' hangs forever. + postInstall = '' + #GNUNET_PREFIX="$out" make check + wrapProgram "$out/bin/gnunetd" \ + --prefix LTDL_LIBRARY_PATH ":" "$out/lib/GNUnet" ''; meta = { diff --git a/pkgs/applications/networking/p2p/gnunet/default.nix b/pkgs/applications/networking/p2p/gnunet/default.nix index 586146bdd9d..1219c176354 100644 --- a/pkgs/applications/networking/p2p/gnunet/default.nix +++ b/pkgs/applications/networking/p2p/gnunet/default.nix @@ -1,85 +1,72 @@ { stdenv, fetchurl, libextractor, libmicrohttpd, libgcrypt -, zlib, gmp, curl, libtool, guile, adns, sqlite, pkgconfig -, libxml2, ncurses, gettext, findutils +, zlib, gmp, curl, libtool, adns, sqlite, pkgconfig +, libxml2, ncurses, gettext , gtkSupport ? false, gtk ? null, libglade ? null , makeWrapper }: assert gtkSupport -> (gtk != null) && (libglade != null); -let version = "0.8.1b"; -in - stdenv.mkDerivation { - name = "gnunet-${version}"; +stdenv.mkDerivation rec { + name = "gnunet-0.9.0"; - src = fetchurl { - url = "mirror://gnu/gnunet/GNUnet-${version}.tar.gz"; - sha256 = "0k6nrsxz5s52z6hlahb7d3sj1z0gidm79n04pf9j2ngfylp4v1bw"; - }; + src = fetchurl { + url = "mirror://gnu/gnunet/${name}.tar.gz"; + sha256 = "1a0faq2j20dxhpdq0lpi8mjhddwmscbaa1bsxk460p5mj8n55i3p"; + }; - buildInputs = [ - libextractor libmicrohttpd libgcrypt gmp curl libtool - zlib guile adns sqlite libxml2 ncurses - pkgconfig gettext findutils - makeWrapper - ] ++ (if gtkSupport then [ gtk libglade ] else []); + buildInputs = [ + libextractor libmicrohttpd libgcrypt gmp curl libtool + zlib adns sqlite libxml2 ncurses + pkgconfig gettext makeWrapper + ] ++ (if gtkSupport then [ gtk libglade ] else []); - preConfigure = '' - # Brute force: since nix-worker chroots don't provide - # /etc/{resolv.conf,hosts}, replace all references to `localhost' - # by their IPv4 equivalent. - for i in $(find . \( -name \*.c -or -name \*.conf \) \ - -exec grep -l localhost {} \;) - do - echo "$i: substituting \`127.0.0.1' to \`localhost'..." - substituteInPlace "$i" --replace "localhost" "127.0.0.1" - done + preConfigure = '' + # Brute force: since nix-worker chroots don't provide + # /etc/{resolv.conf,hosts}, replace all references to `localhost' + # by their IPv4 equivalent. + for i in $(find . \( -name \*.c -or -name \*.conf \) \ + -exec grep -l '\' {} \;) + do + echo "$i: substituting \`127.0.0.1' to \`localhost'..." + sed -i "$i" -e's/\/127.0.0.1/g' + done - # Make sure the tests don't rely on `/tmp', for the sake of chroot - # builds. - for i in $(find . \( -iname \*test\*.c -or -name \*.conf \) \ - -exec grep -l /tmp {} \;) - do - echo "$i: replacing references to \`/tmp' by \`$TMPDIR'..." - substituteInPlace "$i" --replace "/tmp" "$TMPDIR" - done + # Make sure the tests don't rely on `/tmp', for the sake of chroot + # builds. + for i in $(find . \( -iname \*test\*.c -or -name \*.conf \) \ + -exec grep -l /tmp {} \;) + do + echo "$i: replacing references to \`/tmp' by \`$TMPDIR'..." + substituteInPlace "$i" --replace "/tmp" "$TMPDIR" + done + ''; + + # XXX: There are several test failures, forwarded to bug-gnunet@gnu.org. + doCheck = false; + + meta = { + description = "GNUnet, GNU's decentralized anonymous and censorship-resistant P2P framework"; + + longDescription = '' + GNUnet is a framework for secure peer-to-peer networking that + does not use any centralized or otherwise trusted services. A + first service implemented on top of the networking layer + allows anonymous censorship-resistant file-sharing. Anonymity + is provided by making messages originating from a peer + indistinguishable from messages that the peer is routing. All + peers act as routers and use link-encrypted connections with + stable bandwidth utilization to communicate with each other. + GNUnet uses a simple, excess-based economic model to allocate + resources. Peers in GNUnet monitor each others behavior with + respect to resource usage; peers that contribute to the + network are rewarded with better service. ''; - doCheck = false; + homepage = http://gnunet.org/; - # 1. Run tests have once GNUnet is installed. - # 2. Help programs find the numerous modules that sit under - # `$out/lib/GNUnet'. + license = "GPLv2+"; - # FIXME: `src/transports/test_udp' hangs forever. - postInstall = '' - #GNUNET_PREFIX="$out" make check - wrapProgram "$out/bin/gnunetd" \ - --prefix LTDL_LIBRARY_PATH ":" "$out/lib/GNUnet" - ''; - - meta = { - description = "GNUnet, GNU's decentralized anonymous and censorship-resistant P2P framework"; - - longDescription = '' - GNUnet is a framework for secure peer-to-peer networking that - does not use any centralized or otherwise trusted services. A - first service implemented on top of the networking layer - allows anonymous censorship-resistant file-sharing. Anonymity - is provided by making messages originating from a peer - indistinguishable from messages that the peer is routing. All - peers act as routers and use link-encrypted connections with - stable bandwidth utilization to communicate with each other. - GNUnet uses a simple, excess-based economic model to allocate - resources. Peers in GNUnet monitor each others behavior with - respect to resource usage; peers that contribute to the - network are rewarded with better service. - ''; - - homepage = http://gnunet.org/; - - license = "GPLv2+"; - - maintainers = [ stdenv.lib.maintainers.ludo ]; - platforms = stdenv.lib.platforms.gnu; - }; - } + maintainers = [ stdenv.lib.maintainers.ludo ]; + platforms = stdenv.lib.platforms.gnu; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index dc291d23fdf..612168b575a 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -6773,13 +6773,13 @@ let inherit (gnome) GConf; }; - gnunet = callPackage ../applications/networking/p2p/gnunet { + gnunet08 = callPackage ../applications/networking/p2p/gnunet/0.8.nix { inherit (gnome) gtk libglade; guile = guile_1_8; gtkSupport = getConfig [ "gnunet" "gtkSupport" ] true; }; - gnunet09 = lowPrio (callPackage ../applications/networking/p2p/gnunet/0.9.nix { }); + gnunet = callPackage ../applications/networking/p2p/gnunet { }; gocr = callPackage ../applications/graphics/gocr { }; From f237a3a4183459cd64b9d28e5806a2efb64e040d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andres=20L=C3=B6h?= Date: Sun, 4 Dec 2011 16:07:39 +0000 Subject: [PATCH 830/970] Extended ghcWithPackages to link binaries. svn path=/nixpkgs/trunk/; revision=30726 --- .../compilers/ghc/with-packages.nix | 87 +++++++++++-------- pkgs/top-level/haskell-packages.nix | 3 +- 2 files changed, 52 insertions(+), 38 deletions(-) diff --git a/pkgs/development/compilers/ghc/with-packages.nix b/pkgs/development/compilers/ghc/with-packages.nix index 2535e28ebc1..b405a89b642 100644 --- a/pkgs/development/compilers/ghc/with-packages.nix +++ b/pkgs/development/compilers/ghc/with-packages.nix @@ -1,7 +1,7 @@ -{stdenv, ghcPlain, packages ? [], makeWrapper}: +{stdenv, ghc, packages ? [], makeWrapper}: stdenv.mkDerivation rec { - name = "ghc-${ghcPlain.version}-linkdir"; + name = "ghc-${ghc.version}-linkdir"; allPackages = stdenv.lib.closePropagation packages; buildInputs = allPackages ++ [makeWrapper]; @@ -10,58 +10,71 @@ stdenv.mkDerivation rec { unpackPhase = "true"; installPhase = '' - originalTopDir="${ghcPlain}/lib/ghc-${ghcPlain.version}" + originalTopDir="${ghc}/lib/ghc-${ghc.version}" originalPkgDir="$originalTopDir/package.conf.d" linkedTopDir="$out/lib" linkedPkgDir="$linkedTopDir/package.conf.d" ensureDir $out/bin - cd $out/bin - - echo "Generating wrappers ..." - - for prg in ghc ghci ghc-${ghcPlain.version} ghci-${ghcPlain.version}; do - makeWrapper ${ghcPlain}/bin/$prg $out/bin/$prg --add-flags "-B$linkedTopDir" - done - - for prg in runghc runhaskell; do - makeWrapper ${ghcPlain}/bin/$prg $out/bin/$prg --add-flags "-f $out/bin/ghc" - done - - for prg in ghc-pkg ghc-pkg-${ghcPlain.version}; do - makeWrapper ${ghcPlain}/bin/$prg $out/bin/$prg --add-flags "--global-conf $linkedPkgDir" - done - - for prg in hp2ps hpc hasktags hsc2hs haddock haddock-${ghcPlain.version}; do - test -x ${ghcPlain}/bin/$prg && ln -s ${ghcPlain}/bin/$prg $out/bin/$prg - done - ensureDir $linkedTopDir - cd $linkedTopDir + ensureDir $linkedPkgDir + + echo "Linking GHC core libraries:" if test -f $originalTopDir/settings; then - echo "Linking $originalTopDir/settings ..." - ln -s $originalTopDir/settings . + echo -n "Linking $originalTopDir/settings " + ln -s $originalTopDir/settings $linkedTopDir + echo . fi - ensureDir $linkedPkgDir - cd $linkedPkgDir + echo -n "Linking $originalPkgDir " + for f in $originalPkgDir/*.conf; do + ln -s $f $linkedPkgDir + echo -n . + done + echo - echo "Linking $originalPkgDir ..." - ln -s $originalPkgDir/*.conf . + echo "Linking selected packages and dependencies:" for currentPath in ${stdenv.lib.concatStringsSep " " allPackages}; do - currentPkgDir="$currentPath/lib/ghc-pkgs/ghc-${ghcPlain.version}" - if test -d $currentPkgDir; then - echo "Linking $currentPkgDir ..." - ln -s $currentPkgDir/*.conf . - fi + currentPkgDir="$currentPath/lib/ghc-pkgs/ghc-${ghc.version}" + echo -n "Linking $currentPath " + for f in $currentPath/bin/*; do + ln -s $f $out/bin + echo -n . + done + for f in $currentPkgDir/*.conf; do + ln -s $f $linkedPkgDir + echo -n . + done + echo done echo "Generating package cache ..." - ${ghcPlain}/bin/ghc-pkg --global-conf $linkedPkgDir recache + ${ghc}/bin/ghc-pkg --global-conf $linkedPkgDir recache + echo -n "Generating wrappers " + + for prg in ghc ghci ghc-${ghc.version} ghci-${ghc.version}; do + makeWrapper ${ghc}/bin/$prg $out/bin/$prg --add-flags "-B$linkedTopDir" + echo -n . + done + + for prg in runghc runhaskell; do + makeWrapper ${ghc}/bin/$prg $out/bin/$prg --add-flags "-f $out/bin/ghc" + echo -n . + done + + for prg in ghc-pkg ghc-pkg-${ghc.version}; do + makeWrapper ${ghc}/bin/$prg $out/bin/$prg --add-flags "--global-conf $linkedPkgDir" + echo -n . + done + + for prg in hp2ps hpc hasktags hsc2hs haddock haddock-${ghc.version}; do + test -x ${ghc}/bin/$prg && ln -s ${ghc}/bin/$prg $out/bin/$prg && echo -n . + done + echo ''; - # inherit ghc.meta; + meta = ghc.meta; } diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix index 7a62eb070eb..8a4d083f708 100644 --- a/pkgs/top-level/haskell-packages.nix +++ b/pkgs/top-level/haskell-packages.nix @@ -104,7 +104,7 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y); # top of this file. ghc = callPackage ../development/compilers/ghc/wrapper.nix { - ghc = ghc; + ghc = ghc; # refers to ghcPlain }; # An experimental wrapper around ghcPlain that does not automatically @@ -113,6 +113,7 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y); # argument to this function. ghcWithPackages = pkgs : callPackage ../development/compilers/ghc/with-packages.nix { + ghc = ghc; # refers to ghcPlain packages = pkgs self; }; From de5d98eff8a6e93f2e743df717f0015df2395eaf Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andres=20L=C3=B6h?= Date: Sun, 4 Dec 2011 17:45:12 +0000 Subject: [PATCH 831/970] Prevent link collisions by linking only Haskell packages. svn path=/nixpkgs/trunk/; revision=30727 --- .../compilers/ghc/with-packages.nix | 30 +++++++++++-------- 1 file changed, 18 insertions(+), 12 deletions(-) diff --git a/pkgs/development/compilers/ghc/with-packages.nix b/pkgs/development/compilers/ghc/with-packages.nix index b405a89b642..937411eab78 100644 --- a/pkgs/development/compilers/ghc/with-packages.nix +++ b/pkgs/development/compilers/ghc/with-packages.nix @@ -38,20 +38,24 @@ stdenv.mkDerivation rec { for currentPath in ${stdenv.lib.concatStringsSep " " allPackages}; do currentPkgDir="$currentPath/lib/ghc-pkgs/ghc-${ghc.version}" - echo -n "Linking $currentPath " - for f in $currentPath/bin/*; do - ln -s $f $out/bin - echo -n . - done - for f in $currentPkgDir/*.conf; do - ln -s $f $linkedPkgDir - echo -n . - done - echo + # Check if current path is a Cabal package for the current GHC + if test -d $currentPkgDir; then + echo -n "Linking $currentPath " + for f in $currentPath/bin/*; do + ln -s $f $out/bin + echo -n . + done + for f in $currentPkgDir/*.conf; do + ln -s $f $linkedPkgDir + echo -n . + done + echo + fi done - echo "Generating package cache ..." + echo -n "Generating package cache " ${ghc}/bin/ghc-pkg --global-conf $linkedPkgDir recache + echo . echo -n "Generating wrappers " @@ -71,7 +75,9 @@ stdenv.mkDerivation rec { done for prg in hp2ps hpc hasktags hsc2hs haddock haddock-${ghc.version}; do - test -x ${ghc}/bin/$prg && ln -s ${ghc}/bin/$prg $out/bin/$prg && echo -n . + if test -x ${ghc}/bin/$prg -a ! -x $out/bin/$prg; then + ln -s ${ghc}/bin/$prg $out/bin/$prg && echo -n . + fi done echo ''; From 2585033ca677e1149beba821451c9dee5122ed6b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= Date: Sun, 4 Dec 2011 22:02:55 +0000 Subject: [PATCH 832/970] Add Tokyo-Tyrant, the network interface to Tokyo-Cabinet. svn path=/nixpkgs/trunk/; revision=30728 --- .../libraries/tokyo-tyrant/default.nix | 41 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 1 + 2 files changed, 42 insertions(+) create mode 100644 pkgs/development/libraries/tokyo-tyrant/default.nix diff --git a/pkgs/development/libraries/tokyo-tyrant/default.nix b/pkgs/development/libraries/tokyo-tyrant/default.nix new file mode 100644 index 00000000000..63319213312 --- /dev/null +++ b/pkgs/development/libraries/tokyo-tyrant/default.nix @@ -0,0 +1,41 @@ +{ fetchurl, stdenv, tokyocabinet, pkgconfig }: + +stdenv.mkDerivation rec { + name = "tokyotyrant-1.1.41"; + + src = fetchurl { + url = "http://fallabs.com/tokyotyrant/${name}.tar.gz"; + sha256 = "13xqcinhydqmh7231qlir6pymacjwcf98drybkhd9597kzxp1bs2"; + }; + + buildNativeInputs = [ pkgconfig ]; + buildInputs = [ tokyocabinet ]; + + doCheck = false; # FIXME + + meta = { + description = "Network interface of the Tokyo Cabinet DBM"; + + longDescription = + '' Tokyo Tyrant is a package of network interface to the DBM called + Tokyo Cabinet. Though the DBM has high performance, you might + bother in case that multiple processes share the same database, or + remote processes access the database. Thus, Tokyo Tyrant is + provided for concurrent and remote connections to Tokyo Cabinet. It + is composed of the server process managing a database and its access + library for client applications. + + Tokyo Tyrant is written in the C language, and provided as API of C, + Perl, and Ruby. Tokyo Tyrant is available on platforms which have + API conforming to C99 and POSIX. Tokyo Tyrant is a free software + licensed under the GNU Lesser General Public License. + ''; + + homepage = http://fallabs.com/tokyotyrant/; + + license = "LGPLv2.1+"; + + platforms = stdenv.lib.platforms.gnu; # arbitrary choice + maintainers = [ stdenv.lib.maintainers.ludo ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 612168b575a..27a052d9e1e 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -4597,6 +4597,7 @@ let tnt = callPackage ../development/libraries/tnt { }; tokyocabinet = callPackage ../development/libraries/tokyo-cabinet { }; + tokyotyrant = callPackage ../development/libraries/tokyo-tyrant { }; tremor = callPackage ../development/libraries/tremor { }; From b7833639baba1b12611eb4f4152a851be33eac77 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= Date: Sun, 4 Dec 2011 22:03:03 +0000 Subject: [PATCH 833/970] Seeks 0.4.0. svn path=/nixpkgs/trunk/; revision=30729 --- pkgs/tools/networking/p2p/seeks/default.nix | 11 ++++++----- pkgs/top-level/all-packages.nix | 4 +++- 2 files changed, 9 insertions(+), 6 deletions(-) diff --git a/pkgs/tools/networking/p2p/seeks/default.nix b/pkgs/tools/networking/p2p/seeks/default.nix index 1c6c59acd9f..bce4b0687ba 100644 --- a/pkgs/tools/networking/p2p/seeks/default.nix +++ b/pkgs/tools/networking/p2p/seeks/default.nix @@ -1,18 +1,19 @@ { fetchurl, stdenv, zlib, docbook2x, pcre, curl, libxml2, libevent, perl -, pkgconfig, protobuf, tokyocabinet, opencv }: +, pkgconfig, protobuf, tokyocabinet, tokyotyrant, opencv +}: -let version = "0.3.3"; in +let version = "0.4.0"; in stdenv.mkDerivation { name = "seeks-${version}"; src = fetchurl { - url = "mirror://sourceforge/seeks/solo/seeks-${version}.tar.gz"; - sha256 = "1zsl6ixmkvjhy9r2cs22g4q31gg5fkhayvws5jra7jfgmzbrll5c"; + url = "mirror://sourceforge/seeks/hippy/seeks-${version}.tar.gz"; + sha256 = "1y91dmd0b0yj5036x8kk92iy88dsnzdwhhz23ba9lp96vpafd2ky"; }; buildInputs = [ zlib docbook2x pcre curl libxml2 libevent perl pkgconfig - protobuf tokyocabinet opencv + protobuf tokyocabinet tokyotyrant opencv ]; configureFlags = diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 27a052d9e1e..7a2dc71acdd 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -7288,7 +7288,9 @@ let qt = qt4; }; - seeks = callPackage ../tools/networking/p2p/seeks { }; + seeks = callPackage ../tools/networking/p2p/seeks { + opencv = opencv_2_1; + }; seg3d = callPackage ../applications/graphics/seg3d { wxGTK = wxGTK28.override { unicode = false; }; From 69e12ad16e918c371fdedd843829159185ac4c07 Mon Sep 17 00:00:00 2001 From: Shea Levy Date: Mon, 5 Dec 2011 01:32:25 +0000 Subject: [PATCH 834/970] Add ncmpcpp Patch by mornfall svn path=/nixpkgs/trunk/; revision=30730 --- pkgs/applications/audio/ncmpcpp/default.nix | 21 +++++++++++++++++++++ pkgs/servers/mpd/clientlib.nix | 17 +++++++++++++++++ pkgs/top-level/all-packages.nix | 3 +++ 3 files changed, 41 insertions(+) create mode 100644 pkgs/applications/audio/ncmpcpp/default.nix create mode 100644 pkgs/servers/mpd/clientlib.nix diff --git a/pkgs/applications/audio/ncmpcpp/default.nix b/pkgs/applications/audio/ncmpcpp/default.nix new file mode 100644 index 00000000000..b9d30409711 --- /dev/null +++ b/pkgs/applications/audio/ncmpcpp/default.nix @@ -0,0 +1,21 @@ +{stdenv, fetchurl, ncurses, curl, taglib, fftw, mpd_clientlib, pkgconfig}: + +stdenv.mkDerivation rec { + version = "0.5.8"; + name = "ncmpcpp-${version}"; + + src = fetchurl { + url = "http://unkart.ovh.org/ncmpcpp/ncmpcpp-${version}.tar.bz2"; + sha256 = "1kbkngs4fhf9z53awskqiwdl94i5slvxmjiajkrayi99373fallx"; + }; + + buildInputs = [ ncurses curl taglib fftw mpd_clientlib pkgconfig ]; + + meta = { + description = "Curses-based interface for MPD (music player daemon)"; + homepage = http://unkart.ovh.org/ncmpcpp/; + license = "GPLv2+"; + maintainers = [ stdenv.lib.maintainers.mornfall ]; + }; +} + diff --git a/pkgs/servers/mpd/clientlib.nix b/pkgs/servers/mpd/clientlib.nix new file mode 100644 index 00000000000..4f689bae658 --- /dev/null +++ b/pkgs/servers/mpd/clientlib.nix @@ -0,0 +1,17 @@ +{ stdenv, fetchurl }: + +stdenv.mkDerivation rec { + name = "libmpdclient-2.6"; + src = fetchurl { + url = "mirror://sourceforge/musicpd/${name}.tar.bz2"; + sha256 = "1j8kn0fawdsvczrkhf6xm2yp0h6w49b326i3c08zwvhskd3phljw"; + }; + + meta = { + description = "Client library for MPD (music player daemon)"; + homepage = http://mpd.wikia.com/wiki/Music_Player_Daemon_Wiki; + license = "GPLv2"; + platforms = with stdenv.lib.platforms; linux; + maintainers = [ stdenv.lib.maintainers.mornfall ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 7a2dc71acdd..c5952d95d01 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -4975,6 +4975,7 @@ let mod_wsgi = callPackage ../servers/http/apache-modules/mod_wsgi { }; mpd = callPackage ../servers/mpd { }; + mpd_clientlib = callPackage ../servers/mpd/clientlib.nix { }; miniHttpd = callPackage ../servers/http/mini-httpd {}; @@ -7078,6 +7079,8 @@ let mpg321 = callPackage ../applications/audio/mpg321 { }; + ncmpcpp = callPackage ../applications/audio/ncmpcpp { }; + MPlayer = callPackage ../applications/video/MPlayer { }; MPlayerPlugin = browser: From 9943b8da039d8933c86465bbcca9f6bc128c5c10 Mon Sep 17 00:00:00 2001 From: Shea Levy Date: Mon, 5 Dec 2011 02:53:26 +0000 Subject: [PATCH 835/970] Remove llvmSVN, it's outdated and doesn't work svn path=/nixpkgs/trunk/; revision=30732 --- pkgs/development/compilers/llvm/svn-head.nix | 66 -------------------- pkgs/top-level/all-packages.nix | 3 - 2 files changed, 69 deletions(-) delete mode 100644 pkgs/development/compilers/llvm/svn-head.nix diff --git a/pkgs/development/compilers/llvm/svn-head.nix b/pkgs/development/compilers/llvm/svn-head.nix deleted file mode 100644 index f929815f8a2..00000000000 --- a/pkgs/development/compilers/llvm/svn-head.nix +++ /dev/null @@ -1,66 +0,0 @@ -{ stdenv, fetchurl, gcc, flex, perl, libtool, groff, fetchsvn -, buildClang ? false }: - -let rev = "134309"; in -stdenv.mkDerivation ({ - name = "llvm-r${rev}"; - - src = fetchsvn { - url = "http://llvm.org/svn/llvm-project/llvm/trunk"; - inherit rev; - sha256 = "136qwpcl22r5bl9y4kk94vgbha1m58xrggy7qw19lg7jkgxxj8s6"; - }; - - buildInputs = [ gcc flex perl groff ]; - - configureFlags = [ "--enable-optimized" "--enable-shared" "--disable-static" ]; - - meta = { - homepage = http://llvm.org/; - description = "Collection of modular and reusable compiler and toolchain technologies"; - license = "BSD"; - maintainers = with stdenv.lib.maintainers; [viric]; - platforms = with stdenv.lib.platforms; all; - }; -} -// stdenv.lib.optionalAttrs buildClang ( - # I write the assert because 'gcc.libc' will be evaluated although 'triplet' would not - # evaluate properly (in the preConfigure below) - assert stdenv.system == "i686-linux" || stdenv.system == "x86_64-linux"; - let - triplet = if (stdenv.system == "i686-linux") then "i686-unknown-linux-gnu" - else if (stdenv.system == "x86_64-linux") then "x86_64-unknown-linux-gnu" - else throw "System not supported"; - in rec { - name = "clang-r${rev}"; - - srcClang = fetchsvn { - url = http://llvm.org/svn/llvm-project/cfe/trunk; - inherit rev; - sha256 = "0afbrjakfw6zgsplxblgzr2kwjndlnr2lnqjnbj16ggam5fcnhlr"; - }; - - prePatch = '' - cp -r ${srcClang} tools/clang - chmod u+rwX -R tools/clang - ''; - - patches = [ ./clang-include-paths-svn.patch ]; - - # Set up the header file paths - preConfigure = '' - sed -i -e 's,C_INCLUDE_PATH,"${gcc.libc}/include/",' \ - -e 's,CPP_HOST,"${triplet}",' \ - -e 's,CPP_INCLUDE_PATH,"${gcc.gcc}/include/c++/${gcc.gcc.version}",' \ - tools/clang/lib/Frontend/InitHeaderSearch.cpp - ''; - - meta = { - homepage = http://clang.llvm.org/; - description = "A C language family frontend for LLVM"; - license = "BSD"; - 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 c5952d95d01..3ed579e4334 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -2311,9 +2311,6 @@ let llvm = callPackage ../development/compilers/llvm { }; - # Works partially - llvmSVN = callPackage ../development/compilers/llvm/svn-head.nix { }; - mitscheme = callPackage ../development/compilers/mit-scheme { }; mlton = callPackage ../development/compilers/mlton { }; From 99dede273df28886f4ff2afc60a03670573d57f7 Mon Sep 17 00:00:00 2001 From: Shea Levy Date: Mon, 5 Dec 2011 05:03:18 +0000 Subject: [PATCH 836/970] Remove unused patch svn path=/nixpkgs/trunk/; revision=30735 --- .../llvm/clang-include-paths-svn.patch | 40 ------------------- 1 file changed, 40 deletions(-) delete mode 100644 pkgs/development/compilers/llvm/clang-include-paths-svn.patch diff --git a/pkgs/development/compilers/llvm/clang-include-paths-svn.patch b/pkgs/development/compilers/llvm/clang-include-paths-svn.patch deleted file mode 100644 index 85c7a12d09b..00000000000 --- a/pkgs/development/compilers/llvm/clang-include-paths-svn.patch +++ /dev/null @@ -1,40 +0,0 @@ -diff -ru -x '*~' a/tools/clang/lib/Frontend/InitHeaderSearch.cpp b/tools/clang/lib/Frontend/InitHeaderSearch.cpp ---- a/tools/clang/lib/Frontend/InitHeaderSearch.cpp 2010-09-03 18:45:53.000000000 +0200 -+++ b/tools/clang/lib/Frontend/InitHeaderSearch.cpp 2011-02-05 14:59:08.669573190 +0100 -@@ -480,6 +480,7 @@ - AddPath(*i, System, false, false, false); - return; - } - -+#if 0 - switch (os) { - case llvm::Triple::Win32: { -@@ -593,7 +593,9 @@ - } - - if ( os != llvm::Triple::RTEMS ) - AddPath("/usr/include", System, false, false, false); -+#endif -+ AddPath(C_INCLUDE_PATH, System, false, false, false); - } - - void InitHeaderSearch:: -@@ -550,6 +553,7 @@ - triple); - return; - } -+#if 0 - // FIXME: temporary hack: hard-coded paths. - - if (triple.isOSDarwin()) { -@@ -769,6 +773,10 @@ - default: - break; - } -+#endif -+ AddGnuCPlusPlusIncludePaths( -+ CPP_INCLUDE_PATH, -+ CPP_HOST, "", "", triple); - } - - void InitHeaderSearch::AddDefaultSystemIncludePaths(const LangOptions &Lang, From 19cad6e71179322758120ce4fba440e8370ee78a Mon Sep 17 00:00:00 2001 From: Karn Kallio Date: Mon, 5 Dec 2011 09:30:33 +0000 Subject: [PATCH 837/970] fix error: undefined variable 'llvmSVN' svn path=/nixpkgs/trunk/; revision=30736 --- pkgs/top-level/all-packages.nix | 4 ---- 1 file changed, 4 deletions(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 3ed579e4334..b157deb4642 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -1677,10 +1677,6 @@ let #Use this instead of stdenv to build with clang clangStdenv = stdenvAdapters.overrideGCC stdenv clang; - clangSVN = llvmSVN.override { - buildClang = true; - }; - clean = callPackage ../development/compilers/clean { }; cmucl_binary = callPackage ../development/compilers/cmucl/binary.nix { }; From 72b7236428d515865ee4a56294fc026e0ae51457 Mon Sep 17 00:00:00 2001 From: Karn Kallio Date: Mon, 5 Dec 2011 09:38:59 +0000 Subject: [PATCH 838/970] pure 0.49 (compiles again with latest llvm) svn path=/nixpkgs/trunk/; revision=30737 --- pkgs/development/interpreters/pure/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/interpreters/pure/default.nix b/pkgs/development/interpreters/pure/default.nix index 69cb686bec2..dd1982e836d 100644 --- a/pkgs/development/interpreters/pure/default.nix +++ b/pkgs/development/interpreters/pure/default.nix @@ -12,11 +12,11 @@ let sourceInfo = rec { baseName="pure"; project="pure-lang"; - version="0.47"; + version="0.49"; name="${baseName}-${version}"; extension="tar.gz"; url="http://${project}.googlecode.com/files/${name}.${extension}"; - hash="16j0k639kw2am4fc2h7q5sk7kx5z7nca896dakhphlb9zn9h0gbv"; + hash="0kkrcmmqks82g3qlkvs3cd23v6b5948rw3xsdadd1jidh74jg33x"; }; in rec { From a9a03946df5f61f14bd0ef7e1d4b583055f9f17c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?= Date: Mon, 5 Dec 2011 10:44:53 +0000 Subject: [PATCH 839/970] Updating gtkwave svn path=/nixpkgs/trunk/; revision=30738 --- pkgs/applications/science/electronics/gtkwave/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/science/electronics/gtkwave/default.nix b/pkgs/applications/science/electronics/gtkwave/default.nix index 72c3f3e2435..e1bf95700c9 100644 --- a/pkgs/applications/science/electronics/gtkwave/default.nix +++ b/pkgs/applications/science/electronics/gtkwave/default.nix @@ -1,10 +1,10 @@ {stdenv, fetchurl, gtk, gperf, pkgconfig, bzip2, xz, tcl, tk, judy} : stdenv.mkDerivation rec { - name = "gtkwave-3.3.20"; + name = "gtkwave-3.3.28"; src = fetchurl { url = "mirror://sourceforge/gtkwave/${name}.tar.gz"; - sha256 = "0r2yh8a5rrxjzvykdmqlb098wws5c9k255saf2bsdchnigs8il3n"; + sha256 = "0y3dmx39xwc3m23fwjkxvp9gqxpckk8s5814nhs8fnxa384z5cz0"; }; buildInputs = [ gtk gperf pkgconfig bzip2 xz tcl tk judy]; From 8ed604d4b8b8735db871cd548ac01109ceb8e205 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Mon, 5 Dec 2011 12:12:20 +0000 Subject: [PATCH 840/970] * Bump. svn path=/nixpkgs/trunk/; revision=30740 --- pkgs/tools/package-management/nix/unstable.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/package-management/nix/unstable.nix b/pkgs/tools/package-management/nix/unstable.nix index 1e7a7f87288..30487055669 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.0pre30626"; + name = "nix-1.0pre30706"; src = fetchurl { - url = "http://hydra.nixos.org/build/1575015/download/4/${name}.tar.bz2"; - sha256 = "a0ab32125224fa544d0e1979bbb4d1a1ef35b0a6047396e66629f4a8f8187b77"; + url = "http://hydra.nixos.org/build/1580753/download/4/${name}.tar.bz2"; + sha256 = "2658a4fea95799d8719685a808ab354f0b5a3ce38af92117e1a15c394c261c5b"; }; buildNativeInputs = [ perl pkgconfig ]; From f1f9a16fa83d4ccd6a9f5d54b1488a391ecf5c72 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Mon, 5 Dec 2011 13:31:31 +0000 Subject: [PATCH 841/970] * Updated DBIx::Class and DBIx::Class::Schema::Loader. svn path=/nixpkgs/trunk/; revision=30741 --- pkgs/top-level/perl-packages.nix | 51 ++++++++++++++++++++++++-------- 1 file changed, 39 insertions(+), 12 deletions(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 21353664ac4..a73e8193817 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -1120,17 +1120,17 @@ rec { }; DBIxClass = buildPerlPackage rec { - name = "DBIx-Class-0.08195"; + name = "DBIx-Class-0.08196"; src = fetchurl { - url = "mirror://cpan/modules/by-module/DBIx/${name}.tar.gz"; - sha256 = "197q2pkkk6dpq1r76jcnzamk5dqac5k9n3wgq8dd5ak8sw6cj7p6"; + url = "mirror://cpan/authors/id/A/AR/ARODLAND/${name}.tar.gz"; + sha256 = "15k1kgbrsnkwr0ib6cyr114zk904lisy4k09gfiynag9wjhv47lm"; }; buildInputs = [ DBDSQLite TestException TestWarn ]; propagatedBuildInputs = [ PackageStash ClassAccessorGrouped ClassC3Componentised ClassInspector ConfigAny ContextPreserve DBI DataCompare DataDumperConcise DataPage HashMerge MROCompat ModuleFind - PathClass SQLAbstract ScopeGuard SubName TryTiny VariableMagic + PathClass SQLAbstract ScopeGuard SubName TryTiny NamespaceClean ]; }; @@ -1155,17 +1155,18 @@ rec { }; DBIxClassSchemaLoader = buildPerlPackage rec { - name = "DBIx-Class-Schema-Loader-0.07010"; + name = "DBIx-Class-Schema-Loader-0.07014"; src = fetchurl { url = "mirror://cpan/modules/by-module/DBIx/${name}.tar.gz"; - sha256 = "08yy5lsrb7h1xzp7d1bqsgnjpa2d8ik14qhsq2d7v7r3f5fk5q3g"; + sha256 = "0qrsh6i8p4mpx5bapn40cpsbvnvzivli71gymbiqjd0mjflbsjf6"; }; buildInputs = [ TestException TestMore TestWarn DBDSQLite ]; propagatedBuildInputs = - [ DataDump LinguaENInflectNumber LinguaENInflectPhrase ClassAccessor - ClassAccessorGrouped ClassC3Componentised MROCompat CarpClan - DBIxClass ClassLoad ClassUnload FileSlurp ListMoreUtils - NamespaceClean ScopeGuard TryTiny + [ DataDump LinguaENInflectNumber LinguaENInflectPhrase + ClassAccessor ClassAccessorGrouped ClassC3Componentised + MROCompat CarpClan DBIxClass ClassLoad ClassUnload + ListMoreUtils NamespaceClean ScopeGuard TryTiny TaskWeaken + StringCamelCase StringToIdentifierEN ]; }; @@ -2073,10 +2074,10 @@ rec { }; LinguaENInflectPhrase = buildPerlPackage rec { - name = "Lingua-EN-Inflect-Phrase-0.04"; + name = "Lingua-EN-Inflect-Phrase-0.10"; src = fetchurl { url = "mirror://cpan/modules/by-module/Lingua/${name}.tar.gz"; - sha256 = "12a74zkc1rybsvxwg8fxdjs6frfq7naky2ks4idcwd48lya3nw90"; + sha256 = "1l7sjnibnvgb7a73cjhysmrg4j2bfcn0x5yrqmh0v23laj9fsbbm"; }; buildInputs = [ TestMore ]; propagatedBuildInputs = @@ -3053,6 +3054,14 @@ rec { propagatedBuildInputs = [ StatisticsDescriptive StatisticsDistributions ]; }; + StringCamelCase = buildPerlPackage rec { + name = "String-CamelCase-0.02"; + src = fetchurl { + url = "mirror://cpan/modules/by-module/String/${name}.tar.gz"; + sha256 = "17kh8nap2z5g5rqcvw0m7mvbai7wr7h0al39w8l827zhqad8ss42"; + }; + }; + StringFormat = buildPerlPackage rec { name = "String-Format-1.16"; src = fetchurl { @@ -3077,6 +3086,16 @@ rec { }; }; + StringToIdentifierEN = buildPerlPackage rec { + name = "String-ToIdentifier-EN-0.06"; + src = fetchurl { + url = "mirror://cpan/modules/by-module/String/${name}.tar.gz"; + sha256 = "1rmldr7jf4jvkhzlv8hgp48lrmybvinmhv8kcnrpa8las0ijm4vm"; + }; + propagatedBuildInputs = + [ LinguaENInflectPhrase TextUnidecode NamespaceClean ]; + }; + SubExporter = buildPerlPackage rec { name = "Sub-Exporter-0.982"; src = fetchurl { @@ -3578,6 +3597,14 @@ rec { propagatedBuildInputs = [TextAligner]; }; + TextUnidecode = buildPerlPackage rec { + name = "Text-Unidecode-0.04"; + src = fetchurl { + url = "mirror://cpan/modules/by-module/Text/${name}.tar.gz"; + sha256 = "01kbw5xshs906ikg0rgf51y9m6m26a4msv7ghcqwx7w2shgs0ga7"; + }; + }; + Throwable = buildPerlPackage rec { name = "Throwable-0.102080"; src = fetchurl { From b583b816cc23b783ebd5d265e72c0a686f24f742 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Mon, 5 Dec 2011 14:16:30 +0000 Subject: [PATCH 842/970] * Allow versionSuffix to be overriden. svn path=/nixpkgs/trunk/; revision=30742 --- pkgs/build-support/release/source-tarball.nix | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/pkgs/build-support/release/source-tarball.nix b/pkgs/build-support/release/source-tarball.nix index 94566e4c460..16ac0033d93 100644 --- a/pkgs/build-support/release/source-tarball.nix +++ b/pkgs/build-support/release/source-tarball.nix @@ -6,16 +6,15 @@ , buildInputs ? [] , name ? "source-tarball" , version ? "0" +, versionSuffix ? + if officialRelease + then "" + else if src ? rev then "pre${toString src.rev}" else "" , src, stdenv, autoconf, automake, libtool , ... } @ args: let - versionSuffix = - if officialRelease - then "" - else if src ? rev then "pre${toString src.rev}" else ""; - # By default, provide all the GNU Build System as input. bootstrapBuildInputs = if (args ? bootstrapBuildInputs) From d5a1346ad7fa95c6e495a509cd616a64830ff196 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 5 Dec 2011 15:59:38 +0000 Subject: [PATCH 843/970] haskell-X11: updated to version 1.5.0.1 svn path=/nixpkgs/trunk/; revision=30743 --- pkgs/development/libraries/haskell/X11/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/libraries/haskell/X11/default.nix b/pkgs/development/libraries/haskell/X11/default.nix index 9d01b2fdd86..6b0047085bc 100644 --- a/pkgs/development/libraries/haskell/X11/default.nix +++ b/pkgs/development/libraries/haskell/X11/default.nix @@ -2,12 +2,12 @@ cabal.mkDerivation (self: { pname = "X11"; - version = "1.5.0.0"; - sha256 = "653ff8aa4053574a36dbb1729459df6e5a1a87a223bc3eeced8e40c6e3a5406f"; + version = "1.5.0.1"; + sha256 = "0s8k3lhvlks6i1mwfnm5fimfd2f0sjw9k2p67is3x564kih7mh19"; buildDepends = [ syb ]; extraLibraries = [ libX11 libXext libXinerama ]; meta = { - homepage = "http://code.haskell.org/X11"; + homepage = "https://github.com/haskell-pkg-janitors/X11"; description = "A binding to the X11 graphics library"; license = self.stdenv.lib.licenses.bsd3; platforms = self.ghc.meta.platforms; From 49a74d6ed90fbf8977a2c68a83472a7fbfc59482 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 5 Dec 2011 15:59:41 +0000 Subject: [PATCH 844/970] haskell-convertible-text: updated to version 0.4.0.1 svn path=/nixpkgs/trunk/; revision=30744 --- .../libraries/haskell/convertible-text/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/convertible-text/default.nix b/pkgs/development/libraries/haskell/convertible-text/default.nix index 305d589dfb5..b987c9e21e5 100644 --- a/pkgs/development/libraries/haskell/convertible-text/default.nix +++ b/pkgs/development/libraries/haskell/convertible-text/default.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "convertible-text"; - version = "0.3.0.10"; - sha256 = "1hi7rqijay37b5msyzqqgvkvrsdpj9p96ajxmyk4vm7nnk5dfhbp"; + version = "0.4.0.1"; + sha256 = "0m252ml2zgw0jxfs678m1wp9ivy6gvi9w50qw7zi9ycxnzj9j6r2"; isLibrary = true; isExecutable = true; buildDepends = [ attempt text time ]; From 7da7411946a2b7fd5819946ec2e185fa259c4eca Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 5 Dec 2011 15:59:43 +0000 Subject: [PATCH 845/970] haskell-data-object-yaml: updated to version 0.3.3.6 svn path=/nixpkgs/trunk/; revision=30745 --- .../libraries/haskell/data-object-yaml/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/data-object-yaml/default.nix b/pkgs/development/libraries/haskell/data-object-yaml/default.nix index 9622c2af6b9..a29ba40b823 100644 --- a/pkgs/development/libraries/haskell/data-object-yaml/default.nix +++ b/pkgs/development/libraries/haskell/data-object-yaml/default.nix @@ -4,8 +4,8 @@ cabal.mkDerivation (self: { pname = "data-object-yaml"; - version = "0.3.3.5"; - sha256 = "0ag0rac9j4ipfg9haa63s73sn7zckrpwybcfk2nbg84ix56nv36w"; + version = "0.3.3.6"; + sha256 = "0hha52nrxb539bvdz6ksn9sxmksfwmjhh7h8mp223s340vxrlpk3"; isLibrary = true; isExecutable = true; buildDepends = [ From 603a1de5a6e67b1a410a49ec6766af806be43418 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 5 Dec 2011 15:59:46 +0000 Subject: [PATCH 846/970] haskell-hashtables: updated to version 1.0.1.1 svn path=/nixpkgs/trunk/; revision=30746 --- pkgs/development/libraries/haskell/hashtables/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/hashtables/default.nix b/pkgs/development/libraries/haskell/hashtables/default.nix index ece171abe35..b66a7a99264 100644 --- a/pkgs/development/libraries/haskell/hashtables/default.nix +++ b/pkgs/development/libraries/haskell/hashtables/default.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "hashtables"; - version = "1.0.1.0"; - sha256 = "0a2cfm649smryxfkv61yd8vjl1wyly468xa1l4jb50jxzyyw42z5"; + version = "1.0.1.1"; + sha256 = "1s5p2gsi7wv6xmf6ax3s9mqmbvcispn2y9miksay3p4acc6b3lpa"; buildDepends = [ hashable primitive vector ]; meta = { homepage = "http://github.com/gregorycollins/hashtables"; From a442afdb7c00472ab4c17300b1038ecb7c3e6cda Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 5 Dec 2011 15:59:48 +0000 Subject: [PATCH 847/970] haskell-http-enumerator: updated to version 0.7.1.8 svn path=/nixpkgs/trunk/; revision=30747 --- .../development/libraries/haskell/http-enumerator/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/http-enumerator/default.nix b/pkgs/development/libraries/haskell/http-enumerator/default.nix index e6db8be2c71..f89ae69fafa 100644 --- a/pkgs/development/libraries/haskell/http-enumerator/default.nix +++ b/pkgs/development/libraries/haskell/http-enumerator/default.nix @@ -7,8 +7,8 @@ cabal.mkDerivation (self: { pname = "http-enumerator"; - version = "0.7.1.7"; - sha256 = "0w6sz37miyl6jxwl6zq9440bx4avrr56alq26cbm0qxa824nnpih"; + version = "0.7.1.8"; + sha256 = "1bydj4qfmz03qpgk0aixrhf96bl4zx1ak5x0cq8ppp9c2vsig0i4"; isLibrary = true; isExecutable = true; buildDepends = [ From 1a479e8c02a88fb76725e46fa2b5f8ff66e27026 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 5 Dec 2011 15:59:51 +0000 Subject: [PATCH 848/970] haskell-monad-control: updated to version 0.3.0.1 svn path=/nixpkgs/trunk/; revision=30748 --- .../libraries/haskell/monad-control/default.nix | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/pkgs/development/libraries/haskell/monad-control/default.nix b/pkgs/development/libraries/haskell/monad-control/default.nix index b3d9208bd25..52e3d001f48 100644 --- a/pkgs/development/libraries/haskell/monad-control/default.nix +++ b/pkgs/development/libraries/haskell/monad-control/default.nix @@ -1,12 +1,14 @@ -{ cabal, baseUnicodeSymbols, transformers }: +{ cabal, baseUnicodeSymbols, transformers, transformersBase }: cabal.mkDerivation (self: { pname = "monad-control"; - version = "0.2.0.3"; - sha256 = "0z7wjilrx6phqs2gxwv65dy1n3mc0j8hj3adshkwy6z8ggj283nh"; - buildDepends = [ baseUnicodeSymbols transformers ]; + version = "0.3.0.1"; + sha256 = "0aa73cw82yssias0a9y237h9r4v4abvs0lv2lmhxaa4a4mdrj3ms"; + buildDepends = [ + baseUnicodeSymbols transformers transformersBase + ]; meta = { - homepage = "https://github.com/basvandijk/monad-control/"; + homepage = "https://github.com/basvandijk/monad-control"; description = "Lift control operations, like exception catching, through monad transformers"; license = self.stdenv.lib.licenses.bsd3; platforms = self.ghc.meta.platforms; From 4bad71cdd646fb2823ec3f3eec880e09a9295375 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 5 Dec 2011 15:59:53 +0000 Subject: [PATCH 849/970] haskell-persistent-template: updated to version 0.6.3.1 svn path=/nixpkgs/trunk/; revision=30749 --- .../libraries/haskell/persistent-template/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/development/libraries/haskell/persistent-template/default.nix b/pkgs/development/libraries/haskell/persistent-template/default.nix index 67d8e10a3ef..7a32591b97c 100644 --- a/pkgs/development/libraries/haskell/persistent-template/default.nix +++ b/pkgs/development/libraries/haskell/persistent-template/default.nix @@ -1,10 +1,10 @@ -{ cabal, monadControl, persistent, text }: +{ cabal, monadControl, persistent, text, transformers }: cabal.mkDerivation (self: { pname = "persistent-template"; - version = "0.6.3"; - sha256 = "1vcjvfjxmv9c0wg7pbx0lw73128f5y0r4sfdsyq3jrkkiq1bgsxa"; - buildDepends = [ monadControl persistent text ]; + version = "0.6.3.1"; + sha256 = "0hppxd80q7bnxz9vm08i278d9k95w6z139y73dy53ncqkp72ahrg"; + buildDepends = [ monadControl persistent text transformers ]; meta = { homepage = "http://www.yesodweb.com/book/persistent"; description = "Type-safe, non-relational, multi-backend persistence"; From 511f888bcd4173f277d3e8101c7af1d47c1e705d Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 5 Dec 2011 15:59:56 +0000 Subject: [PATCH 850/970] haskell-persistent: updated to version 0.6.4.3 svn path=/nixpkgs/trunk/; revision=30750 --- pkgs/development/libraries/haskell/persistent/default.nix | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/pkgs/development/libraries/haskell/persistent/default.nix b/pkgs/development/libraries/haskell/persistent/default.nix index bab533f6db1..527bbf9f2ae 100644 --- a/pkgs/development/libraries/haskell/persistent/default.nix +++ b/pkgs/development/libraries/haskell/persistent/default.nix @@ -1,14 +1,15 @@ { cabal, blazeHtml, dataObject, enumerator, monadControl, mtl , pathPieces, pool, sqlite, text, time, transformers +, transformersBase }: cabal.mkDerivation (self: { pname = "persistent"; - version = "0.6.4.1"; - sha256 = "06l04yb49iiw4lyyy1vk138v3g2jh8xwd4bzpcagkh62jrvq559a"; + version = "0.6.4.3"; + sha256 = "0j4agwm8hcphrmzmc7d7al57cwp3i5iy7d8yhqw9m8pcx61sqkg4"; buildDepends = [ blazeHtml dataObject enumerator monadControl mtl pathPieces pool - text time transformers + text time transformers transformersBase ]; extraLibraries = [ sqlite ]; meta = { From 97d30e44becff9ff3ae539f03692ffd18f9e7f11 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 5 Dec 2011 15:59:58 +0000 Subject: [PATCH 851/970] haskell-pool: updated to version 0.1.2 svn path=/nixpkgs/trunk/; revision=30751 --- pkgs/development/libraries/haskell/pool/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/pool/default.nix b/pkgs/development/libraries/haskell/pool/default.nix index 51befe00ce4..09c871692ec 100644 --- a/pkgs/development/libraries/haskell/pool/default.nix +++ b/pkgs/development/libraries/haskell/pool/default.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "pool"; - version = "0.1.1"; - sha256 = "0h498pi7048m4cida10s28dp9f8c2ig3m4s9chwrfw3yiyai926l"; + version = "0.1.2"; + sha256 = "05lrinyk9gxdf67vwdav93ral2y8qsb33i9y5k91vlcjfp7w516q"; buildDepends = [ monadControl transformers ]; meta = { homepage = "http://www.yesodweb.com/book/persistent"; From bacef9e59b9c3d746c2bae3f94c7cd4e6638eaf6 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 5 Dec 2011 16:00:01 +0000 Subject: [PATCH 852/970] haskell-shakespeare-css: updated to version 0.10.4 svn path=/nixpkgs/trunk/; revision=30752 --- .../development/libraries/haskell/shakespeare-css/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/shakespeare-css/default.nix b/pkgs/development/libraries/haskell/shakespeare-css/default.nix index 64add15ad59..1cef979c01e 100644 --- a/pkgs/development/libraries/haskell/shakespeare-css/default.nix +++ b/pkgs/development/libraries/haskell/shakespeare-css/default.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "shakespeare-css"; - version = "0.10.3"; - sha256 = "1r0m1pqgg43dmc1gb1aj99hyk1jw0ciln9k7q3mq8vwc602kfd5r"; + version = "0.10.4"; + sha256 = "006ndbhzxkr2zw6gs13bm5pfq7i301bbg6nhagm3h9nnzp155snz"; buildDepends = [ parsec shakespeare text ]; meta = { homepage = "http://www.yesodweb.com/book/templates"; From 2b8265a5476263c11e00b1660601ba352c4e188d Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 5 Dec 2011 16:00:03 +0000 Subject: [PATCH 853/970] haskell-warp: updated to version 0.4.6.2 svn path=/nixpkgs/trunk/; revision=30753 --- pkgs/development/libraries/haskell/warp/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/warp/default.nix b/pkgs/development/libraries/haskell/warp/default.nix index f036c9bc1ed..5ff96051307 100644 --- a/pkgs/development/libraries/haskell/warp/default.nix +++ b/pkgs/development/libraries/haskell/warp/default.nix @@ -5,8 +5,8 @@ cabal.mkDerivation (self: { pname = "warp"; - version = "0.4.6.1"; - sha256 = "0gybcxfg619nws0j3ybimd8qg2knb1byk8cpcsdligp4yifp4qwd"; + version = "0.4.6.2"; + sha256 = "1ja9w3440j69w7638wrjd6067svqcsaqdl1zklr6jx20zyadww94"; buildDepends = [ blazeBuilder blazeBuilderEnumerator caseInsensitive enumerator httpTypes network simpleSendfile transformers unixCompat wai From 4bbe522a4f01a8c9f3b0395038923fd42351ae32 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 5 Dec 2011 16:00:06 +0000 Subject: [PATCH 854/970] haskell-yesod-auth: updated to version 0.7.7 svn path=/nixpkgs/trunk/; revision=30754 --- pkgs/development/libraries/haskell/yesod-auth/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/yesod-auth/default.nix b/pkgs/development/libraries/haskell/yesod-auth/default.nix index c676e175bfb..f652edd99f8 100644 --- a/pkgs/development/libraries/haskell/yesod-auth/default.nix +++ b/pkgs/development/libraries/haskell/yesod-auth/default.nix @@ -7,8 +7,8 @@ cabal.mkDerivation (self: { pname = "yesod-auth"; - version = "0.7.6.2"; - sha256 = "1g865k5p7i4x78kj00ybb757xbl6vck6d7qdq9n15xg6dbfm0i23"; + version = "0.7.7"; + sha256 = "0c5icrhi7an7c500y7ply9p1k22gzm5p9rw33szgc78h5p3jwwcg"; buildDepends = [ aeson authenticate blazeHtml controlMonadAttempt hamlet httpEnumerator mimeMail persistent persistentTemplate pureMD5 From 36c3aabd5690d6d65441678de11dfe90bd235e84 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 5 Dec 2011 16:00:10 +0000 Subject: [PATCH 855/970] haskell-yesod-core: updated to version 0.9.3.5 svn path=/nixpkgs/trunk/; revision=30755 --- .../libraries/haskell/yesod-core/default.nix | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/development/libraries/haskell/yesod-core/default.nix b/pkgs/development/libraries/haskell/yesod-core/default.nix index 203729c7108..8f07c964953 100644 --- a/pkgs/development/libraries/haskell/yesod-core/default.nix +++ b/pkgs/development/libraries/haskell/yesod-core/default.nix @@ -2,20 +2,20 @@ , clientsession, cookie, dataObject, dataObjectYaml, enumerator , failure, hamlet, httpTypes, monadControl, parsec, pathPieces , random, shakespeare, shakespeareCss, shakespeareJs -, strictConcurrency, text, time, transformers, vector, wai -, waiExtra +, strictConcurrency, text, time, transformers, transformersBase +, vector, wai, waiExtra }: cabal.mkDerivation (self: { pname = "yesod-core"; - version = "0.9.3.4"; - sha256 = "1hnzmbspdj15480n0r4r1gayapwwz3d5r3hzj5k4qd9975lyxcw1"; + version = "0.9.3.5"; + sha256 = "0gnn0lm52qk0lmjh51kvwf645icfdrvy0ck5kg9dpznk5i3n2g13"; buildDepends = [ aeson blazeBuilder blazeHtml caseInsensitive cereal clientsession cookie dataObject dataObjectYaml enumerator failure hamlet httpTypes monadControl parsec pathPieces random shakespeare shakespeareCss shakespeareJs strictConcurrency text time - transformers vector wai waiExtra + transformers transformersBase vector wai waiExtra ]; meta = { homepage = "http://www.yesodweb.com/"; From 770df458664ad9a702a53966fe575f7278ff9b90 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 5 Dec 2011 16:00:13 +0000 Subject: [PATCH 856/970] haskell-yesod: updated to version 0.9.3.4 svn path=/nixpkgs/trunk/; revision=30756 --- pkgs/development/libraries/haskell/yesod/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/yesod/default.nix b/pkgs/development/libraries/haskell/yesod/default.nix index dc987e0214d..ecd7dc012aa 100644 --- a/pkgs/development/libraries/haskell/yesod/default.nix +++ b/pkgs/development/libraries/haskell/yesod/default.nix @@ -7,8 +7,8 @@ cabal.mkDerivation (self: { pname = "yesod"; - version = "0.9.3.3"; - sha256 = "11xjj9madb9dxk06z3izzbv3cish748hkf57k37mjsvlidbxd104"; + version = "0.9.3.4"; + sha256 = "1iw6qf1dywss8w4ig3dr04cyi01jq9frvmkbqgj5jq8v11y55x6v"; isLibrary = true; isExecutable = true; buildDepends = [ From 4668d2b3b7ca817c9be1f21d47b363cd4309b039 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 5 Dec 2011 16:00:16 +0000 Subject: [PATCH 857/970] haskell-aeson: re-generated with the latest version of cabal2nix svn path=/nixpkgs/trunk/; revision=30757 --- pkgs/development/libraries/haskell/aeson/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/development/libraries/haskell/aeson/default.nix b/pkgs/development/libraries/haskell/aeson/default.nix index a8305fa8477..0bd68b6b92e 100644 --- a/pkgs/development/libraries/haskell/aeson/default.nix +++ b/pkgs/development/libraries/haskell/aeson/default.nix @@ -1,5 +1,5 @@ -{ cabal, attoparsec, blazeBuilder, blazeTextual, deepseq, hashable -, mtl, syb, text, time, unorderedContainers, vector +{ cabal, attoparsec, blazeBuilder, blazeTextual, deepseq, dlist +, hashable, mtl, syb, text, time, unorderedContainers, vector }: cabal.mkDerivation (self: { @@ -7,8 +7,8 @@ cabal.mkDerivation (self: { version = "0.4.0.0"; sha256 = "1j0m7hh82ab7lg757wq75k28llfd1igawmg4g2qdia5gimm652pa"; buildDepends = [ - attoparsec blazeBuilder blazeTextual deepseq hashable mtl syb text - time unorderedContainers vector + attoparsec blazeBuilder blazeTextual deepseq dlist hashable mtl syb + text time unorderedContainers vector ]; meta = { homepage = "https://github.com/bos/aeson"; From a392cab4d1b1143fd7e8453f2e3dc5e1c1419a50 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 5 Dec 2011 16:22:54 +0000 Subject: [PATCH 858/970] haskell-cabal2nix: updated to version 1.20 svn path=/nixpkgs/trunk/; revision=30758 --- pkgs/development/tools/haskell/cabal2nix/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/haskell/cabal2nix/default.nix b/pkgs/development/tools/haskell/cabal2nix/default.nix index b6c6eed67ad..298c8c8bc51 100644 --- a/pkgs/development/tools/haskell/cabal2nix/default.nix +++ b/pkgs/development/tools/haskell/cabal2nix/default.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "cabal2nix"; - version = "1.19"; - sha256 = "0fvd8h9dymz6l4fw2955ir6w4fcz7kdpl38kbd5ddk99q886035i"; + version = "1.20"; + sha256 = "14xbv7mqr9m9vhjd6xcxdb4m189p30bwbjrjjf20bq12w4h2v1xa"; isLibrary = false; isExecutable = true; buildDepends = [ hackageDb HTTP mtl nixosTypes regexPosix ]; From 0ebf4b42a1256cfda58d4cca133cba2b0c4531a8 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 5 Dec 2011 16:22:56 +0000 Subject: [PATCH 859/970] haskell-uuagc-bootstrap: updated to version 0.9.39.3.0 svn path=/nixpkgs/trunk/; revision=30759 --- pkgs/development/tools/haskell/uuagc/bootstrap.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/haskell/uuagc/bootstrap.nix b/pkgs/development/tools/haskell/uuagc/bootstrap.nix index 2110f258229..8d1c111cc20 100644 --- a/pkgs/development/tools/haskell/uuagc/bootstrap.nix +++ b/pkgs/development/tools/haskell/uuagc/bootstrap.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "uuagc-bootstrap"; - version = "0.9.39.1.0"; - sha256 = "06w330j0nds5piv1rr3m6m1idnf0c5swfk9qwdqzi0pmpws6lpkj"; + version = "0.9.39.3.0"; + sha256 = "0y1ipxkh9rl4mvw9a83dx0slr0ry1yw670z3w3dlb716xyzqyg5z"; isLibrary = true; isExecutable = true; buildDepends = [ haskellSrcExts mtl uulib ]; From c39d60bc0e07089715db478e93d54d5b79075a8c Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 5 Dec 2011 16:22:59 +0000 Subject: [PATCH 860/970] haskell-uuagc-cabal: updated to version 1.0.0.10 svn path=/nixpkgs/trunk/; revision=30760 --- pkgs/development/tools/haskell/uuagc/cabal.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/haskell/uuagc/cabal.nix b/pkgs/development/tools/haskell/uuagc/cabal.nix index 6e7eb904ea1..70c0a8e9931 100644 --- a/pkgs/development/tools/haskell/uuagc/cabal.nix +++ b/pkgs/development/tools/haskell/uuagc/cabal.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "uuagc-cabal"; - version = "1.0.0.9"; - sha256 = "1iifzy58w50162bwj20xmldsyq0xaq0g849zgwxai26881a1jlfg"; + version = "1.0.0.10"; + sha256 = "0dqj5nqq8qpylbxyv8cpy3rrnna9yqb4dnxxk7sgyhw6yvz48l56"; buildDepends = [ mtl uulib ]; meta = { homepage = "http://www.cs.uu.nl/wiki/HUT/WebHome"; From 42757e653a428b2a9d3886688ad12994900c22d7 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 5 Dec 2011 16:23:02 +0000 Subject: [PATCH 861/970] Temporarily keep monad-control 0.2.0.3 until a new version of git-annex comes out that supports the current version. svn path=/nixpkgs/trunk/; revision=30761 --- .../version-management/git-and-tools/default.nix | 3 ++- .../libraries/haskell/monad-control/0.2.0.3.nix | 14 ++++++++++++++ pkgs/top-level/haskell-packages.nix | 1 + 3 files changed, 17 insertions(+), 1 deletion(-) create mode 100644 pkgs/development/libraries/haskell/monad-control/0.2.0.3.nix diff --git a/pkgs/applications/version-management/git-and-tools/default.nix b/pkgs/applications/version-management/git-and-tools/default.nix index 3f1593899c1..0f14c35a3df 100644 --- a/pkgs/applications/version-management/git-and-tools/default.nix +++ b/pkgs/applications/version-management/git-and-tools/default.nix @@ -48,8 +48,9 @@ rec { gitAnnex = lib.makeOverridable (import ./git-annex) { inherit stdenv fetchurl libuuid rsync findutils curl perl git ikiwiki which; inherit (haskellPackages) ghc MissingH utf8String pcreLight SHA dataenc - HTTP testpack monadControl hS3 mtl network hslogger hxt json; + HTTP testpack hS3 mtl network hslogger hxt json; QuickCheck2 = haskellPackages.QuickCheck_2_4_0_1; + monadControl = haskellPackages.monadControl_OBSOLETE; }; qgit = import ./qgit { diff --git a/pkgs/development/libraries/haskell/monad-control/0.2.0.3.nix b/pkgs/development/libraries/haskell/monad-control/0.2.0.3.nix new file mode 100644 index 00000000000..f1107c12af5 --- /dev/null +++ b/pkgs/development/libraries/haskell/monad-control/0.2.0.3.nix @@ -0,0 +1,14 @@ +{ cabal, baseUnicodeSymbols, transformers }: + +cabal.mkDerivation (self: { + pname = "monad-control"; + version = "0.2.0.3"; + sha256 = "0z7wjilrx6phqs2gxwv65dy1n3mc0j8hj3adshkwy6z8ggj283nh"; + buildDepends = [ baseUnicodeSymbols transformers ]; + meta = { + homepage = "https://github.com/basvandijk/monad-control/"; + description = "Lift control operations, like exception catching, through monad transformers"; + license = self.stdenv.lib.licenses.bsd3; + platforms = self.ghc.meta.platforms; + }; +}) diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix index 8a4d083f708..f6b8cd2b76b 100644 --- a/pkgs/top-level/haskell-packages.nix +++ b/pkgs/top-level/haskell-packages.nix @@ -862,6 +862,7 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y); MonadCatchIOTransformers = callPackage ../development/libraries/haskell/MonadCatchIO-transformers {}; + monadControl_OBSOLETE = callPackage ../development/libraries/haskell/monad-control/0.2.0.3.nix {}; monadControl = callPackage ../development/libraries/haskell/monad-control {}; monadLoops = callPackage ../development/libraries/haskell/monad-loops {}; From 3357437461eb250c1ced9dc21e4201f03aea488d Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 5 Dec 2011 16:23:05 +0000 Subject: [PATCH 862/970] git-annex: updated to version 3.20111203 svn path=/nixpkgs/trunk/; revision=30762 --- .../version-management/git-and-tools/git-annex/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/version-management/git-and-tools/git-annex/default.nix b/pkgs/applications/version-management/git-and-tools/git-annex/default.nix index ead61030ea2..26a99c21f25 100644 --- a/pkgs/applications/version-management/git-and-tools/git-annex/default.nix +++ b/pkgs/applications/version-management/git-and-tools/git-annex/default.nix @@ -4,14 +4,14 @@ }: let - version = "3.20111122"; + version = "3.20111203"; in stdenv.mkDerivation { name = "git-annex-${version}"; src = fetchurl { url = "http://ftp.de.debian.org/debian/pool/main/g/git-annex/git-annex_${version}.tar.gz"; - sha256 = "b63fdd1fb890a388b9da8cc1037cefcb58e38ab4c7e3f27a7aec169ecbde6d2c"; + sha256 = "236a8fa537be1738a16afcab8a7438dc567dce75a6b71b62780d31048428f74b"; }; buildInputs = [ From 1be13f458ff3533baad8b5456b08fdc68a6b7713 Mon Sep 17 00:00:00 2001 From: Shea Levy Date: Mon, 5 Dec 2011 17:32:45 +0000 Subject: [PATCH 863/970] Apply mornfall's SANE patches Fix sane-backends to generate udev rules, add a snapshot of sane-backends's unstable repo, and add a SANE nixos module svn path=/nixpkgs/trunk/; revision=30764 --- pkgs/misc/sane-backends/default.nix | 3 ++- pkgs/misc/sane-backends/snapshot.nix | 33 ++++++++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 4 ++++ 3 files changed, 39 insertions(+), 1 deletion(-) create mode 100644 pkgs/misc/sane-backends/snapshot.nix diff --git a/pkgs/misc/sane-backends/default.nix b/pkgs/misc/sane-backends/default.nix index 65e748b68fc..e1bd1436101 100644 --- a/pkgs/misc/sane-backends/default.nix +++ b/pkgs/misc/sane-backends/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, hotplugSupport ? false, libusb ? null +{ stdenv, fetchurl, hotplugSupport ? true, libusb ? null , gt68xxFirmware ? null }: let firmware = gt68xxFirmware {inherit fetchurl;}; @@ -20,6 +20,7 @@ stdenv.mkDerivation { postInstall = '' if test "$udevSupport" = "1"; then ensureDir $out/etc/udev/rules.d/ + ./tools/sane-desc -m udev > $out/etc/udev/rules.d/60-libsane.rules || \ cp tools/udev/libsane.rules $out/etc/udev/rules.d/60-libsane.rules fi ''; diff --git a/pkgs/misc/sane-backends/snapshot.nix b/pkgs/misc/sane-backends/snapshot.nix new file mode 100644 index 00000000000..8725206ddce --- /dev/null +++ b/pkgs/misc/sane-backends/snapshot.nix @@ -0,0 +1,33 @@ +{ stdenv, fetchurl, hotplugSupport ? true, libusb ? null +, gt68xxFirmware ? null }: +let + firmware = gt68xxFirmware {inherit fetchurl;}; +in +assert hotplugSupport -> stdenv.system == "i686-linux"; + +stdenv.mkDerivation { + name = "sane-backends-1.0.22.git201111204"; + + src = fetchurl { + url = http://www.sane-project.org/snapshots/sane-backends-git20111204.tar.gz; + sha256 = "00b3fi8zjrq3in0wndz1xcz228mgfhwhh2knmyjsikr88hal0m47"; + }; + + udevSupport = hotplugSupport; + + buildInputs = if libusb != null then [libusb] else []; + + postInstall = '' + if test "$udevSupport" = "1"; then + ensureDir $out/etc/udev/rules.d/ + ./tools/sane-desc -m udev > $out/etc/udev/rules.d/60-libsane.rules || \ + cp tools/udev/libsane.rules $out/etc/udev/rules.d/60-libsane.rules + fi + ''; + + preInstall = + if gt68xxFirmware != null then + "mkdir -p \${out}/share/sane/gt68xx ; ln -s " + firmware.fw + + " \${out}/share/sane/gt68xx/" + firmware.name + else ""; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index b157deb4642..fa3fdd7dd6d 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -8486,6 +8486,10 @@ let gt68xxFirmware = getConfig ["sane" "gt68xxFirmware"] null; }; + saneBackendsSnapshot = callPackage ../misc/sane-backends/snapshot.nix { + gt68xxFirmware = getConfig ["sane" "gt68xxFirmware"] null; + }; + saneFrontends = callPackage ../misc/sane-front { }; slock = callPackage ../misc/screensavers/slock { }; From 2d0b27df9df9e741b83a6f2e74c9f10568076e5b Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 5 Dec 2011 19:27:47 +0000 Subject: [PATCH 864/970] haskell-uuagc: updated to version 0.9.39.3 svn path=/nixpkgs/trunk/; revision=30765 --- pkgs/development/tools/haskell/uuagc/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/haskell/uuagc/default.nix b/pkgs/development/tools/haskell/uuagc/default.nix index 417f430ba9b..23949ca006e 100644 --- a/pkgs/development/tools/haskell/uuagc/default.nix +++ b/pkgs/development/tools/haskell/uuagc/default.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "uuagc"; - version = "0.9.39.1"; - sha256 = "0zqhwpafq51czy97z0f93cbxd8k6hllnmb24a6yzr4y6kzzv65hd"; + version = "0.9.39.3"; + sha256 = "15wm7r7p9bzhad9nshv0r11h7if581dvlkyagx2whldk40clnk48"; isLibrary = true; isExecutable = true; buildDepends = [ From b530f9ea9c4a8bceb5f09ffc89f9c16dbf2f7193 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 5 Dec 2011 19:27:50 +0000 Subject: [PATCH 865/970] monad-control 0.2.0.3: added missing maintainer section svn path=/nixpkgs/trunk/; revision=30766 --- pkgs/development/libraries/haskell/monad-control/0.2.0.3.nix | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/pkgs/development/libraries/haskell/monad-control/0.2.0.3.nix b/pkgs/development/libraries/haskell/monad-control/0.2.0.3.nix index f1107c12af5..b3d9208bd25 100644 --- a/pkgs/development/libraries/haskell/monad-control/0.2.0.3.nix +++ b/pkgs/development/libraries/haskell/monad-control/0.2.0.3.nix @@ -10,5 +10,9 @@ cabal.mkDerivation (self: { description = "Lift control operations, like exception catching, through monad transformers"; license = self.stdenv.lib.licenses.bsd3; platforms = self.ghc.meta.platforms; + maintainers = [ + self.stdenv.lib.maintainers.andres + self.stdenv.lib.maintainers.simons + ]; }; }) From e2e5f9693d3581840e246fd4e1eb4f0e04eb10f4 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 5 Dec 2011 19:58:19 +0000 Subject: [PATCH 866/970] gv: updated to version 3.7.3 svn path=/nixpkgs/trunk/; revision=30767 --- pkgs/applications/misc/gv/default.nix | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/misc/gv/default.nix b/pkgs/applications/misc/gv/default.nix index efce2c93561..7a02100b2cb 100644 --- a/pkgs/applications/misc/gv/default.nix +++ b/pkgs/applications/misc/gv/default.nix @@ -1,11 +1,14 @@ { stdenv, fetchurl, Xaw3d, ghostscriptX, perl }: -stdenv.mkDerivation rec { - name = "gv-3.7.2"; +let + name = "gv-3.7.3"; +in +stdenv.mkDerivation { + inherit name; src = fetchurl { url = "mirror://gnu/gv/${name}.tar.gz"; - sha256 = "1cj03rb7xs0l3krax4z2llwnldh876p1h3p5vql4gygcxki8vhk2"; + sha256 = "ee01ba96e3a5c319eb4658357372a118dbb0e231891b360edecbdebd449d1c2b"; }; buildInputs = [ Xaw3d ghostscriptX perl ]; From 3f8320658a413f8b4622c31b4f0c9d20ad8aec59 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= Date: Mon, 5 Dec 2011 23:22:42 +0000 Subject: [PATCH 867/970] MIT/GNU Scheme: Fix hashes. svn path=/nixpkgs/trunk/; revision=30769 --- pkgs/development/compilers/mit-scheme/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/compilers/mit-scheme/default.nix b/pkgs/development/compilers/mit-scheme/default.nix index c19581debbf..ef11c5b3baf 100644 --- a/pkgs/development/compilers/mit-scheme/default.nix +++ b/pkgs/development/compilers/mit-scheme/default.nix @@ -15,14 +15,14 @@ stdenv.mkDerivation { if stdenv.isi686 then fetchurl { url = "mirror://gnu/mit-scheme/stable.pkg/${version}/mit-scheme-${version}-i386.tar.gz"; - sha256 = "1bigzzk0k08lggyzqp4rmyvbqhhs3ld4c7drfp22d5qnkbvvzh4g"; + sha256 = "0vi760fy550d9db538m0vzbq1mpdncvw9g8bk4lswk0kcdira55z"; } else if stdenv.isx86_64 then fetchurl { url = "mirror://gnu/mit-scheme/stable.pkg/${version}/mit-scheme-${version}-x86-64.tar.gz"; - sha256 = "1l4zxqm5r1alc6y1cky62rn8h6i40qyiba081n6phwypwxr5sd0g"; + sha256 = "1wcxm9hyfc53myvlcn93fyqrnnn4scwkknl9hkbp1cphc6mp291x"; } else fetchurl { url = "mirror://gnu/mit-scheme/stable.pkg/${version}/mit-scheme-c-${version}.tar.gz"; - sha256 = "1661cybycfvjjyq92gb3n1cygxfmfjdhnh3d2ha3vy6xxk9d7za9"; + sha256 = "0pclakzwxbqgy6wqwvs6ml62wgby8ba8xzmwzdwhx1v8wv05yw1j"; }; buildPhase = From 93511ab4f1744371f3ab9400a5a5f45bb74edaf5 Mon Sep 17 00:00:00 2001 From: Michael Raskin <7c6f434c@mail.ru> Date: Tue, 6 Dec 2011 07:00:04 +0000 Subject: [PATCH 868/970] Update SBCL svn path=/nixpkgs/trunk/; revision=30770 --- pkgs/development/compilers/sbcl/src-for-default.nix | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/development/compilers/sbcl/src-for-default.nix b/pkgs/development/compilers/sbcl/src-for-default.nix index fba20ca926c..bcdd3002fd6 100644 --- a/pkgs/development/compilers/sbcl/src-for-default.nix +++ b/pkgs/development/compilers/sbcl/src-for-default.nix @@ -1,9 +1,9 @@ rec { - version="1.0.53"; - name="sbcl-1.0.53"; - hash="02jb2pz0jlv9fcc8hln4afklz6ic3lwrwd0sszkz09zxj7d5vha9"; - url="http://downloads.sourceforge.net/project/sbcl/sbcl/1.0.53/sbcl-1.0.53-source.tar.bz2"; - advertisedUrl="http://downloads.sourceforge.net/project/sbcl/sbcl/1.0.53/sbcl-1.0.53-source.tar.bz2"; + version="1.0.54"; + name="sbcl-1.0.54"; + hash="1ip13hz5zsys3vy68y3x0fapxs87xk0gqi6bdp68vyznz2a0v1cd"; + url="http://downloads.sourceforge.net/project/sbcl/sbcl/1.0.54/sbcl-1.0.54-source.tar.bz2"; + advertisedUrl="http://downloads.sourceforge.net/project/sbcl/sbcl/1.0.54/sbcl-1.0.54-source.tar.bz2"; } From d0151a7465187b7bf16d0a6ea4a4cf881d1392a4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= Date: Tue, 6 Dec 2011 14:04:01 +0000 Subject: [PATCH 869/970] hwloc 1.3. svn path=/nixpkgs/trunk/; revision=30771 --- pkgs/development/libraries/hwloc/default.nix | 9 +++++---- pkgs/top-level/all-packages.nix | 4 +++- 2 files changed, 8 insertions(+), 5 deletions(-) diff --git a/pkgs/development/libraries/hwloc/default.nix b/pkgs/development/libraries/hwloc/default.nix index 9bb7562cc21..2b2ec1733a1 100644 --- a/pkgs/development/libraries/hwloc/default.nix +++ b/pkgs/development/libraries/hwloc/default.nix @@ -1,14 +1,15 @@ -{ stdenv, fetchurl, pkgconfig, cairo, expat, ncurses }: +{ stdenv, fetchurl, pkgconfig, cairo, expat, ncurses, libX11 }: stdenv.mkDerivation rec { - name = "hwloc-1.2"; + name = "hwloc-1.3"; src = fetchurl { url = "http://www.open-mpi.org/software/hwloc/v1.2/downloads/${name}.tar.bz2"; - sha256 = "04mrlmcp596imzbhlflb53ddld705k9617rzpprnhp3643krn0dw"; + sha256 = "10zlz0hng7scjx1xn8jflx3gbga5djbhxhj94k5kszrivc8zh8xy"; }; - buildInputs = [ pkgconfig cairo expat ncurses ]; + # XXX: libX11 is not directly needed, but needed as a propagated dep of Cairo. + buildInputs = [ pkgconfig cairo expat ncurses libX11 ]; doCheck = true; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index fa3fdd7dd6d..8ba04ed3025 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -3703,7 +3703,9 @@ let hunspell = callPackage ../development/libraries/hunspell { }; - hwloc = callPackage ../development/libraries/hwloc { }; + hwloc = callPackage ../development/libraries/hwloc { + inherit (xlibs) libX11; + }; hydraAntLogger = callPackage ../development/libraries/java/hydra-ant-logger { }; From 648d7e66c040e308ef907b6284eb36f30a0e1aa8 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Tue, 6 Dec 2011 14:07:08 +0000 Subject: [PATCH 870/970] haskell-tls: updated to version 0.8.3.2 svn path=/nixpkgs/trunk/; revision=30772 --- pkgs/development/libraries/haskell/tls/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/tls/default.nix b/pkgs/development/libraries/haskell/tls/default.nix index 73970d1e790..ef0f1bb4dd0 100644 --- a/pkgs/development/libraries/haskell/tls/default.nix +++ b/pkgs/development/libraries/haskell/tls/default.nix @@ -4,8 +4,8 @@ cabal.mkDerivation (self: { pname = "tls"; - version = "0.8.3.1"; - sha256 = "07441s9ll8afpkf2wb0pk8hb9i90hyzkz476jyywvi87mmg2np3m"; + version = "0.8.3.2"; + sha256 = "1g30viz94qhwv3v16d9njrwyqmv0p1hs0r11xmzx0adp806w54z9"; isLibrary = true; isExecutable = true; buildDepends = [ From 1382203c294c1f9fc432c70230e389497829a240 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Tue, 6 Dec 2011 14:07:11 +0000 Subject: [PATCH 871/970] maxima: updated to version 5.25.1 svn path=/nixpkgs/trunk/; revision=30773 --- pkgs/applications/science/math/maxima/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/science/math/maxima/default.nix b/pkgs/applications/science/math/maxima/default.nix index f8f21d8909b..b7949909760 100644 --- a/pkgs/applications/science/math/maxima/default.nix +++ b/pkgs/applications/science/math/maxima/default.nix @@ -2,7 +2,7 @@ let name = "maxima"; - version = "5.25.0"; + version = "5.25.1"; searchPath = stdenv.lib.makeSearchPath "bin" @@ -13,7 +13,7 @@ stdenv.mkDerivation { src = fetchurl { url = "mirror://sourceforge/${name}/${name}-${version}.tar.gz"; - sha256 = "49c90fb809f5027787600050503476193db3620fd9517f620b82ad492ba30c0a"; + sha256 = "8e98ad742151e52edb56337bd62c8a9749f7b598cb6ed4e991980e0e6f89706a"; }; buildInputs = [sbcl texinfo perl makeWrapper]; From c86e037939882661ccaaa0245aaa9203d2898af3 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Tue, 6 Dec 2011 14:07:14 +0000 Subject: [PATCH 872/970] wxMaxima: updated to version 11.08.0 svn path=/nixpkgs/trunk/; revision=30774 --- pkgs/applications/science/math/wxmaxima/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/science/math/wxmaxima/default.nix b/pkgs/applications/science/math/wxmaxima/default.nix index 6bd6e9266e6..77fe32d1792 100644 --- a/pkgs/applications/science/math/wxmaxima/default.nix +++ b/pkgs/applications/science/math/wxmaxima/default.nix @@ -2,14 +2,14 @@ let name = "wxmaxima"; - version = "11.04.0"; + version = "11.08.0"; in stdenv.mkDerivation { name = "${name}-${version}"; src = fetchurl { url = "mirror://sourceforge/${name}/wxMaxima-${version}.tar.gz"; - sha256 = "1dfwh5ka125wr6wxzyiwz16lk8kaf09rb6lldzryjwh8zi7yw8dm"; + sha256 = "dfa25cc15de52829a93da624d42344213cc979351b5fcd3dff2afed6738832df"; }; buildInputs = [wxGTK maxima makeWrapper]; From d5951bfac11d7e13e70b1081d15b5e36b7de3b54 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= Date: Tue, 6 Dec 2011 14:12:43 +0000 Subject: [PATCH 873/970] LCOV: Add `meta.platforms'. svn path=/nixpkgs/trunk/; revision=30775 --- pkgs/development/tools/analysis/lcov/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/development/tools/analysis/lcov/default.nix b/pkgs/development/tools/analysis/lcov/default.nix index 73c3e66f074..c768669bda9 100644 --- a/pkgs/development/tools/analysis/lcov/default.nix +++ b/pkgs/development/tools/analysis/lcov/default.nix @@ -42,5 +42,6 @@ stdenv.mkDerivation rec { license = "GPLv2+"; maintainers = [ stdenv.lib.maintainers.ludo ]; + platforms = stdenv.lib.platforms.all; }; } From b1e6ccae4e0820d4f14d4e906a10ff4f1e1917c6 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Tue, 6 Dec 2011 14:56:47 +0000 Subject: [PATCH 874/970] * Subversion 1.7.2. svn path=/nixpkgs/trunk/; revision=30776 --- pkgs/applications/version-management/subversion/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/version-management/subversion/default.nix b/pkgs/applications/version-management/subversion/default.nix index 0199dd11302..a1a6a3fcd7f 100644 --- a/pkgs/applications/version-management/subversion/default.nix +++ b/pkgs/applications/version-management/subversion/default.nix @@ -19,13 +19,13 @@ assert compressionSupport -> neon.compressionSupport; stdenv.mkDerivation rec { - version = "1.7.1"; + version = "1.7.2"; name = "subversion-${version}"; src = fetchurl { url = "mirror://apache/subversion//${name}.tar.bz2"; - sha1 = "4bfaa8e33e9eaf26a504117cd91b23805518071a"; + sha1 = "8c0824aeb7f42da1ff4f7cd296877af7f59812bb"; }; buildInputs = [ zlib apr aprutil sqlite ] From 06a72fa57c85a1732ceb8d0bd4550580341964d8 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Tue, 6 Dec 2011 15:05:57 +0000 Subject: [PATCH 875/970] log4cplus: added version 1.0.4 svn path=/nixpkgs/trunk/; revision=30777 --- .../libraries/log4cplus/default.nix | 19 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 21 insertions(+) create mode 100644 pkgs/development/libraries/log4cplus/default.nix diff --git a/pkgs/development/libraries/log4cplus/default.nix b/pkgs/development/libraries/log4cplus/default.nix new file mode 100644 index 00000000000..0856832c188 --- /dev/null +++ b/pkgs/development/libraries/log4cplus/default.nix @@ -0,0 +1,19 @@ +{ stdenv, fetchurl }: + +let + name = "log4cplus-1.0.4"; +in +stdenv.mkDerivation { + inherit name; + + src = fetchurl { + url = "mirror://sourceforge/log4cplus/${name}.tar.bz2"; + sha256 = "c2bb01b5f4bff5fa768700e98ead4a79dfd556096c9f3f0401849da7ab80fbef"; + }; + + meta = { + homepage = "http://log4cplus.sourceforge.net/"; + description = "a port the log4j library from Java to C++"; + license = stdenv.lib.licenses.asl20; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 8ba04ed3025..39e5418145c 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -4197,6 +4197,8 @@ let log4cxx = callPackage ../development/libraries/log4cxx { }; + log4cplus = callPackage ../development/libraries/log4cplus { }; + loudmouth = callPackage ../development/libraries/loudmouth { }; lzo = callPackage ../development/libraries/lzo { }; From 3aedd3770f3e6c51c9fd940aae822e1b86cbc871 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Tue, 6 Dec 2011 15:41:16 +0000 Subject: [PATCH 876/970] * Get svn2git to work. svn path=/nixpkgs/trunk/; revision=30778 --- .../git-and-tools/default.nix | 3 +- .../git-and-tools/svn2git/default.nix | 37 +++++++++++-------- 2 files changed, 23 insertions(+), 17 deletions(-) diff --git a/pkgs/applications/version-management/git-and-tools/default.nix b/pkgs/applications/version-management/git-and-tools/default.nix index 0f14c35a3df..c6b29d8ae26 100644 --- a/pkgs/applications/version-management/git-and-tools/default.nix +++ b/pkgs/applications/version-management/git-and-tools/default.nix @@ -101,7 +101,8 @@ rec { }; svn2git = import ./svn2git { - inherit stdenv fetchgit qt47 subversion apr; + inherit stdenv fetchgit ruby makeWrapper; + git = gitSVN; }; gitSubtree = import ./git-subtree { diff --git a/pkgs/applications/version-management/git-and-tools/svn2git/default.nix b/pkgs/applications/version-management/git-and-tools/svn2git/default.nix index ae928fa2d4d..cc3812c6dcb 100644 --- a/pkgs/applications/version-management/git-and-tools/svn2git/default.nix +++ b/pkgs/applications/version-management/git-and-tools/svn2git/default.nix @@ -1,25 +1,30 @@ -{ stdenv, fetchgit, qt47, subversion, apr}: +{ stdenv, fetchgit, ruby, makeWrapper, git }: stdenv.mkDerivation rec { - name = "svn2git"; + name = "svn2git-20111206"; src = fetchgit { - url = http://git.gitorious.org/svn2git/svn2git.git; - rev = "197979b6a641b8b5fa4856c700b1235491c73a41"; - sha256 = "7be1a8f5822aff2d4ea7f415dce0b4fa8c6a82310acf24e628c5f1ada2d2d613"; + url = https://github.com/nirvdrum/svn2git; + rev = "5cd8d4b509affb66eb2dad50d7298c52b3b0d848"; + sha256 = "26aa17f68f605e958b623d803b4bd405e12d6c5d51056635873a2c59e4c7b9ca"; }; - buildPhase = '' - sed -i 's|/bin/cat|cat|' ./src/repository.cpp - qmake - make CXXFLAGS='-I${apr}/include/apr-1 -I${subversion}/include/subversion-1 -DVER="\"${src.rev}\""' - ''; + buildInputs = [ ruby makeWrapper ]; - installPhase = '' - ensureDir $out/bin - cp svn-all-fast-export $out/bin - ''; + buildPhase = "true"; - buildInputs = [subversion apr qt47]; - + installPhase = + '' + mkdir -p $out + cp -r lib $out/ + + mkdir -p $out/bin + substituteInPlace bin/svn2git --replace '/usr/bin/env ruby' ${ruby}/bin/ruby + cp bin/svn2git $out/bin/ + chmod +x $out/bin/svn2git + + wrapProgram $out/bin/svn2git \ + --set RUBYLIB $out/lib \ + --prefix PATH : ${git}/bin + ''; } From f2a7cef449cb07d2f2912880f401d47a88f7e605 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= Date: Tue, 6 Dec 2011 17:44:09 +0000 Subject: [PATCH 877/970] hwloc: Fix typo. svn path=/nixpkgs/trunk/; revision=30779 --- pkgs/development/libraries/hwloc/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/libraries/hwloc/default.nix b/pkgs/development/libraries/hwloc/default.nix index 2b2ec1733a1..303f2750d82 100644 --- a/pkgs/development/libraries/hwloc/default.nix +++ b/pkgs/development/libraries/hwloc/default.nix @@ -4,7 +4,7 @@ stdenv.mkDerivation rec { name = "hwloc-1.3"; src = fetchurl { - url = "http://www.open-mpi.org/software/hwloc/v1.2/downloads/${name}.tar.bz2"; + url = "http://www.open-mpi.org/software/hwloc/v1.3/downloads/${name}.tar.bz2"; sha256 = "10zlz0hng7scjx1xn8jflx3gbga5djbhxhj94k5kszrivc8zh8xy"; }; From 621963488f6aac381e367b6e3ac953da6332ec2f Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Tue, 6 Dec 2011 18:44:05 +0000 Subject: [PATCH 878/970] * GnuCash updated to 2.4.8. svn path=/nixpkgs/trunk/; revision=30780 --- pkgs/applications/office/gnucash/default.nix | 4 +- pkgs/development/libraries/libofx/default.nix | 6 +- .../libraries/libofx/libofx-0.9.0-gcc43.patch | 375 ------------------ 3 files changed, 4 insertions(+), 381 deletions(-) delete mode 100644 pkgs/development/libraries/libofx/libofx-0.9.0-gcc43.patch diff --git a/pkgs/applications/office/gnucash/default.nix b/pkgs/applications/office/gnucash/default.nix index 3e20a350a79..a58c82e1b8b 100644 --- a/pkgs/applications/office/gnucash/default.nix +++ b/pkgs/applications/office/gnucash/default.nix @@ -9,14 +9,14 @@ */ let - name = "gnucash-2.4.7"; + name = "gnucash-2.4.8"; in stdenv.mkDerivation { inherit name; src = fetchurl { url = "mirror://sourceforge/gnucash/${name}.tar.bz2"; - sha256 = "eeb3b17f9081a544f8705db735df88ab3f468642a1d01552ea4e36bcb5b0730e"; + sha256 = "06gfgw4sq1b8c9qzinyd3wmcy3i0jyprngr259l0aldv8rvix8aa"; }; buildInputs = [ diff --git a/pkgs/development/libraries/libofx/default.nix b/pkgs/development/libraries/libofx/default.nix index acacd89f02b..ba031cd927c 100644 --- a/pkgs/development/libraries/libofx/default.nix +++ b/pkgs/development/libraries/libofx/default.nix @@ -1,15 +1,13 @@ { stdenv, fetchurl, opensp, pkgconfig, libxml2, curl }: stdenv.mkDerivation rec { - name = "libofx-0.9.1"; + name = "libofx-0.9.4"; src = fetchurl { url = "mirror://sourceforge/libofx/${name}.tar.gz"; - sha256 = "0gyana7v3pcqdpncjr5vg5z2r2z3rvg0fiml59mazi9n62zk86rj"; + sha256 = "1byvc1ar7s0nivi5cmycwlwh1y4xiad7ipfkgx57lbk7slgn8c4v"; }; - patches = [ ./libofx-0.9.0-gcc43.patch ]; - configureFlags = [ "--with-opensp-includes=${opensp}/include/OpenSP" ]; buildInputs = [ opensp pkgconfig libxml2 curl ]; diff --git a/pkgs/development/libraries/libofx/libofx-0.9.0-gcc43.patch b/pkgs/development/libraries/libofx/libofx-0.9.0-gcc43.patch deleted file mode 100644 index 63ced2d5f81..00000000000 --- a/pkgs/development/libraries/libofx/libofx-0.9.0-gcc43.patch +++ /dev/null @@ -1,375 +0,0 @@ -http://bugs.gentoo.org/218782 -diff -NrU5 libofx-0.9.0.orig/lib/ofx_container_transaction.cpp libofx-0.9.0/lib/ofx_container_transaction.cpp ---- libofx-0.9.0.orig/lib/ofx_container_transaction.cpp 2007-11-10 00:10:49.000000000 +0100 -+++ libofx-0.9.0/lib/ofx_container_transaction.cpp 2008-04-21 22:26:24.000000000 +0200 -@@ -19,10 +19,11 @@ - - #ifdef HAVE_CONFIG_H - #include - #endif - -+#include - #include - #include "messages.hh" - #include "libofx.h" - #include "ofx_containers.hh" - #include "ofx_utilities.hh" -diff -NrU5 libofx-0.9.0.orig/lib/ofx_request_accountinfo.cpp libofx-0.9.0/lib/ofx_request_accountinfo.cpp ---- libofx-0.9.0.orig/lib/ofx_request_accountinfo.cpp 2007-10-28 03:33:43.000000000 +0100 -+++ libofx-0.9.0/lib/ofx_request_accountinfo.cpp 2008-04-21 22:26:24.000000000 +0200 -@@ -19,10 +19,11 @@ - - #ifdef HAVE_CONFIG_H - #include - #endif - -+#include - #include - #include "libofx.h" - #include "ofx_request_accountinfo.hh" - - using namespace std; -diff -NrU5 libofx-0.9.0.orig/lib/ofx_request.cpp libofx-0.9.0/lib/ofx_request.cpp ---- libofx-0.9.0.orig/lib/ofx_request.cpp 2007-10-28 03:37:52.000000000 +0100 -+++ libofx-0.9.0/lib/ofx_request.cpp 2008-04-21 22:26:24.000000000 +0200 -@@ -19,10 +19,11 @@ - - #ifdef HAVE_CONFIG_H - #include - #endif - -+#include - #include - #include "messages.hh" - #include "libofx.h" - #include "ofx_request.hh" - -diff -NrU5 libofx-0.9.0.orig/lib/ofx_request_statement.cpp libofx-0.9.0/lib/ofx_request_statement.cpp ---- libofx-0.9.0.orig/lib/ofx_request_statement.cpp 2007-10-28 13:57:18.000000000 +0100 -+++ libofx-0.9.0/lib/ofx_request_statement.cpp 2008-04-21 22:26:24.000000000 +0200 -@@ -19,10 +19,11 @@ - - #ifdef HAVE_CONFIG_H - #include - #endif - -+#include - #include - #include "libofx.h" - #include "ofx_utilities.hh" - #include "ofx_request_statement.hh" - -diff -NrU5 libofx-0.9.0.orig/lib/ofx_utilities.cpp libofx-0.9.0/lib/ofx_utilities.cpp ---- libofx-0.9.0.orig/lib/ofx_utilities.cpp 2007-10-27 14:12:49.000000000 +0200 -+++ libofx-0.9.0/lib/ofx_utilities.cpp 2008-04-21 22:26:24.000000000 +0200 -@@ -19,11 +19,12 @@ - #include - #include - - #include "ParserEventGeneratorKit.h" - #include "SGMLApplication.h" --#include -+#include -+#include - #include - #include - #include "messages.hh" - #include "ofx_utilities.hh" - -diff -NrU5 libofx-0.9.0.orig/lib/ofx_utilities.cpp.orig libofx-0.9.0/lib/ofx_utilities.cpp.orig ---- libofx-0.9.0.orig/lib/ofx_utilities.cpp.orig 1970-01-01 01:00:00.000000000 +0100 -+++ libofx-0.9.0/lib/ofx_utilities.cpp.orig 2007-10-27 14:12:49.000000000 +0200 -@@ -0,0 +1,245 @@ -+/*************************************************************************** -+ ofx_util.cpp -+ ------------------- -+ copyright : (C) 2002 by Benoit Grégoire -+ email : bock@step.polymtl.ca -+ ***************************************************************************/ -+/**@file -+ * \brief Various simple functions for type conversion & al -+ */ -+/*************************************************************************** -+ * * -+ * This program is free software; you can redistribute it and/or modify * -+ * it under the terms of the GNU General Public License as published by * -+ * the Free Software Foundation; either version 2 of the License, or * -+ * (at your option) any later version. * -+ * * -+ ***************************************************************************/ -+#include -+#include -+#include -+ -+#include "ParserEventGeneratorKit.h" -+#include "SGMLApplication.h" -+#include -+#include -+#include -+#include "messages.hh" -+#include "ofx_utilities.hh" -+ -+#ifdef OS_WIN32 -+# define DIRSEP "\\" -+#else -+# define DIRSEP "/" -+#endif -+ -+ -+using namespace std; -+/** -+ Convert an OpenSP CharString directly to a C++ stream, to enable the use of cout directly for debugging. -+*/ -+/*ostream &operator<<(ostream &os, SGMLApplication::CharString s) -+ { -+ for (size_t i = 0; i < s.len; i++) -+ { -+ os << ((char *)(s.ptr))[i*sizeof(SGMLApplication::Char)]; -+ } -+ return os; -+ }*/ -+ -+/*wostream &operator<<(wostream &os, SGMLApplication::CharString s) -+ { -+ for (size_t i = 0; i < s.len; i++) -+ {//cout<
-+ * To solve this problem (since usually a time error is relatively unimportant, but date error is), and to avoid problems in Australia caused by the behaviour in libofx up to 0.6.4, it was decided starting with 0.6.5 to use the following behavior:

-+ * -No specific time is given in the file (date only): Considering that most banks seem to be sending dates in this format represented as local time (not compliant with the specs), the transaction is assumed to have occurred 11h59 (just before noon) LOCAL TIME. This way, we should never change the date, since you'd have to travel in a timezone at least 11 hours backwards or 13 hours forward from your own to introduce mistakes. However, if you are in timezone +13 or +14, and your bank meant the data to be interpreted by the spec, you will get the wrong date. We hope that banks in those timezone will either represent in local time like most, or specify the timezone properly.

-+ * -No timezone is specified, but exact time is, the same behavior is mostly used, as many banks just append zeros instead of using the short notation. However, the time specified is used, even if 0 (midnight).

-+ * -When a timezone is specified, it is always used to properly convert in local time, following the spec. -+ * -+ */ -+time_t ofxdate_to_time_t(const string ofxdate) -+{ -+ struct tm time; -+ double local_offset; /* in seconds */ -+ float ofx_gmt_offset; /* in fractionnal hours */ -+ char timezone[4]; /* Original timezone: the library does not expose this value*/ -+ char exact_time_specified = false; -+ char time_zone_specified = false; -+ -+ time_t temptime; -+ std::time(&temptime); -+ local_offset = difftime(mktime(localtime(&temptime)), mktime(gmtime(&temptime))); -+ -+ if(ofxdate.size()!=0){ -+ time.tm_year=atoi(ofxdate.substr(0,4).c_str())-1900; -+ time.tm_mon=atoi(ofxdate.substr(4,2).c_str())-1; -+ time.tm_mday=atoi(ofxdate.substr(6,2).c_str()); -+ if(ofxdate.size()>8) { -+ /* if exact time is specified */ -+exact_time_specified = true; -+ time.tm_hour=atoi(ofxdate.substr(8,2).c_str()); -+ time.tm_min=atoi(ofxdate.substr(10,2).c_str()); -+ time.tm_sec=atoi(ofxdate.substr(12,2).c_str()); -+ } -+ -+ /* Check if the timezone has been specified */ -+ string::size_type startidx = ofxdate.find("["); -+ string::size_type endidx; -+ if(startidx!=string::npos){ -+ /* Time zone was specified */ -+ time_zone_specified = true; -+ startidx++; -+ endidx = ofxdate.find(":", startidx)-1; -+ ofx_gmt_offset=atof(ofxdate.substr(startidx,(endidx-startidx)+1).c_str()); -+ startidx = endidx+2; -+ strncpy(timezone,ofxdate.substr(startidx,3).c_str(),4); -+ } -+ else{ -+ /* Time zone was not specified, assume GMT (provisionnaly) in case exact time is specified */ -+ ofx_gmt_offset=0; -+ strcpy(timezone, "GMT"); -+ } -+ -+ if(time_zone_specified == true) -+ { -+ /* If the timezone is specified always correct the timezone */ -+ /* If the timezone is not specified, but the exact time is, correct the timezone, assuming GMT following the spec */ -+ /* Correct the time for the timezone */ -+ time.tm_sec = time.tm_sec + (int)(local_offset - (ofx_gmt_offset*60*60));//Convert from fractionnal hours to seconds -+ } -+ else if (exact_time_specified == false) -+ { -+ /*Time zone data missing and exact time not specified, diverge from the OFX spec ans assume 11h59 local time */ -+ time.tm_hour=11; -+ time.tm_min=59; -+ time.tm_sec=0; -+ } -+ } -+ else{ -+ message_out(ERROR, "ofxdate_to_time_t(): Unable to convert time, string is 0 length!"); -+ } -+ return mktime(&time); -+} -+ -+/** -+ * Convert a C++ string containing an amount of money as specified by the OFX standard and convert it to a double float. -+ *\note The ofx number format is the following: "." or "," as decimal separator, NO thousands separator. -+ */ -+double ofxamount_to_double(const string ofxamount) -+{ -+ //Replace commas and decimal points for atof() -+ string::size_type idx; -+ string tmp = ofxamount; -+ -+ idx = tmp.find(','); -+ if(idx==string::npos){ -+ idx = tmp.find('.'); -+ } -+ -+ if(idx!=string::npos){ -+ tmp.replace(idx,1,1,((localeconv())->decimal_point)[0]); -+ } -+ -+ return atof(tmp.c_str()); -+} -+ -+/** -+Many weird caracters can be present inside a SGML element, as a result on the transfer protocol, or for any reason. This function greatly enhances the reliability of the library by zapping those gremlins (backspace,formfeed,newline,carriage return, horizontal and vertical tabs) as well as removing whitespace at the begining and end of the string. Otherwise, many problems will occur during stringmatching. -+*/ -+string strip_whitespace(const string para_string) -+{ -+ size_t index; -+ size_t i; -+ string temp_string = para_string; -+ const char *whitespace = " \b\f\n\r\t\v"; -+ const char *abnormal_whitespace = "\b\f\n\r\t\v";//backspace,formfeed,newline,cariage return, horizontal and vertical tabs -+ message_out(DEBUG4,"strip_whitespace() Before: |"+temp_string+"|"); -+ for(i=0;i<=temp_string.size()&&temp_string.find_first_of(whitespace, i)==i&&temp_string.find_first_of(whitespace, i)!=string::npos;i++); -+ temp_string.erase(0,i);//Strip leading whitespace -+ for(i=temp_string.size()-1;(i>=0)&&(temp_string.find_last_of(whitespace, i)==i)&&(temp_string.find_last_of(whitespace, i)!=string::npos);i--); -+ temp_string.erase(i+1,temp_string.size()-(i+1));//Strip trailing whitespace -+ -+while ((index = temp_string.find_first_of(abnormal_whitespace))!=string::npos) -+ { -+ temp_string.erase(index,1);//Strip leading whitespace -+ }; -+ -+ message_out(DEBUG4,"strip_whitespace() After: |"+temp_string+"|"); -+ -+ return temp_string; -+} -+ -+ -+int mkTempFileName(const char *tmpl, char *buffer, unsigned int size) { -+ const char *tmp_dir; -+ -+ tmp_dir = getenv ("TMPDIR"); -+ if (!tmp_dir) -+ tmp_dir = getenv ("TMP"); -+ if (!tmp_dir) -+ tmp_dir = getenv ("TEMP"); -+ -+ if (!tmp_dir) -+ { -+#ifdef OS_WIN32 -+ tmp_dir = "C:\\"; -+#else -+ tmp_dir = "/tmp"; -+#endif /* !OS_WIN32 */ -+ } -+ -+ strncpy(buffer, tmp_dir, size); -+ assert((strlen(buffer)+strlen(tmpl)+2) /* Include config constants, e.g., VERSION TF */ - #include - #include - #include -+#include - - #ifdef HAVE_LIBCURL - #include - #endif - -diff -NrU5 libofx-0.9.0.orig/ofxconnect/ofxpartner.cpp libofx-0.9.0/ofxconnect/ofxpartner.cpp ---- libofx-0.9.0.orig/ofxconnect/ofxpartner.cpp 2006-03-26 06:49:54.000000000 +0200 -+++ libofx-0.9.0/ofxconnect/ofxpartner.cpp 2008-04-21 22:28:26.000000000 +0200 -@@ -33,10 +33,13 @@ - #include - - #include - #include - #include -+#include -+#include -+ - - using std::string; - using std::vector; - using std::cout; - using std::endl; -diff -NrU5 libofx-0.9.0.orig/ofxdump/ofxdump.cpp libofx-0.9.0/ofxdump/ofxdump.cpp ---- libofx-0.9.0.orig/ofxdump/ofxdump.cpp 2006-08-02 06:19:22.000000000 +0200 -+++ libofx-0.9.0/ofxdump/ofxdump.cpp 2008-04-21 22:26:24.000000000 +0200 -@@ -27,10 +27,12 @@ - * (at your option) any later version. * - * * - ***************************************************************************/ - #include - #include -+#include -+#include - #include - #include "libofx.h" - #include /* for printf() */ - #include /* Include config constants, e.g., VERSION TF */ - #include From 6cb70eea88cfa7f15c17804e1891798316a0de78 Mon Sep 17 00:00:00 2001 From: Piotr Pietraszkiewicz Date: Tue, 6 Dec 2011 19:11:15 +0000 Subject: [PATCH 879/970] upgraded to kadu-0.10.1 svn path=/nixpkgs/trunk/; revision=30781 --- .../instant-messengers/kadu/default.nix | 8 +++--- .../kadu/disable_encryption_plugins.patch | 16 ----------- .../kadu/disable_some_plugins.patch | 28 +++++++++++++++++++ 3 files changed, 32 insertions(+), 20 deletions(-) delete mode 100644 pkgs/applications/networking/instant-messengers/kadu/disable_encryption_plugins.patch create mode 100644 pkgs/applications/networking/instant-messengers/kadu/disable_some_plugins.patch diff --git a/pkgs/applications/networking/instant-messengers/kadu/default.nix b/pkgs/applications/networking/instant-messengers/kadu/default.nix index cdad7eb1e7c..76b5dde0e87 100644 --- a/pkgs/applications/networking/instant-messengers/kadu/default.nix +++ b/pkgs/applications/networking/instant-messengers/kadu/default.nix @@ -3,11 +3,11 @@ stdenv.mkDerivation { - name = "kadu-0.10.0"; + name = "kadu-0.10.1"; src = fetchurl { - url = http://www.kadu.net/download/stable/kadu-0.10.0.tar.bz2; - sha256 = "039dx8y6vzqmv86prk1srmi7fvxlrbisyd6rcfs0gv497bfi1995"; + url = http://download.kadu.im/stable/kadu-0.10.1.tar.bz2; + sha256 = "0j88pyp2nqpc57j38zr135ypfiv4v329gfgiz9rdbqi8j26cyp7g"; }; buildInputs = [ cmake qt4 libgadu libXScrnSaver libsndfile libX11 alsaLib aspell libidn qca2 phonon @@ -22,7 +22,7 @@ stdenv.mkDerivation { ''; # because I was not able to get those working - patches = [ ./disable_encryption_plugins.patch ]; + patches = [ ./disable_some_plugins.patch ]; NIX_LDFLAGS="-lX11"; diff --git a/pkgs/applications/networking/instant-messengers/kadu/disable_encryption_plugins.patch b/pkgs/applications/networking/instant-messengers/kadu/disable_encryption_plugins.patch deleted file mode 100644 index e89095de55d..00000000000 --- a/pkgs/applications/networking/instant-messengers/kadu/disable_encryption_plugins.patch +++ /dev/null @@ -1,16 +0,0 @@ -diff --git a/Plugins.cmake b/Plugins.cmake -index c6906ce..b1284d6 100644 ---- a/Plugins.cmake -+++ b/Plugins.cmake -@@ -30,9 +30,9 @@ set (COMPILE_PLUGINS - - # encryption - # Encrypted chat support -- encryption_ng -+ # encryption_ng - # OpenSSL encrypted chat support -- encryption_ng_simlite -+ # encryption_ng_simlite - - # docking - # Tray icon support (common part of all docking modules) diff --git a/pkgs/applications/networking/instant-messengers/kadu/disable_some_plugins.patch b/pkgs/applications/networking/instant-messengers/kadu/disable_some_plugins.patch new file mode 100644 index 00000000000..0ee06c21382 --- /dev/null +++ b/pkgs/applications/networking/instant-messengers/kadu/disable_some_plugins.patch @@ -0,0 +1,28 @@ +diff --git a/Plugins.cmake b/Plugins.cmake +index ad63f20..c14a781 100644 +--- a/Plugins.cmake ++++ b/Plugins.cmake +@@ -30,9 +30,9 @@ set (COMPILE_PLUGINS + + # encryption + # Encrypted chat support +- encryption_ng ++ # encryption_ng + # OpenSSL encrypted chat support +- encryption_ng_simlite ++ # encryption_ng_simlite + + # docking + # Tray icon support (common part of all docking modules) +@@ -104,9 +104,9 @@ if (UNIX) + + # mediaplayer + # MPD mediaplayer support +- mpd_mediaplayer ++ # mpd_mediaplayer + # MPRIS Media Players support +- mprisplayer_mediaplayer ++ # mprisplayer_mediaplayer + ) + endif (UNIX) + From 6ffd03317489b2b9ef1719054f6f44466928caa5 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Tue, 6 Dec 2011 19:47:51 +0000 Subject: [PATCH 880/970] haskell-Hipmunk: updated to version 5.2.0.6 svn path=/nixpkgs/trunk/; revision=30782 --- pkgs/development/libraries/haskell/Hipmunk/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/Hipmunk/default.nix b/pkgs/development/libraries/haskell/Hipmunk/default.nix index 593831e2f29..6877e07524d 100644 --- a/pkgs/development/libraries/haskell/Hipmunk/default.nix +++ b/pkgs/development/libraries/haskell/Hipmunk/default.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "Hipmunk"; - version = "5.2.0.5"; - sha256 = "0zmc1bddpvjg11r5931hfx6va73jk1f3nb8nb1qfh86a4addp9id"; + version = "5.2.0.6"; + sha256 = "16yh7v6v05nksspcfz8h054piyhmrfbpaada36562rjxcywyfnfj"; buildDepends = [ StateVar transformers ]; noHaddock = true; meta = { From 088470ef55e8f61653da015d9e6eb2e12ce0c803 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Tue, 6 Dec 2011 20:44:31 +0000 Subject: [PATCH 881/970] pkgs/tools/networking/p2p/rtorrent/default.nix: avoid use of "install -D" to make FreeBSD happy svn path=/nixpkgs/trunk/; revision=30783 --- pkgs/tools/networking/p2p/rtorrent/default.nix | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/pkgs/tools/networking/p2p/rtorrent/default.nix b/pkgs/tools/networking/p2p/rtorrent/default.nix index 848f2284fd3..4056c6429b0 100644 --- a/pkgs/tools/networking/p2p/rtorrent/default.nix +++ b/pkgs/tools/networking/p2p/rtorrent/default.nix @@ -14,7 +14,10 @@ stdenv.mkDerivation { buildInputs = [ libtorrent ncurses pkgconfig libsigcxx curl zlib openssl ]; - postInstall = "install -D -m 444 doc/rtorrent.1 $out/share/man/man1/rtorrent.1"; + postInstall = '' + ensureDir $out/share/man/man1 + mv doc/rtorrent.1 $out/share/man/man1/rtorrent.1 + ''; meta = { homepage = "http://libtorrent.rakshasa.no/"; From acd728867855f3a624cc9cb43d29fa2f6ef41dbb Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Tue, 6 Dec 2011 21:16:20 +0000 Subject: [PATCH 882/970] * Proper version number. svn path=/nixpkgs/trunk/; revision=30784 --- .../version-management/git-and-tools/svn2git/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/applications/version-management/git-and-tools/svn2git/default.nix b/pkgs/applications/version-management/git-and-tools/svn2git/default.nix index cc3812c6dcb..6f5d36f6aa7 100644 --- a/pkgs/applications/version-management/git-and-tools/svn2git/default.nix +++ b/pkgs/applications/version-management/git-and-tools/svn2git/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchgit, ruby, makeWrapper, git }: stdenv.mkDerivation rec { - name = "svn2git-20111206"; + name = "svn2git-2.1.0-20111206"; src = fetchgit { url = https://github.com/nirvdrum/svn2git; From 4ad898b4d61186ee3bd4acf5a0bc179328864f5a Mon Sep 17 00:00:00 2001 From: Piotr Pietraszkiewicz Date: Tue, 6 Dec 2011 23:00:46 +0000 Subject: [PATCH 883/970] added dvb-apps svn path=/nixpkgs/trunk/; revision=30787 --- pkgs/top-level/all-packages.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 39e5418145c..52057e8a195 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -6463,6 +6463,8 @@ let inherit (xlibs) libX11; }; + dvb_apps = callPackage ../applications/video/dvb-apps { }; + dvdauthor = callPackage ../applications/video/dvdauthor { }; dwm = callPackage ../applications/window-managers/dwm { From 32163fa1fffeb65d6589afa89230f1b816603ed8 Mon Sep 17 00:00:00 2001 From: Piotr Pietraszkiewicz Date: Tue, 6 Dec 2011 23:01:22 +0000 Subject: [PATCH 884/970] added dvb-apps svn path=/nixpkgs/trunk/; revision=30788 --- pkgs/applications/video/dvb-apps/default.nix | 23 ++++++++++++++++++++ 1 file changed, 23 insertions(+) create mode 100644 pkgs/applications/video/dvb-apps/default.nix diff --git a/pkgs/applications/video/dvb-apps/default.nix b/pkgs/applications/video/dvb-apps/default.nix new file mode 100644 index 00000000000..74e3d58553a --- /dev/null +++ b/pkgs/applications/video/dvb-apps/default.nix @@ -0,0 +1,23 @@ +{ stdenv, fetchurl, perl }: + +stdenv.mkDerivation { + name = "dvb-apps-7f68f9c8d311"; + + src = fetchurl { + url = "http://linuxtv.org/hg/dvb-apps/archive/7f68f9c8d311.tar.gz"; + sha256 = "0a6c5jjq6ad98bj0r954l3n7zjb2syw9m19jksg06z4zg1z8yg82"; + }; + + buildInputs = [ perl ]; + + configurePhase = "true"; # skip configure + + installPhase = "make prefix=$out install"; + + meta = { + description = "Linux DVB API applications and utilities"; + homepage = http://linuxtv.org/; + platforms = stdenv.lib.platforms.linux; + license = "GPLv2"; + }; +} From 1bd85e4159a5f7e26e4f34ada04bbac7f201588a Mon Sep 17 00:00:00 2001 From: Piotr Pietraszkiewicz Date: Tue, 6 Dec 2011 23:09:19 +0000 Subject: [PATCH 885/970] added libdvbpsi and added it to the dependency list of vlc so that vlc can play DVB svn path=/nixpkgs/trunk/; revision=30789 --- pkgs/applications/video/vlc/default.nix | 4 ++-- .../libraries/libdvbpsi/default.nix | 19 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 3 files changed, 23 insertions(+), 2 deletions(-) create mode 100644 pkgs/development/libraries/libdvbpsi/default.nix diff --git a/pkgs/applications/video/vlc/default.nix b/pkgs/applications/video/vlc/default.nix index ce7b233fdd2..471a4c4a76f 100644 --- a/pkgs/applications/video/vlc/default.nix +++ b/pkgs/applications/video/vlc/default.nix @@ -5,7 +5,7 @@ , libcaca, pulseaudio, flac, schroedinger, libxml2, librsvg , mpeg2dec, udev, gnutls, avahi, libcddb, jackaudio, SDL, SDL_image , libmtp, unzip, taglib, libkate, libtiger, libv4l, samba, liboggz -, libass, libva +, libass, libva, libdvbpsi }: stdenv.mkDerivation rec { @@ -24,7 +24,7 @@ stdenv.mkDerivation rec { pkgconfig dbus hal fribidi qt4 libvorbis libtheora speex lua libgcrypt libupnp libcaca pulseaudio flac schroedinger libxml2 librsvg mpeg2dec udev gnutls avahi libcddb jackaudio SDL SDL_image libmtp unzip taglib - libkate libtiger libv4l samba liboggz libass + libkate libtiger libv4l samba liboggz libass libdvbpsi ] ++ (with xlibs; [ xlibs.xlibs libXv libXvMC libXpm xcbutil libva ]); diff --git a/pkgs/development/libraries/libdvbpsi/default.nix b/pkgs/development/libraries/libdvbpsi/default.nix new file mode 100644 index 00000000000..d3ce7082621 --- /dev/null +++ b/pkgs/development/libraries/libdvbpsi/default.nix @@ -0,0 +1,19 @@ +{stdenv, fetchurl}: + +stdenv.mkDerivation { + + name = "libdvbpsi-0.2.2"; + + src = fetchurl { + url = http://download.videolan.org/pub/libdvbpsi/0.2.2/libdvbpsi-0.2.2.tar.bz2; + sha256 = "1lry2swxqm8mhq0a4rjnc819ngsf2pxnfjajb57lml7yr12j79ls"; + }; + + meta = { + description = "A simple library designed for decoding and generation of MPEG TS and DVB PSI tables according to standards ISO/IEC 13818 and ITU-T H.222.0"; + homepage = http://www.videolan.org/developers/libdvbpsi.html ; + platforms = stdenv.lib.platforms.linux; + license = "LGPLv2.1"; + }; + +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 52057e8a195..d6ea5ba2af8 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -3859,6 +3859,8 @@ let libdv = callPackage ../development/libraries/libdv { }; + libdvbpsi = callPackage ../development/libraries/libdvbpsi { }; + libdwg = callPackage ../development/libraries/libdwg { }; libdvdcss = callPackage ../development/libraries/libdvdcss { }; From 13c9e2b2858348cd65cb05706122626d86bc3eea Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Wed, 7 Dec 2011 10:29:52 +0000 Subject: [PATCH 886/970] fcgi: added "fastcgi -> ." symlink in $out/include to fix compilation of packages that expect the fastcgi library headers in a sub-directory (which is the way they're installed on some platforms, i.e. CentOS). svn path=/nixpkgs/trunk/; revision=30790 --- pkgs/development/libraries/fcgi/default.nix | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/pkgs/development/libraries/fcgi/default.nix b/pkgs/development/libraries/fcgi/default.nix index 6bea14f3837..26ff5dd245e 100644 --- a/pkgs/development/libraries/fcgi/default.nix +++ b/pkgs/development/libraries/fcgi/default.nix @@ -10,7 +10,9 @@ stdenv.mkDerivation rec { patches = [ ./gcc-4.4.diff ]; - meta = { + postInstall = "ln -s . $out/include/fastcgi"; + + meta = { description = "FastCGI is a language independent, scalable, open extension to CG"; homepage = http://www.fastcgi.com/; license = "FastCGI see LICENSE.TERMS"; From 9d86314f49ac02dfad63aebcdcb42ea415834e76 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Wed, 7 Dec 2011 10:46:11 +0000 Subject: [PATCH 887/970] haskell-random: added version 1.0.1.1 svn path=/nixpkgs/trunk/; revision=30791 --- .../libraries/haskell/random/1.0.1.1.nix | 17 +++++++++++++++++ pkgs/top-level/haskell-packages.nix | 3 ++- 2 files changed, 19 insertions(+), 1 deletion(-) create mode 100644 pkgs/development/libraries/haskell/random/1.0.1.1.nix diff --git a/pkgs/development/libraries/haskell/random/1.0.1.1.nix b/pkgs/development/libraries/haskell/random/1.0.1.1.nix new file mode 100644 index 00000000000..a4feee31d02 --- /dev/null +++ b/pkgs/development/libraries/haskell/random/1.0.1.1.nix @@ -0,0 +1,17 @@ +{ cabal, time }: + +cabal.mkDerivation (self: { + pname = "random"; + version = "1.0.1.1"; + sha256 = "0n8m2744gg233s357vqzq3mfhhnbhynqvp4gxsi2gb70bm03nz6z"; + buildDepends = [ time ]; + meta = { + description = "random number library"; + license = self.stdenv.lib.licenses.bsd3; + platforms = self.ghc.meta.platforms; + maintainers = [ + self.stdenv.lib.maintainers.andres + self.stdenv.lib.maintainers.simons + ]; + }; +}) diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix index f6b8cd2b76b..d11e42c16f5 100644 --- a/pkgs/top-level/haskell-packages.nix +++ b/pkgs/top-level/haskell-packages.nix @@ -157,7 +157,7 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y); text = self.text_0_11_1_9; # 7.2 ok, 7.3 ok transformers = self.transformers_0_2_2_0; # 7.2 ok, 7.3 ok mtl = self.mtl_2_0_1_0; # 7.2 ok, 7.3 ok - random = self.random_1_0_0_3; # 7.2 ok, 7.3 ok + random = self.random_1_0_1_1; # 7.2 ok, 7.3 ok cabalInstall = self.cabalInstall_0_10_2; # 7.2 fails, 7.3 fails alex = self.alex_3_0_1; # 7.2 ok, 7.3 ok happy = self.happy_1_18_8; # 7.2 ok, 7.3 ok @@ -1013,6 +1013,7 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y); }; random_1_0_0_3 = callPackage ../development/libraries/haskell/random/1.0.0.3.nix {}; random_1_0_1_0 = callPackage ../development/libraries/haskell/random/1.0.1.0.nix {}; + random_1_0_1_1 = callPackage ../development/libraries/haskell/random/1.0.1.1.nix {}; random = null; # core package until ghc-7.2.1 random_newtime = self.random_1_0_0_2_newtime; From 1d73cbbd1dc4d9e6c6fb7c415160ada358f0b452 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Wed, 7 Dec 2011 10:46:14 +0000 Subject: [PATCH 888/970] haskell-happstack-hamlet: updated to version 6.2.2 svn path=/nixpkgs/trunk/; revision=30792 --- .../libraries/haskell/happstack/happstack-hamlet.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/happstack/happstack-hamlet.nix b/pkgs/development/libraries/haskell/happstack/happstack-hamlet.nix index edd9b19b067..2826d84fa90 100644 --- a/pkgs/development/libraries/haskell/happstack/happstack-hamlet.nix +++ b/pkgs/development/libraries/haskell/happstack/happstack-hamlet.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "happstack-hamlet"; - version = "6.2.1"; - sha256 = "1ypw3lcrbkfkk8k45642kmgj0wjwz7vi3szslii6dirycg99jwkv"; + version = "6.2.2"; + sha256 = "02kpfv7axrmgzyyqsfkdixcm7badh0sgy7am2kryvyb49zzk1vjr"; buildDepends = [ hamlet happstackServer text ]; meta = { homepage = "http://www.happstack.com/"; From 01725fcbea2f3f7d6735b716c2f6f48218f75a37 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Wed, 7 Dec 2011 10:46:16 +0000 Subject: [PATCH 889/970] haskell-utility-ht: updated to version 0.0.7.1 svn path=/nixpkgs/trunk/; revision=30793 --- pkgs/development/libraries/haskell/utility-ht/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/utility-ht/default.nix b/pkgs/development/libraries/haskell/utility-ht/default.nix index 6c67d98c3bb..6b79e4cdda8 100644 --- a/pkgs/development/libraries/haskell/utility-ht/default.nix +++ b/pkgs/development/libraries/haskell/utility-ht/default.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "utility-ht"; - version = "0.0.7"; - sha256 = "83ffd750088a0eef5485b5dfadd13158ab7883655a3773bcc8d22485ba8d3a20"; + version = "0.0.7.1"; + sha256 = "0k097kyv6rxjvg1drnphv2mg882xx2lk098hs557fcsr16w658ma"; meta = { description = "Various small helper functions for Lists, Maybes, Tuples, Functions"; license = self.stdenv.lib.licenses.bsd3; From 02d96f750a9603d5dfde17362da95a2db2445d5d Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Wed, 7 Dec 2011 10:46:19 +0000 Subject: [PATCH 890/970] haskell-yesod-core: updated to version 0.9.3.6 svn path=/nixpkgs/trunk/; revision=30794 --- pkgs/development/libraries/haskell/yesod-core/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/yesod-core/default.nix b/pkgs/development/libraries/haskell/yesod-core/default.nix index 8f07c964953..c894a5138e6 100644 --- a/pkgs/development/libraries/haskell/yesod-core/default.nix +++ b/pkgs/development/libraries/haskell/yesod-core/default.nix @@ -8,8 +8,8 @@ cabal.mkDerivation (self: { pname = "yesod-core"; - version = "0.9.3.5"; - sha256 = "0gnn0lm52qk0lmjh51kvwf645icfdrvy0ck5kg9dpznk5i3n2g13"; + version = "0.9.3.6"; + sha256 = "00h1ylrr5wrid9vn3jhspibprx0175j9rcwdb1hd7ya5gwmzlhjs"; buildDepends = [ aeson blazeBuilder blazeHtml caseInsensitive cereal clientsession cookie dataObject dataObjectYaml enumerator failure hamlet From f57996b658117cc487950ee1bc685a327f8d6418 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Wed, 7 Dec 2011 10:46:21 +0000 Subject: [PATCH 891/970] haskell-packages: removed unused 'random_1_0_0_2_newtime' attribute svn path=/nixpkgs/trunk/; revision=30795 --- pkgs/top-level/haskell-packages.nix | 4 ---- 1 file changed, 4 deletions(-) diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix index d11e42c16f5..daf67589565 100644 --- a/pkgs/top-level/haskell-packages.nix +++ b/pkgs/top-level/haskell-packages.nix @@ -1008,14 +1008,10 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y); RangedSets = callPackage ../development/libraries/haskell/Ranged-sets {}; - random_1_0_0_2_newtime = callPackage ../development/libraries/haskell/random/1.0.0.2.nix { - time = self.time_1_2_0_3; - }; random_1_0_0_3 = callPackage ../development/libraries/haskell/random/1.0.0.3.nix {}; random_1_0_1_0 = callPackage ../development/libraries/haskell/random/1.0.1.0.nix {}; random_1_0_1_1 = callPackage ../development/libraries/haskell/random/1.0.1.1.nix {}; random = null; # core package until ghc-7.2.1 - random_newtime = self.random_1_0_0_2_newtime; randomFu = callPackage ../development/libraries/haskell/random-fu {}; From 75b523bf601d6d15a9b6878ab5f1d46c25f3282c Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Wed, 7 Dec 2011 10:46:23 +0000 Subject: [PATCH 892/970] haskell-random: dropped unused versions 1.0.0.2, 1.0.0.3, and 1.0.1.0 I didn't rename the remaining '1.0.1.1.nix' file to 'default.nix', because random is probably going to require support for multiple versions once the new Haskell Platform comes out. svn path=/nixpkgs/trunk/; revision=30796 --- .../libraries/haskell/random/1.0.0.2.nix | 17 ----------------- .../libraries/haskell/random/1.0.0.3.nix | 17 ----------------- .../libraries/haskell/random/1.0.1.0.nix | 17 ----------------- pkgs/top-level/haskell-packages.nix | 2 -- 4 files changed, 53 deletions(-) delete mode 100644 pkgs/development/libraries/haskell/random/1.0.0.2.nix delete mode 100644 pkgs/development/libraries/haskell/random/1.0.0.3.nix delete mode 100644 pkgs/development/libraries/haskell/random/1.0.1.0.nix diff --git a/pkgs/development/libraries/haskell/random/1.0.0.2.nix b/pkgs/development/libraries/haskell/random/1.0.0.2.nix deleted file mode 100644 index e9101a11407..00000000000 --- a/pkgs/development/libraries/haskell/random/1.0.0.2.nix +++ /dev/null @@ -1,17 +0,0 @@ -{ cabal, time }: - -cabal.mkDerivation (self: { - pname = "random"; - version = "1.0.0.2"; - sha256 = "5433aebb4bbfb999f1d02410c8ca3769c63cd8b02109d2771a37c12918f92dd5"; - buildDepends = [ time ]; - meta = { - description = "random number library"; - license = self.stdenv.lib.licenses.bsd3; - platforms = self.ghc.meta.platforms; - maintainers = [ - self.stdenv.lib.maintainers.andres - self.stdenv.lib.maintainers.simons - ]; - }; -}) diff --git a/pkgs/development/libraries/haskell/random/1.0.0.3.nix b/pkgs/development/libraries/haskell/random/1.0.0.3.nix deleted file mode 100644 index f89cad32f9e..00000000000 --- a/pkgs/development/libraries/haskell/random/1.0.0.3.nix +++ /dev/null @@ -1,17 +0,0 @@ -{ cabal, time }: - -cabal.mkDerivation (self: { - pname = "random"; - version = "1.0.0.3"; - sha256 = "0k2735vrx0id2dxzk7lkm22w07p7gy86zffygk60jxgh9rvignf6"; - buildDepends = [ time ]; - meta = { - description = "random number library"; - license = self.stdenv.lib.licenses.bsd3; - platforms = self.ghc.meta.platforms; - maintainers = [ - self.stdenv.lib.maintainers.andres - self.stdenv.lib.maintainers.simons - ]; - }; -}) diff --git a/pkgs/development/libraries/haskell/random/1.0.1.0.nix b/pkgs/development/libraries/haskell/random/1.0.1.0.nix deleted file mode 100644 index 275a1a09736..00000000000 --- a/pkgs/development/libraries/haskell/random/1.0.1.0.nix +++ /dev/null @@ -1,17 +0,0 @@ -{ cabal, time }: - -cabal.mkDerivation (self: { - pname = "random"; - version = "1.0.1.0"; - sha256 = "1ghdmjzcn6n02x4gffa4g7wag4g7azrgxk3nsc5fqn9iny6rwp2i"; - buildDepends = [ time ]; - meta = { - description = "random number library"; - license = self.stdenv.lib.licenses.bsd3; - platforms = self.ghc.meta.platforms; - maintainers = [ - self.stdenv.lib.maintainers.andres - self.stdenv.lib.maintainers.simons - ]; - }; -}) diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix index daf67589565..dbc6b174415 100644 --- a/pkgs/top-level/haskell-packages.nix +++ b/pkgs/top-level/haskell-packages.nix @@ -1008,8 +1008,6 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y); RangedSets = callPackage ../development/libraries/haskell/Ranged-sets {}; - random_1_0_0_3 = callPackage ../development/libraries/haskell/random/1.0.0.3.nix {}; - random_1_0_1_0 = callPackage ../development/libraries/haskell/random/1.0.1.0.nix {}; random_1_0_1_1 = callPackage ../development/libraries/haskell/random/1.0.1.1.nix {}; random = null; # core package until ghc-7.2.1 From b4c5f72d9e96c71658f4838151988a58adf4536d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?= Date: Wed, 7 Dec 2011 15:26:34 +0000 Subject: [PATCH 893/970] Updating ts svn path=/nixpkgs/trunk/; revision=30797 --- pkgs/tools/system/ts/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/system/ts/default.nix b/pkgs/tools/system/ts/default.nix index ef3fa7ec706..abc04e96c32 100644 --- a/pkgs/tools/system/ts/default.nix +++ b/pkgs/tools/system/ts/default.nix @@ -2,7 +2,7 @@ stdenv.mkDerivation { - name = "ts-0.7.1"; + name = "ts-0.7.2"; installPhase=''make install "PREFIX=$out"''; @@ -11,8 +11,8 @@ stdenv.mkDerivation { }; src = fetchurl { - url = http://vicerveza.homeunix.net/~viric/soft/ts/ts-0.7.1.tar.gz; - sha256 = "0s1hrgw99jn6ar01lcvhdgqsw0jzfnbpdayp0pydr6ikx1zwz70v"; + url = http://vicerveza.homeunix.net/~viric/soft/ts/ts-0.7.2.tar.gz; + sha256 = "08f9ipg98d6ygzb4fzdm1z157llzh4akipmq14ycfd7l023vidik"; }; meta = { From 5088162de43b1a659a80ac99cc4354efd9a25c8a Mon Sep 17 00:00:00 2001 From: Karn Kallio Date: Thu, 8 Dec 2011 02:55:40 +0000 Subject: [PATCH 894/970] Add config option to sane for hotplugSupport. Default value of true prevents builds on non i686 due to assert. svn path=/nixpkgs/trunk/; revision=30798 --- pkgs/top-level/all-packages.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index d6ea5ba2af8..7218afc34e3 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -8492,6 +8492,7 @@ let saneBackends = callPackage ../misc/sane-backends { gt68xxFirmware = getConfig ["sane" "gt68xxFirmware"] null; + hotplugSupport = getConfig ["sane" "hotplugSupport"] true; }; saneBackendsSnapshot = callPackage ../misc/sane-backends/snapshot.nix { From 55688e9d57d10c8ab50ba7fb5ffa57c9b8932c85 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Thu, 8 Dec 2011 12:49:26 +0000 Subject: [PATCH 895/970] * KDE 4.7.4. svn path=/nixpkgs/trunk/; revision=30803 --- pkgs/desktops/kde-4.7/default.nix | 2 +- pkgs/desktops/kde-4.7/kde-package/4.7.3.nix | 273 ------------------ pkgs/desktops/kde-4.7/kde-package/4.7.4.nix | 273 ++++++++++++++++++ pkgs/desktops/kde-4.7/l10n/manifest-4.7.3.nix | 262 ----------------- pkgs/desktops/kde-4.7/l10n/manifest-4.7.4.nix | 267 +++++++++++++++++ 5 files changed, 541 insertions(+), 536 deletions(-) delete mode 100644 pkgs/desktops/kde-4.7/kde-package/4.7.3.nix create mode 100644 pkgs/desktops/kde-4.7/kde-package/4.7.4.nix delete mode 100644 pkgs/desktops/kde-4.7/l10n/manifest-4.7.3.nix create mode 100644 pkgs/desktops/kde-4.7/l10n/manifest-4.7.4.nix diff --git a/pkgs/desktops/kde-4.7/default.nix b/pkgs/desktops/kde-4.7/default.nix index f8c4e594419..3bdf825410c 100644 --- a/pkgs/desktops/kde-4.7/default.nix +++ b/pkgs/desktops/kde-4.7/default.nix @@ -1,7 +1,7 @@ { callPackage, callPackageOrig, stdenv, qt47 }: let - release = "4.7.3"; + release = "4.7.4"; # Need callPackageOrig to avoid infinite cycle kde = callPackageOrig ./kde-package { diff --git a/pkgs/desktops/kde-4.7/kde-package/4.7.3.nix b/pkgs/desktops/kde-4.7/kde-package/4.7.3.nix deleted file mode 100644 index b7bcedf922f..00000000000 --- a/pkgs/desktops/kde-4.7/kde-package/4.7.3.nix +++ /dev/null @@ -1,273 +0,0 @@ -{stable=true; -hashes=builtins.listToAttrs[ - {name="blinken";value="0axfl0078f9v5sly2n4xplsbjgqzh1qfxvdn3a2d6s96sh4f0cbp";} - {name="cantor";value="0gfp30r2bn6pb14nm0bd8flpki889n5pznp52a0zdrg2h0q88lbl";} - {name="gwenview";value="0wn95zz3b6241mzp0s56h5af8z6pfs8z85wbxg3xfjqhxjp59jj1";} - {name="kalgebra";value="1w3vakbwhjsqr74bvwk7a7ijwhn17mj60r525v8ll8068qq9i92r";} - {name="kalzium";value="1mdkblsppxi49i5smmakcihr6frhlfm53h26q08ylp8hw4iknhwb";} - {name="kamera";value="1izjhax6c3pmsf4qwmsxifjklf3995dki5k4mdpdy9wx95pwpal1";} - {name="kanagram";value="07vavddxpsmqbaw4y5kiag338szc7in90hvxvnycbjccdyd2ad58";} - {name="kate";value="15gw6rlmcd2dzk4n2qcwlx8j43crhb8cgsilg1bflib7q7gx6k8m";} - {name="kbruch";value="01x5ww02wmnsblkvw0pvrslh689135a83jhkzp7d6l0wfa838zx7";} - {name="kcolorchooser";value="08hb0ix4ls2x9nknlvy495b5n9a6n64v4pr9h19s9kiqxz1xwhvh";} - {name="kdeaccessibility";value="1lb0kz6w736bbqa98ybbdq89452jyw2y9lg0f9lm01kv437my8nl";} - {name="kdeadmin";value="0abhci304gcscz77zax6qxwpw5qv3gvks201vnfdivd82zxjvcq0";} - {name="kdeartwork";value="187l6bck7ywz6xsvjiighzi673p4hci446sa4g7j1kkpr334f25y";} - {name="kde-baseapps";value="1py8a6zkvzwp8lb6g9387ji1xp6aim8zlpbkl70mb8p9m5fhryz9";} - {name="kdegames";value="140a46zrnrx9c1ic2nzygxq79r8q0mhja73kpjqxyyhlci97rw9b";} - {name="kdegraphics-strigi-analyzer";value="1lyrz6wq7f0gvza84c0w5cb7djvylgdi04xcp7ggl5g9ggic68ja";} - {name="kdegraphics-thumbnailers";value="11zjbyz9h9i9kf26hnjf05lnf99viwffaw86mg6rdk59kx3k8xyh";} - {name="kdelibs";value="0rhfbfms93ipb02bjyl2dq812n14cjyv08qipkl9is9la4lnbvq0";} - {name="kdemultimedia";value="1c9hijfdl9209v1vs883gs8il1c73l36bcdwvrk48b5q30i375md";} - {name="kdenetwork";value="197gah1r98qwwvcsb0bavpryip8imf8cawvlcs08zqwqg7x7npjs";} - {name="kdepim";value="19m014yw76j7h9y9is0y0dp6pc2d85fi4yyv7v4fhfwsxdj8nvg8";} - {name="kdepimlibs";value="11svjasczgram1qr8gavp1szc4kq0172qkfm1lgb3fh4sjlc1ghi";} - {name="kdepim-runtime";value="1ygwag9mwqdd9nx7v24h2kbvjjsdb64xj74nc9szkakw9qlhbmac";} - {name="kdeplasma-addons";value="00cnphq5phh416gij23dfwdwbxmplb6rjpa1xvqkwaf53nscvl61";} - {name="kde-runtime";value="0mh3v27qg5a5l52f816va1vnk66ix01bwanql8csnx287cn123r8";} - {name="kdesdk";value="0zic4a9x07dzx2abm6m7a6z2xxrsgpljhs2icx0prh7jk657yg2h";} - {name="kdetoys";value="0cbcvn28dvg6zyzv96myr5rmqk45limi6nm116gcgdlimswh7zzd";} - {name="kdeutils";value="0f98967fmn4661nxxw3kqkj1jq7qhmac51s4da08v4cy5grh5j58";} - {name="kde-wallpapers";value="0lwaswhhw8zbhi940j5185ldq4416278zknbfsz0brj7c86iyc00";} - {name="kdewebdev";value="0dzfy9qqwlmrqj4lf7h5dv86n73r5kclharvfbqws03w4bkwbx90";} - {name="kde-workspace";value="0pmcfxkcis2x3yfra885f837kbg33c01c4bakcgmprcdyxgzq0vl";} - {name="kgamma";value="0kz9lxbxfqrq6j52p5n6c745q06606mhnn7fb6zb8m7y2g22yxay";} - {name="kgeography";value="0z7d802ggzrvjkviq72k9cg7mz3l0px5mvc66x60pq3czpik0z6f";} - {name="khangman";value="0sqbxv8nbi10fvf58xj7b3sd1x49azym99688brdz5ncx2mzffmy";} - {name="kig";value="1m7yfv30sn6m83fh9p78mhldsz8bi8sp7qcdjwr7rklzma2512i1";} - {name="kimono";value="0hmxq4rr1jyzyqjz38viwda3cd2vljclc47rml8r64px1rxgk5zj";} - {name="kiten";value="10dyr8fws4hilsmvf2xmjpm4khj30vnaqqh3wwwag9i06k3m25yh";} - {name="klettres";value="1icw3pkilm6md1xm97pwwnrznmngw0d1cglqvcpbn7kz1zxdhy6b";} - {name="kmplot";value="1dn7gqplsb5mhq6wmw09f97lvb5jpzvmfwbg6f5v9gjjjkkywhx8";} - {name="kolourpaint";value="1dhwdc9nw59i963achb58qv8sq62l73vmrcccym8pgdb4da91jms";} - {name="konsole";value="002g38lrcfzz9px9wr41xa8n8ih7par23ymrc6nn0jm3wf6873g1";} - {name="korundum";value="1mzznvc807cjdw8gvxks46pd1yg1s5v8dg691rigicvw2fafp83r";} - {name="kross-interpreters";value="084294l474b0d4zzd4s3yca5qspsbh0bqrlqxwrmqy729x6q0i5d";} - {name="kruler";value="00z2lf89bdl7av4lnn68wy49z7lfkfhrhp90hhy977i4cbrkwcpw";} - {name="ksaneplugin";value="1n2idrkrwlml3p9rlhm652783ymyc7dw628zdzq9j37d24vr7bxn";} - {name="ksnapshot";value="1mywpqscxbbi1r8hi4fjph1cxmc7pmq29yqslh7w8wkbrdafws17";} - {name="kstars";value="0g12n61xc49q7fakjcbz2qxyh28sfxwq7kpp1ffd735dxp37sgj3";} - {name="ktouch";value="0b6aiqd56jpl4j3jmx4ba5p50f2l4pjdlb7mzf3pw6wnihavsd11";} - {name="kturtle";value="1a1dvmk7zpqw9i9bn5sc849b64r7lddl3jv82rc66wqjrgi1yz57";} - {name="kwordquiz";value="026mghh8gwdf8gc42djwfc30fr14mqf2fvbb5yjjivk3sz2rsjcb";} - {name="libkdcraw";value="10hiyf8vx9nxplwgg3fgid2pjp6zbjcyrcvm1662g6mbn20aqh8c";} - {name="libkdeedu";value="1ri4pylhp34bhnm969p3wqivbp4j3jg05pacpvxp2s4x35rx8ly6";} - {name="libkexiv2";value="151wdkl743793i7zzgkicahg3ljdi4waa7vgiz6301pw0arvrxav";} - {name="libkipi";value="11877xay0l483yjisb7w4d00ivmsicrafd018xy8xiz0z221rmrx";} - {name="libksane";value="0fhriykamynjw8l8l9802nswa943zjjvc8s3n7w1wh7l90q6c5im";} - {name="marble";value="0mx5916jz2n1cdyg7krcfxk43qy5xzjiyic4x1jn4kh9qhidlfcx";} - {name="mobipocket";value="0f4b4kpagcczrkbrw2jyj5j9g06dpmiiv68g8g0g1biipdng6pfh";} - {name="okular";value="1wbnliw18ma5sz8rv88nwj6hfvgbk415ph439ggqx8lv9sq65xsc";} - {name="oxygen-icons";value="08kavrbln13aak5ahdkh6sr4l8xxdfr2hsckh8y0yz5nd90wa9qb";} - {name="parley";value="0kzhz83z16x58r1vckiwsdsyr2rndzd9d3nksyclz76bri7i2fda";} - {name="perlkde";value="1yfxlbn5abg66vwb622lr91rachhfpl91lb019afhnyglvzb6283";} - {name="perlqt";value="1xgfrxsabm68ldn3z6s2ffsl5r6iwvic8rvnrsjsqb41nlsfpisr";} - {name="pykde4";value="1jjscs3cjhnpzx3v294njyfj189wkmvq8zn201a3aqakchnl7065";} - {name="qtruby";value="097fiag2hx99xdn0i99359p00gq0qrjv6bfbhd56iqc0c6lng97j";} - {name="qyoto";value="1fi6ghn11ymhvf0fi8di8w19hyj0a7l890v6x72k6p5xbffcbgy4";} - {name="rocs";value="0b3wwm0wqgr9pnh10iy5whp33y0kp7wgwmvlyavvvplqdhigfghv";} - {name="smokegen";value="0ls8d8xjvb4414im8y8f2k6nx2xwy0mx1fkx7k8dh4xrcdvljqi5";} - {name="smokekde";value="0l2px9drgg4f0rhdsbvbin225plp5l16kr77x5nyii8anra0sjws";} - {name="smokeqt";value="15xrr3smxx5ay0axymbdrl3wjx5x7xnl5760cf04kqyi8rngggib";} - {name="step";value="1nws0phiyqg5kw4zrirjfkcw9aqsranw2b2925dfklan4c0am0il";} - {name="svgpart";value="1wy9w4h3s3ymvf5dvnm4qnpvr9wkwdkrr79j1fbqvpgmzlgia413";} -]; -modules=[ -{ - module="kdegraphics"; - split=true; - pkgs=[ - { name="gwenview"; } - { name="kamera"; } - { name="kcolorchooser"; } - { name="kdegraphics-strigi-analyzer"; sane="kdegraphics_strigi_analyzer"; } - { name="kdegraphics-thumbnailers"; sane="kdegraphics_thumbnailers"; } - { name="kgamma"; } - { name="kolourpaint"; } - { name="kruler"; } - { name="ksaneplugin"; } - { name="ksnapshot"; } - { name="libkdcraw"; } - { name="libkexiv2"; } - { name="libkipi"; } - { name="libksane"; } - { name="mobipocket"; } - { name="okular"; } - { name="svgpart"; } - ]; -} -{ - module="kdeedu"; - split=true; - pkgs=[ - { name="blinken"; } - { name="cantor"; } - { name="kalgebra"; } - { name="kalzium"; } - { name="kanagram"; } - { name="kbruch"; } - { name="kgeography"; } - { name="khangman"; } - { name="kig"; } - { name="kiten"; } - { name="klettres"; } - { name="kmplot"; } - { name="kstars"; } - { name="ktouch"; } - { name="kturtle"; } - { name="kwordquiz"; } - { name="libkdeedu"; } - { name="marble"; } - { name="parley"; } - { name="rocs"; } - { name="step"; } - ]; -} -{ - module="kdebindings"; - split=true; - pkgs=[ - { name="kimono"; } - { name="korundum"; } - { name="kross-interpreters"; sane="kross_interpreters"; } - { name="perlkde"; } - { name="perlqt"; } - { name="pykde4"; } - { name="qtruby"; } - { name="qyoto"; } - { name="smokegen"; } - { name="smokekde"; } - { name="smokeqt"; } - ]; -} -{ - module="kde-baseapps"; -sane="kde_baseapps"; split=true; - pkgs=[ - { name="kate"; } - { name="kde-baseapps"; sane="kde_baseapps"; } - { name="konsole"; } - ]; -} -{ module="kdeaccessibility"; split=false; - pkgs=[ - { name="kaccessible"; } - { name="kmag"; } - { name="kmouth"; } - { name="kmousetool"; } - { name="jovie"; } - ]; - -} -{ module="kdeadmin"; split=false; - pkgs=[ - { name="strigi-analyzer"; sane="strigi_analyzer";} - { name="kuser"; } - { name="kcron"; } - { name="ksystemlog"; } - { name="system-config-printer-kde"; sane="system_config_printer_kde";} - ]; - -} -{ module="kdeartwork"; split=false; - pkgs=[ - { name="ColorSchemes"; } - { name="IconThemes"; } - { name="emoticons"; } - { name="kscreensaver"; } - { name="kwin-styles"; sane="kwin_styles";} - { name="sounds"; } - { name="styles"; } - { name="wallpapers"; } - { name="HighResolutionWallpapers"; } - { name="WeatherWallpapers"; } - { name="desktopthemes"; } - { name="aurorae"; } - ]; - -} -{ module="kdegames"; split=false;} -{ module="kdelibs"; split=false;} -{ module="kdemultimedia"; split=false;} -{ module="kdenetwork"; split=false; - pkgs=[ - { name="kfile-plugins"; sane="kfile_plugins";} - { name="kget"; } - { name="kopete"; } - { name="krdc"; } - { name="kppp"; } - { name="krfb"; } - { name="kdnssd"; } - { name="filesharing"; } - ]; - -} -{ module="kdepim"; split=false;} -{ module="kdepimlibs"; split=false;} -{ module="kdepim-runtime"; sane="kdepim_runtime"; split=false;} -{ module="kdeplasma-addons"; sane="kdeplasma_addons"; split=false;} -{ module="kde-runtime"; sane="kde_runtime"; split=false;} -{ module="kdesdk"; split=false; - pkgs=[ - { name="cervisia"; } - { name="lokalize"; } - { name="kdeaccounts-plugin"; sane="kdeaccounts_plugin";} - { name="dolphin-plugins-svn"; sane="dolphin_plugins_svn";subdir="dolphin-plugins/svn"; } - { name="dolphin-plugins-git"; sane="dolphin_plugins_git";subdir="dolphin-plugins/git"; } - { name="kcachegrind"; } - { name="kapptemplate"; } - { name="kpartloader"; } - { name="strigi-analyzer"; sane="strigi_analyzer";} - { name="kioslave"; } - { name="okteta"; } - { name="kmtrace"; } - { name="kompare"; } - { name="kprofilemethod"; } - { name="kstartperf"; } - { name="kuiviewer"; } - { name="poxml"; } - { name="scripts"; } - { name="umbrello"; } - ]; - -} -{ module="kdetoys"; split=false; - pkgs=[ - { name="kteatime"; } - { name="ktux"; } - { name="amor"; } - ]; - -} -{ module="kdeutils"; split=false; - pkgs=[ - { name="ark"; } - { name="kcalc"; } - { name="kremotecontrol"; } - { name="kdf"; } - { name="kfloppy"; } - { name="printer-applet"; sane="printer_applet";} - { name="filelight"; } - { name="kcharselect"; } - { name="kgpg"; } - { name="ktimer"; } - { name="kwallet"; } - { name="sweeper"; } - { name="superkaramba"; } - ]; - -} -{ module="kde-wallpapers"; sane="kde_wallpapers"; split=false;} -{ module="kdewebdev"; split=false; - pkgs=[ - { name="klinkstatus"; } - { name="kfilereplace"; } - { name="kimagemapeditor"; } - { name="kommander"; } - ]; - -} -{ module="kde-workspace"; sane="kde_workspace"; split=false;} -{ module="oxygen-icons"; sane="oxygen_icons"; split=false;} -]; -} diff --git a/pkgs/desktops/kde-4.7/kde-package/4.7.4.nix b/pkgs/desktops/kde-4.7/kde-package/4.7.4.nix new file mode 100644 index 00000000000..9a816b72cc6 --- /dev/null +++ b/pkgs/desktops/kde-4.7/kde-package/4.7.4.nix @@ -0,0 +1,273 @@ +{stable=true; +hashes=builtins.listToAttrs[ + {name="blinken";value="16daqg0bbkci305qrcrvpv66cvshjfni5rf5gakblcn8qqlmwsi6";} + {name="cantor";value="0wgm0j9bl632bk94fi0hzp5s392xpyz0d524ahhi8q33bqkl06ra";} + {name="gwenview";value="1dhpb7q0myr9rl4bjsajq0kslvhxcddv1ddplqad63j619wk8gfj";} + {name="kalgebra";value="04g07syrk14kpr15f9kgfkkmkjgdvcwmrykmy56jwm8sfb6ncli9";} + {name="kalzium";value="0k25cinwp6yjp8q9irmwcb1ahf98ck3mw706jfpybpa7ds8ym5z1";} + {name="kamera";value="0airyhxzpnvpzag4w0q1h0pc1lwwplglki5max1mj5miaxg93r34";} + {name="kanagram";value="0271aq39dbs92rhc83m19pmm7rx5c573k27931sf3j3pw3x2q0nm";} + {name="kate";value="0pfddi7g99apqipnqv62i86ld11vl4igqv65xprqqf0a5a1413my";} + {name="kbruch";value="1dhhk55d3bs474l2w0xma89pq74gklq5faskrvd1lvvl853z3zib";} + {name="kcolorchooser";value="1gb861f1fy0fvmkg30l1gza998gyhjwj4gcyyv266wp5v7d01xda";} + {name="kdeaccessibility";value="12mvs1hy5ygnbbz14hg2fvs7mpvlamkfbz7g7kcvzp0fkjb524h3";} + {name="kdeadmin";value="16y73zpdgh72cf8yz8zn246i4d8nh4k6mbz9cbc4ggjblgjcn3pr";} + {name="kdeartwork";value="0vfz9mzpm8yy6fysmhcavd8l1fjcld36p0x9qymi4l072b7dkgyv";} + {name="kde-baseapps";value="075m3nn407di2mx8w5lv7va3ij0yd7yb575wmf05vfqr01xyhn8a";} + {name="kdegames";value="0c42wyk2mq3hz99zg4f9i2dbc9vyaa5l2301j0859pwvnp9zgafz";} + {name="kdegraphics-strigi-analyzer";value="1j7chf76mlwrq7z1dgm525f5srx1h30czm8dnw2f0yxfn18lvnl9";} + {name="kdegraphics-thumbnailers";value="1ny51jc8fm4gldrlmrfmslpfpn5pahlyws3jzaj6nkd3hdw3krnr";} + {name="kdelibs";value="0fdgl8qvpyb9pmb26b3yjfm9ib75mxayw75qm5kyzncmrvn427gy";} + {name="kdemultimedia";value="0a0vp1pq159lzgd0x817p9mf6al99w1dwnlyhs9zfpspgz8nw8y1";} + {name="kdenetwork";value="0zwqbyl5vw5nnzlilc4khlisjj1xjpziw9ahgvw8cbszscmv68b5";} + {name="kdepim";value="0s38qxks58dmwyi3fnvprpq5q9kr17v31n808j33d50rw62y398p";} + {name="kdepimlibs";value="0rpfkc0pxvfkaz8pb3yx21dm3ixw8gfrcdny1aqzbn3f7f8abhip";} + {name="kdepim-runtime";value="14p5bxrhqjnmz303hxlrdj4vxlmiv8j04qni33ljbgib0hnllva3";} + {name="kdeplasma-addons";value="068m2jpyprrscyk3f4nk9qix5smka5pq59sdwdan9996sh256py5";} + {name="kde-runtime";value="06nxv46s7ff5n3kmzq3mdc16b0ck0411lj0gf3scdyd85iqx06wd";} + {name="kdesdk";value="0v3gwml9rvqz96q8jk8myqvl6gjw3q37js2jn24yawli3sjjw552";} + {name="kdetoys";value="17fk1bmabgj9nz0m4j248f48m2xfscql43wmzkqnr7y6zghqfhfh";} + {name="kdeutils";value="0s1whgg59xnc6ny609s3vjzvpxak02f2y6v7zw72i808k03aal5v";} + {name="kde-wallpapers";value="133amrhhca4xi0gbmajcc6rw1c1ai5x29265fqp45588kyycbgvz";} + {name="kdewebdev";value="1nqp2j09nr3jhmfvjydwp86jz4nn5pxwcfi6ww9krfd1hyg4aqjc";} + {name="kde-workspace";value="1dj39nndpws9grinz287ypn5lj3zjh96gl4zhl7kp6z8f9mdqp0p";} + {name="kgamma";value="05vk5b40w0i75nx5lqn9qax10m604jkjxyxynm0i0b8gyksv78h9";} + {name="kgeography";value="1a49zqz8zb9kn7m4m5fsm5ibvn9m5pzq89isrd1yy9q7zlv3qfqc";} + {name="khangman";value="1bmzrc5jzbw9q9gxw9pzad37zj4h89rh3k4smycif6ky2jy72x6d";} + {name="kig";value="1s0mwnj2riam811l0nfk08ja43f0nibqaqchy2ff7627w22yr5m0";} + {name="kimono";value="1cbbchdj4x5sn6ldkmzrx5alhvgzgbprvyjpg1rcsfnyc6whp2p9";} + {name="kiten";value="13bcw1r39h0g75vwbyrsh8sb27vmqsbrmx2ay621ily4iy3jn5az";} + {name="klettres";value="1wczh41wq3w5ccy2yi4pqr3zk4v0wiy4slcn54a8bfi1b5s1267j";} + {name="kmplot";value="0dx5gnya008q7smf74fvygwfsa0hc2ajiznvdmf4qmm3s5bxpbrr";} + {name="kolourpaint";value="14zrh321av5f5i8a4bjj7xb1sqfcphzhc5qyg2w54cywaiswy8nx";} + {name="konsole";value="1wq2k8g6in86x72jzhz4ar8ba5lyjp0pia969wxa6b1vsj148ipy";} + {name="korundum";value="024daf05c9l83whcy0cfgxb3s24ci038kg1pnxlzz4z9sk39432r";} + {name="kross-interpreters";value="1kkg4w3id2g7nr89kjdgyy9hik75dnxlm6jmn3g8ilqdvw5ip1qx";} + {name="kruler";value="0wd805w2k1ask9l44z50jcd033zkbaxs3xd3w21qrwdvs52x8m41";} + {name="ksaneplugin";value="1rxpl6f5b0ld5ap6aag892rjd7r74szbzd6lqw8q8gzm6jmk34gq";} + {name="ksnapshot";value="0dn99b6qr4b4hc3c88m26axmb3jim836ig3mfgqpban9r7k15xci";} + {name="kstars";value="0zrw4rlfm5cwfbj884zn50sdp90zjg7inl9k2zj450dpvh7i6q3q";} + {name="ktouch";value="0vbzr69jbci058bcphf9i3fh40hwgrmcyj1n4gj90gwr4x2ha5hp";} + {name="kturtle";value="0mhg2b1jbywafnj93274yimvnaxivycqj98pvld3hppaq32f7vzp";} + {name="kwordquiz";value="0kfa83a91w8z39r55456i1vn85pb4dqrbav40sx5fhjb03iyrsdk";} + {name="libkdcraw";value="14y8ni9w441zx1k2fhcbnzpa1vcmpvk58mjdqrqvn8n630cy0hzn";} + {name="libkdeedu";value="1ga88g5s8mq1m8xwmhl09ylrnl8sw639cpah6wi8wwnqslj2zj0a";} + {name="libkexiv2";value="0w8mpjsiw2sr8ya7ffnvnprbsbi8ngpxrcxylgw617zcxpxky6ha";} + {name="libkipi";value="01fivyyg5jhnkn9r7bh96ygxvnh7a99h11wh228wk8nzx3i63lsc";} + {name="libksane";value="0bb26ajfmknxf4hdy513zx1q9j0hzrs0dr98vxmrwfxxbza67fbm";} + {name="marble";value="02yljp6lmqs753zkqpaz58zlrjjxydx9pizppzwjvjx8xk63b9z6";} + {name="mobipocket";value="0m08j4cdj2sr1xw3hi0zy651c2ap0q8y9s913r6ccm0f292n0856";} + {name="okular";value="03x1fgdnz0s17wj3pkdp77rqrbbb6ssgq0ly493pbi1x4lx768ib";} + {name="oxygen-icons";value="0ayx0y2swdcgz4wd1idkhm3gbixkn4mw89f1hrhrdvc6j7wdn2dj";} + {name="parley";value="0wgps4adiwaq3l471ig9j56vm7p2xf37779nlhfzavby622lyv8q";} + {name="perlkde";value="1psa8ca2ynmavhmbh5p8bgxiljiqj6figi3cmvkaa7ksnmg2p9a3";} + {name="perlqt";value="1v12vx46kmg9cgld7krphcqp97y0py1bc3s2gd6jbz5j48g1wznb";} + {name="pykde4";value="07c7rzi0rzafrh92m57ldz3v66v8996zqpgcqn351jfycwccg7pz";} + {name="qtruby";value="05j08dfqbqnj92k9n70x8yiiaxyk6p9sk3lwm8w8nhsxdciq8yny";} + {name="qyoto";value="1maq0c6qb618jiqrdfp4imq3x7x5rdgf80wbrsf8wmaz3iwg18jz";} + {name="rocs";value="0qqzfxas64jz95v8i0birbcp0azk01jx5ic6pny7szngwrms6k34";} + {name="smokegen";value="0rdaxss113l80gmzp71ngp1l07nn2ip5nhk0a3mmjkvd08i507i8";} + {name="smokekde";value="0cxd5y1i672wc295m2czvp5jry1lmvv88dkipd97368gxsqzd3q8";} + {name="smokeqt";value="0ll1q87y1sdmna4iac61cm6sn7imsfvcfq573cj7f5raqn08gbpf";} + {name="step";value="000a0hc45znshwrjsydrf05f5rwn7lmaiqbk65py827fgk67qkyb";} + {name="svgpart";value="056h2ynbl6ylfpf5a2l0qjasnicwx2yzizgd21pprzl9n7708zcw";} +]; +modules=[ +{ + module="kdegraphics"; + split=true; + pkgs=[ + { name="gwenview"; } + { name="kamera"; } + { name="kcolorchooser"; } + { name="kdegraphics-strigi-analyzer"; sane="kdegraphics_strigi_analyzer"; } + { name="kdegraphics-thumbnailers"; sane="kdegraphics_thumbnailers"; } + { name="kgamma"; } + { name="kolourpaint"; } + { name="kruler"; } + { name="ksaneplugin"; } + { name="ksnapshot"; } + { name="libkdcraw"; } + { name="libkexiv2"; } + { name="libkipi"; } + { name="libksane"; } + { name="mobipocket"; } + { name="okular"; } + { name="svgpart"; } + ]; +} +{ + module="kdeedu"; + split=true; + pkgs=[ + { name="blinken"; } + { name="cantor"; } + { name="kalgebra"; } + { name="kalzium"; } + { name="kanagram"; } + { name="kbruch"; } + { name="kgeography"; } + { name="khangman"; } + { name="kig"; } + { name="kiten"; } + { name="klettres"; } + { name="kmplot"; } + { name="kstars"; } + { name="ktouch"; } + { name="kturtle"; } + { name="kwordquiz"; } + { name="libkdeedu"; } + { name="marble"; } + { name="parley"; } + { name="rocs"; } + { name="step"; } + ]; +} +{ + module="kdebindings"; + split=true; + pkgs=[ + { name="kimono"; } + { name="korundum"; } + { name="kross-interpreters"; sane="kross_interpreters"; } + { name="perlkde"; } + { name="perlqt"; } + { name="pykde4"; } + { name="qtruby"; } + { name="qyoto"; } + { name="smokegen"; } + { name="smokekde"; } + { name="smokeqt"; } + ]; +} +{ + module="kde-baseapps"; +sane="kde_baseapps"; split=true; + pkgs=[ + { name="kate"; } + { name="kde-baseapps"; sane="kde_baseapps"; } + { name="konsole"; } + ]; +} +{ module="kdeaccessibility"; split=false; + pkgs=[ + { name="kaccessible"; } + { name="kmag"; } + { name="kmouth"; } + { name="kmousetool"; } + { name="jovie"; } + ]; + +} +{ module="kdeadmin"; split=false; + pkgs=[ + { name="strigi-analyzer"; sane="strigi_analyzer";} + { name="kuser"; } + { name="kcron"; } + { name="ksystemlog"; } + { name="system-config-printer-kde"; sane="system_config_printer_kde";} + ]; + +} +{ module="kdeartwork"; split=false; + pkgs=[ + { name="ColorSchemes"; } + { name="IconThemes"; } + { name="emoticons"; } + { name="kscreensaver"; } + { name="kwin-styles"; sane="kwin_styles";} + { name="sounds"; } + { name="styles"; } + { name="wallpapers"; } + { name="HighResolutionWallpapers"; } + { name="WeatherWallpapers"; } + { name="desktopthemes"; } + { name="aurorae"; } + ]; + +} +{ module="kdegames"; split=false;} +{ module="kdelibs"; split=false;} +{ module="kdemultimedia"; split=false;} +{ module="kdenetwork"; split=false; + pkgs=[ + { name="kfile-plugins"; sane="kfile_plugins";} + { name="kget"; } + { name="kopete"; } + { name="krdc"; } + { name="kppp"; } + { name="krfb"; } + { name="kdnssd"; } + { name="filesharing"; } + ]; + +} +{ module="kdepim"; split=false;} +{ module="kdepimlibs"; split=false;} +{ module="kdepim-runtime"; sane="kdepim_runtime"; split=false;} +{ module="kdeplasma-addons"; sane="kdeplasma_addons"; split=false;} +{ module="kde-runtime"; sane="kde_runtime"; split=false;} +{ module="kdesdk"; split=false; + pkgs=[ + { name="cervisia"; } + { name="lokalize"; } + { name="kdeaccounts-plugin"; sane="kdeaccounts_plugin";} + { name="dolphin-plugins-svn"; sane="dolphin_plugins_svn";subdir="dolphin-plugins/svn"; } + { name="dolphin-plugins-git"; sane="dolphin_plugins_git";subdir="dolphin-plugins/git"; } + { name="kcachegrind"; } + { name="kapptemplate"; } + { name="kpartloader"; } + { name="strigi-analyzer"; sane="strigi_analyzer";} + { name="kioslave"; } + { name="okteta"; } + { name="kmtrace"; } + { name="kompare"; } + { name="kprofilemethod"; } + { name="kstartperf"; } + { name="kuiviewer"; } + { name="poxml"; } + { name="scripts"; } + { name="umbrello"; } + ]; + +} +{ module="kdetoys"; split=false; + pkgs=[ + { name="kteatime"; } + { name="ktux"; } + { name="amor"; } + ]; + +} +{ module="kdeutils"; split=false; + pkgs=[ + { name="ark"; } + { name="kcalc"; } + { name="kremotecontrol"; } + { name="kdf"; } + { name="kfloppy"; } + { name="printer-applet"; sane="printer_applet";} + { name="filelight"; } + { name="kcharselect"; } + { name="kgpg"; } + { name="ktimer"; } + { name="kwallet"; } + { name="sweeper"; } + { name="superkaramba"; } + ]; + +} +{ module="kde-wallpapers"; sane="kde_wallpapers"; split=false;} +{ module="kdewebdev"; split=false; + pkgs=[ + { name="klinkstatus"; } + { name="kfilereplace"; } + { name="kimagemapeditor"; } + { name="kommander"; } + ]; + +} +{ module="kde-workspace"; sane="kde_workspace"; split=false;} +{ module="oxygen-icons"; sane="oxygen_icons"; split=false;} +]; +} diff --git a/pkgs/desktops/kde-4.7/l10n/manifest-4.7.3.nix b/pkgs/desktops/kde-4.7/l10n/manifest-4.7.3.nix deleted file mode 100644 index 6cfb25eb7d8..00000000000 --- a/pkgs/desktops/kde-4.7/l10n/manifest-4.7.3.nix +++ /dev/null @@ -1,262 +0,0 @@ -[ -{ - lang = "ar"; - saneName = "ar"; - sha256 = "09v1ywmalaqfq6bmlgs2594y9xxvlms14h82skw21pikx6apblv3"; -} -{ - lang = "bg"; - saneName = "bg"; - sha256 = "11hmr7742l1qs3rxahih9rql1ysp67gidvl7jn7g1haagqvc452v"; -} -{ - lang = "bs"; - saneName = "bs"; - sha256 = "1n4nvnmlfm08k76rl7dmlmvjh74amhm52hv93ama19j6xpp4a491"; -} -{ - lang = "ca"; - saneName = "ca"; - sha256 = "1082lw19k7ijhwjxs30fgl9iwrrnid17khq18zbcqwd6wm35ba89"; -} -{ - lang = "ca@valencia"; - saneName = "ca_valencia"; - sha256 = "1k3r7rby2x1azy4i19m1dg9950ac3y5p9sysmr3lv2b1z7pmszir"; -} -{ - lang = "cs"; - saneName = "cs"; - sha256 = "11sciybxc5hqsjnylrhg23ag52l0hv8f3yhrsdfkm4hbkwq5p0jp"; -} -{ - lang = "da"; - saneName = "da"; - sha256 = "1mbndwyrpykiigs24m4iqca6vaa4f8lr3mydjk7jlqycng0np4hq"; -} -{ - lang = "de"; - saneName = "de"; - sha256 = "1n2cjkhd87hdksqd5ncb86xfqyi371bpdhx1krn8r7hih3mhcfj4"; -} -{ - lang = "el"; - saneName = "el"; - sha256 = "0h4rkdarqs4ls4nybv8wrvy3l7vq23z3arrgx1g7hs3hwbbjbf7b"; -} -{ - lang = "en_GB"; - saneName = "en_GB"; - sha256 = "100kpqkkbv6b3ik30iikxwnk53r3dd1in5livrbl3xs2rwg6wyr3"; -} -{ - lang = "es"; - saneName = "es"; - sha256 = "0vmrcn6fffxjvishhjpay4vqadwlzvaqwrbbcfbalif9hqbg4jad"; -} -{ - lang = "et"; - saneName = "et"; - sha256 = "1bn0yz80fy1cflxkxn93fnpsg9rrkl7kbpicgsb0bh2m7bbmf650"; -} -{ - lang = "eu"; - saneName = "eu"; - sha256 = "0x83ql8sdrrviwqzz7di3xfhnwyswmxhpdz333yjz9i4h7v77mjj"; -} -{ - lang = "fi"; - saneName = "fi"; - sha256 = "13xls7wg5kxfiami38hcgpay8h8141h2n8isgzxsbgg67spaglvb"; -} -{ - lang = "fr"; - saneName = "fr"; - sha256 = "0gm2fry1snypk37hnf0fkn7pvc9amnjd75v1b2hm6yycmbj1w85x"; -} -{ - lang = "ga"; - saneName = "ga"; - sha256 = "1wvbds5yqq404vbi0dypxgy1x6d8if8wv3p3k9sm0ym21nsmi9yh"; -} -{ - lang = "gl"; - saneName = "gl"; - sha256 = "0g17vd95s6fxa787yq8qj6hsaaz7jpqhdybn3qmxp1phksr1abhy"; -} -{ - lang = "he"; - saneName = "he"; - sha256 = "0pfpp2jqr13szbpf34992r5mkcbdlvrfffcbjw98kfri5g88dif8"; -} -{ - lang = "hr"; - saneName = "hr"; - sha256 = "1218vvrivx8mbp275qbwl56ws3y0npx3fk7ribv5f65145xi6j5g"; -} -{ - lang = "hu"; - saneName = "hu"; - sha256 = "1996k35z7hswgvg6kva27bnkd3vgzi1z8f78k4v2xdbl9ldd2d79"; -} -{ - lang = "ia"; - saneName = "ia"; - sha256 = "1pn1f7k5wll4nq7lzw8cm76bvrdrqnl76avbglrap70hpfkiaisn"; -} -{ - lang = "id"; - saneName = "id"; - sha256 = "1hlz5db9apfxx7gq36szgb2wy75c5002jh9jz4rb4n3vcxk8j518"; -} -{ - lang = "is"; - saneName = "is"; - sha256 = "1zi0yj3jpsjc2sbv95d2g3xyndgzi2ygnl79gvs3y5rp0hmnfnv1"; -} -{ - lang = "it"; - saneName = "it"; - sha256 = "0gncff9jddsb0b40d662dy9i1xh6zwkfmrzs9byn4v1cr8k0pv38"; -} -{ - lang = "ja"; - saneName = "ja"; - sha256 = "10fb8f107cdijgnyrinz4cprk37ajq5mppyj1nzpbn2aavbnk3sp"; -} -{ - lang = "kk"; - saneName = "kk"; - sha256 = "1vk44avdhhr5k9gm29c3i79hshff82jh9gvvs9zaljfivym3m977"; -} -{ - lang = "km"; - saneName = "km"; - sha256 = "16ywhi85rw92ig9fbyy4z491gw297fn27403lwjr0n6w5ggfgv4l"; -} -{ - lang = "kn"; - saneName = "kn"; - sha256 = "0vn409r15g7fhcw1nr9z916nmwqfk427f0h8b69lcjjpx7178fcf"; -} -{ - lang = "ko"; - saneName = "ko"; - sha256 = "0i11kxx4ak0672dfaxanqfcb4im7l11ir5fj7j5a5q0pga1dkbm2"; -} -{ - lang = "lt"; - saneName = "lt"; - sha256 = "08czylyavbv1qvwja69h4qj3akf6afk43mqfizcg7bpr55fcjkfh"; -} -{ - lang = "lv"; - saneName = "lv"; - sha256 = "1a0gr5n835mrvv0wwlgnrfa4wri96jrcjpmq247mymka2v3xladv"; -} -{ - lang = "nb"; - saneName = "nb"; - sha256 = "1yd1wm5yvvqsb9l45rbznc5wms5kv6nylf9wsgvnqgr5i0sz7nxf"; -} -{ - lang = "nds"; - saneName = "nds"; - sha256 = "0nq7axb7ii03abdaydnnbmf1ay8w6qsjif51whc9rmcmrzyl3hxr"; -} -{ - lang = "nl"; - saneName = "nl"; - sha256 = "1i12779kr4hcppr6b7py4iyndczm00jlk5dca0csiq67bprap2hf"; -} -{ - lang = "nn"; - saneName = "nn"; - sha256 = "0xg2bb5kg0salhlf243zli9z91drdf1n6wxaps5rg8hiwjxmg6q8"; -} -{ - lang = "pa"; - saneName = "pa"; - sha256 = "0616csccw9lwvsnffslnm764i8lblyyvshpdiy1zd7cw599iarnl"; -} -{ - lang = "pl"; - saneName = "pl"; - sha256 = "0444gvrir26zc35x6y5k1f98ypbj53ldkh8dlwmrp3rk8zh31iyg"; -} -{ - lang = "pt"; - saneName = "pt"; - sha256 = "0knkc3j97gsgljqql2dfnl4h21gj1w5bq3s8kwxh4qjg0xvwcq3a"; -} -{ - lang = "pt_BR"; - saneName = "pt_BR"; - sha256 = "0xy7z8kj0v9wsjmyvaij43wwrpi8xzy2mp1qbg7wihck9b69y083"; -} -{ - lang = "ro"; - saneName = "ro"; - sha256 = "1v7n556fkhiqqknclcgdvya629x66m9b2j10d5l1n2vp94xicaqx"; -} -{ - lang = "ru"; - saneName = "ru"; - sha256 = "1mn6x216a19k8c7bkq9k34sb1w4v367i5fnvm4galnwxdqsw9fx6"; -} -{ - lang = "sk"; - saneName = "sk"; - sha256 = "03ivj3kz5kpz0g5n60i2n07hp407w7k4b1hnaf4y7ml7i4bld59v"; -} -{ - lang = "sl"; - saneName = "sl"; - sha256 = "1zii4282nc8zpkh75rl83c6lqiix91ppd7wcqff62bixzpb0cc6y"; -} -{ - lang = "sr"; - saneName = "sr"; - sha256 = "1ai6y814h7b1nvihq2midmir73qm5isr6gdilhq73vskh3kclp93"; -} -{ - lang = "sv"; - saneName = "sv"; - sha256 = "1lwmsfy5nbm1r2lwbwqwknwh2cm3s53gnbhhkfxzjdr0gjrnhmb2"; -} -{ - lang = "th"; - saneName = "th"; - sha256 = "074gnzmhwbbhq6hwd3vvgdppr5fab9c721bfy0qkbs41yy0wj7ag"; -} -{ - lang = "tr"; - saneName = "tr"; - sha256 = "0cb9l1b8j4d4549lab8g0rmm6yk8ika9qadxwy74skp31yavf4xk"; -} -{ - lang = "ug"; - saneName = "ug"; - sha256 = "1y32gm4p44ddz09j1hsdlbz4m2dzkcgz56w4vph6qgqc0insmwka"; -} -{ - lang = "uk"; - saneName = "uk"; - sha256 = "1gwbzvw9g70mgjbhya5r83hvkjk9030pdslxnmmqakqngyxgczgx"; -} -{ - lang = "wa"; - saneName = "wa"; - sha256 = "0v1ak6l46ixvn2d0xcl9fxz0zyy3jr1k41qrlznh3pk5c0r614dn"; -} -{ - lang = "zh_CN"; - saneName = "zh_CN"; - sha256 = "07ga520mmlsy52dfdpqsnhjbhlr0zcsh95fppwvfbw6g1snmvfh3"; -} -{ - lang = "zh_TW"; - saneName = "zh_TW"; - sha256 = "1hxcsw1v0qz1m5ryjwzpsxpf8ls45fbpmn8pmplcmx55kw0hanq3"; -} -] diff --git a/pkgs/desktops/kde-4.7/l10n/manifest-4.7.4.nix b/pkgs/desktops/kde-4.7/l10n/manifest-4.7.4.nix new file mode 100644 index 00000000000..a128ff8dc62 --- /dev/null +++ b/pkgs/desktops/kde-4.7/l10n/manifest-4.7.4.nix @@ -0,0 +1,267 @@ +[ +{ + lang = "ar"; + saneName = "ar"; + sha256 = "1iw8x8k31jrgqc8nq276iwca1dgicz9vcx58rfbnk924dvqrflpv"; +} +{ + lang = "bg"; + saneName = "bg"; + sha256 = "07i4s6jkfkw59mr5n4256rzwy64y1c5wy957jbvnidqcrpzh1azf"; +} +{ + lang = "bs"; + saneName = "bs"; + sha256 = "080svc26zqf45wra6d6ljxzgs8f6gzl567wm73yp5qrgqnvyvxir"; +} +{ + lang = "ca"; + saneName = "ca"; + sha256 = "04fz56hsrpl6mxsbw5ja7armf8zbib542d7iv4p4c87xncib13qj"; +} +{ + lang = "ca@valencia"; + saneName = "ca_valencia"; + sha256 = "01mi1d6yz5w122bcjzp3r8g70pzil6216sv2y2dxaqjlxpdllklp"; +} +{ + lang = "cs"; + saneName = "cs"; + sha256 = "0l1rwx1k0vpkfc52divm5cnwxr05mwcl1sr84mi24s2ygs6rk8ib"; +} +{ + lang = "da"; + saneName = "da"; + sha256 = "1r2pzkvs1rc8hfzi5q0p6drvkl1ykq89bzi3k73i3fghx42qdxv6"; +} +{ + lang = "de"; + saneName = "de"; + sha256 = "100589wkw5rdcihk1nwl4i0bc30bq3b289n03q9lgf8zadflrrg9"; +} +{ + lang = "el"; + saneName = "el"; + sha256 = "0q41lpkf8srjxrrcnw9c7rkc83m4jw3r7z6s8x9rn0d5h2l36gv8"; +} +{ + lang = "en_GB"; + saneName = "en_GB"; + sha256 = "0mmvr3fh51r958myc18nxvl7d8hsm4wl70vmac3a3w47mr9aayqi"; +} +{ + lang = "es"; + saneName = "es"; + sha256 = "11k8svvnph9431maxdhzr334h7h11jk681fb2z1hb7i6cprmac9f"; +} +{ + lang = "et"; + saneName = "et"; + sha256 = "0pvjfkh93avkg9dii5byjh3kiqcgax9dfw97jmy6qccicgq6frvd"; +} +{ + lang = "eu"; + saneName = "eu"; + sha256 = "0gnnr7nyxjrzf632zs1k3j4bss3gm5qadfm2jki41y9q1f82vy99"; +} +{ + lang = "fi"; + saneName = "fi"; + sha256 = "0mfrmqn1yiqrgq79bgbb8799myv5h30g1gr83xja9g9y0lb645bs"; +} +{ + lang = "fr"; + saneName = "fr"; + sha256 = "03d6xbc7h9gslzvx1q7lcb8bfr5w8809jfb6cn4zv36in593wq85"; +} +{ + lang = "ga"; + saneName = "ga"; + sha256 = "13m7rdz2gd1cag2x6hfzyv8xj5777fly5f9pyhr28hrafyqc44l5"; +} +{ + lang = "gl"; + saneName = "gl"; + sha256 = "1ryimhlddxwaa40si3j0id37xm845ybsfkck0i7x2kmg87a55wcz"; +} +{ + lang = "he"; + saneName = "he"; + sha256 = "01v4vkbyhbsv64z7mnj129ss1rnr00n19iiza0ivjzsbzryhh3p2"; +} +{ + lang = "hr"; + saneName = "hr"; + sha256 = "0s2a4nc3z03xj8za426arwr1cjqqcd6pq82lc9q0kiv2fpxgagxw"; +} +{ + lang = "hu"; + saneName = "hu"; + sha256 = "0sv4fsnnnnpnf14s7fv83g9kzqq31gl0647cy523xkyxpdwhj9hp"; +} +{ + lang = "ia"; + saneName = "ia"; + sha256 = "0k9gzxiyplvk78nqk3kmqh74lani6iqciyighii1m0cvylq5sljz"; +} +{ + lang = "id"; + saneName = "id"; + sha256 = "16l4wif0qsmvpikagkhfyh98wdss4w0imixnzawadx0jq5mac6ga"; +} +{ + lang = "is"; + saneName = "is"; + sha256 = "1g5pan1iy2mx43z5gxvp07n3a9yrc56y4pya2r9g6wjnzcp0ynbj"; +} +{ + lang = "it"; + saneName = "it"; + sha256 = "0p0grhjx04khqmih8gmlpgjazr8asv7ql1gj965sjaf8a6z1h5ar"; +} +{ + lang = "ja"; + saneName = "ja"; + sha256 = "1f6ig8x3siqww4bwldpgncpyhlmkf6hbd6ahlvd5dqn6hqpknygx"; +} +{ + lang = "kk"; + saneName = "kk"; + sha256 = "0kyhr0b5g842dds59l3rcvyq3n12xx11svcqbqhiqqm3a8qki9vi"; +} +{ + lang = "km"; + saneName = "km"; + sha256 = "02ss6rxqf71n06a769l0xky30nhyqdhhsad9lmxs0dbbnxdcnixr"; +} +{ + lang = "kn"; + saneName = "kn"; + sha256 = "0rk193a27hvh63lfb7yy8g0wxb05kymyqnhdxcmai3wk2n53bi9y"; +} +{ + lang = "ko"; + saneName = "ko"; + sha256 = "0wyplpkkq6mdm5k7jxxppwgrm4rrb5mbhagszg1y460rcx7d5vcm"; +} +{ + lang = "lt"; + saneName = "lt"; + sha256 = "08767csx7sq02jkkrdl16jj7jprqc3qbsz7vdcwli3274qjkdk9s"; +} +{ + lang = "lv"; + saneName = "lv"; + sha256 = "0f4mxjsg2ipsj57ki26n870zxnk28z9ayblzgmv821xiawjaa4gc"; +} +{ + lang = "nb"; + saneName = "nb"; + sha256 = "1myb1b4p849nvb4q2n5hcy5fsfb4zdvhc5vkwa2giiy0pv230cmm"; +} +{ + lang = "nds"; + saneName = "nds"; + sha256 = "1vm6fjac0aaxls0rlgz4s804kbarj1rzyli50dzfcfqwngzkckxk"; +} +{ + lang = "nl"; + saneName = "nl"; + sha256 = "02v0cscngl7wfsl7yc2xr1a593qq064spgk1ynzad1rz1g98z212"; +} +{ + lang = "nn"; + saneName = "nn"; + sha256 = "01s1kfp5x036hcpyl87qzqjlmjwp8hda3qplnj3inihias2cnvb7"; +} +{ + lang = "pa"; + saneName = "pa"; + sha256 = "0al2lwvj23rp1plg2ykakbgw6qzxkkd5pd2nqdfnaif9xq9fp9db"; +} +{ + lang = "pl"; + saneName = "pl"; + sha256 = "08fffsaay01dnbs7bg3w325bknjcfbp3f1ryrdy2g7w2achyakls"; +} +{ + lang = "pt"; + saneName = "pt"; + sha256 = "03klc7q1h0xxc43vqw2m87n4wzxg140ql7mlzrjsrdnqgx2pvch4"; +} +{ + lang = "pt_BR"; + saneName = "pt_BR"; + sha256 = "1g4nd48fzfxam8zsi0imw57lhjm7i7qifqmy53s7pfr4cmq4fbw5"; +} +{ + lang = "ro"; + saneName = "ro"; + sha256 = "112pj6bi1bagafh89322mdj8ynmljv0ry7z2zss4ljfhqxxndc6b"; +} +{ + lang = "ru"; + saneName = "ru"; + sha256 = "1i4fx5mrz9910wkfgi885gjafcspnk8nyx7cimkvnp6y2xwpl733"; +} +{ + lang = "si"; + saneName = "si"; + sha256 = "0h77cqi9cmzni4mn7k91ar56b9ph8dlyagn29wd958hpkxwbdqiw"; +} +{ + lang = "sk"; + saneName = "sk"; + sha256 = "1q8bxlaah7afs12ni8xpjj6nlxjmxfpzabavm7ixqwnn4l732vyn"; +} +{ + lang = "sl"; + saneName = "sl"; + sha256 = "0508w2k4g7f9dm0ds28h5hhxd5qc4w16zxqskygrs6144567hb0c"; +} +{ + lang = "sr"; + saneName = "sr"; + sha256 = "0bvbzah338bh8vnn2ppakd8zb49vcc7d95ahyahrkqc4ls5z60sv"; +} +{ + lang = "sv"; + saneName = "sv"; + sha256 = "1glgb7shn3qlszayyc11wjhbc5g29agq2rlwf45drk2b5fi2m8bn"; +} +{ + lang = "th"; + saneName = "th"; + sha256 = "0g3pgrsb3d33295nw45y0a318yb4bvld46xvjsd3ay8hxpxrf4yy"; +} +{ + lang = "tr"; + saneName = "tr"; + sha256 = "02k1jakxwj5zp0z7x8yrjrl17syzv6rfyscal6af5bavjsx99kxp"; +} +{ + lang = "ug"; + saneName = "ug"; + sha256 = "0wq1jlxwz2avqzb9yqnck69qkfy3q7cq76i2jadbfdvwk06w44bi"; +} +{ + lang = "uk"; + saneName = "uk"; + sha256 = "0813bmgi9k3kx2k8rl8h1l9p6zcnabk36p7nm8v9vb4v7d52cyds"; +} +{ + lang = "wa"; + saneName = "wa"; + sha256 = "14slp0ybjbsm62misrp9qni5pzw4pzz3zznzc49z0a7yfni9i6av"; +} +{ + lang = "zh_CN"; + saneName = "zh_CN"; + sha256 = "18jfbz2h8jjby48hwjyrd9yn3k7xbp58g28psmlhsg2m3f8mr669"; +} +{ + lang = "zh_TW"; + saneName = "zh_TW"; + sha256 = "09mfspiy3ihg0n6paqhp0g1srl60sxrkxgha536624kbrbwp1jpq"; +} +] From 5ce6bf04f2cff1c2fbef374604a2e195921f8681 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Fri, 9 Dec 2011 11:14:02 +0000 Subject: [PATCH 896/970] * vde2 updated to 2.3.2. svn path=/nixpkgs/trunk/; revision=30804 --- pkgs/tools/networking/vde2/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/tools/networking/vde2/default.nix b/pkgs/tools/networking/vde2/default.nix index 3bf2b05dd56..72a31262e26 100644 --- a/pkgs/tools/networking/vde2/default.nix +++ b/pkgs/tools/networking/vde2/default.nix @@ -1,14 +1,14 @@ -{ stdenv, fetchurl, openssl, libpcap }: +{ stdenv, fetchurl, openssl, libpcap, python }: stdenv.mkDerivation rec { - name = "vde2-2.3.1"; + name = "vde2-2.3.2"; src = fetchurl { url = "mirror://sourceforge/vde/vde2/2.3.1/${name}.tar.gz"; - sha256 = "1vbrds8k1cn1fgvpkg2ck2227l5yy2f0qxk44sg3vymq0aiw8y37"; + sha256 = "14xga0ib6p1wrv3hkl4sa89yzjxv7f1vfqaxsch87j6scdm59pr2"; }; - buildInputs = [ openssl libpcap ]; + buildInputs = [ openssl libpcap python ]; meta = { homepage = http://vde.sourceforge.net/; From 1817b55a7ffb2b2292b365bae847b0823add6675 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Fri, 9 Dec 2011 11:44:42 +0000 Subject: [PATCH 897/970] git: updated to version 1.7.8 svn path=/nixpkgs/trunk/; revision=30805 --- .../version-management/git-and-tools/git/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/version-management/git-and-tools/git/default.nix b/pkgs/applications/version-management/git-and-tools/git/default.nix index 62b8e8d2ea4..795d43da6da 100644 --- a/pkgs/applications/version-management/git-and-tools/git/default.nix +++ b/pkgs/applications/version-management/git-and-tools/git/default.nix @@ -8,7 +8,7 @@ }: let - version = "1.7.7.3"; + version = "1.7.8"; svn = subversionClient.override { perlBindings = true; }; in stdenv.mkDerivation { @@ -16,7 +16,7 @@ stdenv.mkDerivation { src = fetchurl { url = "http://git-core.googlecode.com/files/git-${version}.tar.gz"; - sha256 = "dc9d773004cdae17453e330a02de630a1beeeb404d0601b9e8c1aef0a0efd100"; + sha256 = "ede41a79c83e0d8673ed16c64d5c105e404d953591f9611e44c3964130da0713"; }; patches = [ ./docbook2texi.patch ]; From a0504e732f1b9b85163039c726693d858c435afd Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Fri, 9 Dec 2011 11:51:16 +0000 Subject: [PATCH 898/970] haskell-blaze-builder: updated to version 0.3.0.2 svn path=/nixpkgs/trunk/; revision=30806 --- pkgs/development/libraries/haskell/blaze-builder/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/blaze-builder/default.nix b/pkgs/development/libraries/haskell/blaze-builder/default.nix index 3a20e5d0cb1..a21d9b7c96f 100644 --- a/pkgs/development/libraries/haskell/blaze-builder/default.nix +++ b/pkgs/development/libraries/haskell/blaze-builder/default.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "blaze-builder"; - version = "0.3.0.1"; - sha256 = "1p3xlifcr7v987zx8l2sppn9yydph332mn1xxk0yfi78a6386nfb"; + version = "0.3.0.2"; + sha256 = "009njfm9g0fs7kg6q9c7qqfl69msw9q3d07xh3xg7layh09khsdb"; buildDepends = [ text ]; meta = { homepage = "http://github.com/meiersi/blaze-builder"; From 6faf382599d3cee8009889ccc1249236e2e957f9 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Fri, 9 Dec 2011 11:51:18 +0000 Subject: [PATCH 899/970] haskell-cereal: updated to version 0.3.5.0 svn path=/nixpkgs/trunk/; revision=30807 --- pkgs/development/libraries/haskell/cereal/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/cereal/default.nix b/pkgs/development/libraries/haskell/cereal/default.nix index f3d1fbbf9be..eedf4936833 100644 --- a/pkgs/development/libraries/haskell/cereal/default.nix +++ b/pkgs/development/libraries/haskell/cereal/default.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "cereal"; - version = "0.3.4.0"; - sha256 = "019fc094w2ica9ims83jacy2digbygaww5wb73xyrj3vgjw774xq"; + version = "0.3.5.0"; + sha256 = "0bqkb9al8mr0dzik17bcrjdsk414x78wfc919jb17ihcg7gnvrg8"; meta = { description = "A binary serialization library"; license = self.stdenv.lib.licenses.bsd3; From 9fc3981ef70b4f4dbfeb788b37fd61d27756cb11 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Fri, 9 Dec 2011 11:51:20 +0000 Subject: [PATCH 900/970] haskell-cmdlib: updated to version 0.3.5 svn path=/nixpkgs/trunk/; revision=30808 --- pkgs/development/libraries/haskell/cmdlib/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/cmdlib/default.nix b/pkgs/development/libraries/haskell/cmdlib/default.nix index e49042a4a1f..7b29ba58004 100644 --- a/pkgs/development/libraries/haskell/cmdlib/default.nix +++ b/pkgs/development/libraries/haskell/cmdlib/default.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "cmdlib"; - version = "0.3.4"; - sha256 = "1f8vb681xd2v7hv0s84x032yf8x2jlxc0j302irv20fkc1w1vbrr"; + version = "0.3.5"; + sha256 = "0218f4rl64wvvka95m969hg5y9vc29dqaawfcnk7d1qsv3hx9ydl"; isLibrary = true; isExecutable = true; buildDepends = [ mtl split syb transformers ]; From e77686b0bbb5048630a588526e667701f7eed710 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Fri, 9 Dec 2011 11:51:22 +0000 Subject: [PATCH 901/970] haskell-hmatrix: updated to version 0.12.0.2 svn path=/nixpkgs/trunk/; revision=30809 --- pkgs/development/libraries/haskell/hmatrix/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/hmatrix/default.nix b/pkgs/development/libraries/haskell/hmatrix/default.nix index 5f45d99c75c..84866e026fd 100644 --- a/pkgs/development/libraries/haskell/hmatrix/default.nix +++ b/pkgs/development/libraries/haskell/hmatrix/default.nix @@ -4,8 +4,8 @@ cabal.mkDerivation (self: { pname = "hmatrix"; - version = "0.12.0.1"; - sha256 = "1lnq1892vzx094d84jfs2477m3w47xgmqvnvzignwgfi470d9lw5"; + version = "0.12.0.2"; + sha256 = "08i3vi0vs6wpyvjsjpqrxp8lw0f89cgzwv1j27y7i2yfp4xmrw8d"; buildDepends = [ binary HUnit QuickCheck random storableComplex vector ]; From 1a435fa999fce8651dfb59a04894116e63fe9e3e Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Fri, 9 Dec 2011 11:51:24 +0000 Subject: [PATCH 902/970] haskell-http-enumerator: updated to version 0.7.2 svn path=/nixpkgs/trunk/; revision=30810 --- .../development/libraries/haskell/http-enumerator/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/http-enumerator/default.nix b/pkgs/development/libraries/haskell/http-enumerator/default.nix index f89ae69fafa..14109cd1c11 100644 --- a/pkgs/development/libraries/haskell/http-enumerator/default.nix +++ b/pkgs/development/libraries/haskell/http-enumerator/default.nix @@ -7,8 +7,8 @@ cabal.mkDerivation (self: { pname = "http-enumerator"; - version = "0.7.1.8"; - sha256 = "1bydj4qfmz03qpgk0aixrhf96bl4zx1ak5x0cq8ppp9c2vsig0i4"; + version = "0.7.2"; + sha256 = "096rwnfm8bqn0pq9cs4i2kr1ljmawk2l17afw301zqfg79q97crc"; isLibrary = true; isExecutable = true; buildDepends = [ From 3d72cfb21104e152741136f47d79bf1fe03fb76d Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Fri, 9 Dec 2011 11:51:26 +0000 Subject: [PATCH 903/970] haskell-yaml: updated to version 0.4.1.2 svn path=/nixpkgs/trunk/; revision=30811 --- pkgs/development/libraries/haskell/yaml/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/yaml/default.nix b/pkgs/development/libraries/haskell/yaml/default.nix index fce7026c0ca..76010bb4f86 100644 --- a/pkgs/development/libraries/haskell/yaml/default.nix +++ b/pkgs/development/libraries/haskell/yaml/default.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "yaml"; - version = "0.4.1.1"; - sha256 = "0qm7kfvi99m80m2lsmn98ssr2sfsw1rbbmzyjlg7bmvbaxsyw0b9"; + version = "0.4.1.2"; + sha256 = "1c7ffs5gkwk0l0vg7amsflra1j8ifd9cvvbqx9jzkqsay8hbr4vb"; isLibrary = true; isExecutable = true; buildDepends = [ enumerator transformers ]; From b76db1c8aceb619952da701abff515733f5f98d9 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Fri, 9 Dec 2011 18:07:29 +0000 Subject: [PATCH 904/970] haskell-SourceGraph: added version 0.7.0.1 svn path=/nixpkgs/trunk/; revision=30813 --- .../tools/haskell/SourceGraph/default.nix | 24 +++++++++++++++++++ pkgs/top-level/haskell-packages.nix | 2 ++ 2 files changed, 26 insertions(+) create mode 100644 pkgs/development/tools/haskell/SourceGraph/default.nix diff --git a/pkgs/development/tools/haskell/SourceGraph/default.nix b/pkgs/development/tools/haskell/SourceGraph/default.nix new file mode 100644 index 00000000000..0987989051f --- /dev/null +++ b/pkgs/development/tools/haskell/SourceGraph/default.nix @@ -0,0 +1,24 @@ +{ cabal, extensibleExceptions, fgl, Graphalyze, graphviz +, haskellSrcExts, mtl, multiset, random +}: + +cabal.mkDerivation (self: { + pname = "SourceGraph"; + version = "0.7.0.1"; + sha256 = "0f6h240a72cxa65cwjrp34cx80c6frzhgl9dpv3krc8xzhxssk78"; + isLibrary = false; + isExecutable = true; + buildDepends = [ + extensibleExceptions fgl Graphalyze graphviz haskellSrcExts mtl + multiset random + ]; + meta = { + description = "Static code analysis using graph-theoretic techniques"; + license = "GPL"; + platforms = self.ghc.meta.platforms; + maintainers = [ + self.stdenv.lib.maintainers.andres + self.stdenv.lib.maintainers.simons + ]; + }; +}) diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix index dbc6b174415..ff1e98e3ff8 100644 --- a/pkgs/top-level/haskell-packages.nix +++ b/pkgs/top-level/haskell-packages.nix @@ -1426,6 +1426,8 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y); hslogger = callPackage ../development/tools/haskell/hslogger {}; + SourceGraph = callPackage ../development/tools/haskell/SourceGraph {}; + tar = callPackage ../development/tools/haskell/tar {}; threadscope = callPackage ../development/tools/haskell/threadscope {}; From 77645f98f7ad6a86036a8e84d2fdc70d653ac6a5 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Fri, 9 Dec 2011 18:07:33 +0000 Subject: [PATCH 905/970] haskell-test-framework: updated to version 0.4.2.0 svn path=/nixpkgs/trunk/; revision=30814 --- pkgs/development/libraries/haskell/test-framework/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/test-framework/default.nix b/pkgs/development/libraries/haskell/test-framework/default.nix index 21ea2ebe954..64a45206b6e 100644 --- a/pkgs/development/libraries/haskell/test-framework/default.nix +++ b/pkgs/development/libraries/haskell/test-framework/default.nix @@ -4,8 +4,8 @@ cabal.mkDerivation (self: { pname = "test-framework"; - version = "0.4.1.1"; - sha256 = "1ig4v2y8xba2rg6pc8yjf0j20cwa3czknnfqn1sgpqhmip2961pc"; + version = "0.4.2.0"; + sha256 = "0a74ajlmwsajrj06k22zqwnyxqfrpbd9xplf4b1swafp7y952ind"; isLibrary = true; isExecutable = true; buildDepends = [ From 4a6af291a3d13e6c2323accc67f1257a602c2c71 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?= Date: Fri, 9 Dec 2011 21:15:41 +0000 Subject: [PATCH 906/970] Adding btar 0.9! svn path=/nixpkgs/trunk/; revision=30815 --- pkgs/tools/backup/btar/default.nix | 21 +++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 23 insertions(+) create mode 100644 pkgs/tools/backup/btar/default.nix diff --git a/pkgs/tools/backup/btar/default.nix b/pkgs/tools/backup/btar/default.nix new file mode 100644 index 00000000000..d7598fae38a --- /dev/null +++ b/pkgs/tools/backup/btar/default.nix @@ -0,0 +1,21 @@ +{ stdenv, fetchurl, librsync }: + +stdenv.mkDerivation rec { + name = "btar-0.9"; + src = fetchurl { + url = "http://vicerveza.homeunix.net/~viric/soft/btar/${name}.tar.gz"; + sha256 = "0w5cliw1n7syg67pqgljmi1f86w383ccw57h8p5h7cgsnabsbnq3"; + }; + + buildInputs = [ librsync ]; + + installPhase = "make install PREFIX=$out"; + + meta = { + description = "Tar-compatible block-based archiver"; + license = "GPLv3+"; + homepage = http://viric.name/cgi-bin/btar; + platforms = with stdenv.lib.platforms; all; + maintainers = with stdenv.lib.maintainers; [viric]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 7218afc34e3..e4bf5287b8b 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -468,6 +468,8 @@ let bzip2 = callPackage ../tools/compression/bzip2 { }; + btar = callPackage ../tools/backup/btar { }; + cabextract = callPackage ../tools/archivers/cabextract { }; ccid = callPackage ../tools/security/ccid { }; From daf8abbc24a8602d1513b9d2f94547fc029fceb1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?= Date: Fri, 9 Dec 2011 21:18:09 +0000 Subject: [PATCH 907/970] Alphabet, and its order... svn path=/nixpkgs/trunk/; revision=30816 --- pkgs/top-level/all-packages.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index e4bf5287b8b..a5ff8291d2e 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -464,12 +464,12 @@ let bsdiff = callPackage ../tools/compression/bsdiff { }; + btar = callPackage ../tools/backup/btar { }; + bup = callPackage ../tools/backup/bup { }; bzip2 = callPackage ../tools/compression/bzip2 { }; - btar = callPackage ../tools/backup/btar { }; - cabextract = callPackage ../tools/archivers/cabextract { }; ccid = callPackage ../tools/security/ccid { }; From c09dbda83ed2ec6cb0a6063ca3cee14755301f24 Mon Sep 17 00:00:00 2001 From: Michael Raskin <7c6f434c@mail.ru> Date: Sat, 10 Dec 2011 05:05:15 +0000 Subject: [PATCH 908/970] Rebuild-checked: does not break boot svn path=/nixpkgs/trunk/; revision=30817 --- pkgs/misc/sane-backends/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/misc/sane-backends/default.nix b/pkgs/misc/sane-backends/default.nix index e1bd1436101..458985c61f7 100644 --- a/pkgs/misc/sane-backends/default.nix +++ b/pkgs/misc/sane-backends/default.nix @@ -3,7 +3,7 @@ let firmware = gt68xxFirmware {inherit fetchurl;}; in -assert hotplugSupport -> stdenv.system == "i686-linux"; +assert hotplugSupport -> (stdenv.system == "i686-linux" || stdenv.system == "x86_64-linux"); stdenv.mkDerivation { name = "sane-backends-1.0.21"; From 4242217532b45d6af62035b5cdf54f08e67b7c47 Mon Sep 17 00:00:00 2001 From: Alexander Tsamutali Date: Sat, 10 Dec 2011 17:11:03 +0000 Subject: [PATCH 909/970] db4: Updated url. svn path=/nixpkgs/trunk/; revision=30818 --- pkgs/development/libraries/db4/db4-4.8.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/libraries/db4/db4-4.8.nix b/pkgs/development/libraries/db4/db4-4.8.nix index 5b99f068769..86424fac567 100644 --- a/pkgs/development/libraries/db4/db4-4.8.nix +++ b/pkgs/development/libraries/db4/db4-4.8.nix @@ -6,7 +6,7 @@ stdenv.mkDerivation { builder = ./builder.sh; src = fetchurl { - url = http://download-east.oracle.com/berkeley-db/db-4.8.26.tar.gz; + url = http://download.oracle.com/berkeley-db/db-4.8.26.tar.gz; sha256 = "0hcxh0kb6m0wk3apjhs57p7b171zzn63rg4l3nkcavygg5gx2mgp"; }; From 9ec2f699d6059b1dd176ee9aac12ef19f98a0d70 Mon Sep 17 00:00:00 2001 From: Alexander Tsamutali Date: Sat, 10 Dec 2011 18:01:51 +0000 Subject: [PATCH 910/970] applications/misc/bitcoin: Hash changed. svn path=/nixpkgs/trunk/; revision=30819 --- pkgs/applications/misc/bitcoin/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/applications/misc/bitcoin/default.nix b/pkgs/applications/misc/bitcoin/default.nix index 20a9bb99168..d56ebe6b17f 100644 --- a/pkgs/applications/misc/bitcoin/default.nix +++ b/pkgs/applications/misc/bitcoin/default.nix @@ -6,7 +6,7 @@ stdenv.mkDerivation rec { src = fetchurl { url = " https://github.com/bitcoin/bitcoin/tarball/v${version}"; - sha256 = "146q0ijvdmk9iidmavzkpdgflnfi86ahqkwdvxpf5gmfqdd53yqx"; + sha256 = "1i9wnbjf9yrs9rq5jnh9pk1x5j982qh3xpjm05z8dgd3nympgyy8"; }; buildInputs = [ openssl db4 boost zlib miniupnpc qt4 ]; From 4451d32a36e0f0194c296e282cc03e94cfb86c0f Mon Sep 17 00:00:00 2001 From: Alexander Tsamutali Date: Sat, 10 Dec 2011 18:11:37 +0000 Subject: [PATCH 911/970] desktops/e17: Updated everything. svn path=/nixpkgs/trunk/; revision=30820 --- pkgs/desktops/e17/e_dbus/default.nix | 9 +++++---- pkgs/desktops/e17/ecore/default.nix | 4 ++-- pkgs/desktops/e17/edje/default.nix | 9 +++++---- pkgs/desktops/e17/eet/default.nix | 4 ++-- pkgs/desktops/e17/eeze/default.nix | 4 ++-- pkgs/desktops/e17/efreet/default.nix | 4 ++-- pkgs/desktops/e17/eina/default.nix | 4 ++-- pkgs/desktops/e17/embryo/default.nix | 7 ++++--- pkgs/desktops/e17/enlightenment/default.nix | 7 ++++--- pkgs/desktops/e17/evas/default.nix | 4 ++-- 10 files changed, 30 insertions(+), 26 deletions(-) diff --git a/pkgs/desktops/e17/e_dbus/default.nix b/pkgs/desktops/e17/e_dbus/default.nix index 44be90f7af9..7c078eee0ee 100644 --- a/pkgs/desktops/e17/e_dbus/default.nix +++ b/pkgs/desktops/e17/e_dbus/default.nix @@ -1,12 +1,13 @@ -{ stdenv, fetchurl, pkgconfig, ecore, eina, evas, dbus_libs }: +{ stdenv, fetchurl, pkgconfig, zlib, libjpeg, expat, ecore, eina, evas +, dbus_libs }: stdenv.mkDerivation rec { name = "e_dbus-${version}"; - version = "1.0.1"; + version = "1.1.0"; src = fetchurl { url = "http://download.enlightenment.org/releases/${name}.tar.gz"; - sha256 = "1ifkijy4ap2mlqw2nd1dlvzlppyi7bnp15bxiy40nhdly8vhpbdl"; + sha256 = "10y68f023jjq6dinjc0brpr41acnd7clxgb0q1j2i9isalx1473z"; }; - buildInputs = [ pkgconfig ecore eina evas ]; + buildInputs = [ pkgconfig zlib libjpeg expat ecore eina evas ]; propagatedBuildInputs = [ dbus_libs ]; configureFlags = '' --disable-edbus-test diff --git a/pkgs/desktops/e17/ecore/default.nix b/pkgs/desktops/e17/ecore/default.nix index 004d708070c..010a8022fca 100644 --- a/pkgs/desktops/e17/ecore/default.nix +++ b/pkgs/desktops/e17/ecore/default.nix @@ -1,10 +1,10 @@ { stdenv, fetchurl, pkgconfig, eina, evas, libX11, libXext }: stdenv.mkDerivation rec { name = "ecore-${version}"; - version = "1.0.1"; + version = "1.1.0"; src = fetchurl { url = "http://download.enlightenment.org/releases/${name}.tar.gz"; - sha256 = "1vi03zxnsdnrjv1rh5r3v0si0b20ikrfb8hf5374i2sqvi1g65j0"; + sha256 = "12iqhrklp3k5lvbxf7lhqd53wpl1csvricfkzlcv2nny4y3r31m0"; }; buildInputs = [ pkgconfig eina evas ]; propagatedBuildInputs = [ libX11 libXext ]; diff --git a/pkgs/desktops/e17/edje/default.nix b/pkgs/desktops/e17/edje/default.nix index 3272963b8b6..6c9e58c65fd 100644 --- a/pkgs/desktops/e17/edje/default.nix +++ b/pkgs/desktops/e17/edje/default.nix @@ -1,12 +1,13 @@ -{ stdenv, fetchurl, pkgconfig, lua, eina, eet, evas, ecore, embryo }: +{ stdenv, fetchurl, pkgconfig, lua, expat, zlib, libjpeg, eina, eet, evas +, ecore, embryo }: stdenv.mkDerivation rec { name = "edje-${version}"; - version = "1.0.1"; + version = "1.1.0"; src = fetchurl { url = "http://download.enlightenment.org/releases/${name}.tar.gz"; - sha256 = "0z7gjj4ccjr36ba763ijmjkya58fc173vpdw1m298zwhy8n4164j"; + sha256 = "0fjn4psl70hkfbjmczk06if8yxarg67w5hp2i1vq49kfkpyn2cx7"; }; - buildInputs = [ pkgconfig lua eina eet evas ecore embryo ]; + buildInputs = [ pkgconfig expat zlib libjpeg lua eina eet evas ecore embryo ]; meta = { description = "Enlightenment's abstract GUI layout and animation object library"; longDescription = '' diff --git a/pkgs/desktops/e17/eet/default.nix b/pkgs/desktops/e17/eet/default.nix index 7f2809c0aa0..98cdca08179 100644 --- a/pkgs/desktops/e17/eet/default.nix +++ b/pkgs/desktops/e17/eet/default.nix @@ -1,10 +1,10 @@ { stdenv, fetchurl, pkgconfig, eina, zlib, libjpeg }: stdenv.mkDerivation rec { name = "eet-${version}"; - version = "1.4.1"; + version = "1.5.0"; src = fetchurl { url = "http://download.enlightenment.org/releases/${name}.tar.gz"; - sha256 = "1hlznlmgkgzxnkmc3qgqjrc62bmwqj5af8lsh59vac2gf4jnymnc"; + sha256 = "0csk2s0y3qllf40q06i4wqaj8y2p1csh5jxcqnlmf6lrk1ycjv32"; }; buildInputs = [ pkgconfig eina zlib libjpeg ]; meta = { diff --git a/pkgs/desktops/e17/eeze/default.nix b/pkgs/desktops/e17/eeze/default.nix index 3499d29dbb1..c095e25f886 100644 --- a/pkgs/desktops/e17/eeze/default.nix +++ b/pkgs/desktops/e17/eeze/default.nix @@ -1,10 +1,10 @@ { stdenv, fetchurl, pkgconfig, eina, ecore, udev }: stdenv.mkDerivation rec { name = "eeze-${version}"; - version = "1.0.2"; + version = "1.1.0"; src = fetchurl { url = "http://download.enlightenment.org/releases/${name}.tar.gz"; - sha256 = "0g6afhnl862clj1rfh0s4nzdnhdikylbalfp8zmsw56dj0zncynq"; + sha256 = "10n2qd7rf1cnsgd3mhh1wd1qm7hsf1lxx1ig72xyj55i4i5dllh3"; }; buildInputs = [ pkgconfig eina ecore ]; propagatedBuildInputs = [ udev ]; diff --git a/pkgs/desktops/e17/efreet/default.nix b/pkgs/desktops/e17/efreet/default.nix index e1e8d34197f..291ea2f63f9 100644 --- a/pkgs/desktops/e17/efreet/default.nix +++ b/pkgs/desktops/e17/efreet/default.nix @@ -1,10 +1,10 @@ { stdenv, fetchurl, pkgconfig, eina, eet, ecore }: stdenv.mkDerivation rec { name = "efreet-${version}"; - version = "1.0.1"; + version = "1.1.0"; src = fetchurl { url = "http://download.enlightenment.org/releases/${name}.tar.gz"; - sha256 = "0fakczsrr1idyvrp04mxw51ww017kn65xa77vq8wka4js8y0nagi"; + sha256 = "0fqrrp8dvaqhwczlh7xyh1x6wr4flpmpy6ihrjh1ywymgcvrfwkf"; }; buildInputs = [ pkgconfig eina eet ecore ]; meta = { diff --git a/pkgs/desktops/e17/eina/default.nix b/pkgs/desktops/e17/eina/default.nix index b4c3d0a7291..d3f02e595c1 100644 --- a/pkgs/desktops/e17/eina/default.nix +++ b/pkgs/desktops/e17/eina/default.nix @@ -1,10 +1,10 @@ { stdenv, fetchurl }: stdenv.mkDerivation rec { name = "eina-${version}"; - version = "1.0.1"; + version = "1.1.0"; src = fetchurl { url = "http://download.enlightenment.org/releases/${name}.tar.gz"; - sha256 = "1v2z1l6nqr7hnp5gki3972kprlvylpalp5wq9xdppm250z91kaas"; + sha256 = "0h2vmvr7bmnb19n124bjvi2rddv7vm15pv19lrpc7av3idk7ic4j"; }; meta = { description = "Enlightenment's core data structure library"; diff --git a/pkgs/desktops/e17/embryo/default.nix b/pkgs/desktops/e17/embryo/default.nix index e23b3f4b0b1..2dd1a5cbab0 100644 --- a/pkgs/desktops/e17/embryo/default.nix +++ b/pkgs/desktops/e17/embryo/default.nix @@ -1,11 +1,12 @@ -{ stdenv, fetchurl }: +{ stdenv, fetchurl, pkgconfig, eina }: stdenv.mkDerivation rec { name = "embryo-${version}"; - version = "1.0.0"; + version = "1.1.0"; src = fetchurl { url = "http://download.enlightenment.org/releases/${name}.tar.gz"; - sha256 = "0ch9vps83s892vda1ss1cf1fbgzff9p51df2fip7fqlj8y1shvvx"; + sha256 = "0nk7jajsgi5xf02yxahwr3cm7bml5477fb1mas1i7a788bw7i6zn"; }; + buildInputs = [ pkgconfig eina ]; meta = { description = "Enlightenment's small Pawn based virtual machine and compiler"; longDescription = '' diff --git a/pkgs/desktops/e17/enlightenment/default.nix b/pkgs/desktops/e17/enlightenment/default.nix index b21bfc92ef2..f8c57543f88 100644 --- a/pkgs/desktops/e17/enlightenment/default.nix +++ b/pkgs/desktops/e17/enlightenment/default.nix @@ -1,9 +1,10 @@ { stdenv, fetchurl, pkgconfig, eina, eet, evas, ecore, edje, efreet, e_dbus, embryo }: stdenv.mkDerivation rec { - name = "enlightenment-0.16.999.55225"; + name = "enlightenment-${version}"; + version = "0.16.999.65643"; src = fetchurl { - url = "http://download.enlightenment.org/snapshots/2010-12-03/${name}.tar.gz"; - sha256 = "1cv701fidp9mx3g5m9klmzsp0fj149rb133v1w76rzms3a0wljl1"; + url = "http://download.enlightenment.org/snapshots/2011-11-28/${name}.tar.gz"; + sha256 = "1bb577gbccb1wrifrhv9pzm451zhig2p29mwz55b187ls31p36kz"; }; buildInputs = [ pkgconfig eina eet ecore evas edje efreet e_dbus embryo ]; configureFlags = '' diff --git a/pkgs/desktops/e17/evas/default.nix b/pkgs/desktops/e17/evas/default.nix index c546eb1af54..84dae4822ba 100644 --- a/pkgs/desktops/e17/evas/default.nix +++ b/pkgs/desktops/e17/evas/default.nix @@ -2,10 +2,10 @@ , libX11, libXext, eina, eet }: stdenv.mkDerivation rec { name = "evas-${version}"; - version = "1.0.1"; + version = "1.1.0"; src = fetchurl { url = "http://download.enlightenment.org/releases/${name}.tar.gz"; - sha256 = "0xkwyvxy32dwja0i3j8r8bzlybjwlrgmrhcri1bscp3aaj75x2rx"; + sha256 = "1qjmxn5a5qhc2slxjx7bsas76w0zlnrbs6hx9swr8xarkifjk3dv"; }; buildInputs = [ pkgconfig freetype fontconfig libpng libjpeg libX11 libXext eina eet From 894a3756e599ccf5f46e251d0bf12f22f65fdafc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?= Date: Sat, 10 Dec 2011 22:00:56 +0000 Subject: [PATCH 912/970] Updating btar to latest release. svn path=/nixpkgs/trunk/; revision=30821 --- pkgs/tools/backup/btar/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/backup/btar/default.nix b/pkgs/tools/backup/btar/default.nix index d7598fae38a..2ec82ff4a68 100644 --- a/pkgs/tools/backup/btar/default.nix +++ b/pkgs/tools/backup/btar/default.nix @@ -1,10 +1,10 @@ { stdenv, fetchurl, librsync }: stdenv.mkDerivation rec { - name = "btar-0.9"; + name = "btar-0.9.1"; src = fetchurl { url = "http://vicerveza.homeunix.net/~viric/soft/btar/${name}.tar.gz"; - sha256 = "0w5cliw1n7syg67pqgljmi1f86w383ccw57h8p5h7cgsnabsbnq3"; + sha256 = "1fmaq5z81zvs3gjrkwnqz8nb4a6dqij5cmw99jhcaxlnwl45y3vj"; }; buildInputs = [ librsync ]; From 99fb5689f78f7244e6ae10265a3eea5de3257d5a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?= Date: Sat, 10 Dec 2011 22:14:08 +0000 Subject: [PATCH 913/970] Setting static build for librsync on cygwin. svn path=/nixpkgs/trunk/; revision=30822 --- pkgs/development/libraries/librsync/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/libraries/librsync/default.nix b/pkgs/development/libraries/librsync/default.nix index 84f34eeebe1..a70a61042e0 100644 --- a/pkgs/development/libraries/librsync/default.nix +++ b/pkgs/development/libraries/librsync/default.nix @@ -8,7 +8,7 @@ stdenv.mkDerivation { sha256 = "1mj1pj99mgf1a59q9f2mxjli2fzxpnf55233pc1klxk2arhf8cv6"; }; - configureFlags = "--enable-shared"; + configureFlags = if stdenv.isCygwin then "--enable-static" else "--enable-shared"; meta = { homepage = http://librsync.sourceforge.net/; From cd90831b3ce2e2a949a53b7b0d09030ed45d115e Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Sat, 10 Dec 2011 22:30:49 +0000 Subject: [PATCH 914/970] haskell-xmobar: updated to version 0.14 svn path=/nixpkgs/trunk/; revision=30823 --- pkgs/applications/misc/xmobar/default.nix | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/misc/xmobar/default.nix b/pkgs/applications/misc/xmobar/default.nix index 454e5493ea7..355deec4092 100644 --- a/pkgs/applications/misc/xmobar/default.nix +++ b/pkgs/applications/misc/xmobar/default.nix @@ -1,12 +1,14 @@ -{ cabal, mtl, parsec, stm, time, utf8String, X11, X11Xft }: +{ cabal, libXrandr, mtl, parsec, stm, time, utf8String, X11, X11Xft +}: cabal.mkDerivation (self: { pname = "xmobar"; - version = "0.13"; - sha256 = "0ijava0vn2dmc6v57i6x663rvxz3ryb2gqks18qk1qli4k0m3hf7"; + version = "0.14"; + sha256 = "1y26b2a5v9hxv1zmjcb4m8j9qkqdn74mqc3q58vgp5cav45rphvh"; isLibrary = false; isExecutable = true; buildDepends = [ mtl parsec stm time utf8String X11 X11Xft ]; + extraLibraries = [ libXrandr ]; configureFlags = "-fwith_xft"; meta = { homepage = "http://projects.haskell.org/xmobar/"; From 50fd91efa92a047ae2474fb94284cc4db2b8c13a Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Sat, 10 Dec 2011 22:30:53 +0000 Subject: [PATCH 915/970] haskell-hakyll: updated to version 3.2.3.2 svn path=/nixpkgs/trunk/; revision=30824 --- pkgs/development/libraries/haskell/hakyll/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/hakyll/default.nix b/pkgs/development/libraries/haskell/hakyll/default.nix index 081c343d450..9035c606ed8 100644 --- a/pkgs/development/libraries/haskell/hakyll/default.nix +++ b/pkgs/development/libraries/haskell/hakyll/default.nix @@ -5,8 +5,8 @@ cabal.mkDerivation (self: { pname = "hakyll"; - version = "3.2.3.1"; - sha256 = "1mmzi8d5a3k4s81h5ciis32g8khxvpafps6pql65lvpp9yhicxdz"; + version = "3.2.3.2"; + sha256 = "0410gg8sdnw0iyhqrw1wfv9abbrv7r6awgvlhqds17vnrdxxk2w8"; buildDepends = [ binary blazeHtml citeprocHs cryptohash hamlet mtl pandoc parsec regexBase regexPcre snapCore snapServer tagsoup time From 257a8deddd273fe85e771dd0fd5976c774e5e550 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Sat, 10 Dec 2011 22:30:56 +0000 Subject: [PATCH 916/970] haskell-cabal2nix: updated to version 1.21 svn path=/nixpkgs/trunk/; revision=30825 --- pkgs/development/tools/haskell/cabal2nix/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/haskell/cabal2nix/default.nix b/pkgs/development/tools/haskell/cabal2nix/default.nix index 298c8c8bc51..c8753ea367b 100644 --- a/pkgs/development/tools/haskell/cabal2nix/default.nix +++ b/pkgs/development/tools/haskell/cabal2nix/default.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "cabal2nix"; - version = "1.20"; - sha256 = "14xbv7mqr9m9vhjd6xcxdb4m189p30bwbjrjjf20bq12w4h2v1xa"; + version = "1.21"; + sha256 = "00gsayb7axxm8z9jrngckb7c666x1kibvln67g2rpchi6djg6wn7"; isLibrary = false; isExecutable = true; buildDepends = [ hackageDb HTTP mtl nixosTypes regexPosix ]; From 64c0b00bbd6a6766c1dedcccff63772bf95998dd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andres=20L=C3=B6h?= Date: Sun, 11 Dec 2011 17:19:36 +0000 Subject: [PATCH 917/970] Linking the complete topdir of GHC in ghc-with-packages. svn path=/nixpkgs/trunk/; revision=30826 --- pkgs/development/compilers/ghc/with-packages.nix | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/pkgs/development/compilers/ghc/with-packages.nix b/pkgs/development/compilers/ghc/with-packages.nix index 937411eab78..19ce4eabf42 100644 --- a/pkgs/development/compilers/ghc/with-packages.nix +++ b/pkgs/development/compilers/ghc/with-packages.nix @@ -21,11 +21,14 @@ stdenv.mkDerivation rec { echo "Linking GHC core libraries:" - if test -f $originalTopDir/settings; then - echo -n "Linking $originalTopDir/settings " - ln -s $originalTopDir/settings $linkedTopDir - echo . - fi + echo -n "Linking $originalTopDir " + for f in $originalTopDir/*; do + if test -f $f; then + ln -s $f $linkedTopDir + echo -n . + fi + done + echo echo -n "Linking $originalPkgDir " for f in $originalPkgDir/*.conf; do From 95d34b93c4f76199603f2b5fb96437ec72766626 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Sun, 11 Dec 2011 18:00:57 +0000 Subject: [PATCH 918/970] haskell-packages.nix: use text 0.11.0.6 when building with ghc 6.10.4 Newer versions of that library don't build with that old compiler, and 'text' is a fairly low-level library on which many others depend. svn path=/nixpkgs/trunk/; revision=30827 --- pkgs/top-level/haskell-packages.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix index ff1e98e3ff8..e2169280610 100644 --- a/pkgs/top-level/haskell-packages.nix +++ b/pkgs/top-level/haskell-packages.nix @@ -360,6 +360,7 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y); self : self.haskellPlatformArgs_2009_2_0_2 self // { haskellPlatform = self.haskellPlatform_2009_2_0_2; extensibleExceptions = self.extensibleExceptions_0_1_1_0; + text = self.text_0_11_0_6; repaExamples = null; # don't pick this version of 'repa-examples' during nix-env -u }; From 6569f68dde909de5706d8b7de516f08643ba6db3 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Sun, 11 Dec 2011 18:01:00 +0000 Subject: [PATCH 919/970] haskell-packages.nix: use the current version of parsec 3.x with GHC 7.2 or later svn path=/nixpkgs/trunk/; revision=30828 --- pkgs/top-level/haskell-packages.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix index e2169280610..27e3f8d8991 100644 --- a/pkgs/top-level/haskell-packages.nix +++ b/pkgs/top-level/haskell-packages.nix @@ -143,7 +143,7 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y); network = self.network_2_3_0_7; # 7.2 ok, 7.3 ok OpenGL = self.OpenGL_2_2_3_0; # 7.2 ok, 7.3 ok parallel = self.parallel_3_1_0_1; # 7.2 ok, 7.3 ok - parsec = self.parsec_3_1_1; # 7.2 ok, 7.3 ok + parsec = self.parsec_3_1_2; # 7.2 ok, 7.3 ok QuickCheck = self.QuickCheck_2_4_0_1; # 7.2 ok, 7.3 ok regexBase = self.regexBase_0_93_2; # 7.2 ok, 7.3 ok regexCompat = self.regexCompat_0_93_1; # 7.2 ok, 7.3 ok @@ -957,7 +957,7 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y); parsec_3_1_2 = callPackage ../development/libraries/haskell/parsec/3.1.2.nix {}; parsec2 = self.parsec_2_1_0_1; parsec3 = self.parsec_3_1_2; - parsec = self.parsec2; + parsec = self.parsec3; parsimony = callPackage ../development/libraries/haskell/parsimony {}; From 0f1e1249e798cd53938dd90b06c0019d5b166545 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Sun, 11 Dec 2011 18:01:03 +0000 Subject: [PATCH 920/970] haskell-packages.nix: xmobar requires parsec 3 Adding this explicit override fixes the GHC 6.10.4 build. svn path=/nixpkgs/trunk/; revision=30829 --- pkgs/top-level/haskell-packages.nix | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix index 27e3f8d8991..8984761c2fb 100644 --- a/pkgs/top-level/haskell-packages.nix +++ b/pkgs/top-level/haskell-packages.nix @@ -1443,7 +1443,9 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y); leksah = callPackage ../applications/editors/leksah {}; - xmobar = callPackage ../applications/misc/xmobar {}; + xmobar = callPackage ../applications/misc/xmobar { + parsec = self.parsec3; + }; xmonad = callPackage ../applications/window-managers/xmonad {}; From 88b400f927252bd6322aa33c4a628b5072b45757 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Sun, 11 Dec 2011 18:01:07 +0000 Subject: [PATCH 921/970] haskell-mime-mail: updated to version 0.4.1.0 svn path=/nixpkgs/trunk/; revision=30830 --- pkgs/development/libraries/haskell/mime-mail/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/development/libraries/haskell/mime-mail/default.nix b/pkgs/development/libraries/haskell/mime-mail/default.nix index 1b3f3c30a14..db2734c8739 100644 --- a/pkgs/development/libraries/haskell/mime-mail/default.nix +++ b/pkgs/development/libraries/haskell/mime-mail/default.nix @@ -1,10 +1,10 @@ -{ cabal, blazeBuilder, dataenc, random, text }: +{ cabal, base64Bytestring, blazeBuilder, random, text }: cabal.mkDerivation (self: { pname = "mime-mail"; - version = "0.4"; - sha256 = "0hlyk3mypn9iw7g8hhn528ycbm3qayiczwf4paw0sxd6xsg9a28s"; - buildDepends = [ blazeBuilder dataenc random text ]; + version = "0.4.1.0"; + sha256 = "1czjxxpv2w8zvwm6nkv0rr47rdl84s5f5xvf3r4kjaw44a6jfgg0"; + buildDepends = [ base64Bytestring blazeBuilder random text ]; meta = { homepage = "http://github.com/snoyberg/mime-mail"; description = "Compose MIME email messages"; From 57d245507be56b41c2aad0ae43011d3f8a078b76 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Sun, 11 Dec 2011 18:01:10 +0000 Subject: [PATCH 922/970] haskell-smallcheck: updated to version 0.6 svn path=/nixpkgs/trunk/; revision=30831 --- .../development/libraries/haskell/smallcheck/default.nix | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/pkgs/development/libraries/haskell/smallcheck/default.nix b/pkgs/development/libraries/haskell/smallcheck/default.nix index b4775394946..d8a9bf24f55 100644 --- a/pkgs/development/libraries/haskell/smallcheck/default.nix +++ b/pkgs/development/libraries/haskell/smallcheck/default.nix @@ -1,12 +1,13 @@ -{ cabal }: +{ cabal, dlist }: cabal.mkDerivation (self: { pname = "smallcheck"; - version = "0.5"; - sha256 = "10bmaifpkd5h3fp76cgbbc21q6nd0v8b3f80fjnb1ggg5zqs10dv"; + version = "0.6"; + sha256 = "19b2dyjbryx2a5bq70pn2mbzlcvjjwhii78fwwx6q57r13zljb9v"; + buildDepends = [ dlist ]; meta = { homepage = "https://github.com/feuerbach/smallcheck"; - description = "Another lightweight testing library in Haskell"; + description = "A property-based testing library"; license = self.stdenv.lib.licenses.bsd3; platforms = self.ghc.meta.platforms; maintainers = [ From ec962155bc2151eeed190b01aa0d4aeafa87925f Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Sun, 11 Dec 2011 18:01:13 +0000 Subject: [PATCH 923/970] haskell-tagsoup: updated to version 0.12.6 svn path=/nixpkgs/trunk/; revision=30832 --- pkgs/development/libraries/haskell/tagsoup/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/tagsoup/default.nix b/pkgs/development/libraries/haskell/tagsoup/default.nix index a8dfe9b83c9..a6fcea3c1c2 100644 --- a/pkgs/development/libraries/haskell/tagsoup/default.nix +++ b/pkgs/development/libraries/haskell/tagsoup/default.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "tagsoup"; - version = "0.12.5"; - sha256 = "1l7c0mk8b6rfk5i8h6j3pa4qma8lvmjk40jjxdj2b0wznyr907dm"; + version = "0.12.6"; + sha256 = "1q1dzsaj131fcvibka72i7si1i0gxkz5d9zl0akd8mbapy5mmlv5"; isLibrary = true; isExecutable = true; buildDepends = [ text ]; From a8567429505ef609441779e45d571673324aea54 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Sun, 11 Dec 2011 18:35:20 +0000 Subject: [PATCH 924/970] torchat: tell Hydra that it shouldn't attempt to build that package an Cygwin (fails with an assertion) svn path=/nixpkgs/trunk/; revision=30833 --- .../networking/instant-messengers/torchat/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/applications/networking/instant-messengers/torchat/default.nix b/pkgs/applications/networking/instant-messengers/torchat/default.nix index a63b2045276..440ab624a62 100644 --- a/pkgs/applications/networking/instant-messengers/torchat/default.nix +++ b/pkgs/applications/networking/instant-messengers/torchat/default.nix @@ -33,6 +33,6 @@ stdenv.mkDerivation rec { description = "instant messaging application on top of the Tor network and it's location hidden services"; license = licenses.gpl3; maintainers = [ maintainers.phreedom ]; - platforms = platforms.all; + platforms = platforms.unix; }; } From 0d7a0a502e9a2f96a20658e1ce7d240f34227a23 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Sun, 11 Dec 2011 18:35:23 +0000 Subject: [PATCH 925/970] spring: tell Hydra that it shouldn't attempt to build that package an Cygwin (fails with an assertion) svn path=/nixpkgs/trunk/; revision=30834 --- pkgs/games/spring/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/games/spring/default.nix b/pkgs/games/spring/default.nix index 1599b6f7644..2991f3de92e 100644 --- a/pkgs/games/spring/default.nix +++ b/pkgs/games/spring/default.nix @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { prePatch = '' substituteInPlace cont/base/make_gamedata_arch.sh --replace "#!/bin/sh" "#!${stdenv.shell}/bin/sh" \ - --replace "which" "type -p" + --replace "which" "type -p" ''; #patches = [ ./gcc44.patch]; @@ -32,6 +32,6 @@ stdenv.mkDerivation rec { description = "A powerful real-time strategy(RTS) game engine"; license = licenses.gpl2; maintainers = [ maintainers.phreedom ]; - platforms = platforms.all; + platforms = platforms.unix; }; -} \ No newline at end of file +} From 80371eb91e246cfccd8339ac744f8daaefe25b11 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Sun, 11 Dec 2011 19:38:51 +0000 Subject: [PATCH 926/970] upgraded ehc to latest svn release svn path=/nixpkgs/trunk/; revision=30835 --- pkgs/development/compilers/ehc/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/compilers/ehc/default.nix b/pkgs/development/compilers/ehc/default.nix index 27a0c431f67..d23d68db56e 100644 --- a/pkgs/development/compilers/ehc/default.nix +++ b/pkgs/development/compilers/ehc/default.nix @@ -3,7 +3,7 @@ }: let - revision = "2293"; + revision = "2375"; in stdenv.mkDerivation { name = "ehc-svn-${revision}"; @@ -11,7 +11,7 @@ stdenv.mkDerivation { src = fetchsvn { url = https://subversion.cs.uu.nl/repos/project.UHC.pub/trunk/EHC; rev = revision; - sha256 = "f4c3d83734cffd64b11e31637598330271a2bb8d2573235d063b27b2ef5f76b6"; + sha256 = "bde79664b7d04337ce668eab63291702687e6d572a302111425e5ff870c57619"; }; propagatedBuildInputs = [mtl network binary fgl syb]; From 957397a749dfe17df0073ef10aec88510c1fd784 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Sun, 11 Dec 2011 19:38:57 +0000 Subject: [PATCH 927/970] upgraded nodejs svn path=/nixpkgs/trunk/; revision=30836 --- pkgs/development/web/nodejs/default.nix | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/pkgs/development/web/nodejs/default.nix b/pkgs/development/web/nodejs/default.nix index 909f0d39fbd..75776416cfc 100644 --- a/pkgs/development/web/nodejs/default.nix +++ b/pkgs/development/web/nodejs/default.nix @@ -1,19 +1,24 @@ -{ stdenv, fetchurl, openssl, python }: +{ stdenv, fetchurl, openssl, python, zlib }: stdenv.mkDerivation rec { - version = "0.5.4"; + version = "0.6.5"; name = "nodejs-${version}"; src = fetchurl { url = "http://nodejs.org/dist/v${version}/node-v${version}.tar.gz"; - sha256 = "d32d3af4e3286b383640df857d76c2fcca1a2e2cb85abb484483a0a49d09ae71"; + sha256 = "72364d240fb61e678897c099df6f2913857c5931aa9b1f44e73e432d4629ca2f"; }; + configureFlags = [ + "--openssl-includes=${openssl}/include" + "--openssl-libpath=${openssl}/lib" + ]; + patchPhase = '' sed -e 's|^#!/usr/bin/env python$|#!${python}/bin/python|g' -i tools/{*.py,waf-light,node-waf} ''; - buildInputs = [ python openssl ]; + buildInputs = [ python openssl zlib]; meta = with stdenv.lib; { description = "Event-driven I/O framework for the V8 JavaScript engine"; From a9d9b9714e89f2ed55d013c528883543d2b456b7 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Sun, 11 Dec 2011 19:39:00 +0000 Subject: [PATCH 928/970] stay at older uuagc for now, newer breaks UHC svn path=/nixpkgs/trunk/; revision=30837 --- pkgs/development/tools/haskell/uuagc/bootstrap.nix | 4 ++-- pkgs/development/tools/haskell/uuagc/default.nix | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/development/tools/haskell/uuagc/bootstrap.nix b/pkgs/development/tools/haskell/uuagc/bootstrap.nix index 8d1c111cc20..2110f258229 100644 --- a/pkgs/development/tools/haskell/uuagc/bootstrap.nix +++ b/pkgs/development/tools/haskell/uuagc/bootstrap.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "uuagc-bootstrap"; - version = "0.9.39.3.0"; - sha256 = "0y1ipxkh9rl4mvw9a83dx0slr0ry1yw670z3w3dlb716xyzqyg5z"; + version = "0.9.39.1.0"; + sha256 = "06w330j0nds5piv1rr3m6m1idnf0c5swfk9qwdqzi0pmpws6lpkj"; isLibrary = true; isExecutable = true; buildDepends = [ haskellSrcExts mtl uulib ]; diff --git a/pkgs/development/tools/haskell/uuagc/default.nix b/pkgs/development/tools/haskell/uuagc/default.nix index 23949ca006e..417f430ba9b 100644 --- a/pkgs/development/tools/haskell/uuagc/default.nix +++ b/pkgs/development/tools/haskell/uuagc/default.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "uuagc"; - version = "0.9.39.3"; - sha256 = "15wm7r7p9bzhad9nshv0r11h7if581dvlkyagx2whldk40clnk48"; + version = "0.9.39.1"; + sha256 = "0zqhwpafq51czy97z0f93cbxd8k6hllnmb24a6yzr4y6kzzv65hd"; isLibrary = true; isExecutable = true; buildDepends = [ From c561cbe8c874f794cba04d5c2805497b9ecf05ed Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Sun, 11 Dec 2011 19:39:06 +0000 Subject: [PATCH 929/970] upgraded mc svn path=/nixpkgs/trunk/; revision=30838 --- pkgs/tools/misc/mc/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/misc/mc/default.nix b/pkgs/tools/misc/mc/default.nix index d3ea7a38a74..cc8fbacca6f 100644 --- a/pkgs/tools/misc/mc/default.nix +++ b/pkgs/tools/misc/mc/default.nix @@ -2,11 +2,11 @@ , libX11, libICE, perl, zip, unzip, gettext, slang}: stdenv.mkDerivation rec { - name = "mc-4.7.5.3"; + name = "mc-4.8.0"; src = fetchurl { - url = http://www.midnight-commander.org/downloads/mc-4.7.5.3.tar.bz2; - sha256 = "1di8fsdg6y98iq3846j145qjk4bf5rgjj2hxnxdbcwfp8p3v8x88"; + url = http://www.midnight-commander.org/downloads/mc-4.8.0.tar.bz2; + sha256 = "dbf077b318c13fc6d465dc67bd43958f067b9ff7e21041975bd14927dfa31b52"; }; buildInputs = [ pkgconfig perl glib gpm slang zip unzip file gettext libX11 libICE e2fsprogs ]; From ba935dcbc03b8a51f91bb62fb131830b99e66855 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Sun, 11 Dec 2011 19:39:12 +0000 Subject: [PATCH 930/970] upgraded cryptsetup svn path=/nixpkgs/trunk/; revision=30839 --- pkgs/os-specific/linux/cryptsetup/default.nix | 16 +++++----------- 1 file changed, 5 insertions(+), 11 deletions(-) diff --git a/pkgs/os-specific/linux/cryptsetup/default.nix b/pkgs/os-specific/linux/cryptsetup/default.nix index 765a49c6446..962de55a156 100644 --- a/pkgs/os-specific/linux/cryptsetup/default.nix +++ b/pkgs/os-specific/linux/cryptsetup/default.nix @@ -1,19 +1,13 @@ -{stdenv, fetchurl, libuuid, popt, devicemapper, udev }: +{stdenv, fetchurl, libuuid, popt, devicemapper, libgcrypt }: stdenv.mkDerivation { - name = "cryptsetup-1.0.6"; + name = "cryptsetup-1.4.1"; src = fetchurl { - url = http://cryptsetup.googlecode.com/files/cryptsetup-1.0.6.tar.bz2; - sha256 = "df7fda80cfa01f063caf39140287a47d018dfe056fc71a3ba605e690ff0183fd"; + url = http://cryptsetup.googlecode.com/files/cryptsetup-1.4.1.tar.bz2; + sha256 = "82b143328c2b427ef2b89fb76c701d311c95b54093c21bbf22342f7b393bddcb"; }; - configureFlags = [ "--enable-libdevmapper" ]; - - patchPhase = '' - sed -i -e 's@/sbin/udevsettle@${udev}/sbin/udevadm settle@' lib/libdevmapper.c - ''; - - buildInputs = [ libuuid popt devicemapper ]; + buildInputs = [ libuuid popt devicemapper libgcrypt ]; meta = { homepage = http://code.google.com/p/cryptsetup/; From 9dab7db8a2750196d5f4b9aeae7e88871bd965ac Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Sun, 11 Dec 2011 19:39:16 +0000 Subject: [PATCH 931/970] added git support to builder-defs svn path=/nixpkgs/trunk/; revision=30840 --- pkgs/build-support/builder-defs/builder-defs.nix | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/pkgs/build-support/builder-defs/builder-defs.nix b/pkgs/build-support/builder-defs/builder-defs.nix index 58c439e4316..ba13a0911f7 100644 --- a/pkgs/build-support/builder-defs/builder-defs.nix +++ b/pkgs/build-support/builder-defs/builder-defs.nix @@ -25,6 +25,7 @@ let inherit (builtins) head tail trace; in else if (hasSuffixHack ".tar.xz" s) then "tar.xz" else if (hasSuffixHack ".zip" s) || (hasSuffixHack ".ZIP" s) then "zip" else if (hasSuffixHack "-cvs-export" s) then "cvs-dir" + else if (hasSuffixHack "-git-export" s) then "git-dir" else if (hasSuffixHack ".nar.bz2" s) then "narbz2" else if (hasSuffixHack ".rpm" s) then "rpm" @@ -228,6 +229,10 @@ let inherit (builtins) head tail trace; in cp -r '${s}' . cd \$(basename ${s}) chmod u+rwX -R . + " else if (archiveType s) == "git-dir" then " + cp -r '${s}' . + cd \$(basename ${s}) + chmod u+rwX -R . " else if (archiveType s) == "dir" then " cp -r '${s}' . cd \$(basename ${s}) From f06abc04c583ef2bac1a78a22fa5bdea719d3271 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Sun, 11 Dec 2011 19:54:40 +0000 Subject: [PATCH 932/970] The EHC compiler is now called UHC. svn path=/nixpkgs/trunk/; revision=30841 --- pkgs/development/compilers/{ehc => uhc}/default.nix | 13 +++++++------ pkgs/top-level/haskell-packages.nix | 2 +- 2 files changed, 8 insertions(+), 7 deletions(-) rename pkgs/development/compilers/{ehc => uhc}/default.nix (74%) diff --git a/pkgs/development/compilers/ehc/default.nix b/pkgs/development/compilers/uhc/default.nix similarity index 74% rename from pkgs/development/compilers/ehc/default.nix rename to pkgs/development/compilers/uhc/default.nix index d23d68db56e..0baba9c603e 100644 --- a/pkgs/development/compilers/ehc/default.nix +++ b/pkgs/development/compilers/uhc/default.nix @@ -6,10 +6,10 @@ let revision = "2375"; in stdenv.mkDerivation { - name = "ehc-svn-${revision}"; + name = "uhc-svn-${revision}"; src = fetchsvn { - url = https://subversion.cs.uu.nl/repos/project.UHC.pub/trunk/EHC; + url = "https://subversion.cs.uu.nl/repos/project.UHC.pub/trunk/EHC"; rev = revision; sha256 = "bde79664b7d04337ce668eab63291702687e6d572a302111425e5ff870c57619"; }; @@ -17,14 +17,15 @@ stdenv.mkDerivation { propagatedBuildInputs = [mtl network binary fgl syb]; buildInputs = [coreutils m4 ghc libtool uulib uuagc]; + # Can we rename this flag to "--with-cpp-uhc-options"? configureFlags = "--with-cpp-ehc-options=-I${glibc}/include"; - # EHC builds packages during compilation; these are by default + # UHC builds packages during compilation; these are by default # installed in the user-specific package config file. We do not # want that, and hack the build process to use a temporary package # configuration file instead. preConfigure = '' - p=`pwd`/ehc-local-packages + p=`pwd`/uhc-local-packages echo '[]' > $p sed -i "s|--user|--package-db=$p|g" mk/shared.mk.in sed -i "s|-fglasgow-exts|-fglasgow-exts -package-conf=$p|g" mk/shared.mk.in @@ -32,8 +33,8 @@ stdenv.mkDerivation { ''; meta = { - homepage = "http://www.cs.uu.nl/wiki/Ehc/WebHome"; - description = "Essential Haskell Compiler"; + homepage = "http://www.cs.uu.nl/wiki/UHC"; + description = "Utrecht Haskell Compiler"; platforms = stdenv.lib.platforms.linux; maintainers = [ stdenv.lib.maintainers.andres diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix index 8984761c2fb..ea2e01f9458 100644 --- a/pkgs/top-level/haskell-packages.nix +++ b/pkgs/top-level/haskell-packages.nix @@ -1376,7 +1376,7 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y); AgdaExecutable = callPackage ../development/compilers/Agda-executable {}; - ehc = callPackage ../development/compilers/ehc {}; + uhc = callPackage ../development/compilers/uhc {}; epic = callPackage ../development/compilers/epic {}; From 1f115a37a547e3e4a4a54b18d3b22989094865d8 Mon Sep 17 00:00:00 2001 From: Shea Levy Date: Sun, 11 Dec 2011 22:01:20 +0000 Subject: [PATCH 933/970] Ruby should work on all platforms svn path=/nixpkgs/trunk/; revision=30842 --- pkgs/development/interpreters/ruby/ruby-19.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/development/interpreters/ruby/ruby-19.nix b/pkgs/development/interpreters/ruby/ruby-19.nix index 82e45a01c16..5e406509a8c 100644 --- a/pkgs/development/interpreters/ruby/ruby-19.nix +++ b/pkgs/development/interpreters/ruby/ruby-19.nix @@ -42,6 +42,7 @@ stdenv.mkDerivation rec { license = "Ruby"; homepage = "http://www.ruby-lang.org/en/"; description = "The Ruby language"; + platforms = stdenv.lib.platforms.all; }; passthru = rec { From 1c3b3d70bbb5babcb3e76bb12c776cac7e57d09d Mon Sep 17 00:00:00 2001 From: Shea Levy Date: Sun, 11 Dec 2011 22:16:15 +0000 Subject: [PATCH 934/970] Update rubygems, adding sass along the way svn path=/nixpkgs/trunk/; revision=30844 --- .../interpreters/ruby/generated.nix | 38 +++++++++++++------ 1 file changed, 27 insertions(+), 11 deletions(-) diff --git a/pkgs/development/interpreters/ruby/generated.nix b/pkgs/development/interpreters/ruby/generated.nix index c1c49d7bf76..5b3d11a2d94 100644 --- a/pkgs/development/interpreters/ruby/generated.nix +++ b/pkgs/development/interpreters/ruby/generated.nix @@ -15,10 +15,10 @@ g: # Get dependencies from patched gems erubis = g.erubis_2_7_0; hike = g.hike_1_2_1; i18n = g.i18n_0_6_0; - json = g.json_1_6_1; + json = g.json_1_6_3; mail = g.mail_2_3_0; mime_types = g.mime_types_1_17_2; - multi_json = g.multi_json_1_0_3; + multi_json = g.multi_json_1_0_4; nix = g.nix_0_1_1; polyglot = g.polyglot_0_3_3; rack = g.rack_1_3_5; @@ -30,13 +30,14 @@ g: # Get dependencies from patched gems railties = g.railties_3_1_3; rake = g.rake_0_9_2_2; rdoc = g.rdoc_3_11; + sass = g.sass_3_1_11; sprockets = g.sprockets_2_0_3; thor = g.thor_0_14_6; tilt = g.tilt_1_3_3; treetop = g.treetop_1_4_10; tzinfo = g.tzinfo_0_3_31; }; - gem_nix_args = [ ''nix'' ''rails'' ''rake'' ]; + gem_nix_args = [ ''nix'' ''rails'' ''rake'' ''sass'' ]; gems = { actionmailer_3_1_3 = { basename = ''actionmailer''; @@ -101,7 +102,7 @@ g: # Get dependencies from patched gems longDescription = ''A toolkit of support libraries and Ruby core extensions extracted from the Rails framework. Rich support for multibyte strings, internationalization, time zones, and testing.''; }; name = ''activesupport-3.1.3''; - requiredGems = [ g.multi_json_1_0_3 ]; + requiredGems = [ g.multi_json_1_0_4 ]; sha256 = ''19na7857adshdsswsgygky30r985ng100z3n78scd65481zcgb9z''; }; arel_2_2_1 = { @@ -194,16 +195,16 @@ simple to do. Currently the following builder objects are supported: requiredGems = [ ]; sha256 = ''1pgmfhmh2wv409g7kla30mkp8jpslvp25vcmmim1figl87wpn3j0''; }; - json_1_6_1 = { + json_1_6_3 = { basename = ''json''; meta = { description = ''JSON Implementation for Ruby''; homepage = ''http://flori.github.com/json''; longDescription = ''This is a JSON implementation as a Ruby extension in C.''; }; - name = ''json-1.6.1''; + name = ''json-1.6.3''; requiredGems = [ ]; - sha256 = ''0xxqr491s2xrxy76551jby4fcwdqa222wwhfhxhgwj7prf35sqc4''; + sha256 = ''0bcl6r04b0r5c0n1y47c7d29r50rl2rzd2hsc23832kgfrc1488m''; }; mail_2_3_0 = { basename = ''mail''; @@ -241,16 +242,16 @@ Copyright:: 2002 - 2011, Austin Ziegler requiredGems = [ ]; sha256 = ''0i4pmx86xbnlrhbbm9znnyfglmb21vwjvh262c6qw3m19w6ifs6p''; }; - multi_json_1_0_3 = { + multi_json_1_0_4 = { basename = ''multi_json''; meta = { description = ''A gem to provide swappable JSON backends.''; homepage = ''http://github.com/intridea/multi_json''; longDescription = ''A gem to provide swappable JSON backends utilizing Yajl::Ruby, the JSON gem, JSON pure, or a vendored version of okjson.''; }; - name = ''multi_json-1.0.3''; + name = ''multi_json-1.0.4''; requiredGems = [ ]; - sha256 = ''12c7h38x1cmgl265n4397zx3ag8szkrq1q4lw7pp6fkqd532n9xb''; + sha256 = ''0f2yrlxcdhdskkm4q11p2didwl26wikxycysb7i49ndp94rklvcr''; }; nix_0_1_1 = { basename = ''nix''; @@ -389,9 +390,24 @@ documentation. See RDoc for a description of RDoc's markup and basic use.''; }; name = ''rdoc-3.11''; - requiredGems = [ g.json_1_6_1 ]; + requiredGems = [ g.json_1_6_3 ]; sha256 = ''0wq8525v21pxcnwgn5ypblcsb0xasnicjnqqd7mrrfqm2g3k2frm''; }; + sass_3_1_11 = { + basename = ''sass''; + meta = { + description = ''A powerful but elegant CSS compiler that makes CSS fun again.''; + homepage = ''http://sass-lang.com/''; + longDescription = '' Sass makes CSS fun again. Sass is an extension of CSS3, adding + nested rules, variables, mixins, selector inheritance, and more. + It's translated to well-formatted, standard CSS using the + command line tool or a web-framework plugin. +''; + }; + name = ''sass-3.1.11''; + requiredGems = [ ]; + sha256 = ''0ksbvvc210yd3fjk7gzsj25qzcd5ahw5rsh3bx94w53ylq60af2g''; + }; sprockets_2_0_3 = { basename = ''sprockets''; meta = { From 2585174c99d489d57e08b021f7a78bacacf55698 Mon Sep 17 00:00:00 2001 From: Shea Levy Date: Sun, 11 Dec 2011 22:24:15 +0000 Subject: [PATCH 935/970] Add rb-fsevent gem svn path=/nixpkgs/trunk/; revision=30845 --- pkgs/development/interpreters/ruby/generated.nix | 14 +++++++++++++- 1 file changed, 13 insertions(+), 1 deletion(-) diff --git a/pkgs/development/interpreters/ruby/generated.nix b/pkgs/development/interpreters/ruby/generated.nix index 5b3d11a2d94..1c286aa2ce4 100644 --- a/pkgs/development/interpreters/ruby/generated.nix +++ b/pkgs/development/interpreters/ruby/generated.nix @@ -29,6 +29,7 @@ g: # Get dependencies from patched gems rails = g.rails_3_1_3; railties = g.railties_3_1_3; rake = g.rake_0_9_2_2; + rb_fsevent = g.rb_fsevent_0_4_3_1; rdoc = g.rdoc_3_11; sass = g.sass_3_1_11; sprockets = g.sprockets_2_0_3; @@ -37,7 +38,7 @@ g: # Get dependencies from patched gems treetop = g.treetop_1_4_10; tzinfo = g.tzinfo_0_3_31; }; - gem_nix_args = [ ''nix'' ''rails'' ''rake'' ''sass'' ]; + gem_nix_args = [ ''nix'' ''rails'' ''rake'' ''rb-fsevent'' ''sass'' ]; gems = { actionmailer_3_1_3 = { basename = ''actionmailer''; @@ -378,6 +379,17 @@ request helpers feature.''; requiredGems = [ ]; sha256 = ''19n4qp5gzbcqy9ajh56kgwqv9p9w2hnczhyvaqz0nlvk9diyng6q''; }; + rb_fsevent_0_4_3_1 = { + basename = ''rb_fsevent''; + meta = { + description = ''Very simple & usable FSEvents API''; + homepage = ''http://rubygems.org/gems/rb-fsevent''; + longDescription = ''FSEvents API with Signals catching (without RubyCocoa)''; + }; + name = ''rb-fsevent-0.4.3.1''; + requiredGems = [ ]; + sha256 = ''043w4695j7f9n0hawy9y0yci36linivsbp23v52v2qg64ji7hsiw''; + }; rdoc_3_11 = { basename = ''rdoc''; meta = { From 05880a4aea562efca00f43284ec767def772d0ba Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= Date: Mon, 12 Dec 2011 08:35:37 +0000 Subject: [PATCH 936/970] GCC 4.6.2. svn path=/nixpkgs/trunk/; revision=30846 --- pkgs/development/compilers/gcc-4.6/default.nix | 2 +- pkgs/development/compilers/gcc-4.6/sources.nix | 16 ++++++++-------- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/pkgs/development/compilers/gcc-4.6/default.nix b/pkgs/development/compilers/gcc-4.6/default.nix index 03d3b235f10..5fdb61576fa 100644 --- a/pkgs/development/compilers/gcc-4.6/default.nix +++ b/pkgs/development/compilers/gcc-4.6/default.nix @@ -46,7 +46,7 @@ assert cloog != null -> cloogppl == null; with stdenv.lib; with builtins; -let version = "4.6.1"; +let version = "4.6.2"; javaEcj = fetchurl { # The `$(top_srcdir)/ecj.jar' file is automatically picked up at # `configure' time. diff --git a/pkgs/development/compilers/gcc-4.6/sources.nix b/pkgs/development/compilers/gcc-4.6/sources.nix index e91f3facb8e..dc85ff10b51 100644 --- a/pkgs/development/compilers/gcc-4.6/sources.nix +++ b/pkgs/development/compilers/gcc-4.6/sources.nix @@ -1,31 +1,31 @@ /* Automatically generated by `update-gcc.sh', do not edit. - For GCC 4.6.1. */ + For GCC 4.6.2. */ { fetchurl, optional, version, langC, langCC, langFortran, langJava, langAda, langGo }: -assert version == "4.6.1"; +assert version == "4.6.2"; optional /* langC */ true (fetchurl { url = "mirror://gcc/releases/gcc-${version}/gcc-core-${version}.tar.bz2"; - sha256 = "0bbb8f754a31f29013f6e9ad4c755d92bb0f154a665c4b623e86ae7174d98e33"; + sha256 = "dcbf391f05277b7e09d14d54f3bdaba5515a3a8e7dd1d8af93af3f6f68455e10"; }) ++ optional langCC (fetchurl { url = "mirror://gcc/releases/gcc-${version}/gcc-g++-${version}.tar.bz2"; - sha256 = "44a91149bf4608aceb03b22209e5ec14ffe0c4003b11e3a368d6cebe5a327901"; + sha256 = "5470bea8093438cf5840fbbef3546b6dba7b0153ef6a16e142c1fba1fac6e598"; }) ++ optional langFortran (fetchurl { url = "mirror://gcc/releases/gcc-${version}/gcc-fortran-${version}.tar.bz2"; - sha256 = "a0069a4452572b46cc20f1a1b52dc839b69c1d25e19c147a782e439d6be0156b"; + sha256 = "492becd732662349eaa5e7c4e458ac009df0ccb8904df54ae295d277c4d6be6f"; }) ++ optional langJava (fetchurl { url = "mirror://gcc/releases/gcc-${version}/gcc-java-${version}.tar.bz2"; - sha256 = "728462275a0532714063803282d1ea815e35b5fd91a96f65a1f0a14da355765f"; + sha256 = "d021a16816daeb5db9a3280909d846b38cbdb4cc0d9aa47714c49b08a81d11f1"; }) ++ optional langAda (fetchurl { url = "mirror://gcc/releases/gcc-${version}/gcc-ada-${version}.tar.bz2"; - sha256 = "0e2958b7be2e7ec9d7847658262ce9276d6c75f91d53c48d7141848cfe3cd093"; + sha256 = "9ac26821ad900d02ed251b62e6a0506ee12417b506a7bb9b02ec9f09e5d9c84f"; }) ++ optional langGo (fetchurl { url = "mirror://gcc/releases/gcc-${version}/gcc-go-${version}.tar.bz2"; - sha256 = "9512347a76c46528d25295cd762f262c8265e99cee497dc2d66caddf9c021198"; + sha256 = "1cafbb254d70f60c39a62a39a3b236674e02c875a1775057ddd33ffafe0fd4e1"; }) ++ [] From b0834a993ea0daa1a417d7d838764c828cee992c Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 12 Dec 2011 14:54:15 +0000 Subject: [PATCH 937/970] haskell-yesod-auth: updated to version 0.7.7.1 svn path=/nixpkgs/trunk/; revision=30849 --- pkgs/development/libraries/haskell/yesod-auth/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/yesod-auth/default.nix b/pkgs/development/libraries/haskell/yesod-auth/default.nix index f652edd99f8..96a951f961d 100644 --- a/pkgs/development/libraries/haskell/yesod-auth/default.nix +++ b/pkgs/development/libraries/haskell/yesod-auth/default.nix @@ -7,8 +7,8 @@ cabal.mkDerivation (self: { pname = "yesod-auth"; - version = "0.7.7"; - sha256 = "0c5icrhi7an7c500y7ply9p1k22gzm5p9rw33szgc78h5p3jwwcg"; + version = "0.7.7.1"; + sha256 = "12gzcrh8siziqd3jgimlgl7rgch8f6jl0fb96krnqpsa682003kc"; buildDepends = [ aeson authenticate blazeHtml controlMonadAttempt hamlet httpEnumerator mimeMail persistent persistentTemplate pureMD5 From 7e82cfb7d6feb6bdce0e7f5c648966473bdb9876 Mon Sep 17 00:00:00 2001 From: Alexander Tsamutali Date: Mon, 12 Dec 2011 17:25:51 +0000 Subject: [PATCH 938/970] Added support for Quake Live to Firefox wrapper. svn path=/nixpkgs/trunk/; revision=30856 --- pkgs/applications/networking/browsers/firefox/wrapper.nix | 4 +++- pkgs/top-level/all-packages.nix | 4 ++++ 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/pkgs/applications/networking/browsers/firefox/wrapper.nix b/pkgs/applications/networking/browsers/firefox/wrapper.nix index 0784b79d8bd..b6ec69ee388 100644 --- a/pkgs/applications/networking/browsers/firefox/wrapper.nix +++ b/pkgs/applications/networking/browsers/firefox/wrapper.nix @@ -1,4 +1,4 @@ -{ stdenv, browser, makeDesktopItem, makeWrapper, plugins +{ stdenv, browser, makeDesktopItem, makeWrapper, plugins, libs , browserName, desktopName, nameSuffix, icon }: @@ -27,6 +27,7 @@ stdenv.mkDerivation { makeWrapper "${browser}/bin/${browserName}" \ "$out/bin/${browserName}${nameSuffix}" \ --suffix-each MOZ_PLUGIN_PATH ':' "$plugins" \ + --suffix-each LD_LIBRARY_PATH ':' "$libs" \ --prefix-contents PATH ':' "$(filterExisting $(addSuffix /extra-bin-path $plugins))" ensureDir $out/share/applications @@ -36,6 +37,7 @@ stdenv.mkDerivation { # Let each plugin tell us (through its `mozillaPlugin') attribute # where to find the plugin in its tree. plugins = map (x: x + x.mozillaPlugin) plugins; + libs = map (x: x + "/lib") libs ++ map (x: x + "/lib64") libs; meta = { description = diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index a5ff8291d2e..54ac0298620 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -7557,6 +7557,10 @@ let ++ lib.optional (supportsJDK && getConfig [browserName "jre"] false && jrePlugin ? mozillaPlugin) jrePlugin ++ lib.optional (getConfig [browserName "enableGoogleTalkPlugin"] false) google_talk_plugin ); + libs = + if getConfig [ browserName "enableQuakeLive" ] false + then with xlibs; [ stdenv.gcc libX11 libXxf86dga libXxf86vm libXext libXt alsaLib zlib ] + else [ ]; }; x11vnc = callPackage ../tools/X11/x11vnc { }; From 135fe9059f987b70f6bb7022114afd2e905ae074 Mon Sep 17 00:00:00 2001 From: Karn Kallio Date: Tue, 13 Dec 2011 01:13:46 +0000 Subject: [PATCH 939/970] ProofGeneral 4.1 svn path=/nixpkgs/trunk/; revision=30863 --- .../emacs-modes/proofgeneral/default.nix | 18 +++++--- .../emacs-modes/proofgeneral/emacs-23.3.patch | 45 ------------------- 2 files changed, 11 insertions(+), 52 deletions(-) delete mode 100644 pkgs/applications/editors/emacs-modes/proofgeneral/emacs-23.3.patch diff --git a/pkgs/applications/editors/emacs-modes/proofgeneral/default.nix b/pkgs/applications/editors/emacs-modes/proofgeneral/default.nix index ce01d4b9204..34acaa6d880 100644 --- a/pkgs/applications/editors/emacs-modes/proofgeneral/default.nix +++ b/pkgs/applications/editors/emacs-modes/proofgeneral/default.nix @@ -1,28 +1,32 @@ { stdenv, fetchurl, emacs, texinfo, texLive, perl, which, automake }: stdenv.mkDerivation (rec { - name = "ProofGeneral-4.0"; + name = "ProofGeneral-4.1"; src = fetchurl { - url = http://proofgeneral.inf.ed.ac.uk/releases/ProofGeneral-4.0.tgz; - sha256 = "1ang2lsc97vl70fkgypfsr1ivdzsdliq3bkvympj30wnc7ayzbmq"; + url = http://proofgeneral.inf.ed.ac.uk/releases/ProofGeneral-4.1.tgz; + sha256 = "1ivxx8c6j7cfdfj2pj0gzdqac7hpb679bjmwdqdcz1c1ni34s9ia"; }; sourceRoot = name; buildInputs = [ emacs texinfo texLive perl which ]; - patches = [ ./emacs-23.3.patch ]; - - postPatch = + prePatch = '' sed -i "Makefile" \ -e "s|^\(\(DEST_\)\?PREFIX\)=.*$|\1=$out|g ; \ s|/sbin/install-info|install-info|g" sed -i "bin/proofgeneral" -e's/which/type -p/g' + + # @image{ProofGeneral} fails, so remove it. + sed -i '94d' doc/PG-adapting.texi + sed -i '101d' doc/ProofGeneral.texi ''; - preBuild = "make clean"; + preBuild = '' + make clean; + ''; installPhase = # Copy `texinfo.tex' in the right place so that `texi2pdf' works. diff --git a/pkgs/applications/editors/emacs-modes/proofgeneral/emacs-23.3.patch b/pkgs/applications/editors/emacs-modes/proofgeneral/emacs-23.3.patch deleted file mode 100644 index 9bbc21a82b8..00000000000 --- a/pkgs/applications/editors/emacs-modes/proofgeneral/emacs-23.3.patch +++ /dev/null @@ -1,45 +0,0 @@ -diff -Nuar ProofGeneral-4.0/contrib/mmm/mmm-mode.el ProofGeneral-4.0-nix/contrib/mmm/mmm-mode.el ---- ProofGeneral-4.0/contrib/mmm/mmm-mode.el 2010-10-11 00:56:57.000000000 +0200 -+++ ProofGeneral-4.0-nix/contrib/mmm/mmm-mode.el 2011-05-14 21:55:12.000000000 +0200 -@@ -160,9 +160,9 @@ - (mmm-add-hooks) - (mmm-fixup-skeleton) - (make-local-variable 'font-lock-fontify-region-function) -- (make-local-variable 'font-lock-beginning-of-syntax-function) -+ (make-local-variable 'syntax-begin-function) - (setq font-lock-fontify-region-function 'mmm-fontify-region -- font-lock-beginning-of-syntax-function 'mmm-beginning-of-syntax) -+ syntax-begin-function 'mmm-beginning-of-syntax) - (setq mmm-mode t) - (condition-case err - (mmm-apply-all) -@@ -190,7 +190,7 @@ - (mmm-update-submode-region) - (setq font-lock-fontify-region-function - (get mmm-primary-mode 'mmm-fontify-region-function) -- font-lock-beginning-of-syntax-function -+ syntax-begin-function - (get mmm-primary-mode 'mmm-beginning-of-syntax-function)) - (mmm-update-font-lock-buffer) - (mmm-refontify-maybe) -diff -Nuar ProofGeneral-4.0/contrib/mmm/mmm-region.el ProofGeneral-4.0-nix/contrib/mmm/mmm-region.el ---- ProofGeneral-4.0/contrib/mmm/mmm-region.el 2010-10-11 00:56:57.000000000 +0200 -+++ ProofGeneral-4.0-nix/contrib/mmm/mmm-region.el 2011-05-14 21:58:01.000000000 +0200 -@@ -548,7 +548,7 @@ - (put mode 'mmm-fontify-region-function - font-lock-fontify-region-function)) - (put mode 'mmm-beginning-of-syntax-function -- font-lock-beginning-of-syntax-function)) -+ syntax-begin-function)) - ;; Get variables - (setq global-vars (mmm-get-locals 'global) - buffer-vars (mmm-get-locals 'buffer) -@@ -768,7 +768,7 @@ - ;; For some reason `font-lock-fontify-block' binds this to nil, thus - ;; preventing `mmm-beginning-of-syntax' from doing The Right Thing. - ;; I don't know why it does this, but let's undo it here. -- (let ((font-lock-beginning-of-syntax-function 'mmm-beginning-of-syntax)) -+ (let ((syntax-begin-function 'mmm-beginning-of-syntax)) - (mapc #'(lambda (elt) - (when (get (car elt) 'mmm-font-lock-mode) - (mmm-fontify-region-list (car elt) (cdr elt)))) From f9227dc45942c329b29b02a2c4e27711e4be01ed Mon Sep 17 00:00:00 2001 From: Michael Raskin <7c6f434c@mail.ru> Date: Tue, 13 Dec 2011 04:30:49 +0000 Subject: [PATCH 940/970] Update BtrFS utilities to latest Git svn path=/nixpkgs/trunk/; revision=30864 --- pkgs/tools/filesystems/btrfsprogs/default.nix | 20 +++++++++++++------ .../filesystems/btrfsprogs/glibc212.patch | 12 ----------- 2 files changed, 14 insertions(+), 18 deletions(-) delete mode 100644 pkgs/tools/filesystems/btrfsprogs/glibc212.patch diff --git a/pkgs/tools/filesystems/btrfsprogs/default.nix b/pkgs/tools/filesystems/btrfsprogs/default.nix index 22d7a1164c8..76d185f82d9 100644 --- a/pkgs/tools/filesystems/btrfsprogs/default.nix +++ b/pkgs/tools/filesystems/btrfsprogs/default.nix @@ -1,27 +1,35 @@ a : let fetchurl = a.fetchurl; + fetchgit = a.fetchgit; version = a.lib.attrByPath ["version"] "0.19" a; buildInputs = with a; [ - zlib libuuid acl + zlib libuuid acl attr ]; in assert a.libuuid != null; rec { - src = fetchurl { - url = "http://www.kernel.org/pub/linux/kernel/people/mason/btrfs/btrfs-progs-${version}.tar.bz2"; - sha256 = "1z3hmfgv7h489gnh55abm0gzyf2cgjkybhfc2rnm0cvsx01xv8zq"; + srcDrv = fetchgit { + url="git://git.kernel.org/pub/scm/linux/kernel/git/mason/btrfs-progs.git" ; + rev="fdb6c0402337d9607c7a39155088eaf033742752" ; + sha256="de7f9e04401bd747a831c48d312106e188adb32f32b6d64078ae6d2aab45b1f8" ; }; + src = srcDrv + "/"; + inherit buildInputs; configureFlags = []; makeFlags = ["prefix=$out CFLAGS=-Os"]; - patches = [ ./glibc212.patch ]; - phaseNames = ["doPatch" "doEnsureBtrfsImage" "doMakeInstall"]; + patches = []; + phaseNames = ["fixMakefile" "doEnsureBtrfsImage" "doMakeInstall"]; + + fixMakefile = a.fullDepEntry '' + sed -e 's@^progs = @progs=@g' -i Makefile + '' ["minInit" "doUnpack"]; doEnsureBtrfsImage = a.fullDepEntry ('' if ! grep 'progs = ' Makefile | grep btrfs-image; then diff --git a/pkgs/tools/filesystems/btrfsprogs/glibc212.patch b/pkgs/tools/filesystems/btrfsprogs/glibc212.patch deleted file mode 100644 index 8bc1873f540..00000000000 --- a/pkgs/tools/filesystems/btrfsprogs/glibc212.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff --git a/btrfsck.c b/btrfsck.c -index 73f1836..c1f47a1 100644 ---- a/btrfsck.c -+++ b/btrfsck.c -@@ -21,6 +21,7 @@ - #include - #include - #include -+#include - #include "kerncompat.h" - #include "ctree.h" - #include "disk-io.h" From 9cc0637247f18c1dfb17a4ad31e9e919778c3b00 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Tue, 13 Dec 2011 12:43:11 +0000 Subject: [PATCH 941/970] * Add xinetd to the channel. svn path=/nixpkgs/trunk/; revision=30865 --- pkgs/servers/xinetd/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/servers/xinetd/default.nix b/pkgs/servers/xinetd/default.nix index 0f2608465ff..6f752a7194f 100644 --- a/pkgs/servers/xinetd/default.nix +++ b/pkgs/servers/xinetd/default.nix @@ -10,6 +10,7 @@ stdenv.mkDerivation rec { meta = { description = "Secure replacement for inetd"; + platforms = stdenv.lib.platforms.linux; homepage = http://xinetd.org; license = "free"; }; From 79819a5262e0650328b18272bfb32069a1057055 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= Date: Tue, 13 Dec 2011 14:54:15 +0000 Subject: [PATCH 942/970] Wicd: Protect the password in the WPA2-TTLS template. svn path=/nixpkgs/trunk/; revision=30867 --- pkgs/tools/networking/wicd/wpa2-ttls | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/tools/networking/wicd/wpa2-ttls b/pkgs/tools/networking/wicd/wpa2-ttls index 7efdeffec84..c5ac798be5d 100644 --- a/pkgs/tools/networking/wicd/wpa2-ttls +++ b/pkgs/tools/networking/wicd/wpa2-ttls @@ -2,6 +2,7 @@ name = WPA2-TTLS author = various contributors version = 1 require identity *Identity anonymous_identity *Anonymous_identity password *Password ca_cert *Path_to_CA_Cert +protected password *Password ----- ctrl_interface=/var/run/wpa_supplicant network={ From de2e9e6ab0644a3c115203f1331d449efb25565e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= Date: Tue, 13 Dec 2011 16:11:02 +0000 Subject: [PATCH 943/970] gnupdate: Really select `stdenv' packages when asked for it. * maintainers/scripts/gnu/gnupdate (gnupdate)[selected-gnu-packages]: Really limit to `stdenv' when ask for it. svn path=/nixpkgs/trunk/; revision=30869 --- maintainers/scripts/gnu/gnupdate | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/maintainers/scripts/gnu/gnupdate b/maintainers/scripts/gnu/gnupdate index 0b50677464b..6bb379f4fd2 100755 --- a/maintainers/scripts/gnu/gnupdate +++ b/maintainers/scripts/gnu/gnupdate @@ -1065,7 +1065,10 @@ pairs. Example: (\"mit-scheme-9.0.1\" . \"/gnu/mit-scheme/stable.pkg/9.0.1\"). (case selection ((stdenv) - gnu) + (filter (lambda (p) + (member (package-source-output-path p) + (force stdenv))) + gnu)) ((non-stdenv) (filter (lambda (p) (not (member (package-source-output-path p) From cbd660a83ec6a3a57f018c867e4f1001d4fc0650 Mon Sep 17 00:00:00 2001 From: Michael Raskin <7c6f434c@mail.ru> Date: Tue, 13 Dec 2011 18:53:40 +0000 Subject: [PATCH 944/970] Oops, forgot to commit svn path=/nixpkgs/trunk/; revision=30872 --- pkgs/top-level/all-packages.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 54ac0298620..ec3cc370633 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -419,7 +419,7 @@ let bootchart = callPackage ../tools/system/bootchart { }; btrfsProgs = builderDefsPackage (import ../tools/filesystems/btrfsprogs) { - inherit libuuid zlib acl; + inherit libuuid zlib acl attr fetchgit; }; catdoc = callPackage ../tools/text/catdoc { }; From 77e3784e9ac45bdaecd4a4f17e228c3443052db8 Mon Sep 17 00:00:00 2001 From: Michael Raskin <7c6f434c@mail.ru> Date: Tue, 13 Dec 2011 21:00:26 +0000 Subject: [PATCH 945/970] Dir-per-version SF layout seems to be more relevant now svn path=/nixpkgs/trunk/; revision=30873 --- .../upstream-updater/update-upstream-data.sh | 36 +++++++++++++++++++ 1 file changed, 36 insertions(+) diff --git a/pkgs/build-support/upstream-updater/update-upstream-data.sh b/pkgs/build-support/upstream-updater/update-upstream-data.sh index 8e4f4490e7b..38c0d13a723 100755 --- a/pkgs/build-support/upstream-updater/update-upstream-data.sh +++ b/pkgs/build-support/upstream-updater/update-upstream-data.sh @@ -36,6 +36,42 @@ baseName="$(getAttr baseName 'unnamed-package')" commonPrefetchVars=" version name hash" prefetchClause="" +[ fetchSFdirs = "$method" ] && { + if [ -z "$forcedUrl" ]; then + freshUrl="$("$own_dir"/urls-from-page.sh "$(getAttr downloadPage)" | + eval "egrep '$(getAttr sourceRegexp '[-][0-9.]+/$')'" | + eval "egrep -v '$(getAttr blacklistRegexp '^$')'" | + eval "$(getAttr choiceCommand 'head -n 1')" | + eval "$(getAttr versionToFileCommand "sed -re 's@/([^/]*-[0-9.]+)/@/\1/\1$(getAttr fileSuffix .tar.gz)@'")" + )" + + if ! egrep ':' <<< "$freshUrl" ; then + freshUrl="$(dirname "$(getAttr downloadPage).")/$freshUrl" + fi + + echo "Found download link: $freshUrl" >&2 + else + freshUrl="$forcedUrl" + fi + + freshUrl="$(echo "$freshUrl" | sed -re "$skipRedirectSF")" + echo "Sourceforge-corrected URL: $freshUrl" >&2 + + version="$(echo "$freshUrl" | + sed -re "$(getAttr versionExtractorSedScript "$extractVersionSF")")" + baseName="$(getAttr baseName "$(echo "$freshUrl" | sed -re 's@.*/project/([^/]+)/.*@\1@')")" + url="$freshUrl" + name="$baseName-$version" + advertisedUrl="$freshUrl" + + if [ x"$freshUrl" = x"$(cat "$src_defs_dir"/advertisedUrl)" ]; then + echo "Source link not changed" >&2 + exit + fi + hash=$(nix-prefetch-url "$freshUrl") + + prefetchVars="url advertisedUrl"; +} [ fetchSF = "$method" ] && { if [ -z "$forcedUrl" ]; then freshUrl="$("$own_dir"/urls-from-page.sh "$(getAttr downloadPage)" | From d5c702939c3205ad6b50c95909ae0432ab45ed31 Mon Sep 17 00:00:00 2001 From: Michael Raskin <7c6f434c@mail.ru> Date: Tue, 13 Dec 2011 21:00:42 +0000 Subject: [PATCH 946/970] Update Golly svn path=/nixpkgs/trunk/; revision=30874 --- pkgs/applications/science/misc/golly/default.nix | 10 +--------- pkgs/applications/science/misc/golly/make-install.make | 9 --------- .../science/misc/golly/src-for-default.nix | 10 +++++----- .../science/misc/golly/src-info-for-default.nix | 5 +++-- 4 files changed, 9 insertions(+), 25 deletions(-) delete mode 100644 pkgs/applications/science/misc/golly/make-install.make diff --git a/pkgs/applications/science/misc/golly/default.nix b/pkgs/applications/science/misc/golly/default.nix index ee2e276c6ca..a380f05b091 100644 --- a/pkgs/applications/science/misc/golly/default.nix +++ b/pkgs/applications/science/misc/golly/default.nix @@ -17,7 +17,7 @@ rec { inherit buildInputs; /* doConfigure should be removed if not needed */ - phaseNames = ["setVars" "doMake" "doDeploy"]; + phaseNames = ["setVars" "doConfigure" "doMakeInstall"]; setVars = a.noDepEntry '' export NIX_LDFLAGS="$NIX_LDFLAGS -lperl -L$(echo "${perl}"/lib/perl5/5*/*/CORE)" pythonLib="$(echo "${python}"/lib/libpython*.so)" @@ -26,14 +26,6 @@ rec { export NIX_LDFLAGS="$NIX_LDFLAGS -l$pythonLib" echo "Flags: $NIX_LDFLAGS" ''; - goSrcDir = ''cd */''; - makeFlags = [ - "-f makefile-gtk" - ]; - doDeploy = a.fullDepEntry '' - cat < ${./make-install.make} >> makefile-gtk - make -f makefile-gtk out="$out" install - '' ["minInit" "doMake" "defEnsureDir"]; meta = { description = "Cellular automata simulation program"; diff --git a/pkgs/applications/science/misc/golly/make-install.make b/pkgs/applications/science/misc/golly/make-install.make deleted file mode 100644 index 1d082e2b6ce..00000000000 --- a/pkgs/applications/science/misc/golly/make-install.make +++ /dev/null @@ -1,9 +0,0 @@ - -install_file = echo "\#! /bin/sh" > "$(out)/bin/$(binfile)"; echo "$(out)/share/golly/$(binfile)" >> "$(out)/bin/$(binfile)"; chmod a+x "$(out)/bin/$(binfile)"; - -install: - mkdir -p "$(out)/share/golly" - mkdir -p "$(out)/bin" - cp -r $(BINFILES) $(SHAREDFILES) "$(out)/share/golly" - $(foreach binfile,$(BINFILES),$(install_file)) - diff --git a/pkgs/applications/science/misc/golly/src-for-default.nix b/pkgs/applications/science/misc/golly/src-for-default.nix index f60df2da315..bf0d9ddada4 100644 --- a/pkgs/applications/science/misc/golly/src-for-default.nix +++ b/pkgs/applications/science/misc/golly/src-for-default.nix @@ -1,9 +1,9 @@ rec { - version="2.1-src"; - name="golly-2.1-src"; - hash="0m9sz0b7pwsxpgvscdvab2q8qnncr337gg3anzgzw83z5zyn3rdz"; - url="http://downloads.sourceforge.net/project/golly/golly/golly-2.1/golly-2.1-src.tar.gz"; - advertisedUrl="http://downloads.sourceforge.net/project/golly/golly/golly-2.1/golly-2.1-src.tar.gz"; + version="2.3-src"; + name="golly-2.3-src"; + hash="12r1lrrn4c1kafzvz5mmfq3750smqv5dwl1xpj3753h0rl9a9gx1"; + url="http://downloads.sourceforge.net/project/golly/golly/golly-2.3/golly-2.3-src.tar.gz"; + advertisedUrl="http://downloads.sourceforge.net/project/golly/golly/golly-2.3/golly-2.3-src.tar.gz"; } diff --git a/pkgs/applications/science/misc/golly/src-info-for-default.nix b/pkgs/applications/science/misc/golly/src-info-for-default.nix index c3bbb262a6f..a83b929f018 100644 --- a/pkgs/applications/science/misc/golly/src-info-for-default.nix +++ b/pkgs/applications/science/misc/golly/src-info-for-default.nix @@ -1,4 +1,5 @@ { - downloadPage = "http://sourceforge.net/projects/golly/files/"; - method="fetchSF"; + downloadPage = "http://sourceforge.net/projects/golly/files/golly"; + method="fetchSFdirs"; + fileSuffix="-src.tar.gz"; } From f6689d01a37aa7b0f0dd74b27a145e56049a672a Mon Sep 17 00:00:00 2001 From: Marco Maggesi Date: Tue, 13 Dec 2011 22:19:06 +0000 Subject: [PATCH 947/970] Update fossil to version 1.21 svn path=/nixpkgs/trunk/; revision=30875 --- .../version-management/fossil/default.nix | 11 +++-------- 1 file changed, 3 insertions(+), 8 deletions(-) diff --git a/pkgs/applications/version-management/fossil/default.nix b/pkgs/applications/version-management/fossil/default.nix index 29aa9843fbe..7b84dcecb63 100644 --- a/pkgs/applications/version-management/fossil/default.nix +++ b/pkgs/applications/version-management/fossil/default.nix @@ -1,16 +1,11 @@ {stdenv, fetchurl, zlib, openssl, tcl, readline, sqlite}: -let - version = "1.20"; - filedate = "20111021125253"; -in - stdenv.mkDerivation { - name = "fossil-${version}"; + name = "fossil-1.21"; src = fetchurl { - url = "http://www.fossil-scm.org/download/fossil-src-${filedate}.tar.gz"; - sha256 = "0m75kw77iray3kbjm1xfn8hr116fn11yv1wr7adcwy314cgj0vv3"; + url = http://www.fossil-scm.org/download/fossil-src-20111213135356.tar.gz; + sha256 = "07g78sf26v7zr4qzcwky4h4zzaaz8apy33d35bhc5ax63z6md1f9"; }; buildInputs = [ zlib openssl readline sqlite ]; From 0e3d2e236ed8bbe84a3ed0675271c1decde544fa Mon Sep 17 00:00:00 2001 From: Michael Raskin <7c6f434c@mail.ru> Date: Wed, 14 Dec 2011 07:27:58 +0000 Subject: [PATCH 948/970] Update Linux kernel to 3.1 svn path=/nixpkgs/trunk/; revision=30876 --- pkgs/os-specific/linux/kernel/linux-3.1.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/linux-3.1.nix b/pkgs/os-specific/linux/kernel/linux-3.1.nix index fbbcf5aaf52..0a44676b4a8 100644 --- a/pkgs/os-specific/linux/kernel/linux-3.1.nix +++ b/pkgs/os-specific/linux/kernel/linux-3.1.nix @@ -215,7 +215,7 @@ in import ./generic.nix ( rec { - version = "3.1.4"; + version = "3.1.5"; preConfigure = '' substituteInPlace scripts/depmod.sh --replace '-b "$INSTALL_MOD_PATH"' "" @@ -223,7 +223,7 @@ import ./generic.nix ( src = fetchurl { url = "mirror://kernel/linux/kernel/v3.x/linux-${version}.tar.bz2"; - sha256 = "0wd43q1m11d4s5ab2kwnga4jvi5racqwlg4pmcp4fqim0q8jl9g6"; + sha256 = "0wdcpfjv56r5cc67ddhprc9vhjxj2qibhp0bl96p3hbqjjpwfpl6"; }; config = configWithPlatform stdenv.platform; From 9d19e4fe06597eac066d62779f52c89d7d3b5e93 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andres=20L=C3=B6h?= Date: Wed, 14 Dec 2011 07:57:52 +0000 Subject: [PATCH 949/970] Added haskell-mongoDB and dependencies. svn path=/nixpkgs/trunk/; revision=30877 --- .../libraries/haskell/bson/default.nix | 23 +++++++++++++++++++ .../haskell/compact-string-fix/default.nix | 17 ++++++++++++++ .../haskell/data-binary-ieee754/default.nix | 20 ++++++++++++++++ .../libraries/haskell/mongoDB/default.nix | 23 +++++++++++++++++++ pkgs/top-level/haskell-packages.nix | 11 +++++++++ 5 files changed, 94 insertions(+) create mode 100644 pkgs/development/libraries/haskell/bson/default.nix create mode 100644 pkgs/development/libraries/haskell/compact-string-fix/default.nix create mode 100644 pkgs/development/libraries/haskell/data-binary-ieee754/default.nix create mode 100644 pkgs/development/libraries/haskell/mongoDB/default.nix diff --git a/pkgs/development/libraries/haskell/bson/default.nix b/pkgs/development/libraries/haskell/bson/default.nix new file mode 100644 index 00000000000..d14b0c990c8 --- /dev/null +++ b/pkgs/development/libraries/haskell/bson/default.nix @@ -0,0 +1,23 @@ +{ cabal, binary, compactStringFix, cryptohash, dataBinaryIeee754 +, mtl, network, time +}: + +cabal.mkDerivation (self: { + pname = "bson"; + version = "0.1.6"; + sha256 = "0w9dab8x6b3dwk2afy0gnmrvcvx2dshwhjvlr2k69nchid4wh823"; + buildDepends = [ + binary compactStringFix cryptohash dataBinaryIeee754 mtl network + time + ]; + meta = { + homepage = "http://github.com/TonyGen/bson-haskell"; + description = "BSON documents are JSON-like objects with a standard binary encoding"; + license = "unknown"; + platforms = self.ghc.meta.platforms; + maintainers = [ + self.stdenv.lib.maintainers.andres + self.stdenv.lib.maintainers.simons + ]; + }; +}) diff --git a/pkgs/development/libraries/haskell/compact-string-fix/default.nix b/pkgs/development/libraries/haskell/compact-string-fix/default.nix new file mode 100644 index 00000000000..416826298bb --- /dev/null +++ b/pkgs/development/libraries/haskell/compact-string-fix/default.nix @@ -0,0 +1,17 @@ +{ cabal }: + +cabal.mkDerivation (self: { + pname = "compact-string-fix"; + version = "0.3.2"; + sha256 = "161z0lmrrqvy77ppdgz7m6nazcmlmy1azxa8rx0cgpqmyxzkf87n"; + meta = { + homepage = "http://twan.home.fmf.nl/compact-string/"; + description = "Same as compact-string except with a small fix so it builds on ghc-6.12"; + license = self.stdenv.lib.licenses.bsd3; + platforms = self.ghc.meta.platforms; + maintainers = [ + self.stdenv.lib.maintainers.andres + self.stdenv.lib.maintainers.simons + ]; + }; +}) diff --git a/pkgs/development/libraries/haskell/data-binary-ieee754/default.nix b/pkgs/development/libraries/haskell/data-binary-ieee754/default.nix new file mode 100644 index 00000000000..48786b509fa --- /dev/null +++ b/pkgs/development/libraries/haskell/data-binary-ieee754/default.nix @@ -0,0 +1,20 @@ +{ cabal, binary }: + +cabal.mkDerivation (self: { + pname = "data-binary-ieee754"; + version = "0.4.2.1"; + sha256 = "0i0nclq8858flpp2sl3czwz6rfaykjrlzpvlfr6vlxzf8zvah9kz"; + isLibrary = true; + isExecutable = true; + buildDepends = [ binary ]; + meta = { + homepage = "http://john-millikin.com/software/data-binary-ieee754/"; + description = "Parser/Serialiser for IEEE-754 floating-point values"; + license = self.stdenv.lib.licenses.mit; + platforms = self.ghc.meta.platforms; + maintainers = [ + self.stdenv.lib.maintainers.andres + self.stdenv.lib.maintainers.simons + ]; + }; +}) diff --git a/pkgs/development/libraries/haskell/mongoDB/default.nix b/pkgs/development/libraries/haskell/mongoDB/default.nix new file mode 100644 index 00000000000..0b59808a53a --- /dev/null +++ b/pkgs/development/libraries/haskell/mongoDB/default.nix @@ -0,0 +1,23 @@ +{ cabal, binary, bson, cryptohash, monadControl, mtl, network +, parsec, random, randomShuffle +}: + +cabal.mkDerivation (self: { + pname = "mongoDB"; + version = "1.1.1"; + sha256 = "0hy47kvswm4g85c3lb75fvdrcnrcbmjrhk15r1jjriwzqicgiimz"; + buildDepends = [ + binary bson cryptohash monadControl mtl network parsec random + randomShuffle + ]; + meta = { + homepage = "http://github.com/TonyGen/mongoDB-haskell"; + description = "Driver (client) for MongoDB, a free, scalable, fast, document DBMS"; + license = "unknown"; + platforms = self.ghc.meta.platforms; + maintainers = [ + self.stdenv.lib.maintainers.andres + self.stdenv.lib.maintainers.simons + ]; + }; +}) diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix index ea2e01f9458..a5e622a08d1 100644 --- a/pkgs/top-level/haskell-packages.nix +++ b/pkgs/top-level/haskell-packages.nix @@ -433,6 +433,8 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y); Boolean = callPackage ../development/libraries/haskell/Boolean {}; + bson = callPackage ../development/libraries/haskell/bson {}; + bytestringNums = callPackage ../development/libraries/haskell/bytestring-nums {}; bytestringLexing = callPackage ../development/libraries/haskell/bytestring-lexing {}; @@ -477,6 +479,8 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y); colour = callPackage ../development/libraries/haskell/colour {}; + compactStringFix = callPackage ../development/libraries/haskell/compact-string-fix {}; + ConfigFile = callPackage ../development/libraries/haskell/ConfigFile {}; controlMonadAttempt = callPackage ../development/libraries/haskell/control-monad-attempt {}; @@ -517,6 +521,8 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y); dataAccessorTemplate = callPackage ../development/libraries/haskell/data-accessor/data-accessor-template.nix {}; + dataBinaryIeee754 = callPackage ../development/libraries/haskell/data-binary-ieee754 {}; + dataDefault = callPackage ../development/libraries/haskell/data-default {}; dataenc = callPackage ../development/libraries/haskell/dataenc {}; @@ -864,6 +870,7 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y); MonadCatchIOTransformers = callPackage ../development/libraries/haskell/MonadCatchIO-transformers {}; monadControl_OBSOLETE = callPackage ../development/libraries/haskell/monad-control/0.2.0.3.nix {}; + monadControl2 = self.monadControl_OBSOLETE; monadControl = callPackage ../development/libraries/haskell/monad-control {}; monadLoops = callPackage ../development/libraries/haskell/monad-loops {}; @@ -876,6 +883,10 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y); MonadRandom = callPackage ../development/libraries/haskell/MonadRandom {}; + mongoDB = callPackage ../development/libraries/haskell/mongoDB { + monadControl = self.monadControl2; + }; + mpppc = callPackage ../development/libraries/haskell/mpppc {}; mtl_1_1_0_2 = callPackage ../development/libraries/haskell/mtl/1.1.0.2.nix {}; From ea8d3f396ec813c92ed65e75abf47b46e969e1a3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andres=20L=C3=B6h?= Date: Wed, 14 Dec 2011 08:31:14 +0000 Subject: [PATCH 950/970] Added zeromq and haskell-zeromq-haskell. svn path=/nixpkgs/trunk/; revision=30878 --- .../haskell/zeromq-haskell/default.nix | 18 ++++++++++++++++++ pkgs/development/libraries/zeromq/default.nix | 17 +++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ pkgs/top-level/haskell-packages.nix | 2 ++ 4 files changed, 39 insertions(+) create mode 100644 pkgs/development/libraries/haskell/zeromq-haskell/default.nix create mode 100644 pkgs/development/libraries/zeromq/default.nix diff --git a/pkgs/development/libraries/haskell/zeromq-haskell/default.nix b/pkgs/development/libraries/haskell/zeromq-haskell/default.nix new file mode 100644 index 00000000000..b456c1d81a0 --- /dev/null +++ b/pkgs/development/libraries/haskell/zeromq-haskell/default.nix @@ -0,0 +1,18 @@ +{ cabal, zeromq }: + +cabal.mkDerivation (self: { + pname = "zeromq-haskell"; + version = "0.8.1"; + sha256 = "19fl3nd548yj6d6c3jqr6lxk6y033qa68jgnc5aq5w8kmlpn70mc"; + extraLibraries = [ zeromq ]; + meta = { + homepage = "http://github.com/twittner/zeromq-haskell/"; + description = "bindings to zeromq"; + license = self.stdenv.lib.licenses.mit; + platforms = self.ghc.meta.platforms; + maintainers = [ + self.stdenv.lib.maintainers.andres + self.stdenv.lib.maintainers.simons + ]; + }; +}) diff --git a/pkgs/development/libraries/zeromq/default.nix b/pkgs/development/libraries/zeromq/default.nix new file mode 100644 index 00000000000..06beb9254f9 --- /dev/null +++ b/pkgs/development/libraries/zeromq/default.nix @@ -0,0 +1,17 @@ +{stdenv, fetchurl, libuuid}: + +stdenv.mkDerivation rec { + name = "zeromq-2.1.10"; + + src = fetchurl { + url = "http://download.zeromq.org/${name}.tar.gz"; + sha256 = "0yabbbgx9ajpq0hjzqjm6rmj7pkcj95d5zn7d59b4wmm6kipwwn6"; + }; + + buildInputs = [ libuuid ]; + + meta = { + homepage = "http://www.zeromq.org"; + description = "The Intelligent Transport Layer"; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index ec3cc370633..3dad98e476b 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -4730,6 +4730,8 @@ let static = true; })); + zeromq = callPackage ../development/libraries/zeromq {}; + zvbi = callPackage ../development/libraries/zvbi { pngSupport = true; }; diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix index a5e622a08d1..1b086de0266 100644 --- a/pkgs/top-level/haskell-packages.nix +++ b/pkgs/top-level/haskell-packages.nix @@ -1360,6 +1360,8 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y); yst = callPackage ../development/libraries/haskell/yst {}; + zeromqHaskell = callPackage ../development/libraries/haskell/zeromq-haskell {}; + zipArchive = callPackage ../development/libraries/haskell/zip-archive {}; zipper = callPackage ../development/libraries/haskell/zipper { From 805f5f866161729813899cc737a03a457b7c4969 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Wed, 14 Dec 2011 10:40:29 +0000 Subject: [PATCH 951/970] haskell-attoparsec: updated to version 0.10.1.0 svn path=/nixpkgs/trunk/; revision=30881 --- pkgs/development/libraries/haskell/attoparsec/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/attoparsec/default.nix b/pkgs/development/libraries/haskell/attoparsec/default.nix index 501f4170a93..c0b9a0eab82 100644 --- a/pkgs/development/libraries/haskell/attoparsec/default.nix +++ b/pkgs/development/libraries/haskell/attoparsec/default.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "attoparsec"; - version = "0.10.0.3"; - sha256 = "0qlmjv8fhbx0xk8vkhlm01qmqlbk7xl98vfhcnlcjjrc5wkj0pjc"; + version = "0.10.1.0"; + sha256 = "1wlil4zxnyrygvkgmap8kcqf4f6rc08ais20alyy4ggzmx73sl9q"; buildDepends = [ deepseq text ]; meta = { homepage = "https://github.com/bos/attoparsec"; From e9f107003f358d25628bf11bd19387e3810bf984 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Wed, 14 Dec 2011 10:40:33 +0000 Subject: [PATCH 952/970] haskell-hashtables: updated to version 1.0.1.2 svn path=/nixpkgs/trunk/; revision=30882 --- pkgs/development/libraries/haskell/hashtables/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/hashtables/default.nix b/pkgs/development/libraries/haskell/hashtables/default.nix index b66a7a99264..56b2316a5f9 100644 --- a/pkgs/development/libraries/haskell/hashtables/default.nix +++ b/pkgs/development/libraries/haskell/hashtables/default.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "hashtables"; - version = "1.0.1.1"; - sha256 = "1s5p2gsi7wv6xmf6ax3s9mqmbvcispn2y9miksay3p4acc6b3lpa"; + version = "1.0.1.2"; + sha256 = "09lviwxwlhvhrgm7v66w0vd7j02s0191w1izsvwh1a3dj2vc7vw7"; buildDepends = [ hashable primitive vector ]; meta = { homepage = "http://github.com/gregorycollins/hashtables"; From e72698bb830c104d520d19580392ec42ac7d8c86 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Wed, 14 Dec 2011 10:40:35 +0000 Subject: [PATCH 953/970] haskell-iteratee: updated to version 0.8.7.5 svn path=/nixpkgs/trunk/; revision=30883 --- pkgs/development/libraries/haskell/iteratee/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/iteratee/default.nix b/pkgs/development/libraries/haskell/iteratee/default.nix index e7e690654e0..148cf3474b1 100644 --- a/pkgs/development/libraries/haskell/iteratee/default.nix +++ b/pkgs/development/libraries/haskell/iteratee/default.nix @@ -3,8 +3,8 @@ cabal.mkDerivation (self: { pname = "iteratee"; - version = "0.8.7.4"; - sha256 = "08smgb4xad8zpjzjrpjpv3vindhwgbcsf4rgipnrpyvz6mrg4w9i"; + version = "0.8.7.5"; + sha256 = "182bxdnj7k4dkmrbnkzy93axq8hwpq3xdbkyf93hbzzp4vhdvjnl"; isLibrary = true; isExecutable = true; buildDepends = [ From 8285e96cb7830e119dc2761ed0da9d4acb0f6e2e Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Wed, 14 Dec 2011 10:40:37 +0000 Subject: [PATCH 954/970] haskell-yesod-auth: updated to version 0.7.7.2 svn path=/nixpkgs/trunk/; revision=30884 --- pkgs/development/libraries/haskell/yesod-auth/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/yesod-auth/default.nix b/pkgs/development/libraries/haskell/yesod-auth/default.nix index 96a951f961d..19ba48b58cc 100644 --- a/pkgs/development/libraries/haskell/yesod-auth/default.nix +++ b/pkgs/development/libraries/haskell/yesod-auth/default.nix @@ -7,8 +7,8 @@ cabal.mkDerivation (self: { pname = "yesod-auth"; - version = "0.7.7.1"; - sha256 = "12gzcrh8siziqd3jgimlgl7rgch8f6jl0fb96krnqpsa682003kc"; + version = "0.7.7.2"; + sha256 = "1zqxg13hpd45i2nyhh1bvaly1cwaygmjpz46cm7knp553bdhy8c8"; buildDepends = [ aeson authenticate blazeHtml controlMonadAttempt hamlet httpEnumerator mimeMail persistent persistentTemplate pureMD5 From 8d2d9449f7bdda4200cd24f8258713fb3348b6c4 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Wed, 14 Dec 2011 10:42:49 +0000 Subject: [PATCH 955/970] Revert cryptsetup update to version 1.4.1. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit The patch committed in revision 30839 causes nixos-rebuild to fail: | building Nix... | building the system configuration... | these derivations will be built: | /nix/store/0agbr6bgn6mgy8fy9miyc4p856x33qyg-system.drv | /nix/store/csagx61sw5mzd4hb9lajx65ds5212331-udev-initrd.conf.drv | /nix/store/jgm3l6ylmc8ncsirdi5hjh0mlk3m043g-initrd.drv | /nix/store/k40r1l30amnbxqidbdl480xq46rqr0pa-udev-rules.drv | /nix/store/ndphs01sgzw14aqpzzg3i6s6nlp6bwwc-stage-1-init.sh.drv | /nix/store/wqhdw86v24z0x7fhp8xrqvw6g12lphij-extra-utils.drv | building path(s) `/nix/store/dap930kk3f3s1p6if1c2la6fyx3p1ri3-extra-utils' | building /nix/store/dap930kk3f3s1p6if1c2la6fyx3p1ri3-extra-utils | `/nix/store/vxycd107wjbhcj720hzkw2px7s7kr724-glibc-2.12.2/lib/ld-linux-x86-64.so.2' -> `/nix/store/dap930kk3f3s1p6if1c2la6fyx3p1ri3-extra-utils/lib/ld-linux-x86-64.so.2' | `/nix/store/vxycd107wjbhcj720hzkw2px7s7kr724-glibc-2.12.2/lib/libc.so.6' -> `/nix/store/dap930kk3f3s1p6if1c2la6fyx3p1ri3-extra-utils/lib/libc.so.6' | [...] | `/nix/store/dap930kk3f3s1p6if1c2la6fyx3p1ri3-extra-utils/bin/sh' -> `bash' | `/nix/store/pmsabjn87gxlmkqlnj3hj502l687hw0f-module-init-tools-3.16/sbin/modprobe' -> `/nix/store/dap930kk3f3s1p6if1c2la6fyx3p1ri3-extra-utils/bin/modprobe.real' | patching /nix/store/dap930kk3f3s1p6if1c2la6fyx3p1ri3-extra-utils/bin/ata_id... | patching /nix/store/dap930kk3f3s1p6if1c2la6fyx3p1ri3-extra-utils/bin/basename... | patching /nix/store/dap930kk3f3s1p6if1c2la6fyx3p1ri3-extra-utils/bin/bash... | patching /nix/store/dap930kk3f3s1p6if1c2la6fyx3p1ri3-extra-utils/bin/blkid... | patching /nix/store/dap930kk3f3s1p6if1c2la6fyx3p1ri3-extra-utils/bin/cat... | patching /nix/store/dap930kk3f3s1p6if1c2la6fyx3p1ri3-extra-utils/bin/cdrom_id... | patching /nix/store/dap930kk3f3s1p6if1c2la6fyx3p1ri3-extra-utils/bin/chmod... | patching /nix/store/dap930kk3f3s1p6if1c2la6fyx3p1ri3-extra-utils/bin/chroot... | patching /nix/store/dap930kk3f3s1p6if1c2la6fyx3p1ri3-extra-utils/bin/cryptsetup... | patching /nix/store/dap930kk3f3s1p6if1c2la6fyx3p1ri3-extra-utils/bin/dmsetup... | patching /nix/store/dap930kk3f3s1p6if1c2la6fyx3p1ri3-extra-utils/bin/e2fsck... | patching /nix/store/dap930kk3f3s1p6if1c2la6fyx3p1ri3-extra-utils/bin/edd_id... | patching /nix/store/dap930kk3f3s1p6if1c2la6fyx3p1ri3-extra-utils/bin/fsck... | patching /nix/store/dap930kk3f3s1p6if1c2la6fyx3p1ri3-extra-utils/bin/input_id... | patching /nix/store/dap930kk3f3s1p6if1c2la6fyx3p1ri3-extra-utils/bin/ln... | patching /nix/store/dap930kk3f3s1p6if1c2la6fyx3p1ri3-extra-utils/bin/lvm... | patching /nix/store/dap930kk3f3s1p6if1c2la6fyx3p1ri3-extra-utils/bin/mdadm... | patching /nix/store/dap930kk3f3s1p6if1c2la6fyx3p1ri3-extra-utils/bin/mkdir... | patching /nix/store/dap930kk3f3s1p6if1c2la6fyx3p1ri3-extra-utils/bin/mknod... | patching /nix/store/dap930kk3f3s1p6if1c2la6fyx3p1ri3-extra-utils/bin/modprobe.real... | patching /nix/store/dap930kk3f3s1p6if1c2la6fyx3p1ri3-extra-utils/bin/mount... | patching /nix/store/dap930kk3f3s1p6if1c2la6fyx3p1ri3-extra-utils/bin/path_id... | patching /nix/store/dap930kk3f3s1p6if1c2la6fyx3p1ri3-extra-utils/bin/reiserfsck... | patching /nix/store/dap930kk3f3s1p6if1c2la6fyx3p1ri3-extra-utils/bin/scsi_id... | patching /nix/store/dap930kk3f3s1p6if1c2la6fyx3p1ri3-extra-utils/bin/sleep... | patching /nix/store/dap930kk3f3s1p6if1c2la6fyx3p1ri3-extra-utils/bin/switch_root... | patching /nix/store/dap930kk3f3s1p6if1c2la6fyx3p1ri3-extra-utils/bin/tune2fs... | patching /nix/store/dap930kk3f3s1p6if1c2la6fyx3p1ri3-extra-utils/bin/udevadm... | patching /nix/store/dap930kk3f3s1p6if1c2la6fyx3p1ri3-extra-utils/bin/udevd... | patching /nix/store/dap930kk3f3s1p6if1c2la6fyx3p1ri3-extra-utils/bin/umount... | patching /nix/store/dap930kk3f3s1p6if1c2la6fyx3p1ri3-extra-utils/bin/usb_id... | patching /nix/store/dap930kk3f3s1p6if1c2la6fyx3p1ri3-extra-utils/bin/v4l_id... | testing patched programs... | GNU bash, version 4.1.2(1)-release (x86_64-unknown-linux-gnu) | mount from util-linux-ng 2.18 (with libblkid support) | umount (util-linux-ng 2.18) | e2fsck 1.41.14 (22-Dec-2010) | tune2fs 1.41.14 (22-Dec-2010) | 173 | blkid from util-linux-ng 2.18 (libblkid 2.18.0, 30-Jun-2010) | Library version: 1.02.66 (2011-08-12) | LVM version: 2.02.87(2) (2011-08-12) | reiserfsck 3.6.21 (2009 www.namesys.com) | | mdadm - v3.1.2 - 10th March 2010 | basename (GNU coreutils) 8.7 | Copyright (C) 2010 Free Software Foundation, Inc. | License GPLv3+: GNU GPL version 3 or later . | This is free software: you are free to change and redistribute it. | There is NO WARRANTY, to the extent permitted by law. | | Written by David MacKenzie. | module-init-tools version 3.16 | output is not allowed to refer to path `/nix/store/qccjhn063cfv171rcaxvxh0yk96zf7l2-cryptsetup-1.4.1' | cannot build derivation `/nix/store/ndphs01sgzw14aqpzzg3i6s6nlp6bwwc-stage-1-init.sh.drv': 1 dependencies couldn't be built | cannot build derivation `/nix/store/jgm3l6ylmc8ncsirdi5hjh0mlk3m043g-initrd.drv': 1 dependencies couldn't be built | cannot build derivation `/nix/store/0agbr6bgn6mgy8fy9miyc4p856x33qyg-system.drv': 1 dependencies couldn't be built | error: build of `/nix/store/0agbr6bgn6mgy8fy9miyc4p856x33qyg-system.drv' failed svn path=/nixpkgs/trunk/; revision=30885 --- pkgs/os-specific/linux/cryptsetup/default.nix | 16 +++++++++++----- 1 file changed, 11 insertions(+), 5 deletions(-) diff --git a/pkgs/os-specific/linux/cryptsetup/default.nix b/pkgs/os-specific/linux/cryptsetup/default.nix index 962de55a156..765a49c6446 100644 --- a/pkgs/os-specific/linux/cryptsetup/default.nix +++ b/pkgs/os-specific/linux/cryptsetup/default.nix @@ -1,13 +1,19 @@ -{stdenv, fetchurl, libuuid, popt, devicemapper, libgcrypt }: +{stdenv, fetchurl, libuuid, popt, devicemapper, udev }: stdenv.mkDerivation { - name = "cryptsetup-1.4.1"; + name = "cryptsetup-1.0.6"; src = fetchurl { - url = http://cryptsetup.googlecode.com/files/cryptsetup-1.4.1.tar.bz2; - sha256 = "82b143328c2b427ef2b89fb76c701d311c95b54093c21bbf22342f7b393bddcb"; + url = http://cryptsetup.googlecode.com/files/cryptsetup-1.0.6.tar.bz2; + sha256 = "df7fda80cfa01f063caf39140287a47d018dfe056fc71a3ba605e690ff0183fd"; }; - buildInputs = [ libuuid popt devicemapper libgcrypt ]; + configureFlags = [ "--enable-libdevmapper" ]; + + patchPhase = '' + sed -i -e 's@/sbin/udevsettle@${udev}/sbin/udevadm settle@' lib/libdevmapper.c + ''; + + buildInputs = [ libuuid popt devicemapper ]; meta = { homepage = http://code.google.com/p/cryptsetup/; From 63a5da5ef217bdda9ae988da7e49fbc0d7393597 Mon Sep 17 00:00:00 2001 From: "Yury G. Kudryashov" Date: Wed, 14 Dec 2011 14:09:53 +0000 Subject: [PATCH 956/970] virtuoso-6.1.4 svn path=/nixpkgs/trunk/; revision=30890 --- pkgs/servers/sql/virtuoso/default.nix | 15 +++------------ 1 file changed, 3 insertions(+), 12 deletions(-) diff --git a/pkgs/servers/sql/virtuoso/default.nix b/pkgs/servers/sql/virtuoso/default.nix index bb9426ad947..8271ea8daf4 100644 --- a/pkgs/servers/sql/virtuoso/default.nix +++ b/pkgs/servers/sql/virtuoso/default.nix @@ -1,25 +1,15 @@ { stdenv, fetchurl, libxml2, openssl, readline, gawk }: stdenv.mkDerivation rec { - name = "virtuoso-opensource-6.1.3"; + name = "virtuoso-opensource-6.1.4"; src = fetchurl { url = "mirror://sourceforge/virtuoso/${name}.tar.gz"; - sha256 = "0rj629qjsibpllazngbhzhsh90x6nidpn292qz1xdvirwvb2h3s2"; + sha256 = "0khm81hvjh6p4l0ca4zj00fk41ixjv998k6y9g7mvq1338hr4gqm"; }; buildInputs = [ libxml2 openssl readline gawk ]; - patchFlags = "-p0"; - - patches = - [ (fetchurl { - url = "http://bugsfiles.kde.org/attachment.cgi?id=63510"; - name = "virtuoso-charset-fix.diff"; - sha256 = "09kxjhsy3rbys0bcxpmgga4sa6qjyy79dyl4n8b0gp1hnzjskvkz"; - }) - ]; - CPP = "${stdenv.gcc}/bin/gcc -E"; configureFlags = " @@ -32,6 +22,7 @@ stdenv.mkDerivation rec { echo Moving documentation mkdir -pv $out/share/doc mv -v $out/share/virtuoso/doc $out/share/doc/${name} + echo Removing jars and empty directories find $out -name "*.a" -delete -o -name "*.jar" -delete -o -type d -empty -delete ''; From aaba1c0bf9d08af03ed8bde45c6e309f6cd1b0d3 Mon Sep 17 00:00:00 2001 From: "Yury G. Kudryashov" Date: Wed, 14 Dec 2011 18:58:12 +0000 Subject: [PATCH 957/970] pdf2djvu-0.7.11 Preparing to poppler-0.18.x update svn path=/nixpkgs/trunk/; revision=30896 --- pkgs/tools/typesetting/pdf2djvu/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/typesetting/pdf2djvu/default.nix b/pkgs/tools/typesetting/pdf2djvu/default.nix index f91b77fb928..aea28238665 100644 --- a/pkgs/tools/typesetting/pdf2djvu/default.nix +++ b/pkgs/tools/typesetting/pdf2djvu/default.nix @@ -1,12 +1,12 @@ {stdenv, fetchurl, pkgconfig, djvulibre, poppler, fontconfig, libjpeg }: stdenv.mkDerivation rec { - version = "0.7.7"; + version = "0.7.11"; name = "pdf2djvu-${version}"; src = fetchurl { url = "http://pdf2djvu.googlecode.com/files/pdf2djvu_${version}.tar.gz"; - sha256 = "17fi5yq936hgjby5jp2hsb1inqqxab4mh58lkxvf1jkrrz658za5"; + sha256 = "00gscd7l02jyr132vlj08ks0pgmh5ja785n3fdxa795cib45rbgq"; }; buildInputs = [ pkgconfig djvulibre poppler fontconfig libjpeg ]; @@ -14,6 +14,6 @@ stdenv.mkDerivation rec { meta = { description = "Creates djvu files from PDF files"; homepage = http://code.google.com/p/pdf2djvu/; - license = "GPLv2"; + license = stdenv.lib.licenses.gpl2; }; } From 471ebaf6f8501f259c6afb7e99f3d3373e0d564c Mon Sep 17 00:00:00 2001 From: "Yury G. Kudryashov" Date: Thu, 15 Dec 2011 06:58:27 +0000 Subject: [PATCH 958/970] calibre-0.8.30 svn path=/nixpkgs/trunk/; revision=30900 --- pkgs/applications/misc/calibre/default.nix | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/pkgs/applications/misc/calibre/default.nix b/pkgs/applications/misc/calibre/default.nix index 421fb40e1bd..b38a6cb5644 100644 --- a/pkgs/applications/misc/calibre/default.nix +++ b/pkgs/applications/misc/calibre/default.nix @@ -1,21 +1,23 @@ { stdenv, fetchurl, python, pyqt4, sip, popplerQt4, pkgconfig, libpng , imagemagick, libjpeg, fontconfig, podofo, qt4, icu -, pil, makeWrapper, unrar, chmlib, pythonPackages +, pil, makeWrapper, unrar, chmlib, pythonPackages, xz }: stdenv.mkDerivation rec { - name = "calibre-0.8.21"; + name = "calibre-0.8.30"; src = fetchurl { - url = "mirror://sourceforge/calibre/${name}.tar.gz"; - sha256 = "173is8qlsm1gbsx5a411c2226kakwyv200wcw97yfs613k7cz256"; + url = "http://calibre-ebook.googlecode.com/files/${name}.tar.xz"; + sha256 = "1w94kaynxiksjfi6wqlvwnryl08f8m0ylqwgzwkz1hjznqiji282"; }; inherit python; + buildNativeInputs = [ makeWrapper xz pkgconfig ]; + buildInputs = - [ python pyqt4 sip popplerQt4 pkgconfig libpng imagemagick libjpeg - fontconfig podofo qt4 pil makeWrapper chmlib icu + [ python pyqt4 sip popplerQt4 libpng imagemagick libjpeg + fontconfig podofo qt4 pil chmlib icu pythonPackages.mechanize pythonPackages.lxml pythonPackages.dateutil pythonPackages.cssutils pythonPackages.beautifulsoap pythonPackages.sqlite3 ]; From 76c2e7d82f592b86c9d2a2bb7ca511d46051b711 Mon Sep 17 00:00:00 2001 From: "Yury G. Kudryashov" Date: Thu, 15 Dec 2011 08:01:03 +0000 Subject: [PATCH 959/970] xournal: prepare to poppler upgrade svn path=/nixpkgs/trunk/; revision=30901 --- pkgs/applications/graphics/xournal/default.nix | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) diff --git a/pkgs/applications/graphics/xournal/default.nix b/pkgs/applications/graphics/xournal/default.nix index b6d7e431443..990709c03e5 100644 --- a/pkgs/applications/graphics/xournal/default.nix +++ b/pkgs/applications/graphics/xournal/default.nix @@ -15,11 +15,22 @@ stdenv.mkDerivation rec { ghostscript atk gtk glib fontconfig freetype libgnomecanvas libgnomeprint libgnomeprintui pango libX11 xproto zlib poppler poppler_data - autoconf automake libtool pkgconfig ]; + buildNativeInputs = [ autoconf automake libtool pkgconfig ]; + + # Build with poppler-0.18.x + patchFlags = "-p0"; + + patches = [ (fetchurl { + url = "https://api.opensuse.org/public/source/X11:Utilities/xournal/xournal-poppler-0.18.patch?rev=eca1c0b24f5bc78111147ab8f4688455"; + sha256 = "1q565kqb4bklncriq4dlhp1prhidv88wmxr9k3laykiia0qjmfyj"; + })]; + NIX_LDFLAGS="-lX11 -lz"; + meta = { + homepage = http://xournal.sourceforge.net/; description = "note-taking application (supposes stylus)"; maintainers = [ stdenv.lib.maintainers.guibert ]; }; From e1e6b10eee8a91eb32ce54848b9617c5a926d349 Mon Sep 17 00:00:00 2001 From: "Yury G. Kudryashov" Date: Thu, 15 Dec 2011 08:34:34 +0000 Subject: [PATCH 960/970] poppler-0.18.2 I've checked that everything in `grep -rl poppler .` compiles. svn path=/nixpkgs/trunk/; revision=30902 --- pkgs/development/libraries/poppler/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/libraries/poppler/default.nix b/pkgs/development/libraries/poppler/default.nix index bb19338cc88..f22d6a795c9 100644 --- a/pkgs/development/libraries/poppler/default.nix +++ b/pkgs/development/libraries/poppler/default.nix @@ -6,11 +6,11 @@ }: stdenv.mkDerivation rec { - name = "poppler-0.16.7"; + name = "poppler-0.18.2"; src = fetchurl { url = "${meta.homepage}${name}.tar.gz"; - sha256 = "1k9by922qkn9pkkf03jjxxqhp4s0gmsgs6c8f4m19m1l5npyid7s"; + sha256 = "0ljvr6l1lfwbkl0v4vw9dybski7d4sx52iz6k37mkfnj3x36npxi"; }; propagatedBuildInputs = @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { ++ stdenv.lib.optionals gtkSupport [ glib gtk ] ++ stdenv.lib.optional qt4Support qt4; - buildInputs = [ pkgconfig cmake ]; + buildNativeInputs = [ pkgconfig cmake ]; cmakeFlags = "-DENABLE_XPDF_HEADERS=ON -DENABLE_LIBCURL=ON -DENABLE_ZLIB=ON"; From f9cbcf881d48a929abcc6c416227d81afc0686a2 Mon Sep 17 00:00:00 2001 From: Cillian de Roiste Date: Thu, 15 Dec 2011 12:11:54 +0000 Subject: [PATCH 961/970] Removing trailing whitespace svn path=/nixpkgs/trunk/; revision=30903 --- pkgs/top-level/all-packages.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 3dad98e476b..fe2fd4a77a9 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -2419,7 +2419,7 @@ let ocamlPackages_3_11_1 = mkOcamlPackages ocaml_3_11_1 pkgs.ocamlPackages_3_11_1; ocamlPackages_3_12_0 = mkOcamlPackages ocaml_3_12_0 pkgs.ocamlPackages_3_12_0; - opa = let callPackage = newScope pkgs.ocamlPackages_3_12_0; in callPackage ../development/compilers/opa { }; + opa = let callPackage = newScope pkgs.ocamlPackages_3_12_0; in callPackage ../development/compilers/opa { }; opencxx = callPackage ../development/compilers/opencxx { gcc = gcc33; @@ -7559,7 +7559,7 @@ let ++ lib.optional (supportsJDK && getConfig [browserName "jre"] false && jrePlugin ? mozillaPlugin) jrePlugin ++ lib.optional (getConfig [browserName "enableGoogleTalkPlugin"] false) google_talk_plugin ); - libs = + libs = if getConfig [ browserName "enableQuakeLive" ] false then with xlibs; [ stdenv.gcc libX11 libXxf86dga libXxf86vm libXext libXt alsaLib zlib ] else [ ]; From 47765274e5c873b3abd09fdddf96c9a27f35d2ef Mon Sep 17 00:00:00 2001 From: Cillian de Roiste Date: Thu, 15 Dec 2011 12:13:36 +0000 Subject: [PATCH 962/970] Adding SpiderMonkey 185 svn path=/nixpkgs/trunk/; revision=30904 --- .../interpreters/spidermonkey/185-1.0.0.nix | 29 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 1 + 2 files changed, 30 insertions(+) create mode 100644 pkgs/development/interpreters/spidermonkey/185-1.0.0.nix diff --git a/pkgs/development/interpreters/spidermonkey/185-1.0.0.nix b/pkgs/development/interpreters/spidermonkey/185-1.0.0.nix new file mode 100644 index 00000000000..55e0dada71e --- /dev/null +++ b/pkgs/development/interpreters/spidermonkey/185-1.0.0.nix @@ -0,0 +1,29 @@ +{ stdenv, fetchurl, autoconf213, nspr, perl, python, readline, zip }: + +stdenv.mkDerivation rec { + version = "185-1.0.0"; + name = "spidermonkey-${version}"; + + src = fetchurl { + url = "http://ftp.mozilla.org/pub/mozilla.org/js/js${version}.tar.gz"; + sha256 = "5d12f7e1f5b4a99436685d97b9b7b75f094d33580227aa998c406bbae6f2a687"; + }; + + buildInputs = [ autoconf213 nspr perl python readline zip ]; + + postUnpack = "sourceRoot=\${sourceRoot}/js/src"; + + preConfigure = '' + export NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE -I${nspr}/include/nspr" + export LIBXUL_DIST=$out + autoconf + ''; + + meta = with stdenv.lib; { + description = "Mozilla's JavaScript engine written in C/C++"; + homepage = https://developer.mozilla.org/en/SpiderMonkey; + # TODO: MPL/GPL/LGPL tri-license. + maintainers = [ maintainers.goibhniu ]; + }; + +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index fe2fd4a77a9..f68baa73cc6 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -2708,6 +2708,7 @@ let spidermonkey = callPackage ../development/interpreters/spidermonkey { }; spidermonkey_1_8_0rc1 = callPackage ../development/interpreters/spidermonkey/1.8.0-rc1.nix { }; + spidermonkey_185 = callPackage ../development/interpreters/spidermonkey/185-1.0.0.nix { }; sysPerl = callPackage ../development/interpreters/sys-perl { }; From 02eb690bad5c5e7af2b70df15a614f437f2e2d3b Mon Sep 17 00:00:00 2001 From: Cillian de Roiste Date: Thu, 15 Dec 2011 12:24:25 +0000 Subject: [PATCH 963/970] Upgrading CouchDB to 1.1.1 with SpiderMonkey 185 svn path=/nixpkgs/trunk/; revision=30905 --- pkgs/servers/http/couchdb/default.nix | 6 +++--- pkgs/servers/http/couchdb/src-for-default.nix | 14 +++++++------- pkgs/top-level/all-packages.nix | 4 +++- 3 files changed, 13 insertions(+), 11 deletions(-) diff --git a/pkgs/servers/http/couchdb/default.nix b/pkgs/servers/http/couchdb/default.nix index 3fa253af397..08bc45443a3 100644 --- a/pkgs/servers/http/couchdb/default.nix +++ b/pkgs/servers/http/couchdb/default.nix @@ -1,4 +1,4 @@ -args @ {stdenv, fetchurl, erlang, spidermonkey, +args @ {stdenv, fetchurl, erlang, spidermonkey, icu, getopt, curl, ...}: let s = import ./src-for-default.nix; in @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { postInstall = '' sed -i -e "s|\`getopt|\`${getopt}/bin/getopt|" $out/bin/couchdb ''; - - configureFlags = "--with-erlang=${erlang}/lib/erlang/usr/include"; + + configureFlags = "--with-erlang=${erlang}/lib/erlang/usr/include --with-js-include=${spidermonkey}/include --with-js-lib=${spidermonkey}/lib"; } diff --git a/pkgs/servers/http/couchdb/src-for-default.nix b/pkgs/servers/http/couchdb/src-for-default.nix index f7dd2199b54..0c174feed8d 100644 --- a/pkgs/servers/http/couchdb/src-for-default.nix +++ b/pkgs/servers/http/couchdb/src-for-default.nix @@ -1,9 +1,9 @@ rec { - version="1.0.1"; - name="couchdb-1.0.1"; - hash="07wb21qi471qbb6nqlmdmmvg4z8f7m9wn2bm22c7fig32gz5njmp"; - url="mirror://apache/couchdb/1.0.1/apache-couchdb-${version}.tar.gz"; - advertisedUrl="http://www.apache.org/dist/couchdb/1.0.1/apache-couchdb-1.0.1.tar.gz"; - - + version="1.1.1"; + name="couchdb-1.1.1"; + hash="9d6592aacd4bc139f8c1ccb0ed80f30021cee50eb7f8a1feddf46b6eb963891c"; + url="mirror://apache/couchdb/${version}/apache-couchdb-${version}.tar.gz"; + advertisedUrl="http://www.apache.org/dist/couchdb/${version}/apache-couchdb-${version}.tar.gz"; + + } diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index f68baa73cc6..c2254eea363 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -4936,7 +4936,9 @@ let erlang = erlangR13B ; }; - couchdb = callPackage ../servers/http/couchdb { }; + couchdb = callPackage ../servers/http/couchdb { + spidermonkey = spidermonkey_185; + }; felix = callPackage ../servers/felix { }; From ba6e0edc9f6385a618f82036b705dd19ab387750 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Thu, 15 Dec 2011 13:36:56 +0000 Subject: [PATCH 964/970] haskell-syb: updated version 3.x to 0.3.6 svn path=/nixpkgs/trunk/; revision=30907 --- .../development/libraries/haskell/syb/0.3.5.nix | 17 ----------------- .../haskell/syb/{0.3.3.nix => 0.3.6.nix} | 4 ++-- pkgs/top-level/haskell-packages.nix | 8 +++----- 3 files changed, 5 insertions(+), 24 deletions(-) delete mode 100644 pkgs/development/libraries/haskell/syb/0.3.5.nix rename pkgs/development/libraries/haskell/syb/{0.3.3.nix => 0.3.6.nix} (81%) diff --git a/pkgs/development/libraries/haskell/syb/0.3.5.nix b/pkgs/development/libraries/haskell/syb/0.3.5.nix deleted file mode 100644 index f15911c08bd..00000000000 --- a/pkgs/development/libraries/haskell/syb/0.3.5.nix +++ /dev/null @@ -1,17 +0,0 @@ -{ cabal }: - -cabal.mkDerivation (self: { - pname = "syb"; - version = "0.3.5"; - sha256 = "17gwhn0rqjf9zkx1dsmsaj41qdjlk4mq5lzpqkgy3slq30nwwwbr"; - meta = { - homepage = "http://www.cs.uu.nl/wiki/GenericProgramming/SYB"; - description = "Scrap Your Boilerplate"; - license = self.stdenv.lib.licenses.bsd3; - platforms = self.ghc.meta.platforms; - maintainers = [ - self.stdenv.lib.maintainers.andres - self.stdenv.lib.maintainers.simons - ]; - }; -}) diff --git a/pkgs/development/libraries/haskell/syb/0.3.3.nix b/pkgs/development/libraries/haskell/syb/0.3.6.nix similarity index 81% rename from pkgs/development/libraries/haskell/syb/0.3.3.nix rename to pkgs/development/libraries/haskell/syb/0.3.6.nix index 01cc80c883d..a40b25cc1bc 100644 --- a/pkgs/development/libraries/haskell/syb/0.3.3.nix +++ b/pkgs/development/libraries/haskell/syb/0.3.6.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "syb"; - version = "0.3.3"; - sha256 = "0jskxbnzariq2ahcymvjrp4bhl9cpflc1nh51whdl9axcrd5c901"; + version = "0.3.6"; + sha256 = "1khb5h4gw1f9l9zhb7x1y9rf2qpypbvm9kmpf0b6xgggd2800s25"; meta = { homepage = "http://www.cs.uu.nl/wiki/GenericProgramming/SYB"; description = "Scrap Your Boilerplate"; diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix index 1b086de0266..90a5ffebea7 100644 --- a/pkgs/top-level/haskell-packages.nix +++ b/pkgs/top-level/haskell-packages.nix @@ -149,7 +149,7 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y); regexCompat = self.regexCompat_0_93_1; # 7.2 ok, 7.3 ok regexPosix = self.regexPosix_0_94_4; # 7.2 ok, 7.3 ok stm = self.stm_2_2_0_1; # 7.2 ok, 7.3 ok - syb = self.syb_0_3_5; # 7.2 ok, 7.3 ok + syb = self.syb_0_3_6; # 7.2 ok, 7.3 ok xhtml = self.xhtml_3000_2_0_1; # 7.2 ok, 7.3 ok zlib = self.zlib_0_5_3_1; # 7.2 ok, 7.3 ok HTTP = self.HTTP_4000_2_1; # 7.2 ok, 7.3 ok @@ -1113,9 +1113,7 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y); syb_0_2_2 = callPackage ../development/libraries/haskell/syb/0.2.2.nix {}; syb_0_3 = callPackage ../development/libraries/haskell/syb/0.3.nix {}; - syb_0_3_5 = callPackage ../development/libraries/haskell/syb/0.3.5.nix {}; - syb02 = self.syb_0_2_2; - syb03 = self.syb_0_3; + syb_0_3_6 = callPackage ../development/libraries/haskell/syb/0.3.6.nix {}; syb = null; # by default, we assume that syb ships with GHC, which is # true for the older GHC versions @@ -1398,7 +1396,7 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y); idris = callPackage ../development/compilers/idris {}; pakcs = callPackage ../development/compilers/pakcs { - syb = self.syb02; + syb = self.syb_0_2_2; }; # Development tools. From 9e7e3ae89cd8240467791faaf03fbd7d935f64f4 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Thu, 15 Dec 2011 13:36:58 +0000 Subject: [PATCH 965/970] haskell-network: updated to version 2.3.0.8 svn path=/nixpkgs/trunk/; revision=30908 --- .../libraries/haskell/network/{2.3.0.7.nix => 2.3.0.8.nix} | 4 ++-- pkgs/top-level/haskell-packages.nix | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) rename pkgs/development/libraries/haskell/network/{2.3.0.7.nix => 2.3.0.8.nix} (82%) diff --git a/pkgs/development/libraries/haskell/network/2.3.0.7.nix b/pkgs/development/libraries/haskell/network/2.3.0.8.nix similarity index 82% rename from pkgs/development/libraries/haskell/network/2.3.0.7.nix rename to pkgs/development/libraries/haskell/network/2.3.0.8.nix index 3c0e0065ed9..93e57b0ec01 100644 --- a/pkgs/development/libraries/haskell/network/2.3.0.7.nix +++ b/pkgs/development/libraries/haskell/network/2.3.0.8.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "network"; - version = "2.3.0.7"; - sha256 = "1rlzdacgaq8nv0bwczsrkw47rw4aamf9y4ynm3xjw0r3w1xcg9yv"; + version = "2.3.0.8"; + sha256 = "10y7spi1qwjmq7mz7h09ijrzq0jl4r02jrgxiqavsiw6j35r4yfv"; buildDepends = [ parsec ]; meta = { homepage = "http://github.com/haskell/network"; diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix index 90a5ffebea7..03d014569f9 100644 --- a/pkgs/top-level/haskell-packages.nix +++ b/pkgs/top-level/haskell-packages.nix @@ -140,7 +140,7 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y); haskellSrc = self.haskellSrc_1_0_1_5; # 7.2 fails, 7.3 fails html = self.html_1_0_1_2; # 7.2 ok, 7.3 ok HUnit = self.HUnit_1_2_2_3; # 7.2 ok, 7.3 ok - network = self.network_2_3_0_7; # 7.2 ok, 7.3 ok + network = self.network_2_3_0_8; # 7.2 ok, 7.3 ok OpenGL = self.OpenGL_2_2_3_0; # 7.2 ok, 7.3 ok parallel = self.parallel_3_1_0_1; # 7.2 ok, 7.3 ok parsec = self.parsec_3_1_2; # 7.2 ok, 7.3 ok @@ -917,8 +917,8 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y); network_2_2_1_4 = callPackage ../development/libraries/haskell/network/2.2.1.4.nix {}; network_2_2_1_7 = callPackage ../development/libraries/haskell/network/2.2.1.7.nix {}; network_2_3_0_2 = callPackage ../development/libraries/haskell/network/2.3.0.2.nix {}; - network_2_3_0_7 = callPackage ../development/libraries/haskell/network/2.3.0.7.nix {}; - network = self.network_2_3_0_7; + network_2_3_0_8 = callPackage ../development/libraries/haskell/network/2.3.0.8.nix {}; + network = self.network_2_3_0_8; nixosTypes = callPackage ../development/libraries/haskell/nixos-types {}; From de1140e0efef6348b47995221754ebb418ee2f7d Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Thu, 15 Dec 2011 13:37:01 +0000 Subject: [PATCH 966/970] haskell-case-insensitive: updated to version 0.4.0.1 svn path=/nixpkgs/trunk/; revision=30909 --- .../libraries/haskell/case-insensitive/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/case-insensitive/default.nix b/pkgs/development/libraries/haskell/case-insensitive/default.nix index 88a6d7f6a21..9d72d8cedf7 100644 --- a/pkgs/development/libraries/haskell/case-insensitive/default.nix +++ b/pkgs/development/libraries/haskell/case-insensitive/default.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "case-insensitive"; - version = "0.4"; - sha256 = "0la9gzf563x03xy120n8h5f6kmn425c5chbm42ksx1g7ag1ppmd6"; + version = "0.4.0.1"; + sha256 = "15wcpzmj1ppl27p8hph9y8nxkjkd4yrvamxi3gk0ahfnb47chaq7"; buildDepends = [ hashable text ]; meta = { homepage = "https://github.com/basvandijk/case-insensitive"; From 85ff75b1efad953b73f96871fd611008c2e6c729 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Thu, 15 Dec 2011 13:37:03 +0000 Subject: [PATCH 967/970] haskell-monad-par: updated to version 0.1.0.2 svn path=/nixpkgs/trunk/; revision=30910 --- pkgs/development/libraries/haskell/monad-par/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/monad-par/default.nix b/pkgs/development/libraries/haskell/monad-par/default.nix index 01d6a40a433..8b6850ea08d 100644 --- a/pkgs/development/libraries/haskell/monad-par/default.nix +++ b/pkgs/development/libraries/haskell/monad-par/default.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "monad-par"; - version = "0.1.0.1"; - sha256 = "0sd5w09vi12jwzz8xgh51r27577byr6pqp15dw0z5nhf4w869qxq"; + version = "0.1.0.2"; + sha256 = "0ca5fbc92bmghg8pk40rwcf58jk3y7xcr0nwfhyhi67riqnwqrl8"; buildDepends = [ deepseq HUnit ]; meta = { homepage = "https://github.com/simonmar/monad-par"; From 360bda540fdafabefcdc6a2e8daadab91103475d Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Thu, 15 Dec 2011 13:37:06 +0000 Subject: [PATCH 968/970] haskell-murmur-hash: updated to version 0.1.0.5 svn path=/nixpkgs/trunk/; revision=30911 --- pkgs/development/libraries/haskell/murmur-hash/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/murmur-hash/default.nix b/pkgs/development/libraries/haskell/murmur-hash/default.nix index 468c18f9051..d20822244ef 100644 --- a/pkgs/development/libraries/haskell/murmur-hash/default.nix +++ b/pkgs/development/libraries/haskell/murmur-hash/default.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "murmur-hash"; - version = "0.1.0.4"; - sha256 = "08nvdv3r5scqpdcivwp0d77dl4vpkgq58rzxv1xpb8r1krqy588d"; + version = "0.1.0.5"; + sha256 = "1m7rm57bxkrl4i9fbvmx5m29axyxddrs4ss7plbd19pw3wsvgmr0"; meta = { homepage = "http://github.com/nominolo/murmur-hash"; description = "MurmurHash2 implementation for Haskell"; From 74c70eeecaf8edc4e05a485617826639d42a394b Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Thu, 15 Dec 2011 13:37:08 +0000 Subject: [PATCH 969/970] haskell-unordered-containers: updated to version 0.1.4.4 svn path=/nixpkgs/trunk/; revision=30912 --- .../libraries/haskell/unordered-containers/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/unordered-containers/default.nix b/pkgs/development/libraries/haskell/unordered-containers/default.nix index 096fb1932ac..df50bacd522 100644 --- a/pkgs/development/libraries/haskell/unordered-containers/default.nix +++ b/pkgs/development/libraries/haskell/unordered-containers/default.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "unordered-containers"; - version = "0.1.4.3"; - sha256 = "0zya72777bnmiw77rqn8k2a0g7g3j0fzpk409qb827qs3j1ffikg"; + version = "0.1.4.4"; + sha256 = "1fvicb2a8fnfg7579x6v4fpyz3dhjij8vmny4fa8x5g8ih608kb8"; buildDepends = [ deepseq hashable ]; meta = { description = "Efficient hashing-based container types"; From 9e839d01847f94bf4013a88f5e1a2bd43a2c5d85 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Thu, 15 Dec 2011 13:37:11 +0000 Subject: [PATCH 970/970] haskell-uu-parsinglib: updated to version 2.7.3.1 svn path=/nixpkgs/trunk/; revision=30913 --- pkgs/development/libraries/haskell/uu-parsinglib/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/uu-parsinglib/default.nix b/pkgs/development/libraries/haskell/uu-parsinglib/default.nix index 82a4d71bdfa..124d08aabc0 100644 --- a/pkgs/development/libraries/haskell/uu-parsinglib/default.nix +++ b/pkgs/development/libraries/haskell/uu-parsinglib/default.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "uu-parsinglib"; - version = "2.7.3"; - sha256 = "18387pq6mqg6mns1cd16d22h98mx1xnz584q8w3rmn4cndrk3883"; + version = "2.7.3.1"; + sha256 = "11lwf2b4l4sll6xvscv3c2n3kl6hs0s8rplw66cwskcck3mvs7ms"; buildDepends = [ ListLike time ]; meta = { homepage = "http://www.cs.uu.nl/wiki/bin/view/HUT/ParserCombinators";