From 527d64b6647d0156212f2f7e097459fa66927aed Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andres=20L=C3=B6h?= Date: Mon, 1 Nov 2010 16:37:46 +0000 Subject: [PATCH 01/68] darcs should propagate its Haskell dependencies since it can be used as a library svn path=/nixpkgs/trunk/; revision=24558 --- pkgs/applications/version-management/darcs/darcs-2.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/applications/version-management/darcs/darcs-2.nix b/pkgs/applications/version-management/darcs/darcs-2.nix index a5cd1f5a168..cabd9a3be93 100644 --- a/pkgs/applications/version-management/darcs/darcs-2.nix +++ b/pkgs/applications/version-management/darcs/darcs-2.nix @@ -6,7 +6,7 @@ cabal.mkDerivation (self : { version = "2.4.4"; sha256 = "97cde35ae4b74488f8b98b487bc0498069eaa74fe035903394f3d4aff1da9f9e"; - extraBuildInputs = [ + propagatedBuildInputs = [ html parsec regexCompat curl haskeline hashedStorage zlib ]; From 76e26dd7a19cc8230955857ca132b0011b7a96b6 Mon Sep 17 00:00:00 2001 From: Sander van der Burg Date: Mon, 1 Nov 2010 17:33:24 +0000 Subject: [PATCH 02/68] - Renamed DisnixService => DisnixWebService - Updated to latest unstable version svn path=/nixpkgs/trunk/; revision=24559 --- .../disnix/DisnixService/builder.sh | 34 ------------------- .../default.nix | 6 ++-- .../disnix/activation-scripts/default.nix | 33 +++++++++++++++--- .../package-management/disnix/default.nix | 14 +++++--- pkgs/top-level/all-packages.nix | 10 ++++-- 5 files changed, 49 insertions(+), 48 deletions(-) delete mode 100644 pkgs/tools/package-management/disnix/DisnixService/builder.sh rename pkgs/tools/package-management/disnix/{DisnixService => DisnixWebService}/default.nix (72%) diff --git a/pkgs/tools/package-management/disnix/DisnixService/builder.sh b/pkgs/tools/package-management/disnix/DisnixService/builder.sh deleted file mode 100644 index 78fe9e55adf..00000000000 --- a/pkgs/tools/package-management/disnix/DisnixService/builder.sh +++ /dev/null @@ -1,34 +0,0 @@ -source $stdenv/setup - -# Fix permissions -cp -av $src/* . -find . -type f | while read i -do - chmod 644 "$i" -done -find . -type d | while read i -do - chmod 755 "$i" -done - -export AXIS2_LIB=$axis2/share/java/axis2 - -# Deploy webservice -ant generate.library.jar -ant generate.service.aar -ensureDir $out/shared/lib -cp *.jar *.so $out/shared/lib -chmod 755 $out/shared/lib/*.so -ensureDir $out/webapps/axis2/WEB-INF/services -cp DisnixService.aar $out/webapps/axis2/WEB-INF/services - -# Deploy client -ant generate.client.jar -ensureDir $out/bin -for i in disnix-soap-* -do - sed -i -e "s|AXIS2_LIBDIR=|AXIS2_LIBDIR=$axis2/share/java/axis2|" $i - shebangfix $i -done -cp disnix-soap-* DisnixClient.jar jargs.jar *.nix builder.sh $out/bin -chmod 755 $out/bin/disnix-soap-* diff --git a/pkgs/tools/package-management/disnix/DisnixService/default.nix b/pkgs/tools/package-management/disnix/DisnixWebService/default.nix similarity index 72% rename from pkgs/tools/package-management/disnix/DisnixService/default.nix rename to pkgs/tools/package-management/disnix/DisnixWebService/default.nix index 1aece565099..ef6f9300c42 100644 --- a/pkgs/tools/package-management/disnix/DisnixService/default.nix +++ b/pkgs/tools/package-management/disnix/DisnixWebService/default.nix @@ -1,10 +1,10 @@ {stdenv, fetchurl, apacheAnt, jdk, axis2, dbus_java}: stdenv.mkDerivation { - name = "DisnixService-0.1"; + name = "DisnixWebService-0.2"; src = fetchurl { - url = http://hydra.nixos.org/build/337920/download/1/DisnixService-0.1.tar.bz2; - sha256 = "18526dh5axmicbahwma2m71hw7j0nkxmmhgl4kd76r61wdiiblx7"; + url = http://hydra.nixos.org/build/716007/download/1/DisnixWebService-0.2.tar.bz2; + sha256 = "0a6l9dhi20d67bddzgqi15i00xvrxacpmfbn5a0nscp2izzbvmdr"; }; buildInputs = [ apacheAnt ]; PREFIX = ''''${env.out}''; diff --git a/pkgs/tools/package-management/disnix/activation-scripts/default.nix b/pkgs/tools/package-management/disnix/activation-scripts/default.nix index 2719e611b1a..e214206d891 100644 --- a/pkgs/tools/package-management/disnix/activation-scripts/default.nix +++ b/pkgs/tools/package-management/disnix/activation-scripts/default.nix @@ -1,9 +1,34 @@ -{stdenv, fetchurl}: +{ stdenv, fetchurl +, ejabberd ? null, mysql ? null +, enableApacheWebApplication ? false +, enableAxis2WebService ? false +, enableEjabberdDump ? false +, enableMySQLDatabase ? false +, enableTomcatWebApplication ? false +, catalinaBaseDir ? "/var/tomcat" +}: + +assert enableMySQLDatabase -> mysql != null; +assert enableEjabberdDump -> ejabberd != null; stdenv.mkDerivation { - name = "disnix-activation-scripts-test"; + name = "disnix-activation-scripts-0.2pre24557"; src = fetchurl { - url = http://hydra.nixos.org/build/333630/download/1/disnix-activation-scripts-nixos-0.1.tar.gz; - sha256 = "0izkkdw9r2gff03mq973ah5b9b0a4b07l8ac0406yv8ss9vaaclm"; + url = http://hydra.nixos.org/build/727573/download/1/disnix-activation-scripts-0.2pre24557.tar.gz; + sha256 = "089bp700rjdxfa0wzf81420i5iphs78kkz41506ibsfnbm8k3axj"; }; + + preConfigure = if enableEjabberdDump then "export PATH=$PATH:${ejabberd}/sbin" else ""; + + configureFlags = '' + ${if enableApacheWebApplication then "--with-apache" else "--without-apache"} + ${if enableAxis2WebService then "--with-axis2" else "--without-axis2"} + ${if enableEjabberdDump then "--with-ejabberd" else "--without-ejabberd"} + ${if enableMySQLDatabase then "--with-mysql" else "--without-mysql"} + ${if enableTomcatWebApplication then "--with-tomcat=${catalinaBaseDir}" else "--without-tomcat"} + ''; + + buildInputs = [] + ++ stdenv.lib.optional enableEjabberdDump ejabberd + ++ stdenv.lib.optional enableMySQLDatabase mysql; } diff --git a/pkgs/tools/package-management/disnix/default.nix b/pkgs/tools/package-management/disnix/default.nix index e9b9e722c87..adb1dcc0dd6 100644 --- a/pkgs/tools/package-management/disnix/default.nix +++ b/pkgs/tools/package-management/disnix/default.nix @@ -1,10 +1,14 @@ -{stdenv, fetchurl, pkgconfig, dbus_glib, libxml2, libxslt, getopt, nixUnstable}: +{stdenv, fetchurl, pkgconfig, dbus_glib, libxml2, libxslt, getopt, nixUnstable, gettext, libiconv}: stdenv.mkDerivation { - name = "disnix-0.1"; + name = "disnix-0.2pre24517"; src = fetchurl { - url = http://hydra.nixos.org/build/334661/download/1/disnix-0.1.tar.gz; - sha256 = "0qiskbgn49dihhicczsbjandwjnz04yhnlxgwjinkcyfzsh4yqdp"; + url = http://hydra.nixos.org/build/720966/download/3/disnix-0.2pre24517.tar.gz; + sha256 = "03d2w9kckk8hy2xrywb5mk5qiyd9kjxabihv1rjnc3grlzi053k4"; }; - buildInputs = [ pkgconfig dbus_glib libxml2 libxslt getopt nixUnstable ]; + buildInputs = [ pkgconfig dbus_glib libxml2 libxslt getopt nixUnstable ] + ++ stdenv.lib.optional (!stdenv.isLinux) libiconv + ++ stdenv.lib.optional (!stdenv.isLinux) gettext; + dontStrip = true; + NIX_STRIP_DEBUG = true; } diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 27bfb20288c..4c6337ddb30 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -7037,9 +7037,15 @@ let disnix = callPackage ../tools/package-management/disnix { }; - disnix_activation_scripts = callPackage ../tools/package-management/disnix/activation-scripts { }; + disnix_activation_scripts = callPackage ../tools/package-management/disnix/activation-scripts { + enableApacheWebApplication = getConfig ["disnix" "enableApacheWebApplication"] false; + enableAxis2WebService = getConfig ["disnix" "enableAxis2WebService"] false; + enableEjabberdDump = getConfig ["disnix" "enableEjabberdDump"] false; + enableMySQLDatabase = getConfig ["disnix" "enableMySQLDatabase"] false; + enableTomcatWebApplication = getConfig ["disnix" "enableTomcatWebApplication"] false; + }; - DisnixService = callPackage ../tools/package-management/disnix/DisnixService { }; + DisnixWebService = callPackage ../tools/package-management/disnix/DisnixWebService { }; latex2html = callPackage ../misc/tex/latex2html/default.nix { tex = tetex; From 24d011bfbc04757446025a1dbc29a893e936eba8 Mon Sep 17 00:00:00 2001 From: "Yury G. Kudryashov" Date: Tue, 2 Nov 2010 11:20:24 +0000 Subject: [PATCH 03/68] monotone-0.99.1, less hacky way to get perl version svn path=/nixpkgs/trunk/; revision=24565 --- .../version-management/monotone/default.nix | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/pkgs/applications/version-management/monotone/default.nix b/pkgs/applications/version-management/monotone/default.nix index 3d74654b346..fbd36417bfc 100644 --- a/pkgs/applications/version-management/monotone/default.nix +++ b/pkgs/applications/version-management/monotone/default.nix @@ -2,22 +2,24 @@ lua, pcre, sqlite, perl, pkgconfig}: let - version = "0.99"; + version = "0.99.1"; + perlVersion = builtins.substring 5 10 perl.name; in stdenv.mkDerivation rec { name = "monotone-${version}"; - inherit perl; src = fetchurl { url = "http://monotone.ca/downloads/${version}/monotone-${version}.tar.gz"; - sha256 = "fa677f09169afb71452598ce92ea376fe06037d17bfe650fb6aed17cead11453"; + sha256 = "189h5f6gqd4ng0qmzi3xwnj17nnpxm2vzras216ar6b5yc9bnki0"; }; buildInputs = [boost zlib botan libidn lua pcre sqlite pkgconfig]; postInstall = '' ensureDir $out/share/${name} cp -rv contrib/ $out/share/${name}/contrib - ensureDir $out/lib/perl5/site_perl/''${perl##*-perl-} - cp -v contrib/Monotone.pm $out/lib/perl5/site_perl/''${perl##*-perl-} + ensureDir $out/lib/perl5/site_perl/${perlVersion} + cp -v contrib/Monotone.pm $out/lib/perl5/site_perl/${perlVersion} ''; meta = { + description = "A free distributed version control system"; maintainers = [stdenv.lib.maintainers.raskin]; + platforms = stdenv.lib.platforms.all; }; } From 3baea16bc6f91d608b6d23223e189394347e1bea Mon Sep 17 00:00:00 2001 From: "Yury G. Kudryashov" Date: Tue, 2 Nov 2010 12:23:01 +0000 Subject: [PATCH 04/68] Add guitone. It compiles. Haven't checked whether it works. svn path=/nixpkgs/trunk/; revision=24566 --- .../version-management/guitone/default.nix | 22 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 24 insertions(+) create mode 100644 pkgs/applications/version-management/guitone/default.nix diff --git a/pkgs/applications/version-management/guitone/default.nix b/pkgs/applications/version-management/guitone/default.nix new file mode 100644 index 00000000000..88859ee9607 --- /dev/null +++ b/pkgs/applications/version-management/guitone/default.nix @@ -0,0 +1,22 @@ +{ stdenv, fetchurl, qt4 }: + +let version = "1.0rc4"; in +stdenv.mkDerivation rec { + name = "guitone-${version}"; + + src = fetchurl { + url = "${meta.homepage}/count.php/from=default/${version}/${name}.tgz"; + sha256 = "08kcyar6p6v5z4dq6q6c1dhyxc2jj49qcd6lj3rdn1rb9hz4n7ms"; + }; + + buildInputs = [ qt4 ]; + + prefixKey="PREFIX="; + configureScript = "qmake"; + + meta = { + description = "Qt4 based GUI for monotone"; + homepage = http://guitone.thomaskeller.biz; + inherit (qt4.meta) platforms; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 4c6337ddb30..6b6bc2b0ae1 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -5739,6 +5739,8 @@ let python = pythonFull; }; + guitone = callPackage ../applications/version-management/guitone { }; + gv = callPackage ../applications/misc/gv { }; hello = callPackage ../applications/misc/hello/ex-2 { }; From 00d1d949d7eae3be344d41c3248f3ea5be439e1f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?= Date: Tue, 2 Nov 2010 13:23:59 +0000 Subject: [PATCH 05/68] Updating kdenlive (and mlt as a requirement) svn path=/nixpkgs/trunk/; revision=24567 --- pkgs/applications/video/kdenlive/default.nix | 6 +++--- pkgs/development/libraries/mlt/default.nix | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/pkgs/applications/video/kdenlive/default.nix b/pkgs/applications/video/kdenlive/default.nix index 8af0db2fcc8..38f843c447f 100644 --- a/pkgs/applications/video/kdenlive/default.nix +++ b/pkgs/applications/video/kdenlive/default.nix @@ -2,10 +2,10 @@ shared_mime_info, soprano}: stdenv.mkDerivation { - name = "kdenlive-0.7.7.1"; + name = "kdenlive-0.7.8"; src = fetchurl { - url = mirror://sourceforge/kdenlive/kdenlive-0.7.7.1.tar.gz; - sha256 = "047kpzfdmipgnnkbdhcpy5c0kqgpg7yn3qhyd7inlplmyd3i1pfx"; + url = mirror://sourceforge/kdenlive/kdenlive-0.7.8.tar.gz; + sha256 = "10bwmhh3kzdbq1nzq8s5ln7ydrzg41d1rihj5kdmf5hb91az8mvx"; }; buildInputs = [ cmake qt4 perl kdelibs automoc4 phonon mlt gettext diff --git a/pkgs/development/libraries/mlt/default.nix b/pkgs/development/libraries/mlt/default.nix index 53ce0ed847e..33b5918d1ca 100644 --- a/pkgs/development/libraries/mlt/default.nix +++ b/pkgs/development/libraries/mlt/default.nix @@ -2,11 +2,11 @@ libvorbis, sox}: stdenv.mkDerivation { - name = "mlt-0.5.4"; + name = "mlt-0.5.10"; src = fetchurl { - url = mirror://sourceforge/mlt/mlt-0.5.4.tar.gz; - sha256 = "12s5znbm6q45r33ymyw1bak3d41xhh72gh9i1pdsgvddr0pizshj"; + url = mirror://sourceforge/mlt/mlt-0.5.10.tar.gz; + sha256 = "17nil3snm6qgcyld852ys0kqm61cx94zb3bvjdqgci6z1ia3crhh"; }; buildInputs = [ qt SDL ffmpeg libdv libxml2 libsamplerate libvorbis sox ]; From 548e313d02c65ca93c1a5815bc3cc74f9dd1018e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?= Date: Tue, 2 Nov 2010 13:24:04 +0000 Subject: [PATCH 06/68] Updating fossil svn path=/nixpkgs/trunk/; revision=24568 --- pkgs/applications/version-management/fossil/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/version-management/fossil/default.nix b/pkgs/applications/version-management/fossil/default.nix index ff682e63364..b1827711ee6 100644 --- a/pkgs/applications/version-management/fossil/default.nix +++ b/pkgs/applications/version-management/fossil/default.nix @@ -1,7 +1,7 @@ {stdenv, fetchurl, zlib, openssl}: let - version = "20101005035549"; + version = "20101101142335"; in stdenv.mkDerivation { @@ -9,7 +9,7 @@ stdenv.mkDerivation { src = fetchurl { url = "http://www.fossil-scm.org/download/fossil-src-${version}.tar.gz"; - sha256 = "14d7sibz9vfmb96xsaia5x6x0059xpn09x3la0xph0ym9gjqp8kb"; + sha256 = "129a2zf5zpq397nmmmk31k1yhkgvrssgrh9z4aaj6lh50s3ax0bh"; }; buildInputs = [ zlib openssl ]; From 5e5ce5a987bd044459c19b393884a348e9d1f0b3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?= Date: Tue, 2 Nov 2010 13:24:08 +0000 Subject: [PATCH 07/68] Updating kdesvn. It still does not build to some docbook problems I don't know how to solve, related to kde 4.5 I guess. It runs some /nix/store/wlbri8r6fzavvq554bm04666aphhkxxr-kdelibs-4.5.2/bin/meinproc4 --check --cache /tmp/nix-build-rjcm9mri08cpbvh7gcjcvra2iqzn20ch-kdesvn-1.5.5.drv-0/kdesvn-1.5.5/build/doc/nl/index.cache.bz2 /tmp/nix-build-rjcm9mri08cpbvh7gcjcvra2iqzn20ch-kdesvn-1.5.5.drv-0/kdesvn-1.5.5/doc/nl/index.docbook and this fails. svn path=/nixpkgs/trunk/; revision=24569 --- .../version-management/kdesvn/builder.sh | 8 -------- .../version-management/kdesvn/default.nix | 18 ++++++++++++------ 2 files changed, 12 insertions(+), 14 deletions(-) delete mode 100644 pkgs/applications/version-management/kdesvn/builder.sh diff --git a/pkgs/applications/version-management/kdesvn/builder.sh b/pkgs/applications/version-management/kdesvn/builder.sh deleted file mode 100644 index ed3b06c00c8..00000000000 --- a/pkgs/applications/version-management/kdesvn/builder.sh +++ /dev/null @@ -1,8 +0,0 @@ -source $stdenv/setup - -myPatchPhase() -{ - sed -i -e "s|/usr|$subversion|g" src/svnqt/cmakemodules/FindSubversion.cmake -} -patchPhase=myPatchPhase -genericBuild diff --git a/pkgs/applications/version-management/kdesvn/default.nix b/pkgs/applications/version-management/kdesvn/default.nix index 141bf938e3a..c063cd6d09a 100644 --- a/pkgs/applications/version-management/kdesvn/default.nix +++ b/pkgs/applications/version-management/kdesvn/default.nix @@ -1,15 +1,21 @@ { stdenv, fetchurl, lib, cmake, qt4, perl, gettext, apr, aprutil, subversion, db4 -, kdelibs, automoc4, phonon}: +, kdelibs, automoc4, phonon, kdebase}: stdenv.mkDerivation { - name = "kdesvn-1.5.2"; + name = "kdesvn-1.5.5"; src = fetchurl { - url = http://kdesvn.alwins-world.de/downloads/kdesvn-1.5.2.tar.bz2; - sha256 = "1svblxi70ks816zj1w4cc87x72b628g7xjx4hvx57zw8d9hr463h"; + url = http://kdesvn.alwins-world.de/downloads/kdesvn-1.5.5.tar.bz2; + sha256 = "02sb34p04dyd88ksxvpiffhxqwmhs3yv1wif9m8w0fly9hvy1zk7"; }; - builder = ./builder.sh; - inherit subversion; + + patchPhase = '' + sed -i -e "s|/usr|${subversion}|g" src/svnqt/cmakemodules/FindSubversion.cmake + ''; + + makeFlags = [ "VERBOSE=1" ]; + buildInputs = [ cmake qt4 perl gettext apr aprutil subversion db4 kdelibs automoc4 phonon ]; + meta = { description = "KDE SVN front-end"; license = "GPL"; From 448b75b87b1e0977149754edd9b3edca27c2f42d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?= Date: Tue, 2 Nov 2010 13:24:12 +0000 Subject: [PATCH 08/68] Removing a fix made for gcc 4.3 in php expression. Now it builds with -O2 as usual, instead of -O1. svn path=/nixpkgs/trunk/; revision=24570 --- pkgs/development/interpreters/php/default.nix | 2 -- 1 file changed, 2 deletions(-) diff --git a/pkgs/development/interpreters/php/default.nix b/pkgs/development/interpreters/php/default.nix index 3f3efa78275..8277021b0dc 100644 --- a/pkgs/development/interpreters/php/default.nix +++ b/pkgs/development/interpreters/php/default.nix @@ -134,13 +134,11 @@ composableDerivation {} ( fixed : let inherit (fixed.fixed) version; in { gdSupport = getConfig ["php" "gd"] true; }; - # only -O1 configurePhase = '' iniFile=$out/etc/php-recommended.ini [[ -z "$libxml2" ]] || export PATH=$PATH:$libxml2/bin ./configure --with-config-file-scan-dir=/etc --with-config-file-path=$out/etc --prefix=$out $configureFlags echo configurePhase end - sed -e 's/-O2/-O1/g' -i Makefile # http://bugs.php.net/bug.php?id=47730&edit=3 ''; installPhase = '' From 9ff062284801e2df583f862f34bc994a0849b45d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?= Date: Tue, 2 Nov 2010 13:35:28 +0000 Subject: [PATCH 09/68] Kdesvn fixed. At the end it was a wrong docbook type only in one of the docbook files there. The other was fine, and kept me confused for long. svn path=/nixpkgs/trunk/; revision=24571 --- .../version-management/kdesvn/default.nix | 5 +++-- .../version-management/kdesvn/docbook.patch | 13 +++++++++++++ 2 files changed, 16 insertions(+), 2 deletions(-) create mode 100644 pkgs/applications/version-management/kdesvn/docbook.patch diff --git a/pkgs/applications/version-management/kdesvn/default.nix b/pkgs/applications/version-management/kdesvn/default.nix index c063cd6d09a..b6893ba17e1 100644 --- a/pkgs/applications/version-management/kdesvn/default.nix +++ b/pkgs/applications/version-management/kdesvn/default.nix @@ -8,11 +8,12 @@ stdenv.mkDerivation { sha256 = "02sb34p04dyd88ksxvpiffhxqwmhs3yv1wif9m8w0fly9hvy1zk7"; }; - patchPhase = '' + prePatch = '' sed -i -e "s|/usr|${subversion}|g" src/svnqt/cmakemodules/FindSubversion.cmake ''; - makeFlags = [ "VERBOSE=1" ]; + patches = [ ./docbook.patch ]; + buildInputs = [ cmake qt4 perl gettext apr aprutil subversion db4 kdelibs automoc4 phonon ]; diff --git a/pkgs/applications/version-management/kdesvn/docbook.patch b/pkgs/applications/version-management/kdesvn/docbook.patch new file mode 100644 index 00000000000..54f43c77958 --- /dev/null +++ b/pkgs/applications/version-management/kdesvn/docbook.patch @@ -0,0 +1,13 @@ +The name of the dtd changed in kdelibs 4.5, so we need to increase it. + +diff --git a/doc/nl/index.docbook b/doc/nl/index.docbook +index 8747869..a9676aa 100644 +--- a/doc/nl/index.docbook ++++ b/doc/nl/index.docbook +@@ -1,5 +1,5 @@ + +-kdesvn"> + + From 15216324136cf09d0d357b050dd39ce8cc6e552c Mon Sep 17 00:00:00 2001 From: Michael Raskin <7c6f434c@mail.ru> Date: Tue, 2 Nov 2010 15:34:20 +0000 Subject: [PATCH 10/68] Try updating WebKit svn path=/nixpkgs/trunk/; revision=24572 --- pkgs/development/libraries/webkit/default.nix | 2 +- pkgs/development/libraries/webkit/src-for-default.nix | 10 +++++----- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/pkgs/development/libraries/webkit/default.nix b/pkgs/development/libraries/webkit/default.nix index 262b0c2e9ce..cfd8b2a303e 100644 --- a/pkgs/development/libraries/webkit/default.nix +++ b/pkgs/development/libraries/webkit/default.nix @@ -35,7 +35,7 @@ rec { # https://bugs.webkit.org/show_bug.cgi?id=45110 # "--enable-indexed-database" - # "--enable-xhtmlmp" + "--enable-xhtmlmp" # "--enable-input-speech" diff --git a/pkgs/development/libraries/webkit/src-for-default.nix b/pkgs/development/libraries/webkit/src-for-default.nix index 727bc993b36..93085c99ab3 100644 --- a/pkgs/development/libraries/webkit/src-for-default.nix +++ b/pkgs/development/libraries/webkit/src-for-default.nix @@ -1,9 +1,9 @@ rec { - version="r69611"; - name="webkit-r69611"; - hash="1429hz86w4c2lzl32mpfxcim25d3xvqgx2as1c5ghdhiv0q9d76p"; - url="http://builds.nightly.webkit.org/files/trunk/src/WebKit-r69611.tar.bz2"; - advertisedUrl="http://builds.nightly.webkit.org/files/trunk/src/WebKit-r69611.tar.bz2"; + version="r70732"; + name="webkit-r70732"; + hash="1y81rir7mwqxd40i4zzq79c7wa0pvvgvk332k1j94xwqfrffnxzi"; + url="http://builds.nightly.webkit.org/files/trunk/src/WebKit-r70732.tar.bz2"; + advertisedUrl="http://builds.nightly.webkit.org/files/trunk/src/WebKit-r70732.tar.bz2"; } From 770eaeb8e2891003534a79e8626d9b4cf1a1f23e Mon Sep 17 00:00:00 2001 From: Michael Raskin <7c6f434c@mail.ru> Date: Tue, 2 Nov 2010 18:38:09 +0000 Subject: [PATCH 11/68] Roll back on XHTML-MP svn path=/nixpkgs/trunk/; revision=24576 --- pkgs/development/libraries/webkit/default.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/development/libraries/webkit/default.nix b/pkgs/development/libraries/webkit/default.nix index cfd8b2a303e..d7f3c03eb8a 100644 --- a/pkgs/development/libraries/webkit/default.nix +++ b/pkgs/development/libraries/webkit/default.nix @@ -35,7 +35,8 @@ rec { # https://bugs.webkit.org/show_bug.cgi?id=45110 # "--enable-indexed-database" - "--enable-xhtmlmp" + # Related bug is marked as closed, but seems to persist + # "--enable-xhtmlmp" # "--enable-input-speech" From 6a09974e0f53305ab5f411d1388acdfb264d1441 Mon Sep 17 00:00:00 2001 From: Michael Raskin <7c6f434c@mail.ru> Date: Tue, 2 Nov 2010 19:19:25 +0000 Subject: [PATCH 12/68] Update Guitone svn path=/nixpkgs/trunk/; revision=24580 --- .../version-management/guitone/default.nix | 19 +++++++++++++------ 1 file changed, 13 insertions(+), 6 deletions(-) diff --git a/pkgs/applications/version-management/guitone/default.nix b/pkgs/applications/version-management/guitone/default.nix index 88859ee9607..a396765e918 100644 --- a/pkgs/applications/version-management/guitone/default.nix +++ b/pkgs/applications/version-management/guitone/default.nix @@ -1,18 +1,25 @@ -{ stdenv, fetchurl, qt4 }: +{ stdenv, fetchurl, fetchmtn, qt4 }: -let version = "1.0rc4"; in +let version = "1.0-mtn-head"; in stdenv.mkDerivation rec { name = "guitone-${version}"; - src = fetchurl { - url = "${meta.homepage}/count.php/from=default/${version}/${name}.tgz"; - sha256 = "08kcyar6p6v5z4dq6q6c1dhyxc2jj49qcd6lj3rdn1rb9hz4n7ms"; + #src = fetchurl { + # url = "${meta.homepage}/count.php/from=default/${version}/${name}.tgz"; + # sha256 = "08kcyar6p6v5z4dq6q6c1dhyxc2jj49qcd6lj3rdn1rb9hz4n7ms"; + #}; + + src = fetchmtn { + dbs = ["mtn://code.monotone.ca/guitone"]; + selector = "2777cdef424c65df93fa1ff181f02ee30d4901ab"; + sha256 = "918d36a83060b84efa0ee0fe0fd058f1c871c91156d91366e2e979c886ff4271"; + branch = "net.venge.monotone.guitone"; }; buildInputs = [ qt4 ]; prefixKey="PREFIX="; - configureScript = "qmake"; + configureScript = "qmake guitone.pro"; meta = { description = "Qt4 based GUI for monotone"; From 7ce8c4b77ea6897cff6be8e43d16bc5efee1106d Mon Sep 17 00:00:00 2001 From: Piotr Pietraszkiewicz Date: Tue, 2 Nov 2010 20:09:15 +0000 Subject: [PATCH 13/68] fixed compilation error, debian bug #577368 (implicit decl. of function 'GTK_WIDGET_SENSITIVE'), by bumping gtkhtml to version 3.29.92.1 svn path=/nixpkgs/trunk/; revision=24581 --- pkgs/desktops/gnome-2.28/platform/gtkhtml/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/desktops/gnome-2.28/platform/gtkhtml/default.nix b/pkgs/desktops/gnome-2.28/platform/gtkhtml/default.nix index e4ced2247a5..a6a99c35310 100644 --- a/pkgs/desktops/gnome-2.28/platform/gtkhtml/default.nix +++ b/pkgs/desktops/gnome-2.28/platform/gtkhtml/default.nix @@ -2,11 +2,11 @@ GConf, enchant, isocodes, gnome_icon_theme }: stdenv.mkDerivation rec { - name = "gtkhtml-3.29.5"; + name = "gtkhtml-3.29.92.1"; src = fetchurl { url = "mirror://gnome/sources/gtkhtml/3.29/${name}.tar.bz2"; - sha256 = "0abd91isqbriq9nclq14275v2xd0r9vrr3sxhxwxxp02m8gskwvd"; + sha256 = "a34fe24af0f591db95010475c21a461985ef4479b2e91602bc745a9accfeef77"; }; buildInputs = [pkgconfig gtk intltool GConf enchant isocodes gnome_icon_theme ]; From 6c5c9fc17c1d0762a7ac65fc65a57fad0057b872 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andres=20L=C3=B6h?= Date: Wed, 3 Nov 2010 13:52:20 +0000 Subject: [PATCH 14/68] Updated GHC 7.0.1 release candidate. svn path=/nixpkgs/trunk/; revision=24583 --- pkgs/development/compilers/ghc/7.0.1.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/compilers/ghc/7.0.1.nix b/pkgs/development/compilers/ghc/7.0.1.nix index e4840eb2d20..6c4454ae3b5 100644 --- a/pkgs/development/compilers/ghc/7.0.1.nix +++ b/pkgs/development/compilers/ghc/7.0.1.nix @@ -1,7 +1,7 @@ {stdenv, fetchurl, ghc, perl, gmp, ncurses}: stdenv.mkDerivation rec { - version = "7.0.1-rc1"; + version = "7.0.1-rc2"; name = "ghc-${version}"; @@ -9,8 +9,8 @@ stdenv.mkDerivation rec { homepage = "http://haskell.org/ghc"; src = fetchurl { - url = "http://new-www.haskell.org/ghc/dist/${version}/ghc-7.0.0.20100924-src.tar.bz2"; - sha256 = "14b3cg4i805798v0rasr16nja70k68vp34qar0pv2vbwcl39apv5"; + url = "http://new-www.haskell.org/ghc/dist/${version}/ghc-7.0.0.20101028-src.tar.bz2"; + sha256 = "6048eb94163c96b99094960fe2e5ddd1053594323ba80548dabf50c62c1b7b71"; }; buildInputs = [ghc perl gmp ncurses]; From b247c239e52be5b7fd9ad7b6a62e8695aa5e1f76 Mon Sep 17 00:00:00 2001 From: Armijn Hemel Date: Wed, 3 Nov 2010 14:03:53 +0000 Subject: [PATCH 15/68] update to 2.7.5 svn path=/nixpkgs/trunk/; revision=24584 --- .../networking/instant-messengers/pidgin/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/networking/instant-messengers/pidgin/default.nix b/pkgs/applications/networking/instant-messengers/pidgin/default.nix index 691a6d09734..d5ae3b5440f 100644 --- a/pkgs/applications/networking/instant-messengers/pidgin/default.nix +++ b/pkgs/applications/networking/instant-messengers/pidgin/default.nix @@ -21,10 +21,10 @@ } : stdenv.mkDerivation { - name = "pidgin-2.7.4"; + name = "pidgin-2.7.5"; src = fetchurl { - url = mirror://sourceforge/pidgin/pidgin-2.7.4.tar.bz2; - sha256 = "0mpqh77g5wgi39bqi4hma4z7r3piz3wi8x49s3dy5gc2220s4vvw"; + url = mirror://sourceforge/pidgin/pidgin-2.7.5.tar.bz2; + sha256 = "0y6qzgx907k9p8bi8fvjnn4ri7qzmqch1i5lfh45k2lngxxfxxgk"; }; inherit nss ncurses; From f540277f975a06384bafaed7742fc0eeeefb5377 Mon Sep 17 00:00:00 2001 From: Piotr Pietraszkiewicz Date: Wed, 3 Nov 2010 20:36:36 +0000 Subject: [PATCH 16/68] added the sword framework svn path=/nixpkgs/trunk/; revision=24586 --- pkgs/development/libraries/sword/default.nix | 30 ++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 32 insertions(+) create mode 100644 pkgs/development/libraries/sword/default.nix diff --git a/pkgs/development/libraries/sword/default.nix b/pkgs/development/libraries/sword/default.nix new file mode 100644 index 00000000000..07634ce09f3 --- /dev/null +++ b/pkgs/development/libraries/sword/default.nix @@ -0,0 +1,30 @@ +{stdenv, fetchurl, pkgconfig, icu, cluceneCore, curl}: + +stdenv.mkDerivation rec { + + version = "1.6.2"; + + name = "sword-${version}"; + + src = fetchurl { + url = "http://www.crosswire.org/ftpmirror/pub/sword/source/v1.6/${name}.tar.gz"; + sha256 = "1fc71avaxkhx6kckjiflw6j02lpg569b9bzaksq49i1m87awfxmg"; + }; + + buildInputs = [ pkgconfig icu cluceneCore curl ]; + + prePatch = '' + patchShebangs .; + ''; + + configureFlags = "--without-conf --enable-debug"; + + meta = { + description = "A software framework that allows research manipulation of Biblical texts"; + homepage = http://www.crosswire.org/sword/; + platforms = stdenv.lib.platforms.linux; + license = "GPLv2"; + }; + +} + diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 6b6bc2b0ae1..d90cad034f3 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -3841,6 +3841,8 @@ let suitesparse = callPackage ../development/libraries/suitesparse { }; + sword = callPackage ../development/libraries/sword { }; + t1lib = callPackage ../development/libraries/t1lib { }; taglib = callPackage ../development/libraries/taglib { }; From be71209dd39f27fcd86d7f06868444e1ff55e368 Mon Sep 17 00:00:00 2001 From: Piotr Pietraszkiewicz Date: Wed, 3 Nov 2010 20:42:26 +0000 Subject: [PATCH 17/68] added bibletime - a Bible study tool svn path=/nixpkgs/trunk/; revision=24587 --- pkgs/applications/misc/bibletime/default.nix | 35 ++++++++++++++++++++ pkgs/top-level/all-packages.nix | 4 +++ 2 files changed, 39 insertions(+) create mode 100644 pkgs/applications/misc/bibletime/default.nix diff --git a/pkgs/applications/misc/bibletime/default.nix b/pkgs/applications/misc/bibletime/default.nix new file mode 100644 index 00000000000..e7ae8b4f175 --- /dev/null +++ b/pkgs/applications/misc/bibletime/default.nix @@ -0,0 +1,35 @@ +{stdenv, fetchurl, cmake, sword, qt, boost, cluceneCore}: + +stdenv.mkDerivation rec { + + version = "2.7.3"; + + name = "bibletime-${version}"; + + src = fetchurl { + url = "mirror://sourceforge/project/bibletime/BibleTime%202/BibleTime%202%20source%20code/${name}.tar.bz2"; + sha256 = "0171hlwg4rjv93b3gwcyv3nsj2kzwf4n8f6jw6ld18x7xmk9rkdg"; + }; + + prePatch = '' + patchShebangs .; + ''; + + preConfigure = '' + export CLUCENE_HOME=${cluceneCore}; + export SWORD_HOME=${sword}; + ''; + + buildInputs = [ cmake sword qt boost cluceneCore ]; + + cmakeFlags = "-DUSE_QT_WEBKIT=ON -DCMAKE_BUILD_TYPE=Debug"; + + meta = { + description = "A Qt4 Bible study tool"; + homepage = http://www.bibletime.info/; + platforms = stdenv.lib.platforms.linux; + license = "GPLv2"; + }; + +} + diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index d90cad034f3..1021d65ddaa 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -5278,6 +5278,10 @@ let inherit (gnome) libgnomecanvas libart_lgpl; }; + bibletime = newScope pkgs.kde45 ../applications/misc/bibletime { + qt = qt4; + } ; + bitlbee = callPackage ../applications/networking/instant-messengers/bitlbee { }; bitlbeeOtr = callPackage ../applications/networking/instant-messengers/bitlbee-otr { }; From 528dc56ce1060b553ef865de2f9f3a432d71574f Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Wed, 3 Nov 2010 20:54:20 +0000 Subject: [PATCH 18/68] * Linux 2.6.32.25. svn path=/nixpkgs/trunk/; revision=24588 --- pkgs/os-specific/linux/kernel/linux-2.6.32.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/linux-2.6.32.nix b/pkgs/os-specific/linux/kernel/linux-2.6.32.nix index 8924ffe1d59..3466b399722 100644 --- a/pkgs/os-specific/linux/kernel/linux-2.6.32.nix +++ b/pkgs/os-specific/linux/kernel/linux-2.6.32.nix @@ -198,11 +198,11 @@ in import ./generic.nix ( rec { - version = "2.6.32.24"; + version = "2.6.32.25"; src = fetchurl { url = "mirror://kernel/linux/kernel/v2.6/linux-${version}.tar.bz2"; - sha256 = "0girs793499ig4p4rp1pi3fdigbdv4h2slavxs8jlj9kxd2x19y7"; + sha256 = "1ycri78c335qqmfqxg8c4m03f6gy0q1y35yv7yg2f2m6aqhylh2z"; }; config = configWithPlatform stdenv.platform; From 11616a221384c6cac83e79e5cbde9a215e00be5f Mon Sep 17 00:00:00 2001 From: Michael Raskin <7c6f434c@mail.ru> Date: Wed, 3 Nov 2010 21:57:42 +0000 Subject: [PATCH 19/68] Update fbpanel svn path=/nixpkgs/trunk/; revision=24589 --- .../window-managers/fbpanel/default.nix | 73 +++++++++++++------ 1 file changed, 51 insertions(+), 22 deletions(-) diff --git a/pkgs/applications/window-managers/fbpanel/default.nix b/pkgs/applications/window-managers/fbpanel/default.nix index c7bba46ec05..66a3741d365 100644 --- a/pkgs/applications/window-managers/fbpanel/default.nix +++ b/pkgs/applications/window-managers/fbpanel/default.nix @@ -1,24 +1,53 @@ -{ stdenv, fetchurl, builderDefs, libX11, gtk, pkgconfig, libXmu -, libXpm, libpng, libjpeg, libtiff, librsvg }: +x@{builderDefsPackage + , libX11, gtk, pkgconfig, libXmu + , libXpm, libpng, libjpeg, libtiff, librsvg + , ...}: +builderDefsPackage +(a : +let + helperArgNames = ["stdenv" "fetchurl" "builderDefsPackage"] ++ + []; - let localDefs = builderDefs.passthru.function { - src = /* put a fetchurl here */ - fetchurl { - url = http://garr.dl.sourceforge.net/sourceforge/fbpanel/fbpanel-4.12.tgz; - sha256 = "0zv0zkq6w4h7dk0ji8bm9cqpj2qxv3ss161mqg9y68shvxvmfrlz"; - }; + buildInputs = map (n: builtins.getAttr n x) + (builtins.attrNames (builtins.removeAttrs x helperArgNames)); + sourceInfo = rec { + baseName="fbpanel"; + version="6.1"; + name="${baseName}-${version}"; + url="mirror://sourceforge/${baseName}/${name}.tbz2"; + hash="e14542cc81ea06e64dd4708546f5fd3f5e01884c3e4617885c7ef22af8cf3965"; + }; +in +rec { + src = a.fetchurl { + url = sourceInfo.url; + sha256 = sourceInfo.hash; + }; + + inherit (sourceInfo) name version; + inherit buildInputs; + + /* doConfigure should be removed if not needed */ + phaseNames = ["setVars" "doUnpack" "fixPaths" "doConfigure" "doMakeInstall"]; + + fixPaths=(a.doPatchShebangs "."); + setVars = a.fullDepEntry '' + export NIX_LDFLAGS="$NIX_LDFLAGS -lX11" + '' []; + + meta = { + description = "${abort ''Specify description''}"; + maintainers = with a.lib.maintainers; + [ + raskin + ]; + platforms = with a.lib.platforms; + linux; + }; + passthru = { + updateInfo = { + downloadPage = "fbpanel.sourceforge.net"; + }; + }; +}) x - buildInputs = [libX11 gtk pkgconfig libXmu libXpm - libpng libjpeg libtiff librsvg]; - configureFlags = []; - }; /* null is a terminator for sumArgs */ - in with localDefs; -stdenv.mkDerivation rec { - name = "fbpanel-4.12"; - builder = writeScript (name + "-builder") - (textClosure localDefs [doConfigure doMakeInstall doForceShare doPropagate]); - meta = { - description = "Just a desktop panel"; - inherit src; - }; -} From ce39b02f35a68dfbe86a1a04d0dff363d1e00485 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Wed, 3 Nov 2010 22:14:13 +0000 Subject: [PATCH 20/68] * Add xwininfo to the channel. svn path=/nixpkgs/trunk/; revision=24590 --- pkgs/top-level/release.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/top-level/release.nix b/pkgs/top-level/release.nix index f4a293a131d..9e61e6c5a0d 100644 --- a/pkgs/top-level/release.nix +++ b/pkgs/top-level/release.nix @@ -534,6 +534,7 @@ with (import ./release-lib.nix); xrdb = linux; xset = linux; xsetroot = linux; + xwininfo = linux; }; xfce4 = { From 078587a84611de78159a88847cb4a28286cb197f Mon Sep 17 00:00:00 2001 From: Marco Maggesi Date: Wed, 3 Nov 2010 22:20:05 +0000 Subject: [PATCH 21/68] Update HOL Light svn path=/nixpkgs/trunk/; revision=24591 --- .../science/logic/hol_light/parser_setup.patch | 9 ++++----- pkgs/applications/science/logic/hol_light/sources.nix | 6 +++--- 2 files changed, 7 insertions(+), 8 deletions(-) diff --git a/pkgs/applications/science/logic/hol_light/parser_setup.patch b/pkgs/applications/science/logic/hol_light/parser_setup.patch index e327527882d..0ad17ca1a0b 100644 --- a/pkgs/applications/science/logic/hol_light/parser_setup.patch +++ b/pkgs/applications/science/logic/hol_light/parser_setup.patch @@ -1,6 +1,6 @@ diff -Nuar hol_light/hol.ml hol_light.nixos/hol.ml ---- hol_light/hol.ml 2010-09-12 18:57:28.000000000 +0200 -+++ hol_light.nixos/hol.ml 2010-09-12 19:09:09.000000000 +0200 +--- hol_light/hol.ml 2010-11-03 23:09:01.000000000 +0100 ++++ hol_light.nixos/hol.ml 2010-11-03 23:10:31.000000000 +0100 @@ -11,8 +11,8 @@ let hol_version = "2.20++";; @@ -12,7 +12,7 @@ diff -Nuar hol_light/hol.ml hol_light.nixos/hol.ml (* ------------------------------------------------------------------------- *) (* Should eventually change to "ref(Filename.temp_dir_name)". *) -@@ -23,20 +23,6 @@ +@@ -23,19 +23,6 @@ let temp_path = ref "/tmp";; (* ------------------------------------------------------------------------- *) @@ -21,8 +21,7 @@ diff -Nuar hol_light/hol.ml hol_light.nixos/hol.ml -(* and for Ocaml >= 3.10, use camlp5 instead. *) -(* ------------------------------------------------------------------------- *) - --if let v = String.sub Sys.ocaml_version 0 4 in -- v = "3.10" or v = "3.11" +-if let v = String.sub Sys.ocaml_version 0 4 in v >= "3.10" -then (Topdirs.dir_directory "+camlp5"; - Topdirs.dir_load Format.std_formatter "camlp5o.cma") -else (Topdirs.dir_load Format.std_formatter "camlp4o.cma");; diff --git a/pkgs/applications/science/logic/hol_light/sources.nix b/pkgs/applications/science/logic/hol_light/sources.nix index 497c3d8ff5f..b45ca4a9034 100644 --- a/pkgs/applications/science/logic/hol_light/sources.nix +++ b/pkgs/applications/science/logic/hol_light/sources.nix @@ -2,12 +2,12 @@ stdenv.mkDerivation rec { name = "hol_light_sources-${version}"; - version = "20100820"; + version = "20101029"; src = fetchsvn { url = http://hol-light.googlecode.com/svn/trunk; - rev = "57"; - sha256 = "d1372744abca6c9978673850977d3e1577fd8cfd8298826eb713b3681c10cccd"; + rev = "64"; + sha256 = "91e9cac62586039b13c11af245f85a743e299892b24b39d3c7b2ee13157e87c9"; }; buildCommand = '' From a2102af6dfa3a5ab34a6bfcd00f8534b515d0b1b Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Wed, 3 Nov 2010 22:37:00 +0000 Subject: [PATCH 22/68] * buildEnv: use $SHELL (i.e. bash) rather than /bin/sh. This allows NixOS VM tests to be built on Ubuntu, where /bin/sh is dash rather than bash. svn path=/nixpkgs/trunk/; revision=24592 --- pkgs/build-support/buildenv/builder.pl | 5 ----- pkgs/build-support/buildenv/default.nix | 13 +++++++------ pkgs/top-level/all-packages.nix | 3 +-- 3 files changed, 8 insertions(+), 13 deletions(-) diff --git a/pkgs/build-support/buildenv/builder.pl b/pkgs/build-support/buildenv/builder.pl index cdd65cbc523..71502c9f668 100755 --- a/pkgs/build-support/buildenv/builder.pl +++ b/pkgs/build-support/buildenv/builder.pl @@ -10,7 +10,6 @@ STDOUT->autoflush(1); my $out = $ENV{"out"}; - my @pathsToLink = split ' ', $ENV{"pathsToLink"}; sub isInPathsToLink { @@ -153,7 +152,3 @@ my $manifest = $ENV{"manifest"}; if ($manifest) { symlink($manifest, "$out/manifest") or die "cannot create manifest"; } - - -system("eval \"\$postBuild\"") == 0 - or die "post-build hook failed"; diff --git a/pkgs/build-support/buildenv/default.nix b/pkgs/build-support/buildenv/default.nix index abe2f37ec66..1bfada4fb62 100644 --- a/pkgs/build-support/buildenv/default.nix +++ b/pkgs/build-support/buildenv/default.nix @@ -2,7 +2,7 @@ # a fork of the buildEnv in the Nix distribution. Most changes should # eventually be merged back into the Nix distribution. -{stdenv, perl}: +{ perl, runCommand }: { name @@ -25,8 +25,9 @@ postBuild ? "" }: -stdenv.mkDerivation { - inherit name manifest paths ignoreCollisions pathsToLink postBuild; - realBuilder = "${perl}/bin/perl"; - args = ["-w" ./builder.pl]; -} +runCommand name + { inherit manifest paths ignoreCollisions pathsToLink postBuild; } + '' + ${perl}/bin/perl -w ${./builder.pl} + eval "$postBuild" + '' diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 1021d65ddaa..df199ae36ea 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -233,9 +233,8 @@ let theAttrSet = arg; }; - buildEnvScript = ../build-support/buildenv/builder.pl; buildEnv = import ../build-support/buildenv { - inherit stdenv perl; + inherit runCommand perl; }; dotnetenv = import ../build-support/dotnetenv { From 2db7a9dfbde7c3bdb21024ae1d72e2b795c987b4 Mon Sep 17 00:00:00 2001 From: Michael Raskin <7c6f434c@mail.ru> Date: Thu, 4 Nov 2010 08:28:24 +0000 Subject: [PATCH 23/68] Add stalonetray svn path=/nixpkgs/trunk/; revision=24595 --- .../window-managers/stalonetray/default.nix | 47 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 + 2 files changed, 49 insertions(+) create mode 100644 pkgs/applications/window-managers/stalonetray/default.nix diff --git a/pkgs/applications/window-managers/stalonetray/default.nix b/pkgs/applications/window-managers/stalonetray/default.nix new file mode 100644 index 00000000000..143e45b5484 --- /dev/null +++ b/pkgs/applications/window-managers/stalonetray/default.nix @@ -0,0 +1,47 @@ +x@{builderDefsPackage + , libX11, xproto + , ...}: +builderDefsPackage +(a : +let + helperArgNames = ["stdenv" "fetchurl" "builderDefsPackage"] ++ + []; + + buildInputs = map (n: builtins.getAttr n x) + (builtins.attrNames (builtins.removeAttrs x helperArgNames)); + sourceInfo = rec { + baseName="stalonetray"; + version="0.8.0"; + name="${baseName}-${version}"; + url="mirror://sourceforge/${baseName}/${name}.tar.bz2"; + hash="0ccllmpsmilns6xxl174vgcjf8kfakcrhg3psc4cg0yynqbi2mka"; + }; +in +rec { + src = a.fetchurl { + url = sourceInfo.url; + sha256 = sourceInfo.hash; + }; + + inherit (sourceInfo) name version; + inherit buildInputs; + + /* doConfigure should be removed if not needed */ + phaseNames = ["doConfigure" "doMakeInstall"]; + + meta = { + description = "Stand alone tray"; + maintainers = with a.lib.maintainers; + [ + raskin + ]; + platforms = with a.lib.platforms; + linux; + }; + passthru = { + updateInfo = { + downloadPage = "http://sourceforge.net/projects/stalonetray/files/"; + }; + }; +}) x + diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index df199ae36ea..571f931e52d 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -6193,6 +6193,8 @@ let sox = callPackage ../applications/misc/audio/sox { }; + stalonetray = callPackage ../applications/window-managers/stalonetray {}; + stumpwm = builderDefsPackage (import ../applications/window-managers/stumpwm) { inherit texinfo; clisp = clisp_2_44_1; From eb2a953bc3f86362e9bdfebc6b973e5552cb0ca9 Mon Sep 17 00:00:00 2001 From: Michael Raskin <7c6f434c@mail.ru> Date: Thu, 4 Nov 2010 10:47:24 +0000 Subject: [PATCH 24/68] Fix missing descriptions svn path=/nixpkgs/trunk/; revision=24596 --- pkgs/applications/window-managers/fbpanel/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/applications/window-managers/fbpanel/default.nix b/pkgs/applications/window-managers/fbpanel/default.nix index 66a3741d365..b0c5b34bf3c 100644 --- a/pkgs/applications/window-managers/fbpanel/default.nix +++ b/pkgs/applications/window-managers/fbpanel/default.nix @@ -36,7 +36,7 @@ rec { '' []; meta = { - description = "${abort ''Specify description''}"; + description = "A stand-alone panel"; maintainers = with a.lib.maintainers; [ raskin From 0430167083c1cdca354b295f87290d7b10a930e7 Mon Sep 17 00:00:00 2001 From: Marco Maggesi Date: Thu, 4 Nov 2010 11:24:27 +0000 Subject: [PATCH 25/68] Update Coq svn path=/nixpkgs/trunk/; revision=24597 --- .../applications/science/logic/coq/8.3rc1.nix | 53 ------------------ ....3-rc1_configure.patch => configure.patch} | 10 ++-- .../science/logic/coq/configure.patch.gz | Bin 438 -> 0 bytes .../science/logic/coq/default.nix | 18 ++---- pkgs/top-level/all-packages.nix | 4 -- 5 files changed, 10 insertions(+), 75 deletions(-) delete mode 100644 pkgs/applications/science/logic/coq/8.3rc1.nix rename pkgs/applications/science/logic/coq/{coq-8.3-rc1_configure.patch => configure.patch} (72%) delete mode 100644 pkgs/applications/science/logic/coq/configure.patch.gz diff --git a/pkgs/applications/science/logic/coq/8.3rc1.nix b/pkgs/applications/science/logic/coq/8.3rc1.nix deleted file mode 100644 index 66eb4de833e..00000000000 --- a/pkgs/applications/science/logic/coq/8.3rc1.nix +++ /dev/null @@ -1,53 +0,0 @@ -# TODO: -# - coqide compilation should be optional or (better) separate; -# - coqide libraries are not installed; - -{stdenv, fetchurl, ocaml, camlp5, lablgtk, ncurses}: - -stdenv.mkDerivation { - name = "coq-devel-8.3pre1"; - - src = fetchurl { - url = http://coq.inria.fr/distrib/V8.3-rc1/files/coq-8.3-rc1.tar.gz; - sha256 = "0r43dqr7nzjfkxlz4963sj18gvjni6x3lhrlgh4l8k0cjspi62sj"; - }; - - buildInputs = [ ocaml camlp5 ncurses lablgtk ]; - - patches = [ ./coq-8.3-rc1_configure.patch ]; - - postPatch = '' - substituteInPlace scripts/coqmktop.ml --replace \ - "\"-I\"; \"+lablgtk2\"" \ - "\"-I\"; \"${lablgtk}/lib/ocaml/lablgtk2\"; \"-I\"; \"${lablgtk}/lib/ocaml/stublibs\"" - ''; - - prefixKey = "-prefix "; - - preConfigure = '' - ARCH=`uname -s` - CAMLDIR=`type -p ocamlc` - ''; - - configureFlags = - "-arch $ARCH " + - "-camldir $CAMLDIR " + - "-camldir ${ocaml}/bin " + - "-camlp5dir ${camlp5}/lib/ocaml/camlp5 " + - "-lablgtkdir ${lablgtk}/lib/ocaml/lablgtk2 " + - "-opt -coqide opt"; - - buildFlags = "world"; # Debug with "world VERBOSE=1"; - - meta = { - description = "Coq proof assistant (development version)"; - longDescription = '' - Coq is a formal proof management system. It provides a formal language - to write mathematical definitions, executable algorithms and theorems - together with an environment for semi-interactive development of - machine-checked proofs. - ''; - homepage = "http://coq.inria.fr"; - license = "LGPL"; - }; -} diff --git a/pkgs/applications/science/logic/coq/coq-8.3-rc1_configure.patch b/pkgs/applications/science/logic/coq/configure.patch similarity index 72% rename from pkgs/applications/science/logic/coq/coq-8.3-rc1_configure.patch rename to pkgs/applications/science/logic/coq/configure.patch index 9ae5d2d688a..3989ea5c601 100644 --- a/pkgs/applications/science/logic/coq/coq-8.3-rc1_configure.patch +++ b/pkgs/applications/science/logic/coq/configure.patch @@ -1,7 +1,7 @@ -diff -Nuar coq-8.3-rc1/configure coq-8.3-rc1.nixos/configure ---- coq-8.3-rc1/configure 2010-08-06 10:36:16.000000000 +0200 -+++ coq-8.3-rc1.nixos/configure 2010-09-14 20:30:02.000000000 +0200 -@@ -399,7 +399,6 @@ +diff -Nuar coq-8.3/configure coq-8.3.nixos/configure +--- coq-8.3/configure 2010-10-14 16:02:46.000000000 +0200 ++++ coq-8.3.nixos/configure 2010-11-04 09:57:16.000000000 +0100 +@@ -394,7 +394,6 @@ ocamlyaccexec=$CAMLBIN/ocamlyacc ocamlmktopexec=$CAMLBIN/ocamlmktop ocamlmklibexec=$CAMLBIN/ocamlmklib @@ -9,7 +9,7 @@ diff -Nuar coq-8.3-rc1/configure coq-8.3-rc1.nixos/configure esac if test ! -f "$CAMLC" ; then -@@ -647,7 +646,7 @@ +@@ -637,7 +636,7 @@ no) LABLGTKLIB=+lablgtk2 # Pour le message LABLGTKINCLUDES="-I $LABLGTKLIB";; # Pour le makefile yes) LABLGTKLIB="$lablgtkdir" # Pour le message diff --git a/pkgs/applications/science/logic/coq/configure.patch.gz b/pkgs/applications/science/logic/coq/configure.patch.gz deleted file mode 100644 index 85ecfda6dae166ef6bb80f561242684b473c3e67..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 438 zcmb2|=HM`xyTgl#IXOQsEi=8eC{?c@u_QTzp?At@zrzLsuGhbY^K`@(6mp3~wS>Ij z;{3sWeP+PwPFWf8i~EmrYVsS3PWGKr{cN7cwl_=HXTM)?cO94X1s8dpZN&!vLgV_? zeW%V}yN3B~m;A(%Z+p9se!9OYa`DZC1uV>uJoae6<$n31QzIv`>CV5mIn0-)vb0Q@ zl+&Z;b#}?FNm}hT^W)>rPnBBzmwBdFOiEmK0moG(A z?q+j!w>Ah?EPkD}y!T+a$#(VAyO$sT-Tr*@`XAZL?z!9-aIXEAylRtnk=9eEz6HNC z^!~h`s3_8~)~{Y9!Mo#zn*~$kp+fuZHf_=!*(G~;dk(JSdy~*EF^TEEhGUmyYW|5$ z<~^HqCul975nLwd?EJ0zP{5MlM;jK2%x_t^;>FeV5!&;YHSz6cZsIdk*{ZgFqKNUS zUcR-ZPectA`cx9`n6{f#pAf2y-?n9`GLLI^Q?AlW2?2MZQmd&;7OV5PUQvs3wqiRn yami}OZPC&vlRx=dt}^|ms3|4k{qu>ZYz@|_Jk0|NlWe###J diff --git a/pkgs/applications/science/logic/coq/default.nix b/pkgs/applications/science/logic/coq/default.nix index 8716d39a176..d72a2104370 100644 --- a/pkgs/applications/science/logic/coq/default.nix +++ b/pkgs/applications/science/logic/coq/default.nix @@ -4,7 +4,7 @@ {stdenv, fetchurl, ocaml, camlp5, lablgtk, ncurses}: let - version = "8.2pl2"; + version = "8.3"; in stdenv.mkDerivation { @@ -12,7 +12,7 @@ stdenv.mkDerivation { src = fetchurl { url = "http://coq.inria.fr/V${version}/files/coq-${version}.tar.gz"; - sha256 = "0dh2vv3bvz8694dd12kjdkdaq19l1vslvygzif11igshc5bw4rhf"; + sha256 = "02iy4rxz1n1kc85fb3vs4xpxqfxjw87y2gvmi39fxrj8742qx0dx"; }; buildInputs = [ ocaml camlp5 ncurses lablgtk ]; @@ -27,21 +27,13 @@ stdenv.mkDerivation { buildFlags = "world"; # Debug with "world VERBOSE=1"; - patches = [ ./configure.patch.gz ]; + patches = [ ./configure.patch ]; postPatch = '' - BASH=$(type -tp bash) UNAME=$(type -tp uname) - MV=$(type -tp mv) RM=$(type -tp rm) - substituteInPlace configure --replace "/bin/bash" "$BASH" \ - --replace "/bin/uname" "$UNAME" - substituteInPlace Makefile --replace "/bin/bash" "$BASH" \ - --replace "/bin/mv" "$MV" \ - --replace "/bin/rm" "$RM" - substituteInPlace Makefile.stage1 --replace "/bin/bash" "$BASH" - substituteInPlace install.sh --replace "/bin/bash" "$BASH" - substituteInPlace dev/v8-syntax/check-grammar --replace "/bin/bash" "$BASH" + substituteInPlace configure --replace "/bin/uname" "$UNAME" + substituteInPlace tools/beautify-archive --replace "/bin/rm" "$RM" substituteInPlace scripts/coqmktop.ml --replace \ "\"-I\"; \"+lablgtk2\"" \ "\"-I\"; \"${lablgtk}/lib/ocaml/lablgtk2\"; \"-I\"; \"${lablgtk}/lib/ocaml/stublibs\"" diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 571f931e52d..de151eab5ad 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -6836,10 +6836,6 @@ let camlp5 = camlp5_transitional; }; - coq_devel = callPackage ../applications/science/logic/coq/8.3rc1.nix { - camlp5 = camlp5_transitional; - }; - eprover = callPackage ../applications/science/logic/eProver { texLive = texLiveAggregationFun { paths = [ From a4ab9317197c4233b6326a073fc7a9f539d717a0 Mon Sep 17 00:00:00 2001 From: Rob Vermaas Date: Thu, 4 Nov 2010 12:09:40 +0000 Subject: [PATCH 26/68] =?UTF-8?q?applied=20patch=20by=20Cillian=20de=20R?= =?UTF-8?q?=C3=B3iste?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit svn path=/nixpkgs/trunk/; revision=24598 --- pkgs/applications/networking/browsers/chromium/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/networking/browsers/chromium/default.nix b/pkgs/applications/networking/browsers/chromium/default.nix index 5899386e881..caa8430f0cd 100644 --- a/pkgs/applications/networking/browsers/chromium/default.nix +++ b/pkgs/applications/networking/browsers/chromium/default.nix @@ -35,17 +35,17 @@ assert stdenv.system == "i686-linux" || stdenv.system == "x86_64-linux" ; stdenv.mkDerivation rec { name = "chrome-${version}"; - version = "62263"; + version = "65039"; src = if stdenv.system == "x86_64-linux" then fetchurl { url = "http://build.chromium.org/buildbot/snapshots/chromium-rel-linux-64/${version}/chrome-linux.zip"; - sha256 = "0yn52bqxadwnzi04gfg0ginrvwz18wchqgcl701s7n4i5xzdnmv8"; + sha256 = "1ad7kwd1w1958mb3pwzhshawrf2nlxdsf0gy7d2q4qnx5d809vws"; } else if stdenv.system == "i686-linux" then fetchurl { url = "http://build.chromium.org/buildbot/snapshots/chromium-rel-linux/${version}/chrome-linux.zip"; - sha256 = "1cbzd4k9m1hf08462him8jqxw13k0wy0q1rpq84niifsqnq4z8nx"; + sha256 = "06hz3gvv3623ldrj141w3mnzw049yylvv9b9q5r6my8icm722phf"; } else throw "Chromium is not supported on this platform."; From 0a00613f8982e25b489c66ca892cb226ff94b190 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= Date: Thu, 4 Nov 2010 14:26:19 +0000 Subject: [PATCH 27/68] fileschanged: Assorted nitpicks. svn path=/nixpkgs/trunk/; revision=24599 --- pkgs/tools/misc/fileschanged/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/tools/misc/fileschanged/default.nix b/pkgs/tools/misc/fileschanged/default.nix index 0af42822af2..5619174f74f 100644 --- a/pkgs/tools/misc/fileschanged/default.nix +++ b/pkgs/tools/misc/fileschanged/default.nix @@ -1,10 +1,10 @@ { stdenv, fetchurl, fam }: -stdenv.mkDerivation { +stdenv.mkDerivation rec { name = "fileschanged-0.6.9"; src = fetchurl { - url = "http://nongnu.askapache.com/fileschanged/fileschanged-0.6.9.tar.gz"; + url = "mirror://savannah/fileschanged/${name}.tar.gz"; sha256 = "0ajc9h023vzpnlqqjli4wbvs0q36nr5p9msc3wzbic8rk687qcxc"; }; @@ -14,8 +14,8 @@ stdenv.mkDerivation { meta = { homepage = "http://www.nongnu.org/fileschanged/"; - description = "A command-line utility that reports when files have been altered."; - license = "GPL"; + description = "A command-line utility that reports when files have been altered"; + license = "GPLv3+"; longDescription = '' This utility is a client to FAM (File Alteration Monitor) servers From 5b009db20e963b92245c1430618af29f65946bed Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Fri, 5 Nov 2010 11:45:16 +0000 Subject: [PATCH 28/68] Updated Git to version 1.7.3.2. svn path=/nixpkgs/trunk/; revision=24600 --- .../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 b79d1d1ca0f..4824f39a527 100644 --- a/pkgs/applications/version-management/git-and-tools/git/default.nix +++ b/pkgs/applications/version-management/git-and-tools/git/default.nix @@ -12,11 +12,11 @@ let in stdenv.mkDerivation rec { - name = "git-1.7.3.1"; + name = "git-1.7.3.2"; src = fetchurl { url = "mirror://kernel/software/scm/git/${name}.tar.bz2"; - sha256 = "1sfs8hxbqa39cy2sp43mknlm2pywz7ni02kkac4azi9ypyqjdb6h"; + sha256 = "0w9yappfl0jb88fk28vv680p33c2j4b0afzl1q2mcq0igjygck5w"; }; patches = [ ./docbook2texi.patch ]; From c13e0307b607eebc52e1f22d58f258bb3790346f Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Fri, 5 Nov 2010 14:35:14 +0000 Subject: [PATCH 29/68] pkgs/tools/misc/screen: fixed various impurities Removed lots of hard-coded /usr/something paths from the configure script. Moved $out/{info,man} to $out/share/{info,man}. svn path=/nixpkgs/trunk/; revision=24601 --- pkgs/tools/misc/screen/default.nix | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/misc/screen/default.nix b/pkgs/tools/misc/screen/default.nix index ee3a79b7aa0..329754ab5f5 100644 --- a/pkgs/tools/misc/screen/default.nix +++ b/pkgs/tools/misc/screen/default.nix @@ -8,7 +8,11 @@ stdenv.mkDerivation rec { sha256 = "0xvckv1ia5pjxk7fs4za6gz2njwmfd54sc464n8ab13096qxbw3q"; }; - configureFlags = [ "--enable-telnet" ]; + preConfigure = '' + configureFlags="--enable-telnet --infodir=$out/share/info --mandir=$out/share/man" + sed -i -e "s|/usr/local|/non-existent|g" -e "s|/usr|/non-existent|g" configure Makefile.in */Makefile.in + ''; + buildInputs = [ ncurses ]; doCheck = true; @@ -42,6 +46,6 @@ stdenv.mkDerivation rec { license = stdenv.lib.licenses.gpl2Plus; platforms = stdenv.lib.platforms.unix; - maintainers = [ stdenv.lib.maintainers.ludo ]; + maintainers = [ stdenv.lib.maintainers.ludo stdenv.lib.maintainers.simons ]; }; } From ceb246865719522696e74cfb3e87a2993785de10 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Fri, 5 Nov 2010 14:35:18 +0000 Subject: [PATCH 30/68] pkgs/tools/text/diffutils: fixed location of "info" and "man" directories svn path=/nixpkgs/trunk/; revision=24602 --- pkgs/tools/text/diffutils/default.nix | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/text/diffutils/default.nix b/pkgs/tools/text/diffutils/default.nix index 44b7715607c..37646cede1d 100644 --- a/pkgs/tools/text/diffutils/default.nix +++ b/pkgs/tools/text/diffutils/default.nix @@ -2,17 +2,24 @@ stdenv.mkDerivation { name = "diffutils-2.8.1"; - + src = fetchurl { url = mirror://gnu/diffutils/diffutils-2.8.1.tar.gz; md5 = "71f9c5ae19b60608f6c7f162da86a428"; }; - + + preConfigure = '' + configureFlags="--infodir=$out/share/info --mandir=$out/share/man" + ''; + /* If no explicit coreutils is given, use the one from stdenv. */ buildInputs = [coreutils]; meta = { homepage = http://www.gnu.org/software/diffutils/diffutils.html; description = "Commands for showing the differences between files (diff, cmp, etc.)"; + + platforms = stdenv.lib.platforms.all; + maintainers = [ stdenv.lib.maintainers.simons ]; }; } From a33ddc804701a3ed78df40b9d594ec29bd8fe768 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Fri, 5 Nov 2010 14:35:22 +0000 Subject: [PATCH 31/68] pkgs/applications/version-management/cvs: fixed location of "info" and "man" directories svn path=/nixpkgs/trunk/; revision=24603 --- .../version-management/cvs/default.nix | 18 ++++++++++-------- 1 file changed, 10 insertions(+), 8 deletions(-) diff --git a/pkgs/applications/version-management/cvs/default.nix b/pkgs/applications/version-management/cvs/default.nix index 73d90afb93b..0be984df761 100644 --- a/pkgs/applications/version-management/cvs/default.nix +++ b/pkgs/applications/version-management/cvs/default.nix @@ -10,14 +10,16 @@ stdenv.mkDerivation { patches = [ ./getcwd-chroot.patch ]; - preConfigure = + preConfigure = '' + # Fix location of info and man directories. + configureFlags="--infodir=$out/share/info --mandir=$out/share/man" + # Apply the Debian patches. - '' for p in "debian/patches/"* - do - echo "applying \`$p'..." - patch --verbose -p1 < "$p" - done - ''; + for p in "debian/patches/"*; do + echo "applying \`$p' ..." + patch --verbose -p1 < "$p" + done + ''; buildInputs = [ nano ]; @@ -26,6 +28,6 @@ stdenv.mkDerivation { description = "Concurrent Versions System - a source control system"; platforms = stdenv.lib.platforms.all; - maintainers = []; + maintainers = [ stdenv.lib.maintainers.simons ]; }; } From d5abf27257a61b1345792831309b28039b2ad533 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Fri, 5 Nov 2010 14:35:30 +0000 Subject: [PATCH 32/68] pkgs/tools/networking/pdsh: fixed location of "info" and "man" directories svn path=/nixpkgs/trunk/; revision=24604 --- pkgs/tools/networking/pdsh/default.nix | 43 +++++++++++++------------- 1 file changed, 22 insertions(+), 21 deletions(-) diff --git a/pkgs/tools/networking/pdsh/default.nix b/pkgs/tools/networking/pdsh/default.nix index c48ec9265c9..9ab03a5ebc5 100644 --- a/pkgs/tools/networking/pdsh/default.nix +++ b/pkgs/tools/networking/pdsh/default.nix @@ -14,27 +14,28 @@ stdenv.mkDerivation rec { library can be found. Obviously, though, this is a hack. */ NIX_LDFLAGS="-lgcc_s"; - # Setting --with-machines=$out in configureFlags doesn't seem to work, - # so I specify configurePhase instead. - configurePhase = "./configure --prefix=$out --with-machines=$out/etc/machines" - + " " + (if readline == null then "--without-readline" else "--with-readline") - + " " + (if ssh == null then "--without-ssh" else "--with-ssh") - + " " + (if pam == null then "--without-pam" else "--with-pam") - + " " + (if rsh == false then "--without-rsh" else "--with-rsh") - + " --with-dshgroups" - + " --with-xcpu" - + " --without-genders" - + " --without-mqshell" - + " --without-mrsh" - + " --without-netgroup" - + " --without-nodeattr" - + " --without-nodeupdown" - + " --without-qshell" - + " --without-slurm" - + " --enable-fast-install" - + " --disable-dependency-tracking" - + " --disable-debug" - ; + preConfigure = '' + configureFlagsArray=( + "--infodir=$out/share/info" + "--mandir=$out/share/man" + "--with-machines=$out/etc/machines" + ${if readline == null then "--without-readline" else "--with-readline"} + ${if ssh == null then "--without-ssh" else "--with-ssh"} + ${if pam == null then "--without-pam" else "--with-pam"} + ${if rsh == false then "--without-rsh" else "--with-rsh"} + "--with-dshgroups" + "--with-xcpu" + "--without-genders" + "--without-mqshell" + "--without-mrsh" + "--without-netgroup" + "--without-nodeattr" + "--without-nodeupdown" + "--without-qshell" + "--without-slurm" + "--disable-debug" + ) + ''; meta = { homepage = "https://computing.llnl.gov/linux/pdsh.html"; From a09b681e3eafbb38e8c095153442a62e5ec8329f Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Fri, 5 Nov 2010 14:35:37 +0000 Subject: [PATCH 33/68] pkgs/applications/science/math/maxima: fixed location of "info" and "man" directories svn path=/nixpkgs/trunk/; revision=24605 --- pkgs/applications/science/math/maxima/default.nix | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/pkgs/applications/science/math/maxima/default.nix b/pkgs/applications/science/math/maxima/default.nix index 48386c719bd..f99c1e46162 100644 --- a/pkgs/applications/science/math/maxima/default.nix +++ b/pkgs/applications/science/math/maxima/default.nix @@ -12,6 +12,10 @@ stdenv.mkDerivation { sha256 = "0sdrv3lra6j3ylaqsblnd3x7rq4ybafyj7rb114ycadpx2qf06lq"; }; + preConfigure = '' + configureFlags="--infodir=$out/share/info --mandir=$out/share/man" + ''; + buildInputs = [clisp]; meta = { From 9c6acea5636d8d6095cf865e5b360b221e3cfa5d Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Fri, 5 Nov 2010 14:41:19 +0000 Subject: [PATCH 34/68] pkgs/applications/misc/xpdf: fixed location of "info" and "man" directories svn path=/nixpkgs/trunk/; revision=24606 --- pkgs/applications/misc/xpdf/default.nix | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/pkgs/applications/misc/xpdf/default.nix b/pkgs/applications/misc/xpdf/default.nix index 7b897e59d4e..4a9425070de 100644 --- a/pkgs/applications/misc/xpdf/default.nix +++ b/pkgs/applications/misc/xpdf/default.nix @@ -40,11 +40,11 @@ stdenv.mkDerivation { ]; configureFlags = - [ "--enable-a4-paper" ] /* We obey ISO standards! */ - ++ (if enablePDFtoPPM then [ - "--with-freetype2-library=${freetype}/lib" - "--with-freetype2-includes=${freetype}/include/freetype2" - ] else []); + "--infodir=$out/share/info --mandir=$out/share/man --enable-a4-paper" + + (if enablePDFtoPPM then + " --with-freetype2-library=${freetype}/lib" + + " --with-freetype2-includes=${freetype}/include/freetype2" + else ""); postInstall = " if test -n \"${base14Fonts}\"; then @@ -59,6 +59,6 @@ stdenv.mkDerivation { description = "viewer for Portable Document Format (PDF) files"; platforms = stdenv.lib.platforms.unix; - maintainers = []; + maintainers = [ stdenv.lib.maintainers.simons ]; }; } From 7c07c5aae2f935262e599723585e2ceb514d181c Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Fri, 5 Nov 2010 14:46:13 +0000 Subject: [PATCH 35/68] pkgs/applications/version-management/rcs: fixed location of "info" and "man" directories svn path=/nixpkgs/trunk/; revision=24607 --- pkgs/applications/version-management/rcs/default.nix | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/pkgs/applications/version-management/rcs/default.nix b/pkgs/applications/version-management/rcs/default.nix index 333266d959b..32696a6d7ac 100644 --- a/pkgs/applications/version-management/rcs/default.nix +++ b/pkgs/applications/version-management/rcs/default.nix @@ -10,10 +10,14 @@ stdenv.mkDerivation { patches = [ ./no-root.patch ]; + preConfigure = '' + configureFlags="--infodir=$out/share/info --mandir=$out/share/man" + ''; + meta = { homepage = http://www.cs.purdue.edu/homes/trinkle/RCS/; description = "Revision Control System, a version management system"; - maintainers = [ stdenv.lib.maintainers.eelco ]; + maintainers = [ stdenv.lib.maintainers.eelco stdenv.lib.maintainers.simons ]; platforms = stdenv.lib.platforms.all; }; } From 027f42695c87cd97297ad72ad6828af4e45d631f Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Fri, 5 Nov 2010 14:49:42 +0000 Subject: [PATCH 36/68] The lxc package doesn't build on systems other than Linux. svn path=/nixpkgs/trunk/; revision=24608 --- pkgs/tools/system/lxc/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/tools/system/lxc/default.nix b/pkgs/tools/system/lxc/default.nix index 773ee536fb8..5976d03fc33 100644 --- a/pkgs/tools/system/lxc/default.nix +++ b/pkgs/tools/system/lxc/default.nix @@ -20,6 +20,6 @@ stdenv.mkDerivation rec{ homepage = http://lxc.sourceforge.net; description = "lxc Linux Containers userland tools"; license = "LGPLv2.1+"; - platforms = with stdenv.lib.platforms; all; + platforms = stdenv.lib.platforms.linux; }; } From ffebdb77c3c7a505bb08554775bc1fe8d49d358d Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Fri, 5 Nov 2010 14:54:47 +0000 Subject: [PATCH 37/68] Revert revision 24602. diffutils is part of stdenv and shouldn't have been modified in trunk. svn path=/nixpkgs/trunk/; revision=24609 --- pkgs/tools/text/diffutils/default.nix | 11 ++--------- 1 file changed, 2 insertions(+), 9 deletions(-) diff --git a/pkgs/tools/text/diffutils/default.nix b/pkgs/tools/text/diffutils/default.nix index 37646cede1d..44b7715607c 100644 --- a/pkgs/tools/text/diffutils/default.nix +++ b/pkgs/tools/text/diffutils/default.nix @@ -2,24 +2,17 @@ stdenv.mkDerivation { name = "diffutils-2.8.1"; - + src = fetchurl { url = mirror://gnu/diffutils/diffutils-2.8.1.tar.gz; md5 = "71f9c5ae19b60608f6c7f162da86a428"; }; - - preConfigure = '' - configureFlags="--infodir=$out/share/info --mandir=$out/share/man" - ''; - + /* If no explicit coreutils is given, use the one from stdenv. */ buildInputs = [coreutils]; meta = { homepage = http://www.gnu.org/software/diffutils/diffutils.html; description = "Commands for showing the differences between files (diff, cmp, etc.)"; - - platforms = stdenv.lib.platforms.all; - maintainers = [ stdenv.lib.maintainers.simons ]; }; } From 384eefe26bdb25d905e64d3c2273a308c0444751 Mon Sep 17 00:00:00 2001 From: Michael Raskin <7c6f434c@mail.ru> Date: Sat, 6 Nov 2010 09:45:13 +0000 Subject: [PATCH 38/68] Adding andagii font svn path=/nixpkgs/trunk/; revision=24610 --- pkgs/data/fonts/andagii/default.nix | 58 +++++++++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 + 2 files changed, 60 insertions(+) create mode 100644 pkgs/data/fonts/andagii/default.nix diff --git a/pkgs/data/fonts/andagii/default.nix b/pkgs/data/fonts/andagii/default.nix new file mode 100644 index 00000000000..8c2803c26d7 --- /dev/null +++ b/pkgs/data/fonts/andagii/default.nix @@ -0,0 +1,58 @@ +x@{builderDefsPackage + , unzip + , ...}: +builderDefsPackage +(a : +let + helperArgNames = ["stdenv" "fetchurl" "builderDefsPackage"] ++ + []; + + buildInputs = map (n: builtins.getAttr n x) + (builtins.attrNames (builtins.removeAttrs x helperArgNames)); + sourceInfo = rec { + url="http://www.i18nguy.com/unicode/andagii.zip"; + name="andagii"; + hash="0cknb8vin15akz4ahpyayrpqyaygp9dgrx6qw7zs7d6iv9v59ds1"; + }; +in +rec { + src = a.fetchurl { + url = sourceInfo.url; + sha256 = sourceInfo.hash; + }; + + inherit (sourceInfo) name version; + inherit buildInputs; + + /* doConfigure should be removed if not needed */ + phaseNames = ["doUnpack" "doInstall"]; + + doUnpack = a.fullDepEntry '' + unzip "${src}" + '' ["addInputs"]; + + doInstall = a.fullDepEntry ('' + ensureDir "$out"/share/fonts/ttf/ + cp ANDAGII_.TTF "$out"/share/fonts/ttf/andagii.ttf + '') ["defEnsureDir" "minInit"]; + + meta = { + description = "Unicode Plane 1 Osmanya script font"; + maintainers = with a.lib.maintainers; + [ + raskin + ]; + platforms = with a.lib.platforms; + []; + # There are multiple claims that the font is GPL, + # so I include the package; but I cannot find the + # original source, so use it on your own risk + # Debian claims it is GPL - good enough for me. + }; + passthru = { + updateInfo = { + downloadPage = "http://www.i18nguy.com/unicode/unicode-font.html"; + }; + }; +}) x + diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index de151eab5ad..5fd4e762c03 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -5104,6 +5104,8 @@ let ### DATA + andagii = callPackage ../data/fonts/andagii {}; + arkpandora_ttf = builderDefsPackage (import ../data/fonts/arkpandora) { }; From f4a73e2dddc4532a9d2450dbae50ddc674d8d47a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?= Date: Sun, 7 Nov 2010 21:25:28 +0000 Subject: [PATCH 39/68] Updating mono from 2.6 to 2.8 svn path=/nixpkgs/trunk/; revision=24614 --- pkgs/development/compilers/mono/default.nix | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/pkgs/development/compilers/mono/default.nix b/pkgs/development/compilers/mono/default.nix index 1fcdb3e4c0b..ee415e3b07b 100644 --- a/pkgs/development/compilers/mono/default.nix +++ b/pkgs/development/compilers/mono/default.nix @@ -1,10 +1,10 @@ {stdenv, fetchurl, bison, pkgconfig, glib, gettext, perl}: stdenv.mkDerivation { - name = "mono-2.6.4"; + name = "mono-2.8"; src = fetchurl { - url = http://ftp.novell.com/pub/mono/sources/mono/mono-2.6.4.tar.bz2; - sha256 = "08krrl9zdigzxxa10c9scy518301l20xmw6dc2w8s0rvrhxryny0"; + url = http://ftp.novell.com/pub/mono/sources/mono/mono-2.8.tar.bz2; + sha256 = "04bivxg90mmihkp72sjshl4ijbjcbl9f6hdgm476zy794g5rwd78"; }; buildInputs = [bison pkgconfig glib gettext perl]; @@ -12,10 +12,15 @@ stdenv.mkDerivation { NIX_LDFLAGS = "-lgcc_s" ; + # To overcome the bug https://bugzilla.novell.com/show_bug.cgi?id=644723 + dontDisableStatic = true; + # Attempt to fix this error when running "mcs --version": # The file /nix/store/xxx-mono-2.4.2.1/lib/mscorlib.dll is an invalid CIL image dontStrip = true; + enableParallelBuilding = true; + preBuild = " makeFlagsArray=(INSTALL=`type -tp install`) patchShebangs ./ From ab8ea7ab681273f0cee59d0d70efd7a61649ba10 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?= Date: Sun, 7 Nov 2010 21:27:06 +0000 Subject: [PATCH 40/68] Updating pinta to 0.5 svn path=/nixpkgs/trunk/; revision=24615 --- pkgs/applications/graphics/pinta/default.nix | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/pkgs/applications/graphics/pinta/default.nix b/pkgs/applications/graphics/pinta/default.nix index 801ed7a1b61..12f01adc830 100644 --- a/pkgs/applications/graphics/pinta/default.nix +++ b/pkgs/applications/graphics/pinta/default.nix @@ -1,12 +1,11 @@ -{stdenv, fetchgit, mono, gtksharp, pkgconfig}: +{stdenv, fetchurl, mono, gtksharp, pkgconfig}: stdenv.mkDerivation { - name = "pinta-0.3"; + name = "pinta-0.5"; - src = fetchgit { - url = http://github.com/jpobst/Pinta.git; - rev = "0.3"; - sha256 = "17fde1187be4cfd50a9acda4ba45584e24d51ff22df5074654bed23f61faf33b"; + src = fetchurl { + url = http://github.com/downloads/jpobst/Pinta/pinta-0.5.tar.gz; + sha256 = "0qv95zswi488bkbck9b9yhmczj1sgqc96nzn4f5rwfqz516kilrl"; }; buildInputs = [mono gtksharp pkgconfig]; From 5b79f27f5cb104270cecd323cce8560434eb0da4 Mon Sep 17 00:00:00 2001 From: "Yury G. Kudryashov" Date: Sun, 7 Nov 2010 23:20:02 +0000 Subject: [PATCH 41/68] Upgrade ntfs-3g svn path=/nixpkgs/trunk/; revision=24617 --- pkgs/tools/filesystems/ntfs-3g/default.nix | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/pkgs/tools/filesystems/ntfs-3g/default.nix b/pkgs/tools/filesystems/ntfs-3g/default.nix index 511a4e1eadf..c41121911e5 100644 --- a/pkgs/tools/filesystems/ntfs-3g/default.nix +++ b/pkgs/tools/filesystems/ntfs-3g/default.nix @@ -2,12 +2,12 @@ stdenv.mkDerivation rec { pname = "ntfs-3g"; - version = "2009.4.4"; + version = "2010.10.2"; name = "${pname}-${version}"; src = fetchurl { - url = "${meta.homepage}/${name}.tgz"; - sha256 = "03qdbv0c6gfssmb2s0zzqhwp447n2hgr2qjvc0p527slj2z9xlxw"; + url = "http://tuxera.com/opensource/${name}.tgz"; + sha256 = "0wcyks4nvi1kck8i2dgwfsy5zxhil0v0xam8zbg1p592xbqygiqp"; }; preConfigure = '' @@ -20,7 +20,8 @@ stdenv.mkDerivation rec { configureFlags = "--disable-ldconfig --exec-prefix=\${prefix} --enable-mount-helper"; meta = { - homepage = http://www.ntfs-3g.org; + homepage = http://www.tuxera.com/community/; description = "FUSE-base NTFS driver with full write support"; + maintainers = [ stdenv.lib.maintainers.urkud ]; }; } From caf0e7209aeb40fd31284a0a91f201c2e69d907c Mon Sep 17 00:00:00 2001 From: Marco Maggesi Date: Mon, 8 Nov 2010 08:58:50 +0000 Subject: [PATCH 42/68] Add CMUCL Common Lisp compiler svn path=/nixpkgs/trunk/; revision=24618 --- pkgs/development/compilers/cmucl/binary.nix | 45 +++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 + 2 files changed, 47 insertions(+) create mode 100644 pkgs/development/compilers/cmucl/binary.nix diff --git a/pkgs/development/compilers/cmucl/binary.nix b/pkgs/development/compilers/cmucl/binary.nix new file mode 100644 index 00000000000..1e5c7d4febc --- /dev/null +++ b/pkgs/development/compilers/cmucl/binary.nix @@ -0,0 +1,45 @@ +{stdenv, fetchurl}: + +let + inherit (stdenv) system; + version = "20b"; + downloadUrl = arch: + "http://common-lisp.net/project/cmucl/downloads/release/" + + "${version}/cmucl-${version}-${arch}.tar.bz2"; + fetchDist = {arch, sha256}: fetchurl { + url = downloadUrl arch; + inherit sha256; + }; + dist = + if system == "i686-linux" then fetchDist { + arch = "x86-linux"; + sha256 = "1s00r1kszk5zhmv7m8z5q2wcqjn2gn7fbqwji3hgnsdvbb1f3jdn"; + } + else if system == "i686-darwin" then fetchDist { + arch = "x86-darwin"; + sha256 = "0vd3zbp5zcp0hjd3y03k595hmri8hw884brjpwjiby3jpm3l40np"; + } + else throw "Unsupported platform for cmucl."; +in + +stdenv.mkDerivation { + name = "cmucl-binary-${version}"; + + buildCommand = '' + ensureDir $out + tar -C $out -xjf ${dist} + patchelf --set-interpreter "$(cat $NIX_GCC/nix-support/dynamic-linker)" \ + $out/bin/lisp + ''; + + meta = { + description = "The CMU implementation of Common Lisp"; + longDescription = '' + CMUCL is a free implementation of the Common Lisp programming language + which runs on most major Unix platforms. It mainly conforms to the + ANSI Common Lisp standard. + ''; + license = "free"; # public domain + homepage = http://www.cons.org/cmucl/; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 5fd4e762c03..c3e6262ca32 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -1453,6 +1453,8 @@ let buildClang = true; }; + cmucl_binary = callPackage ../development/compilers/cmucl/binary.nix { }; + dylan = callPackage ../development/compilers/gwydion-dylan { dylan = import ../development/compilers/gwydion-dylan/binary.nix { From 95c614def0fe24cc9ab7083a66f596e35caf0e72 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 8 Nov 2010 10:40:25 +0000 Subject: [PATCH 43/68] Advance urweb to latest release version 20101102. svn path=/nixpkgs/trunk/; revision=24619 --- pkgs/development/compilers/urweb/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/compilers/urweb/default.nix b/pkgs/development/compilers/urweb/default.nix index 4a9b6acc154..b88df77dd50 100644 --- a/pkgs/development/compilers/urweb/default.nix +++ b/pkgs/development/compilers/urweb/default.nix @@ -2,12 +2,12 @@ stdenv.mkDerivation rec { pname = "urweb"; - version = "20100603"; + version = "20101102"; name = "${pname}-${version}"; src = fetchurl { url = "http://www.impredicative.com/ur/${name}.tgz"; - sha256 = "1f2l09g3586w0fyd7i7wkfnqlqwrk7c1q9pngmd8jz69g5ysl808"; + sha256 = "1x661z6hg8gb7v1n580kdij9mr6vv3psm28zr4mmipj2kqh66gfi"; }; buildInputs = [ stdenv.gcc file libmhash mlton mysql postgresql sqlite ]; From e48bf66bf2315fcf8d1ec7f74b849df9ec66f65b Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 8 Nov 2010 17:56:45 +0000 Subject: [PATCH 44/68] rcs: fixed build error introduced in my last commit This package's configure script is too old to support "--mandir". Instead, the default settings have to be overridden on the make command-line. svn path=/nixpkgs/trunk/; revision=24620 --- pkgs/applications/version-management/rcs/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/applications/version-management/rcs/default.nix b/pkgs/applications/version-management/rcs/default.nix index 32696a6d7ac..38c1d38e349 100644 --- a/pkgs/applications/version-management/rcs/default.nix +++ b/pkgs/applications/version-management/rcs/default.nix @@ -11,7 +11,7 @@ stdenv.mkDerivation { patches = [ ./no-root.patch ]; preConfigure = '' - configureFlags="--infodir=$out/share/info --mandir=$out/share/man" + makeFlags="man1dir=$out/share/man/man1 man5dir=$out/share/man/man5"; ''; meta = { From 55be5106fd1901d4ac2bb0ec88f81ec881b81cf5 Mon Sep 17 00:00:00 2001 From: Evgeny Egorochkin Date: Mon, 8 Nov 2010 23:45:58 +0000 Subject: [PATCH 45/68] Amule, Quassel: use appendToName to provide different names for common/named overrides. svn path=/nixpkgs/trunk/; revision=24622 --- pkgs/top-level/all-packages.nix | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index c3e6262ca32..67e0dbfda88 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -366,15 +366,15 @@ let amule = callPackage ../tools/networking/p2p/amule { }; - amuleDaemon = amule.override { + amuleDaemon = appendToName "daemon" (amule.override { monolithic = false; daemon = true; - }; + }); - amuleGui = amule.override { + amuleGui = appendToName "gui" (amule.override { monolithic = false; client = true; - }; + }); aria = builderDefsPackage (import ../tools/networking/aria) { }; @@ -3744,15 +3744,15 @@ let quassel = newScope pkgs.kde4 ../applications/networking/irc/quassel { }; - quasselDaemon = quassel.override { + quasselDaemon = appendToName "daemon" (quassel.override { monolithic = false; daemon = true; - }; + }); - quasselClient = quassel.override { + quasselClient = appendToName "client" (quassel.override { monolithic = false; client = true; - }; + }); quesoglc = callPackage ../development/libraries/quesoglc { }; From 93718907e4ea4bdbbcdabe7dc13dbf0e2d8b1787 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?= Date: Tue, 9 Nov 2010 14:30:58 +0000 Subject: [PATCH 46/68] Updating freeimage svn path=/nixpkgs/trunk/; revision=24630 --- pkgs/development/libraries/freeimage/default.nix | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/pkgs/development/libraries/freeimage/default.nix b/pkgs/development/libraries/freeimage/default.nix index ec402b6bee0..b2118eb1da4 100644 --- a/pkgs/development/libraries/freeimage/default.nix +++ b/pkgs/development/libraries/freeimage/default.nix @@ -1,17 +1,18 @@ {stdenv, fetchurl, unzip}: stdenv.mkDerivation { - name = "freeimage-3.13.1"; + name = "freeimage-3.14.1"; src = fetchurl { - url = mirror://sourceforge/freeimage/FreeImage3131.zip; - sha256 = "1ilpfgyi3qhjra5hxvjcrq3bna909bgdl7rgmhkybmcpdq1x56rj"; + url = mirror://sourceforge/freeimage/FreeImage3141.zip; + sha256 = "0rgzdjwzd64z5z9j4bq075h3kfqjk8ab2dwswy0lnzw9jvmbbifm"; }; buildInputs = [ unzip ]; - patchPhase = '' + prePatch = '' sed -e s@/usr/@$out/@ \ -e 's@-o root -g root@@' \ -e 's@ldconfig@echo not running ldconfig@' \ -i Makefile.gnu ''; + patches = [ ./memset.patch ]; preInstall = "mkdir -p $out/include $out/lib"; meta = { From a26788440d1c13249d2037ad782718db79759647 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?= Date: Tue, 9 Nov 2010 20:14:30 +0000 Subject: [PATCH 47/68] Updating gtkpod to their 1.0 svn path=/nixpkgs/trunk/; revision=24633 --- pkgs/applications/audio/gtkpod/default.nix | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/pkgs/applications/audio/gtkpod/default.nix b/pkgs/applications/audio/gtkpod/default.nix index 30400b3c5e6..90e27c12ce3 100644 --- a/pkgs/applications/audio/gtkpod/default.nix +++ b/pkgs/applications/audio/gtkpod/default.nix @@ -1,14 +1,16 @@ -{ stdenv, fetchurl, pkgconfig, libgpod, gtk, glib, gettext, perl, perlXMLParser, libglade, flex, libid3tag, libvorbis }: +{ stdenv, fetchurl, pkgconfig, libgpod, gtk, glib, gettext, perl, perlXMLParser +, libglade, flex, libid3tag, libvorbis, intltool }: stdenv.mkDerivation { - name = "gtkpod-0.99.14"; + name = "gtkpod-1.0.0"; src = fetchurl { - url = mirror://sourceforge/gtkpod/gtkpod-0.99.14.tar.gz; - sha256 = "0ggcfyhcdlf3br88csdki215k4clxixa192afz6f16k7h8s2iqbk"; + url = mirror://sourceforge/gtkpod/gtkpod-1.0.0.tar.gz; + sha256 = "04jzybs55c27kyp7r9c58prcq0q4ssvj5iggva857f49s1ar826q"; }; - buildInputs = [ pkgconfig libgpod gettext perl perlXMLParser gtk libglade flex libid3tag libvorbis ]; + buildInputs = [ pkgconfig libgpod gettext perl perlXMLParser gtk libglade flex + libid3tag libvorbis intltool ]; patchPhase = '' sed -i 's/which/type -P/' scripts/*.sh @@ -18,5 +20,6 @@ stdenv.mkDerivation { description = "GTK Manager for an Apple ipod"; homepage = http://gtkpod.sourceforge.net; license = "GPLv2+"; + platforms = with stdenv.lib.platforms; linux; }; } From cf8da224c6dbb4038b935d90df62fa70401cd11d Mon Sep 17 00:00:00 2001 From: Rob Vermaas Date: Wed, 10 Nov 2010 12:55:25 +0000 Subject: [PATCH 48/68] fixing wrappers in ant-build svn path=/nixpkgs/trunk/; revision=24637 --- pkgs/build-support/release/ant-build.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/build-support/release/ant-build.nix b/pkgs/build-support/release/ant-build.nix index 779841aec6a..2aa08ee27de 100644 --- a/pkgs/build-support/release/ant-build.nix +++ b/pkgs/build-support/release/ant-build.nix @@ -52,12 +52,13 @@ stdenv.mkDerivation ( generateWrappersPhase = let - cp = w: "-cp ${lib.optionalString (w ? classPath) w.classPath}${lib.optionalString (w ? mainClass) ":$out/lib/java/${w.jar}"}"; + cp = w: "-cp '${lib.optionalString (w ? classPath) w.classPath}${lib.optionalString (w ? mainClass) ":$out/lib/java/*"}'"; in '' header "Generating jar wrappers" '' + (stdenv.lib.concatMapStrings (w: '' + ensureDir $out/bin cat >> $out/bin/${w.name} < Date: Wed, 10 Nov 2010 13:22:53 +0000 Subject: [PATCH 49/68] Do not use ttmkfdir - claimed to be obsolete, Debian patches are going offline.. svn path=/nixpkgs/trunk/; revision=24638 --- pkgs/data/fonts/fontWrap/default.nix | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) diff --git a/pkgs/data/fonts/fontWrap/default.nix b/pkgs/data/fonts/fontWrap/default.nix index fdf1a771842..927cc48575d 100644 --- a/pkgs/data/fonts/fontWrap/default.nix +++ b/pkgs/data/fonts/fontWrap/default.nix @@ -1,7 +1,7 @@ args : with args; let localDefs = builderDefs.passthru.function { src =""; /* put a fetchurl here */ - buildInputs = [mkfontdir mkfontscale ttmkfdir]; + buildInputs = [mkfontdir mkfontscale]; configureFlags = []; }; in with localDefs; @@ -14,12 +14,6 @@ let done mkfontdir mkfontscale - mv fonts.scale fonts.scale.old - mv fonts.dir fonts.dir.old - ttmkfdir - cat fonts.dir.old >> fonts.dir - cat fonts.scale.old >> fonts.scale - rm fonts.dir.old fonts.scale.old ") [minInit addInputs defEnsureDir] ; in stdenv.mkDerivation rec { From d19aa61253647802dabe98a9ec74ab58b701b7b7 Mon Sep 17 00:00:00 2001 From: Michael Raskin <7c6f434c@mail.ru> Date: Wed, 10 Nov 2010 14:48:42 +0000 Subject: [PATCH 50/68] Update Botan svn path=/nixpkgs/trunk/; revision=24639 --- pkgs/development/libraries/botan/default.nix | 54 ++++++++++++++------ pkgs/top-level/all-packages.nix | 4 +- 2 files changed, 40 insertions(+), 18 deletions(-) diff --git a/pkgs/development/libraries/botan/default.nix b/pkgs/development/libraries/botan/default.nix index 10fd49b5d18..18de87b0667 100644 --- a/pkgs/development/libraries/botan/default.nix +++ b/pkgs/development/libraries/botan/default.nix @@ -1,28 +1,52 @@ -a : +x@{builderDefsPackage + , python + , bzip2, zlib, gmp, openssl + , boost + , ...}: +builderDefsPackage +(a : let - fetchurl = a.fetchurl; + helperArgNames = ["stdenv" "fetchurl" "builderDefsPackage"] ++ + []; - version = a.lib.attrByPath ["version"] "1.8.1" a; - buildInputs = with a; [ - perl - ]; + buildInputs = map (n: builtins.getAttr n x) + (builtins.attrNames (builtins.removeAttrs x helperArgNames)); + sourceInfo = rec { + baseName="botan"; + tarBaseName="Botan"; + baseVersion="1.8"; + revision="11"; + version="${baseVersion}.${revision}"; + name="${baseName}-${version}"; + url="http://files.randombit.net/${baseName}/v${baseVersion}/${tarBaseName}-${version}.tbz"; + hash="194vffc9gfb0912lzndn8nzblg2d2gjmk13fc8hppgpw7ln0mdn3"; + }; in rec { - src = fetchurl { - url = "http://files.randombit.net/botan/Botan-${version}.tbz"; - sha256 = "1lgqkg7q0qpzh647zmzay149myrjihcx4jp3rrz6gw17rgn11v98"; + src = a.fetchurl { + url = sourceInfo.url; + sha256 = sourceInfo.hash; }; + inherit (sourceInfo) name version; inherit buildInputs; - configureFlags = []; /* doConfigure should be removed if not needed */ phaseNames = ["doConfigure" "doMakeInstall"]; - - configureCommand = "perl ./configure.pl"; - - name = "botan-" + version; + configureCommand = "python configure.py --with-gnump --with-bzip2 --with-zlib --with-openssl --with-tr1-implementation=boost"; + meta = { description = "Cryptographic algorithms library"; + maintainers = with a.lib.maintainers; + [ + raskin + ]; + platforms = with a.lib.platforms; + unix; }; -} + passthru = { + updateInfo = { + downloadPage = "http://files.randombit.net/botan/"; + }; + }; +}) x diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 67e0dbfda88..ff0024dc4e1 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -2610,9 +2610,7 @@ let enableStatic = true; }); - botan = builderDefsPackage (import ../development/libraries/botan) { - inherit perl; - }; + botan = callPackage ../development/libraries/botan { }; buddy = callPackage ../development/libraries/buddy { }; From 91afbd159af952d69b05a477e9b0365ce7e0ab2c Mon Sep 17 00:00:00 2001 From: Michael Raskin <7c6f434c@mail.ru> Date: Wed, 10 Nov 2010 14:57:38 +0000 Subject: [PATCH 51/68] Update gosmore svn path=/nixpkgs/trunk/; revision=24640 --- pkgs/applications/misc/gosmore/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/misc/gosmore/default.nix b/pkgs/applications/misc/gosmore/default.nix index b848e81c302..6da8ed05499 100644 --- a/pkgs/applications/misc/gosmore/default.nix +++ b/pkgs/applications/misc/gosmore/default.nix @@ -9,8 +9,8 @@ in rec { src = fetchsvn { url = http://svn.openstreetmap.org/applications/rendering/gosmore; - sha256 = "0r6c6gk0pjljwcqxjy18d2s526pyv2kwydf5gl9k68s1b20ps3nd"; - rev = "21657"; + sha256 = "0ds61gl75rnzvm0hj9papl5sfcgdv4310df9ch7x9rifssfli9zm"; + rev = "24178"; } + "/"; inherit buildInputs; From 7905af113757ac615e95f06ae86b24fe21dff0ed Mon Sep 17 00:00:00 2001 From: Michael Raskin <7c6f434c@mail.ru> Date: Wed, 10 Nov 2010 16:09:30 +0000 Subject: [PATCH 52/68] Update monotone-viz svn path=/nixpkgs/trunk/; revision=24642 --- .../version-management/monotone-viz/mtn-head.nix | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-) diff --git a/pkgs/applications/version-management/monotone-viz/mtn-head.nix b/pkgs/applications/version-management/monotone-viz/mtn-head.nix index 9d9eb3a55bc..5cb2d3beed5 100644 --- a/pkgs/applications/version-management/monotone-viz/mtn-head.nix +++ b/pkgs/applications/version-management/monotone-viz/mtn-head.nix @@ -1,12 +1,13 @@ args : with args; rec { - src = fetchmtn { + srcDrv = fetchmtn { name = "monotone-viz-mtn-checkout"; - dbs = ["monotone.ca"]; - selector = "b34ff2e695b53c2d73d533a3ffa7cb081b48eefb"; + dbs = ["monotone.mtn-host.prjek.net"]; + selector = "c3fdb3af1c7c89989c7da8062bb62203f2aaccf0"; branch = "net.venge.monotone-viz.new-stdio"; - sha256 = "06263564bc111d865b50b4a9587a86f8d97fff47625a3c1cb98d90b79faf7889"; - } + "/"; + sha256 = "661c6a49d442b7e5a7ba455bb9a892e7e12b3968c2ddd69375e7bd0cd0b3ecb9"; + }; + src = srcDrv + "/"; buildInputs = [ocaml lablgtk libgnomecanvas gtk graphviz glib pkgconfig autoconf automake libtool]; @@ -20,12 +21,13 @@ rec { autoconf -I . '') ["minInit" "addInputs" "doUnpack"]; - patches = [ ./graphviz.patch ]; - name = "monotone-viz-mtn-head"; meta = { description = "Monotone commit tree visualizer"; maintainers = [args.lib.maintainers.raskin]; }; + passthru = { + inherit srcDrv; + }; } From 7da1dc10d9a9cf2d51f041b4c49bef3200940d8d Mon Sep 17 00:00:00 2001 From: Michael Raskin <7c6f434c@mail.ru> Date: Wed, 10 Nov 2010 16:38:22 +0000 Subject: [PATCH 53/68] fpc should not use lib64-located ld-linux.so.. svn path=/nixpkgs/trunk/; revision=24645 --- pkgs/development/compilers/fpc/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/development/compilers/fpc/default.nix b/pkgs/development/compilers/fpc/default.nix index ee2aa27a621..30081c9d805 100644 --- a/pkgs/development/compilers/fpc/default.nix +++ b/pkgs/development/compilers/fpc/default.nix @@ -16,6 +16,7 @@ stdenv.mkDerivation rec { preConfigure = if stdenv.system == "i686-linux" || stdenv.system == "x86_64-linux" then '' sed -e "s@'/lib/ld-linux[^']*'@'''@" -i fpcsrc/compiler/systems/t_linux.pas + sed -e "s@'/lib64/ld-linux[^']*'@'''@" -i fpcsrc/compiler/systems/t_linux.pas '' else ""; makeFlags = "NOGDB=1"; From 8ed1a21f2c2e2002e07ad1e90b2cd623147cae7c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?= Date: Wed, 10 Nov 2010 16:48:13 +0000 Subject: [PATCH 54/68] Updating inkscape svn path=/nixpkgs/trunk/; revision=24646 --- 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 a3910fae2bf..e34d4592f91 100644 --- a/pkgs/applications/graphics/inkscape/default.nix +++ b/pkgs/applications/graphics/inkscape/default.nix @@ -4,11 +4,11 @@ , gsl, python, pyxml, lxml }: stdenv.mkDerivation rec { - name = "inkscape-0.47"; + name = "inkscape-0.48.0"; src = fetchurl { - url = "mirror://sourceforge/inkscape/${name}.tar.gz"; - sha256 = "15wvcllq0nj69hkyanzvxbjhlq06cwabqabaa54n5n4307hrp2g5"; + url = "mirror://sourceforge/inkscape/${name}.tar.bz2"; + sha256 = "0w72xf76vxpm3fpslmix0x71l2rd2sdhrvgwx2vk7hxfjqdxib1n"; }; patches = [ ./configure-python-libs.patch ]; From 477bb198c772547e04662d57ff8c0b0a884c697f Mon Sep 17 00:00:00 2001 From: Michael Raskin <7c6f434c@mail.ru> Date: Wed, 10 Nov 2010 17:18:51 +0000 Subject: [PATCH 55/68] Add a patch to fix a build issue with utmpentry svn path=/nixpkgs/trunk/; revision=24647 --- pkgs/games/bsdgames/default.nix | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/pkgs/games/bsdgames/default.nix b/pkgs/games/bsdgames/default.nix index ab6aa2ec2e6..38a32da9537 100644 --- a/pkgs/games/bsdgames/default.nix +++ b/pkgs/games/bsdgames/default.nix @@ -10,6 +10,13 @@ stdenv.mkDerivation { buildInputs = [ ncurses openssl flex bison ]; + patches = [ + (fetchurl { + url = http://svn.exactcode.de/t2/trunk/package/games/bsd-games/dm-noutmpx.patch; + sha256 = "1k3qp3jj0dksjr4dnppv6dvkwslrgk9c7p2n9vipqildpxgqp7w2"; + }) + ]; + preConfigure = '' cat > config.params << EOF bsd_games_cfg_man6dir=$out/share/man/man6 From df168884a02b37b9de4e049d4337ed61fb9fe8f5 Mon Sep 17 00:00:00 2001 From: Michael Raskin <7c6f434c@mail.ru> Date: Wed, 10 Nov 2010 17:32:08 +0000 Subject: [PATCH 56/68] amd64 is still x86 svn path=/nixpkgs/trunk/; revision=24648 --- pkgs/development/libraries/libx86/default.nix | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/pkgs/development/libraries/libx86/default.nix b/pkgs/development/libraries/libx86/default.nix index 05251d2ebfe..1ad967c25a2 100644 --- a/pkgs/development/libraries/libx86/default.nix +++ b/pkgs/development/libraries/libx86/default.nix @@ -11,11 +11,14 @@ rec { inherit (s) name; inherit buildInputs; - phaseNames = ["doPatch" "killUsr" "doMakeInstall"]; + phaseNames = ["doPatch" "fixX86Def" "killUsr" "doMakeInstall"]; patches = [./constants.patch]; makeFlags = [ "DESTDIR=$out" ]; + fixX86Def = a.fullDepEntry ('' + sed -i lrmi.c -e 's@defined(__i386__)@(defined(__i386__) || defined(__x86_64__))@' + '') ["doUnpack" "minInit"]; killUsr = a.fullDepEntry ('' sed -e s@/usr@@ -i Makefile '') ["doUnpack" "minInit"]; From 4394b2d1ae3347ee308b2fa1769a3f1e61e036d5 Mon Sep 17 00:00:00 2001 From: Michael Raskin <7c6f434c@mail.ru> Date: Wed, 10 Nov 2010 17:55:43 +0000 Subject: [PATCH 57/68] Update CLisp svn path=/nixpkgs/trunk/; revision=24649 --- pkgs/development/interpreters/clisp/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/interpreters/clisp/default.nix b/pkgs/development/interpreters/clisp/default.nix index 92098dc369a..ca57be85b26 100644 --- a/pkgs/development/interpreters/clisp/default.nix +++ b/pkgs/development/interpreters/clisp/default.nix @@ -3,12 +3,12 @@ , libffi, libffcall, coreutils }: stdenv.mkDerivation rec { - v = "2.48"; + v = "2.49"; name = "clisp-${v}"; src = fetchurl { url = "mirror://gnu/clisp/release/${v}/${name}.tar.bz2"; - sha256 = "1hix1j7zhbn37ld46d6pi6agwxski893l1zwriwkd8jr11b3zf05"; + sha256 = "8132ff353afaa70e6b19367a25ae3d5a43627279c25647c220641fed00f8e890"; }; inherit libsigsegv gettext coreutils; From 01b6395203323fc211409656d42506110174d814 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?= Date: Wed, 10 Nov 2010 18:13:00 +0000 Subject: [PATCH 58/68] Making inkscape not install any icon cache svn path=/nixpkgs/trunk/; revision=24650 --- pkgs/applications/graphics/inkscape/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/applications/graphics/inkscape/default.nix b/pkgs/applications/graphics/inkscape/default.nix index e34d4592f91..01b72599fb1 100644 --- a/pkgs/applications/graphics/inkscape/default.nix +++ b/pkgs/applications/graphics/inkscape/default.nix @@ -35,6 +35,7 @@ stdenv.mkDerivation rec { "$(toPythonPath ${pyxml}):$(toPythonPath ${lxml})" || \ exit 2 done + rm $out/share/icons/hicolor/icon-theme.cache ''; NIX_LDFLAGS = "-lX11"; From 8d1e11606963e4a7825addd21bb7ae79e7c4cbe0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?= Date: Wed, 10 Nov 2010 18:13:04 +0000 Subject: [PATCH 59/68] Updating paraview svn path=/nixpkgs/trunk/; revision=24651 --- pkgs/applications/graphics/paraview/default.nix | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/graphics/paraview/default.nix b/pkgs/applications/graphics/paraview/default.nix index 8ba089903eb..99bed17c966 100644 --- a/pkgs/applications/graphics/paraview/default.nix +++ b/pkgs/applications/graphics/paraview/default.nix @@ -1,16 +1,19 @@ { fetchurl, stdenv, cmake, qt4 }: stdenv.mkDerivation rec { - name = "paraview-3.8.0"; + name = "paraview-3.8.1"; src = fetchurl { - url = "http://www.paraview.org/files/v3.8/ParaView-3.8.0.tar.gz"; - sha256 = "0y20daf59hn9dmbp1cmx0085z34qccwps04hv2lh9s15namca9py"; + url = "http://www.paraview.org/files/v3.8/ParaView-3.8.1.tar.gz"; + sha256 = "0g169vc956gifkd90lcini63dkr5x3id3hkwcwxzriqamxr72r1p"; }; preConfigure = '' export NIX_LDFLAGS="$NIX_LDFLAGS -rpath $out/lib/paraview-3.8" ''; + # I don't enable it due to memory bounds + enableParallelBuilding = false; + buildInputs = [ cmake qt4 ]; meta = { From 5d0d35d0da4714818a1bd9937035759af7e060fd Mon Sep 17 00:00:00 2001 From: Michael Raskin <7c6f434c@mail.ru> Date: Wed, 10 Nov 2010 22:26:35 +0000 Subject: [PATCH 60/68] Update SBCL; and not believe "Download Now" links anymore... svn path=/nixpkgs/trunk/; revision=24653 --- pkgs/development/compilers/sbcl/src-for-default.nix | 10 +++++----- .../compilers/sbcl/src-info-for-default.nix | 2 +- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/pkgs/development/compilers/sbcl/src-for-default.nix b/pkgs/development/compilers/sbcl/src-for-default.nix index 73ba92e8d06..13585e504a8 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.43"; - name="sbcl-1.0.43"; - hash="0csykjcmy0gjlvxx7pg7kd2b7h610zpys3xla85qjj9ngjzpmbcq"; - url="http://downloads.sourceforge.net/project/sbcl/sbcl/1.0.43/sbcl-1.0.43-source.tar.bz2"; - advertisedUrl="http://downloads.sourceforge.net/project/sbcl/sbcl/1.0.43/sbcl-1.0.43-source.tar.bz2"; + version="1.0.44"; + name="sbcl-1.0.44"; + hash="0nl1vrz6mibbhjaxbi64gr0sbq9hf2yjc1h4i05kjw5l6dhws8hg"; + url="http://downloads.sourceforge.net/project/sbcl/sbcl/1.0.44/sbcl-1.0.44-source.tar.bz2"; + advertisedUrl="http://downloads.sourceforge.net/project/sbcl/sbcl/1.0.44/sbcl-1.0.44-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 bd320d2e1c9..4bc8516d4b9 100644 --- a/pkgs/development/compilers/sbcl/src-info-for-default.nix +++ b/pkgs/development/compilers/sbcl/src-info-for-default.nix @@ -1,7 +1,7 @@ { baseName = "sbcl"; downloadPage = "http://sourceforge.net/projects/sbcl/files/"; - choiceCommand = "head -1 | sed -e 's@/download@@;'\"$skipRedirectSF\""; + choiceCommand = "head -n 2| tail -n 1 | sed -e 's@/download@@;'\"$skipRedirectSF\""; sourceRegexp = "source[.-].*tar"; versionExtractorSedScript = "s/.*-([0-9.rc]+)-.*/\\1/"; blacklistRegexp = "1[.]0[.]3[012]|1[.]0[.]29[.]54[.]rc1"; From eed53122c17b5d7e99428f265f116439a22ab671 Mon Sep 17 00:00:00 2001 From: Michael Raskin <7c6f434c@mail.ru> Date: Thu, 11 Nov 2010 12:27:39 +0000 Subject: [PATCH 61/68] Remove ttmkfdir reference svn path=/nixpkgs/trunk/; revision=24659 --- 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 ff0024dc4e1..dcd4ab98fca 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -5116,7 +5116,7 @@ let corefonts = callPackage ../data/fonts/corefonts { }; wrapFonts = paths : ((import ../data/fonts/fontWrap) { - inherit fetchurl stdenv builderDefs paths ttmkfdir; + inherit fetchurl stdenv builderDefs paths; inherit (xorg) mkfontdir mkfontscale; }); From 07d9d421a7e667a2578900cae4eac8b3a01c05fb Mon Sep 17 00:00:00 2001 From: Michael Raskin <7c6f434c@mail.ru> Date: Thu, 11 Nov 2010 12:59:31 +0000 Subject: [PATCH 62/68] Add progress reporting for generation of fonts svn path=/nixpkgs/trunk/; revision=24660 --- pkgs/build-support/builder-defs/builder-defs.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/build-support/builder-defs/builder-defs.nix b/pkgs/build-support/builder-defs/builder-defs.nix index 55cc30b9fb2..29fc9845ab3 100644 --- a/pkgs/build-support/builder-defs/builder-defs.nix +++ b/pkgs/build-support/builder-defs/builder-defs.nix @@ -484,6 +484,7 @@ let inherit (builtins) head tail trace; in generateFontsFromSFD = fullDepEntry ('' for i in *.sfd; do + echo $i; fontforge -c \ 'Open($1); ${optionalString (args ? extraFontForgeCommands) args.extraFontForgeCommands From 4f920af24ab964c4099f57b8d543e28c51525aa0 Mon Sep 17 00:00:00 2001 From: Michael Raskin <7c6f434c@mail.ru> Date: Thu, 11 Nov 2010 19:57:46 +0000 Subject: [PATCH 63/68] create logs symlink later so that builder doesn't stumble on it svn path=/nixpkgs/trunk/; revision=24665 --- pkgs/servers/irc/ircd-hybrid/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/servers/irc/ircd-hybrid/default.nix b/pkgs/servers/irc/ircd-hybrid/default.nix index ddbdc4346ae..b37aaca1eaa 100644 --- a/pkgs/servers/irc/ircd-hybrid/default.nix +++ b/pkgs/servers/irc/ircd-hybrid/default.nix @@ -13,7 +13,7 @@ stdenv.mkDerivation { configureFlags = "--with-nicklen=100 --with-topiclen=360 --enable-openssl=${openssl}"; - preInstall = "mkdir -p \${out}/ ; ln -s /home/ircd \${out}/logs;"; + postInstall = "echo postinstall; mkdir -p \${out}/ ; rm -rf \${out}/logs ; ln -s /home/ircd \${out}/logs;"; meta = { description = "An IPv6-capable IRC server"; From e119bdb5de02f647ea8e3dbe09b3b3b90ece7a00 Mon Sep 17 00:00:00 2001 From: Michael Raskin <7c6f434c@mail.ru> Date: Thu, 11 Nov 2010 21:37:35 +0000 Subject: [PATCH 64/68] Enable VGA_SWITCHEROO svn path=/nixpkgs/trunk/; revision=24667 --- pkgs/os-specific/linux/kernel/linux-2.6.36.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/os-specific/linux/kernel/linux-2.6.36.nix b/pkgs/os-specific/linux/kernel/linux-2.6.36.nix index dbc036bec37..a85ef2ecee1 100644 --- a/pkgs/os-specific/linux/kernel/linux-2.6.36.nix +++ b/pkgs/os-specific/linux/kernel/linux-2.6.36.nix @@ -78,6 +78,8 @@ let # Video configuration # The intel drivers already require KMS DRM_I915_KMS y + # Hybrid graphics support + VGA_SWITCHEROO y # Sound. SND_AC97_POWER_SAVE y # AC97 Power-Saving Mode From e8703916443c217c2e3618967a3ce45d98673e5a Mon Sep 17 00:00:00 2001 From: Michael Raskin <7c6f434c@mail.ru> Date: Thu, 11 Nov 2010 22:00:57 +0000 Subject: [PATCH 65/68] Adding acpi-call svn path=/nixpkgs/trunk/; revision=24668 --- pkgs/os-specific/linux/acpi-call/default.nix | 30 ++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 32 insertions(+) create mode 100644 pkgs/os-specific/linux/acpi-call/default.nix diff --git a/pkgs/os-specific/linux/acpi-call/default.nix b/pkgs/os-specific/linux/acpi-call/default.nix new file mode 100644 index 00000000000..10137ba189a --- /dev/null +++ b/pkgs/os-specific/linux/acpi-call/default.nix @@ -0,0 +1,30 @@ +{stdenv, fetchgit, kernel, ...}: + +stdenv.mkDerivation { + src = fetchgit { + url="git://github.com/mkottman/acpi_call.git"; + rev="4f71ce83392bc52b3497"; + sha256="1f20516dc7d42bc7d9d71eaa54f48f38cd56b8683062f81d6f3857990056bdd3"; + }; + name = "acpi-call"; + + preBuild = '' + sed -e 's/break/true/' -i test_off.sh + sed -e 's@/bin/bash@.bin/sh@' -i test_off.sh + sed -e "s@/lib/modules@${kernel}/&@" -i Makefile + ''; + + installPhase = '' + kernelVersion=$(cd ${kernel}/lib/modules && ls) + ensureDir $out/lib/modules/$kernelVersion/misc + cp acpi_call.ko $out/lib/modules/$kernelVersion/misc + ensureDir $out/bin + cp test_off.sh $out/bin + ''; + + meta = { + maintainers = [stdenv.lib.maintainers.raskin]; + platforms = stdenv.lib.platforms.linux; + description = "A module allowing arbitrary ACPI calls; use case: hybrid video"; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index dcd4ab98fca..82a309a407b 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -4714,6 +4714,8 @@ let inherit kernel; + acpi_call = callPackage ../os-specific/linux/acpi-call {}; + ati_drivers_x11 = callPackage ../os-specific/linux/ati-drivers { }; aufs = callPackage ../os-specific/linux/aufs { }; From ecd065005032c36ccc5e5ef6e0e229ba1a1f0324 Mon Sep 17 00:00:00 2001 From: Michael Raskin <7c6f434c@mail.ru> Date: Thu, 11 Nov 2010 22:02:19 +0000 Subject: [PATCH 66/68] Installing test_off.sh with reasonable name svn path=/nixpkgs/trunk/; revision=24669 --- pkgs/os-specific/linux/acpi-call/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/os-specific/linux/acpi-call/default.nix b/pkgs/os-specific/linux/acpi-call/default.nix index 10137ba189a..996409d786a 100644 --- a/pkgs/os-specific/linux/acpi-call/default.nix +++ b/pkgs/os-specific/linux/acpi-call/default.nix @@ -19,7 +19,7 @@ stdenv.mkDerivation { ensureDir $out/lib/modules/$kernelVersion/misc cp acpi_call.ko $out/lib/modules/$kernelVersion/misc ensureDir $out/bin - cp test_off.sh $out/bin + cp test_off.sh $out/bin/test_discrete_video_off.sh ''; meta = { From bca9914534995ca1777ec2fc6d97ced1bb7bf2b5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?= Date: Thu, 11 Nov 2010 22:16:35 +0000 Subject: [PATCH 67/68] Blindly updating go-oo. As it has always been, not that they announced anything in their web. I imagined the latest tarball name from the tags I saw in http://cgit.freedesktop.org/libreoffice/build/log/?h=ooo-build-3-2-1 OOO_BUILD_3_2_1_6 svn path=/nixpkgs/trunk/; revision=24672 --- pkgs/applications/office/openoffice/go-oo.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/office/openoffice/go-oo.nix b/pkgs/applications/office/openoffice/go-oo.nix index bdd7b45981e..35e39ff1cc7 100644 --- a/pkgs/applications/office/openoffice/go-oo.nix +++ b/pkgs/applications/office/openoffice/go-oo.nix @@ -11,7 +11,7 @@ let langsSpaces = stdenv.lib.concatStringsSep " " langs; tag = "OOO320_m19"; - version = "3.2.1.3"; + version = "3.2.1.6"; in stdenv.mkDerivation rec { name = "go-oo-${version}"; @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { src = fetchurl { url = "http://download.go-oo.org/OOO320/ooo-build-${version}.tar.gz"; - sha256 = "0c8y66ca9nsfbznjazblpszpvg20mgic2bnpffgqb6qlpji6iwd1"; + sha256 = "1l9kpg61wyqjsig5n6a7c7zyygbg09zsmn4q267c12zzpl5qpmxy"; }; srcs_download = import ./go-srcs.nix { inherit fetchurl; }; From 88769633254aa2bd7a39fafd5e84c592f2fc2e1d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?= Date: Thu, 11 Nov 2010 22:16:39 +0000 Subject: [PATCH 68/68] I forgot a patch for freeimage. svn path=/nixpkgs/trunk/; revision=24673 --- pkgs/development/libraries/freeimage/memset.patch | 11 +++++++++++ 1 file changed, 11 insertions(+) create mode 100644 pkgs/development/libraries/freeimage/memset.patch diff --git a/pkgs/development/libraries/freeimage/memset.patch b/pkgs/development/libraries/freeimage/memset.patch new file mode 100644 index 00000000000..91eabf10fdc --- /dev/null +++ b/pkgs/development/libraries/freeimage/memset.patch @@ -0,0 +1,11 @@ +diff -urN a/Source/OpenEXR/Imath/ImathMatrix.h b/Source/OpenEXR/Imath/ImathMatrix.h +--- a/Source/OpenEXR/Imath/ImathMatrix.h 2010-07-17 12:48:40.000000000 +0200 ++++ b/Source/OpenEXR/Imath/ImathMatrix.h 2010-09-03 18:38:37.138598422 +0200 +@@ -49,6 +49,7 @@ + #include "ImathVec.h" + #include "ImathShear.h" + ++#include + #include + #include +