From c11749dcd652cb986efdb3ddd704b41c07208c54 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andres=20L=C3=B6h?= Date: Fri, 16 Dec 2011 18:11:23 +0000 Subject: [PATCH 001/186] Updated the GHC HEAD snapshot. svn path=/nixpkgs/trunk/; revision=30937 --- pkgs/development/compilers/ghc/head.nix | 18 +++++++++--------- pkgs/top-level/all-packages.nix | 3 ++- pkgs/top-level/haskell-packages.nix | 13 +++++++++---- 3 files changed, 20 insertions(+), 14 deletions(-) diff --git a/pkgs/development/compilers/ghc/head.nix b/pkgs/development/compilers/ghc/head.nix index 8e60b4f2fc1..330165437d5 100644 --- a/pkgs/development/compilers/ghc/head.nix +++ b/pkgs/development/compilers/ghc/head.nix @@ -1,19 +1,17 @@ -{stdenv, fetchurl, ghc, perl, gmp, ncurses}: +{stdenv, fetchurl, ghc, perl, gmp, ncurses, darwinInstallNameToolUtility}: stdenv.mkDerivation rec { - version = "7.3.20110910"; + version = "7.3.20111212"; name = "ghc-${version}"; - # TODO: Does this have to be here, or can it go to meta? - homepage = "http://haskell.org/ghc"; - src = fetchurl { - url = "${homepage}/dist/current/dist/${name}-src.tar.bz2"; - sha256 = "1y8ixh6vcbqxqddc872kjfzxj94q4dhyaprdv7kv2yzwgp49qza5"; + url = "http://haskell.org/ghc/dist/current/dist/${name}-src.tar.bz2"; + sha256 = "1i8zw3qaihzbgygdlip9d5g5321wv1yhashf8nrinwgy5649rsyf"; }; - buildInputs = [ghc perl gmp ncurses]; + buildInputs = [ghc perl gmp ncurses] ++ + (if stdenv.isDarwin then [darwinInstallNameToolUtility] else []); buildMK = '' libraries/integer-gmp_CONFIGURE_OPTS += --configure-option=--with-gmp-libraries="${gmp}/lib" @@ -22,6 +20,7 @@ stdenv.mkDerivation rec { preConfigure = '' echo "${buildMK}" > mk/build.mk + sed -i -e 's|-isysroot /Developer/SDKs/MacOSX10.5.sdk||' configure ''; configureFlags=[ @@ -33,11 +32,12 @@ stdenv.mkDerivation rec { stripDebugFlags=["-S" "--keep-file-symbols"]; meta = { - inherit homepage; + homepage = "http://haskell.org/ghc"; description = "The Glasgow Haskell Compiler"; maintainers = [ stdenv.lib.maintainers.marcweber stdenv.lib.maintainers.andres + stdenv.lib.maintainers.simons ]; platforms = ghc.meta.platforms; }; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 5bc9869e822..3eaa4382c25 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -2233,7 +2233,8 @@ let # Reasonably current HEAD snapshot. Should *always* be lowPrio. haskellPackages_ghcHEAD = haskellPackagesFun ../development/compilers/ghc/head.nix - ghc6121Binary (x : x.ghcHEADPrefs) false false lowPrio; + (haskellPackages_ghc704.ghcWithPackages (self : [ self.alex self.happy ])) + (x : x.ghcHEADPrefs) false false lowPrio; haxeDist = import ../development/compilers/haxe { inherit fetchurl sourceFromHead stdenv lib ocaml zlib makeWrapper neko; diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix index 03d014569f9..0217a343ea5 100644 --- a/pkgs/top-level/haskell-packages.nix +++ b/pkgs/top-level/haskell-packages.nix @@ -89,8 +89,8 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y); ghc703Prefs = super : super // super.haskellPlatformDefaults_2011_2_0_1 super; ghc704Prefs = super : super // super.haskellPlatformDefaults_2011_2_0_1 super; # link ghc721Prefs = super : super // super.haskellPlatformDefaults_future super; - ghc722Prefs = super : super // super.haskellPlatformDefaults_future super; - ghcHEADPrefs = super : super // super.haskellPlatformDefaults_future super; # link + ghc722Prefs = super : super // super.haskellPlatformDefaults_future super; #link + ghcHEADPrefs = super : super // super.haskellPlatformDefaults_HEAD super; # GHC and its wrapper # @@ -142,9 +142,9 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y); HUnit = self.HUnit_1_2_2_3; # 7.2 ok, 7.3 ok network = self.network_2_3_0_8; # 7.2 ok, 7.3 ok OpenGL = self.OpenGL_2_2_3_0; # 7.2 ok, 7.3 ok - parallel = self.parallel_3_1_0_1; # 7.2 ok, 7.3 ok + parallel = self.parallel_3_2_0_0; # 7.2 ok, 7.3 ok parsec = self.parsec_3_1_2; # 7.2 ok, 7.3 ok - QuickCheck = self.QuickCheck_2_4_0_1; # 7.2 ok, 7.3 ok + QuickCheck = self.QuickCheck_2_4_1_1; # 7.2 ok, 7.3 ok regexBase = self.regexBase_0_93_2; # 7.2 ok, 7.3 ok regexCompat = self.regexCompat_0_93_1; # 7.2 ok, 7.3 ok regexPosix = self.regexPosix_0_94_4; # 7.2 ok, 7.3 ok @@ -169,6 +169,11 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y); mtl1 = self.mtl_1_1_1_1; # 7.2 ok, 7.3 ok }; + haskellPlatformDefaults_HEAD = + self : self.haskellPlatformDefaults_future self // { + deepseq = null; # apparently a core library in ghc-7.3 + }; + haskellPlatformArgs_2011_2_0_1 = self : { inherit (self) cabal ghc; cgi = self.cgi_3001_1_7_4; From eff443fdd73fd7afe3dc1723e603f2f44d9ea1f7 Mon Sep 17 00:00:00 2001 From: "Yury G. Kudryashov" Date: Fri, 16 Dec 2011 19:38:34 +0000 Subject: [PATCH 002/186] yakuake-2.9.8 svn path=/nixpkgs/trunk/; revision=30938 --- pkgs/applications/misc/yakuake/default.nix | 18 ++++++++++++------ 1 file changed, 12 insertions(+), 6 deletions(-) diff --git a/pkgs/applications/misc/yakuake/default.nix b/pkgs/applications/misc/yakuake/default.nix index 263bc09ff32..e06f812a18a 100644 --- a/pkgs/applications/misc/yakuake/default.nix +++ b/pkgs/applications/misc/yakuake/default.nix @@ -1,14 +1,20 @@ -{ stdenv, fetchurl, kdelibs, cmake, gettext, perl, automoc4, qt4, phonon }: +{ stdenv, fetchurl, kdelibs, gettext }: -stdenv.mkDerivation rec { - name = "yakuake-2.9.7"; +let + pname = "yakuake"; + version = "2.9.8"; +in +stdenv.mkDerivation { + name = "${pname}-${version}"; src = fetchurl { - url = "http://download.berlios.de/yakuake/${name}.tar.bz2"; - sha256 = "0azzvbh3jwz8yhn6gqd46ya7589sadfjyysw230vlf0zlfipdlvd"; + url = "mirror://kde/stable/${pname}/${version}/src/${pname}-${version}.tar.bz2"; + sha256 = "0a9x3nmala8nl4xl3h7rcd76f5j7b7r74jc5cfbayc6jgkjdynd3"; }; - buildInputs = [ kdelibs cmake gettext perl automoc4 qt4 phonon ]; + buildInputs = [ kdelibs ]; + + buildNativeInputs = [ gettext ]; meta = { homepage = http://yakuake.kde.org; From c93380381c90eee4083ccdee126ba639e1427e18 Mon Sep 17 00:00:00 2001 From: "Yury G. Kudryashov" Date: Fri, 16 Dec 2011 19:38:43 +0000 Subject: [PATCH 003/186] kdelibs: remove unused parameter svn path=/nixpkgs/trunk/; revision=30939 --- pkgs/desktops/kde-4.7/kdelibs.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/desktops/kde-4.7/kdelibs.nix b/pkgs/desktops/kde-4.7/kdelibs.nix index cad1988723c..83de4e95136 100644 --- a/pkgs/desktops/kde-4.7/kdelibs.nix +++ b/pkgs/desktops/kde-4.7/kdelibs.nix @@ -3,7 +3,7 @@ , xz, openexr, avahi, kerberos, acl, attr, shared_desktop_ontologies, libXScrnSaver , automoc4, strigi, soprano, qca2, attica, enchant, libdbusmenu_qt , docbook_xml_dtd_42, docbook_xsl, polkit_qt_1 -, getopt, udev, herqq, phonon, gettext +, getopt, udev, herqq, phonon }: kde { From bbc4ac6e9f479e4f0a7782629ec181fc27c1fcbd Mon Sep 17 00:00:00 2001 From: "Yury G. Kudryashov" Date: Fri, 16 Dec 2011 19:55:40 +0000 Subject: [PATCH 004/186] rsibreak-0.11 Add some metadata svn path=/nixpkgs/trunk/; revision=30941 --- pkgs/applications/misc/rsibreak/default.nix | 18 +++++++++++++----- 1 file changed, 13 insertions(+), 5 deletions(-) diff --git a/pkgs/applications/misc/rsibreak/default.nix b/pkgs/applications/misc/rsibreak/default.nix index 939797d9dc5..8aab11beec3 100644 --- a/pkgs/applications/misc/rsibreak/default.nix +++ b/pkgs/applications/misc/rsibreak/default.nix @@ -1,12 +1,20 @@ -{ stdenv, fetchurl, cmake, kdelibs, kdebase_workspace }: +{ stdenv, fetchurl, kdelibs, kdebase_workspace, gettext }: stdenv.mkDerivation rec { - name = "rsibreak-0.10"; + name = "rsibreak-0.11"; src = fetchurl { - url = "http://www.rsibreak.org/files/${name}.tar.bz2"; - sha256 = "02vvwmzhvc9jfrzmnfn3cygx63yx7g360lcslwj1vikzkg834ik0"; + url = "${meta.homepage}/files/${name}.tar.bz2"; + sha256 = "1yrf73r8mixskh8b531wb8dfs9z7rrw010xsrflhjhjmqh94h8mw"; }; - buildInputs = [ cmake kdelibs kdebase_workspace ]; + buildNativeInputs = [ gettext ]; + + buildInputs = [ kdelibs kdebase_workspace ]; + + meta = { + homepage = http://www.rsibreak.org/; + description = "Repetitive Strain Injury prevention"; + inherit (kdelibs.meta) platforms maintainers; + }; } From dc2af32b7456bdefb7139bef69b26e94114082f0 Mon Sep 17 00:00:00 2001 From: "Yury G. Kudryashov" Date: Fri, 16 Dec 2011 19:55:48 +0000 Subject: [PATCH 005/186] polkit-qt-1-0.103.0 Fixes crash https://bugs.kde.org/show_bug.cgi?id=258916 svn path=/nixpkgs/trunk/; revision=30942 --- pkgs/development/libraries/polkit-qt-1/default.nix | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/development/libraries/polkit-qt-1/default.nix b/pkgs/development/libraries/polkit-qt-1/default.nix index 008a75cff67..0c1a0a79584 100644 --- a/pkgs/development/libraries/polkit-qt-1/default.nix +++ b/pkgs/development/libraries/polkit-qt-1/default.nix @@ -1,18 +1,18 @@ { stdenv, fetchurl, cmake, qt4, pkgconfig, polkit, automoc4, glib }: stdenv.mkDerivation rec { - name = "polkit-qt-1-0.99.0"; + name = "polkit-qt-1-0.103.0"; src = fetchurl { url = "mirror://kde/stable/apps/KDE4.x/admin/${name}.tar.bz2"; - sha256 = "02m710q34aapbmnz1p6qwgkk5xjmm239zdl3lvjg77dh3j0w5i3r"; + sha256 = "0k17sb70ywk94dmncnkyig03sg1hcfbhi5wlc77xf3rxirmmccif"; }; patches = [ ./polkit-install.patch ]; - buildInputs = [ cmake qt4 automoc4 ]; - - propagatedBuildInputs = [ polkit glib ]; + buildNativeInputs = [ cmake automoc4 ]; + + propagatedBuildInputs = [ polkit glib qt4 ]; meta = { description = "A Qt wrapper around PolKit"; From 9d43831de23ddd1699fbf296b8334e3fcf125d3f Mon Sep 17 00:00:00 2001 From: "Yury G. Kudryashov" Date: Fri, 16 Dec 2011 22:33:16 +0000 Subject: [PATCH 006/186] krusader-2.4.0beta1 svn path=/nixpkgs/trunk/; revision=30945 --- pkgs/applications/misc/krusader/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/applications/misc/krusader/default.nix b/pkgs/applications/misc/krusader/default.nix index f395e64ddb5..05e62ba3844 100644 --- a/pkgs/applications/misc/krusader/default.nix +++ b/pkgs/applications/misc/krusader/default.nix @@ -1,12 +1,12 @@ -{stdenv, fetchurl, cmake, qt4, perl, gettext, kdelibs, kde_baseapps, automoc4, phonon}: +{stdenv, fetchurl, gettext, kdelibs, kde_baseapps}: stdenv.mkDerivation rec { - name = "krusader-2.2.0-beta1"; + name = "krusader-2.4.0-beta1"; src = fetchurl { url = "mirror://sourceforge/krusader/${name}.tar.bz2"; - sha256 = "0rbk0hw8p1bb03w74gspljbzhvpbs3dcr6ckp38gh5r80mcmqfbs"; + sha256 = "1q1m4cjzz2m41pdpxnwrsiczc7990785b700lv64midjjgjnr7j6"; }; - buildInputs = [ cmake qt4 perl gettext kdelibs automoc4 phonon kde_baseapps ]; + buildInputs = [ gettext kdelibs kde_baseapps ]; meta = { description = "Norton/Total Commander clone for KDE"; license = "GPL"; From 1e74801dc454471e5142c0e2bad4b6168aa7fa91 Mon Sep 17 00:00:00 2001 From: "Yury G. Kudryashov" Date: Fri, 16 Dec 2011 22:33:28 +0000 Subject: [PATCH 007/186] wacomtablet-1.3.5 svn path=/nixpkgs/trunk/; revision=30946 --- pkgs/applications/misc/kde-wacomtablet/default.nix | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/pkgs/applications/misc/kde-wacomtablet/default.nix b/pkgs/applications/misc/kde-wacomtablet/default.nix index 6da0b8410a0..46730848024 100644 --- a/pkgs/applications/misc/kde-wacomtablet/default.nix +++ b/pkgs/applications/misc/kde-wacomtablet/default.nix @@ -1,18 +1,20 @@ -{ stdenv, fetchurl, automoc4, cmake, kdelibs }: +{ stdenv, fetchurl, kdelibs, gettext }: stdenv.mkDerivation rec { - name = "wacomtablet-1.2.5"; + name = "wacomtablet-1.3.5"; src = fetchurl { - url = "http://kde-apps.org/CONTENT/content-files/114856-${name}.tar.gz"; - sha256 = "11hfab6sqmhvd0m1grc9m9yfi0p7rk0bycj9wqgkgbc8cwgps6sf"; + url = "http://kde-apps.org/CONTENT/content-files/114856-wacomtablet-v1.3.5.tar.bz2"; + sha256 = "0dgsp3izx2v44f6j8mhxc6zybjn5sj9038w6b4v2fgix47fri0ja"; }; - buildInputs = [ automoc4 cmake kdelibs ]; + buildInputs = [ kdelibs ]; + + buildNativeInputs = [ gettext ]; meta = with stdenv.lib; { description = "KDE Wacom graphic tablet configuration tool"; - license = "GPLv2"; + license = licenses.gpl2Plus; homepage = http://kde-apps.org/content/show.php/wacom+tablet?content=114856; platforms = platforms.linux; maintainers = [ maintainers.goibhniu maintainers.urkud ]; From d8e5cb01b54ec64e0cc1487bdf9c901a83caa978 Mon Sep 17 00:00:00 2001 From: Florian Friesdorf Date: Sat, 17 Dec 2011 20:16:45 +0000 Subject: [PATCH 008/186] pyside-1.0.9 svn path=/nixpkgs/trunk/; revision=30950 --- .../python-modules/pyside/apiextractor.nix | 23 +++++++++++++++ .../python-modules/pyside/default.nix | 25 ++++++++++++++++ .../python-modules/pyside/generatorrunner.nix | 23 +++++++++++++++ .../python-modules/pyside/shiboken.nix | 29 +++++++++++++++++++ .../python-modules/pyside/tools.nix | 23 +++++++++++++++ pkgs/top-level/all-packages.nix | 10 +++++++ 6 files changed, 133 insertions(+) create mode 100644 pkgs/development/python-modules/pyside/apiextractor.nix create mode 100644 pkgs/development/python-modules/pyside/default.nix create mode 100644 pkgs/development/python-modules/pyside/generatorrunner.nix create mode 100644 pkgs/development/python-modules/pyside/shiboken.nix create mode 100644 pkgs/development/python-modules/pyside/tools.nix diff --git a/pkgs/development/python-modules/pyside/apiextractor.nix b/pkgs/development/python-modules/pyside/apiextractor.nix new file mode 100644 index 00000000000..107bb08759f --- /dev/null +++ b/pkgs/development/python-modules/pyside/apiextractor.nix @@ -0,0 +1,23 @@ +{ stdenv, fetchgit, cmake, libxml2, libxslt, python27Packages, qt4 }: + +stdenv.mkDerivation { + name = "pyside-apiextractor-0.10.7-6-gdcb1195"; + + src = fetchgit { + url = "git://github.com/PySide/Apiextractor.git"; + rev = "dcb11958cabe518630f9f2d2bebd9f8711c2b15b"; + sha256 = "d7b6cb16d11b6134de17a15635d0b5ad7460d31d7870cafe23a690141b9a2274"; + }; + + enableParallelBuilding = true; + + buildInputs = [ cmake libxml2 libxslt python27Packages.sphinx qt4 ]; + + meta = { + description = "Eases the development of bindings of Qt-based libraries for high level languages by automating most of the process"; + license = stdenv.lib.licenses.gpl2; + homepage = "http://www.pyside.org/docs/apiextractor/"; + maintainers = [ stdenv.lib.maintainers.chaoflow ]; + platforms = stdenv.lib.platforms.all; + }; +} diff --git a/pkgs/development/python-modules/pyside/default.nix b/pkgs/development/python-modules/pyside/default.nix new file mode 100644 index 00000000000..791d5e83d3c --- /dev/null +++ b/pkgs/development/python-modules/pyside/default.nix @@ -0,0 +1,25 @@ +{ stdenv, fetchgit, cmake, pysideGeneratorrunner, pysideShiboken, qt4 }: + +stdenv.mkDerivation { + name = "pyside-1.0.9"; + + src = fetchgit { + url = "git://github.com/PySide/PySide.git"; + rev = "4e47b3284fd8715b68342e755cd06ba02b1df0de"; + sha256 = "1fd302e78c5dea8a9c312bd493c04240f2383517ee745d9df2b070f15f0ab515"; + }; + + enableParallelBuilding = true; + + buildInputs = [ cmake pysideGeneratorrunner pysideShiboken qt4 ]; + + makeFlags = "QT_PLUGIN_PATH=" + pysideShiboken + "/lib/generatorrunner"; + + meta = { + description = "LGPL-licensed Python bindings for the Qt cross-platform application and UI framework."; + license = stdenv.lib.licenses.lgpl21; + homepage = "http://www.pyside.org"; + maintainers = [ stdenv.lib.maintainers.chaoflow ]; + platforms = stdenv.lib.platforms.all; + }; +} diff --git a/pkgs/development/python-modules/pyside/generatorrunner.nix b/pkgs/development/python-modules/pyside/generatorrunner.nix new file mode 100644 index 00000000000..afb258cec70 --- /dev/null +++ b/pkgs/development/python-modules/pyside/generatorrunner.nix @@ -0,0 +1,23 @@ +{ stdenv, fetchgit, cmake, pysideApiextractor, python27Packages, qt4 }: + +stdenv.mkDerivation { + name = "pyside-generatorrunner-0.6.13-9-g567ca6e"; + + src = fetchgit { + url = "git://github.com/PySide/Generatorrunner.git"; + rev = "567ca6effaecdf97b33d1d13eada23bafe0f7535"; + sha256 = "182aba79af9fc865337f4befc96faf3eaca1ab9bcb902a57e0a68af49f071c74"; + }; + + enableParallelBuilding = true; + + buildInputs = [ cmake pysideApiextractor python27Packages.sphinx qt4 ]; + + meta = { + description = "Eases the development of binding generators for C++ and Qt-based libraries by providing a framework to help automating most of the process"; + license = stdenv.lib.licenses.gpl2; + homepage = "http://www.pyside.org/docs/generatorrunner/"; + maintainers = [ stdenv.lib.maintainers.chaoflow ]; + platforms = stdenv.lib.platforms.all; + }; +} diff --git a/pkgs/development/python-modules/pyside/shiboken.nix b/pkgs/development/python-modules/pyside/shiboken.nix new file mode 100644 index 00000000000..d8ef2d7b52f --- /dev/null +++ b/pkgs/development/python-modules/pyside/shiboken.nix @@ -0,0 +1,29 @@ +{ stdenv, fetchgit, cmake, pysideApiextractor, pysideGeneratorrunner, python27, python27Packages, qt4 }: + +stdenv.mkDerivation { + name = "pyside-shiboken-1.0.7-73-g9f110f8"; + + src = fetchgit { + url = "git://github.com/PySide/Shiboken.git"; + rev = "9f110f83c213867e15b0141a802ebbf74f2ed9f7"; + sha256 = "4618ed113fb20840fd9acb7d08460eb257f630cbca6d61113c16549a6bb651cd"; + }; + + enableParallelBuilding = true; + + buildInputs = [ cmake pysideApiextractor pysideGeneratorrunner python27 python27Packages.sphinx qt4 ]; + + preConfigure = '' + echo "preConfigure: Fixing shiboken_generator install target." + substituteInPlace generator/CMakeLists.txt --replace \ + \"$\{GENERATORRUNNER_PLUGIN_DIR}\" lib/generatorrunner/ + ''; + + meta = { + description = "Plugin (front-end) for pyside-generatorrunner, that generates bindings for C++ libraries using CPython source code"; + license = stdenv.lib.licenses.gpl2; + homepage = "http://www.pyside.org/docs/shiboken/"; + maintainers = [ stdenv.lib.maintainers.chaoflow ]; + platforms = stdenv.lib.platforms.all; + }; +} diff --git a/pkgs/development/python-modules/pyside/tools.nix b/pkgs/development/python-modules/pyside/tools.nix new file mode 100644 index 00000000000..0b5e6851761 --- /dev/null +++ b/pkgs/development/python-modules/pyside/tools.nix @@ -0,0 +1,23 @@ +{ stdenv, fetchgit, cmake, pyside, python27, qt4, pysideShiboken }: + +stdenv.mkDerivation { + name = "pyside-tools-0.2.13"; + + src = fetchgit { + url = "git://github.com/PySide/Tools.git"; + rev = "23e0712360442e50f34be0d6e4651b8c4c806d47"; + sha256 = "68f059e4936fb8dfae6aa3a463db8c28adcb7bd050b29e8b6fef82431f72da07"; + }; + + enableParallelBuilding = true; + + buildInputs = [ cmake pyside python27 qt4 pysideShiboken ]; + + meta = { + description = "Tools for pyside, the LGPL-licensed Python bindings for the Qt cross-platform application and UI framework."; + license = stdenv.lib.licenses.gpl2; + homepage = "http://www.pyside.org"; + maintainers = [ stdenv.lib.maintainers.chaoflow ]; + platforms = stdenv.lib.platforms.all; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 3eaa4382c25..e64df19a2e5 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -4885,6 +4885,16 @@ let pyqt4 = callPackage ../development/python-modules/pyqt { }; + pysideApiextractor = callPackage ../development/python-modules/pyside/apiextractor.nix { }; + + pysideGeneratorrunner = callPackage ../development/python-modules/pyside/generatorrunner.nix { }; + + pyside = callPackage ../development/python-modules/pyside { }; + + pysideTools = callPackage ../development/python-modules/pyside/tools.nix { }; + + pysideShiboken = callPackage ../development/python-modules/pyside/shiboken.nix { }; + pyx = callPackage ../development/python-modules/pyx { }; pyxml = callPackage ../development/python-modules/pyxml { }; From e20ab8d9b385b07ed9d06fae5a39a3e602487cce Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andres=20L=C3=B6h?= Date: Sun, 18 Dec 2011 10:22:48 +0000 Subject: [PATCH 009/186] Added Haskell Platform 2011.4.0.0. svn path=/nixpkgs/trunk/; revision=30951 --- .../libraries/haskell/HTTP/4000.1.2.nix | 18 ++++ .../haskell/haskell-platform/2011.4.0.0.nix | 36 ++++++++ .../haskell-platform-2011.4.0.0.cabal | 90 +++++++++++++++++++ .../libraries/haskell/network/2.3.0.5.nix | 18 ++++ .../libraries/haskell/syb/0.3.3.nix | 17 ++++ .../libraries/haskell/text/0.11.1.5.nix | 18 ++++ pkgs/top-level/haskell-packages.nix | 51 ++++++++++- 7 files changed, 246 insertions(+), 2 deletions(-) create mode 100644 pkgs/development/libraries/haskell/HTTP/4000.1.2.nix create mode 100644 pkgs/development/libraries/haskell/haskell-platform/2011.4.0.0.nix create mode 100644 pkgs/development/libraries/haskell/haskell-platform/haskell-platform-2011.4.0.0.cabal create mode 100644 pkgs/development/libraries/haskell/network/2.3.0.5.nix create mode 100644 pkgs/development/libraries/haskell/syb/0.3.3.nix create mode 100644 pkgs/development/libraries/haskell/text/0.11.1.5.nix diff --git a/pkgs/development/libraries/haskell/HTTP/4000.1.2.nix b/pkgs/development/libraries/haskell/HTTP/4000.1.2.nix new file mode 100644 index 00000000000..5dcb4cbe618 --- /dev/null +++ b/pkgs/development/libraries/haskell/HTTP/4000.1.2.nix @@ -0,0 +1,18 @@ +{ cabal, mtl, network, parsec }: + +cabal.mkDerivation (self: { + pname = "HTTP"; + version = "4000.1.2"; + sha256 = "19vcy8xinrvn01caly6sg1p1yvbbf7nwq10kxmnwqssnl4h5cwn8"; + buildDepends = [ mtl network parsec ]; + meta = { + homepage = "http://projects.haskell.org/http/"; + description = "A library for client-side HTTP"; + license = self.stdenv.lib.licenses.bsd3; + platforms = self.ghc.meta.platforms; + maintainers = [ + self.stdenv.lib.maintainers.andres + self.stdenv.lib.maintainers.simons + ]; + }; +}) diff --git a/pkgs/development/libraries/haskell/haskell-platform/2011.4.0.0.nix b/pkgs/development/libraries/haskell/haskell-platform/2011.4.0.0.nix new file mode 100644 index 00000000000..24766bc1fa9 --- /dev/null +++ b/pkgs/development/libraries/haskell/haskell-platform/2011.4.0.0.nix @@ -0,0 +1,36 @@ +{cabal, fetchurl, GLUT, HTTP, HUnit, OpenGL, QuickCheck, cgi, fgl, + haskellSrc, html, network, parallel, parsec, regexBase, regexCompat, regexPosix, + stm, syb, deepseq, text, transformers, mtl, xhtml, zlib, + cabalInstall, alex, happy, haddock, ghc}: + +# This is just a meta-package. Because upstream fails to provide proper versioned +# release tarballs that can be used for the purpose of verifying this package, we +# just create it on the fly from a simple Setup.hs file and a .cabal file that we +# store directly in the nixpkgs repository. + +cabal.mkDerivation (self : { + pname = "haskell-platform"; + version = "2011.4.0.0"; + cabalFile = ./haskell-platform-2011.4.0.0.cabal; + setupFile = ./Setup.hs; + src = null; + propagatedBuildInputs = [ + GLUT HTTP HUnit OpenGL QuickCheck cgi fgl + haskellSrc html network parallel parsec regexBase regexCompat regexPosix + stm syb deepseq text transformers mtl xhtml zlib + cabalInstall alex happy ghc haddock + ]; + unpackPhase = '' + sourceRoot=haskell-platform + mkdir $sourceRoot + cp ${self.cabalFile} $sourceRoot/${self.pname}.cabal + cp ${self.setupFile} $sourceRoot/Setup.hs + touch $sourceRoot/LICENSE + ''; + noHaddock = true; + meta = { + description = "Haskell Platform meta package"; + maintainers = [self.stdenv.lib.maintainers.andres]; + }; +}) + diff --git a/pkgs/development/libraries/haskell/haskell-platform/haskell-platform-2011.4.0.0.cabal b/pkgs/development/libraries/haskell/haskell-platform/haskell-platform-2011.4.0.0.cabal new file mode 100644 index 00000000000..56414de90c5 --- /dev/null +++ b/pkgs/development/libraries/haskell/haskell-platform/haskell-platform-2011.4.0.0.cabal @@ -0,0 +1,90 @@ +name: haskell-platform +version: 2011.4.0.0 +homepage: http://haskell.org/platform +license: BSD3 +license-file: LICENSE +author: libraries@haskell.org +maintainer: haskell-platform@projects.haskell.org +category: System +synopsis: The Haskell Platform +description: + The Haskell Platform (HP) is the blessed set of libraries and tools on + which to build further Haskell libraries and applications. It is + intended to provide a comprehensive, stable, and quality tested base for + Haskell projects to work from. + . + This version specifies the following additional developer tools be + installed, for a system to be in full compliance: + . + * cabal-install + * alex + * happy + * haddock + +cabal-version: >= 1.8 +build-type: Custom +tested-with: GHC ==7.0.4 + +library + build-depends: + -- ghc 7.x + -- Core libraries: provided by every ghc installation + -- We don't include "non-API" packages here. + -- array ==0.3.0.2 + -- base ==4.3.1.0 + -- bytestring ==0.9.1.10 + -- Cabal ==1.10.2.0 + -- containers ==0.4.0.0 + -- directory ==1.1.0.0 + -- extensible-exceptions ==0.1.1.2 + -- filepath ==1.2.0.0 + -- haskell2010 ==1.0.0.0 + -- haskell98 ==1.1.0.1 + -- hpc ==0.5.0.6 + -- old-locale ==1.0.0.2 + -- old-time ==1.0.0.6 + -- pretty ==1.0.1.2 + -- process ==1.0.1.5 + -- random ==1.0.0.3 + -- template-haskell ==2.5.0.0 + -- time ==1.2.0.3 + -- unix ==XXX 2.4.2.0 + -- Win32 ==XXX 2.2.0.1 + + -- Libraries in addition to what GHC provides: + -- Note: newer versions of cgi need monad-catchio. + cgi ==3001.1.7.4, + fgl ==5.4.2.4, + GLUT ==2.1.2.1, + haskell-src ==1.0.1.4, + html ==1.0.1.2, + HUnit ==1.2.4.2, + network ==2.3.0.5, + OpenGL ==2.2.3.0, + parallel ==3.1.0.1, + parsec ==3.1.1, + QuickCheck ==2.4.1.1, + regex-base ==0.93.2, + regex-compat ==0.95.1, + regex-posix ==0.95.1, + stm ==2.2.0.1, + syb ==0.3.3, + xhtml ==3000.2.0.4, + zlib ==0.5.3.1, + HTTP ==4000.1.2, + deepseq ==1.1.0.2, + + -- 2011.1 proposals: + text ==0.11.1.5, + transformers ==0.2.2.0, + mtl ==2.0.1.0 + + -- Depending on programs does not work, they are not registered + -- We list them to help distro packaging. + build-tools: + cabal-install ==0.10.2, + alex ==2.3.5, + happy ==1.18.6 + -- hscolour ==1.17 + -- haddock ==2.9.2 -- need to use the one shipped with ghc + diff --git a/pkgs/development/libraries/haskell/network/2.3.0.5.nix b/pkgs/development/libraries/haskell/network/2.3.0.5.nix new file mode 100644 index 00000000000..bf9330eb256 --- /dev/null +++ b/pkgs/development/libraries/haskell/network/2.3.0.5.nix @@ -0,0 +1,18 @@ +{ cabal, parsec }: + +cabal.mkDerivation (self: { + pname = "network"; + version = "2.3.0.5"; + sha256 = "0y1sbgsffzr0skm6xl8907iclgw9vmf395zvpwgakp69i3snh1z0"; + buildDepends = [ parsec ]; + meta = { + homepage = "http://github.com/haskell/network"; + description = "Low-level networking interface"; + license = self.stdenv.lib.licenses.bsd3; + platforms = self.ghc.meta.platforms; + maintainers = [ + self.stdenv.lib.maintainers.andres + self.stdenv.lib.maintainers.simons + ]; + }; +}) diff --git a/pkgs/development/libraries/haskell/syb/0.3.3.nix b/pkgs/development/libraries/haskell/syb/0.3.3.nix new file mode 100644 index 00000000000..01cc80c883d --- /dev/null +++ b/pkgs/development/libraries/haskell/syb/0.3.3.nix @@ -0,0 +1,17 @@ +{ cabal }: + +cabal.mkDerivation (self: { + pname = "syb"; + version = "0.3.3"; + sha256 = "0jskxbnzariq2ahcymvjrp4bhl9cpflc1nh51whdl9axcrd5c901"; + meta = { + homepage = "http://www.cs.uu.nl/wiki/GenericProgramming/SYB"; + description = "Scrap Your Boilerplate"; + license = self.stdenv.lib.licenses.bsd3; + platforms = self.ghc.meta.platforms; + maintainers = [ + self.stdenv.lib.maintainers.andres + self.stdenv.lib.maintainers.simons + ]; + }; +}) diff --git a/pkgs/development/libraries/haskell/text/0.11.1.5.nix b/pkgs/development/libraries/haskell/text/0.11.1.5.nix new file mode 100644 index 00000000000..db438a54bc2 --- /dev/null +++ b/pkgs/development/libraries/haskell/text/0.11.1.5.nix @@ -0,0 +1,18 @@ +{ cabal, deepseq }: + +cabal.mkDerivation (self: { + pname = "text"; + version = "0.11.1.5"; + sha256 = "0fxxhw932gdvaqafsbw7dfzccc43hv92yhxppzp6jrg0npbyz04l"; + buildDepends = [ deepseq ]; + meta = { + homepage = "https://bitbucket.org/bos/text"; + description = "An efficient packed Unicode text type"; + license = self.stdenv.lib.licenses.bsd3; + platforms = self.ghc.meta.platforms; + maintainers = [ + self.stdenv.lib.maintainers.andres + self.stdenv.lib.maintainers.simons + ]; + }; +}) diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix index 0217a343ea5..990a3766c9e 100644 --- a/pkgs/top-level/haskell-packages.nix +++ b/pkgs/top-level/haskell-packages.nix @@ -87,7 +87,7 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y); ghc701Prefs = super : super // super.haskellPlatformDefaults_2011_2_0_0 super; # link ghc702Prefs = super : super // super.haskellPlatformDefaults_2011_2_0_0 super; ghc703Prefs = super : super // super.haskellPlatformDefaults_2011_2_0_1 super; - ghc704Prefs = super : super // super.haskellPlatformDefaults_2011_2_0_1 super; # link + ghc704Prefs = super : super // super.haskellPlatformDefaults_2011_4_0_0 super; # link ghc721Prefs = super : super // super.haskellPlatformDefaults_future super; ghc722Prefs = super : super // super.haskellPlatformDefaults_future super; #link ghcHEADPrefs = super : super // super.haskellPlatformDefaults_HEAD super; @@ -174,6 +174,49 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y); deepseq = null; # apparently a core library in ghc-7.3 }; + haskellPlatformArgs_2011_4_0_0 = self : { + inherit (self) cabal ghc; + cgi = self.cgi_3001_1_7_4; + fgl = self.fgl_5_4_2_4; + GLUT = self.GLUT_2_1_2_1; + haskellSrc = self.haskellSrc_1_0_1_4; + html = self.html_1_0_1_2; + HUnit = self.HUnit_1_2_4_2; + network = self.network_2_3_0_5; + OpenGL = self.OpenGL_2_2_3_0; + parallel = self.parallel_3_1_0_1; + parsec = self.parsec_3_1_1; + QuickCheck = self.QuickCheck_2_4_1_1; + regexBase = self.regexBase_0_93_2; + regexCompat = self.regexCompat_0_95_1; + regexPosix = self.regexPosix_0_95_1; + stm = self.stm_2_2_0_1; + syb = self.syb_0_3_3; + xhtml = self.xhtml_3000_2_0_4; + zlib = self.zlib_0_5_3_1; + HTTP = self.HTTP_4000_1_2; + deepseq = self.deepseq_1_1_0_2; + text = self.text_0_11_1_5; + transformers = self.transformers_0_2_2_0; + mtl = self.mtl_2_0_1_0; + cabalInstall = self.cabalInstall_0_10_2; + alex = self.alex_2_3_5; + happy = self.happy_1_18_6; + haddock = self.haddock_2_9_2; + }; + + haskellPlatformDefaults_2011_4_0_0 = + self : self.haskellPlatformArgs_2011_4_0_0 self // { + haskellPlatform = self.haskellPlatform_2011_4_0_0; + mtl1 = self.mtl_1_1_1_1; + text = self.text_0_11_1_9; + repaExamples = null; # don't pick this version of 'repa-examples' during nix-env -u + }; + + haskellPlatform_2011_4_0_0 = + callPackage ../development/libraries/haskell/haskell-platform/2011.4.0.0.nix + (self.haskellPlatformArgs_2011_4_0_0 self); + haskellPlatformArgs_2011_2_0_1 = self : { inherit (self) cabal ghc; cgi = self.cgi_3001_1_7_4; @@ -714,6 +757,7 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y); HTTP_4000_0_6 = callPackage ../development/libraries/haskell/HTTP/4000.0.6.nix {}; HTTP_4000_0_9 = callPackage ../development/libraries/haskell/HTTP/4000.0.9.nix {}; HTTP_4000_1_1 = callPackage ../development/libraries/haskell/HTTP/4000.1.1.nix {}; + HTTP_4000_1_2 = callPackage ../development/libraries/haskell/HTTP/4000.1.2.nix {}; HTTP_4000_2_1 = callPackage ../development/libraries/haskell/HTTP/4000.2.1.nix {}; HTTP = self.HTTP_4000_2_1; @@ -802,7 +846,7 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y); HUnit_1_2_0_3 = callPackage ../development/libraries/haskell/HUnit/1.2.0.3.nix {}; HUnit_1_2_2_1 = callPackage ../development/libraries/haskell/HUnit/1.2.2.1.nix {}; HUnit_1_2_2_3 = callPackage ../development/libraries/haskell/HUnit/1.2.2.3.nix {}; - HUnit_1_2_4_3 = callPackage ../development/libraries/haskell/HUnit/1.2.4.2.nix {}; + HUnit_1_2_4_2 = callPackage ../development/libraries/haskell/HUnit/1.2.4.2.nix {}; HUnit = self.HUnit_1_2_0_3; hxt = callPackage ../development/libraries/haskell/hxt {}; @@ -922,6 +966,7 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y); network_2_2_1_4 = callPackage ../development/libraries/haskell/network/2.2.1.4.nix {}; network_2_2_1_7 = callPackage ../development/libraries/haskell/network/2.2.1.7.nix {}; network_2_3_0_2 = callPackage ../development/libraries/haskell/network/2.3.0.2.nix {}; + network_2_3_0_5 = callPackage ../development/libraries/haskell/network/2.3.0.5.nix {}; network_2_3_0_8 = callPackage ../development/libraries/haskell/network/2.3.0.8.nix {}; network = self.network_2_3_0_8; @@ -1118,6 +1163,7 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y); syb_0_2_2 = callPackage ../development/libraries/haskell/syb/0.2.2.nix {}; syb_0_3 = callPackage ../development/libraries/haskell/syb/0.3.nix {}; + syb_0_3_3 = callPackage ../development/libraries/haskell/syb/0.3.3.nix {}; syb_0_3_6 = callPackage ../development/libraries/haskell/syb/0.3.6.nix {}; syb = null; # by default, we assume that syb ships with GHC, which is # true for the older GHC versions @@ -1207,6 +1253,7 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y); text_0_11_0_5 = callPackage ../development/libraries/haskell/text/0.11.0.5.nix {}; text_0_11_0_6 = callPackage ../development/libraries/haskell/text/0.11.0.6.nix {}; + text_0_11_1_5 = callPackage ../development/libraries/haskell/text/0.11.1.5.nix {}; text_0_11_1_9 = callPackage ../development/libraries/haskell/text/0.11.1.9.nix {}; text = self.text_0_11_1_9; From ffa89c82fdeff3bd04f0eada559456ae2a229489 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andres=20L=C3=B6h?= Date: Sun, 18 Dec 2011 11:26:46 +0000 Subject: [PATCH 010/186] Trying to fix the build of darcs for ghc-7.0.4. svn path=/nixpkgs/trunk/; revision=30952 --- pkgs/top-level/haskell-packages.nix | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix index 990a3766c9e..df236bc2c8f 100644 --- a/pkgs/top-level/haskell-packages.nix +++ b/pkgs/top-level/haskell-packages.nix @@ -1100,6 +1100,7 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y); regexCompat_0_95_1 = callPackage ../development/libraries/haskell/regex-compat/0.95.1.nix { regexPosix = self.regexPosix_0_95_1; }; + regexCompat93 = self.regexCompat_0_93_1; regexCompat = self.regexCompat_0_71_0_1; regexPosix_0_72_0_3 = callPackage ../development/libraries/haskell/regex-posix/0.72.0.3.nix {}; @@ -1502,7 +1503,9 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y); # Applications. - darcs = callPackage ../applications/version-management/darcs {}; + darcs = callPackage ../applications/version-management/darcs { + regexCompat = self.regexCompat93; + }; leksah = callPackage ../applications/editors/leksah {}; From 25bf67915d9e51c8ab0c264ca85233de7009c479 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?= Date: Sun, 18 Dec 2011 14:49:39 +0000 Subject: [PATCH 011/186] Updating kicad. svn path=/nixpkgs/trunk/; revision=30953 --- .../science/electronics/kicad/default.nix | 26 +++++++++---------- 1 file changed, 12 insertions(+), 14 deletions(-) diff --git a/pkgs/applications/science/electronics/kicad/default.nix b/pkgs/applications/science/electronics/kicad/default.nix index c2200841ee1..9da45184978 100644 --- a/pkgs/applications/science/electronics/kicad/default.nix +++ b/pkgs/applications/science/electronics/kicad/default.nix @@ -1,28 +1,26 @@ -{stdenv, fetchsvn, unzip, cmake, mesa, wxGTK, zlib, libX11, gettext}: +{stdenv, fetchurl, fetchbzr, unzip, cmake, mesa, wxGTK, zlib, libX11, +gettext}: stdenv.mkDerivation rec { - name = "kicad-svn-2518"; + name = "kicad-20110708"; - src = fetchsvn { - url = https://kicad.svn.sourceforge.net/svnroot/kicad/trunk/kicad; - rev = 2518; - sha256 = "05z4fnkvvy91d0krf72q8xyislwh3zg8k0gy9w18caizbla5sih5"; + src = fetchurl { + url = ftp://iut-tice.ujf-grenoble.fr/cao/sources/kicad_sources-2011-07-08-BZR3044.zip; + sha256 = "1gr75zcf55p3xpbg1gdkdpbh5x11bawc9rcff4fskwjyc3vfiv6a"; }; - srcLibrary = fetchsvn { - url = https://kicad.svn.sourceforge.net/svnroot/kicad/trunk/kicad-library; - rev = 2518; - sha256 = "05sfmbp1z3hjxzcspj4vpprww5bxc6hq4alcjlc1vg6cvx2qgb9s"; + srcLibrary = fetchbzr { + url = "http://bazaar.launchpad.net/~kicad-lib-committers/kicad/library"; + revision = 112; + sha256 = "49fa9ad90759cfaf522c2a62665f033688b9d84d02f31c6b2505c08a217ad312"; }; + cmakeFlags = "-DKICAD_TESTING_VERSION=ON"; + # They say they only support installs to /usr or /usr/local, # so we have to handle this. patchPhase = '' sed -i -e 's,/usr/local/kicad,'$out,g common/gestfich.cpp - pushd internat/ca - sed -i -e s/iso-8859-1/utf-8/ kicad.po - msgfmt -o kicad.mo kicad.po - popd ''; enableParallelBuilding = true; From 0a93e7417436e8c7de994cd2503f940301042f45 Mon Sep 17 00:00:00 2001 From: Shea Levy Date: Mon, 19 Dec 2011 02:13:38 +0000 Subject: [PATCH 012/186] Add beret game svn path=/nixpkgs/trunk/; revision=30954 --- pkgs/games/beret/default.nix | 36 +++++++++++++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 38 insertions(+) create mode 100644 pkgs/games/beret/default.nix diff --git a/pkgs/games/beret/default.nix b/pkgs/games/beret/default.nix new file mode 100644 index 00000000000..dd6fc9be71e --- /dev/null +++ b/pkgs/games/beret/default.nix @@ -0,0 +1,36 @@ +{ stdenv, fetchurl, SDL, SDL_image, SDL_ttf, SDL_mixer }: + +stdenv.mkDerivation { + name = "beret-1.2.0"; + + buildInputs = [ SDL SDL_image SDL_ttf SDL_mixer ]; + + NIX_CFLAGS_COMPILE = "-I${SDL}/include/SDL"; + + NIX_CFLAGS_LINK = "-lgcc_s"; + + patchPhase = '' + sed -i 's@RESOURCE_PATH ""@RESOURCE_PATH "'$out'/share/"@' game.c + ''; + + src = fetchurl { + url = https://gitorious.org/beret/beret/archive-tarball/ae029777; + name = "beret-1.2.0.tar.gz"; + sha256 = "0md00ipacvz5mq8q83h7xbzycnwympr06pc1n5c351swjvyw0ysx"; + }; + + installPhase = '' + ensureDir $out/bin + install -v -m755 beret $out/bin + ensureDir $out/share + cp -av tahoma.ttf images music rooms sfx $out/share + ''; + + meta = { + description = "A 2D puzzle-platformer game about a scientist with telekinetic abilities"; + homepage = http://kiwisauce.com/beret/; + platforms = stdenv.lib.platforms.all; + license = stdenv.lib.licenses.lgpl2; + }; +} + diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index e64df19a2e5..1252032a78c 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -5162,6 +5162,8 @@ let bluez = callPackage ../os-specific/linux/bluez { }; + beret = callPackage ../games/beret { }; + bridge_utils = callPackage ../os-specific/linux/bridge-utils { }; checkpolicy = callPackage ../os-specific/linux/checkpolicy { }; From 8116b29c3322bb35759a1c99f0641a5bdb691bc3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andres=20L=C3=B6h?= Date: Mon, 19 Dec 2011 12:28:58 +0000 Subject: [PATCH 013/186] Adding metadata for the Haskell Platform. svn path=/nixpkgs/trunk/; revision=30955 --- .../libraries/haskell/haskell-platform/2011.4.0.0.nix | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/pkgs/development/libraries/haskell/haskell-platform/2011.4.0.0.nix b/pkgs/development/libraries/haskell/haskell-platform/2011.4.0.0.nix index 24766bc1fa9..8dd833a7bf0 100644 --- a/pkgs/development/libraries/haskell/haskell-platform/2011.4.0.0.nix +++ b/pkgs/development/libraries/haskell/haskell-platform/2011.4.0.0.nix @@ -29,8 +29,14 @@ cabal.mkDerivation (self : { ''; noHaddock = true; meta = { + homepage = "http://haskell.org/platform"; description = "Haskell Platform meta package"; - maintainers = [self.stdenv.lib.maintainers.andres]; + license = self.stdenv.lib.licenses.bsd3; + platforms = self.ghc.meta.platforms; + maintainers = [ + self.stdenv.lib.maintainers.andres + self.stdenv.lib.maintainers.simons + ]; }; }) From 006d8dcdc1127808d6c68f3b72f8c3d0d8e79014 Mon Sep 17 00:00:00 2001 From: Shea Levy Date: Mon, 19 Dec 2011 12:48:09 +0000 Subject: [PATCH 014/186] clang-3.0 This required moving to the cmake build for llvm in order to build clang separately from llvm. svn path=/nixpkgs/trunk/; revision=30956 --- .../compilers/llvm/clang-include-paths.patch | 80 ++++++----- .../compilers/llvm/clang-ld-flags.patch | 39 +++-- .../llvm/clang-system-llvm-libs.patch | 42 ------ .../compilers/llvm/clang-tblgen.patch | 134 ------------------ pkgs/development/compilers/llvm/clang.nix | 57 +++----- pkgs/development/compilers/llvm/default.nix | 10 +- pkgs/top-level/all-packages.nix | 6 +- 7 files changed, 88 insertions(+), 280 deletions(-) delete mode 100644 pkgs/development/compilers/llvm/clang-system-llvm-libs.patch delete mode 100644 pkgs/development/compilers/llvm/clang-tblgen.patch diff --git a/pkgs/development/compilers/llvm/clang-include-paths.patch b/pkgs/development/compilers/llvm/clang-include-paths.patch index aaa9a5fc4b5..828c554175e 100644 --- a/pkgs/development/compilers/llvm/clang-include-paths.patch +++ b/pkgs/development/compilers/llvm/clang-include-paths.patch @@ -1,39 +1,49 @@ -diff -ru -x '*~' a/tools/clang/lib/Frontend/InitHeaderSearch.cpp b/tools/clang/lib/Frontend/InitHeaderSearch.cpp ---- a/tools/clang/lib/Frontend/InitHeaderSearch.cpp 2011-03-21 20:24:04.000000000 -0400 -+++ b/tools/clang/lib/Frontend/InitHeaderSearch.cpp 2011-10-18 12:09:50.624355551 -0400 -@@ -438,6 +438,7 @@ - - void InitHeaderSearch::AddDefaultCIncludePaths(const llvm::Triple &triple, - const HeaderSearchOptions &HSOpts) { -+#if 0 - llvm::Triple::OSType os = triple.getOS(); - - switch (os) { -@@ -559,6 +560,8 @@ - } - - AddPath("/usr/include", System, false, false, false); -+#endif -+ AddPath(C_INCLUDE_PATH, System, false, false, false); - } - - void InitHeaderSearch:: -@@ -577,6 +580,7 @@ - triple); +diff -Naur clang-3.0.src-orig/lib/Driver/ToolChains.cpp clang-3.0.src/lib/Driver/ToolChains.cpp +--- clang-3.0.src-orig/lib/Driver/ToolChains.cpp 2011-11-17 02:40:32.000000000 -0500 ++++ clang-3.0.src/lib/Driver/ToolChains.cpp 2011-12-19 06:29:27.562428830 -0500 +@@ -1926,14 +1926,17 @@ + if (DriverArgs.hasArg(options::OPT_nostdinc)) return; - } -+#if 0 - // FIXME: temporary hack: hard-coded paths. - switch (os) { - case llvm::Triple::Cygwin: -@@ -847,6 +851,10 @@ - default: - break; - } + ++#if 0 + if (!DriverArgs.hasArg(options::OPT_nostdlibinc)) + addSystemInclude(DriverArgs, CC1Args, D.SysRoot + "/usr/local/include"); + +#endif -+ AddGnuCPlusPlusIncludePaths( -+ CPP_INCLUDE_PATH, -+ CPP_HOST, "", "", triple); + if (!DriverArgs.hasArg(options::OPT_nobuiltininc)) { + llvm::sys::Path P(D.ResourceDir); + P.appendComponent("include"); + addSystemInclude(DriverArgs, CC1Args, P.str()); + } ++#if 0 + + if (DriverArgs.hasArg(options::OPT_nostdlibinc)) + return; +@@ -1998,6 +2001,8 @@ + return; + + addExternCSystemInclude(DriverArgs, CC1Args, D.SysRoot + "/usr/include"); ++#endif ++ addExternCSystemInclude(DriverArgs, CC1Args, D.SysRoot + C_INCLUDE_PATH); } - void InitHeaderSearch::AddDefaultSystemIncludePaths(const LangOptions &Lang, + static bool addLibStdCXXIncludePaths(Twine Base, Twine TargetArchDir, +@@ -2030,6 +2035,7 @@ + bool IsTarget64Bit = (TargetArch == llvm::Triple::x86_64 || + TargetArch == llvm::Triple::ppc64); + ++#if 0 + StringRef CxxIncludeRoot(CXX_INCLUDE_ROOT); + if (!CxxIncludeRoot.empty()) { + StringRef CxxIncludeArch(CXX_INCLUDE_ARCH); +@@ -2072,6 +2078,10 @@ + GCCInstallation.getTriple() + Suffix, + DriverArgs, CC1Args); + } ++#endif ++ addLibStdCXXIncludePaths(CPP_INCLUDE_PATH, ++ CPP_HOST, ++ DriverArgs, CC1Args); + } + + /// DragonFly - DragonFly tool chain which can call as(1) and ld(1) directly. diff --git a/pkgs/development/compilers/llvm/clang-ld-flags.patch b/pkgs/development/compilers/llvm/clang-ld-flags.patch index fc625a0e0b7..62b8bc763f9 100644 --- a/pkgs/development/compilers/llvm/clang-ld-flags.patch +++ b/pkgs/development/compilers/llvm/clang-ld-flags.patch @@ -1,33 +1,26 @@ -diff -Naur a/tools/clang/lib/Driver/ToolChains.cpp b/tools/clang/lib/Driver/ToolChains.cpp ---- a/tools/clang/lib/Driver/ToolChains.cpp 2011-03-21 17:29:27.000000000 -0400 -+++ b/tools/clang/lib/Driver/ToolChains.cpp 2011-10-18 19:43:48.999590771 -0400 -@@ -1482,12 +1482,9 @@ - Lib = Lib64; - } +diff -Naur clang-3.0.src-orig/lib/Driver/ToolChains.cpp clang-3.0.src/lib/Driver/ToolChains.cpp +--- clang-3.0.src-orig/lib/Driver/ToolChains.cpp 2011-11-17 02:40:32.000000000 -0500 ++++ clang-3.0.src/lib/Driver/ToolChains.cpp 2011-12-19 05:32:38.695513475 -0500 +@@ -1800,6 +1800,7 @@ -- llvm::sys::Path LinkerPath(Base + "/../../../../" + GccTriple + "/bin/ld"); -- if (!llvm::sys::fs::exists(LinkerPath.str(), Exists) && Exists) -- Linker = LinkerPath.str(); -- else -- Linker = GetProgramPath("ld"); -+ Linker = GetProgramPath("ld"); + Linker = GetProgramPath("ld"); +#if 0 LinuxDistro Distro = DetectLinuxDistro(Arch); - if (IsUbuntu(Distro)) { -@@ -1531,6 +1528,7 @@ - Paths.push_back(Base + "/../../.."); - if (Arch == getArch() && IsUbuntu(Distro)) - Paths.push_back("/usr/lib/" + GccTriple); + if (IsOpenSuse(Distro) || IsUbuntu(Distro)) { +@@ -1882,6 +1883,7 @@ + addPathIfExists(SysRoot + "/lib", Paths); + addPathIfExists(SysRoot + "/usr/lib/" + MultiarchTriple, Paths); + addPathIfExists(SysRoot + "/usr/lib", Paths); +#endif } bool Linux::HasNativeLLVMSupport() const { -diff -Naur a/tools/clang/lib/Driver/Tools.cpp b/tools/clang/lib/Driver/Tools.cpp ---- a/tools/clang/lib/Driver/Tools.cpp 2011-03-06 18:31:01.000000000 -0500 -+++ b/tools/clang/lib/Driver/Tools.cpp 2011-10-18 18:44:00.799604267 -0400 -@@ -3619,6 +3619,7 @@ +diff -Naur clang-3.0.src-orig/lib/Driver/Tools.cpp clang-3.0.src/lib/Driver/Tools.cpp +--- clang-3.0.src-orig/lib/Driver/Tools.cpp 2011-11-07 05:27:39.000000000 -0500 ++++ clang-3.0.src/lib/Driver/Tools.cpp 2011-12-19 05:34:44.075325534 -0500 +@@ -4306,6 +4306,7 @@ ToolChain.getArch() == llvm::Triple::thumb || (!Args.hasArg(options::OPT_static) && !Args.hasArg(options::OPT_shared))) { @@ -35,8 +28,8 @@ diff -Naur a/tools/clang/lib/Driver/Tools.cpp b/tools/clang/lib/Driver/Tools.cpp CmdArgs.push_back("-dynamic-linker"); if (ToolChain.getArch() == llvm::Triple::x86) CmdArgs.push_back("/lib/ld-linux.so.2"); -@@ -3627,6 +3628,7 @@ - CmdArgs.push_back("/lib/ld-linux.so.3"); +@@ -4318,6 +4319,7 @@ + CmdArgs.push_back("/lib64/ld64.so.1"); else CmdArgs.push_back("/lib64/ld-linux-x86-64.so.2"); +#endif diff --git a/pkgs/development/compilers/llvm/clang-system-llvm-libs.patch b/pkgs/development/compilers/llvm/clang-system-llvm-libs.patch deleted file mode 100644 index 0d82cf4017a..00000000000 --- a/pkgs/development/compilers/llvm/clang-system-llvm-libs.patch +++ /dev/null @@ -1,42 +0,0 @@ -diff -Naur llvm-2.9-orig/Makefile.rules llvm-2.9/Makefile.rules ---- llvm-2.9-orig/Makefile.rules 2011-03-25 02:26:58.000000000 -0400 -+++ llvm-2.9/Makefile.rules 2011-10-19 15:31:38.538674143 -0400 -@@ -941,7 +941,7 @@ - @echo "*** llvm-config doesn't exist - rebuilding it." - @$(MAKE) -C $(PROJ_OBJ_ROOT)/tools/llvm-config - --$(ToolDir)/$(strip $(TOOLNAME))$(EXEEXT): $(LLVM_CONFIG) -+$(ToolDir)/$(strip $(TOOLNAME))$(EXEEXT): - - ifeq ($(ENABLE_SHARED), 1) - # We can take the "auto-import" feature to get rid of using dllimport. -@@ -1137,7 +1137,7 @@ - else - SharedLibKindMessage := "Shared Library" - endif --$(LibName.SO): $(ObjectsO) $(ProjLibsPaths) $(LLVMLibsPaths) $(SharedLibDir)/.dir -+$(LibName.SO): $(ObjectsO) $(ProjLibsPaths) $(SharedLibDir)/.dir - $(Echo) Linking $(BuildMode) $(SharedLibKindMessage) \ - $(notdir $@) - $(Verb) $(Link) $(SharedLinkOptions) -o $@ $(ObjectsO) \ -@@ -1411,7 +1411,7 @@ - $(ToolBuildPath): $(ToolDir)/.dir - endif - --$(ToolBuildPath): $(ObjectsO) $(ProjLibsPaths) $(LLVMLibsPaths) -+$(ToolBuildPath): $(ObjectsO) $(ProjLibsPaths) - $(Echo) Linking $(BuildMode) executable $(TOOLNAME) $(StripWarnMsg) - $(Verb) $(Link) -o $@ $(TOOLLINKOPTS) $(ObjectsO) $(ProjLibsOptions) \ - $(LLVMLibsOptions) $(ExtraLibs) $(TOOLLINKOPTSB) $(LIBS) -diff -Naur llvm-2.9-orig/unittests/Makefile.unittest llvm-2.9/unittests/Makefile.unittest ---- llvm-2.9-orig/unittests/Makefile.unittest 2011-02-04 12:12:18.000000000 -0500 -+++ llvm-2.9/unittests/Makefile.unittest 2011-10-19 15:47:27.100035616 -0400 -@@ -47,7 +47,7 @@ - Run.Shared := $(SHLIBPATH_VAR)="$(SharedLibDir)$${$(SHLIBPATH_VAR):+:}$$$(SHLIBPATH_VAR)" - endif - --$(LLVMUnitTestExe): $(ObjectsO) $(ProjLibsPaths) $(LLVMLibsPaths) -+$(LLVMUnitTestExe): $(ObjectsO) $(ProjLibsPaths) - $(Echo) Linking $(BuildMode) unit test $(TESTNAME) $(StripWarnMsg) - $(Verb) $(Link) -o $@ $(TOOLLINKOPTS) $(ObjectsO) $(ProjLibsOptions) \ - $(TESTLIBS) $(LLVMLibsOptions) $(ExtraLibs) $(TOOLLINKOPTSB) $(LIBS) diff --git a/pkgs/development/compilers/llvm/clang-tblgen.patch b/pkgs/development/compilers/llvm/clang-tblgen.patch deleted file mode 100644 index 9533529555d..00000000000 --- a/pkgs/development/compilers/llvm/clang-tblgen.patch +++ /dev/null @@ -1,134 +0,0 @@ -diff -Naur a/tools/clang/include/clang/AST/Makefile b/tools/clang/include/clang/AST/Makefile ---- a/tools/clang/include/clang/AST/Makefile 2010-08-18 19:23:40.000000000 -0400 -+++ b/tools/clang/include/clang/AST/Makefile 2011-10-19 14:19:21.420750346 -0400 -@@ -6,24 +6,24 @@ - - include $(CLANG_LEVEL)/Makefile - --$(ObjDir)/Attrs.inc.tmp : $(TD_SRC_DIR)/Attr.td $(TBLGEN) \ -+$(ObjDir)/Attrs.inc.tmp : $(TD_SRC_DIR)/Attr.td \ - $(ObjDir)/.dir - $(Echo) "Building Clang attribute classes with tblgen" - $(Verb) $(TableGen) -gen-clang-attr-classes -o $(call SYSPATH, $@) \ - -I $(PROJ_SRC_DIR)/../../ $< - --$(ObjDir)/AttrImpl.inc.tmp : $(TD_SRC_DIR)/Attr.td $(TBLGEN) \ -+$(ObjDir)/AttrImpl.inc.tmp : $(TD_SRC_DIR)/Attr.td \ - $(ObjDir)/.dir - $(Echo) "Building Clang attribute implementations with tblgen" - $(Verb) $(TableGen) -gen-clang-attr-impl -o $(call SYSPATH, $@) \ - -I $(PROJ_SRC_DIR)/../../ $< - --$(ObjDir)/StmtNodes.inc.tmp : $(TD_SRC_DIR)/StmtNodes.td $(TBLGEN) \ -+$(ObjDir)/StmtNodes.inc.tmp : $(TD_SRC_DIR)/StmtNodes.td \ - $(ObjDir)/.dir - $(Echo) "Building Clang statement node tables with tblgen" - $(Verb) $(TableGen) -gen-clang-stmt-nodes -o $(call SYSPATH, $@) $< - --$(ObjDir)/DeclNodes.inc.tmp : $(TD_SRC_DIR)/DeclNodes.td $(TBLGEN) \ -+$(ObjDir)/DeclNodes.inc.tmp : $(TD_SRC_DIR)/DeclNodes.td \ - $(ObjDir)/.dir - $(Echo) "Building Clang declaration node tables with tblgen" - $(Verb) $(TableGen) -gen-clang-decl-nodes -o $(call SYSPATH, $@) $< -diff -Naur a/tools/clang/include/clang/Basic/Makefile b/tools/clang/include/clang/Basic/Makefile ---- a/tools/clang/include/clang/Basic/Makefile 2010-09-09 16:27:36.000000000 -0400 -+++ b/tools/clang/include/clang/Basic/Makefile 2011-10-19 14:17:54.950837324 -0400 -@@ -29,20 +29,20 @@ - CLANG_HAS_VERSION_PATCHLEVEL := 1 - endif - --$(ObjDir)/Diagnostic%Kinds.inc.tmp : Diagnostic.td Diagnostic%Kinds.td $(TBLGEN) $(ObjDir)/.dir -+$(ObjDir)/Diagnostic%Kinds.inc.tmp : Diagnostic.td Diagnostic%Kinds.td $(ObjDir)/.dir - $(Echo) "Building Clang $(patsubst Diagnostic%Kinds.inc.tmp,%,$(@F)) diagnostic tables with tblgen" - $(Verb) $(TableGen) -gen-clang-diags-defs -clang-component=$(patsubst Diagnostic%Kinds.inc.tmp,%,$(@F)) -o $(call SYSPATH, $@) $< - --$(ObjDir)/DiagnosticGroups.inc.tmp : Diagnostic.td DiagnosticGroups.td $(INPUT_TDS) $(TBLGEN) $(ObjDir)/.dir -+$(ObjDir)/DiagnosticGroups.inc.tmp : Diagnostic.td DiagnosticGroups.td $(INPUT_TDS) $(ObjDir)/.dir - $(Echo) "Building Clang diagnostic groups with tblgen" - $(Verb) $(TableGen) -gen-clang-diag-groups -o $(call SYSPATH, $@) $< - --$(ObjDir)/AttrList.inc.tmp : Attr.td $(TBLGEN) $(ObjDir)/.dir -+$(ObjDir)/AttrList.inc.tmp : Attr.td $(ObjDir)/.dir - $(Echo) "Building Clang attribute list with tblgen" - $(Verb) $(TableGen) -gen-clang-attr-list -o $(call SYSPATH, $@) \ - -I $(PROJ_SRC_DIR)/../.. $< - --$(ObjDir)/arm_neon.inc.tmp : arm_neon.td $(TBLGEN) $(ObjDir)/.dir -+$(ObjDir)/arm_neon.inc.tmp : arm_neon.td $(ObjDir)/.dir - $(Echo) "Building Clang arm_neon.inc with tblgen" - $(Verb) $(TableGen) -gen-arm-neon-sema -o $(call SYSPATH, $@) $< - -diff -Naur a/tools/clang/include/clang/Driver/Makefile b/tools/clang/include/clang/Driver/Makefile ---- a/tools/clang/include/clang/Driver/Makefile 2010-06-08 16:34:18.000000000 -0400 -+++ b/tools/clang/include/clang/Driver/Makefile 2011-10-19 14:25:33.739369159 -0400 -@@ -5,14 +5,14 @@ - - include $(CLANG_LEVEL)/Makefile - --$(ObjDir)/Options.inc.tmp : Options.td OptParser.td $(TBLGEN) $(ObjDir)/.dir -+$(ObjDir)/Options.inc.tmp : Options.td OptParser.td $(ObjDir)/.dir - $(Echo) "Building Clang Driver Option tables with tblgen" - $(Verb) $(TableGen) -gen-opt-parser-defs -o $(call SYSPATH, $@) $< - --$(ObjDir)/CC1Options.inc.tmp : CC1Options.td OptParser.td $(TBLGEN) $(ObjDir)/.dir -+$(ObjDir)/CC1Options.inc.tmp : CC1Options.td OptParser.td $(ObjDir)/.dir - $(Echo) "Building Clang CC1 Option tables with tblgen" - $(Verb) $(TableGen) -gen-opt-parser-defs -o $(call SYSPATH, $@) $< - --$(ObjDir)/CC1AsOptions.inc.tmp : CC1AsOptions.td OptParser.td $(TBLGEN) $(ObjDir)/.dir -+$(ObjDir)/CC1AsOptions.inc.tmp : CC1AsOptions.td OptParser.td $(ObjDir)/.dir - $(Echo) "Building Clang CC1 Assembler Option tables with tblgen" - $(Verb) $(TableGen) -gen-opt-parser-defs -o $(call SYSPATH, $@) $< -diff -Naur a/tools/clang/include/clang/Lex/Makefile b/tools/clang/include/clang/Lex/Makefile ---- a/tools/clang/include/clang/Lex/Makefile 2010-10-19 22:31:43.000000000 -0400 -+++ b/tools/clang/include/clang/Lex/Makefile 2011-10-19 14:18:25.082807086 -0400 -@@ -6,7 +6,7 @@ - - include $(CLANG_LEVEL)/Makefile - --$(ObjDir)/AttrSpellings.inc.tmp : $(TD_SRC_DIR)/Attr.td $(TBLGEN) \ -+$(ObjDir)/AttrSpellings.inc.tmp : $(TD_SRC_DIR)/Attr.td \ - $(ObjDir)/.dir - $(Echo) "Building Clang attribute spellings with tblgen" - $(Verb) $(TableGen) -gen-clang-attr-spelling-list -o $(call SYSPATH, $@) \ -diff -Naur a/tools/clang/include/clang/Serialization/Makefile b/tools/clang/include/clang/Serialization/Makefile ---- a/tools/clang/include/clang/Serialization/Makefile 2010-08-18 19:23:40.000000000 -0400 -+++ b/tools/clang/include/clang/Serialization/Makefile 2011-10-19 14:25:05.764398164 -0400 -@@ -6,13 +6,13 @@ - - include $(CLANG_LEVEL)/Makefile - --$(ObjDir)/AttrPCHRead.inc.tmp : $(TD_SRC_DIR)/Attr.td $(TBLGEN) \ -+$(ObjDir)/AttrPCHRead.inc.tmp : $(TD_SRC_DIR)/Attr.td \ - $(ObjDir)/.dir - $(Echo) "Building Clang PCH reader with tblgen" - $(Verb) $(TableGen) -gen-clang-attr-pch-read -o $(call SYSPATH, $@) \ - -I $(PROJ_SRC_DIR)/../../ $< - --$(ObjDir)/AttrPCHWrite.inc.tmp : $(TD_SRC_DIR)/Attr.td $(TBLGEN) \ -+$(ObjDir)/AttrPCHWrite.inc.tmp : $(TD_SRC_DIR)/Attr.td \ - $(ObjDir)/.dir - $(Echo) "Building Clang PCH writer with tblgen" - $(Verb) $(TableGen) -gen-clang-attr-pch-write -o $(call SYSPATH, $@) \ -diff -Naur a/tools/clang/lib/Headers/Makefile b/tools/clang/lib/Headers/Makefile ---- a/tools/clang/lib/Headers/Makefile 2010-07-21 21:19:36.000000000 -0400 -+++ b/tools/clang/lib/Headers/Makefile 2011-10-19 14:15:18.520993127 -0400 -@@ -49,6 +49,6 @@ - - install-local:: $(INSTHEADERS) - --$(ObjDir)/arm_neon.h.inc.tmp : $(CLANG_LEVEL)/include/clang/Basic/arm_neon.td $(TBLGEN) $(ObjDir)/.dir -+$(ObjDir)/arm_neon.h.inc.tmp : $(CLANG_LEVEL)/include/clang/Basic/arm_neon.td $(ObjDir)/.dir - $(Echo) "Building Clang arm_neon.h.inc with tblgen" - $(Verb) $(TableGen) -gen-arm-neon -o $(call SYSPATH, $@) $< -diff -Naur a/tools/clang/lib/StaticAnalyzer/Checkers/Makefile b/tools/clang/lib/StaticAnalyzer/Checkers/Makefile ---- a/tools/clang/lib/StaticAnalyzer/Checkers/Makefile 2011-02-15 02:42:38.000000000 -0500 -+++ b/tools/clang/lib/StaticAnalyzer/Checkers/Makefile 2011-10-19 14:15:58.240953760 -0400 -@@ -19,6 +19,6 @@ - - include $(CLANG_LEVEL)/Makefile - --$(ObjDir)/Checkers.inc.tmp : Checkers.td $(PROJ_SRC_DIR)/$(CLANG_LEVEL)/include/clang/StaticAnalyzer/Checkers/CheckerBase.td $(TBLGEN) $(ObjDir)/.dir -+$(ObjDir)/Checkers.inc.tmp : Checkers.td $(PROJ_SRC_DIR)/$(CLANG_LEVEL)/include/clang/StaticAnalyzer/Checkers/CheckerBase.td $(ObjDir)/.dir - $(Echo) "Building Clang SA Checkers tables with tblgen" - $(Verb) $(TableGen) -gen-clang-sa-checkers -I $(PROJ_SRC_DIR)/$(CLANG_LEVEL)/include -o $(call SYSPATH, $@) $< diff --git a/pkgs/development/compilers/llvm/clang.nix b/pkgs/development/compilers/llvm/clang.nix index 1763e1e9e16..c9745bf8319 100644 --- a/pkgs/development/compilers/llvm/clang.nix +++ b/pkgs/development/compilers/llvm/clang.nix @@ -1,51 +1,31 @@ -{ stdenv, fetchurl, perl, groff, llvm }: +{ stdenv, fetchurl, perl, groff, llvm, cmake }: -assert stdenv.isLinux && stdenv.gcc.gcc != null; - -let version = "2.9"; in +let version = "3.0"; in stdenv.mkDerivation { name = "clang-${version}"; - src = llvm.src; + buildInputs = [ perl llvm groff cmake ]; - buildInputs = [ perl llvm groff ]; + patches = stdenv.lib.optionals stdenv.isLinux + [ ./clang-include-paths.patch ./clang-ld-flags.patch ]; - configureFlags = [ "--enable-optimized" "--enable-shared" "--disable-static" ] - ++ stdenv.lib.optionals (stdenv.gcc ? clang) [ - "--with-built-clang=yes" - "CXX=clang++" - ]; - - srcClang = fetchurl { - url = "http://llvm.org/releases/${version}/clang-${version}.tgz"; - sha256 = "1pq9g7qxw761dp6gx3amx39kl9p4zhlymmn8gfmcnw9ag0zizi3h"; - }; - - prePatch = '' - pushd tools - unpackFile $srcClang - mv clang-${version} clang - popd - find - ''; - - patches = [ ./clang-include-paths.patch ./clang-ld-flags.patch ./clang-tblgen.patch ./clang-system-llvm-libs.patch ]; - - buildFlags = [ "TableGen=tblgen" "LLVM_CONFIG=llvm-config" ]; - - preBuild = '' + postPatch = stdenv.lib.optionalString stdenv.isLinux '' sed -i -e 's,C_INCLUDE_PATH,"${stdenv.gcc.libc}/include/",' \ - -e 's,CPP_HOST,"'$(${stdenv.gcc.gcc}/bin/gcc -dumpmachine)'",' \ + -e 's,CPP_HOST,"'$(${stdenv.gcc}/bin/cc -dumpmachine)'",' \ -e 's,CPP_INCLUDE_PATH,"${stdenv.gcc.gcc}/include/c++/${stdenv.gcc.gcc.version}",' \ - tools/clang/lib/Frontend/InitHeaderSearch.cpp - - pushd utils/unittest - make - popd - cd tools/clang + lib/Driver/ToolChains.cpp ''; + cmakeFlags = [ "-DCLANG_PATH_TO_LLVM_BUILD=${llvm}" "-DCMAKE_BUILD_TYPE=Release" ]; + + enableParallelBuilding = true; + + src = fetchurl { + url = "http://llvm.org/releases/${version}/clang-${version}.tar.gz"; + sha256 = "0v8j9rgmb7w74ihc44zfxa22q17c946n5b6prwl38z3d6pd74kmn"; + }; + passthru = { gcc = stdenv.gcc.gcc; }; meta = { @@ -53,6 +33,7 @@ stdenv.mkDerivation { description = "A C language family frontend for LLVM"; license = "BSD"; maintainers = with stdenv.lib.maintainers; [viric shlevy]; - platforms = with stdenv.lib.platforms; linux; + platforms = with stdenv.lib.platforms; all; }; } + diff --git a/pkgs/development/compilers/llvm/default.nix b/pkgs/development/compilers/llvm/default.nix index afc1a55b093..fd62f4b0ae8 100644 --- a/pkgs/development/compilers/llvm/default.nix +++ b/pkgs/development/compilers/llvm/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, perl, groff, darwinSwVersUtility }: +{ stdenv, fetchurl, perl, groff, darwinSwVersUtility, cmake }: let version = "3.0"; in @@ -10,14 +10,10 @@ stdenv.mkDerivation { sha256 = "0xq4gi7lflv8ilfckslhfvnja5693xjii1yvzz39kklr6hfv37ji"; }; - buildInputs = [ perl groff ] ++ + buildInputs = [ perl groff cmake ] ++ stdenv.lib.optional stdenv.isDarwin darwinSwVersUtility; - configureFlags = [ "--enable-optimized" "--enable-shared" "--disable-static" ] - ++ stdenv.lib.optionals (stdenv.gcc ? clang) [ - "--with-built-clang=yes" - "CXX=clang++" - ]; + cmakeFlags = [ "-DCMAKE_BUILD_TYPE=Release" ]; enableParallelBuilding = true; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 1252032a78c..4e9f9fa68b9 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -1665,7 +1665,11 @@ let ccl = builderDefsPackage ../development/compilers/ccl {}; - clangBootUnwrapped = callPackage ../development/compilers/llvm/clang.nix { }; + clangBootUnwrapped = callPackage ../development/compilers/llvm/clang.nix { + # There is a bug in gcc-4.5 that prevents building a release build of + # clang-3.0 + stdenv = stdenvAdapters.overrideGCC stdenv gcc46; + }; clangBoot = wrapClang clangBootUnwrapped; From 2a033caa1d354d6599fce04d8e330710b8b203ce Mon Sep 17 00:00:00 2001 From: Shea Levy Date: Mon, 19 Dec 2011 12:53:07 +0000 Subject: [PATCH 015/186] llvm+clang don't yet build on non-Linux platforms svn path=/nixpkgs/trunk/; revision=30957 --- pkgs/development/compilers/llvm/clang.nix | 2 +- pkgs/development/compilers/llvm/default.nix | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/compilers/llvm/clang.nix b/pkgs/development/compilers/llvm/clang.nix index c9745bf8319..0ee91a2cd0d 100644 --- a/pkgs/development/compilers/llvm/clang.nix +++ b/pkgs/development/compilers/llvm/clang.nix @@ -33,7 +33,7 @@ stdenv.mkDerivation { description = "A C language family frontend for LLVM"; license = "BSD"; maintainers = with stdenv.lib.maintainers; [viric shlevy]; - platforms = with stdenv.lib.platforms; all; + platforms = with stdenv.lib.platforms; linux; }; } diff --git a/pkgs/development/compilers/llvm/default.nix b/pkgs/development/compilers/llvm/default.nix index fd62f4b0ae8..9e7502fb370 100644 --- a/pkgs/development/compilers/llvm/default.nix +++ b/pkgs/development/compilers/llvm/default.nix @@ -22,7 +22,7 @@ stdenv.mkDerivation { description = "Collection of modular and reusable compiler and toolchain technologies"; license = "BSD"; maintainers = with stdenv.lib.maintainers; [viric shlevy]; - platforms = with stdenv.lib.platforms; all; + platforms = with stdenv.lib.platforms; linux; }; } From dfb27bd1814c7a9a68a635fce16ddfa1ed375f69 Mon Sep 17 00:00:00 2001 From: Shea Levy Date: Mon, 19 Dec 2011 13:00:03 +0000 Subject: [PATCH 016/186] llvm should build on darwin now svn path=/nixpkgs/trunk/; revision=30958 --- pkgs/development/compilers/llvm/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/compilers/llvm/default.nix b/pkgs/development/compilers/llvm/default.nix index 9e7502fb370..01b16fcda8d 100644 --- a/pkgs/development/compilers/llvm/default.nix +++ b/pkgs/development/compilers/llvm/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, perl, groff, darwinSwVersUtility, cmake }: +{ stdenv, fetchurl, perl, groff, darwinSwVersUtility, darwinInstallNameToolUtility, cmake }: let version = "3.0"; in @@ -11,7 +11,7 @@ stdenv.mkDerivation { }; buildInputs = [ perl groff cmake ] ++ - stdenv.lib.optional stdenv.isDarwin darwinSwVersUtility; + stdenv.lib.optionals stdenv.isDarwin [ darwinSwVersUtility darwinInstallNameToolUtility ]; cmakeFlags = [ "-DCMAKE_BUILD_TYPE=Release" ]; @@ -22,7 +22,7 @@ stdenv.mkDerivation { description = "Collection of modular and reusable compiler and toolchain technologies"; license = "BSD"; maintainers = with stdenv.lib.maintainers; [viric shlevy]; - platforms = with stdenv.lib.platforms; linux; + platforms = with stdenv.lib.platforms; all; }; } From 22bbe11e6573ca62712f3b02ce19706fb5e4310a Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 19 Dec 2011 13:27:32 +0000 Subject: [PATCH 017/186] haskell-multirec: updated to version 0.7 svn path=/nixpkgs/trunk/; revision=30959 --- .../libraries/haskell/multirec/{0.6.nix => 0.7.nix} | 4 ++-- pkgs/top-level/haskell-packages.nix | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) rename pkgs/development/libraries/haskell/multirec/{0.6.nix => 0.7.nix} (84%) diff --git a/pkgs/development/libraries/haskell/multirec/0.6.nix b/pkgs/development/libraries/haskell/multirec/0.7.nix similarity index 84% rename from pkgs/development/libraries/haskell/multirec/0.6.nix rename to pkgs/development/libraries/haskell/multirec/0.7.nix index 6fb6acd58ed..e5a1b2a85a9 100644 --- a/pkgs/development/libraries/haskell/multirec/0.6.nix +++ b/pkgs/development/libraries/haskell/multirec/0.7.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "multirec"; - version = "0.6"; - sha256 = "1k0icyz9i4hc5vfpwrv42l3q4lrnsb1bswhyyv63d9azffn5flys"; + version = "0.7"; + sha256 = "1n196qqggfnk8fa1x296rdbyb77a6ykhy01z8x2glgdimzpxsiay"; noHaddock = true; meta = { homepage = "http://www.cs.uu.nl/wiki/GenericProgramming/Multirec"; diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix index df236bc2c8f..0e05eb4a09c 100644 --- a/pkgs/top-level/haskell-packages.nix +++ b/pkgs/top-level/haskell-packages.nix @@ -950,8 +950,8 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y); multiplate = callPackage ../development/libraries/haskell/multiplate {}; multirec_0_5_1 = callPackage ../development/libraries/haskell/multirec/0.5.1.nix {}; - multirec_0_6 = callPackage ../development/libraries/haskell/multirec/0.6.nix {}; - multirec = self.multirec_0_6; + multirec_0_7 = callPackage ../development/libraries/haskell/multirec/0.7.nix {}; + multirec = self.multirec_0_7; multiset = callPackage ../development/libraries/haskell/multiset {}; From 4c05021dcb50cfc7e1d47c421caeeb69e1d35748 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 19 Dec 2011 13:27:35 +0000 Subject: [PATCH 018/186] haskell-QuickCheck: dropped obsolete version 2.1.0.3 svn path=/nixpkgs/trunk/; revision=30960 --- .../libraries/haskell/QuickCheck/2.1.0.3.nix | 18 ------------------ pkgs/top-level/haskell-packages.nix | 1 - 2 files changed, 19 deletions(-) delete mode 100644 pkgs/development/libraries/haskell/QuickCheck/2.1.0.3.nix diff --git a/pkgs/development/libraries/haskell/QuickCheck/2.1.0.3.nix b/pkgs/development/libraries/haskell/QuickCheck/2.1.0.3.nix deleted file mode 100644 index df686f71c5b..00000000000 --- a/pkgs/development/libraries/haskell/QuickCheck/2.1.0.3.nix +++ /dev/null @@ -1,18 +0,0 @@ -{ cabal, extensibleExceptions, mtl, random }: - -cabal.mkDerivation (self: { - pname = "QuickCheck"; - version = "2.1.0.3"; - sha256 = "91a861233fe0a37a032d092dd5e8ec40c2c99fbbf0701081394eb244f23757b1"; - buildDepends = [ extensibleExceptions mtl random ]; - meta = { - homepage = "http://www.cs.chalmers.se/~koen"; - description = "Automatic testing of Haskell programs"; - license = self.stdenv.lib.licenses.bsd3; - platforms = self.ghc.meta.platforms; - maintainers = [ - self.stdenv.lib.maintainers.andres - self.stdenv.lib.maintainers.simons - ]; - }; -}) diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix index 0e05eb4a09c..371dd8abc52 100644 --- a/pkgs/top-level/haskell-packages.nix +++ b/pkgs/top-level/haskell-packages.nix @@ -1060,7 +1060,6 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y); QuickCheck_1_2_0_0 = callPackage ../development/libraries/haskell/QuickCheck/1.2.0.0.nix {}; QuickCheck_1_2_0_1 = callPackage ../development/libraries/haskell/QuickCheck/1.2.0.1.nix {}; - QuickCheck_2_1_0_3 = callPackage ../development/libraries/haskell/QuickCheck/2.1.0.3.nix {}; QuickCheck_2_1_1_1 = callPackage ../development/libraries/haskell/QuickCheck/2.1.1.1.nix {}; QuickCheck_2_4_0_1 = callPackage ../development/libraries/haskell/QuickCheck/2.4.0.1.nix {}; QuickCheck_2_4_1_1 = callPackage ../development/libraries/haskell/QuickCheck/2.4.1.1.nix {}; From c4e802e22d0822dcbf4e26a5ed7cc7bd02ce4b97 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 19 Dec 2011 13:27:38 +0000 Subject: [PATCH 019/186] haskell-QuickCheck: added version 2.4.2 svn path=/nixpkgs/trunk/; revision=30961 --- .../libraries/haskell/QuickCheck/2.4.2.nix | 18 ++++++++++++++++++ pkgs/top-level/haskell-packages.nix | 5 +++-- 2 files changed, 21 insertions(+), 2 deletions(-) create mode 100644 pkgs/development/libraries/haskell/QuickCheck/2.4.2.nix diff --git a/pkgs/development/libraries/haskell/QuickCheck/2.4.2.nix b/pkgs/development/libraries/haskell/QuickCheck/2.4.2.nix new file mode 100644 index 00000000000..69a1c1dc417 --- /dev/null +++ b/pkgs/development/libraries/haskell/QuickCheck/2.4.2.nix @@ -0,0 +1,18 @@ +{ cabal, extensibleExceptions, random }: + +cabal.mkDerivation (self: { + pname = "QuickCheck"; + version = "2.4.2"; + sha256 = "17qp73sdp780lha3i6xdsrvgshqz47qwldqknadc0w3vmscw61bg"; + buildDepends = [ extensibleExceptions random ]; + meta = { + homepage = "http://code.haskell.org/QuickCheck"; + description = "Automatic testing of Haskell programs"; + license = self.stdenv.lib.licenses.bsd3; + platforms = self.ghc.meta.platforms; + maintainers = [ + self.stdenv.lib.maintainers.andres + self.stdenv.lib.maintainers.simons + ]; + }; +}) diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix index 371dd8abc52..ba6ce39e1b1 100644 --- a/pkgs/top-level/haskell-packages.nix +++ b/pkgs/top-level/haskell-packages.nix @@ -144,7 +144,7 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y); OpenGL = self.OpenGL_2_2_3_0; # 7.2 ok, 7.3 ok parallel = self.parallel_3_2_0_0; # 7.2 ok, 7.3 ok parsec = self.parsec_3_1_2; # 7.2 ok, 7.3 ok - QuickCheck = self.QuickCheck_2_4_1_1; # 7.2 ok, 7.3 ok + QuickCheck = self.QuickCheck_2_4_2; # 7.2 ok, 7.3 ok regexBase = self.regexBase_0_93_2; # 7.2 ok, 7.3 ok regexCompat = self.regexCompat_0_93_1; # 7.2 ok, 7.3 ok regexPosix = self.regexPosix_0_94_4; # 7.2 ok, 7.3 ok @@ -1063,8 +1063,9 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y); QuickCheck_2_1_1_1 = callPackage ../development/libraries/haskell/QuickCheck/2.1.1.1.nix {}; QuickCheck_2_4_0_1 = callPackage ../development/libraries/haskell/QuickCheck/2.4.0.1.nix {}; QuickCheck_2_4_1_1 = callPackage ../development/libraries/haskell/QuickCheck/2.4.1.1.nix {}; + QuickCheck_2_4_2 = callPackage ../development/libraries/haskell/QuickCheck/2.4.2.nix {}; QuickCheck1 = self.QuickCheck_1_2_0_1; - QuickCheck2 = self.QuickCheck_2_4_1_1; + QuickCheck2 = self.QuickCheck_2_4_2; QuickCheck = self.QuickCheck2; RangedSets = callPackage ../development/libraries/haskell/Ranged-sets {}; From 2c451670b20b66afd73e0006ea8c5e0f8b43443c Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 19 Dec 2011 13:27:41 +0000 Subject: [PATCH 020/186] haskell-base-unicode-symbols: updated to version 0.2.2.3 svn path=/nixpkgs/trunk/; revision=30962 --- .../libraries/haskell/base-unicode-symbols/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/base-unicode-symbols/default.nix b/pkgs/development/libraries/haskell/base-unicode-symbols/default.nix index ab0233e1956..ae9d23f57d4 100644 --- a/pkgs/development/libraries/haskell/base-unicode-symbols/default.nix +++ b/pkgs/development/libraries/haskell/base-unicode-symbols/default.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "base-unicode-symbols"; - version = "0.2.2.2"; - sha256 = "13bn580r3wk7g5bq8ry04i2lvrcf576wjzlr0imli8rklkx8k3b8"; + version = "0.2.2.3"; + sha256 = "0803ncdydkxivn4kcjfn9v0lm43xg47y5iws7lajhhyg6v4zq08j"; meta = { homepage = "http://haskell.org/haskellwiki/Unicode-symbols"; description = "Unicode alternatives for common functions and operators"; From f3b1ee8f8232e5097cf0b3efef61b55bf39a66f3 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 19 Dec 2011 13:27:43 +0000 Subject: [PATCH 021/186] haskell-dataenc: updated to version 0.14.0.3 svn path=/nixpkgs/trunk/; revision=30963 --- pkgs/development/libraries/haskell/dataenc/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/dataenc/default.nix b/pkgs/development/libraries/haskell/dataenc/default.nix index 88d1b6ed067..7f7b65702b0 100644 --- a/pkgs/development/libraries/haskell/dataenc/default.nix +++ b/pkgs/development/libraries/haskell/dataenc/default.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "dataenc"; - version = "0.14.0.2"; - sha256 = "1zym24259d053b7vbxir2l7229gilkg81vvc0wf9605873j6gw5b"; + version = "0.14.0.3"; + sha256 = "1k6k9cpx5ma32gvzf2mdbz4kfiblwfah9875qr13zkl4has9y0pd"; isLibrary = true; isExecutable = true; meta = { From a6904c2aef7cfdd32e7ab3fcf7617016034c8e57 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 19 Dec 2011 13:27:45 +0000 Subject: [PATCH 022/186] haskell-http-types: updated to version 0.6.8 svn path=/nixpkgs/trunk/; revision=30964 --- pkgs/development/libraries/haskell/http-types/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/http-types/default.nix b/pkgs/development/libraries/haskell/http-types/default.nix index 1006d2fd2c3..890d5100147 100644 --- a/pkgs/development/libraries/haskell/http-types/default.nix +++ b/pkgs/development/libraries/haskell/http-types/default.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "http-types"; - version = "0.6.7"; - sha256 = "04bmw5k9gvlh7x4ggmwz7pdc1ik3va0v4icg7nv47ab2w2pn88pb"; + version = "0.6.8"; + sha256 = "0amjpn93wc7jhfy1n69mhiryi2yy40k5388ap3iwqi79mblkjf31"; isLibrary = true; isExecutable = true; buildDepends = [ blazeBuilder caseInsensitive text ]; From 8845eaa7f8bb1f03902d41b0f5bc3ecbcda227b3 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 19 Dec 2011 13:27:48 +0000 Subject: [PATCH 023/186] haskell-monad-control: updated to version 0.3.1 svn path=/nixpkgs/trunk/; revision=30965 --- pkgs/development/libraries/haskell/monad-control/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/monad-control/default.nix b/pkgs/development/libraries/haskell/monad-control/default.nix index 52e3d001f48..bf4ca6d0042 100644 --- a/pkgs/development/libraries/haskell/monad-control/default.nix +++ b/pkgs/development/libraries/haskell/monad-control/default.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "monad-control"; - version = "0.3.0.1"; - sha256 = "0aa73cw82yssias0a9y237h9r4v4abvs0lv2lmhxaa4a4mdrj3ms"; + version = "0.3.1"; + sha256 = "0laqvbnj1dfcdxrybxdnzw5g95drv34ys0cbwkcw47nl9w801p45"; buildDepends = [ baseUnicodeSymbols transformers transformersBase ]; From 72df7d358e33e53820f1f121b499511a26362428 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 19 Dec 2011 13:27:50 +0000 Subject: [PATCH 024/186] haskell-transformers-base: updated to version 0.4.1 svn path=/nixpkgs/trunk/; revision=30966 --- .../libraries/haskell/transformers-base/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/transformers-base/default.nix b/pkgs/development/libraries/haskell/transformers-base/default.nix index 6571b082281..951458eb4eb 100644 --- a/pkgs/development/libraries/haskell/transformers-base/default.nix +++ b/pkgs/development/libraries/haskell/transformers-base/default.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "transformers-base"; - version = "0.4.0.1"; - sha256 = "0avnnxbxh59xgxzb8vldysrbw37sim9iaiiscgjhdlscxy6yasbb"; + version = "0.4.1"; + sha256 = "1d3w7k7smvdnnn4q6xpdhsj9zvj6372ihyhz4lrhdvgh72pfiaag"; buildDepends = [ transformers ]; meta = { homepage = "https://github.com/mvv/transformers-base"; From 87c3b5f727f5b5f1f213f639082deb896071057a Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 19 Dec 2011 13:27:53 +0000 Subject: [PATCH 025/186] haskell-zeromq-haskell: updated to version 0.8.2 svn path=/nixpkgs/trunk/; revision=30967 --- .../libraries/haskell/zeromq-haskell/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/libraries/haskell/zeromq-haskell/default.nix b/pkgs/development/libraries/haskell/zeromq-haskell/default.nix index b456c1d81a0..f7c6a81d188 100644 --- a/pkgs/development/libraries/haskell/zeromq-haskell/default.nix +++ b/pkgs/development/libraries/haskell/zeromq-haskell/default.nix @@ -2,12 +2,12 @@ cabal.mkDerivation (self: { pname = "zeromq-haskell"; - version = "0.8.1"; - sha256 = "19fl3nd548yj6d6c3jqr6lxk6y033qa68jgnc5aq5w8kmlpn70mc"; + version = "0.8.2"; + sha256 = "0wi3s3ygxd15jbj5bpq6xvrsjsm94hhj6na8r45j241j0cgr322x"; extraLibraries = [ zeromq ]; meta = { homepage = "http://github.com/twittner/zeromq-haskell/"; - description = "bindings to zeromq"; + description = "Bindings to ZeroMQ 2.1.x"; license = self.stdenv.lib.licenses.mit; platforms = self.ghc.meta.platforms; maintainers = [ From cf247dcce02cfd51ee04988e4ac35e7c8ec79a81 Mon Sep 17 00:00:00 2001 From: Shea Levy Date: Mon, 19 Dec 2011 13:40:33 +0000 Subject: [PATCH 026/186] Try to fix tarball svn path=/nixpkgs/trunk/; revision=30968 --- pkgs/development/compilers/llvm/clang.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/compilers/llvm/clang.nix b/pkgs/development/compilers/llvm/clang.nix index 0ee91a2cd0d..8450dbe1771 100644 --- a/pkgs/development/compilers/llvm/clang.nix +++ b/pkgs/development/compilers/llvm/clang.nix @@ -7,10 +7,10 @@ stdenv.mkDerivation { buildInputs = [ perl llvm groff cmake ]; - patches = stdenv.lib.optionals stdenv.isLinux + patches = stdenv.lib.optionals (stdenv.gcc.libc != null) [ ./clang-include-paths.patch ./clang-ld-flags.patch ]; - postPatch = stdenv.lib.optionalString stdenv.isLinux '' + postPatch = stdenv.lib.optionalString (stdenv.gcc.libc != null) '' sed -i -e 's,C_INCLUDE_PATH,"${stdenv.gcc.libc}/include/",' \ -e 's,CPP_HOST,"'$(${stdenv.gcc}/bin/cc -dumpmachine)'",' \ -e 's,CPP_INCLUDE_PATH,"${stdenv.gcc.gcc}/include/c++/${stdenv.gcc.gcc.version}",' \ From 121a926167936ec1365151e55bb547afef6180d2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?= Date: Mon, 19 Dec 2011 16:03:55 +0000 Subject: [PATCH 027/186] Updating Google Protocol Buffers, and removing an old version because I think it is unreferenced. svn path=/nixpkgs/trunk/; revision=30969 --- pkgs/development/libraries/protobuf/2.2.0.nix | 28 ------------------- .../libraries/protobuf/default.nix | 4 +-- pkgs/top-level/all-packages.nix | 1 - 3 files changed, 2 insertions(+), 31 deletions(-) delete mode 100644 pkgs/development/libraries/protobuf/2.2.0.nix diff --git a/pkgs/development/libraries/protobuf/2.2.0.nix b/pkgs/development/libraries/protobuf/2.2.0.nix deleted file mode 100644 index c9419367fd6..00000000000 --- a/pkgs/development/libraries/protobuf/2.2.0.nix +++ /dev/null @@ -1,28 +0,0 @@ -{ fetchurl, stdenv, zlib }: - -stdenv.mkDerivation rec { - name = "protobuf-2.2.0"; - - src = fetchurl { - url = "http://protobuf.googlecode.com/files/${name}.tar.bz2"; - sha256 = "0jvj7i0fifl4fqjf84f67chb9b6q2z1jqkfc1zic9fz035mzn7bk"; - }; - - buildInputs = [ zlib ]; - - doCheck = true; - - meta = { - description = "Protocol Buffers - Google's data interchange format"; - - longDescription = - '' Protocol Buffers are a way of encoding structured data in an - efficient yet extensible format. Google uses Protocol Buffers for - almost all of its internal RPC protocols and file formats. - ''; - - license = "mBSD"; - - homepage = http://code.google.com/p/protobuf/; - }; -} diff --git a/pkgs/development/libraries/protobuf/default.nix b/pkgs/development/libraries/protobuf/default.nix index 05dabd23773..57dc58bdfa1 100644 --- a/pkgs/development/libraries/protobuf/default.nix +++ b/pkgs/development/libraries/protobuf/default.nix @@ -1,11 +1,11 @@ { fetchurl, stdenv, zlib }: stdenv.mkDerivation rec { - name = "protobuf-2.3.0"; + name = "protobuf-2.4.1"; src = fetchurl { url = "http://protobuf.googlecode.com/files/${name}.tar.bz2"; - sha256 = "1b40cb7ij4bnw78k46y0a2jkm8qisxkk1gbbj40yi77yqc3pf33n"; + sha256 = "1gxhfhk37jyjq1z4y3d4bz4i1fk2an5ydhk5kjzlp0rhfcs5516g"; }; buildInputs = [ zlib ]; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 4e9f9fa68b9..caa473e3225 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -4426,7 +4426,6 @@ let postgis = callPackage ../development/libraries/postgis { }; protobuf = callPackage ../development/libraries/protobuf { }; - protobuf_2_2_0 = callPackage ../development/libraries/protobuf/2.2.0.nix { }; pth = callPackage ../development/libraries/pth { }; From 1ef78f94ebc76407c3fe4d1732cecc7b6a293919 Mon Sep 17 00:00:00 2001 From: Rob Vermaas Date: Mon, 19 Dec 2011 21:12:57 +0000 Subject: [PATCH 028/186] make sure fetchhg always produces same output for same revision svn path=/nixpkgs/trunk/; revision=30970 --- pkgs/build-support/fetchhg/builder.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/build-support/fetchhg/builder.sh b/pkgs/build-support/fetchhg/builder.sh index fbdd12b4f05..48ef269c505 100644 --- a/pkgs/build-support/fetchhg/builder.sh +++ b/pkgs/build-support/fetchhg/builder.sh @@ -5,5 +5,6 @@ header "getting $url${tag:+ ($tag)} into $out" hg clone ${tag:+-r "$tag"} "$url" "$out" rm -rf "$out/.hg" +rm -f "$out/.hg_archival.txt" stopNest From 66b4a5a009bcf5acd440e9f0fd4702d8de630f04 Mon Sep 17 00:00:00 2001 From: Rob Vermaas Date: Mon, 19 Dec 2011 21:15:17 +0000 Subject: [PATCH 029/186] revert previous commit, i'm not awake... svn path=/nixpkgs/trunk/; revision=30971 --- pkgs/build-support/fetchhg/builder.sh | 1 - 1 file changed, 1 deletion(-) diff --git a/pkgs/build-support/fetchhg/builder.sh b/pkgs/build-support/fetchhg/builder.sh index 48ef269c505..fbdd12b4f05 100644 --- a/pkgs/build-support/fetchhg/builder.sh +++ b/pkgs/build-support/fetchhg/builder.sh @@ -5,6 +5,5 @@ header "getting $url${tag:+ ($tag)} into $out" hg clone ${tag:+-r "$tag"} "$url" "$out" rm -rf "$out/.hg" -rm -f "$out/.hg_archival.txt" stopNest From ec305ac161ab11d09e6fd0e62db7d007cd1ed26e Mon Sep 17 00:00:00 2001 From: Shea Levy Date: Mon, 19 Dec 2011 23:58:57 +0000 Subject: [PATCH 030/186] clang builds on darwin now Also, get rid of the clang bootstrap, there's no need for it svn path=/nixpkgs/trunk/; revision=30973 --- pkgs/development/compilers/llvm/clang.nix | 6 +++--- pkgs/top-level/all-packages.nix | 16 ++++++---------- 2 files changed, 9 insertions(+), 13 deletions(-) diff --git a/pkgs/development/compilers/llvm/clang.nix b/pkgs/development/compilers/llvm/clang.nix index 8450dbe1771..4d8bb3fe834 100644 --- a/pkgs/development/compilers/llvm/clang.nix +++ b/pkgs/development/compilers/llvm/clang.nix @@ -1,11 +1,11 @@ -{ stdenv, fetchurl, perl, groff, llvm, cmake }: +{ stdenv, fetchurl, perl, groff, llvm, cmake, darwinInstallNameToolUtility }: let version = "3.0"; in stdenv.mkDerivation { name = "clang-${version}"; - buildInputs = [ perl llvm groff cmake ]; + buildInputs = [ perl llvm groff cmake ] ++ stdenv.lib.optional stdenv.isDarwin darwinInstallNameToolUtility; patches = stdenv.lib.optionals (stdenv.gcc.libc != null) [ ./clang-include-paths.patch ./clang-ld-flags.patch ]; @@ -33,7 +33,7 @@ stdenv.mkDerivation { description = "A C language family frontend for LLVM"; license = "BSD"; maintainers = with stdenv.lib.maintainers; [viric shlevy]; - platforms = with stdenv.lib.platforms; linux; + platforms = with stdenv.lib.platforms; all; }; } diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index caa473e3225..f706fcde770 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -1665,17 +1665,12 @@ let ccl = builderDefsPackage ../development/compilers/ccl {}; - clangBootUnwrapped = callPackage ../development/compilers/llvm/clang.nix { + clangUnwrapped = callPackage ../development/compilers/llvm/clang.nix { # There is a bug in gcc-4.5 that prevents building a release build of # clang-3.0 - stdenv = stdenvAdapters.overrideGCC stdenv gcc46; - }; - - clangBoot = wrapClang clangBootUnwrapped; - - clangUnwrapped = let clangBootStdenv = stdenvAdapters.overrideGCC stdenv clangBoot; in clangBootUnwrapped.override { - stdenv = clangBootStdenv; - llvm = llvm.override { stdenv = clangBootStdenv; }; + stdenv = if stdenv.isLinux + then (stdenvAdapters.overrideGCC stdenv gcc46) + else stdenv; }; clang = wrapClang clangUnwrapped; @@ -2499,7 +2494,8 @@ let clang = baseClang; libc = glibc; shell = bash; - inherit stdenv binutils coreutils zlib; + binutils = stdenv.gcc.binutils; + inherit stdenv coreutils zlib; }; wrapClang = wrapClangWith (import ../build-support/clang-wrapper) glibc; From d54677f9c47103e6e36184649f7dfdf8b5156983 Mon Sep 17 00:00:00 2001 From: Shea Levy Date: Tue, 20 Dec 2011 02:51:37 +0000 Subject: [PATCH 031/186] Try to fix the tarball Not sure if this will work, just tried the obvious fix. svn path=/nixpkgs/trunk/; revision=30974 --- pkgs/top-level/haskell-packages.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix index ba6ce39e1b1..df176735967 100644 --- a/pkgs/top-level/haskell-packages.nix +++ b/pkgs/top-level/haskell-packages.nix @@ -351,7 +351,7 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y); zlib = self.zlib_0_5_2_0; alex = self.alex_2_3_2; cgi = self.cgi_3001_1_7_2; - QuickCheck = self.QuickCheck_2_1_0_3; + QuickCheck = self.QuickCheck_2_1_1_1; HTTP = self.HTTP_4000_0_9; HUnit = self.HUnit_1_2_2_1; network = self.network_2_2_1_7; From 63c643d07244078b859768336e07233ccd1547d0 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Tue, 20 Dec 2011 14:51:26 +0000 Subject: [PATCH 032/186] * Firefox 9.0. svn path=/nixpkgs/trunk/; revision=30985 --- .../networking/browsers/firefox/5.0.nix | 165 ---------------- .../networking/browsers/firefox/7.0.nix | 184 ------------------ .../networking/browsers/firefox/9.0.nix | 6 +- pkgs/top-level/all-packages.nix | 18 +- pkgs/top-level/release.nix | 3 +- 5 files changed, 7 insertions(+), 369 deletions(-) delete mode 100644 pkgs/applications/networking/browsers/firefox/5.0.nix delete mode 100644 pkgs/applications/networking/browsers/firefox/7.0.nix diff --git a/pkgs/applications/networking/browsers/firefox/5.0.nix b/pkgs/applications/networking/browsers/firefox/5.0.nix deleted file mode 100644 index f59d50fb6de..00000000000 --- a/pkgs/applications/networking/browsers/firefox/5.0.nix +++ /dev/null @@ -1,165 +0,0 @@ -{ stdenv, fetchurl, pkgconfig, gtk, pango, perl, python, zip, libIDL -, libjpeg, libpng, zlib, cairo, dbus, dbus_glib, bzip2, xlibs -, freetype, fontconfig, file, alsaLib, nspr, nss, libnotify -, yasm, mesa, sqlite - -, # If you want the resulting program to call itself "Firefox" instead - # of "Shiretoko" or whatever, enable this option. However, those - # binaries may not be distributed without permission from the - # Mozilla Foundation, see - # http://www.mozilla.org/foundation/trademarks/. - enableOfficialBranding ? false -}: - -assert stdenv.gcc ? libc && stdenv.gcc.libc != null; - -rec { - - firefoxVersion = "5.0.1"; - - xulVersion = "5.0.1"; # this attribute is used by other packages - - - src = fetchurl { - url = "http://releases.mozilla.org/pub/mozilla.org/firefox/releases/${firefoxVersion}/source/firefox-${firefoxVersion}.source.tar.bz2"; - sha1 = "c93b3513e160d87535a9d61c5e06a6a701e9cd3e"; - }; - - - commonConfigureFlags = - [ "--enable-optimize" - "--disable-debug" - "--enable-strip" - "--with-system-jpeg" - "--with-system-zlib" - "--with-system-bz2" - "--with-system-nspr" - # "--with-system-nss" - # "--with-system-png" # <-- "--with-system-png won't work because the system's libpng doesn't have APNG support" - "--enable-system-cairo" - "--enable-system-sqlite" - "--disable-crashreporter" - "--disable-tests" - "--disable-necko-wifi" # maybe we want to enable this at some point - "--disable-installer" - "--disable-updater" - ]; - - - xulrunner = stdenv.mkDerivation rec { - name = "xulrunner-${xulVersion}"; - - inherit src; - - buildInputs = - [ pkgconfig gtk perl zip libIDL libjpeg libpng zlib cairo bzip2 - python dbus dbus_glib pango freetype fontconfig xlibs.libXi - xlibs.libX11 xlibs.libXrender xlibs.libXft xlibs.libXt file - alsaLib nspr /* nss */ libnotify xlibs.pixman yasm mesa - xlibs.libXScrnSaver xlibs.scrnsaverproto - xlibs.libXext xlibs.xextproto sqlite - ]; - - configureFlags = - [ "--enable-application=xulrunner" - "--disable-javaxpcom" - ] ++ commonConfigureFlags; - - enableParallelBuilding = true; - - # Hack to work around make's idea of -lbz2 dependency - preConfigure = - '' - find . -name Makefile.in -execdir sed -i '{}' -e '1ivpath %.so ${ - stdenv.lib.concatStringsSep ":" - (map (s : s + "/lib") (buildInputs ++ [stdenv.gcc.libc])) - }' ';' - ''; - - # !!! Temporary hack. - preBuild = - '' - export NIX_ENFORCE_PURITY= - ''; - - installFlags = "SKIP_GRE_REGISTRATION=1"; - - postInstall = '' - # Fix some references to /bin paths in the Xulrunner shell script. - substituteInPlace $out/bin/xulrunner \ - --replace /bin/pwd "$(type -tP pwd)" \ - --replace /bin/ls "$(type -tP ls)" - - # Fix run-mozilla.sh search - libDir=$(cd $out/lib && ls -d xulrunner-[0-9]*) - echo libDir: $libDir - test -n "$libDir" - cd $out/bin - mv xulrunner ../lib/$libDir/ - - for i in $out/lib/$libDir/*; do - file $i; - if file $i | grep executable &>/dev/null; then - ln -s $i $out/bin - fi; - done; - rm -f $out/bin/run-mozilla.sh - ''; # */ - - meta = { - description = "Mozilla Firefox XUL runner"; - homepage = http://www.mozilla.org/firefox/; - }; - - passthru = { inherit gtk; version = xulVersion; }; - }; - - - firefox = stdenv.mkDerivation rec { - name = "firefox-${firefoxVersion}"; - - inherit src; - - enableParallelBuilding = true; - - buildInputs = - [ pkgconfig gtk perl zip libIDL libjpeg zlib cairo bzip2 python - dbus dbus_glib pango freetype fontconfig alsaLib nspr libnotify - xlibs.pixman yasm mesa sqlite - ]; - - propagatedBuildInputs = [xulrunner]; - - configureFlags = - [ "--enable-application=browser" - "--with-libxul-sdk=${xulrunner}/lib/xulrunner-devel-${xulrunner.version}" - "--enable-chrome-format=jar" - ] - ++ commonConfigureFlags - ++ stdenv.lib.optional enableOfficialBranding "--enable-official-branding"; - - # Hack to work around make's idea of -lbz2 dependency - preConfigure = - '' - find . -name Makefile.in -execdir sed -i '{}' -e '1ivpath %.so ${ - stdenv.lib.concatStringsSep ":" - (map (s : s + "/lib") (buildInputs ++ [stdenv.gcc.libc])) - }' ';' - ''; - - postInstall = - '' - ln -s ${xulrunner}/lib/xulrunner-${xulrunner.version} $(echo $out/lib/firefox-*)/xulrunner - ''; # */ - - meta = { - description = "Mozilla Firefox - the browser, reloaded"; - homepage = http://www.mozilla.org/firefox/; - }; - - passthru = { - inherit gtk xulrunner nspr; - isFirefox3Like = true; - }; - }; -} diff --git a/pkgs/applications/networking/browsers/firefox/7.0.nix b/pkgs/applications/networking/browsers/firefox/7.0.nix deleted file mode 100644 index c4fef3dfaf2..00000000000 --- a/pkgs/applications/networking/browsers/firefox/7.0.nix +++ /dev/null @@ -1,184 +0,0 @@ -{ stdenv, fetchurl, pkgconfig, gtk, pango, perl, python, zip, libIDL -, libjpeg, libpng, zlib, cairo, dbus, dbus_glib, bzip2, xlibs -, freetype, fontconfig, file, alsaLib, nspr, nss, libnotify -, yasm, mesa, sqlite - -, # If you want the resulting program to call itself "Firefox" instead - # of "Shiretoko" or whatever, enable this option. However, those - # binaries may not be distributed without permission from the - # Mozilla Foundation, see - # http://www.mozilla.org/foundation/trademarks/. - enableOfficialBranding ? false -}: - -assert stdenv.gcc ? libc && stdenv.gcc.libc != null; - -rec { - - firefoxVersion = "7.0.1"; - - xulVersion = "7.0.1"; # this attribute is used by other packages - - - src = fetchurl { - url = "http://releases.mozilla.org/pub/mozilla.org/firefox/releases/${firefoxVersion}/source/firefox-${firefoxVersion}.source.tar.bz2"; - sha1 = "94bbc7152832371dc0be82f411730df043c5c6ac"; - }; - - commonConfigureFlags = - [ "--enable-optimize" - "--disable-debug" - "--enable-strip" - "--with-system-jpeg" - "--with-system-zlib" - "--with-system-bz2" - "--with-system-nspr" - # "--with-system-nss" - # "--with-system-png" # <-- "--with-system-png won't work because the system's libpng doesn't have APNG support" - "--enable-system-cairo" - "--enable-system-sqlite" - "--disable-crashreporter" - "--disable-tests" - "--disable-necko-wifi" # maybe we want to enable this at some point - "--disable-installer" - "--disable-updater" - ]; - - - xulrunner = stdenv.mkDerivation rec { - name = "xulrunner-${xulVersion}"; - - inherit src; - - buildInputs = - [ pkgconfig gtk perl zip libIDL libjpeg libpng zlib cairo bzip2 - python dbus dbus_glib pango freetype fontconfig xlibs.libXi - xlibs.libX11 xlibs.libXrender xlibs.libXft xlibs.libXt file - alsaLib nspr /* nss */ libnotify xlibs.pixman yasm mesa - xlibs.libXScrnSaver xlibs.scrnsaverproto - xlibs.libXext xlibs.xextproto sqlite - ]; - - configureFlags = - [ "--enable-application=xulrunner" - "--disable-javaxpcom" - ] ++ commonConfigureFlags; - - enableParallelBuilding = true; - - # Hack to work around make's idea of -lbz2 dependency - preConfigure = - '' - find . -name Makefile.in -execdir sed -i '{}' -e '1ivpath %.so ${ - stdenv.lib.concatStringsSep ":" - (map (s : s + "/lib") (buildInputs ++ [stdenv.gcc.libc])) - }' ';' - cp -i security/coreconf/Linux{2.6,3.0}.mk - cp -i security/coreconf/Linux{2.6,3.1}.mk - cp -i security/coreconf/Linux{2.6,3.2}.mk - cp -i security/coreconf/Linux{2.6,3.3}.mk - - export NIX_LDFLAGS="$NIX_LDFLAGS -L$out/lib/xulrunner-${xulVersion}" - ''; - - # !!! Temporary hack. - preBuild = - '' - export NIX_ENFORCE_PURITY= - ''; - - installFlags = "SKIP_GRE_REGISTRATION=1"; - - postInstall = '' - # Fix some references to /bin paths in the Xulrunner shell script. - substituteInPlace $out/bin/xulrunner \ - --replace /bin/pwd "$(type -tP pwd)" \ - --replace /bin/ls "$(type -tP ls)" - - # Fix run-mozilla.sh search - libDir=$(cd $out/lib && ls -d xulrunner-[0-9]*) - echo libDir: $libDir - test -n "$libDir" - cd $out/bin - mv xulrunner ../lib/$libDir/ - - for i in $out/lib/$libDir/*; do - file $i; - if file $i | grep executable &>/dev/null; then - echo -e '#! /bin/sh\n"'"$i"'" "$@"' > "$out/bin/$(basename "$i")"; - chmod a+x "$out/bin/$(basename "$i")"; - fi; - done; - for i in $out/lib/$libDir/{xpcshell,plugin-container,*.so}; do - patchelf --set-rpath "$(patchelf --print-rpath "$i"):$out/lib/$libDir" $i || true - done; - rm -f $out/bin/run-mozilla.sh - ''; # */ - - meta = { - description = "Mozilla Firefox XUL runner"; - homepage = http://www.mozilla.com/en-US/firefox/; - }; - - passthru = { inherit gtk; version = xulVersion; }; - }; - - - firefox = stdenv.mkDerivation rec { - name = "firefox-${firefoxVersion}"; - - inherit src; - - enableParallelBuilding = true; - - buildInputs = - [ pkgconfig gtk perl zip libIDL libjpeg zlib cairo bzip2 python - dbus dbus_glib pango freetype fontconfig alsaLib nspr libnotify - xlibs.pixman yasm mesa sqlite file - ]; - - propagatedBuildInputs = [xulrunner]; - - configureFlags = - [ "--enable-application=browser" - "--with-libxul-sdk=${xulrunner}/lib/xulrunner-devel-${xulrunner.version}" - "--enable-chrome-format=jar" - "--disable-elf-hack" - ] - ++ commonConfigureFlags - ++ stdenv.lib.optional enableOfficialBranding "--enable-official-branding"; - - # Hack to work around make's idea of -lbz2 dependency - preConfigure = - '' - find . -name Makefile.in -execdir sed -i '{}' -e '1ivpath %.so ${ - stdenv.lib.concatStringsSep ":" - (map (s : s + "/lib") (buildInputs ++ [stdenv.gcc.libc])) - }' ';' - ''; - - postInstall = - '' - ln -s ${xulrunner}/lib/xulrunner-${xulrunner.version} $(echo $out/lib/firefox-*)/xulrunner - for j in $out/bin/*; do - i="$(readlink "$j")"; - file $i; - if file $i | grep executable &>/dev/null; then - rm "$out/bin/$(basename "$i")" - echo -e '#! /bin/sh\n"'"$i"'" "$@"' > "$out/bin/$(basename "$i")" - chmod a+x "$out/bin/$(basename "$i")" - fi; - done; - ''; # */ - - meta = { - description = "Mozilla Firefox - the browser, reloaded"; - homepage = http://www.mozilla.com/en-US/firefox/; - }; - - passthru = { - inherit gtk xulrunner nspr; - isFirefox3Like = true; - }; - }; -} diff --git a/pkgs/applications/networking/browsers/firefox/9.0.nix b/pkgs/applications/networking/browsers/firefox/9.0.nix index f14eb05899d..32d785e7692 100644 --- a/pkgs/applications/networking/browsers/firefox/9.0.nix +++ b/pkgs/applications/networking/browsers/firefox/9.0.nix @@ -15,14 +15,14 @@ assert stdenv.gcc ? libc && stdenv.gcc.libc != null; rec { - firefoxVersion = "9.0b1"; + firefoxVersion = "9.0"; xulVersion = "9.0"; # this attribute is used by other packages src = fetchurl { - url = "http://ftp.mozilla.org/pub/mozilla.org/firefox/nightly/${firefoxVersion}-candidates/build1/source/firefox-${firefoxVersion}.source.tar.bz2"; - sha256 = "0mvm0bjzghqywh54fnk5qhz7fjm5d8y952sf59ypq64bhs5dh009"; + url = "http://releases.mozilla.org/pub/mozilla.org/firefox/releases/${firefoxVersion}/source/firefox-${firefoxVersion}.source.tar.bz2"; + sha1 = "f79324ec6205e4c23d51d8ab2e790de1b2541657"; }; commonConfigureFlags = diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index f706fcde770..e80a33743a9 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -6676,20 +6676,6 @@ let firefox36Wrapper = wrapFirefox { browser = firefox36Pkgs.firefox; }; - firefox50Pkgs = callPackage ../applications/networking/browsers/firefox/5.0.nix { - inherit (gtkLibs) gtk pango; - inherit (gnome) libIDL; - }; - - firefox50Wrapper = wrapFirefox { browser = firefox50Pkgs.firefox; }; - - firefox70Pkgs = callPackage ../applications/networking/browsers/firefox/7.0.nix { - inherit (gtkLibs) gtk pango; - inherit (gnome) libIDL; - }; - - firefox70Wrapper = wrapFirefox { browser = firefox70Pkgs.firefox; }; - firefox80Pkgs = callPackage ../applications/networking/browsers/firefox/8.0.nix { inherit (gtkLibs) gtk pango; inherit (gnome) libIDL; @@ -6697,11 +6683,13 @@ let firefox80Wrapper = wrapFirefox { browser = firefox80Pkgs.firefox; }; - firefox90bPkgs = callPackage ../applications/networking/browsers/firefox/9.0.nix { + firefox90Pkgs = callPackage ../applications/networking/browsers/firefox/9.0.nix { inherit (gtkLibs) gtk pango; inherit (gnome) libIDL; }; + firefox90Wrapper = wrapFirefox { browser = firefox90Pkgs.firefox; }; + flac = callPackage ../applications/audio/flac { }; flashplayer = flashplayer11; diff --git a/pkgs/top-level/release.nix b/pkgs/top-level/release.nix index 7381c23de7e..e1976b5d732 100644 --- a/pkgs/top-level/release.nix +++ b/pkgs/top-level/release.nix @@ -382,9 +382,8 @@ with (import ./release-lib.nix); }; firefox36Pkgs.firefox = linux; - firefox50Pkgs.firefox = linux; - firefox70Pkgs.firefox = linux; firefox80Pkgs.firefox = linux; + firefox90Pkgs.firefox = linux; gnome = { gnome_panel = linux; From 64290dbd96a608637a2d5f56e36f9f835f014cb9 Mon Sep 17 00:00:00 2001 From: Michael Raskin <7c6f434c@mail.ru> Date: Tue, 20 Dec 2011 21:37:23 +0000 Subject: [PATCH 033/186] Try updating veracity svn path=/nixpkgs/trunk/; revision=30990 --- .../version-management/veracity/src-for-default.nix | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/applications/version-management/veracity/src-for-default.nix b/pkgs/applications/version-management/veracity/src-for-default.nix index 85bc00db713..b074c3ec507 100644 --- a/pkgs/applications/version-management/veracity/src-for-default.nix +++ b/pkgs/applications/version-management/veracity/src-for-default.nix @@ -1,9 +1,9 @@ rec { - version="1.1.0.10565"; - name="veracity-1.1.0.10565"; - hash="0sx12zzc60pdvzhf8ax2lisnw0rsrvnrk2500y1vfqhwxh2r04id"; - url="http://download.sourcegear.com/Veracity/release/1.1.0.10565/veracity-source-${version}.tar.gz"; - advertisedUrl="http://download.sourcegear.com/Veracity/release/1.1.0.10565/veracity-source-1.1.0.10565.tar.gz"; + version="1.5.0.10647"; + name="veracity-1.5.0.10647"; + hash="1b10npyxxg9592wigfpv66h17bzbsg2hqcfm7imyn941a34qrkd3"; + url="http://download.sourcegear.com/Veracity/nightly/1.5.0.10647/veracity-source-${version}.tar.gz"; + advertisedUrl="http://download.sourcegear.com/Veracity/nightly/1.5.0.10647/veracity-source-1.5.0.10647.tar.gz"; } From 32a88887c6fe2c1aaaee428a781b64e31324eed8 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Tue, 20 Dec 2011 22:47:57 +0000 Subject: [PATCH 034/186] * upower updated to 0.9.15. svn path=/nixpkgs/trunk/; revision=30992 --- pkgs/os-specific/linux/upower/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/upower/default.nix b/pkgs/os-specific/linux/upower/default.nix index 963a4f48d7a..73f1dc75d5f 100644 --- a/pkgs/os-specific/linux/upower/default.nix +++ b/pkgs/os-specific/linux/upower/default.nix @@ -4,11 +4,11 @@ assert stdenv.isLinux; stdenv.mkDerivation rec { - name = "upower-0.9.13"; + name = "upower-0.9.15"; src = fetchurl { url = "http://upower.freedesktop.org/releases/${name}.tar.xz"; - sha256 = "08jasjkp44ydvsnk020xghrshi0jspp5078id26n5nhidp1d4z9c"; + sha256 = "1313lr404hb29fzkf9frn1z0xxvibi451xmk05sf9kidyf01956m"; }; buildInputs = [ dbus_glib polkit intltool libxslt docbook_xsl udev libusb1 ]; From a9a3aed0c29f1592d933c9501bb7f2b89272a7fd Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Tue, 20 Dec 2011 23:04:07 +0000 Subject: [PATCH 035/186] * udisks updated to 1.0.4. svn path=/nixpkgs/trunk/; revision=30993 --- pkgs/os-specific/linux/udisks/default.nix | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/pkgs/os-specific/linux/udisks/default.nix b/pkgs/os-specific/linux/udisks/default.nix index 17482f69899..191f34489a7 100644 --- a/pkgs/os-specific/linux/udisks/default.nix +++ b/pkgs/os-specific/linux/udisks/default.nix @@ -3,11 +3,11 @@ , libxslt, docbook_xsl, utillinux, automake, autoconf }: stdenv.mkDerivation rec { - name = "udisks-1.0.3"; + name = "udisks-1.0.4"; src = fetchurl { url = "http://hal.freedesktop.org/releases/${name}.tar.gz"; - sha256 = "0jwavs2ag0cv46517j17943s16a8fw2lqk4k3cljgivh5aswwnyr"; + sha256 = "1xgqifddwaavmjc8c30i0mdffyirsld7c6qhfyjw7f9khwv8jjw5"; }; # Move 80-udisks.rules manually to make the patch smaller @@ -18,7 +18,6 @@ stdenv.mkDerivation rec { patches = [ ./purity.patch ]; - buildInputs = [ sg3_utils udev glib dbus dbus_glib polkit parted lvm2 libatasmart intltool libuuid libxslt docbook_xsl @@ -26,7 +25,7 @@ stdenv.mkDerivation rec { buildNativeInputs = [ automake autoconf pkgconfig ]; - configureFlags = "--localstatedir=/var"; + configureFlags = "--localstatedir=/var --enable-lvm2"; preConfigure = '' From c3a52c32a4de442a4ab63434e107d12bf492771d Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Tue, 20 Dec 2011 23:10:06 +0000 Subject: [PATCH 036/186] * Fix the upower build in the case where /var/lib/upower doesn't exist already (http://hydra.nixos.org/build/1646705). svn path=/nixpkgs/trunk/; revision=30994 --- pkgs/os-specific/linux/upower/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/os-specific/linux/upower/default.nix b/pkgs/os-specific/linux/upower/default.nix index 73f1dc75d5f..32698ac4efb 100644 --- a/pkgs/os-specific/linux/upower/default.nix +++ b/pkgs/os-specific/linux/upower/default.nix @@ -24,7 +24,7 @@ stdenv.mkDerivation rec { --replace /usr/sbin/pm- ${pmutils}/sbin/pm- ''; - installFlags = "localstatedir=$(TMPDIR)/var"; + installFlags = "historydir=$(TMPDIR)/foo"; meta = { homepage = http://upower.freedesktop.org/; From 331519b7e6a1dbed021cfb8a318ca8ce4cf705e2 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Wed, 21 Dec 2011 09:28:17 +0000 Subject: [PATCH 037/186] all-packages.nix: append "with-cxx" to the name of gmpxx to ensure that "nix-env -i gmp" prefers this expression svn path=/nixpkgs/trunk/; revision=30995 --- 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 e80a33743a9..58817326f45 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -3539,7 +3539,7 @@ let cxx = false; }; - gmpxx = gmp.override { cxx = true; }; + gmpxx = appendToName "with-cxx" (gmp.override { cxx = true; }); gobjectIntrospection = callPackage ../development/libraries/gobject-introspection { }; From 5f0536dc27d3cbb86306321be950623906965d4c Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Wed, 21 Dec 2011 10:28:09 +0000 Subject: [PATCH 038/186] * lm-sensors updated to 3.3.1. Also fixed the name to match upstream. svn path=/nixpkgs/trunk/; revision=30996 --- pkgs/os-specific/linux/lm_sensors/default.nix | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/pkgs/os-specific/linux/lm_sensors/default.nix b/pkgs/os-specific/linux/lm_sensors/default.nix index f3957f41ead..4cfbdd6e691 100644 --- a/pkgs/os-specific/linux/lm_sensors/default.nix +++ b/pkgs/os-specific/linux/lm_sensors/default.nix @@ -1,14 +1,16 @@ -{stdenv, fetchurl, bison, flex, perl}: +{ stdenv, fetchurl, bison, flex, which, perl }: + +let version = "3.3.1"; in stdenv.mkDerivation rec { - name = "lm_sensors-3.1.1"; + name = "lm-sensors-3.3.1"; src = fetchurl { - url = "http://dl.lm-sensors.org/lm-sensors/releases/${name}.tar.bz2"; - sha256 = "1vsrs2cl35h2gry03lp0pwbzpw0nbpsbpds5w4mdmx16clm3ynnr"; + url = "http://dl.lm-sensors.org/lm-sensors/releases/lm_sensors-${version}.tar.bz2"; + sha256 = "13v2gszagmx8hwjyzh2k47rdpc2kyg9zky3kdqhdbgzp8lwpik6g"; }; - buildInputs = [bison flex perl]; + buildInputs = [ bison flex which perl ]; preBuild = '' makeFlagsArray=(PREFIX=$out ETCDIR=$out/etc) From 9eecf0e07612e64ea6bbb443ebd44bbc62b82f0c Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Wed, 21 Dec 2011 10:28:51 +0000 Subject: [PATCH 039/186] * lm_sensors -> lm-sensors. svn path=/nixpkgs/trunk/; revision=30997 --- pkgs/os-specific/linux/{lm_sensors => lm-sensors}/default.nix | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename pkgs/os-specific/linux/{lm_sensors => lm-sensors}/default.nix (100%) diff --git a/pkgs/os-specific/linux/lm_sensors/default.nix b/pkgs/os-specific/linux/lm-sensors/default.nix similarity index 100% rename from pkgs/os-specific/linux/lm_sensors/default.nix rename to pkgs/os-specific/linux/lm-sensors/default.nix From ed2a67d6d6e6097207f6269f0ec67355ec5c97fc Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Wed, 21 Dec 2011 10:29:19 +0000 Subject: [PATCH 040/186] * Doh. svn path=/nixpkgs/trunk/; revision=30998 --- 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 58817326f45..3d09cc607ac 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -5859,7 +5859,7 @@ let libsmbios = callPackage ../os-specific/linux/libsmbios { }; - lm_sensors = callPackage ../os-specific/linux/lm_sensors { }; + lm_sensors = callPackage ../os-specific/linux/lm-sensors { }; lsiutil = callPackage ../os-specific/linux/lsiutil { }; From 3f4358a02a0656f82e8cec62967f08958d8bbb73 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Wed, 21 Dec 2011 10:48:57 +0000 Subject: [PATCH 041/186] haskell-multirec: dropped obsolete version 0.5.1 svn path=/nixpkgs/trunk/; revision=30999 --- .../libraries/haskell/multirec/0.5.1.nix | 18 ------------------ .../haskell/multirec/{0.7.nix => default.nix} | 0 pkgs/top-level/haskell-packages.nix | 8 ++------ 3 files changed, 2 insertions(+), 24 deletions(-) delete mode 100644 pkgs/development/libraries/haskell/multirec/0.5.1.nix rename pkgs/development/libraries/haskell/multirec/{0.7.nix => default.nix} (100%) diff --git a/pkgs/development/libraries/haskell/multirec/0.5.1.nix b/pkgs/development/libraries/haskell/multirec/0.5.1.nix deleted file mode 100644 index 3e994f878cc..00000000000 --- a/pkgs/development/libraries/haskell/multirec/0.5.1.nix +++ /dev/null @@ -1,18 +0,0 @@ -{ cabal }: - -cabal.mkDerivation (self: { - pname = "multirec"; - version = "0.5.1"; - sha256 = "0y62gb2ml0799a3f1ny5ydjc4rjwj1dgs48f5fj6hf2fpl4hk02l"; - noHaddock = true; - meta = { - homepage = "http://www.cs.uu.nl/wiki/GenericProgramming/Multirec"; - description = "Generic programming for families of recursive datatypes"; - license = self.stdenv.lib.licenses.bsd3; - platforms = self.ghc.meta.platforms; - maintainers = [ - self.stdenv.lib.maintainers.andres - self.stdenv.lib.maintainers.simons - ]; - }; -}) diff --git a/pkgs/development/libraries/haskell/multirec/0.7.nix b/pkgs/development/libraries/haskell/multirec/default.nix similarity index 100% rename from pkgs/development/libraries/haskell/multirec/0.7.nix rename to pkgs/development/libraries/haskell/multirec/default.nix diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix index df176735967..82c713868b0 100644 --- a/pkgs/top-level/haskell-packages.nix +++ b/pkgs/top-level/haskell-packages.nix @@ -949,9 +949,7 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y); multiplate = callPackage ../development/libraries/haskell/multiplate {}; - multirec_0_5_1 = callPackage ../development/libraries/haskell/multirec/0.5.1.nix {}; - multirec_0_7 = callPackage ../development/libraries/haskell/multirec/0.7.nix {}; - multirec = self.multirec_0_7; + multirec = callPackage ../development/libraries/haskell/multirec {}; multiset = callPackage ../development/libraries/haskell/multiset {}; @@ -1415,9 +1413,7 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y); zipArchive = callPackage ../development/libraries/haskell/zip-archive {}; - zipper = callPackage ../development/libraries/haskell/zipper { - multirec = self.multirec_0_5_1; - }; + zipper = callPackage ../development/libraries/haskell/zipper {}; zlib_0_5_0_0 = callPackage ../development/libraries/haskell/zlib/0.5.0.0.nix { inherit (pkgs) zlib; From d70b6515f6b36aad8b19491ddb55d3c8bb6b11f7 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Wed, 21 Dec 2011 10:49:02 +0000 Subject: [PATCH 042/186] haskell-asn1-data: updated to version 0.6.1.2 svn path=/nixpkgs/trunk/; revision=31000 --- pkgs/development/libraries/haskell/asn1-data/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/asn1-data/default.nix b/pkgs/development/libraries/haskell/asn1-data/default.nix index 7ba67e5ce79..73601f462e9 100644 --- a/pkgs/development/libraries/haskell/asn1-data/default.nix +++ b/pkgs/development/libraries/haskell/asn1-data/default.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "asn1-data"; - version = "0.6.1.1"; - sha256 = "13l7gcrgngr2bdr7hxh1wbsh21q7nc5bdknz0gpzjf65297g44an"; + version = "0.6.1.2"; + sha256 = "1655fp71l8qjif4p6c1y2xk8r0gj58djg7np5zwwm6jlj780773r"; isLibrary = true; isExecutable = true; buildDepends = [ From 9d4254bf8b616c78a2cc03b2ad32ca6e0cbc250c Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Wed, 21 Dec 2011 10:49:05 +0000 Subject: [PATCH 043/186] haskell-authenticate: updated to version 0.10.4 svn path=/nixpkgs/trunk/; revision=31001 --- pkgs/development/libraries/haskell/authenticate/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/libraries/haskell/authenticate/default.nix b/pkgs/development/libraries/haskell/authenticate/default.nix index 3a55192b76a..0c41a350103 100644 --- a/pkgs/development/libraries/haskell/authenticate/default.nix +++ b/pkgs/development/libraries/haskell/authenticate/default.nix @@ -6,8 +6,8 @@ cabal.mkDerivation (self: { pname = "authenticate"; - version = "0.10.3.1"; - sha256 = "01xqqnvy2xjcgnp5qq5xiqm1whxywa31cgd79mm290i2r4baiq8s"; + version = "0.10.4"; + sha256 = "0bjxlnc2qf1900ch9cnab26qz6a0vdz5nz1dwrjby1n5xqqzjd7x"; buildDepends = [ aeson attoparsec base64Bytestring blazeBuilder caseInsensitive enumerator failure httpEnumerator httpTypes network random RSA SHA @@ -15,7 +15,7 @@ cabal.mkDerivation (self: { xmlEnumerator ]; meta = { - homepage = "http://github.com/snoyberg/authenticate/tree/master"; + homepage = "http://github.com/yesodweb/authenticate"; description = "Authentication methods for Haskell web applications"; license = self.stdenv.lib.licenses.bsd3; platforms = self.ghc.meta.platforms; From eda37d4b2b626deee977134aadce15bf5d2be6c6 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Wed, 21 Dec 2011 10:49:09 +0000 Subject: [PATCH 044/186] haskell-base16-bytestring: updated to version 0.1.1.4 svn path=/nixpkgs/trunk/; revision=31002 --- .../libraries/haskell/base16-bytestring/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/base16-bytestring/default.nix b/pkgs/development/libraries/haskell/base16-bytestring/default.nix index b95052d02d9..b09024851de 100644 --- a/pkgs/development/libraries/haskell/base16-bytestring/default.nix +++ b/pkgs/development/libraries/haskell/base16-bytestring/default.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "base16-bytestring"; - version = "0.1.1.3"; - sha256 = "0v08fnkykvd6y6in6f9a808vk2gfd9pf0wd7rr28z6wwxm5d2x6l"; + version = "0.1.1.4"; + sha256 = "061rxlw5kjwj0s08kml46qpw602xwwp05285gpad8c7baw5mzxlr"; meta = { homepage = "http://github.com/bos/base16-bytestring"; description = "Fast base16 (hex) encoding and decoding for ByteStrings"; From 17155492077145fa96077c7b1ecf1606797f6c02 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Wed, 21 Dec 2011 10:49:13 +0000 Subject: [PATCH 045/186] haskell-blaze-html: updated to version 0.4.3.0 svn path=/nixpkgs/trunk/; revision=31003 --- pkgs/development/libraries/haskell/blaze-html/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/blaze-html/default.nix b/pkgs/development/libraries/haskell/blaze-html/default.nix index 2e8a5868d12..dbeb4721f33 100644 --- a/pkgs/development/libraries/haskell/blaze-html/default.nix +++ b/pkgs/development/libraries/haskell/blaze-html/default.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "blaze-html"; - version = "0.4.2.2"; - sha256 = "1fg0qgqml7ar3m0as9sk9zc260j2jvdsf5cdfrsify5l62ip060f"; + version = "0.4.3.0"; + sha256 = "1018mfsc1cqbyxlil136171n9qi9sypchlmmfqawf3aa1sjskmfg"; buildDepends = [ blazeBuilder text ]; meta = { homepage = "http://jaspervdj.be/blaze"; From e368ea1e8562e095acc7fc7996a77a0bbef3c51a Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Wed, 21 Dec 2011 10:49:17 +0000 Subject: [PATCH 046/186] haskell-blaze-textual: updated to version 0.2.0.6 svn path=/nixpkgs/trunk/; revision=31004 --- pkgs/development/libraries/haskell/blaze-textual/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/blaze-textual/default.nix b/pkgs/development/libraries/haskell/blaze-textual/default.nix index b5924d7c73b..67d87905143 100644 --- a/pkgs/development/libraries/haskell/blaze-textual/default.nix +++ b/pkgs/development/libraries/haskell/blaze-textual/default.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "blaze-textual"; - version = "0.2.0.5"; - sha256 = "0rl41idjmrw227yi2x6nk2rlm93rgzz2y7jvz2yvmya2ihrppzjf"; + version = "0.2.0.6"; + sha256 = "1699fj9zig6ids9bdjn5v0gqhnyx5dkzi542gkx1gs8943c94737"; buildDepends = [ blazeBuilder text time vector ]; meta = { homepage = "http://github.com/bos/blaze-textual"; From fa0e948cbafee56304b15de46c3d66a52fcf51de Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Wed, 21 Dec 2011 10:49:21 +0000 Subject: [PATCH 047/186] haskell-bmp: updated to version 1.2.0.2 svn path=/nixpkgs/trunk/; revision=31005 --- pkgs/development/libraries/haskell/bmp/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/bmp/default.nix b/pkgs/development/libraries/haskell/bmp/default.nix index 2c08676d9c4..19f69ede610 100644 --- a/pkgs/development/libraries/haskell/bmp/default.nix +++ b/pkgs/development/libraries/haskell/bmp/default.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "bmp"; - version = "1.1.2.1"; - sha256 = "01w0fbfzdmrfnmnkjkg9paagfkzsjn57rx7lf2npzp95rmljplkb"; + version = "1.2.0.2"; + sha256 = "0y1fjbhk73dj260wd1jhcf12fkh4maba4iwkzdg2087s9saxvljk"; buildDepends = [ binary ]; meta = { homepage = "http://code.ouroborus.net/bmp"; From 48c73ad7533e216a90f914b8a5222d21b69764ab Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Wed, 21 Dec 2011 10:49:25 +0000 Subject: [PATCH 048/186] haskell-double-conversion: updated to version 0.2.0.4 svn path=/nixpkgs/trunk/; revision=31006 --- .../libraries/haskell/double-conversion/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/double-conversion/default.nix b/pkgs/development/libraries/haskell/double-conversion/default.nix index ee84665ad63..7c810a29565 100644 --- a/pkgs/development/libraries/haskell/double-conversion/default.nix +++ b/pkgs/development/libraries/haskell/double-conversion/default.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "double-conversion"; - version = "0.2.0.3"; - sha256 = "17ny1gvd622rnqjvlrmcpgw3wlabrsc6d046d4ii6xv299z97qw9"; + version = "0.2.0.4"; + sha256 = "00rb8n2ky20ah9ry398jagi9gb0gz40yjfalh35cpckmg30z199x"; buildDepends = [ text ]; meta = { homepage = "https://github.com/bos/double-conversion"; From b3b9660af0cc34874699db33c6952a9d6719ab48 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Wed, 21 Dec 2011 10:49:28 +0000 Subject: [PATCH 049/186] haskell-monad-par: updated to version 0.1.0.3 svn path=/nixpkgs/trunk/; revision=31007 --- pkgs/development/libraries/haskell/monad-par/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/monad-par/default.nix b/pkgs/development/libraries/haskell/monad-par/default.nix index 8b6850ea08d..e8a2e298c98 100644 --- a/pkgs/development/libraries/haskell/monad-par/default.nix +++ b/pkgs/development/libraries/haskell/monad-par/default.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "monad-par"; - version = "0.1.0.2"; - sha256 = "0ca5fbc92bmghg8pk40rwcf58jk3y7xcr0nwfhyhi67riqnwqrl8"; + version = "0.1.0.3"; + sha256 = "1c0yclil152hv06c2sbgam9amd63nnzh7a4xsnxb05wgy93qs2mg"; buildDepends = [ deepseq HUnit ]; meta = { homepage = "https://github.com/simonmar/monad-par"; From 71d11df0da88b20cc960b90eaf909a0036d7a74e Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Wed, 21 Dec 2011 10:49:31 +0000 Subject: [PATCH 050/186] haskell-tls-extra: updated to version 0.4.2 svn path=/nixpkgs/trunk/; revision=31008 --- pkgs/development/libraries/haskell/tls-extra/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/tls-extra/default.nix b/pkgs/development/libraries/haskell/tls-extra/default.nix index 52cdfc5ffe4..d9d5c8c11d6 100644 --- a/pkgs/development/libraries/haskell/tls-extra/default.nix +++ b/pkgs/development/libraries/haskell/tls-extra/default.nix @@ -4,8 +4,8 @@ cabal.mkDerivation (self: { pname = "tls-extra"; - version = "0.4.1"; - sha256 = "0yimnq5p89jfbnk5cpa9w30zvfqs9dxxjxy2a86l8jvba5xb8068"; + version = "0.4.2"; + sha256 = "14zi5xzdyzdzw9qv6775li635x8i9rkp2z655ygzcwz5v3spjz9z"; isLibrary = true; isExecutable = true; buildDepends = [ From 8a1883e481c78c8e173bf35bf7f7c53573cacc2a Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Wed, 21 Dec 2011 10:49:34 +0000 Subject: [PATCH 051/186] haskell-tls: updated to version 0.8.4 svn path=/nixpkgs/trunk/; revision=31009 --- pkgs/development/libraries/haskell/tls/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/tls/default.nix b/pkgs/development/libraries/haskell/tls/default.nix index ef0f1bb4dd0..c5e56ec6b80 100644 --- a/pkgs/development/libraries/haskell/tls/default.nix +++ b/pkgs/development/libraries/haskell/tls/default.nix @@ -4,8 +4,8 @@ cabal.mkDerivation (self: { pname = "tls"; - version = "0.8.3.2"; - sha256 = "1g30viz94qhwv3v16d9njrwyqmv0p1hs0r11xmzx0adp806w54z9"; + version = "0.8.4"; + sha256 = "1xd6cax4ldvahjjs5kdhcjmy4rx1ywp6r3alaifxbk2397zi7p1v"; isLibrary = true; isExecutable = true; buildDepends = [ From 6e3d06e0f5425ff51e6b8d0d6bcf2ee0e41295b5 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Wed, 21 Dec 2011 10:49:37 +0000 Subject: [PATCH 052/186] haskell-unordered-containers: updated to version 0.1.4.5 svn path=/nixpkgs/trunk/; revision=31010 --- .../libraries/haskell/unordered-containers/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/unordered-containers/default.nix b/pkgs/development/libraries/haskell/unordered-containers/default.nix index df50bacd522..5ec2d9ea558 100644 --- a/pkgs/development/libraries/haskell/unordered-containers/default.nix +++ b/pkgs/development/libraries/haskell/unordered-containers/default.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "unordered-containers"; - version = "0.1.4.4"; - sha256 = "1fvicb2a8fnfg7579x6v4fpyz3dhjij8vmny4fa8x5g8ih608kb8"; + version = "0.1.4.5"; + sha256 = "065701zdbxpn70zl142jxmv30m0162mg3z95rvpfa593ggq688m4"; buildDepends = [ deepseq hashable ]; meta = { description = "Efficient hashing-based container types"; From 0074dfb9be01a3f9d9c02d69f7d511f1b337a959 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Wed, 21 Dec 2011 10:49:40 +0000 Subject: [PATCH 053/186] haskell-yesod-auth: updated to version 0.7.8 svn path=/nixpkgs/trunk/; revision=31011 --- pkgs/development/libraries/haskell/yesod-auth/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/yesod-auth/default.nix b/pkgs/development/libraries/haskell/yesod-auth/default.nix index 19ba48b58cc..ce9c3c29808 100644 --- a/pkgs/development/libraries/haskell/yesod-auth/default.nix +++ b/pkgs/development/libraries/haskell/yesod-auth/default.nix @@ -7,8 +7,8 @@ cabal.mkDerivation (self: { pname = "yesod-auth"; - version = "0.7.7.2"; - sha256 = "1zqxg13hpd45i2nyhh1bvaly1cwaygmjpz46cm7knp553bdhy8c8"; + version = "0.7.8"; + sha256 = "1v3mvb22g56frvwb82l73k7cqrl926hg133x5idl5q66fp8h94q0"; buildDepends = [ aeson authenticate blazeHtml controlMonadAttempt hamlet httpEnumerator mimeMail persistent persistentTemplate pureMD5 From b2bdf7aa9f193b0a9e9dba5d4d86b9586a234832 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Wed, 21 Dec 2011 10:49:44 +0000 Subject: [PATCH 054/186] haskell-zipper: updated to version 0.4 svn path=/nixpkgs/trunk/; revision=31012 --- pkgs/development/libraries/haskell/zipper/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/zipper/default.nix b/pkgs/development/libraries/haskell/zipper/default.nix index 4cfca3bf1a3..2ade79bffa1 100644 --- a/pkgs/development/libraries/haskell/zipper/default.nix +++ b/pkgs/development/libraries/haskell/zipper/default.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "zipper"; - version = "0.3.1"; - sha256 = "170qjc3mbk6i96z5js745ix57i0xkgpa5h9xjiiirq9x6bfbbqyp"; + version = "0.4"; + sha256 = "0s3gw883kwxgmz9sk3638ba8i1zb5dirv2hanc3caf6pfay6caks"; buildDepends = [ multirec ]; meta = { homepage = "http://www.cs.uu.nl/wiki/GenericProgramming/Multirec"; From e1a96b2b88fae1d9f9eadcfb11950701be1fb430 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Wed, 21 Dec 2011 16:24:40 +0000 Subject: [PATCH 055/186] * Add cpufrequtils to the channel. svn path=/nixpkgs/trunk/; revision=31017 --- pkgs/os-specific/linux/cpufrequtils/default.nix | 9 +++++++-- pkgs/top-level/all-packages.nix | 7 +------ 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/pkgs/os-specific/linux/cpufrequtils/default.nix b/pkgs/os-specific/linux/cpufrequtils/default.nix index 74db3a0d890..35bf57c269e 100644 --- a/pkgs/os-specific/linux/cpufrequtils/default.nix +++ b/pkgs/os-specific/linux/cpufrequtils/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchurl, linuxHeaders, glibc, libtool, gettext}: +{ stdenv, fetchurl, libtool, gettext }: assert stdenv.isLinux && stdenv.system != "powerpc-linux"; @@ -16,5 +16,10 @@ stdenv.mkDerivation { -i Makefile ''; - buildInputs = [ linuxHeaders glibc libtool gettext ]; + buildInputs = [ stdenv.gcc.libc.kernelHeaders libtool gettext ]; + + meta = { + description = "Tools to display or change the CPU governor settings"; + platforms = stdenv.lib.platforms.linux; + }; } diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 3d09cc607ac..49b5c8fffaa 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -5171,12 +5171,7 @@ let conky = callPackage ../os-specific/linux/conky { }; - cpufrequtils = ( - import ../os-specific/linux/cpufrequtils { - inherit fetchurl stdenv libtool gettext; - glibc = stdenv.gcc.libc; - linuxHeaders = stdenv.gcc.libc.kernelHeaders; - }); + cpufrequtils = callPackage ../os-specific/linux/cpufrequtils { }; cryopid = callPackage ../os-specific/linux/cryopid { }; From f821677f67d00c2e8a3b1c9347185f20fe043e94 Mon Sep 17 00:00:00 2001 From: Shea Levy Date: Wed, 21 Dec 2011 18:18:15 +0000 Subject: [PATCH 056/186] beret: Store game status in home directory svn path=/nixpkgs/trunk/; revision=31021 --- pkgs/games/beret/default.nix | 4 ++- pkgs/games/beret/use-home-dir.patch | 48 +++++++++++++++++++++++++++++ 2 files changed, 51 insertions(+), 1 deletion(-) create mode 100644 pkgs/games/beret/use-home-dir.patch diff --git a/pkgs/games/beret/default.nix b/pkgs/games/beret/default.nix index dd6fc9be71e..e41e88fc1b0 100644 --- a/pkgs/games/beret/default.nix +++ b/pkgs/games/beret/default.nix @@ -9,7 +9,9 @@ stdenv.mkDerivation { NIX_CFLAGS_LINK = "-lgcc_s"; - patchPhase = '' + patches = [ ./use-home-dir.patch ]; + + postPatch = '' sed -i 's@RESOURCE_PATH ""@RESOURCE_PATH "'$out'/share/"@' game.c ''; diff --git a/pkgs/games/beret/use-home-dir.patch b/pkgs/games/beret/use-home-dir.patch new file mode 100644 index 00000000000..c8597a0303b --- /dev/null +++ b/pkgs/games/beret/use-home-dir.patch @@ -0,0 +1,48 @@ +diff -Naur beret-beret-orig/game.c beret-beret/game.c +--- beret-beret-orig/game.c 2011-12-17 18:51:32.000000000 -0500 ++++ beret-beret/game.c 2011-12-21 13:16:37.047511020 -0500 +@@ -10,12 +10,10 @@ + #include + #include + #include +-#ifdef __APPLE__ + #include + #include + #include + #include +-#endif + + #define CAMSCROLL 15 + #define SCR_WIDTH 780 +@@ -88,12 +86,8 @@ + #define DIRSEP "/" + #endif + +-#ifdef __APPLE__ +-#define SUPPORT_PATH "Library/Application Support/Beret/" +-#define RESOURCE_PATH "Beret.app/Contents/Resources/" +-#else ++#define SUPPORT_PATH ".beret" + #define RESOURCE_PATH "" +-#endif + + #define QUITMOD_WIN KMOD_ALT + #define QUITKEY_WIN SDLK_F4 +@@ -812,7 +806,6 @@ + + int init() { + +- #ifdef __APPLE__ + char filestr[512]; + // Get the home directory of the user. + struct passwd *pwd = getpwuid(getuid()); +@@ -827,9 +820,6 @@ + sprintf(filestr, "%s/saves", support_path); + mkdir(filestr, S_IRWXU); + } +- #else +- sprintf(support_path, ""); +- #endif + + if (SDL_Init(SDL_INIT_EVERYTHING) == -1) { + printf("Error: couldn't initialize SDL\n"); From 83452ba0ab3b763bd9dceb3d2bba0d5e2159db7a Mon Sep 17 00:00:00 2001 From: Russell O'Connor Date: Wed, 21 Dec 2011 21:51:35 +0000 Subject: [PATCH 057/186] adding two versions of metaocaml svn path=/nixpkgs/trunk/; revision=31026 --- .../compilers/ocaml/ber-metaocaml-003.nix | 63 +++++++++++++++++++ .../compilers/ocaml/metaocaml-3.09.nix | 32 ++++++++++ pkgs/top-level/all-packages.nix | 4 ++ 3 files changed, 99 insertions(+) create mode 100644 pkgs/development/compilers/ocaml/ber-metaocaml-003.nix create mode 100644 pkgs/development/compilers/ocaml/metaocaml-3.09.nix diff --git a/pkgs/development/compilers/ocaml/ber-metaocaml-003.nix b/pkgs/development/compilers/ocaml/ber-metaocaml-003.nix new file mode 100644 index 00000000000..5b3052b544a --- /dev/null +++ b/pkgs/development/compilers/ocaml/ber-metaocaml-003.nix @@ -0,0 +1,63 @@ +{ stdenv, fetchurl, ncurses, x11 }: + +let + useX11 = stdenv.isi686 || stdenv.isx86_64; + useNativeCompilers = stdenv.isi686 || stdenv.isx86_64 || stdenv.isMips; + inherit (stdenv.lib) optionals optionalString; +in + +stdenv.mkDerivation rec { + + name = "ber-metaocaml-003"; + + src = fetchurl { + url = "http://caml.inria.fr/pub/distrib/ocaml-3.11/ocaml-3.11.2.tar.bz2"; + sha256 = "0hw1yp1mmfyn1pmda232d0ry69m7ln1z0fn5lgi8nz3y1mx3iww6"; + }; + + metaocaml = fetchurl { + url = "http://okmij.org/ftp/ML/ber-metaocaml.tar.gz"; + sha256 = "1kq1if25c1wvcdiy4g46xk05dkc1am2gc4qvmg4x19wvvaz09gzf"; + }; + + # Needed to avoid a SIGBUS on the final executable on mips + NIX_CFLAGS_COMPILE = if stdenv.isMips then "-fPIC" else ""; + + patches = optionals stdenv.isDarwin [ ./gnused-on-osx-fix.patch ]; + + prefixKey = "-prefix "; + configureFlags = ["-no-tk"] ++ optionals useX11 [ "-x11lib" x11 ]; + buildFlags = "core coreboot all"; # "world" + optionalString useNativeCompilers " bootstrap world.opt"; + buildInputs = [ncurses] ++ optionals useX11 [ x11 ]; + installFlags = "-i"; + installTargets = "install"; # + optionalString useNativeCompilers " installopt"; + prePatch = '' + CAT=$(type -tp cat) + sed -e "s@/bin/cat@$CAT@" -i config/auto-aux/sharpbang + patch -p0 < ${./mips64.patch} + ''; + postConfigure = '' + tar -xvzf $metaocaml + cd ${name} + make patch + cd .. + ''; + postBuild = '' + ensureDir $out/include + ln -sv $out/lib/ocaml/caml $out/include/caml + ''; + postInstall = '' + cd ${name} + make all + make install + make test + make test-compile + cd .. + ''; + + meta = { + homepage = "http://okmij.org/ftp/ML/index.html#ber-metaocaml"; + licenses = [ "QPL" /* compiler */ "LGPLv2" /* library */ ]; + description = "a conservative extension of OCaml with the primitive type of code values, and three basic multi-stage expression forms: Brackets, Escape, and Run"; + }; +} diff --git a/pkgs/development/compilers/ocaml/metaocaml-3.09.nix b/pkgs/development/compilers/ocaml/metaocaml-3.09.nix new file mode 100644 index 00000000000..b115a8fedcf --- /dev/null +++ b/pkgs/development/compilers/ocaml/metaocaml-3.09.nix @@ -0,0 +1,32 @@ +{ stdenv, fetchurl, x11, ncurses }: + +stdenv.mkDerivation (rec { + + name = "metaocaml-3.09-alpha-30"; + + src = fetchurl { + url = "http://www.metaocaml.org/dist/old/MetaOCaml_309_alpha_030.tar.gz"; + sha256 = "0migbn0zwfb7yb24dy7qfqi19sv3drqcv4369xi7xzpds2cs35fd"; + }; + + prefixKey = "-prefix "; + configureFlags = ["-no-tk" "-x11lib" x11]; + buildFlags = "world bootstrap world.opt"; + buildInputs = [x11 ncurses]; + installTargets = "install installopt"; + patchPhase = '' + CAT=$(type -tp cat) + sed -e "s@/bin/cat@$CAT@" -i config/auto-aux/sharpbang + ''; + postBuild = '' + ensureDir $out/include + ln -sv $out/lib/ocaml/caml $out/include/caml + ''; + + meta = { + homepage = http://www.metaocaml.org/; + license = "QPL, LGPL2 (library part)"; + desctiption = "A compiled, type-safe, multi-stage programming language"; + }; + +}) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 49b5c8fffaa..f159e310049 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -2335,6 +2335,10 @@ let ocaml_3_12_1 = lowPrio (callPackage ../development/compilers/ocaml/3.12.1.nix { }); + metaocaml_3_09 = callPackage ../development/compilers/ocaml/metaocaml-3.09.nix { }; + + ber_metaocaml_003 = callPackage ../development/compilers/ocaml/ber-metaocaml-003.nix { }; + mkOcamlPackages = ocaml: self: let callPackage = newScope self; in rec { inherit ocaml; From e91a225a37f8b4e784ccddeebdd46db38379450d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?= Date: Wed, 21 Dec 2011 22:48:33 +0000 Subject: [PATCH 058/186] Updating gnuplot svn path=/nixpkgs/trunk/; revision=31027 --- pkgs/tools/graphics/gnuplot/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/graphics/gnuplot/default.nix b/pkgs/tools/graphics/gnuplot/default.nix index f1388135bcb..ce564e8de4f 100644 --- a/pkgs/tools/graphics/gnuplot/default.nix +++ b/pkgs/tools/graphics/gnuplot/default.nix @@ -14,11 +14,11 @@ }: stdenv.mkDerivation rec { - name = "gnuplot-4.4.2"; + name = "gnuplot-4.4.4"; src = fetchurl { url = "mirror://sourceforge/gnuplot/${name}.tar.gz"; - sha256 = "1r799l6ww9w21qnklqfn335jkfc6y0ilhv3sv4x4mf4ghgacis1p"; + sha256 = "1zfv3npsxfn743wl65ibh11djxrc8fxzi2mgg75ppy6m12fmja6j"; }; configureFlags = if libX11 != null then ["--with-x"] else ["--without-x"]; From 53f44020590f65f6ff0215e6d9d820df624f88a9 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Thu, 22 Dec 2011 12:18:38 +0000 Subject: [PATCH 059/186] haskell-text: updated use of version 0.11.1.9 to 0.11.1.10 svn path=/nixpkgs/trunk/; revision=31029 --- .../haskell/text/{0.11.1.9.nix => 0.11.1.10.nix} | 4 ++-- pkgs/top-level/haskell-packages.nix | 10 +++++----- 2 files changed, 7 insertions(+), 7 deletions(-) rename pkgs/development/libraries/haskell/text/{0.11.1.9.nix => 0.11.1.10.nix} (82%) diff --git a/pkgs/development/libraries/haskell/text/0.11.1.9.nix b/pkgs/development/libraries/haskell/text/0.11.1.10.nix similarity index 82% rename from pkgs/development/libraries/haskell/text/0.11.1.9.nix rename to pkgs/development/libraries/haskell/text/0.11.1.10.nix index 5b095c97e67..248316c5c0f 100644 --- a/pkgs/development/libraries/haskell/text/0.11.1.9.nix +++ b/pkgs/development/libraries/haskell/text/0.11.1.10.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "text"; - version = "0.11.1.9"; - sha256 = "12lq9v1byrsan7rp7kywkbwp15qyganpkanmln43yylxdzdc8a2k"; + version = "0.11.1.10"; + sha256 = "1dhrl4gvn8jv4hrmb4hmww9gj0bzzq3a8z5d37zp0pn1iyb0gxfi"; buildDepends = [ deepseq ]; meta = { homepage = "https://github.com/bos/text"; diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix index 82c713868b0..8fae8615159 100644 --- a/pkgs/top-level/haskell-packages.nix +++ b/pkgs/top-level/haskell-packages.nix @@ -154,7 +154,7 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y); zlib = self.zlib_0_5_3_1; # 7.2 ok, 7.3 ok HTTP = self.HTTP_4000_2_1; # 7.2 ok, 7.3 ok deepseq = self.deepseq_1_1_0_2; # 7.2 ok, 7.3 ok - text = self.text_0_11_1_9; # 7.2 ok, 7.3 ok + text = self.text_0_11_1_10; # 7.2 ok, 7.3 ok transformers = self.transformers_0_2_2_0; # 7.2 ok, 7.3 ok mtl = self.mtl_2_0_1_0; # 7.2 ok, 7.3 ok random = self.random_1_0_1_1; # 7.2 ok, 7.3 ok @@ -209,7 +209,7 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y); self : self.haskellPlatformArgs_2011_4_0_0 self // { haskellPlatform = self.haskellPlatform_2011_4_0_0; mtl1 = self.mtl_1_1_1_1; - text = self.text_0_11_1_9; + text = self.text_0_11_1_10; repaExamples = null; # don't pick this version of 'repa-examples' during nix-env -u }; @@ -252,7 +252,7 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y); self : self.haskellPlatformArgs_2011_2_0_1 self // { haskellPlatform = self.haskellPlatform_2011_2_0_1; mtl1 = self.mtl_1_1_1_1; - text = self.text_0_11_1_9; + text = self.text_0_11_1_10; repaExamples = null; # don't pick this version of 'repa-examples' during nix-env -u }; @@ -1253,8 +1253,8 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y); text_0_11_0_5 = callPackage ../development/libraries/haskell/text/0.11.0.5.nix {}; text_0_11_0_6 = callPackage ../development/libraries/haskell/text/0.11.0.6.nix {}; text_0_11_1_5 = callPackage ../development/libraries/haskell/text/0.11.1.5.nix {}; - text_0_11_1_9 = callPackage ../development/libraries/haskell/text/0.11.1.9.nix {}; - text = self.text_0_11_1_9; + text_0_11_1_10 = callPackage ../development/libraries/haskell/text/0.11.1.10.nix {}; + text = self.text_0_11_1_10; thespian = callPackage ../development/libraries/haskell/thespian {}; From 8854fa0da54464dc480f59d8a13111bf4993ee82 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Thu, 22 Dec 2011 12:18:42 +0000 Subject: [PATCH 060/186] haskell-parallel: updated use of version 3.2.0.0 to 3.2.0.2 svn path=/nixpkgs/trunk/; revision=31030 --- .../libraries/haskell/parallel/{3.2.0.0.nix => 3.2.0.2.nix} | 4 ++-- pkgs/top-level/haskell-packages.nix | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) rename pkgs/development/libraries/haskell/parallel/{3.2.0.0.nix => 3.2.0.2.nix} (80%) diff --git a/pkgs/development/libraries/haskell/parallel/3.2.0.0.nix b/pkgs/development/libraries/haskell/parallel/3.2.0.2.nix similarity index 80% rename from pkgs/development/libraries/haskell/parallel/3.2.0.0.nix rename to pkgs/development/libraries/haskell/parallel/3.2.0.2.nix index 9c260d06566..81d37e3a2b0 100644 --- a/pkgs/development/libraries/haskell/parallel/3.2.0.0.nix +++ b/pkgs/development/libraries/haskell/parallel/3.2.0.2.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "parallel"; - version = "3.2.0.0"; - sha256 = "1wqdy9p7xqq84ffgzdakvqydxq9668r9xq3wyay9wlgrk83wd1sq"; + version = "3.2.0.2"; + sha256 = "0sy67cdbwh17wng6b77h9hnkg59mgnyilwvirihmq9535jm9yml2"; buildDepends = [ deepseq ]; meta = { description = "Parallel programming library"; diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix index 8fae8615159..d771c6f38bb 100644 --- a/pkgs/top-level/haskell-packages.nix +++ b/pkgs/top-level/haskell-packages.nix @@ -142,7 +142,7 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y); HUnit = self.HUnit_1_2_2_3; # 7.2 ok, 7.3 ok network = self.network_2_3_0_8; # 7.2 ok, 7.3 ok OpenGL = self.OpenGL_2_2_3_0; # 7.2 ok, 7.3 ok - parallel = self.parallel_3_2_0_0; # 7.2 ok, 7.3 ok + parallel = self.parallel_3_2_0_2; # 7.2 ok, 7.3 ok parsec = self.parsec_3_1_2; # 7.2 ok, 7.3 ok QuickCheck = self.QuickCheck_2_4_2; # 7.2 ok, 7.3 ok regexBase = self.regexBase_0_93_2; # 7.2 ok, 7.3 ok @@ -1006,8 +1006,8 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y); parallel_1_1_0_1 = callPackage ../development/libraries/haskell/parallel/1.1.0.1.nix {}; parallel_2_2_0_1 = callPackage ../development/libraries/haskell/parallel/2.2.0.1.nix {}; parallel_3_1_0_1 = callPackage ../development/libraries/haskell/parallel/3.1.0.1.nix {}; - parallel_3_2_0_0 = callPackage ../development/libraries/haskell/parallel/3.2.0.0.nix {}; - parallel = self.parallel_1_1_0_1; + parallel_3_2_0_2 = callPackage ../development/libraries/haskell/parallel/3.2.0.2.nix {}; + parallel = self.parallel_3_2_0_2; parseargs = callPackage ../development/libraries/haskell/parseargs {}; From 498508fd59f8d5a64b8dcb4c367e92569e29ed14 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Thu, 22 Dec 2011 12:18:46 +0000 Subject: [PATCH 061/186] haskell-uhc-svn: updated to revision 2381 svn path=/nixpkgs/trunk/; revision=31031 --- pkgs/development/compilers/uhc/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/compilers/uhc/default.nix b/pkgs/development/compilers/uhc/default.nix index 0baba9c603e..390fa28f6f7 100644 --- a/pkgs/development/compilers/uhc/default.nix +++ b/pkgs/development/compilers/uhc/default.nix @@ -3,7 +3,7 @@ }: let - revision = "2375"; + revision = "2381"; in stdenv.mkDerivation { name = "uhc-svn-${revision}"; @@ -11,7 +11,7 @@ stdenv.mkDerivation { src = fetchsvn { url = "https://subversion.cs.uu.nl/repos/project.UHC.pub/trunk/EHC"; rev = revision; - sha256 = "bde79664b7d04337ce668eab63291702687e6d572a302111425e5ff870c57619"; + sha256 = "37598f49cda8ff67b0b4d1c75b0bf50bfcd29a92b08ea427c5071080e368c4bc"; }; propagatedBuildInputs = [mtl network binary fgl syb]; From 569b33edbc9b40767608edd22092e43c17855c02 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Thu, 22 Dec 2011 12:18:50 +0000 Subject: [PATCH 062/186] haskell-NanoProlog: updated to version 0.3 svn path=/nixpkgs/trunk/; revision=31032 --- pkgs/development/libraries/haskell/NanoProlog/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/NanoProlog/default.nix b/pkgs/development/libraries/haskell/NanoProlog/default.nix index 85f5a1d9e6e..4bf301bd66d 100644 --- a/pkgs/development/libraries/haskell/NanoProlog/default.nix +++ b/pkgs/development/libraries/haskell/NanoProlog/default.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "NanoProlog"; - version = "0.2.3.3"; - sha256 = "0008xpahqbs2djchlw1bslhqqhbc0n7ql7pqm4g7lh8xd3ampxba"; + version = "0.3"; + sha256 = "0wjjwzzc78sj7nsaq1hgxiwv0pc069mxns425lhmrlxcm0vf8fmn"; isLibrary = true; isExecutable = true; buildDepends = [ ListLike uuParsinglib ]; From cad2c575b4dc85eae4df1fcf806d0b71d1fc9769 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Thu, 22 Dec 2011 12:18:54 +0000 Subject: [PATCH 063/186] haskell-colour: updated to version 2.3.2 svn path=/nixpkgs/trunk/; revision=31033 --- pkgs/development/libraries/haskell/colour/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/libraries/haskell/colour/default.nix b/pkgs/development/libraries/haskell/colour/default.nix index 51c93043e8b..d31f8546d4c 100644 --- a/pkgs/development/libraries/haskell/colour/default.nix +++ b/pkgs/development/libraries/haskell/colour/default.nix @@ -2,12 +2,12 @@ cabal.mkDerivation (self: { pname = "colour"; - version = "2.3.1"; - sha256 = "58cf12b8abf7d01a752b1b778b64cc406903874702e3475d65c2aa35689fa49b"; + version = "2.3.2"; + sha256 = "1j0y8cfdzhzjid1hg50qvh5nsa6kfnxcwxaizxyk73z60dn8g9b6"; meta = { homepage = "http://www.haskell.org/haskellwiki/Colour"; description = "A model for human colour/color perception"; - license = "unknown"; + license = self.stdenv.lib.licenses.mit; platforms = self.ghc.meta.platforms; maintainers = [ self.stdenv.lib.maintainers.andres From 8c3e81a5d446a795ea367947f608f70428fe738b Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Thu, 22 Dec 2011 12:18:58 +0000 Subject: [PATCH 064/186] haskell-fclabels: updated to version 1.1.0 svn path=/nixpkgs/trunk/; revision=31034 --- pkgs/development/libraries/haskell/fclabels/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/fclabels/default.nix b/pkgs/development/libraries/haskell/fclabels/default.nix index b2a6142bbaf..197d3efbbb3 100644 --- a/pkgs/development/libraries/haskell/fclabels/default.nix +++ b/pkgs/development/libraries/haskell/fclabels/default.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "fclabels"; - version = "1.0.4"; - sha256 = "051ryqjzc74lnlbdd1ngxgqj56p43ls5xhafmldnyhkv75x59svw"; + version = "1.1.0"; + sha256 = "0wklxzrvnp91qssdxym66xpi20g0dhx4kmww2fhbjjkdc023xd3z"; buildDepends = [ mtl transformers ]; meta = { description = "First class accessor labels"; From 06265922f8b703e15f34fbc5a1f2df4b2357e931 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Thu, 22 Dec 2011 12:19:05 +0000 Subject: [PATCH 065/186] haskell-split: updated to version 0.1.4.2 svn path=/nixpkgs/trunk/; revision=31035 --- pkgs/development/libraries/haskell/split/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/split/default.nix b/pkgs/development/libraries/haskell/split/default.nix index 8463200e387..604c4a0a0f2 100644 --- a/pkgs/development/libraries/haskell/split/default.nix +++ b/pkgs/development/libraries/haskell/split/default.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "split"; - version = "0.1.4.1"; - sha256 = "0cdn2sb3m62bnxdz59diwwaxysh3kj4kk1srn4m80p03fj60s0q5"; + version = "0.1.4.2"; + sha256 = "09vi7vw4i4r78gyp3bbvhvvyiqi8rgf678ppmq99qrfqm34c2fl9"; meta = { homepage = "http://code.haskell.org/~byorgey/code/split"; description = "Combinator library for splitting lists"; From f683bc76dd56773dffbb37fc3f97b8445b592d18 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Thu, 22 Dec 2011 12:19:10 +0000 Subject: [PATCH 066/186] haskell-system-filepath: updated to version 0.4.4 svn path=/nixpkgs/trunk/; revision=31036 --- .../libraries/haskell/system-filepath/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/libraries/haskell/system-filepath/default.nix b/pkgs/development/libraries/haskell/system-filepath/default.nix index 75f13c948e9..ee42d3415f2 100644 --- a/pkgs/development/libraries/haskell/system-filepath/default.nix +++ b/pkgs/development/libraries/haskell/system-filepath/default.nix @@ -2,11 +2,11 @@ cabal.mkDerivation (self: { pname = "system-filepath"; - version = "0.4.3"; - sha256 = "16a57dipz3aid5n22gzyd9yqmsxm98c3s6vb7minj82q9rbl5z67"; + version = "0.4.4"; + sha256 = "16904xwbcy82ghf1bckw8h63pfj9jfbdlqrr8jf91jzl27lqlwxf"; buildDepends = [ deepseq text ]; meta = { - homepage = "https://john-millikin.com/software/hs-filepath/"; + homepage = "https://john-millikin.com/software/haskell-filesystem/"; description = "High-level, byte-based file and directory path manipulations"; license = self.stdenv.lib.licenses.mit; platforms = self.ghc.meta.platforms; From 2f02b3d8e053875f600840e78b9498dcaf156786 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Thu, 22 Dec 2011 12:19:14 +0000 Subject: [PATCH 067/186] haskell-unordered-containers: updated to version 0.1.4.6 svn path=/nixpkgs/trunk/; revision=31037 --- .../libraries/haskell/unordered-containers/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/unordered-containers/default.nix b/pkgs/development/libraries/haskell/unordered-containers/default.nix index 5ec2d9ea558..da4616a1367 100644 --- a/pkgs/development/libraries/haskell/unordered-containers/default.nix +++ b/pkgs/development/libraries/haskell/unordered-containers/default.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "unordered-containers"; - version = "0.1.4.5"; - sha256 = "065701zdbxpn70zl142jxmv30m0162mg3z95rvpfa593ggq688m4"; + version = "0.1.4.6"; + sha256 = "1azwxbrzlzaw54idp3z2xx1xlywzsf1r893blbz51nnwcj9v550d"; buildDepends = [ deepseq hashable ]; meta = { description = "Efficient hashing-based container types"; From ee7bedf20cc65bd4f18a17f0de15374af613a592 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Thu, 22 Dec 2011 12:19:18 +0000 Subject: [PATCH 068/186] haskell-uuagc-bootstrap: updated to version 0.9.40.2 svn path=/nixpkgs/trunk/; revision=31038 --- pkgs/development/tools/haskell/uuagc/bootstrap.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/haskell/uuagc/bootstrap.nix b/pkgs/development/tools/haskell/uuagc/bootstrap.nix index 2110f258229..c50391efd4e 100644 --- a/pkgs/development/tools/haskell/uuagc/bootstrap.nix +++ b/pkgs/development/tools/haskell/uuagc/bootstrap.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "uuagc-bootstrap"; - version = "0.9.39.1.0"; - sha256 = "06w330j0nds5piv1rr3m6m1idnf0c5swfk9qwdqzi0pmpws6lpkj"; + version = "0.9.40.2"; + sha256 = "0zsb8pz2zx7y8sjp392hpdk30dzzmppjizcnlgd1wvq2csacnfxq"; isLibrary = true; isExecutable = true; buildDepends = [ haskellSrcExts mtl uulib ]; From 1a316e3ef216a2103757b90d7f2f4f477f7a6118 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Thu, 22 Dec 2011 12:19:24 +0000 Subject: [PATCH 069/186] haskell-uuagc-cabal: updated to version 1.0.2.0 svn path=/nixpkgs/trunk/; revision=31039 --- pkgs/development/tools/haskell/uuagc/cabal.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/haskell/uuagc/cabal.nix b/pkgs/development/tools/haskell/uuagc/cabal.nix index 70c0a8e9931..9a0ae50fc9a 100644 --- a/pkgs/development/tools/haskell/uuagc/cabal.nix +++ b/pkgs/development/tools/haskell/uuagc/cabal.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "uuagc-cabal"; - version = "1.0.0.10"; - sha256 = "0dqj5nqq8qpylbxyv8cpy3rrnna9yqb4dnxxk7sgyhw6yvz48l56"; + version = "1.0.2.0"; + sha256 = "0nvnyc6c1611rziglpp0ywqkgg9sgfi9ph33ya33k5zv3jxxh1q0"; buildDepends = [ mtl uulib ]; meta = { homepage = "http://www.cs.uu.nl/wiki/HUT/WebHome"; From f0fccbb3f06e9d13f81c1be2d8ccfb5abca62240 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Thu, 22 Dec 2011 12:19:28 +0000 Subject: [PATCH 070/186] haskell-uuagc: updated to version 0.9.40.2 svn path=/nixpkgs/trunk/; revision=31040 --- pkgs/development/tools/haskell/uuagc/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/haskell/uuagc/default.nix b/pkgs/development/tools/haskell/uuagc/default.nix index 417f430ba9b..6a662055df4 100644 --- a/pkgs/development/tools/haskell/uuagc/default.nix +++ b/pkgs/development/tools/haskell/uuagc/default.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "uuagc"; - version = "0.9.39.1"; - sha256 = "0zqhwpafq51czy97z0f93cbxd8k6hllnmb24a6yzr4y6kzzv65hd"; + version = "0.9.40.2"; + sha256 = "1qc5sqm2lqysm5rplzc229rfw5750w4z8b7cgxaid7jjv4csrbf8"; isLibrary = true; isExecutable = true; buildDepends = [ From 30afcc3af37bfc30c91006228be7cc73768accad Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Thu, 22 Dec 2011 12:22:52 +0000 Subject: [PATCH 071/186] pkgs/top-level/haskell-packages.nix: updated comment about the current HP default version svn path=/nixpkgs/trunk/; revision=31041 --- pkgs/top-level/haskell-packages.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix index d771c6f38bb..eedaebb75bc 100644 --- a/pkgs/top-level/haskell-packages.nix +++ b/pkgs/top-level/haskell-packages.nix @@ -130,7 +130,7 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y); # We try to support several platform versions. For these, we set all # versions explicitly. - # NOTE: 2011.2.0.1 is the current default. + # NOTE: 2011.4.0.0 is the current default. haskellPlatformArgs_future = self : { inherit (self) cabal ghc; From c7bed207d82372741c56a64191479d0f09e4a805 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Thu, 22 Dec 2011 12:30:19 +0000 Subject: [PATCH 072/186] maxima: updated to version 5.26.0 svn path=/nixpkgs/trunk/; revision=31042 --- pkgs/applications/science/math/maxima/default.nix | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/pkgs/applications/science/math/maxima/default.nix b/pkgs/applications/science/math/maxima/default.nix index b7949909760..02b7017d295 100644 --- a/pkgs/applications/science/math/maxima/default.nix +++ b/pkgs/applications/science/math/maxima/default.nix @@ -2,7 +2,7 @@ let name = "maxima"; - version = "5.25.1"; + version = "5.26.0"; searchPath = stdenv.lib.makeSearchPath "bin" @@ -13,7 +13,7 @@ stdenv.mkDerivation { src = fetchurl { url = "mirror://sourceforge/${name}/${name}-${version}.tar.gz"; - sha256 = "8e98ad742151e52edb56337bd62c8a9749f7b598cb6ed4e991980e0e6f89706a"; + sha256 = "887105c99a91122f3e622472aa39bdd1ca8ed6198cf09b49917f63f8396dced9"; }; buildInputs = [sbcl texinfo perl makeWrapper]; @@ -29,8 +29,9 @@ stdenv.mkDerivation { ln -s ../maxima/${version}/doc $out/share/doc/maxima ''; - # The regression test suite has minor failures, but curiously enough - # this doesn't seem to abort the build process: + # Failures in the regression test suite are not going to abort the + # build process. We run the suite mostly so that potential errors show + # up in the build log. See also: # . doCheck = true; From cddfcd7bcc2ebc406ca3425e5e09333df1aa4e06 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Thu, 22 Dec 2011 12:30:59 +0000 Subject: [PATCH 073/186] * Bump nixUnstable. svn path=/nixpkgs/trunk/; revision=31043 --- pkgs/tools/package-management/nix/unstable.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/package-management/nix/unstable.nix b/pkgs/tools/package-management/nix/unstable.nix index 30487055669..708951814bc 100644 --- a/pkgs/tools/package-management/nix/unstable.nix +++ b/pkgs/tools/package-management/nix/unstable.nix @@ -5,11 +5,11 @@ }: stdenv.mkDerivation rec { - name = "nix-1.0pre30706"; + name = "nix-1.0pre31028"; src = fetchurl { - url = "http://hydra.nixos.org/build/1580753/download/4/${name}.tar.bz2"; - sha256 = "2658a4fea95799d8719685a808ab354f0b5a3ce38af92117e1a15c394c261c5b"; + url = "http://hydra.nixos.org/build/1648301/download/4/${name}.tar.bz2"; + sha256 = "5a74cff532e0615b23a3937003ee67d257b4371d89fc60ae2be9f342efd979d2"; }; buildNativeInputs = [ perl pkgconfig ]; From 6db6983bc2bce686f1ef31ae12d6db4d230a3402 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?= Date: Thu, 22 Dec 2011 22:35:57 +0000 Subject: [PATCH 074/186] Updating nvidia legacy 96.x, so it builds with the linux 3.1 kernel. svn path=/nixpkgs/trunk/; revision=31047 --- pkgs/os-specific/linux/nvidia-x11/legacy96.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/os-specific/linux/nvidia-x11/legacy96.nix b/pkgs/os-specific/linux/nvidia-x11/legacy96.nix index 0d36013ffd2..a7ba4d5ca95 100644 --- a/pkgs/os-specific/linux/nvidia-x11/legacy96.nix +++ b/pkgs/os-specific/linux/nvidia-x11/legacy96.nix @@ -2,7 +2,7 @@ let - versionNumber = "96.43.19"; + versionNumber = "96.43.20"; in @@ -15,12 +15,12 @@ stdenv.mkDerivation { if stdenv.system == "i686-linux" then fetchurl { url = "http://us.download.nvidia.com/XFree86/Linux-x86/${versionNumber}/NVIDIA-Linux-x86-${versionNumber}-pkg0.run"; - sha256 = "1j7im9ra7nmm1hn11c1brvf895xibs49xrxkxcrsnmpa17l10n72"; + sha256 = "05vm36jnydp4cfdkfvrvxczd64i3f0pp0yp7dn8y8pklrxi80xxw"; } else if stdenv.system == "x86_64-linux" then fetchurl { url = "http://us.download.nvidia.com/XFree86/Linux-x86_64/${versionNumber}/NVIDIA-Linux-x86_64-${versionNumber}-pkg0.run"; - sha256 = "1g8z36wz3ww1q6vjbypzwl0973vy0miz6rw2fd7v3a36yxl2gvn5"; + sha256 = "0a8ninp4wyql3xh6z93dzhbacvz7g0h8gs4pg5279a0i6h05wb1w"; } else throw "nvidia-x11 does not support platform ${stdenv.system}"; From 435c32b5b6d2e02bed4fc265274f9ea0801f41db Mon Sep 17 00:00:00 2001 From: Michael Raskin <7c6f434c@mail.ru> Date: Fri, 23 Dec 2011 04:26:36 +0000 Subject: [PATCH 075/186] A fresher Linux rc svn path=/nixpkgs/trunk/; revision=31048 --- pkgs/os-specific/linux/kernel/linux-3.2.nix | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/linux-3.2.nix b/pkgs/os-specific/linux/kernel/linux-3.2.nix index 0e3ace5c384..576ef0941f7 100644 --- a/pkgs/os-specific/linux/kernel/linux-3.2.nix +++ b/pkgs/os-specific/linux/kernel/linux-3.2.nix @@ -214,17 +214,18 @@ in import ./generic.nix ( rec { - version = "3.2-rc1"; + version = "3.2-rc6"; - modDirVersion = "3.2.0-rc1"; + modDirVersion = "3.2.0-rc6"; preConfigure = '' substituteInPlace scripts/depmod.sh --replace '-b "$INSTALL_MOD_PATH"' "" ''; src = fetchurl { - url = "mirror://kernel/linux/kernel/v3.x/linux-${version}.tar.bz2"; - sha256 = "0pp79njklvjzzr4wpyymqhkiq0xgz1sgil5sjms2xj583jg8c4wm"; + #url = "mirror://kernel/linux/kernel/v3.x/linux-${version}.tar.bz2"; + url = "mirror://kernel/linux/kernel/v3.0/testing/linux-${version}.tar.bz2"; + sha256 = "18wdp3r3xvq12ddv7c7z0h0i8zsm3wrahl83s6jqbixrw4aq5zbd"; }; config = configWithPlatform stdenv.platform; From e4a2d3ff6d1bd6b6325bc0de73d50b1018e2119b Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Fri, 23 Dec 2011 11:57:45 +0000 Subject: [PATCH 076/186] haskell-text: updated version 0.11.1.10 to 0.11.1.11 svn path=/nixpkgs/trunk/; revision=31049 --- .../haskell/text/{0.11.1.10.nix => 0.11.1.11.nix} | 4 ++-- pkgs/top-level/haskell-packages.nix | 10 +++++----- 2 files changed, 7 insertions(+), 7 deletions(-) rename pkgs/development/libraries/haskell/text/{0.11.1.10.nix => 0.11.1.11.nix} (82%) diff --git a/pkgs/development/libraries/haskell/text/0.11.1.10.nix b/pkgs/development/libraries/haskell/text/0.11.1.11.nix similarity index 82% rename from pkgs/development/libraries/haskell/text/0.11.1.10.nix rename to pkgs/development/libraries/haskell/text/0.11.1.11.nix index 248316c5c0f..053888a1f0c 100644 --- a/pkgs/development/libraries/haskell/text/0.11.1.10.nix +++ b/pkgs/development/libraries/haskell/text/0.11.1.11.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "text"; - version = "0.11.1.10"; - sha256 = "1dhrl4gvn8jv4hrmb4hmww9gj0bzzq3a8z5d37zp0pn1iyb0gxfi"; + version = "0.11.1.11"; + sha256 = "0k58f6p3lnr3dh9d7n39lydqk3rkfsyds2jgwpi0zwml20bdaqcl"; buildDepends = [ deepseq ]; meta = { homepage = "https://github.com/bos/text"; diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix index eedaebb75bc..3bdb7a1651a 100644 --- a/pkgs/top-level/haskell-packages.nix +++ b/pkgs/top-level/haskell-packages.nix @@ -154,7 +154,7 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y); zlib = self.zlib_0_5_3_1; # 7.2 ok, 7.3 ok HTTP = self.HTTP_4000_2_1; # 7.2 ok, 7.3 ok deepseq = self.deepseq_1_1_0_2; # 7.2 ok, 7.3 ok - text = self.text_0_11_1_10; # 7.2 ok, 7.3 ok + text = self.text_0_11_1_11; # 7.2 ok, 7.3 ok transformers = self.transformers_0_2_2_0; # 7.2 ok, 7.3 ok mtl = self.mtl_2_0_1_0; # 7.2 ok, 7.3 ok random = self.random_1_0_1_1; # 7.2 ok, 7.3 ok @@ -209,7 +209,7 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y); self : self.haskellPlatformArgs_2011_4_0_0 self // { haskellPlatform = self.haskellPlatform_2011_4_0_0; mtl1 = self.mtl_1_1_1_1; - text = self.text_0_11_1_10; + text = self.text_0_11_1_11; repaExamples = null; # don't pick this version of 'repa-examples' during nix-env -u }; @@ -252,7 +252,7 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y); self : self.haskellPlatformArgs_2011_2_0_1 self // { haskellPlatform = self.haskellPlatform_2011_2_0_1; mtl1 = self.mtl_1_1_1_1; - text = self.text_0_11_1_10; + text = self.text_0_11_1_11; repaExamples = null; # don't pick this version of 'repa-examples' during nix-env -u }; @@ -1253,8 +1253,8 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y); text_0_11_0_5 = callPackage ../development/libraries/haskell/text/0.11.0.5.nix {}; text_0_11_0_6 = callPackage ../development/libraries/haskell/text/0.11.0.6.nix {}; text_0_11_1_5 = callPackage ../development/libraries/haskell/text/0.11.1.5.nix {}; - text_0_11_1_10 = callPackage ../development/libraries/haskell/text/0.11.1.10.nix {}; - text = self.text_0_11_1_10; + text_0_11_1_11 = callPackage ../development/libraries/haskell/text/0.11.1.11.nix {}; + text = self.text_0_11_1_11; thespian = callPackage ../development/libraries/haskell/thespian {}; From 25373e78d3fdb30b00f1e358f7b31356010546f2 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Fri, 23 Dec 2011 11:57:56 +0000 Subject: [PATCH 077/186] haskell-ListLike: updated to version 3.1.4 svn path=/nixpkgs/trunk/; revision=31050 --- pkgs/development/libraries/haskell/ListLike/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/ListLike/default.nix b/pkgs/development/libraries/haskell/ListLike/default.nix index 1d89afe5968..523f59de5e9 100644 --- a/pkgs/development/libraries/haskell/ListLike/default.nix +++ b/pkgs/development/libraries/haskell/ListLike/default.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "ListLike"; - version = "3.1.2"; - sha256 = "1fa2y8yc0ppmh37alc20a75gpb90i8s3pgnh3kg8n0577gvhjhzz"; + version = "3.1.4"; + sha256 = "0cpj7vqlazs2yzh0ffhlg69kdb18xyicybfw614nlqfhhrp53lj9"; isLibrary = true; isExecutable = true; meta = { From 638d85922925e3b4b96cf4c8a256a944996deeac Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Fri, 23 Dec 2011 11:58:05 +0000 Subject: [PATCH 078/186] haskell-aeson: updated to version 0.4.0.1 svn path=/nixpkgs/trunk/; revision=31051 --- pkgs/development/libraries/haskell/aeson/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/aeson/default.nix b/pkgs/development/libraries/haskell/aeson/default.nix index 0bd68b6b92e..04a94c222c6 100644 --- a/pkgs/development/libraries/haskell/aeson/default.nix +++ b/pkgs/development/libraries/haskell/aeson/default.nix @@ -4,8 +4,8 @@ cabal.mkDerivation (self: { pname = "aeson"; - version = "0.4.0.0"; - sha256 = "1j0m7hh82ab7lg757wq75k28llfd1igawmg4g2qdia5gimm652pa"; + version = "0.4.0.1"; + sha256 = "15aq3r36vda8v1fn3pn0k638w32kzy15kbrf97krvg3xdwrvybky"; buildDepends = [ attoparsec blazeBuilder blazeTextual deepseq dlist hashable mtl syb text time unorderedContainers vector From 0ec4f26ffe861655a88e013c782cdb1f588c5b01 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Fri, 23 Dec 2011 11:58:13 +0000 Subject: [PATCH 079/186] haskell-snap-core: updated to version 0.7.0.1 svn path=/nixpkgs/trunk/; revision=31052 --- pkgs/development/libraries/haskell/snap/core.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/snap/core.nix b/pkgs/development/libraries/haskell/snap/core.nix index c0639515bf5..c6be9f80258 100644 --- a/pkgs/development/libraries/haskell/snap/core.nix +++ b/pkgs/development/libraries/haskell/snap/core.nix @@ -8,8 +8,8 @@ cabal.mkDerivation (self: { pname = "snap-core"; - version = "0.7"; - sha256 = "1rplv1pg531jfmvxlhl7lz9hdhbxllk59daik013i172wglggivp"; + version = "0.7.0.1"; + sha256 = "010w3ycwalz48288342rmwg87pdml7ixg9drw38k206q9s9a9cp9"; buildDepends = [ attoparsec attoparsecEnumerator base16Bytestring blazeBuilder blazeBuilderEnumerator bytestringMmap bytestringNums From 2eaf159e2f038d6cbe3abd7260d4ae48c893efe4 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Fri, 23 Dec 2011 11:58:23 +0000 Subject: [PATCH 080/186] haskell-snap-server: updated to version 0.7.0.1 svn path=/nixpkgs/trunk/; revision=31053 --- pkgs/development/libraries/haskell/snap/server.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/snap/server.nix b/pkgs/development/libraries/haskell/snap/server.nix index da786f8a7c6..e6eafd47eab 100644 --- a/pkgs/development/libraries/haskell/snap/server.nix +++ b/pkgs/development/libraries/haskell/snap/server.nix @@ -7,8 +7,8 @@ cabal.mkDerivation (self: { pname = "snap-server"; - version = "0.7"; - sha256 = "1zvijghk7597xbmxv2x3qk92jlckwpz73c57cmfl63as5x6psxhr"; + version = "0.7.0.1"; + sha256 = "149jgd9mcndw9sc051020y7yiai1fipjnqk4s3sbw4lmaysap673"; buildDepends = [ attoparsec attoparsecEnumerator binary blazeBuilder blazeBuilderEnumerator bytestringNums caseInsensitive directoryTree From 06d7dce3e0ed727558f19fe287cf1852737778b7 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Fri, 23 Dec 2011 11:58:30 +0000 Subject: [PATCH 081/186] haskell-uu-parsinglib: updated to version 2.7.3.2 svn path=/nixpkgs/trunk/; revision=31054 --- pkgs/development/libraries/haskell/uu-parsinglib/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/uu-parsinglib/default.nix b/pkgs/development/libraries/haskell/uu-parsinglib/default.nix index 124d08aabc0..ed6701976dd 100644 --- a/pkgs/development/libraries/haskell/uu-parsinglib/default.nix +++ b/pkgs/development/libraries/haskell/uu-parsinglib/default.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "uu-parsinglib"; - version = "2.7.3.1"; - sha256 = "11lwf2b4l4sll6xvscv3c2n3kl6hs0s8rplw66cwskcck3mvs7ms"; + version = "2.7.3.2"; + sha256 = "0z53s9wvk57g3d9x3iswjydwm7nw5vfrj7k08v75fw6rwldkal60"; buildDepends = [ ListLike time ]; meta = { homepage = "http://www.cs.uu.nl/wiki/bin/view/HUT/ParserCombinators"; From 3f209edf6ed6a17690aa89bd169d090676237b27 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Fri, 23 Dec 2011 14:19:45 +0000 Subject: [PATCH 082/186] * Updated ntfs-3g to 2011.4.12. Also create a sbin/mount.ntfs symlink to ensure that NTFS filesystems are mounted using ntfs-3g, which is much better than the kernel NTFS driver. In particular, this ensures that udisks will automount external NTFS drives with read/write support. (See also http://www.tuxera.com/community/ntfs-3g-faq/#plugandplay) svn path=/nixpkgs/trunk/; revision=31055 --- pkgs/tools/filesystems/ntfs-3g/default.nix | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/pkgs/tools/filesystems/ntfs-3g/default.nix b/pkgs/tools/filesystems/ntfs-3g/default.nix index a39ba002d23..df75cbf5966 100644 --- a/pkgs/tools/filesystems/ntfs-3g/default.nix +++ b/pkgs/tools/filesystems/ntfs-3g/default.nix @@ -2,7 +2,7 @@ stdenv.mkDerivation rec { pname = "ntfs-3g"; - version = "2010.10.2"; + version = "2011.4.12"; name = "${pname}-${version}"; src = fetchurl { @@ -19,6 +19,12 @@ stdenv.mkDerivation rec { configureFlags = "--disable-ldconfig --exec-prefix=\${prefix} --enable-mount-helper"; + postInstall = + '' + # Prefer ntfs-3g over the ntfs driver in the kernel. + ln -s mount.ntfs-3g $out/sbin/mount.ntfs + ''; + meta = { homepage = http://www.tuxera.com/community/; description = "FUSE-base NTFS driver with full write support"; From 986f3c193d674a3cb623aa4f6617dbed6c0b6cdb Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Fri, 23 Dec 2011 23:34:21 +0000 Subject: [PATCH 083/186] pkgs/top-level/haskell-packages.nix: removed inconsistent 'text' specifications in haskell platform expressions These changes were introduced unintentionally a while ago. svn path=/nixpkgs/trunk/; revision=31057 --- pkgs/top-level/haskell-packages.nix | 2 -- 1 file changed, 2 deletions(-) diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix index 3bdb7a1651a..e3c0adbdc64 100644 --- a/pkgs/top-level/haskell-packages.nix +++ b/pkgs/top-level/haskell-packages.nix @@ -209,7 +209,6 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y); self : self.haskellPlatformArgs_2011_4_0_0 self // { haskellPlatform = self.haskellPlatform_2011_4_0_0; mtl1 = self.mtl_1_1_1_1; - text = self.text_0_11_1_11; repaExamples = null; # don't pick this version of 'repa-examples' during nix-env -u }; @@ -252,7 +251,6 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y); self : self.haskellPlatformArgs_2011_2_0_1 self // { haskellPlatform = self.haskellPlatform_2011_2_0_1; mtl1 = self.mtl_1_1_1_1; - text = self.text_0_11_1_11; repaExamples = null; # don't pick this version of 'repa-examples' during nix-env -u }; From f13c4dba3d4119dfaf278100631454c15d04a2d5 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Sat, 24 Dec 2011 11:05:21 +0000 Subject: [PATCH 084/186] asymptote: updated to version 2.15 svn path=/nixpkgs/trunk/; revision=31058 --- pkgs/tools/graphics/asymptote/src-for-default.nix | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/pkgs/tools/graphics/asymptote/src-for-default.nix b/pkgs/tools/graphics/asymptote/src-for-default.nix index e960b74655b..1f8a46ae581 100644 --- a/pkgs/tools/graphics/asymptote/src-for-default.nix +++ b/pkgs/tools/graphics/asymptote/src-for-default.nix @@ -1,9 +1,9 @@ rec { - version="2.03"; - name="asymptote-2.03"; - hash="1npj9igf4b9dy1frriqc20ihm1s0f3yw2pgs0xc4rv514rp0wkpx"; + version="2.15"; + name="asymptote-2.15"; + hash="11y8w2r51g48znqvl1wwrg0wsrwz3194r70aq1mlgq1g0xzln0w9"; url="http://downloads.sourceforge.net/project/asymptote/asymptote/${version}/asymptote-${version}.src.tgz"; - advertisedUrl="http://downloads.sourceforge.net/project/asymptote/asymptote/2.03/asymptote-2.03.src.tgz"; - - + advertisedUrl="http://downloads.sourceforge.net/project/asymptote/asymptote/2.15/asymptote-2.15.src.tgz"; + + } From a4a5a35f2d30e158cfd05ad6e859cdb222dfbf0a Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Sat, 24 Dec 2011 18:03:51 +0000 Subject: [PATCH 085/186] asymptote: added fixInfoDir hook to move the generated info files into the correct location svn path=/nixpkgs/trunk/; revision=31059 --- pkgs/tools/graphics/asymptote/default.nix | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/graphics/asymptote/default.nix b/pkgs/tools/graphics/asymptote/default.nix index 303fc086874..e49b5a45cab 100644 --- a/pkgs/tools/graphics/asymptote/default.nix +++ b/pkgs/tools/graphics/asymptote/default.nix @@ -23,9 +23,10 @@ rec { configureFlags = []; /* doConfigure should be removed if not needed */ - phaseNames = ["setVars" "doUnpack" "fixPaths" "extractTexinfoTex" - "doConfigure" "dumpRealVars" "doMakeInstall" "fixPathsResult"]; - + phaseNames = ["setVars" "doUnpack" "fixPaths" "extractTexinfoTex" + "doConfigure" "dumpRealVars" "doMakeInstall" "fixPathsResult" + "fixInfoDir"]; + setVars = a.noDepEntry '' export NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE -I${a.boehmgc}/include/gc" export HOME="$PWD" @@ -38,6 +39,12 @@ rec { fixPaths = a.doPatchShebangs ''.''; fixPathsResult = a.doPatchShebangs ''$out/bin''; + fixInfoDir = a.noDepEntry '' + mv -v "$out/share/info/asymptote/"*.info $out/share/info/ + rmdir $out/share/info/asymptote + rm $out/share/info/dir + ''; + extractTexinfoTex = a.fullDepEntry '' lzma -d < ${a.texinfo.src} | tar --wildcards -x texinfo-'*'/doc/texinfo.tex cp texinfo-*/doc/texinfo.tex doc/ From f4439564cbdf5c35bcf3b67105b033c71fceaa97 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Sat, 24 Dec 2011 18:28:23 +0000 Subject: [PATCH 086/186] asymptote: fix info dir some more svn path=/nixpkgs/trunk/; revision=31060 --- pkgs/tools/graphics/asymptote/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/tools/graphics/asymptote/default.nix b/pkgs/tools/graphics/asymptote/default.nix index e49b5a45cab..b314da4a3ed 100644 --- a/pkgs/tools/graphics/asymptote/default.nix +++ b/pkgs/tools/graphics/asymptote/default.nix @@ -41,6 +41,7 @@ rec { fixInfoDir = a.noDepEntry '' mv -v "$out/share/info/asymptote/"*.info $out/share/info/ + sed -i -e 's|(asymptote/asymptote)|(asymptote)|' $out/share/info/asymptote.info rmdir $out/share/info/asymptote rm $out/share/info/dir ''; From 0ea5780f7522d1de9f28edf0031cffd70bfcc552 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Sat, 24 Dec 2011 18:57:39 +0000 Subject: [PATCH 087/186] haskell-text: updated use of 0.11.1.11 to 0.11.1.12 svn path=/nixpkgs/trunk/; revision=31061 --- .../libraries/haskell/text/{0.11.1.11.nix => 0.11.1.12.nix} | 4 ++-- pkgs/top-level/haskell-packages.nix | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) rename pkgs/development/libraries/haskell/text/{0.11.1.11.nix => 0.11.1.12.nix} (82%) diff --git a/pkgs/development/libraries/haskell/text/0.11.1.11.nix b/pkgs/development/libraries/haskell/text/0.11.1.12.nix similarity index 82% rename from pkgs/development/libraries/haskell/text/0.11.1.11.nix rename to pkgs/development/libraries/haskell/text/0.11.1.12.nix index 053888a1f0c..805c96d2af0 100644 --- a/pkgs/development/libraries/haskell/text/0.11.1.11.nix +++ b/pkgs/development/libraries/haskell/text/0.11.1.12.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "text"; - version = "0.11.1.11"; - sha256 = "0k58f6p3lnr3dh9d7n39lydqk3rkfsyds2jgwpi0zwml20bdaqcl"; + version = "0.11.1.12"; + sha256 = "0j2044whj3xckmxqmgdjbc2mpwdan481qzjslwplqbqwml2jvkml"; buildDepends = [ deepseq ]; meta = { homepage = "https://github.com/bos/text"; diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix index e3c0adbdc64..8fe6bb15f2c 100644 --- a/pkgs/top-level/haskell-packages.nix +++ b/pkgs/top-level/haskell-packages.nix @@ -154,7 +154,7 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y); zlib = self.zlib_0_5_3_1; # 7.2 ok, 7.3 ok HTTP = self.HTTP_4000_2_1; # 7.2 ok, 7.3 ok deepseq = self.deepseq_1_1_0_2; # 7.2 ok, 7.3 ok - text = self.text_0_11_1_11; # 7.2 ok, 7.3 ok + text = self.text_0_11_1_12; # 7.2 ok, 7.3 ok transformers = self.transformers_0_2_2_0; # 7.2 ok, 7.3 ok mtl = self.mtl_2_0_1_0; # 7.2 ok, 7.3 ok random = self.random_1_0_1_1; # 7.2 ok, 7.3 ok @@ -1251,8 +1251,8 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y); text_0_11_0_5 = callPackage ../development/libraries/haskell/text/0.11.0.5.nix {}; text_0_11_0_6 = callPackage ../development/libraries/haskell/text/0.11.0.6.nix {}; text_0_11_1_5 = callPackage ../development/libraries/haskell/text/0.11.1.5.nix {}; - text_0_11_1_11 = callPackage ../development/libraries/haskell/text/0.11.1.11.nix {}; - text = self.text_0_11_1_11; + text_0_11_1_12 = callPackage ../development/libraries/haskell/text/0.11.1.12.nix {}; + text = self.text_0_11_1_12; thespian = callPackage ../development/libraries/haskell/thespian {}; From a43d5444d9af42017febccdb706ab6d1e4433bf0 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Sat, 24 Dec 2011 18:57:42 +0000 Subject: [PATCH 088/186] haskell-fclabels: updated to version 1.1.0.1 svn path=/nixpkgs/trunk/; revision=31062 --- pkgs/development/libraries/haskell/fclabels/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/fclabels/default.nix b/pkgs/development/libraries/haskell/fclabels/default.nix index 197d3efbbb3..ddd6905d314 100644 --- a/pkgs/development/libraries/haskell/fclabels/default.nix +++ b/pkgs/development/libraries/haskell/fclabels/default.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "fclabels"; - version = "1.1.0"; - sha256 = "0wklxzrvnp91qssdxym66xpi20g0dhx4kmww2fhbjjkdc023xd3z"; + version = "1.1.0.1"; + sha256 = "0nzqx1d4hwailfkcb9g03hagws9j6valqd5yp7972kmhbq0c8h3s"; buildDepends = [ mtl transformers ]; meta = { description = "First class accessor labels"; From aa49dde3d9b7b21897b57127d30abb1efede2d2c Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Sat, 24 Dec 2011 18:57:45 +0000 Subject: [PATCH 089/186] haskell-yesod-form: updated to version 0.3.4.1 svn path=/nixpkgs/trunk/; revision=31063 --- pkgs/development/libraries/haskell/yesod-form/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/yesod-form/default.nix b/pkgs/development/libraries/haskell/yesod-form/default.nix index 7ed924fb07b..c6ce1d024c1 100644 --- a/pkgs/development/libraries/haskell/yesod-form/default.nix +++ b/pkgs/development/libraries/haskell/yesod-form/default.nix @@ -5,8 +5,8 @@ cabal.mkDerivation (self: { pname = "yesod-form"; - version = "0.3.4"; - sha256 = "05hvffzhwb6x6cmpvpf60hbzm4lvn7gp47rvspm5k6y6d999az3l"; + version = "0.3.4.1"; + sha256 = "0khkc4bpqfgfs0zl753x4l5qpkfr8hv0kwzz6qpry5skxa326q6i"; buildDepends = [ blazeBuilder blazeHtml dataDefault emailValidate hamlet network persistent shakespeareCss shakespeareJs text time transformers wai From 6b5dff3bb956a230703b094d918b43b1149ffbcf Mon Sep 17 00:00:00 2001 From: "Yury G. Kudryashov" Date: Sat, 24 Dec 2011 21:52:08 +0000 Subject: [PATCH 090/186] Qt-4.8.0 Hardcode paths to many dlopen()ed libraries. This should fix: * Print dialog fails to find CUPS; * flashplugin. Add optional support for GTK style. Disabled by default. svn path=/nixpkgs/trunk/; revision=31064 --- .../libraries/qt-4.x/4.8/default.nix | 109 ++++++++++++++++++ .../qt-4.x/4.8/dlopen-absolute-paths.diff | 64 ++++++++++ .../libraries/qt-4.x/4.8/dlopen-gtkstyle.diff | 35 ++++++ .../qt-4.x/4.8/dlopen-webkit-nsplugin.diff | 52 +++++++++ pkgs/top-level/all-packages.nix | 7 ++ 5 files changed, 267 insertions(+) create mode 100644 pkgs/development/libraries/qt-4.x/4.8/default.nix create mode 100644 pkgs/development/libraries/qt-4.x/4.8/dlopen-absolute-paths.diff create mode 100644 pkgs/development/libraries/qt-4.x/4.8/dlopen-gtkstyle.diff create mode 100644 pkgs/development/libraries/qt-4.x/4.8/dlopen-webkit-nsplugin.diff diff --git a/pkgs/development/libraries/qt-4.x/4.8/default.nix b/pkgs/development/libraries/qt-4.x/4.8/default.nix new file mode 100644 index 00000000000..8ef50777522 --- /dev/null +++ b/pkgs/development/libraries/qt-4.x/4.8/default.nix @@ -0,0 +1,109 @@ +{ stdenv, fetchurl, substituteAll +, alsaLib, gstreamer, gstPluginsBase +, libXrender, libXinerama, libXcursor, libXmu , libXv, libXext +, libXfixes, libXrandr, libSM, freetype, fontconfig +, zlib, libjpeg, libpng, libmng, which, mesa, openssl, dbus, cups, pkgconfig +, libtiff, glib, icu +, mysql, postgresql, sqlite +, perl, coreutils, libXi +, flashplayerFix ? true, gdk_pixbuf +, gtkStyle ? false, libgnomeui, gtk, GConf, gnome_vfs +}: + +let + v = "4.8.0"; +in + +# TODO: +# * move some plugins (e.g., SQL plugins) to dedicated derivations to avoid +# false build-time dependencies + +stdenv.mkDerivation rec { + name = "qt-${v}"; + + src = fetchurl { + url = "ftp://ftp.qt.nokia.com/qt/source/qt-everywhere-opensource-src-${v}.tar.gz"; + sha256 = "0vhb6bysjqz8l0dygg2yypm4frsggma2g9877rdgf5ay917bg4lk"; + }; + + patches = [ ( substituteAll { + src = ./dlopen-absolute-paths.diff; + inherit cups icu libXfixes; + glibc = stdenv.gcc.libc; + }) + ] ++ stdenv.lib.optional gtkStyle ( + substituteAll { + src = ./dlopen-gtkstyle.diff; + # substituteAll ignores env vars starting with capital letter + gconf = GConf; + inherit gnome_vfs libgnomeui gtk; + } + ) ++ stdenv.lib.optional flashplayerFix ( + substituteAll { + src = ./dlopen-webkit-nsplugin.diff; + inherit gtk gdk_pixbuf; + } + ); + + preConfigure = + '' + export LD_LIBRARY_PATH="`pwd`/lib:$LD_LIBRARY_PATH" + configureFlags+=" + -docdir $out/share/doc/${name} + -plugindir $out/lib/qt4/plugins + -importdir $out/lib/qt4/imports + -examplesdir $out/share/doc/${name}/examples + -demosdir $out/share/doc/${name}/demos + -datadir $out/share/${name} + -translationdir $out/share/${name}/translations + " + ''; + + configureFlags = + '' + -v -no-separate-debug-info -release -no-fast -confirm-license -opensource + + -opengl -xrender -xrandr -xinerama -xcursor -xinput -xfixes -fontconfig + -qdbus -cups -glib -dbus-linked -openssl-linked + + -plugin-sql-mysql -system-sqlite + + -exceptions -xmlpatterns + + -make libs -make tools -make translations + -nomake demos -nomake examples -nomake docs + + -no-phonon -webkit -multimedia -audio-backend + ''; + + propagatedBuildInputs = + [ libXrender libXrandr libXinerama libXcursor libXext libXfixes + libXv libXi libSM mesa + alsaLib zlib libpng openssl dbus.libs freetype fontconfig glib + gstreamer gstPluginsBase + ]; + + # The following libraries are only used in plugins + buildInputs = [ cups # Qt dlopen's libcups instead of linking to it + mysql postgresql sqlite libjpeg libmng libtiff icu ]; + + buildNativeInputs = [ perl pkgconfig which ]; + + prefixKey = "-prefix "; + + prePatch = '' + substituteInPlace configure --replace /bin/pwd pwd + substituteInPlace src/corelib/global/global.pri --replace /bin/ls ${coreutils}/bin/ls + sed -e 's@/\(usr\|opt\)/@/var/empty/@g' -i config.tests/*/*.test -i mkspecs/*/*.conf + ''; + + enableParallelBuilding = true; + + meta = with stdenv.lib; { + homepage = http://qt.nokia.com/products; + description = "A cross-platform application framework for C++"; + license = "GPL/LGPL"; + maintainers = with maintainers; [ urkud sander ]; + platforms = platforms.linux; + }; +} diff --git a/pkgs/development/libraries/qt-4.x/4.8/dlopen-absolute-paths.diff b/pkgs/development/libraries/qt-4.x/4.8/dlopen-absolute-paths.diff new file mode 100644 index 00000000000..9823d649365 --- /dev/null +++ b/pkgs/development/libraries/qt-4.x/4.8/dlopen-absolute-paths.diff @@ -0,0 +1,64 @@ +--- a/src/gui/painting/qcups.cpp 2011-12-08 09:06:02.000000000 +0400 ++++ b/src/gui/painting/qcups.cpp 2011-12-18 12:17:07.000000000 +0400 +@@ -87,7 +87,7 @@ + + static void resolveCups() + { +- QLibrary cupsLib(QLatin1String("cups"), 2); ++ QLibrary cupsLib(QLatin1String("@cups@/lib/libcups"), 2); + if(cupsLib.load()) { + _cupsGetDests = (CupsGetDests) cupsLib.resolve("cupsGetDests"); + _cupsFreeDests = (CupsFreeDests) cupsLib.resolve("cupsFreeDests"); +--- a/src/gui/painting/qprinterinfo_unix.cpp 2011-12-08 09:06:02.000000000 +0400 ++++ b/src/gui/painting/qprinterinfo_unix.cpp 2011-12-23 16:22:15.000000000 +0400 +@@ -454,7 +454,7 @@ + char *domain; + int err; + +- QLibrary lib(QLatin1String("nsl")); ++ QLibrary lib(QLatin1String("@glibc@/lib/libnsl")); + typedef int (*ypGetDefaultDomain)(char **); + ypGetDefaultDomain _ypGetDefaultDomain = (ypGetDefaultDomain)lib.resolve("yp_get_default_domain"); + typedef int (*ypAll)(const char *, const char *, const struct ypall_callback *); +--- a/src/network/kernel/qhostinfo_unix.cpp 2011-12-23 16:26:07.000000000 +0400 ++++ b/src/network/kernel/qhostinfo_unix.cpp 2011-12-23 16:25:55.000000000 +0400 +@@ -95,7 +95,7 @@ + static void resolveLibrary() + { + #ifndef QT_NO_LIBRARY +- QLibrary lib(QLatin1String("resolv")); ++ QLibrary lib(QLatin1String("@glibc@/lib/libresolv")); + if (!lib.load()) + return; + +--- a/src/corelib/tools/qlocale_icu.cpp 2011-12-08 09:06:03.000000000 +0400 ++++ b/src/corelib/tools/qlocale_icu.cpp 2011-12-23 16:29:15.000000000 +0400 +@@ -81,7 +81,7 @@ + if (status == NotLoaded) { + + // resolve libicui18n +- QLibrary lib(QLatin1String("icui18n"), QLatin1String(U_ICU_VERSION_SHORT)); ++ QLibrary lib(QLatin1String("@icu@/lib/libicui18n"), QLatin1String(U_ICU_VERSION_SHORT)); + if (!lib.load()) { + qWarning() << "Unable to load library icui18n" << lib.errorString(); + status = ErrorLoading; +@@ -110,7 +110,7 @@ + } + + // resolve libicuuc +- QLibrary ucLib(QLatin1String("icuuc"), QLatin1String(U_ICU_VERSION_SHORT)); ++ QLibrary ucLib(QLatin1String("@icu@/lib/libicuuc"), QLatin1String(U_ICU_VERSION_SHORT)); + if (!ucLib.load()) { + qWarning() << "Unable to load library icuuc" << ucLib.errorString(); + status = ErrorLoading; +--- a/src/plugins/platforms/xlib/qxlibstatic.cpp 2011-12-08 09:06:02.000000000 +0400 ++++ b/src/plugins/platforms/xlib/qxlibstatic.cpp 2011-12-23 20:38:49.000000000 +0400 +@@ -242,7 +242,7 @@ + } + + # define XFIXES_LOAD_RUNTIME(vernum, symbol, symbol_type) \ +- (symbol_type)qt_load_library_runtime("libXfixes", vernum, 4, #symbol); ++ (symbol_type)qt_load_library_runtime("@libXfixes@/lib/libXfixes", vernum, 4, #symbol); + # define XFIXES_LOAD_V1(symbol) \ + XFIXES_LOAD_RUNTIME(1, symbol, Ptr##symbol) + # define XFIXES_LOAD_V2(symbol) \ diff --git a/pkgs/development/libraries/qt-4.x/4.8/dlopen-gtkstyle.diff b/pkgs/development/libraries/qt-4.x/4.8/dlopen-gtkstyle.diff new file mode 100644 index 00000000000..522676a2b31 --- /dev/null +++ b/pkgs/development/libraries/qt-4.x/4.8/dlopen-gtkstyle.diff @@ -0,0 +1,35 @@ +--- a/src/gui/styles/qgtkstyle_p.cpp 2011-12-08 09:06:02.000000000 +0400 ++++ b/src/gui/styles/qgtkstyle_p.cpp 2011-12-24 17:56:46.000000000 +0400 +@@ -312,7 +312,7 @@ + void QGtkStylePrivate::resolveGtk() const + { + // enforce the "0" suffix, so we'll open libgtk-x11-2.0.so.0 +- QLibrary libgtk(QLS("gtk-x11-2.0"), 0, 0); ++ QLibrary libgtk(QLS("@gtk@/lib/libgtk-x11-2.0"), 0, 0); + + gtk_init = (Ptr_gtk_init)libgtk.resolve("gtk_init"); + gtk_window_new = (Ptr_gtk_window_new)libgtk.resolve("gtk_window_new"); +@@ -434,8 +434,8 @@ + pango_font_description_get_family = (Ptr_pango_font_description_get_family)libgtk.resolve("pango_font_description_get_family"); + pango_font_description_get_style = (Ptr_pango_font_description_get_style)libgtk.resolve("pango_font_description_get_style"); + +- gnome_icon_lookup_sync = (Ptr_gnome_icon_lookup_sync)QLibrary::resolve(QLS("gnomeui-2"), 0, "gnome_icon_lookup_sync"); +- gnome_vfs_init= (Ptr_gnome_vfs_init)QLibrary::resolve(QLS("gnomevfs-2"), 0, "gnome_vfs_init"); ++ gnome_icon_lookup_sync = (Ptr_gnome_icon_lookup_sync)QLibrary::resolve(QLS("@libgnomeui@/lib/libgnomeui-2"), 0, "gnome_icon_lookup_sync"); ++ gnome_vfs_init= (Ptr_gnome_vfs_init)QLibrary::resolve(QLS("@gnome_vfs@/lib/libgnomevfs-2"), 0, "gnome_vfs_init"); + } + + /* \internal +@@ -607,9 +607,9 @@ + static bool resolveGConf() + { + if (!QGtkStylePrivate::gconf_client_get_default) { +- QGtkStylePrivate::gconf_client_get_default = (Ptr_gconf_client_get_default)QLibrary::resolve(QLS("gconf-2"), 4, "gconf_client_get_default"); +- QGtkStylePrivate::gconf_client_get_string = (Ptr_gconf_client_get_string)QLibrary::resolve(QLS("gconf-2"), 4, "gconf_client_get_string"); +- QGtkStylePrivate::gconf_client_get_bool = (Ptr_gconf_client_get_bool)QLibrary::resolve(QLS("gconf-2"), 4, "gconf_client_get_bool"); ++ QGtkStylePrivate::gconf_client_get_default = (Ptr_gconf_client_get_default)QLibrary::resolve(QLS("@gconf@/lib/libgconf-2"), 4, "gconf_client_get_default"); ++ QGtkStylePrivate::gconf_client_get_string = (Ptr_gconf_client_get_string)QLibrary::resolve(QLS("@gconf@/lib/libgconf-2"), 4, "gconf_client_get_string"); ++ QGtkStylePrivate::gconf_client_get_bool = (Ptr_gconf_client_get_bool)QLibrary::resolve(QLS("@gconf@/lib/libgconf-2"), 4, "gconf_client_get_bool"); + } + return (QGtkStylePrivate::gconf_client_get_default !=0); + } diff --git a/pkgs/development/libraries/qt-4.x/4.8/dlopen-webkit-nsplugin.diff b/pkgs/development/libraries/qt-4.x/4.8/dlopen-webkit-nsplugin.diff new file mode 100644 index 00000000000..14199d40503 --- /dev/null +++ b/pkgs/development/libraries/qt-4.x/4.8/dlopen-webkit-nsplugin.diff @@ -0,0 +1,52 @@ +diff --git a/src/3rdparty/webkit/Source/WebCore/plugins/qt/PluginPackageQt.cpp b/src/3rdparty/webkit/Source/WebCore/plugins/qt/PluginPackageQt.cpp +index 19941d6..0ec15e2 100644 +--- a/src/3rdparty/webkit/Source/WebCore/plugins/qt/PluginPackageQt.cpp ++++ b/src/3rdparty/webkit/Source/WebCore/plugins/qt/PluginPackageQt.cpp +@@ -121,7 +121,7 @@ static void initializeGtk(QLibrary* module = 0) + } + } + +- QLibrary library(QLatin1String("libgtk-x11-2.0.so.0")); ++ QLibrary library(QLatin1String("@gtk@/lib/libgtk-x11-2.0"), 0); + if (library.load()) { + typedef void *(*gtk_init_check_ptr)(int*, char***); + gtk_init_check_ptr gtkInitCheck = (gtk_init_check_ptr)library.resolve("gtk_init_check"); +diff --git a/src/3rdparty/webkit/Source/WebCore/plugins/qt/PluginViewQt.cpp b/src/3rdparty/webkit/Source/WebCore/plugins/qt/PluginViewQt.cpp +index 2fe69d1..b658e4a 100644 +--- a/src/3rdparty/webkit/Source/WebCore/plugins/qt/PluginViewQt.cpp ++++ b/src/3rdparty/webkit/Source/WebCore/plugins/qt/PluginViewQt.cpp +@@ -857,7 +857,7 @@ static Display *getPluginDisplay() + // support gdk based plugins (like flash) that use a different X connection. + // The code below has the same effect as this one: + // Display *gdkDisplay = gdk_x11_display_get_xdisplay(gdk_display_get_default()); +- QLibrary library(QLatin1String("libgdk-x11-2.0"), 0); ++ QLibrary library(QLatin1String("@gdk_pixbuf@/lib/libgdk-x11-2.0"), 0); + if (!library.load()) + return 0; + +diff --git a/src/3rdparty/webkit/Source/WebKit2/Shared/Plugins/Netscape/x11/NetscapePluginModuleX11.cpp b/src/3rdparty/webkit/Source/WebKit2/Shared/Plugins/Netscape/x11/NetscapePluginModuleX11.cpp +index 2c9b465..56b3074 100644 +--- a/src/3rdparty/webkit/Source/WebKit2/Shared/Plugins/Netscape/x11/NetscapePluginModuleX11.cpp ++++ b/src/3rdparty/webkit/Source/WebKit2/Shared/Plugins/Netscape/x11/NetscapePluginModuleX11.cpp +@@ -42,7 +42,7 @@ namespace WebKit { + #if PLATFORM(QT) + static void initializeGTK() + { +- QLibrary library(QLatin1String("libgtk-x11-2.0.so.0")); ++ QLibrary library(QLatin1String("@gtk@/lib/libgtk-x11-2.0"), 0); + if (library.load()) { + typedef void *(*gtk_init_check_ptr)(int*, char***); + gtk_init_check_ptr gtkInitCheck = reinterpret_cast(library.resolve("gtk_init_check")); +diff --git a/src/3rdparty/webkit/Source/WebKit2/WebProcess/Plugins/Netscape/x11/NetscapePluginX11.cpp b/src/3rdparty/webkit/Source/WebKit2/WebProcess/Plugins/Netscape/x11/NetscapePluginX11.cpp +index b8c8f2a..e7f4dc5 100644 +--- a/src/3rdparty/webkit/Source/WebKit2/WebProcess/Plugins/Netscape/x11/NetscapePluginX11.cpp ++++ b/src/3rdparty/webkit/Source/WebKit2/WebProcess/Plugins/Netscape/x11/NetscapePluginX11.cpp +@@ -54,7 +54,7 @@ static Display *getPluginDisplay() + // The code below has the same effect as this one: + // Display *gdkDisplay = gdk_x11_display_get_xdisplay(gdk_display_get_default()); + +- QLibrary library(QLatin1String("libgdk-x11-2.0"), 0); ++ QLibrary library(QLatin1String("@gdk_pixbuf@/lib/libgdk-x11-2.0"), 0); + if (!library.load()) + return 0; + diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index f159e310049..618c4a80455 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -4458,6 +4458,13 @@ let inherit (pkgs.gnome) glib; }; + qt48 = callPackage ../development/libraries/qt-4.x/4.8 { + # GNOME dependencies are not used unless gtkStyle == true + inherit (pkgs.gnome) gtk libgnomeui GConf gnome_vfs; + # GStreamer is required for HTML5 video in QtWebKit + inherit (pkgs.gst_all) gstreamer gstPluginsBase; + }; + qtscriptgenerator = callPackage ../development/libraries/qtscriptgenerator { }; quesoglc = callPackage ../development/libraries/quesoglc { }; From f806eca299854ed6d3d63e65e49b07841d83e1f9 Mon Sep 17 00:00:00 2001 From: "Yury G. Kudryashov" Date: Sat, 24 Dec 2011 22:28:00 +0000 Subject: [PATCH 091/186] Actually upgrade ntfs-3g ntfsprogs collection is now part of ntfs-3g svn path=/nixpkgs/trunk/; revision=31065 --- pkgs/tools/filesystems/ntfs-3g/default.nix | 25 +++++++++++++------- pkgs/tools/filesystems/ntfsprogs/default.nix | 23 ------------------ pkgs/top-level/all-packages.nix | 3 ++- 3 files changed, 19 insertions(+), 32 deletions(-) delete mode 100644 pkgs/tools/filesystems/ntfsprogs/default.nix diff --git a/pkgs/tools/filesystems/ntfs-3g/default.nix b/pkgs/tools/filesystems/ntfs-3g/default.nix index df75cbf5966..2a8bef6c6ed 100644 --- a/pkgs/tools/filesystems/ntfs-3g/default.nix +++ b/pkgs/tools/filesystems/ntfs-3g/default.nix @@ -1,28 +1,37 @@ -{stdenv, fetchurl, utillinux}: +{stdenv, fetchurl, utillinux, libuuid +, crypto ? false, libgcrypt, gnutls, pkgconfig}: stdenv.mkDerivation rec { - pname = "ntfs-3g"; + pname = "ntfs-3g_ntfsprogs"; version = "2011.4.12"; name = "${pname}-${version}"; + buildInputs = [libuuid] ++ stdenv.lib.optionals crypto [gnutls libgcrypt]; + buildNativeInputs = stdenv.lib.optional crypto pkgconfig; + src = fetchurl { - url = "http://pkgs.fedoraproject.org/repo/pkgs/ntfs-3g/ntfs-3g-2010.10.2.tgz/91405690f25822142cdcb43d03e62d3f/ntfs-3g-2010.10.2.tgz"; - sha256 = "0wcyks4nvi1kck8i2dgwfsy5zxhil0v0xam8zbg1p592xbqygiqp"; + url = "http://tuxera.com/opensource/${name}.tgz"; + sha256 = "01gfn94f4fdrl1rjhhxjvjbarr1mipdi4pmhhwirp0gy1dzp935a"; }; - preConfigure = '' - substituteInPlace src/Makefile.in --replace /sbin '@sbindir@' + patchPhase = '' + substituteInPlace src/Makefile.in --replace /sbin '@sbindir@' + substituteInPlace ntfsprogs/Makefile.in --replace /sbin '@sbindir@' substituteInPlace libfuse-lite/mount_util.c \ --replace /bin/mount ${utillinux}/bin/mount \ --replace /bin/umount ${utillinux}/bin/umount ''; - configureFlags = "--disable-ldconfig --exec-prefix=\${prefix} --enable-mount-helper"; + configureFlags = + '' + --disable-ldconfig --exec-prefix=''${prefix} --enable-mount-helper + --enable-posix-acls --enable-xattr-mappings --${if crypto then "enable" else "disable"}-crypto + ''; postInstall = '' # Prefer ntfs-3g over the ntfs driver in the kernel. - ln -s mount.ntfs-3g $out/sbin/mount.ntfs + ln -sv mount.ntfs-3g $out/sbin/mount.ntfs ''; meta = { diff --git a/pkgs/tools/filesystems/ntfsprogs/default.nix b/pkgs/tools/filesystems/ntfsprogs/default.nix deleted file mode 100644 index 3deb668eddb..00000000000 --- a/pkgs/tools/filesystems/ntfsprogs/default.nix +++ /dev/null @@ -1,23 +0,0 @@ -{stdenv, fetchurl, libuuid}: - -stdenv.mkDerivation rec { - name = "ntfsprogs-2.0.0"; - - src = fetchurl { - url = "mirror://sourceforge/linux-ntfs/${name}.tar.bz2"; - sha256 = "ad36e19706c7303b10aa0a9bf2c2dd0309b91cd0171f1c9eb361d94a85017432"; - }; - - buildInputs = [libuuid]; - - preConfigure = - '' - substituteInPlace ntfsprogs/Makefile.in --replace /sbin $out/sbin - ''; - - meta = { - description = "Utilities for the NTFS filesystem"; - homepage = http://sourceforge.net/projects/linux-ntfs; - license = "GPL"; - }; -} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 618c4a80455..f9243b7e05f 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -1070,7 +1070,8 @@ let ntfs3g = callPackage ../tools/filesystems/ntfs-3g { }; - ntfsprogs = callPackage ../tools/filesystems/ntfsprogs { }; + # ntfsprogs are merged into ntfs-3g + ntfsprogs = pkgs.ntfs3g; ntp = callPackage ../tools/networking/ntp { }; From 8af094c99f8d2178cf5d0f03960815607b07d50c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andres=20L=C3=B6h?= Date: Sun, 25 Dec 2011 00:12:52 +0000 Subject: [PATCH 092/186] Updated ghc HEAD snapshot to ghc-7.4.1-rc1. svn path=/nixpkgs/trunk/; revision=31066 --- pkgs/development/compilers/ghc/head.nix | 6 +++--- pkgs/top-level/all-packages.nix | 3 ++- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/pkgs/development/compilers/ghc/head.nix b/pkgs/development/compilers/ghc/head.nix index 330165437d5..0d3301df60a 100644 --- a/pkgs/development/compilers/ghc/head.nix +++ b/pkgs/development/compilers/ghc/head.nix @@ -1,13 +1,13 @@ {stdenv, fetchurl, ghc, perl, gmp, ncurses, darwinInstallNameToolUtility}: stdenv.mkDerivation rec { - version = "7.3.20111212"; + version = "7.4.0.20111219"; name = "ghc-${version}"; src = fetchurl { - url = "http://haskell.org/ghc/dist/current/dist/${name}-src.tar.bz2"; - sha256 = "1i8zw3qaihzbgygdlip9d5g5321wv1yhashf8nrinwgy5649rsyf"; + url = "http://haskell.org/ghc/dist/7.4.1-rc1/${name}-src.tar.bz2"; + sha256 = "11imfag07wr9s5vf12yh6bz4hjfbw20i1c7n8py9fa4vx7va676n"; }; buildInputs = [ghc perl gmp ncurses] ++ diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index f9243b7e05f..0c9e92e7c9a 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -2233,7 +2233,8 @@ let # Reasonably current HEAD snapshot. Should *always* be lowPrio. haskellPackages_ghcHEAD = haskellPackagesFun ../development/compilers/ghc/head.nix - (haskellPackages_ghc704.ghcWithPackages (self : [ self.alex self.happy ])) + # (haskellPackages_ghc704.ghcWithPackages (self : [ self.alex self.happy ])) + (if stdenv.isDarwin then ghc704Binary else ghc6121Binary) (x : x.ghcHEADPrefs) false false lowPrio; haxeDist = import ../development/compilers/haxe { From 658f4ae7e2b3f06c43a8ed7bd69c1757d5446d12 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Sun, 25 Dec 2011 16:06:00 +0000 Subject: [PATCH 093/186] haskell-dstring: added version 0.4.0.3 svn path=/nixpkgs/trunk/; revision=31068 --- .../libraries/haskell/dstring/default.nix | 14 ++++++++++++++ pkgs/top-level/haskell-packages.nix | 2 ++ 2 files changed, 16 insertions(+) create mode 100644 pkgs/development/libraries/haskell/dstring/default.nix diff --git a/pkgs/development/libraries/haskell/dstring/default.nix b/pkgs/development/libraries/haskell/dstring/default.nix new file mode 100644 index 00000000000..44997847cfb --- /dev/null +++ b/pkgs/development/libraries/haskell/dstring/default.nix @@ -0,0 +1,14 @@ +{ cabal, baseUnicodeSymbols, dlist }: + +cabal.mkDerivation (self: { + pname = "dstring"; + version = "0.4.0.3"; + sha256 = "0wzj1wzls7w79ac84sc5msblh2dmfmcxm77drpdqdirl1pwdlq9c"; + buildDepends = [ baseUnicodeSymbols dlist ]; + meta = { + homepage = "https://github.com/basvandijk/dstring"; + description = "Difference strings"; + license = self.stdenv.lib.licenses.bsd3; + platforms = self.ghc.meta.platforms; + }; +}) diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix index 8fe6bb15f2c..e7c621f4947 100644 --- a/pkgs/top-level/haskell-packages.nix +++ b/pkgs/top-level/haskell-packages.nix @@ -612,6 +612,8 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y); downloadCurl = callPackage ../development/libraries/haskell/download-curl { tagsoup = self.tagsoup_0_10_1; }; + dstring = callPackage ../development/libraries/haskell/dstring {}; + editline = callPackage ../development/libraries/haskell/editline {}; emailValidate = callPackage ../development/libraries/haskell/email-validate {}; From 6a9bbeac0f4d87529979f5df9d6da0f9c4177e1f Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Sun, 25 Dec 2011 16:06:11 +0000 Subject: [PATCH 094/186] haskell-string-combinators: added version 0.6.0.2 svn path=/nixpkgs/trunk/; revision=31069 --- .../haskell/string-combinators/default.nix | 14 ++++++++++++++ pkgs/top-level/haskell-packages.nix | 2 ++ 2 files changed, 16 insertions(+) create mode 100644 pkgs/development/libraries/haskell/string-combinators/default.nix diff --git a/pkgs/development/libraries/haskell/string-combinators/default.nix b/pkgs/development/libraries/haskell/string-combinators/default.nix new file mode 100644 index 00000000000..62fadb1462a --- /dev/null +++ b/pkgs/development/libraries/haskell/string-combinators/default.nix @@ -0,0 +1,14 @@ +{ cabal, baseUnicodeSymbols }: + +cabal.mkDerivation (self: { + pname = "string-combinators"; + version = "0.6.0.2"; + sha256 = "1bsnli6376nq5dmcx8da2fakj7h73plqz6v1myzhkz1f6r3qcjfi"; + buildDepends = [ baseUnicodeSymbols ]; + meta = { + homepage = "https://github.com/basvandijk/string-combinators"; + description = "Polymorphic functions to build and combine stringlike values"; + license = self.stdenv.lib.licenses.bsd3; + platforms = self.ghc.meta.platforms; + }; +}) diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix index e7c621f4947..e15c7fecf75 100644 --- a/pkgs/top-level/haskell-packages.nix +++ b/pkgs/top-level/haskell-packages.nix @@ -1160,6 +1160,8 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y); strict = callPackage ../development/libraries/haskell/strict {}; + stringCombinators = callPackage ../development/libraries/haskell/string-combinators {}; + syb_0_2_2 = callPackage ../development/libraries/haskell/syb/0.2.2.nix {}; syb_0_3 = callPackage ../development/libraries/haskell/syb/0.3.nix {}; syb_0_3_3 = callPackage ../development/libraries/haskell/syb/0.3.3.nix {}; From 46084dbc3c6f7db88fe6d0aad7ae28cb37c2f23e Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Sun, 25 Dec 2011 16:06:17 +0000 Subject: [PATCH 095/186] haskell-repr: added version 0.4.1.2 svn path=/nixpkgs/trunk/; revision=31070 --- .../libraries/haskell/repr/default.nix | 16 ++++++++++++++++ pkgs/top-level/haskell-packages.nix | 2 ++ 2 files changed, 18 insertions(+) create mode 100644 pkgs/development/libraries/haskell/repr/default.nix diff --git a/pkgs/development/libraries/haskell/repr/default.nix b/pkgs/development/libraries/haskell/repr/default.nix new file mode 100644 index 00000000000..ab953e46da6 --- /dev/null +++ b/pkgs/development/libraries/haskell/repr/default.nix @@ -0,0 +1,16 @@ +{ cabal, baseUnicodeSymbols, dstring, random, stringCombinators }: + +cabal.mkDerivation (self: { + pname = "repr"; + version = "0.4.1.2"; + sha256 = "09rv23p1hvvfw5wnhiawgrpqgqa4i0d00skyj9z1jj6bfxk5avjs"; + buildDepends = [ + baseUnicodeSymbols dstring random stringCombinators + ]; + meta = { + homepage = "https://github.com/basvandijk/repr"; + description = "Render overloaded expressions to their textual representation"; + license = self.stdenv.lib.licenses.bsd3; + platforms = self.ghc.meta.platforms; + }; +}) diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix index e15c7fecf75..462d9ca594e 100644 --- a/pkgs/top-level/haskell-packages.nix +++ b/pkgs/top-level/haskell-packages.nix @@ -1132,6 +1132,8 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y); RepLib = callPackage ../development/libraries/haskell/RepLib {}; + repr = callPackage ../development/libraries/haskell/repr {}; + RSA = callPackage ../development/libraries/haskell/RSA {}; safe = callPackage ../development/libraries/haskell/safe {}; From bbd45bcdc6d37d84d1f64f97925a7a65c6f66647 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Sun, 25 Dec 2011 16:06:20 +0000 Subject: [PATCH 096/186] haskell-aeson: updated to version 0.5.0.0 svn path=/nixpkgs/trunk/; revision=31071 --- pkgs/development/libraries/haskell/aeson/default.nix | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/pkgs/development/libraries/haskell/aeson/default.nix b/pkgs/development/libraries/haskell/aeson/default.nix index 04a94c222c6..b8ead39671e 100644 --- a/pkgs/development/libraries/haskell/aeson/default.nix +++ b/pkgs/development/libraries/haskell/aeson/default.nix @@ -1,14 +1,14 @@ -{ cabal, attoparsec, blazeBuilder, blazeTextual, deepseq, dlist -, hashable, mtl, syb, text, time, unorderedContainers, vector +{ cabal, attoparsec, blazeBuilder, deepseq, dlist, hashable, mtl +, syb, text, time, unorderedContainers, vector }: cabal.mkDerivation (self: { pname = "aeson"; - version = "0.4.0.1"; - sha256 = "15aq3r36vda8v1fn3pn0k638w32kzy15kbrf97krvg3xdwrvybky"; + version = "0.5.0.0"; + sha256 = "1n7c0kf6rdf5p76mjcxlqrzhnfz4b1zkkbxk9w94hibb0s4kwxv6"; buildDepends = [ - attoparsec blazeBuilder blazeTextual deepseq dlist hashable mtl syb - text time unorderedContainers vector + attoparsec blazeBuilder deepseq dlist hashable mtl syb text time + unorderedContainers vector ]; meta = { homepage = "https://github.com/bos/aeson"; From 27fa436674f761e3f0a5097550c26d28dd72e902 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Sun, 25 Dec 2011 16:06:23 +0000 Subject: [PATCH 097/186] haskell-dstring: updated to version 0.4.0.3 svn path=/nixpkgs/trunk/; revision=31072 --- pkgs/development/libraries/haskell/dstring/default.nix | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/pkgs/development/libraries/haskell/dstring/default.nix b/pkgs/development/libraries/haskell/dstring/default.nix index 44997847cfb..0b979e179f4 100644 --- a/pkgs/development/libraries/haskell/dstring/default.nix +++ b/pkgs/development/libraries/haskell/dstring/default.nix @@ -10,5 +10,9 @@ cabal.mkDerivation (self: { description = "Difference strings"; license = self.stdenv.lib.licenses.bsd3; platforms = self.ghc.meta.platforms; + maintainers = [ + self.stdenv.lib.maintainers.andres + self.stdenv.lib.maintainers.simons + ]; }; }) From 1b722dcc80d121953be1e453cc5eaeb1256857eb Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Sun, 25 Dec 2011 16:06:28 +0000 Subject: [PATCH 098/186] haskell-repr: updated to version 0.4.1.2 svn path=/nixpkgs/trunk/; revision=31073 --- pkgs/development/libraries/haskell/repr/default.nix | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/pkgs/development/libraries/haskell/repr/default.nix b/pkgs/development/libraries/haskell/repr/default.nix index ab953e46da6..bad1e93d6b9 100644 --- a/pkgs/development/libraries/haskell/repr/default.nix +++ b/pkgs/development/libraries/haskell/repr/default.nix @@ -12,5 +12,9 @@ cabal.mkDerivation (self: { description = "Render overloaded expressions to their textual representation"; license = self.stdenv.lib.licenses.bsd3; platforms = self.ghc.meta.platforms; + maintainers = [ + self.stdenv.lib.maintainers.andres + self.stdenv.lib.maintainers.simons + ]; }; }) From 8d7110cb668f964d306ee74fbd0f071a39a4b625 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Sun, 25 Dec 2011 16:06:35 +0000 Subject: [PATCH 099/186] haskell-string-combinators: updated to version 0.6.0.2 svn path=/nixpkgs/trunk/; revision=31074 --- .../libraries/haskell/string-combinators/default.nix | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/pkgs/development/libraries/haskell/string-combinators/default.nix b/pkgs/development/libraries/haskell/string-combinators/default.nix index 62fadb1462a..3371c56ceb2 100644 --- a/pkgs/development/libraries/haskell/string-combinators/default.nix +++ b/pkgs/development/libraries/haskell/string-combinators/default.nix @@ -10,5 +10,9 @@ cabal.mkDerivation (self: { description = "Polymorphic functions to build and combine stringlike values"; license = self.stdenv.lib.licenses.bsd3; platforms = self.ghc.meta.platforms; + maintainers = [ + self.stdenv.lib.maintainers.andres + self.stdenv.lib.maintainers.simons + ]; }; }) From 5968d4645bcc1f24d59ec4b4548a0ff54a8248bc Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Sun, 25 Dec 2011 16:06:41 +0000 Subject: [PATCH 100/186] haskell-yesod-auth: updated to version 0.7.9 svn path=/nixpkgs/trunk/; revision=31075 --- pkgs/development/libraries/haskell/yesod-auth/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/yesod-auth/default.nix b/pkgs/development/libraries/haskell/yesod-auth/default.nix index ce9c3c29808..2ed7486eff4 100644 --- a/pkgs/development/libraries/haskell/yesod-auth/default.nix +++ b/pkgs/development/libraries/haskell/yesod-auth/default.nix @@ -7,8 +7,8 @@ cabal.mkDerivation (self: { pname = "yesod-auth"; - version = "0.7.8"; - sha256 = "1v3mvb22g56frvwb82l73k7cqrl926hg133x5idl5q66fp8h94q0"; + version = "0.7.9"; + sha256 = "08vlj61y3czv0v8dnfdkyfww5sccia6j0fxnn1hxk44zghwhy214"; buildDepends = [ aeson authenticate blazeHtml controlMonadAttempt hamlet httpEnumerator mimeMail persistent persistentTemplate pureMD5 From 6dbd367227c1eaf8796242263e1120e59f3b4831 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Sun, 25 Dec 2011 16:06:47 +0000 Subject: [PATCH 101/186] haskell-yesod-json: updated to version 0.2.2.2 svn path=/nixpkgs/trunk/; revision=31076 --- .../libraries/haskell/yesod-json/default.nix | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/pkgs/development/libraries/haskell/yesod-json/default.nix b/pkgs/development/libraries/haskell/yesod-json/default.nix index 167ead39dd5..cf65dc8993e 100644 --- a/pkgs/development/libraries/haskell/yesod-json/default.nix +++ b/pkgs/development/libraries/haskell/yesod-json/default.nix @@ -1,13 +1,14 @@ -{ cabal, aeson, shakespeareJs, text, unorderedContainers, vector -, yesodCore +{ cabal, aeson, blazeBuilder, shakespeareJs, text +, unorderedContainers, vector, yesodCore }: cabal.mkDerivation (self: { pname = "yesod-json"; - version = "0.2.2.1"; - sha256 = "16l5ygj9xsg2lzw3mkn1kmq543n9w5z1g6lyl8nw5bblp66lfxq3"; + version = "0.2.2.2"; + sha256 = "0mhajy0hal9icwys63vcmlipl3gwm8bvv7xywwjydd86drqhz9ni"; buildDepends = [ - aeson shakespeareJs text unorderedContainers vector yesodCore + aeson blazeBuilder shakespeareJs text unorderedContainers vector + yesodCore ]; meta = { homepage = "http://www.yesodweb.com/"; From 8755735a06639cf34d7cb3b12ccbac6fd444608f Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Sun, 25 Dec 2011 16:18:34 +0000 Subject: [PATCH 102/186] haskell-cabal2nix: updated to version 1.23 svn path=/nixpkgs/trunk/; revision=31077 --- pkgs/development/tools/haskell/cabal2nix/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/haskell/cabal2nix/default.nix b/pkgs/development/tools/haskell/cabal2nix/default.nix index c8753ea367b..1b98d7821e5 100644 --- a/pkgs/development/tools/haskell/cabal2nix/default.nix +++ b/pkgs/development/tools/haskell/cabal2nix/default.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "cabal2nix"; - version = "1.21"; - sha256 = "00gsayb7axxm8z9jrngckb7c666x1kibvln67g2rpchi6djg6wn7"; + version = "1.23"; + sha256 = "1rnvnzwb4n89hq4wpyq1h6x773r7y23clqj5slsfnas7j3alzz8c"; isLibrary = false; isExecutable = true; buildDepends = [ hackageDb HTTP mtl nixosTypes regexPosix ]; From 50fb545705890faa4dc3d03eaa69332dc77c2759 Mon Sep 17 00:00:00 2001 From: "Yury G. Kudryashov" Date: Sun, 25 Dec 2011 16:22:36 +0000 Subject: [PATCH 103/186] qt48: make "gtkStyle = true" work svn path=/nixpkgs/trunk/; revision=31078 --- pkgs/development/libraries/qt-4.x/4.8/default.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/development/libraries/qt-4.x/4.8/default.nix b/pkgs/development/libraries/qt-4.x/4.8/default.nix index 8ef50777522..dfaf63e6725 100644 --- a/pkgs/development/libraries/qt-4.x/4.8/default.nix +++ b/pkgs/development/libraries/qt-4.x/4.8/default.nix @@ -85,7 +85,8 @@ stdenv.mkDerivation rec { # The following libraries are only used in plugins buildInputs = [ cups # Qt dlopen's libcups instead of linking to it - mysql postgresql sqlite libjpeg libmng libtiff icu ]; + mysql postgresql sqlite libjpeg libmng libtiff icu ] + ++ stdenv.lib.optionals gtkStyle [ gtk gdk_pixbuf ]; buildNativeInputs = [ perl pkgconfig which ]; From 94a638d1197b5bb4338b194f00986fb9e51d0137 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?= Date: Sun, 25 Dec 2011 22:54:32 +0000 Subject: [PATCH 104/186] Updating digikam. Now at least digikam now passes the configure stage. I've still not finished building it though. svn path=/nixpkgs/trunk/; revision=31080 --- pkgs/applications/graphics/digikam/default.nix | 16 +++++++++++----- pkgs/applications/graphics/digikam/include.diff | 12 ------------ 2 files changed, 11 insertions(+), 17 deletions(-) delete mode 100644 pkgs/applications/graphics/digikam/include.diff diff --git a/pkgs/applications/graphics/digikam/default.nix b/pkgs/applications/graphics/digikam/default.nix index 6d4431516f8..895453aae44 100644 --- a/pkgs/applications/graphics/digikam/default.nix +++ b/pkgs/applications/graphics/digikam/default.nix @@ -1,22 +1,28 @@ { stdenv, fetchurl, cmake, qt4, kdelibs, automoc4, phonon, qimageblitz, qca2, eigen, kdegraphics, lcms, jasper, libgphoto2, kdepimlibs, gettext, soprano, kdeedu, -liblqr1, lensfun, pkgconfig }: +liblqr1, lensfun, pkgconfig, qjson, libkdcraw, opencv, libkexiv2, libkipi, boost, +shared_desktop_ontologies, marble }: stdenv.mkDerivation rec { - name = "digikam-1.5.0"; + name = "digikam-2.4.1"; src = fetchurl { url = "mirror://sourceforge/digikam/${name}.tar.bz2"; - sha256 = "1vvzw132aw2c1z2v1zc3aqa99kvg501krr2law35ri12zkqjsvaz"; + sha256 = "0fyyhc26syd1d1m8jqyg2i66hwd523mh419ln8y944jkrjj6gadc"; }; buildInputs = [ cmake qt4 kdelibs kdegraphics automoc4 phonon qimageblitz qca2 eigen lcms jasper libgphoto2 kdepimlibs gettext soprano kdeedu liblqr1 lensfun - pkgconfig ]; + pkgconfig qjson libkdcraw opencv libkexiv2 libkipi boost shared_desktop_ontologies + marble ]; KDEDIRS=kdeedu; - patches = [ ./include.diff ]; + # Make digikam find some FindXXXX.cmake + preConfigure = '' + cp ${qjson}/share/apps/cmake/modules/FindQJSON.cmake cmake/modules; + cp ${marble}/share/apps/cmake/modules/FindMarble.cmake cmake/modules; + ''; meta = { description = "Photo Management Program"; diff --git a/pkgs/applications/graphics/digikam/include.diff b/pkgs/applications/graphics/digikam/include.diff deleted file mode 100644 index 0762ce04d26..00000000000 --- a/pkgs/applications/graphics/digikam/include.diff +++ /dev/null @@ -1,12 +0,0 @@ -diff --git a/libs/imageproperties/markerclusterholderplugin/CMakeLists.txt b/libs/imageproperties/markerclusterholderplugin/CMakeLists.txt -index 9ee36cc..c6e5c00 100644 ---- a/libs/imageproperties/markerclusterholderplugin/CMakeLists.txt -+++ b/libs/imageproperties/markerclusterholderplugin/CMakeLists.txt -@@ -18,6 +18,7 @@ IF(MARBLEWIDGET_SUPPORTS_PLUGINS) - - INCLUDE_DIRECTORIES( ${CMAKE_CURRENT_SOURCE_DIR}/libs/imageproperties/markerclusterholderplugin/ - ${CMAKE_BINARY_DIR}/libs/imageproperties/markerclusterholderplugin/ -+ ${LIBMARBLEWIDGET_INCLUDE_DIR}/.. - ${QT_INCLUDE_DIR} - ) - From 0efe938292e657efdd335f9ff09f6e35e85ff409 Mon Sep 17 00:00:00 2001 From: Michael Raskin <7c6f434c@mail.ru> Date: Mon, 26 Dec 2011 04:20:15 +0000 Subject: [PATCH 105/186] A newer rc svn path=/nixpkgs/trunk/; revision=31081 --- pkgs/os-specific/linux/kernel/linux-3.2.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/linux-3.2.nix b/pkgs/os-specific/linux/kernel/linux-3.2.nix index 576ef0941f7..8a4fa9648b1 100644 --- a/pkgs/os-specific/linux/kernel/linux-3.2.nix +++ b/pkgs/os-specific/linux/kernel/linux-3.2.nix @@ -214,9 +214,9 @@ in import ./generic.nix ( rec { - version = "3.2-rc6"; + version = "3.2-rc7"; - modDirVersion = "3.2.0-rc6"; + modDirVersion = "3.2.0-rc7"; preConfigure = '' substituteInPlace scripts/depmod.sh --replace '-b "$INSTALL_MOD_PATH"' "" @@ -225,7 +225,7 @@ import ./generic.nix ( src = fetchurl { #url = "mirror://kernel/linux/kernel/v3.x/linux-${version}.tar.bz2"; url = "mirror://kernel/linux/kernel/v3.0/testing/linux-${version}.tar.bz2"; - sha256 = "18wdp3r3xvq12ddv7c7z0h0i8zsm3wrahl83s6jqbixrw4aq5zbd"; + sha256 = "0phakj1c97n2fdz9lh5gmpg6c5g45z2xpgrz3q2z2y9w9dgk3mqd"; }; config = configWithPlatform stdenv.platform; From 331d4d13da215ed4063141d9d3b11fd1db3def69 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?= Date: Mon, 26 Dec 2011 10:13:55 +0000 Subject: [PATCH 106/186] Trying to make digikam build with boost 1.47 (http://trac.macports.org/ticket/32524), as it fails with 1.48. svn path=/nixpkgs/trunk/; revision=31082 --- pkgs/top-level/all-packages.nix | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 0c9e92e7c9a..428dd041588 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -8040,7 +8040,9 @@ let bluedevil = callPackage ../tools/bluetooth/bluedevil { }; - digikam = callPackage ../applications/graphics/digikam { }; + digikam = callPackage ../applications/graphics/digikam { + boost = boost147; + }; k3b = callPackage ../applications/misc/k3b { }; From 70b696e83e36d08b7a88ca5fd968b160a507e3f8 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 26 Dec 2011 15:35:30 +0000 Subject: [PATCH 107/186] haskell-HTTP: added version 4000.2.2 svn path=/nixpkgs/trunk/; revision=31083 --- .../libraries/haskell/HTTP/4000.2.2.nix | 18 ++++++++++++++++++ pkgs/top-level/haskell-packages.nix | 5 +++-- 2 files changed, 21 insertions(+), 2 deletions(-) create mode 100644 pkgs/development/libraries/haskell/HTTP/4000.2.2.nix diff --git a/pkgs/development/libraries/haskell/HTTP/4000.2.2.nix b/pkgs/development/libraries/haskell/HTTP/4000.2.2.nix new file mode 100644 index 00000000000..082c3ddc3ac --- /dev/null +++ b/pkgs/development/libraries/haskell/HTTP/4000.2.2.nix @@ -0,0 +1,18 @@ +{ cabal, mtl, network, parsec }: + +cabal.mkDerivation (self: { + pname = "HTTP"; + version = "4000.2.2"; + sha256 = "0qrr9wdj25sdfxifppmw0w14g8skpgf42ic4iqcqylxxzfa8v7vh"; + buildDepends = [ mtl network parsec ]; + meta = { + homepage = "https://github.com/haskell/HTTP"; + description = "A library for client-side HTTP"; + license = self.stdenv.lib.licenses.bsd3; + platforms = self.ghc.meta.platforms; + maintainers = [ + self.stdenv.lib.maintainers.andres + self.stdenv.lib.maintainers.simons + ]; + }; +}) diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix index 462d9ca594e..0a844a5a167 100644 --- a/pkgs/top-level/haskell-packages.nix +++ b/pkgs/top-level/haskell-packages.nix @@ -152,7 +152,7 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y); syb = self.syb_0_3_6; # 7.2 ok, 7.3 ok xhtml = self.xhtml_3000_2_0_1; # 7.2 ok, 7.3 ok zlib = self.zlib_0_5_3_1; # 7.2 ok, 7.3 ok - HTTP = self.HTTP_4000_2_1; # 7.2 ok, 7.3 ok + HTTP = self.HTTP_4000_2_2; # 7.2 ok, 7.3 ok deepseq = self.deepseq_1_1_0_2; # 7.2 ok, 7.3 ok text = self.text_0_11_1_12; # 7.2 ok, 7.3 ok transformers = self.transformers_0_2_2_0; # 7.2 ok, 7.3 ok @@ -759,7 +759,8 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y); HTTP_4000_1_1 = callPackage ../development/libraries/haskell/HTTP/4000.1.1.nix {}; HTTP_4000_1_2 = callPackage ../development/libraries/haskell/HTTP/4000.1.2.nix {}; HTTP_4000_2_1 = callPackage ../development/libraries/haskell/HTTP/4000.2.1.nix {}; - HTTP = self.HTTP_4000_2_1; + HTTP_4000_2_2 = callPackage ../development/libraries/haskell/HTTP/4000.2.2.nix {}; + HTTP = self.HTTP_4000_2_2; hackageDb = callPackage ../development/libraries/haskell/hackage-db {}; From e4f3dcda83f82e5713c9a144afa059bfa6912d99 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 26 Dec 2011 15:35:33 +0000 Subject: [PATCH 108/186] haskell-byteorder: added version 1.0.3 svn path=/nixpkgs/trunk/; revision=31084 --- .../libraries/haskell/byteorder/default.nix | 13 +++++++++++++ pkgs/top-level/haskell-packages.nix | 2 ++ 2 files changed, 15 insertions(+) create mode 100644 pkgs/development/libraries/haskell/byteorder/default.nix diff --git a/pkgs/development/libraries/haskell/byteorder/default.nix b/pkgs/development/libraries/haskell/byteorder/default.nix new file mode 100644 index 00000000000..e709a12ce8b --- /dev/null +++ b/pkgs/development/libraries/haskell/byteorder/default.nix @@ -0,0 +1,13 @@ +{ cabal }: + +cabal.mkDerivation (self: { + pname = "byteorder"; + version = "1.0.3"; + sha256 = "056jb47r4pkimi6z2z49prnsmjnhnijk57zm0divl1k55igi5way"; + meta = { + homepage = "http://community.haskell.org/~aslatter/code/byteorder"; + description = "Exposes the native endianness or byte ordering of the system"; + license = self.stdenv.lib.licenses.bsd3; + platforms = self.ghc.meta.platforms; + }; +}) diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix index 0a844a5a167..24b76428f8d 100644 --- a/pkgs/top-level/haskell-packages.nix +++ b/pkgs/top-level/haskell-packages.nix @@ -481,6 +481,8 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y); bson = callPackage ../development/libraries/haskell/bson {}; + byteorder = callPackage ../development/libraries/haskell/byteorder {}; + bytestringNums = callPackage ../development/libraries/haskell/bytestring-nums {}; bytestringLexing = callPackage ../development/libraries/haskell/bytestring-lexing {}; From 2d972e96ad225842bddf36bfea5d7a66119e0c48 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 26 Dec 2011 15:35:37 +0000 Subject: [PATCH 109/186] haskell-fast-logger: added version 0.0.1 svn path=/nixpkgs/trunk/; revision=31085 --- .../libraries/haskell/fast-logger/default.nix | 17 +++++++++++++++++ pkgs/top-level/haskell-packages.nix | 2 ++ 2 files changed, 19 insertions(+) create mode 100644 pkgs/development/libraries/haskell/fast-logger/default.nix diff --git a/pkgs/development/libraries/haskell/fast-logger/default.nix b/pkgs/development/libraries/haskell/fast-logger/default.nix new file mode 100644 index 00000000000..68bc8ca6005 --- /dev/null +++ b/pkgs/development/libraries/haskell/fast-logger/default.nix @@ -0,0 +1,17 @@ +{ cabal, blazeBuilder }: + +cabal.mkDerivation (self: { + pname = "fast-logger"; + version = "0.0.1"; + sha256 = "19ff2dhkh62i1ljsl90wnsblzk30dz0yx4kw5gk1hb22md7hakim"; + buildDepends = [ blazeBuilder ]; + meta = { + description = "A fast logging system"; + license = self.stdenv.lib.licenses.bsd3; + platforms = self.ghc.meta.platforms; + maintainers = [ + self.stdenv.lib.maintainers.andres + self.stdenv.lib.maintainers.simons + ]; + }; +}) diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix index 24b76428f8d..8647faeedfa 100644 --- a/pkgs/top-level/haskell-packages.nix +++ b/pkgs/top-level/haskell-packages.nix @@ -635,6 +635,8 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y); failure = callPackage ../development/libraries/haskell/failure {}; + fastLogger = callPackage ../development/libraries/haskell/fast-logger {}; + fclabels = callPackage ../development/libraries/haskell/fclabels {}; funcmp = callPackage ../development/libraries/haskell/funcmp {}; From 5aacd74bf82d970ac3c9740062865e646ddaa6d7 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 26 Dec 2011 15:35:42 +0000 Subject: [PATCH 110/186] haskell-wai-logger: added version 0.1.1 svn path=/nixpkgs/trunk/; revision=31086 --- .../libraries/haskell/wai-logger/default.nix | 18 ++++++++++++++++++ pkgs/top-level/haskell-packages.nix | 2 ++ 2 files changed, 20 insertions(+) create mode 100644 pkgs/development/libraries/haskell/wai-logger/default.nix diff --git a/pkgs/development/libraries/haskell/wai-logger/default.nix b/pkgs/development/libraries/haskell/wai-logger/default.nix new file mode 100644 index 00000000000..d992ff424da --- /dev/null +++ b/pkgs/development/libraries/haskell/wai-logger/default.nix @@ -0,0 +1,18 @@ +{ cabal, blazeBuilder, byteorder, caseInsensitive, fastLogger +, httpTypes, network, time, wai +}: + +cabal.mkDerivation (self: { + pname = "wai-logger"; + version = "0.1.1"; + sha256 = "02354n4j1wj2n2vn4hza7ng2gqbf6ibvr4gfnv7maisivgqjy694"; + buildDepends = [ + blazeBuilder byteorder caseInsensitive fastLogger httpTypes network + time wai + ]; + meta = { + description = "A logging system for WAI"; + license = self.stdenv.lib.licenses.bsd3; + platforms = self.ghc.meta.platforms; + }; +}) diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix index 8647faeedfa..b81b933d6bd 100644 --- a/pkgs/top-level/haskell-packages.nix +++ b/pkgs/top-level/haskell-packages.nix @@ -1347,6 +1347,8 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y); waiExtra = callPackage ../development/libraries/haskell/wai-extra {}; + waiLogger = callPackage ../development/libraries/haskell/wai-logger {}; + warp = callPackage ../development/libraries/haskell/warp {}; WebBits_1_0 = callPackage ../development/libraries/haskell/WebBits/1.0.nix { From 481a96b2ed6a7c98cda599f44ee688632e8b4e05 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 26 Dec 2011 15:35:48 +0000 Subject: [PATCH 111/186] haskell-shakespeare-i18n: added version 0.0.0 svn path=/nixpkgs/trunk/; revision=31087 --- .../libraries/haskell/shakespeare-i18n/default.nix | 14 ++++++++++++++ pkgs/top-level/haskell-packages.nix | 2 ++ 2 files changed, 16 insertions(+) create mode 100644 pkgs/development/libraries/haskell/shakespeare-i18n/default.nix diff --git a/pkgs/development/libraries/haskell/shakespeare-i18n/default.nix b/pkgs/development/libraries/haskell/shakespeare-i18n/default.nix new file mode 100644 index 00000000000..39558319ea5 --- /dev/null +++ b/pkgs/development/libraries/haskell/shakespeare-i18n/default.nix @@ -0,0 +1,14 @@ +{ cabal, parsec, shakespeare, text }: + +cabal.mkDerivation (self: { + pname = "shakespeare-i18n"; + version = "0.0.0"; + sha256 = "1zyr63ncd92c30afh0sf4lq7p253jd3gjvcv65f7i0njqpc1lg9y"; + buildDepends = [ parsec shakespeare text ]; + meta = { + homepage = "http://www.yesodweb.com/book/i18n"; + description = "A type-based approach to internationalization"; + license = self.stdenv.lib.licenses.bsd3; + platforms = self.ghc.meta.platforms; + }; +}) diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix index b81b933d6bd..8cc83cf4853 100644 --- a/pkgs/top-level/haskell-packages.nix +++ b/pkgs/top-level/haskell-packages.nix @@ -1196,6 +1196,8 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y); shakespeareCss = callPackage ../development/libraries/haskell/shakespeare-css {}; + shakespeareI18n = callPackage ../development/libraries/haskell/shakespeare-i18n {}; + shakespeareJs = callPackage ../development/libraries/haskell/shakespeare-js {}; shakespeareText = callPackage ../development/libraries/haskell/shakespeare-text {}; From 8cc81a726da54caabbbc95c2ce3ae94a8d337cdc Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 26 Dec 2011 15:35:53 +0000 Subject: [PATCH 112/186] haskell-hamlet: updated to version 0.10.6 svn path=/nixpkgs/trunk/; revision=31088 --- pkgs/development/libraries/haskell/hamlet/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/hamlet/default.nix b/pkgs/development/libraries/haskell/hamlet/default.nix index 15d219830a4..98132edfdb2 100644 --- a/pkgs/development/libraries/haskell/hamlet/default.nix +++ b/pkgs/development/libraries/haskell/hamlet/default.nix @@ -4,8 +4,8 @@ cabal.mkDerivation (self: { pname = "hamlet"; - version = "0.10.5"; - sha256 = "0kizy0qij6zbayrbb3gr4iqys1551ax5c8w5lvh6chg3ypl1i1m3"; + version = "0.10.6"; + sha256 = "0ai00jwbq5nnrgcfhz3sxm2jm2jvz7qbj56lr0wlc3z818a22ams"; buildDepends = [ blazeBuilder blazeHtml failure parsec shakespeare text ]; From c551acaec60ac97626884f2a91228a9525f2e2cc Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 26 Dec 2011 15:35:57 +0000 Subject: [PATCH 113/186] haskell-hmatrix: updated to version 0.13.0.0 svn path=/nixpkgs/trunk/; revision=31089 --- .../libraries/haskell/hmatrix/default.nix | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-) diff --git a/pkgs/development/libraries/haskell/hmatrix/default.nix b/pkgs/development/libraries/haskell/hmatrix/default.nix index 84866e026fd..c60c7dc1591 100644 --- a/pkgs/development/libraries/haskell/hmatrix/default.nix +++ b/pkgs/development/libraries/haskell/hmatrix/default.nix @@ -1,14 +1,10 @@ -{ cabal, binary, blas, gsl, HUnit, liblapack, QuickCheck, random -, storableComplex, vector -}: +{ cabal, binary, blas, gsl, liblapack, storableComplex, vector }: cabal.mkDerivation (self: { pname = "hmatrix"; - version = "0.12.0.2"; - sha256 = "08i3vi0vs6wpyvjsjpqrxp8lw0f89cgzwv1j27y7i2yfp4xmrw8d"; - buildDepends = [ - binary HUnit QuickCheck random storableComplex vector - ]; + version = "0.13.0.0"; + sha256 = "1jlibgg2nrgajw2ny0dq88f5mhrffi7kda9bb8sp9szf4a0kd4wd"; + buildDepends = [ binary storableComplex vector ]; extraLibraries = [ blas gsl liblapack ]; configureFlags = "-fvector"; meta = { From 7c5c365003867f45fcc1817caef169a6a0382a92 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 26 Dec 2011 15:36:02 +0000 Subject: [PATCH 114/186] haskell-http-enumerator: updated to version 0.7.2.1 svn path=/nixpkgs/trunk/; revision=31090 --- .../development/libraries/haskell/http-enumerator/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/http-enumerator/default.nix b/pkgs/development/libraries/haskell/http-enumerator/default.nix index 14109cd1c11..2a285965f9c 100644 --- a/pkgs/development/libraries/haskell/http-enumerator/default.nix +++ b/pkgs/development/libraries/haskell/http-enumerator/default.nix @@ -7,8 +7,8 @@ cabal.mkDerivation (self: { pname = "http-enumerator"; - version = "0.7.2"; - sha256 = "096rwnfm8bqn0pq9cs4i2kr1ljmawk2l17afw301zqfg79q97crc"; + version = "0.7.2.1"; + sha256 = "1qbarxi9268yzb3phnfgvnszbkzs6r63gqzy63h69kpi0k0wl84i"; isLibrary = true; isExecutable = true; buildDepends = [ From 4a0e29f53cb6f43a8b2fe2162a6c3e836004356b Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 26 Dec 2011 15:36:07 +0000 Subject: [PATCH 115/186] haskell-multirec: updated to version 0.7.1 svn path=/nixpkgs/trunk/; revision=31091 --- pkgs/development/libraries/haskell/multirec/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/multirec/default.nix b/pkgs/development/libraries/haskell/multirec/default.nix index e5a1b2a85a9..c001783a13b 100644 --- a/pkgs/development/libraries/haskell/multirec/default.nix +++ b/pkgs/development/libraries/haskell/multirec/default.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "multirec"; - version = "0.7"; - sha256 = "1n196qqggfnk8fa1x296rdbyb77a6ykhy01z8x2glgdimzpxsiay"; + version = "0.7.1"; + sha256 = "1a3snlv6lr9mi4nrl4cyc5ilk6flbdn0ck2sqla6dyb2zdlgf5ph"; noHaddock = true; meta = { homepage = "http://www.cs.uu.nl/wiki/GenericProgramming/Multirec"; From 9ccf9b3674a7c12480190c5bd71e15e32ed17157 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 26 Dec 2011 15:36:12 +0000 Subject: [PATCH 116/186] haskell-regular: updated to version 0.3.4 svn path=/nixpkgs/trunk/; revision=31092 --- pkgs/development/libraries/haskell/regular/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/regular/default.nix b/pkgs/development/libraries/haskell/regular/default.nix index 4b4e5458df2..0085d866567 100644 --- a/pkgs/development/libraries/haskell/regular/default.nix +++ b/pkgs/development/libraries/haskell/regular/default.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "regular"; - version = "0.3.3"; - sha256 = "1xlpp60nvdiqkcn66dnpww72hcawyc1w7cd9zk9kk88x574kqzf7"; + version = "0.3.4"; + sha256 = "10gfid99xcqv3i9rp4x8hykk91qq3h7b7lxzsl7ii58vmifa4kgq"; meta = { description = "Generic programming library for regular datatypes"; license = self.stdenv.lib.licenses.bsd3; From ba991ec10078783874f94522a680a57da43bbbac Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 26 Dec 2011 15:36:18 +0000 Subject: [PATCH 117/186] haskell-shakespeare-css: updated to version 0.10.5 svn path=/nixpkgs/trunk/; revision=31093 --- .../development/libraries/haskell/shakespeare-css/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/shakespeare-css/default.nix b/pkgs/development/libraries/haskell/shakespeare-css/default.nix index 1cef979c01e..b0d70a8fbfd 100644 --- a/pkgs/development/libraries/haskell/shakespeare-css/default.nix +++ b/pkgs/development/libraries/haskell/shakespeare-css/default.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "shakespeare-css"; - version = "0.10.4"; - sha256 = "006ndbhzxkr2zw6gs13bm5pfq7i301bbg6nhagm3h9nnzp155snz"; + version = "0.10.5"; + sha256 = "1cnv9qgp1llrrvcqp64mq207wdsxpqza9yq5nzlsgrh6qlzvm4hs"; buildDepends = [ parsec shakespeare text ]; meta = { homepage = "http://www.yesodweb.com/book/templates"; From 381ebfe9944f62a05ce1f3206cdc3f18f10610fa Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 26 Dec 2011 15:36:23 +0000 Subject: [PATCH 118/186] haskell-shakespeare-js: updated to version 0.10.4 svn path=/nixpkgs/trunk/; revision=31094 --- pkgs/development/libraries/haskell/shakespeare-js/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/shakespeare-js/default.nix b/pkgs/development/libraries/haskell/shakespeare-js/default.nix index a4a20c98b19..d127725a73e 100644 --- a/pkgs/development/libraries/haskell/shakespeare-js/default.nix +++ b/pkgs/development/libraries/haskell/shakespeare-js/default.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "shakespeare-js"; - version = "0.10.3"; - sha256 = "1xz4jf91dfz60dji31d3hyy1k01hk0v41pb8qmi598jylk9iz1r2"; + version = "0.10.4"; + sha256 = "15mh93d38qpqnrgxvaq659zwl2mks9xhkynhlpjrf8zb234knxjw"; buildDepends = [ shakespeare text ]; meta = { homepage = "http://www.yesodweb.com/book/templates"; From d9c27a43871b3ff887715dafad6832272fc98db5 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 26 Dec 2011 15:36:27 +0000 Subject: [PATCH 119/186] haskell-simple-sendfile: updated to version 0.2.0 svn path=/nixpkgs/trunk/; revision=31095 --- .../development/libraries/haskell/simple-sendfile/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/simple-sendfile/default.nix b/pkgs/development/libraries/haskell/simple-sendfile/default.nix index f66eb3bb591..d4f814b2111 100644 --- a/pkgs/development/libraries/haskell/simple-sendfile/default.nix +++ b/pkgs/development/libraries/haskell/simple-sendfile/default.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "simple-sendfile"; - version = "0.1.3"; - sha256 = "0n78d6bn2hsm3p6r2kc2cr5nf9v1vqs6v5i9x71f910r3kk2grm8"; + version = "0.2.0"; + sha256 = "1rsbmlnks4q8gsfzwqwcj901b8hzcrfb85z7wy3szj4h0axw4264"; buildDepends = [ network ]; meta = { description = "Cross platform library for the sendfile system call"; From 51254f668a0183fe73b80952bc3cf056589c8ae8 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 26 Dec 2011 15:36:32 +0000 Subject: [PATCH 120/186] haskell-wai-extra: updated to version 0.4.6 svn path=/nixpkgs/trunk/; revision=31096 --- .../libraries/haskell/wai-extra/default.nix | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/development/libraries/haskell/wai-extra/default.nix b/pkgs/development/libraries/haskell/wai-extra/default.nix index a0a736deeef..a2840ad66ce 100644 --- a/pkgs/development/libraries/haskell/wai-extra/default.nix +++ b/pkgs/development/libraries/haskell/wai-extra/default.nix @@ -1,15 +1,15 @@ { cabal, blazeBuilder, blazeBuilderEnumerator, caseInsensitive -, dataDefault, enumerator, httpTypes, network, text, time -, transformers, wai, zlibBindings, zlibEnum +, dataDefault, enumerator, fastLogger, httpTypes, network, text +, time, transformers, wai, zlibBindings, zlibEnum }: cabal.mkDerivation (self: { pname = "wai-extra"; - version = "0.4.5.2"; - sha256 = "05gq22il1jnvw5rcqr6gassxj29f8l4536zm6bpgk1kff8cxa3g1"; + version = "0.4.6"; + sha256 = "1wpdfzw5qzbd33iypgppp4822vn7vhja6y26dnkb17n08r83vvhv"; buildDepends = [ blazeBuilder blazeBuilderEnumerator caseInsensitive dataDefault - enumerator httpTypes network text time transformers wai + enumerator fastLogger httpTypes network text time transformers wai zlibBindings zlibEnum ]; meta = { From d0dc6f0ba8a1ef1c99413eb563e99cff46ce81a1 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 26 Dec 2011 15:36:37 +0000 Subject: [PATCH 121/186] haskell-warp: updated to version 0.4.6.3 svn path=/nixpkgs/trunk/; revision=31097 --- pkgs/development/libraries/haskell/warp/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/warp/default.nix b/pkgs/development/libraries/haskell/warp/default.nix index 5ff96051307..95caf840ad0 100644 --- a/pkgs/development/libraries/haskell/warp/default.nix +++ b/pkgs/development/libraries/haskell/warp/default.nix @@ -5,8 +5,8 @@ cabal.mkDerivation (self: { pname = "warp"; - version = "0.4.6.2"; - sha256 = "1ja9w3440j69w7638wrjd6067svqcsaqdl1zklr6jx20zyadww94"; + version = "0.4.6.3"; + sha256 = "1gfjhp1s42ynpi3kh8fr6fp5nwirxz0gasr7zs7q2qwwvlq9pzm6"; buildDepends = [ blazeBuilder blazeBuilderEnumerator caseInsensitive enumerator httpTypes network simpleSendfile transformers unixCompat wai From 8923112c1d9d0b327b29150486d4a9560d3ade5f Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 26 Dec 2011 15:36:42 +0000 Subject: [PATCH 122/186] haskell-yesod-core: updated to version 0.9.4 svn path=/nixpkgs/trunk/; revision=31098 --- .../libraries/haskell/yesod-core/default.nix | 20 +++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/pkgs/development/libraries/haskell/yesod-core/default.nix b/pkgs/development/libraries/haskell/yesod-core/default.nix index c894a5138e6..4e81d54979b 100644 --- a/pkgs/development/libraries/haskell/yesod-core/default.nix +++ b/pkgs/development/libraries/haskell/yesod-core/default.nix @@ -1,21 +1,21 @@ { cabal, aeson, blazeBuilder, blazeHtml, caseInsensitive, cereal , clientsession, cookie, dataObject, dataObjectYaml, enumerator -, failure, hamlet, httpTypes, monadControl, parsec, pathPieces -, random, shakespeare, shakespeareCss, shakespeareJs -, strictConcurrency, text, time, transformers, transformersBase -, vector, wai, waiExtra +, failure, fastLogger, hamlet, httpTypes, monadControl, parsec +, pathPieces, random, shakespeare, shakespeareCss, shakespeareI18n +, shakespeareJs, text, time, transformers, transformersBase, vector +, wai, waiExtra, waiLogger }: cabal.mkDerivation (self: { pname = "yesod-core"; - version = "0.9.3.6"; - sha256 = "00h1ylrr5wrid9vn3jhspibprx0175j9rcwdb1hd7ya5gwmzlhjs"; + version = "0.9.4"; + sha256 = "1m9cxm3pngg4pq7j3p1sh7lrjp5gslnn6zcimc5ln8yldxx01c6g"; buildDepends = [ aeson blazeBuilder blazeHtml caseInsensitive cereal clientsession - cookie dataObject dataObjectYaml enumerator failure hamlet - httpTypes monadControl parsec pathPieces random shakespeare - shakespeareCss shakespeareJs strictConcurrency text time - transformers transformersBase vector wai waiExtra + cookie dataObject dataObjectYaml enumerator failure fastLogger + hamlet httpTypes monadControl parsec pathPieces random shakespeare + shakespeareCss shakespeareI18n shakespeareJs text time transformers + transformersBase vector wai waiExtra waiLogger ]; meta = { homepage = "http://www.yesodweb.com/"; From aa1be5c36f1e2336b55eccca80f9ff4cb2a0d821 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 26 Dec 2011 15:36:46 +0000 Subject: [PATCH 123/186] haskell-yesod-form: updated to version 0.3.4.2 svn path=/nixpkgs/trunk/; revision=31099 --- pkgs/development/libraries/haskell/yesod-form/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/yesod-form/default.nix b/pkgs/development/libraries/haskell/yesod-form/default.nix index c6ce1d024c1..2f384e2e878 100644 --- a/pkgs/development/libraries/haskell/yesod-form/default.nix +++ b/pkgs/development/libraries/haskell/yesod-form/default.nix @@ -5,8 +5,8 @@ cabal.mkDerivation (self: { pname = "yesod-form"; - version = "0.3.4.1"; - sha256 = "0khkc4bpqfgfs0zl753x4l5qpkfr8hv0kwzz6qpry5skxa326q6i"; + version = "0.3.4.2"; + sha256 = "1ahkbycxvjh1yvxfbf8wg6mlklmwm8hmy15x0b07g2xq7h1jmc5i"; buildDepends = [ blazeBuilder blazeHtml dataDefault emailValidate hamlet network persistent shakespeareCss shakespeareJs text time transformers wai From 1592e39ced5a3735708705201308a43d45ca0919 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 26 Dec 2011 15:36:52 +0000 Subject: [PATCH 124/186] haskell-yesod-json: updated to version 0.2.3 svn path=/nixpkgs/trunk/; revision=31100 --- .../libraries/haskell/yesod-json/default.nix | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/pkgs/development/libraries/haskell/yesod-json/default.nix b/pkgs/development/libraries/haskell/yesod-json/default.nix index cf65dc8993e..379d7319b12 100644 --- a/pkgs/development/libraries/haskell/yesod-json/default.nix +++ b/pkgs/development/libraries/haskell/yesod-json/default.nix @@ -1,14 +1,14 @@ -{ cabal, aeson, blazeBuilder, shakespeareJs, text -, unorderedContainers, vector, yesodCore +{ cabal, aeson, attoparsecEnumerator, blazeBuilder, shakespeareJs +, text, transformers, unorderedContainers, vector, yesodCore }: cabal.mkDerivation (self: { pname = "yesod-json"; - version = "0.2.2.2"; - sha256 = "0mhajy0hal9icwys63vcmlipl3gwm8bvv7xywwjydd86drqhz9ni"; + version = "0.2.3"; + sha256 = "0bd75zzxqrarqk8b2v515jv0zbi5x27fmb9cbj3g57l9ig57lqy5"; buildDepends = [ - aeson blazeBuilder shakespeareJs text unorderedContainers vector - yesodCore + aeson attoparsecEnumerator blazeBuilder shakespeareJs text + transformers unorderedContainers vector yesodCore ]; meta = { homepage = "http://www.yesodweb.com/"; From 3553c0f867823014b365968ede736d9c6778f761 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 26 Dec 2011 15:36:58 +0000 Subject: [PATCH 125/186] haskell-yesod-static: updated to version 0.3.2.1 svn path=/nixpkgs/trunk/; revision=31101 --- pkgs/development/libraries/haskell/yesod-static/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/yesod-static/default.nix b/pkgs/development/libraries/haskell/yesod-static/default.nix index 65cb5493181..46f989c53a5 100644 --- a/pkgs/development/libraries/haskell/yesod-static/default.nix +++ b/pkgs/development/libraries/haskell/yesod-static/default.nix @@ -5,8 +5,8 @@ cabal.mkDerivation (self: { pname = "yesod-static"; - version = "0.3.2"; - sha256 = "0m0fws0bwhf1cyw1a3cg85mhdjr9pv35a39671jsqkkvmmxiixlf"; + version = "0.3.2.1"; + sha256 = "0gggavj5bxb12axlfl8kmqizgg55nmcrr6z5za60n3bp70sq4vn4"; buildDepends = [ base64Bytestring cereal enumerator fileEmbed httpTypes pureMD5 text transformers unixCompat wai waiAppStatic yesodCore From 42a4cda59df33c8ffc70f937adb26200deddd7f3 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 26 Dec 2011 15:37:02 +0000 Subject: [PATCH 126/186] haskell-yesod: updated to version 0.9.4 svn path=/nixpkgs/trunk/; revision=31102 --- pkgs/development/libraries/haskell/yesod/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/yesod/default.nix b/pkgs/development/libraries/haskell/yesod/default.nix index ecd7dc012aa..7af910a903a 100644 --- a/pkgs/development/libraries/haskell/yesod/default.nix +++ b/pkgs/development/libraries/haskell/yesod/default.nix @@ -7,8 +7,8 @@ cabal.mkDerivation (self: { pname = "yesod"; - version = "0.9.3.4"; - sha256 = "1iw6qf1dywss8w4ig3dr04cyi01jq9frvmkbqgj5jq8v11y55x6v"; + version = "0.9.4"; + sha256 = "0kb25ilx0hf51x8i6kr94lhald4bfy08c1wrx3k9gnqgv2dk6vlp"; isLibrary = true; isExecutable = true; buildDepends = [ From 0def824532c8e4a2ea894a4de95b37d1acd5fc12 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?= Date: Mon, 26 Dec 2011 17:27:30 +0000 Subject: [PATCH 127/186] Updating webalizer. svn path=/nixpkgs/trunk/; revision=31105 --- pkgs/tools/networking/webalizer/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/networking/webalizer/default.nix b/pkgs/tools/networking/webalizer/default.nix index 7645bff9e55..efa29e81407 100644 --- a/pkgs/tools/networking/webalizer/default.nix +++ b/pkgs/tools/networking/webalizer/default.nix @@ -1,11 +1,11 @@ {stdenv, fetchurl, zlib, libpng, gd, geoip, db4}: stdenv.mkDerivation { - name = "webalizer-2.21-02"; + name = "webalizer-2.23-05"; src = fetchurl { - url = ftp://ftp.mrunix.net/pub/webalizer/webalizer-2.21-02-src.tgz; - sha256 = "0spfsqxhgfnmd2yyhrmrj8chjilr8qbx1g2n3kn44k9gd4y3jfc7"; + url = ftp://ftp.mrunix.net/pub/webalizer/webalizer-2.23-05-src.tar.bz2; + sha256 = "0nl88y57a7gawfragj3viiigfkh5sgivfb4n0k89wzcjw278pj5g"; }; preConfigure = From 1d7bc50e9ac5ed00db44e4f3387fdcd8de892e5e Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 26 Dec 2011 20:24:59 +0000 Subject: [PATCH 128/186] emacs-modes/magit: updated to 1.1.0.0 svn path=/nixpkgs/trunk/; revision=31106 --- .../editors/emacs-modes/magit/default.nix | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-) diff --git a/pkgs/applications/editors/emacs-modes/magit/default.nix b/pkgs/applications/editors/emacs-modes/magit/default.nix index 0746dd5b3be..1af31c2ba5c 100644 --- a/pkgs/applications/editors/emacs-modes/magit/default.nix +++ b/pkgs/applications/editors/emacs-modes/magit/default.nix @@ -1,22 +1,19 @@ { stdenv, fetchurl, emacs, texinfo }: let - version = "1.0.0"; + version = "1.1.0"; in stdenv.mkDerivation { name = "magit-${version}"; src = fetchurl { url = "http://github.com/downloads/magit/magit/magit-${version}.tar.gz"; - sha256 = "1hfdl90d96zin31v8x4p8zx5f0x0i5i9hccysx6q3prdgw9r6wzq"; + sha256 = "8e147e1f2e69938232f859daf712515b46aa367d7b7d90b42538e083f52a72b4"; }; buildInputs = [emacs texinfo]; - configurePhase = - '' sed -i Makefile \ - -e "s|^PREFIX=.*$|PREFIX=$out|g ; s|/etc/emacs/|$out/etc/emacs/|" - ''; + configurePhase = "makeFlagsArray=( PREFIX=$out SYSCONFDIR=$out/etc )"; meta = { description = "Magit, an Emacs interface to Git"; @@ -34,7 +31,7 @@ stdenv.mkDerivation { ''; license = "GPLv3+"; - homepage = "http://github.com/philjackson/magit"; + homepage = "https://github.com/magit/magit"; platforms = stdenv.lib.platforms.all; maintainers = with stdenv.lib.maintainers; [ simons ludo ]; }; From 2ae07a853fbd2664b260f9353621983140a40886 Mon Sep 17 00:00:00 2001 From: Karn Kallio Date: Tue, 27 Dec 2011 01:48:57 +0000 Subject: [PATCH 129/186] Clean version 2.4 svn path=/nixpkgs/trunk/; revision=31107 --- pkgs/development/compilers/clean/default.nix | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/development/compilers/clean/default.nix b/pkgs/development/compilers/clean/default.nix index fa61f8bfc75..bd051a95699 100644 --- a/pkgs/development/compilers/clean/default.nix +++ b/pkgs/development/compilers/clean/default.nix @@ -1,16 +1,16 @@ { stdenv, fetchurl }: stdenv.mkDerivation rec { - name = "clean-2.3"; + name = "clean-2.4"; src = if stdenv.system == "i686-linux" then (fetchurl { - url = "http://clean.cs.ru.nl/download/Clean23/linux/clean2.3_boot.tar.gz"; - sha256 = "0rrjpqdbqwbx7n8v35wi3wpm6lpv9zd1n5q50byb2h0ljqw31j9h"; + url = "http://clean.cs.ru.nl/download/Clean24/linux/clean2.4_boot.tar.gz"; + sha256 = "1w8vvmkwzq8g51639r62apcy75sj69nm08082a34xvqm9ymfgkq5"; }) else if stdenv.system == "x86_64-linux" then (fetchurl { - url = "http://clean.cs.ru.nl/download/Clean23/linux/clean2.3_64_boot.tar.gz"; - sha256 = "0bvkaiwcaa1p6h1bl4bgnia1yd0j8nq6sb1yiwar74y2m1wwmjqj"; + url = "http://clean.cs.ru.nl/download/Clean24/linux/clean2.4_64_boot.tar.gz"; + sha256 = "08gsa1pjl5wyzh4ah8ccfx8a7mdcn6ycsn1lzkrr9adygv1gmm7r"; }) else throw "Architecture not supported"; From a8785e7b7237c8a9789f40c21ae262622d56d075 Mon Sep 17 00:00:00 2001 From: Rob Vermaas Date: Tue, 27 Dec 2011 12:56:07 +0000 Subject: [PATCH 130/186] use simple version compare in stead of timestamps to determine newer package svn path=/nixpkgs/trunk/; revision=31108 --- pkgs/build-support/vm/rpm/rpm-closure.pl | 42 +++++++++++++++++++++++- 1 file changed, 41 insertions(+), 1 deletion(-) diff --git a/pkgs/build-support/vm/rpm/rpm-closure.pl b/pkgs/build-support/vm/rpm/rpm-closure.pl index 5efc162784a..2ef59dcbdef 100644 --- a/pkgs/build-support/vm/rpm/rpm-closure.pl +++ b/pkgs/build-support/vm/rpm/rpm-closure.pl @@ -1,5 +1,6 @@ use strict; use XML::Simple; +use List::Util qw(min); my @packagesFiles = (); my @urlPrefixes = (); @@ -13,6 +14,44 @@ while(-f $ARGV[0]) { push(@urlPrefixes, $urlPrefix); } + +sub rpmvercmp { + my ($version1, $version2) = @_; + my @vercmps1 = split /\./, $version1; + my @vercmps2 = split /\./, $version2; + my $l1 = scalar(@vercmps1); + my $l2 = scalar(@vercmps2); + my $l = min($l1, $l2); + + for(my $i=0; $i<$l; $i++) { + my $v1 = $vercmps1[$i]; + my $v2 = $vercmps2[$i]; + + if($v1 =~ /^[0-9]*$/ && $v2 =~ /^[0-9]*$/) { + if ( int($v1) > int($v2) ) { + return 1; + } + elsif ( int($v1) < int($v2) ) { + return -1; + } + } else { + if ( $v1 gt $v2 ) { + return 1; + } + elsif ( $v1 lt $v2 ) { + return -1; + } + } + } + if($l1 == $l2) { + return 0; + } elsif ($l1 > $l2) { + return 1; + } elsif ($l1 < $l2) { + return -1; + } +} + my @toplevelPkgs = @ARGV; my @archs = split ' ', ($ENV{'archs'} or ""); @@ -36,7 +75,8 @@ for (my $i = 0; $i < scalar(@packagesFiles); $i++) { if (defined $pkgs{$pkg->{name}}) { my $earlierPkg = $pkgs{$pkg->{name}}; print STDERR "WARNING: duplicate occurrence of package $pkg->{name}\n"; - if ($earlierPkg->{'time'}->{file} <= $pkg->{'time'}->{file}) { + # + if (rpmvercmp($pkg->{'version'}->{ver}, $earlierPkg->{'version'}->{ver}) >= 0) { print STDERR "WARNING: replaced package $pkg->{name} with newer one\n"; $pkg->{urlPrefix} = $urlPrefixes[$i]; $pkgs{$pkg->{name}} = $pkg; From d0543a8af1eeab6f3e897550c43df4800af75e8a Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Tue, 27 Dec 2011 17:49:31 +0000 Subject: [PATCH 131/186] Added missing meta.maintainers section. svn path=/nixpkgs/trunk/; revision=31110 --- pkgs/development/libraries/haskell/byteorder/default.nix | 4 ++++ .../libraries/haskell/shakespeare-i18n/default.nix | 4 ++++ pkgs/development/libraries/haskell/wai-logger/default.nix | 4 ++++ 3 files changed, 12 insertions(+) diff --git a/pkgs/development/libraries/haskell/byteorder/default.nix b/pkgs/development/libraries/haskell/byteorder/default.nix index e709a12ce8b..d3af223418b 100644 --- a/pkgs/development/libraries/haskell/byteorder/default.nix +++ b/pkgs/development/libraries/haskell/byteorder/default.nix @@ -9,5 +9,9 @@ cabal.mkDerivation (self: { description = "Exposes the native endianness or byte ordering of the system"; license = self.stdenv.lib.licenses.bsd3; platforms = self.ghc.meta.platforms; + maintainers = [ + self.stdenv.lib.maintainers.andres + self.stdenv.lib.maintainers.simons + ]; }; }) diff --git a/pkgs/development/libraries/haskell/shakespeare-i18n/default.nix b/pkgs/development/libraries/haskell/shakespeare-i18n/default.nix index 39558319ea5..1a1e4f1d20b 100644 --- a/pkgs/development/libraries/haskell/shakespeare-i18n/default.nix +++ b/pkgs/development/libraries/haskell/shakespeare-i18n/default.nix @@ -10,5 +10,9 @@ cabal.mkDerivation (self: { description = "A type-based approach to internationalization"; license = self.stdenv.lib.licenses.bsd3; platforms = self.ghc.meta.platforms; + maintainers = [ + self.stdenv.lib.maintainers.andres + self.stdenv.lib.maintainers.simons + ]; }; }) diff --git a/pkgs/development/libraries/haskell/wai-logger/default.nix b/pkgs/development/libraries/haskell/wai-logger/default.nix index d992ff424da..e38f4c853f1 100644 --- a/pkgs/development/libraries/haskell/wai-logger/default.nix +++ b/pkgs/development/libraries/haskell/wai-logger/default.nix @@ -14,5 +14,9 @@ cabal.mkDerivation (self: { description = "A logging system for WAI"; license = self.stdenv.lib.licenses.bsd3; platforms = self.ghc.meta.platforms; + maintainers = [ + self.stdenv.lib.maintainers.andres + self.stdenv.lib.maintainers.simons + ]; }; }) From 577b55a0dee3e4d8cf40731f0ae7fb2760f87c2b Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Tue, 27 Dec 2011 17:49:35 +0000 Subject: [PATCH 132/186] haskell-yesod: updated to version 0.9.4.1 svn path=/nixpkgs/trunk/; revision=31111 --- pkgs/development/libraries/haskell/yesod/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/yesod/default.nix b/pkgs/development/libraries/haskell/yesod/default.nix index 7af910a903a..ab0bc9f89dd 100644 --- a/pkgs/development/libraries/haskell/yesod/default.nix +++ b/pkgs/development/libraries/haskell/yesod/default.nix @@ -7,8 +7,8 @@ cabal.mkDerivation (self: { pname = "yesod"; - version = "0.9.4"; - sha256 = "0kb25ilx0hf51x8i6kr94lhald4bfy08c1wrx3k9gnqgv2dk6vlp"; + version = "0.9.4.1"; + sha256 = "0dcd4m91liash046i0qaq51s447sl4fn55gsg7mi807lffik436q"; isLibrary = true; isExecutable = true; buildDepends = [ From c6814a8951317c1ec9e14ce4c257e89e70b0379c Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Tue, 27 Dec 2011 17:49:40 +0000 Subject: [PATCH 133/186] haskell-zipper: updated to version 0.4.1 svn path=/nixpkgs/trunk/; revision=31112 --- pkgs/development/libraries/haskell/zipper/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/zipper/default.nix b/pkgs/development/libraries/haskell/zipper/default.nix index 2ade79bffa1..c36def2683c 100644 --- a/pkgs/development/libraries/haskell/zipper/default.nix +++ b/pkgs/development/libraries/haskell/zipper/default.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "zipper"; - version = "0.4"; - sha256 = "0s3gw883kwxgmz9sk3638ba8i1zb5dirv2hanc3caf6pfay6caks"; + version = "0.4.1"; + sha256 = "19xgvqznf200akzf19mp40fg75c0gzpp38wq3n671nm90r08lgvi"; buildDepends = [ multirec ]; meta = { homepage = "http://www.cs.uu.nl/wiki/GenericProgramming/Multirec"; From 9c87cccee95916db5c88f22cc02ccd58b0cbcad3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?= Date: Tue, 27 Dec 2011 19:33:36 +0000 Subject: [PATCH 134/186] Adding cgroups to the sheevaplug kernel. svn path=/nixpkgs/trunk/; revision=31114 --- pkgs/top-level/platforms.nix | 3 +++ 1 file changed, 3 insertions(+) diff --git a/pkgs/top-level/platforms.nix b/pkgs/top-level/platforms.nix index 911dff97d0c..730629731f3 100644 --- a/pkgs/top-level/platforms.nix +++ b/pkgs/top-level/platforms.nix @@ -83,6 +83,9 @@ rec { BLK_DEV_CMD640_ENHANCED n FUSE_FS m + + # nixos mounts some cgroup + CGROUPS y ''; kernelTarget = "uImage"; uboot = "sheevaplug"; From 58af7eb6bf286cf508198ce6864c5e5eaff1e20c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?= Date: Tue, 27 Dec 2011 21:35:50 +0000 Subject: [PATCH 135/186] Adding smbldap-tools. And some CPAN packages as bonus. svn path=/nixpkgs/trunk/; revision=31118 --- .../tools/networking/smbldaptools/default.nix | 31 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 4 +++ pkgs/top-level/perl-packages.nix | 25 +++++++++++++++ 3 files changed, 60 insertions(+) create mode 100644 pkgs/tools/networking/smbldaptools/default.nix diff --git a/pkgs/tools/networking/smbldaptools/default.nix b/pkgs/tools/networking/smbldaptools/default.nix new file mode 100644 index 00000000000..962799117a0 --- /dev/null +++ b/pkgs/tools/networking/smbldaptools/default.nix @@ -0,0 +1,31 @@ +{stdenv, fetchurl, perl, NetLDAP, makeWrapper, CryptSmbHash, DigestSHA1}: + +let + version = "0.9.7"; +in +stdenv.mkDerivation { + name = "smbldap-tools-${version}"; + src = fetchurl { + url = "http://download.gna.org/smbldap-tools/sources/${version}/smbldap-tools-${version}.tar.gz"; + sha256 = "0y1k2j5qjxy66yvl36adbp9m1brapiz9ycaisdyy6093xvw1nh7j"; + }; + + buildInputs = [ perl NetLDAP makeWrapper CryptSmbHash DigestSHA1 ]; + + preConfigure = '' + export configureFlags="$configureFlags --with-perl-libdir=$out/lib/perl5/site_perl" + ''; + + postInstall = '' + for i in $out/sbin/*; do + wrapProgram $i \ + --prefix PERL5LIB : $PERL5LIB:$out/lib/perl5/site_perl + done + ''; + + meta = { + homepage = http://gna.org/projects/smbldap-tools/; + description = "SAMBA LDAP tools"; + license = "GPLv2+"; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 428dd041588..44d44f080e0 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -1345,6 +1345,10 @@ let smartmontools = callPackage ../tools/system/smartmontools { }; + smbldaptools = callPackage ../tools/networking/smbldaptools { + inherit (perlPackages) NetLDAP CryptSmbHash DigestSHA1; + }; + smbnetfs = callPackage ../tools/filesystems/smbnetfs {}; fusesmb = callPackage ../tools/filesystems/fusesmb { }; diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index a73e8193817..8b591231820 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -836,6 +836,14 @@ rec { }; }; + ConvertASN1 = buildPerlPackage rec { + name = "Convert-ASN1-0.22"; + src = fetchurl { + url = "mirror://cpan/authors/id/G/GB/GBARR/Convert-ASN1-0.22.tar.gz"; + sha256 = "1vpny8smwl23rai1kxngi5i31jhp6s6cdls19gjhcwsxf76daqxy"; + }; + }; + constant = buildPerlPackage { name = "constant-1.15"; src = fetchurl { @@ -922,6 +930,14 @@ rec { }; }; + CryptSmbHash = buildPerlPackage rec { + name = "Crypt-SmbHash-0.12"; + src = fetchurl { + url = "mirror://cpan/authors/id/B/BJ/BJKUIT/Crypt-SmbHash-0.12.tar.gz"; + sha256 = "0dxivcqmabkhpz5xzph6rzl8fvq9xjy26b2ci77pv5gsmdzari38"; + }; + }; + CryptSSLeay = buildPerlPackage rec { name = "Crypt-SSLeay-0.57"; src = fetchurl { @@ -2537,6 +2553,15 @@ rec { }; }; + NetLDAP = buildPerlPackage { + name = "Net-LDAP-0.43"; + propagatedBuildInputs = [ ConvertASN1 ]; + src = fetchurl { + url = mirror://cpan/authors/id/G/GB/GBARR/perl-ldap-0.43.tar.gz; + sha256 = "0ak7393zs8ps6r6in5ilr9l1mzxxh529jr768sjzx4273p7li3m0"; + }; + }; + NetServer = buildPerlPackage rec { name = "Net-Server-0.99"; src = fetchurl { From d74fd84210b311c52fe9cb50fb310014063d5ca8 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Wed, 28 Dec 2011 10:31:27 +0000 Subject: [PATCH 136/186] haskell-blaze-html: updated to version 0.4.3.1 svn path=/nixpkgs/trunk/; revision=31121 --- pkgs/development/libraries/haskell/blaze-html/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/blaze-html/default.nix b/pkgs/development/libraries/haskell/blaze-html/default.nix index dbeb4721f33..0231b9e8e00 100644 --- a/pkgs/development/libraries/haskell/blaze-html/default.nix +++ b/pkgs/development/libraries/haskell/blaze-html/default.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "blaze-html"; - version = "0.4.3.0"; - sha256 = "1018mfsc1cqbyxlil136171n9qi9sypchlmmfqawf3aa1sjskmfg"; + version = "0.4.3.1"; + sha256 = "0yhwlwmjy3jagxscz2i0yjfy6akqpamn9c35ffxcgpr0kj6qlpfp"; buildDepends = [ blazeBuilder text ]; meta = { homepage = "http://jaspervdj.be/blaze"; From 2cc6165e7e7b92fcc5a9bf66d62dc0fcb11850be Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Wed, 28 Dec 2011 10:31:30 +0000 Subject: [PATCH 137/186] haskell-gloss: updated to version 1.6.0.1 svn path=/nixpkgs/trunk/; revision=31122 --- pkgs/development/libraries/haskell/gloss/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/gloss/default.nix b/pkgs/development/libraries/haskell/gloss/default.nix index 1b9fbb03da4..47425ae2536 100644 --- a/pkgs/development/libraries/haskell/gloss/default.nix +++ b/pkgs/development/libraries/haskell/gloss/default.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "gloss"; - version = "1.5.2.1"; - sha256 = "1mwk9gnkbjr76f9g79ixxlwzpsvmhflp5c8a0584fyypjg2r33n3"; + version = "1.6.0.1"; + sha256 = "0yy8yl2s3n0kyr14bcxp1hjzh3wlrhc0xp2ngl3wbz1hbzyrsdlf"; buildDepends = [ bmp GLUT OpenGL ]; meta = { homepage = "http://gloss.ouroborus.net"; From 4528363ead58ee3e21a442df8a79a5055ad85228 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Wed, 28 Dec 2011 10:31:34 +0000 Subject: [PATCH 138/186] haskell-persistent: updated to version 0.6.4.4 svn path=/nixpkgs/trunk/; revision=31123 --- pkgs/development/libraries/haskell/persistent/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/persistent/default.nix b/pkgs/development/libraries/haskell/persistent/default.nix index 527bbf9f2ae..59fe42ff65e 100644 --- a/pkgs/development/libraries/haskell/persistent/default.nix +++ b/pkgs/development/libraries/haskell/persistent/default.nix @@ -5,8 +5,8 @@ cabal.mkDerivation (self: { pname = "persistent"; - version = "0.6.4.3"; - sha256 = "0j4agwm8hcphrmzmc7d7al57cwp3i5iy7d8yhqw9m8pcx61sqkg4"; + version = "0.6.4.4"; + sha256 = "0n4zl0r8nmp3pwsgc0kiy7fgk2dfvdvagv1gvjxrs8545c5ycggv"; buildDepends = [ blazeHtml dataObject enumerator monadControl mtl pathPieces pool text time transformers transformersBase From 2afb111ad5bcc5f7431d7e292989f74359f89d8b Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Wed, 28 Dec 2011 10:31:37 +0000 Subject: [PATCH 139/186] haskell-wai-logger: updated to version 0.1.2 svn path=/nixpkgs/trunk/; revision=31124 --- pkgs/development/libraries/haskell/wai-logger/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/wai-logger/default.nix b/pkgs/development/libraries/haskell/wai-logger/default.nix index e38f4c853f1..d99bd1a0442 100644 --- a/pkgs/development/libraries/haskell/wai-logger/default.nix +++ b/pkgs/development/libraries/haskell/wai-logger/default.nix @@ -4,8 +4,8 @@ cabal.mkDerivation (self: { pname = "wai-logger"; - version = "0.1.1"; - sha256 = "02354n4j1wj2n2vn4hza7ng2gqbf6ibvr4gfnv7maisivgqjy694"; + version = "0.1.2"; + sha256 = "0pzbdjy0xkjqkzc5w1v0hh18jgbxlkllsjwxabswkh8gl73mp7d9"; buildDepends = [ blazeBuilder byteorder caseInsensitive fastLogger httpTypes network time wai From ff3b0ed420b8e59bd5699b8edf887e3d40b52968 Mon Sep 17 00:00:00 2001 From: Marco Maggesi Date: Wed, 28 Dec 2011 12:45:59 +0000 Subject: [PATCH 140/186] Update HOL Light to r116 svn path=/nixpkgs/trunk/; revision=31125 --- pkgs/applications/science/logic/hol_light/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/science/logic/hol_light/default.nix b/pkgs/applications/science/logic/hol_light/default.nix index 209ba934b9e..416d6bb75dd 100644 --- a/pkgs/applications/science/logic/hol_light/default.nix +++ b/pkgs/applications/science/logic/hol_light/default.nix @@ -9,10 +9,10 @@ let in stdenv.mkDerivation { - name = "hol_light-20111204"; + name = "hol_light-20111224"; src = fetchsvn { url = http://hol-light.googlecode.com/svn/trunk; - rev = "114"; + rev = "116"; sha256 = "a9203a0118caf5d0ca7621abafab4af6245e1c1ae6ba628ead7c6f69aa86d9d3"; }; From fd64bc52891d030b637abc640540d511921332f9 Mon Sep 17 00:00:00 2001 From: Marco Maggesi Date: Wed, 28 Dec 2011 12:49:29 +0000 Subject: [PATCH 141/186] Oops! svn path=/nixpkgs/trunk/; revision=31126 --- pkgs/applications/science/logic/hol_light/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/applications/science/logic/hol_light/default.nix b/pkgs/applications/science/logic/hol_light/default.nix index 416d6bb75dd..793d5c9452a 100644 --- a/pkgs/applications/science/logic/hol_light/default.nix +++ b/pkgs/applications/science/logic/hol_light/default.nix @@ -13,7 +13,7 @@ stdenv.mkDerivation { src = fetchsvn { url = http://hol-light.googlecode.com/svn/trunk; rev = "116"; - sha256 = "a9203a0118caf5d0ca7621abafab4af6245e1c1ae6ba628ead7c6f69aa86d9d3"; + sha256 = "c840cc2dfeb2088484692cb0073e6a7bb85e3e44e95aee1e0f5a8e223f7ccae6"; }; buildInputs = [ ocaml findlib camlp5 ]; From daa459cc8ab5037674039b7235f9f2d7769c1cae Mon Sep 17 00:00:00 2001 From: Florian Friesdorf Date: Wed, 28 Dec 2011 21:48:55 +0000 Subject: [PATCH 142/186] popt-0.16 Thanks to Peter Simons for preparing this. Make sure you have nixos 31132. svn path=/nixpkgs/trunk/; revision=31133 --- pkgs/development/libraries/popt/default.nix | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/pkgs/development/libraries/popt/default.nix b/pkgs/development/libraries/popt/default.nix index 82fa564fa01..03f917daa23 100644 --- a/pkgs/development/libraries/popt/default.nix +++ b/pkgs/development/libraries/popt/default.nix @@ -1,10 +1,14 @@ {stdenv, fetchurl}: -stdenv.mkDerivation { - name = "popt-1.15"; +stdenv.mkDerivation rec { + name = "popt-1.16"; src = fetchurl { - url = http://rpm5.org/files/popt/popt-1.15.tar.gz; - sha256 = "1wqbcimg4zlfp7261i89s1918a46fjfbvq1a4ij4a6prk27576q6"; + url = "http://rpm5.org/files/popt/${name}.tar.gz"; + sha256 = "1j2c61nn2n351nhj4d25mnf3vpiddcykq005w2h6kw79dwlysa77"; + }; + + meta = { + description = "command line option parsing library"; }; } From d5709cfb64c177f6274567dc8eb612244de691e7 Mon Sep 17 00:00:00 2001 From: Florian Friesdorf Date: Wed, 28 Dec 2011 21:48:58 +0000 Subject: [PATCH 143/186] cryptsetup-1.4.1 Thanks to Mathijs Kwik and Peter Simons for preparing this. Make sure you have nixos r31132. svn path=/nixpkgs/trunk/; revision=31134 --- pkgs/os-specific/linux/cryptsetup/default.nix | 20 +++++++------------ 1 file changed, 7 insertions(+), 13 deletions(-) diff --git a/pkgs/os-specific/linux/cryptsetup/default.nix b/pkgs/os-specific/linux/cryptsetup/default.nix index 765a49c6446..2b23dbe904f 100644 --- a/pkgs/os-specific/linux/cryptsetup/default.nix +++ b/pkgs/os-specific/linux/cryptsetup/default.nix @@ -1,25 +1,19 @@ -{stdenv, fetchurl, libuuid, popt, devicemapper, udev }: +{stdenv, fetchurl, devicemapper, libgcrypt, libuuid, pkgconfig, popt, udev }: -stdenv.mkDerivation { - name = "cryptsetup-1.0.6"; +stdenv.mkDerivation rec { + name = "cryptsetup-1.4.1"; src = fetchurl { - url = http://cryptsetup.googlecode.com/files/cryptsetup-1.0.6.tar.bz2; - sha256 = "df7fda80cfa01f063caf39140287a47d018dfe056fc71a3ba605e690ff0183fd"; + url = "http://cryptsetup.googlecode.com/files/${name}.tar.bz2"; + sha256 = "82b143328c2b427ef2b89fb76c701d311c95b54093c21bbf22342f7b393bddcb"; }; - configureFlags = [ "--enable-libdevmapper" ]; - - patchPhase = '' - sed -i -e 's@/sbin/udevsettle@${udev}/sbin/udevadm settle@' lib/libdevmapper.c - ''; - - buildInputs = [ libuuid popt devicemapper ]; + buildInputs = [ devicemapper libgcrypt libuuid pkgconfig popt ]; meta = { homepage = http://code.google.com/p/cryptsetup/; description = "LUKS for dm-crypt"; license = "GPLv2"; - maintainers = with stdenv.lib.maintainers; [viric]; + maintainers = with stdenv.lib.maintainers; [ viric chaoflow ]; platforms = with stdenv.lib.platforms; linux; }; } From bf55fb9192b300186b3544b66cd7edf14032aafb Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Thu, 29 Dec 2011 16:22:46 +0000 Subject: [PATCH 144/186] * Fixed Calibre (it was referring to "python2", which doesn't exist) and updated it to 0.8.32. svn path=/nixpkgs/trunk/; revision=31140 --- pkgs/applications/misc/calibre/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/misc/calibre/default.nix b/pkgs/applications/misc/calibre/default.nix index b38a6cb5644..1685ef50b8d 100644 --- a/pkgs/applications/misc/calibre/default.nix +++ b/pkgs/applications/misc/calibre/default.nix @@ -4,11 +4,11 @@ }: stdenv.mkDerivation rec { - name = "calibre-0.8.30"; + name = "calibre-0.8.32"; src = fetchurl { url = "http://calibre-ebook.googlecode.com/files/${name}.tar.xz"; - sha256 = "1w94kaynxiksjfi6wqlvwnryl08f8m0ylqwgzwkz1hjznqiji282"; + sha256 = "0d0zq4sr0qm8jarg0ps24lfizb4hyb57pjsp81y1sb5nzjki7jml"; }; inherit python; @@ -38,7 +38,7 @@ stdenv.mkDerivation rec { $out/lib/calibre/calibre/ebooks/metadata/*.py $out/lib/calibre/calibre/ebooks/rtf2xml/*.py" - sed -i "s/env python/python/" $PYFILES + sed -i "s/env python[0-9.]*/python/" $PYFILES for a in $out/bin/*; do wrapProgram $a --prefix PYTHONPATH : $PYTHONPATH --prefix LD_LIBRARY_PATH : ${unrar}/lib done From de1a6e09d7bbf1cf4adbabbae00de56d943dae12 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Thu, 29 Dec 2011 16:42:08 +0000 Subject: [PATCH 145/186] haskell-path-pieces: added version 0.1.0 haskell-attoparsec-conduit: added version 0.0.0 haskell-blaze-builder-conduit: added version 0.0.0 haskell-conduit: added version 0.0.0.1 haskell-http-conduit: added version 1.0.0 haskell-lifted-base: added version 0.1.0.2 haskell-xml-conduit: added version 0.5.0 haskell-zlib-conduit: added version 0.0.0 svn path=/nixpkgs/trunk/; revision=31141 --- .../haskell/attoparsec-conduit/default.nix | 18 +++++++++++ .../haskell/blaze-builder-conduit/default.nix | 18 +++++++++++ .../libraries/haskell/conduit/default.nix | 22 +++++++++++++ .../haskell/http-conduit/default.nix | 31 +++++++++++++++++++ .../libraries/haskell/lifted-base/default.nix | 20 ++++++++++++ .../path-pieces/{default.nix => 0.0.0.nix} | 0 .../libraries/haskell/path-pieces/0.1.0.nix | 18 +++++++++++ .../libraries/haskell/xml-conduit/default.nix | 25 +++++++++++++++ .../haskell/zlib-conduit/default.nix | 18 +++++++++++ pkgs/top-level/haskell-packages.nix | 30 +++++++++++++++--- 10 files changed, 196 insertions(+), 4 deletions(-) create mode 100644 pkgs/development/libraries/haskell/attoparsec-conduit/default.nix create mode 100644 pkgs/development/libraries/haskell/blaze-builder-conduit/default.nix create mode 100644 pkgs/development/libraries/haskell/conduit/default.nix create mode 100644 pkgs/development/libraries/haskell/http-conduit/default.nix create mode 100644 pkgs/development/libraries/haskell/lifted-base/default.nix rename pkgs/development/libraries/haskell/path-pieces/{default.nix => 0.0.0.nix} (100%) create mode 100755 pkgs/development/libraries/haskell/path-pieces/0.1.0.nix create mode 100644 pkgs/development/libraries/haskell/xml-conduit/default.nix create mode 100644 pkgs/development/libraries/haskell/zlib-conduit/default.nix diff --git a/pkgs/development/libraries/haskell/attoparsec-conduit/default.nix b/pkgs/development/libraries/haskell/attoparsec-conduit/default.nix new file mode 100644 index 00000000000..fd11df19905 --- /dev/null +++ b/pkgs/development/libraries/haskell/attoparsec-conduit/default.nix @@ -0,0 +1,18 @@ +{ cabal, attoparsec, conduit, text, transformers }: + +cabal.mkDerivation (self: { + pname = "attoparsec-conduit"; + version = "0.0.0"; + sha256 = "1cwmi86faisg10l15w8mz3619phvrn2hl10blr6pziv1k8c3ncj7"; + buildDepends = [ attoparsec conduit text transformers ]; + meta = { + homepage = "http://github.com/snoyberg/conduit"; + description = "Turn attoparsec parsers into sinks"; + license = self.stdenv.lib.licenses.bsd3; + platforms = self.ghc.meta.platforms; + maintainers = [ + self.stdenv.lib.maintainers.andres + self.stdenv.lib.maintainers.simons + ]; + }; +}) diff --git a/pkgs/development/libraries/haskell/blaze-builder-conduit/default.nix b/pkgs/development/libraries/haskell/blaze-builder-conduit/default.nix new file mode 100644 index 00000000000..40e4ec9a121 --- /dev/null +++ b/pkgs/development/libraries/haskell/blaze-builder-conduit/default.nix @@ -0,0 +1,18 @@ +{ cabal, blazeBuilder, conduit, text, transformers }: + +cabal.mkDerivation (self: { + pname = "blaze-builder-conduit"; + version = "0.0.0"; + sha256 = "022j78sj9cs4xcbvxz0f2lga0rhxcwaj1mkxn0019rbx3lix1nh3"; + buildDepends = [ blazeBuilder conduit text transformers ]; + meta = { + homepage = "http://github.com/snoyberg/conduit"; + description = "Convert streams of builders to streams of bytestrings"; + license = self.stdenv.lib.licenses.bsd3; + platforms = self.ghc.meta.platforms; + maintainers = [ + self.stdenv.lib.maintainers.andres + self.stdenv.lib.maintainers.simons + ]; + }; +}) diff --git a/pkgs/development/libraries/haskell/conduit/default.nix b/pkgs/development/libraries/haskell/conduit/default.nix new file mode 100644 index 00000000000..76a7130ecb1 --- /dev/null +++ b/pkgs/development/libraries/haskell/conduit/default.nix @@ -0,0 +1,22 @@ +{ cabal, liftedBase, monadControl, text, transformers +, transformersBase +}: + +cabal.mkDerivation (self: { + pname = "conduit"; + version = "0.0.0.1"; + sha256 = "0l3q9jj0dpbn2ixjx6d9m6ss92dmfgd5xc7wgfpb9d0kfk2li0sv"; + buildDepends = [ + liftedBase monadControl text transformers transformersBase + ]; + meta = { + homepage = "http://github.com/snoyberg/conduit"; + description = "A pull-based approach to streaming data"; + license = self.stdenv.lib.licenses.bsd3; + platforms = self.ghc.meta.platforms; + maintainers = [ + self.stdenv.lib.maintainers.andres + self.stdenv.lib.maintainers.simons + ]; + }; +}) diff --git a/pkgs/development/libraries/haskell/http-conduit/default.nix b/pkgs/development/libraries/haskell/http-conduit/default.nix new file mode 100644 index 00000000000..ab011d5c87b --- /dev/null +++ b/pkgs/development/libraries/haskell/http-conduit/default.nix @@ -0,0 +1,31 @@ +{ cabal, asn1Data, attoparsec, attoparsecConduit, base64Bytestring +, blazeBuilder, blazeBuilderConduit, caseInsensitive, certificate +, conduit, cprngAes, dataDefault, failure, httpTypes, liftedBase +, monadControl, network, text, tls, tlsExtra, transformers +, transformersBase, utf8String, zlibConduit, zlibEnum +}: + +cabal.mkDerivation (self: { + pname = "http-conduit"; + version = "1.0.0"; + sha256 = "1ix2qx6zqp8g7hjg2ygwivzg4hhz2ac22rbybh9adzvzw0q2yvgk"; + isLibrary = true; + isExecutable = true; + buildDepends = [ + asn1Data attoparsec attoparsecConduit base64Bytestring blazeBuilder + blazeBuilderConduit caseInsensitive certificate conduit cprngAes + dataDefault failure httpTypes liftedBase monadControl network text + tls tlsExtra transformers transformersBase utf8String zlibConduit + zlibEnum + ]; + meta = { + homepage = "http://github.com/snoyberg/http-enumerator"; + description = "HTTP client package with conduit interface and HTTPS support"; + license = self.stdenv.lib.licenses.bsd3; + platforms = self.ghc.meta.platforms; + maintainers = [ + self.stdenv.lib.maintainers.andres + self.stdenv.lib.maintainers.simons + ]; + }; +}) diff --git a/pkgs/development/libraries/haskell/lifted-base/default.nix b/pkgs/development/libraries/haskell/lifted-base/default.nix new file mode 100644 index 00000000000..48822d777bc --- /dev/null +++ b/pkgs/development/libraries/haskell/lifted-base/default.nix @@ -0,0 +1,20 @@ +{ cabal, baseUnicodeSymbols, monadControl, transformersBase }: + +cabal.mkDerivation (self: { + pname = "lifted-base"; + version = "0.1.0.2"; + sha256 = "1j810pdkhl6kpc368081ar1k9342k3bl4cmx294zdyd0j00n23zx"; + buildDepends = [ + baseUnicodeSymbols monadControl transformersBase + ]; + meta = { + homepage = "https://github.com/basvandijk/lifted-base"; + description = "lifted IO operations from the base library"; + license = self.stdenv.lib.licenses.bsd3; + platforms = self.ghc.meta.platforms; + maintainers = [ + self.stdenv.lib.maintainers.andres + self.stdenv.lib.maintainers.simons + ]; + }; +}) diff --git a/pkgs/development/libraries/haskell/path-pieces/default.nix b/pkgs/development/libraries/haskell/path-pieces/0.0.0.nix similarity index 100% rename from pkgs/development/libraries/haskell/path-pieces/default.nix rename to pkgs/development/libraries/haskell/path-pieces/0.0.0.nix diff --git a/pkgs/development/libraries/haskell/path-pieces/0.1.0.nix b/pkgs/development/libraries/haskell/path-pieces/0.1.0.nix new file mode 100755 index 00000000000..9c3c8dbc79a --- /dev/null +++ b/pkgs/development/libraries/haskell/path-pieces/0.1.0.nix @@ -0,0 +1,18 @@ +{ cabal, text }: + +cabal.mkDerivation (self: { + pname = "path-pieces"; + version = "0.1.0"; + sha256 = "12dgiq2pz94pwa5v5wv96ps0nl5w23r44nnp4lm4cdhl063c9w8d"; + buildDepends = [ text ]; + meta = { + homepage = "http://github.com/snoyberg/path-pieces"; + description = "Components of paths"; + license = self.stdenv.lib.licenses.bsd3; + platforms = self.ghc.meta.platforms; + maintainers = [ + self.stdenv.lib.maintainers.andres + self.stdenv.lib.maintainers.simons + ]; + }; +}) diff --git a/pkgs/development/libraries/haskell/xml-conduit/default.nix b/pkgs/development/libraries/haskell/xml-conduit/default.nix new file mode 100644 index 00000000000..79f10512b46 --- /dev/null +++ b/pkgs/development/libraries/haskell/xml-conduit/default.nix @@ -0,0 +1,25 @@ +{ cabal, attoparsec, attoparsecConduit, blazeBuilder +, blazeBuilderConduit, conduit, dataDefault, failure +, systemFilepath, text, transformers, xmlTypes +}: + +cabal.mkDerivation (self: { + pname = "xml-conduit"; + version = "0.5.0"; + sha256 = "008rrqglxajihcf3yp9cwif67dnabyjjiymxvssznrl8ljz4yn8y"; + buildDepends = [ + attoparsec attoparsecConduit blazeBuilder blazeBuilderConduit + conduit dataDefault failure systemFilepath text transformers + xmlTypes + ]; + meta = { + homepage = "http://github.com/snoyberg/xml"; + description = "Pure-Haskell utilities for dealing with XML with the conduit package"; + license = self.stdenv.lib.licenses.bsd3; + platforms = self.ghc.meta.platforms; + maintainers = [ + self.stdenv.lib.maintainers.andres + self.stdenv.lib.maintainers.simons + ]; + }; +}) diff --git a/pkgs/development/libraries/haskell/zlib-conduit/default.nix b/pkgs/development/libraries/haskell/zlib-conduit/default.nix new file mode 100644 index 00000000000..306475a81b4 --- /dev/null +++ b/pkgs/development/libraries/haskell/zlib-conduit/default.nix @@ -0,0 +1,18 @@ +{ cabal, conduit, transformers, zlibBindings }: + +cabal.mkDerivation (self: { + pname = "zlib-conduit"; + version = "0.0.0"; + sha256 = "1nqcw809xqlycggn4nqys205gv3kjwws16910xlx2b8b9f8ayxjg"; + buildDepends = [ conduit transformers zlibBindings ]; + meta = { + homepage = "http://github.com/snoyberg/conduit"; + description = "Streaming compression/decompression via conduits"; + license = self.stdenv.lib.licenses.bsd3; + platforms = self.ghc.meta.platforms; + maintainers = [ + self.stdenv.lib.maintainers.andres + self.stdenv.lib.maintainers.simons + ]; + }; +}) diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix index 8cc83cf4853..5e1fef0215f 100644 --- a/pkgs/top-level/haskell-packages.nix +++ b/pkgs/top-level/haskell-packages.nix @@ -439,6 +439,8 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y); attoparsec = callPackage ../development/libraries/haskell/attoparsec {}; + attoparsecConduit = callPackage ../development/libraries/haskell/attoparsec-conduit {}; + attoparsecEnumerator = callPackage ../development/libraries/haskell/attoparsec/enumerator.nix {}; authenticate = callPackage ../development/libraries/haskell/authenticate {}; @@ -467,6 +469,8 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y); blazeBuilder = callPackage ../development/libraries/haskell/blaze-builder {}; + blazeBuilderConduit = callPackage ../development/libraries/haskell/blaze-builder-conduit {}; + blazeBuilderEnumerator = callPackage ../development/libraries/haskell/blaze-builder-enumerator {}; blazeHtml = callPackage ../development/libraries/haskell/blaze-html {}; @@ -529,6 +533,8 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y); compactStringFix = callPackage ../development/libraries/haskell/compact-string-fix {}; + conduit = callPackage ../development/libraries/haskell/conduit {}; + ConfigFile = callPackage ../development/libraries/haskell/ConfigFile {}; controlMonadAttempt = callPackage ../development/libraries/haskell/control-monad-attempt {}; @@ -840,6 +846,8 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y); html_1_0_1_2 = callPackage ../development/libraries/haskell/html/1.0.1.2.nix {}; html = self.html_1_0_1_2; + httpConduit = callPackage ../development/libraries/haskell/http-conduit {}; + httpdShed = callPackage ../development/libraries/haskell/httpd-shed {}; httpDate = callPackage ../development/libraries/haskell/http-date {}; @@ -899,6 +907,8 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y); libmpd = callPackage ../development/libraries/haskell/libmpd {}; + liftedBase = callPackage ../development/libraries/haskell/lifted-base {}; + ListLike = callPackage ../development/libraries/haskell/ListLike {}; ltk = callPackage ../development/libraries/haskell/ltk {}; @@ -997,7 +1007,9 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y); OpenGLRaw = callPackage ../development/libraries/haskell/OpenGLRaw {}; - pathPieces = callPackage ../development/libraries/haskell/path-pieces {}; + pathPieces_0_0_0 = callPackage ../development/libraries/haskell/path-pieces/0.0.0.nix {}; + pathPieces_0_1_0 = callPackage ../development/libraries/haskell/path-pieces/0.1.0.nix {}; + pathPieces = self.pathPieces_0_1_0; pandoc = callPackage ../development/libraries/haskell/pandoc/default.nix {}; @@ -1029,7 +1041,9 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y); pcreLight = callPackage ../development/libraries/haskell/pcre-light {}; - persistent = callPackage ../development/libraries/haskell/persistent {}; + persistent = callPackage ../development/libraries/haskell/persistent { + pathPieces = self.pathPieces_0_0_0; + }; persistentTemplate = callPackage ../development/libraries/haskell/persistent-template {}; @@ -1372,7 +1386,9 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y); webRoutes = callPackage ../development/libraries/haskell/web-routes {}; - webRoutesQuasi = callPackage ../development/libraries/haskell/web-routes-quasi {}; + webRoutesQuasi = callPackage ../development/libraries/haskell/web-routes-quasi { + pathPieces = self.pathPieces_0_0_0; + }; CouchDB = callPackage ../development/libraries/haskell/CouchDB {}; @@ -1396,6 +1412,8 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y); xml = callPackage ../development/libraries/haskell/xml {}; + xmlConduit = callPackage ../development/libraries/haskell/xml-conduit {}; + xmlEnumerator = callPackage ../development/libraries/haskell/xml-enumerator {}; xmlTypes = callPackage ../development/libraries/haskell/xml-types {}; @@ -1410,7 +1428,9 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y); yesodAuth = callPackage ../development/libraries/haskell/yesod-auth {}; - yesodCore = callPackage ../development/libraries/haskell/yesod-core {}; + yesodCore = callPackage ../development/libraries/haskell/yesod-core { + pathPieces = self.pathPieces_0_0_0; + }; yesodForm = callPackage ../development/libraries/haskell/yesod-form {}; @@ -1441,6 +1461,8 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y); zlibBindings = callPackage ../development/libraries/haskell/zlib-bindings {}; + zlibConduit = callPackage ../development/libraries/haskell/zlib-conduit {}; + zlibEnum = callPackage ../development/libraries/haskell/zlib-enum {}; Zwaluw = callPackage ../development/libraries/haskell/Zwaluw {}; From 633a19499459667568eaa80ffa5484cb31705176 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Thu, 29 Dec 2011 16:53:14 +0000 Subject: [PATCH 146/186] * PIL updated to 1.1.7. svn path=/nixpkgs/trunk/; revision=31142 --- .../python-modules/pil/default.nix | 70 +++++++++---------- 1 file changed, 35 insertions(+), 35 deletions(-) diff --git a/pkgs/development/python-modules/pil/default.nix b/pkgs/development/python-modules/pil/default.nix index e4586762527..4cf4576c0ce 100644 --- a/pkgs/development/python-modules/pil/default.nix +++ b/pkgs/development/python-modules/pil/default.nix @@ -1,41 +1,41 @@ -{ fetchurl, stdenv, python -, libjpeg, zlib, freetype }: +{ fetchurl, stdenv, python, libjpeg, zlib, freetype }: -let version = "1.1.6"; -in - stdenv.mkDerivation { - name = "python-imaging-${version}"; - src = fetchurl { - url = "http://effbot.org/downloads/Imaging-${version}.tar.gz"; - sha256 = "141zidl3s9v4vfi3nsbg42iq1lc2a932gprqr1kij5hrnn53bmvx"; - }; +let version = "1.1.7"; in - buildInputs = [ python libjpeg zlib freetype ]; +stdenv.mkDerivation { + name = "python-imaging-${version}"; + + src = fetchurl { + url = "http://effbot.org/downloads/Imaging-${version}.tar.gz"; + sha256 = "04aj80jhfbmxqzvmq40zfi4z3cw6vi01m3wkk6diz3lc971cfnw9"; + }; - doCheck = true; + buildInputs = [ python libjpeg zlib freetype ]; - configurePhase = '' - sed -i "setup.py" \ - -e 's|^FREETYPE_ROOT =.*$|FREETYPE_ROOT = libinclude("${freetype}")|g ; - s|^JPEG_ROOT =.*$|JPEG_ROOT = libinclude("${libjpeg}")|g ; - s|^ZLIB_ROOT =.*$|ZLIB_ROOT = libinclude("${zlib}")|g ;' + doCheck = true; + + configurePhase = '' + sed -i "setup.py" \ + -e 's|^FREETYPE_ROOT =.*$|FREETYPE_ROOT = libinclude("${freetype}")|g ; + s|^JPEG_ROOT =.*$|JPEG_ROOT = libinclude("${libjpeg}")|g ; + s|^ZLIB_ROOT =.*$|ZLIB_ROOT = libinclude("${zlib}")|g ;' + ''; + + buildPhase = "python setup.py build_ext -i"; + checkPhase = "python selftest.py"; + installPhase = "python setup.py install --prefix=$out"; + + meta = { + homepage = http://www.pythonware.com/products/pil/; + description = "The Python Imaging Library (PIL)"; + + longDescription = '' + The Python Imaging Library (PIL) adds image processing + capabilities to your Python interpreter. This library + supports many file formats, and provides powerful image + processing and graphics capabilities. ''; - buildPhase = "python setup.py build_ext -i"; - checkPhase = "python selftest.py"; - installPhase = "python setup.py install --prefix=$out"; - - meta = { - homepage = http://www.pythonware.com/products/pil/; - description = "The Python Imaging Library (PIL)"; - - longDescription = '' - The Python Imaging Library (PIL) adds image processing - capabilities to your Python interpreter. This library - supports many file formats, and provides powerful image - processing and graphics capabilities. - ''; - - license = "http://www.pythonware.com/products/pil/license.htm"; - }; - } + license = "http://www.pythonware.com/products/pil/license.htm"; + }; +} From c6ad751a8c94936533041843f3676088460fad45 Mon Sep 17 00:00:00 2001 From: Florian Friesdorf Date: Thu, 29 Dec 2011 19:46:37 +0000 Subject: [PATCH 147/186] zsh-4.3.15 svn path=/nixpkgs/trunk/; revision=31146 --- pkgs/shells/zsh/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/shells/zsh/default.nix b/pkgs/shells/zsh/default.nix index 037ceddfd01..ae1801c5463 100644 --- a/pkgs/shells/zsh/default.nix +++ b/pkgs/shells/zsh/default.nix @@ -2,11 +2,11 @@ let - version = "4.3.10"; + version = "4.3.15"; documentation = fetchurl { url = "mirror://sourceforge/zsh/zsh-${version}-doc.tar.bz2"; - sha256 = "f53d5c434fdb26fc79755279175514507eb1d11cf793ac57270d053ee61f37f9"; + sha256 = "73b7ee1a737fbaf9be77cf6b55b27cca96bac39bc5ef25efa9ceb427cd1b5ad4"; }; in @@ -16,7 +16,7 @@ stdenv.mkDerivation { src = fetchurl { url = "mirror://sourceforge/zsh/zsh-${version}.tar.bz2"; - sha256 = "63fdc0273eadbb42d164f38b0b79922c0b3df0e97084e746a318276d935a4f7c"; + sha256 = "8708f485823fb7e51aa696776d0dfac7d3558485182672cf9311c12a50a95486"; }; configureFlags = "--with-tcsetpgrp --enable-maildir-support --enable-multibyte"; From ecba799e780734eaf9087fc7444ae554d7f59e46 Mon Sep 17 00:00:00 2001 From: Florian Friesdorf Date: Thu, 29 Dec 2011 19:46:43 +0000 Subject: [PATCH 148/186] zsh meta svn path=/nixpkgs/trunk/; revision=31147 --- pkgs/shells/zsh/default.nix | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/pkgs/shells/zsh/default.nix b/pkgs/shells/zsh/default.nix index ae1801c5463..db0e1d107b5 100644 --- a/pkgs/shells/zsh/default.nix +++ b/pkgs/shells/zsh/default.nix @@ -26,5 +26,14 @@ stdenv.mkDerivation { tar xf ${documentation} -C $out/share ''; - buildInputs = [ncurses coreutils]; + buildInputs = [ ncurses coreutils ]; + + meta = { + description = "the Z shell"; + longDescription = "Zsh is a UNIX command interpreter (shell) usable as an interactive login shell and as a shell script command processor. Of the standard shells, zsh most closely resembles ksh but includes many enhancements. Zsh has command line editing, builtin spelling correction, programmable command completion, shell functions (with autoloading), a history mechanism, and a host of other features."; + license = "MIT-like"; + homePage = "http://www.zsh.org/"; + maintainers = with stdenv.lib.maintainers; [ chaoflow ]; + platforms = stdenv.lib.platforms.gnu; # arbitrary choice + }; } From 0009c1f650ba619de97df36322fbd0346db0c099 Mon Sep 17 00:00:00 2001 From: Florian Friesdorf Date: Thu, 29 Dec 2011 19:46:47 +0000 Subject: [PATCH 149/186] zshprofile to load /etc/profile while emulating bash svn path=/nixpkgs/trunk/; revision=31148 --- pkgs/shells/zsh/default.nix | 27 ++++++++++++++++++++++++--- 1 file changed, 24 insertions(+), 3 deletions(-) diff --git a/pkgs/shells/zsh/default.nix b/pkgs/shells/zsh/default.nix index db0e1d107b5..61deeb4869d 100644 --- a/pkgs/shells/zsh/default.nix +++ b/pkgs/shells/zsh/default.nix @@ -19,14 +19,35 @@ stdenv.mkDerivation { sha256 = "8708f485823fb7e51aa696776d0dfac7d3558485182672cf9311c12a50a95486"; }; - configureFlags = "--with-tcsetpgrp --enable-maildir-support --enable-multibyte"; + buildInputs = [ ncurses coreutils ]; + preConfigure = '' + configureFlags="--enable-maildir-support --enable-multibyte --enable-zprofile=$out/etc/zprofile --with-tcsetpgrp" + ''; + + # XXX: think/discuss about this, also with respect to nixos vs nix-on-X postInstall = '' ensureDir $out/share/ tar xf ${documentation} -C $out/share + ensureDir $out/etc/ + cat > $out/etc/zprofile < Date: Thu, 29 Dec 2011 20:09:30 +0000 Subject: [PATCH 150/186] zsh profile load tweaking only on nixos svn path=/nixpkgs/trunk/; revision=31149 --- pkgs/shells/zsh/default.nix | 28 ++++++++++++++++++---------- 1 file changed, 18 insertions(+), 10 deletions(-) diff --git a/pkgs/shells/zsh/default.nix b/pkgs/shells/zsh/default.nix index 61deeb4869d..6b199e165d0 100644 --- a/pkgs/shells/zsh/default.nix +++ b/pkgs/shells/zsh/default.nix @@ -31,17 +31,25 @@ stdenv.mkDerivation { tar xf ${documentation} -C $out/share ensureDir $out/etc/ cat > $out/etc/zprofile < Date: Thu, 29 Dec 2011 22:14:08 +0000 Subject: [PATCH 151/186] Adding task warrior, stable. svn path=/nixpkgs/trunk/; revision=31150 --- pkgs/applications/misc/taskwarrior/default.nix | 16 ++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 18 insertions(+) create mode 100644 pkgs/applications/misc/taskwarrior/default.nix diff --git a/pkgs/applications/misc/taskwarrior/default.nix b/pkgs/applications/misc/taskwarrior/default.nix new file mode 100644 index 00000000000..52b721622e4 --- /dev/null +++ b/pkgs/applications/misc/taskwarrior/default.nix @@ -0,0 +1,16 @@ +{ stdenv, fetchurl }: + +stdenv.mkDerivation { + name = "task-warrior-1.9.4"; + + src = fetchurl { + url = http://www.taskwarrior.org/download/task-1.9.4.tar.gz; + sha256 = "0jnk30k1b2j3nx39il70jmj6p49wxp6cl4awd8hw71gqkcf6480h"; + }; + + meta = { + description = "Command-line todo list manager"; + homepage = http://taskwarrior.org/; + license = "MIT"; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 44d44f080e0..9d2c693e163 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -7422,6 +7422,8 @@ let withKde = getConfig [ "taskJuggler" "kde" ] false; }; + taskwarrior = callPackage ../applications/misc/taskwarrior { }; + tesseract = callPackage ../applications/graphics/tesseract { }; thinkingRock = callPackage ../applications/misc/thinking-rock { }; From 7d4e6bbec9a04c604c24edf2c42db47fdd842f45 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?= Date: Thu, 29 Dec 2011 22:27:32 +0000 Subject: [PATCH 152/186] Adding task warrior unstable. svn path=/nixpkgs/trunk/; revision=31151 --- .../misc/taskwarrior/unstable.nix | 20 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 22 insertions(+) create mode 100644 pkgs/applications/misc/taskwarrior/unstable.nix diff --git a/pkgs/applications/misc/taskwarrior/unstable.nix b/pkgs/applications/misc/taskwarrior/unstable.nix new file mode 100644 index 00000000000..057ebbe57c5 --- /dev/null +++ b/pkgs/applications/misc/taskwarrior/unstable.nix @@ -0,0 +1,20 @@ +{ stdenv, fetchurl, cmake, lua5 }: + +stdenv.mkDerivation { + name = "task-warrior-2.0.0.beta4"; + + src = fetchurl { + url = http://www.taskwarrior.org/download/task-2.0.0.beta4.tar.gz; + sha256 = "1c9n6b5ly3m5kminnsvqgmjxdkb68w4av9kdnh47dw4sj3gwrn1w"; + }; + + NIX_LDFLAGS = "-ldl"; + + buildInputs = [ cmake lua5 ]; + + meta = { + description = "Command-line todo list manager"; + homepage = http://taskwarrior.org/; + license = "MIT"; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 9d2c693e163..bbc4a70b948 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -7424,6 +7424,8 @@ let taskwarrior = callPackage ../applications/misc/taskwarrior { }; + taskwarrior_unstable = callPackage ../applications/misc/taskwarrior/unstable.nix { }; + tesseract = callPackage ../applications/graphics/tesseract { }; thinkingRock = callPackage ../applications/misc/thinking-rock { }; From 3e9953290aa023d61d407e6e4344cb7332bc8309 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?= Date: Thu, 29 Dec 2011 22:28:22 +0000 Subject: [PATCH 153/186] THe stable task warrior has a licence GPLv2+, not MIT. svn path=/nixpkgs/trunk/; revision=31152 --- pkgs/applications/misc/taskwarrior/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/applications/misc/taskwarrior/default.nix b/pkgs/applications/misc/taskwarrior/default.nix index 52b721622e4..1202c4327bb 100644 --- a/pkgs/applications/misc/taskwarrior/default.nix +++ b/pkgs/applications/misc/taskwarrior/default.nix @@ -11,6 +11,6 @@ stdenv.mkDerivation { meta = { description = "Command-line todo list manager"; homepage = http://taskwarrior.org/; - license = "MIT"; + license = "GPLv2+"; }; } From 573455fd44527152f4f6455b69e859d8088d8f64 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Fri, 30 Dec 2011 17:05:17 +0000 Subject: [PATCH 154/186] haskell-data-object-yaml: updated to version 0.3.4 svn path=/nixpkgs/trunk/; revision=31158 --- .../libraries/haskell/data-object-yaml/default.nix | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/pkgs/development/libraries/haskell/data-object-yaml/default.nix b/pkgs/development/libraries/haskell/data-object-yaml/default.nix index a29ba40b823..1669f4be73e 100644 --- a/pkgs/development/libraries/haskell/data-object-yaml/default.nix +++ b/pkgs/development/libraries/haskell/data-object-yaml/default.nix @@ -1,20 +1,19 @@ -{ cabal, convertibleText, dataObject, enumerator, failure, text +{ cabal, conduit, convertibleText, dataObject, failure, text , transformers, yaml }: cabal.mkDerivation (self: { pname = "data-object-yaml"; - version = "0.3.3.6"; - sha256 = "0hha52nrxb539bvdz6ksn9sxmksfwmjhh7h8mp223s340vxrlpk3"; + version = "0.3.4"; + sha256 = "1wx6m7mjmdks8ym6dh117bhkdks4d1jlfchqif0svcwg04qnfczd"; isLibrary = true; isExecutable = true; buildDepends = [ - convertibleText dataObject enumerator failure text transformers - yaml + conduit convertibleText dataObject failure text transformers yaml ]; meta = { homepage = "http://github.com/snoyberg/data-object-yaml"; - description = "Serialize data to and from Yaml files"; + description = "Serialize data to and from Yaml files (deprecated)"; license = self.stdenv.lib.licenses.bsd3; platforms = self.ghc.meta.platforms; maintainers = [ From 6dfd7b14460573877c03089f80a4e8fae6881750 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Fri, 30 Dec 2011 17:05:20 +0000 Subject: [PATCH 155/186] haskell-yaml: updated to version 0.5.1.1 svn path=/nixpkgs/trunk/; revision=31159 --- .../libraries/haskell/yaml/default.nix | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) diff --git a/pkgs/development/libraries/haskell/yaml/default.nix b/pkgs/development/libraries/haskell/yaml/default.nix index 76010bb4f86..2b25768aa69 100644 --- a/pkgs/development/libraries/haskell/yaml/default.nix +++ b/pkgs/development/libraries/haskell/yaml/default.nix @@ -1,12 +1,15 @@ -{ cabal, enumerator, transformers }: +{ cabal, aeson, attoparsec, conduit, text, transformers +, unorderedContainers, vector +}: cabal.mkDerivation (self: { pname = "yaml"; - version = "0.4.1.2"; - sha256 = "1c7ffs5gkwk0l0vg7amsflra1j8ifd9cvvbqx9jzkqsay8hbr4vb"; - isLibrary = true; - isExecutable = true; - buildDepends = [ enumerator transformers ]; + version = "0.5.1.1"; + sha256 = "1l3f1rbdajdf9944kwbf90a1wxv00g2jcgjkg54k6c3iqbx956w2"; + buildDepends = [ + aeson attoparsec conduit text transformers unorderedContainers + vector + ]; meta = { homepage = "http://github.com/snoyberg/yaml/"; description = "Low-level binding to the libyaml C library"; From aefc550ae01fb396d442b97416b808aa6da26e6c Mon Sep 17 00:00:00 2001 From: Florian Friesdorf Date: Sat, 31 Dec 2011 04:05:33 +0000 Subject: [PATCH 156/186] asciidoc-8.6.6 svn path=/nixpkgs/trunk/; revision=31169 --- pkgs/tools/typesetting/asciidoc/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/typesetting/asciidoc/default.nix b/pkgs/tools/typesetting/asciidoc/default.nix index 598cbff11f2..31c57850285 100644 --- a/pkgs/tools/typesetting/asciidoc/default.nix +++ b/pkgs/tools/typesetting/asciidoc/default.nix @@ -1,10 +1,10 @@ { fetchurl, stdenv, python }: stdenv.mkDerivation rec { - name = "asciidoc-8.6.1"; + name = "asciidoc-8.6.6"; src = fetchurl { url = "mirror://sourceforge/asciidoc/${name}.tar.gz"; - sha256 = "1c844ahv4naghfv1jabyr8gnv2fsx4k7366vh63zx0h0w2x7ylaq"; + sha256 = "9d54c11716e4309ff4d942cf6a6d9745d6a28754ff1de01efed0dc659457ac71"; }; patchPhase = '' From 19246750bfa8aa11fe5586c96adca49a74f19da3 Mon Sep 17 00:00:00 2001 From: Florian Friesdorf Date: Sat, 31 Dec 2011 04:05:44 +0000 Subject: [PATCH 157/186] libev-4.04 (frees awesome build from many warnings) svn path=/nixpkgs/trunk/; revision=31170 --- pkgs/development/libraries/libev/src-for-default.nix | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/development/libraries/libev/src-for-default.nix b/pkgs/development/libraries/libev/src-for-default.nix index c7b37ce1891..52c8e65bc4f 100644 --- a/pkgs/development/libraries/libev/src-for-default.nix +++ b/pkgs/development/libraries/libev/src-for-default.nix @@ -1,8 +1,8 @@ rec { - advertisedUrl="http://dist.schmorp.de/libev/Attic/libev-3.8.tar.gz"; - version = "3.8"; - url="http://dist.schmorp.de/libev/Attic/libev-3.8.tar.gz"; - hash = "1512n6c5q9ykqmk5zbwyb1na9qb9shd900kf4xhl5g07aypm7qr5"; - name = "libev-3.8"; + advertisedUrl="http://dist.schmorp.de/libev/Attic/libev-4.04.tar.gz"; + version = "4.04"; + url="http://dist.schmorp.de/libev/Attic/libev-4.04.tar.gz"; + hash = "ab3a09e967e3b868055cd9363fd236aa093f8643d19cc7042e90e0dfe905b012"; + name = "libev-4.04"; } From 251d42d03f4856d6982291797a9710d0c6afef9a Mon Sep 17 00:00:00 2001 From: Florian Friesdorf Date: Sat, 31 Dec 2011 04:05:50 +0000 Subject: [PATCH 158/186] xcb-util-0.3.8 (+image|keysyms|renderutil|wm) this might break things but makes awesome-3.4.11 happy svn path=/nixpkgs/trunk/; revision=31171 --- pkgs/servers/x11/xorg/default.nix | 48 +++++++++++++++++++++++++++++-- 1 file changed, 45 insertions(+), 3 deletions(-) diff --git a/pkgs/servers/x11/xorg/default.nix b/pkgs/servers/x11/xorg/default.nix index f25289a683a..b1c7770b2ba 100644 --- a/pkgs/servers/x11/xorg/default.nix +++ b/pkgs/servers/x11/xorg/default.nix @@ -1148,15 +1148,57 @@ let })) // {inherit python ;}; xcbutil = (stdenv.mkDerivation ((if overrides ? xcbutil then overrides.xcbutil else x: x) { - name = "xcb-util-0.3.6"; + name = "xcb-util-0.3.8"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/individual/xcb/xcb-util-0.3.6.tar.bz2; - sha256 = "0mqfyq6skm19hhfmd5kmcn0v4di4pmbdszmbf2lmhn01mc8yxf7z"; + url = mirror://xorg/individual/xcb/xcb-util-0.3.8.tar.bz2; + sha256 = "c1eed9284750bc09352e60654df77bb585dbbe7673fdcc675e58b7f3a0b447b9"; }; buildInputs = [pkgconfig gperf m4 libxcb xproto ]; })) // {inherit gperf m4 libxcb xproto ;}; + xcbutilImage = (stdenv.mkDerivation ((if overrides ? xcbutil then overrides.xcbutil else x: x) { + name = "xcb-util-image-0.3.8"; + builder = ./builder.sh; + src = fetchurl { + url = mirror://xorg/individual/xcb/xcb-util-image-0.3.8.tar.bz2; + sha256 = "40390528c26e8231132540f16579b821de68bb2e9152918f72182d5a4038a6d9"; + }; + buildInputs = [pkgconfig gperf m4 libxcb xcbutil xproto ]; + })) // {inherit gperf m4 libxcb xcbutil xproto ;}; + + # XXX: No package 'xorg-macros' found + xcbutilKeysyms = (stdenv.mkDerivation ((if overrides ? xcbutil then overrides.xcbutil else x: x) { + name = "xcb-util-keysyms-0.3.8"; + builder = ./builder.sh; + src = fetchurl { + url = mirror://xorg/individual/xcb/xcb-util-keysyms-0.3.8.tar.bz2; + sha256 = "913d32f7afe380c580da7636ee13f2728790237bb5c03def536363f552686121"; + }; + buildInputs = [pkgconfig gperf m4 libxcb xproto ]; + })) // {inherit gperf m4 libxcb xproto ;}; + + # XXX: No package 'xorg-macros' found + xcbutilRenderutil = (stdenv.mkDerivation ((if overrides ? xcbutil then overrides.xcbutil else x: x) { + name = "xcb-util-renderutil-0.3.8"; + builder = ./builder.sh; + src = fetchurl { + url = mirror://xorg/individual/xcb/xcb-util-renderutil-0.3.8.tar.bz2; + sha256 = "9789a5c55728fa7bae374d9fdf1c61095869bdc68561911760879095644c7452"; + }; + buildInputs = [pkgconfig gperf m4 libxcb ]; + })) // {inherit gperf m4 libxcb ;}; + + xcbutilWm = (stdenv.mkDerivation ((if overrides ? xcbutil then overrides.xcbutil else x: x) { + name = "xcb-util-wm-0.3.8"; + builder = ./builder.sh; + src = fetchurl { + url = mirror://xorg/individual/xcb/xcb-util-wm-0.3.8.tar.bz2; + sha256 = "c557abbe4c7d45268f0541ee3d8f9a1a8799692fcc28aa33f39db93cc2e65007"; + }; + buildInputs = [pkgconfig gperf m4 libxcb ]; + })) // {inherit gperf m4 libxcb ;}; + xclock = (stdenv.mkDerivation ((if overrides ? xclock then overrides.xclock else x: x) { name = "xclock-1.0.5"; builder = ./builder.sh; From 096d86bfb152ff281200379b2e6e9d2bf2f65587 Mon Sep 17 00:00:00 2001 From: Florian Friesdorf Date: Sat, 31 Dec 2011 04:05:57 +0000 Subject: [PATCH 159/186] startup-notification-0.12 (works with xcb-util-0.3.8) svn path=/nixpkgs/trunk/; revision=31172 --- pkgs/development/libraries/startup-notification/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/startup-notification/default.nix b/pkgs/development/libraries/startup-notification/default.nix index d989c4059e6..2683a01a290 100644 --- a/pkgs/development/libraries/startup-notification/default.nix +++ b/pkgs/development/libraries/startup-notification/default.nix @@ -1,13 +1,13 @@ {stdenv, fetchurl, libX11, libxcb, pkgconfig, xcbutil}: let - version = "0.10"; + version = "0.12"; in stdenv.mkDerivation { name = "libstartup-notification-${version}"; src = fetchurl { url = "http://www.freedesktop.org/software/startup-notification/releases/startup-notification-${version}.tar.gz"; - sha256 = "0nalaay0yj3gq85insp9l31hsv5zp390m4nn37y235v151ffpfv4"; + sha256 = "3c391f7e930c583095045cd2d10eb73a64f085c7fde9d260f2652c7cb3cfbe4a"; }; buildInputs = [ libX11 libxcb pkgconfig xcbutil ]; From 8dd443c8dfbff99fae17266dbbca89d1cf6fa2d2 Mon Sep 17 00:00:00 2001 From: Florian Friesdorf Date: Sat, 31 Dec 2011 04:06:02 +0000 Subject: [PATCH 160/186] awesome-3.4.11 - ru manpages disabled because of build failure svn path=/nixpkgs/trunk/; revision=31173 --- .../window-managers/awesome/default.nix | 20 ++++++++++++++----- 1 file changed, 15 insertions(+), 5 deletions(-) diff --git a/pkgs/applications/window-managers/awesome/default.nix b/pkgs/applications/window-managers/awesome/default.nix index b94b350a848..fbf3b087cc7 100644 --- a/pkgs/applications/window-managers/awesome/default.nix +++ b/pkgs/applications/window-managers/awesome/default.nix @@ -1,10 +1,12 @@ {stdenv, fetchurl, xz, cmake, gperf, imagemagick, pkgconfig, lua , glib, cairo, pango, imlib2, libxcb, libxdg_basedir, xcbutil +, xcbutilImage, xcbutilKeysyms, xcbutilWm, libpthreadstubs, libXau +, libXdmcp, pixman, doxygen , libstartup_notification, libev, asciidoc, xmlto, dbus, docbook_xsl , docbook_xml_dtd_45, libxslt, coreutils}: let - version = "3.4.9"; + version = "3.4.11"; in stdenv.mkDerivation rec { @@ -12,11 +14,12 @@ stdenv.mkDerivation rec { src = fetchurl { url = "http://awesome.naquadah.org/download/awesome-${version}.tar.xz"; - sha256 = "0382v482904xv295l0gvhwzc64b7631miiv8wyq7jxmwqf2vfbp7"; + sha256 = "576b4f6d2c3f56dfbe52ad92f2eecece111f0f05816e32126cd03d4b4387761d"; }; buildInputs = [ xz cmake gperf imagemagick pkgconfig lua glib cairo pango - imlib2 libxcb libxdg_basedir xcbutil libstartup_notification libev + imlib2 libxcb libxdg_basedir xcbutil xcbutilImage xcbutilKeysyms xcbutilWm + libstartup_notification libev libpthreadstubs libXau libXdmcp pixman doxygen asciidoc xmlto dbus docbook_xsl docbook_xml_dtd_45 libxslt ]; # We use coreutils for 'env', that will allow then finding 'bash' or 'zsh' in @@ -27,10 +30,17 @@ stdenv.mkDerivation rec { sed s,/usr/bin/env,${coreutils}/bin/env, -i lib/awful/completion.lua.in # Remove the 'root' PATH override (I don't know why they have that) sed /WHOAMI/d -i utils/awsetbg + # Russian manpages fail to be generated: + # [ 56%] Generating manpages/ru/man1/awesome.1.xml + # asciidoc: ERROR: : line 3: name section expected + # asciidoc: FAILED: : line 3: section title expected + # make[2]: *** [manpages/ru/man1/awesome.1.xml] Error 1 + substituteInPlace CMakeLists.txt \ + --replace "set(AWE_MAN_LANGS es fr de ru)" \ + "set(AWE_MAN_LANGS es fr de)" ''; - patches = [ ./cmake284.patch ]; - + # XXX: maybe not needed anymore # Somehow libev does not get into the rpath, although it should. # Something may be wrong in the gcc wrapper. preBuild = '' From 44ef26c8963f2f246e165f7c803b95bd117d8cde Mon Sep 17 00:00:00 2001 From: Florian Friesdorf Date: Sat, 31 Dec 2011 04:30:46 +0000 Subject: [PATCH 161/186] xlsclients-1.1.2 svn path=/nixpkgs/trunk/; revision=31176 --- pkgs/servers/x11/xorg/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/servers/x11/xorg/default.nix b/pkgs/servers/x11/xorg/default.nix index b1c7770b2ba..b10db9309f4 100644 --- a/pkgs/servers/x11/xorg/default.nix +++ b/pkgs/servers/x11/xorg/default.nix @@ -2020,11 +2020,11 @@ let })) // {inherit libxcb ;}; xlsclients = (stdenv.mkDerivation ((if overrides ? xlsclients then overrides.xlsclients else x: x) { - name = "xlsclients-1.1.1"; + name = "xlsclients-1.1.2"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/X11R7.6/src/everything/xlsclients-1.1.1.tar.bz2; - sha256 = "0ng81cm40881gddzwrfdbsvbnqfpqllxaxdsa8m2ljqxlq9mwfs5"; + url = mirror://xorg/individual/app/xlsclients-1.1.2.tar.bz2; + sha256 = "1ce5f3987b63ea79b3f8421fcb1dd9c739e99efa97f280eafd8e93574b9027d1"; }; buildInputs = [pkgconfig libxcb xcbutil ]; })) // {inherit libxcb xcbutil ;}; From e1556e64d735eb34dfd4f876a5ff711884aa0ff8 Mon Sep 17 00:00:00 2001 From: Florian Friesdorf Date: Sat, 31 Dec 2011 06:07:15 +0000 Subject: [PATCH 162/186] xorg: moved individuals from tarballs-7.6 to extra.list and regen tarballs-7.6 svn path=/nixpkgs/trunk/; revision=31177 --- pkgs/servers/x11/xorg/extra.list | 15 +++++++++++++ pkgs/servers/x11/xorg/tarballs-7.6.list | 30 ++++++++++++------------- 2 files changed, 30 insertions(+), 15 deletions(-) diff --git a/pkgs/servers/x11/xorg/extra.list b/pkgs/servers/x11/xorg/extra.list index 6dd80a89978..2f384dbd336 100644 --- a/pkgs/servers/x11/xorg/extra.list +++ b/pkgs/servers/x11/xorg/extra.list @@ -1,2 +1,17 @@ mirror://xorg/individual/xcb/xcb-util-0.3.6.tar.bz2 mirror://xorg/individual/lib/pixman-0.20.2.tar.bz2 +mirror://xorg/individual/proto/dmxproto-2.3.1.tar.bz2 +mirror://xorg/individual/lib/libpciaccess-0.12.1.tar.bz2 +mirror://xorg/individual/lib/libX11-1.4.1.tar.bz2 +mirror://xorg/individual/lib/libXaw-1.0.9.tar.bz2 +mirror://xorg/individual/lib/libXi-1.4.1.tar.bz2 +mirror://xorg/individual/app/x11perf-1.5.3.tar.bz2 +mirror://xorg/individual/proto/xf86driproto-2.1.1.tar.bz2 +mirror://xorg/individual/driver/xf86-input-evdev-2.6.0.tar.bz2 +mirror://xorg/individual/driver/xf86-video-ati-6.14.2.tar.bz2 +mirror://xorg/individual/driver/xf86-video-intel-2.14.0.tar.bz2 +mirror://xorg/individual/proto/xf86vidmodeproto-2.3.1.tar.bz2 +mirror://xorg/individual/proto/xineramaproto-1.2.1.tar.bz2 +mirror://xorg/individual/app/xkbcomp-1.2.1.tar.bz2 +mirror://xorg/individual/xserver/xorg-server-1.9.5.tar.bz2 +mirror://xorg/individual/app/xrdb-1.0.8.tar.bz2 diff --git a/pkgs/servers/x11/xorg/tarballs-7.6.list b/pkgs/servers/x11/xorg/tarballs-7.6.list index c8039d24671..fdd6409f028 100644 --- a/pkgs/servers/x11/xorg/tarballs-7.6.list +++ b/pkgs/servers/x11/xorg/tarballs-7.6.list @@ -3,7 +3,7 @@ mirror://xorg/X11R7.6/src/everything/bdftopcf-1.0.3.tar.bz2 mirror://xorg/X11R7.6/src/everything/bigreqsproto-1.1.1.tar.bz2 mirror://xorg/X11R7.6/src/everything/compositeproto-0.4.2.tar.bz2 mirror://xorg/X11R7.6/src/everything/damageproto-1.2.1.tar.bz2 -mirror://xorg/individual/proto/dmxproto-2.3.1.tar.bz2 +mirror://xorg/X11R7.6/src/everything/dmxproto-2.3.tar.bz2 mirror://xorg/X11R7.6/src/everything/dri2proto-2.3.tar.bz2 mirror://xorg/X11R7.6/src/everything/encodings-1.0.4.tar.bz2 mirror://xorg/X11R7.6/src/everything/fixesproto-4.1.2.tar.bz2 @@ -53,13 +53,13 @@ mirror://xorg/X11R7.6/src/everything/libdmx-1.1.1.tar.bz2 mirror://xorg/X11R7.6/src/everything/libfontenc-1.1.0.tar.bz2 mirror://xorg/X11R7.6/src/everything/libFS-1.0.3.tar.bz2 mirror://xorg/X11R7.6/src/everything/libICE-1.0.7.tar.bz2 -mirror://xorg/individual/lib/libpciaccess-0.12.1.tar.bz2 +mirror://xorg/X11R7.6/src/everything/libpciaccess-0.12.0.tar.bz2 mirror://xorg/X11R7.6/src/everything/libpthread-stubs-0.3.tar.bz2 mirror://xorg/X11R7.6/src/everything/libSM-1.2.0.tar.bz2 mirror://xorg/X11R7.6/src/everything/libWindowsWM-1.0.1.tar.bz2 -mirror://xorg/individual/lib/libX11-1.4.1.tar.bz2 +mirror://xorg/X11R7.6/src/everything/libX11-1.4.0.tar.bz2 mirror://xorg/X11R7.6/src/everything/libXau-1.0.6.tar.bz2 -mirror://xorg/individual/lib/libXaw-1.0.9.tar.bz2 +mirror://xorg/X11R7.6/src/everything/libXaw-1.0.8.tar.bz2 mirror://xorg/X11R7.6/src/everything/libxcb-1.7.tar.bz2 mirror://xorg/X11R7.6/src/everything/libXcomposite-0.4.3.tar.bz2 mirror://xorg/X11R7.6/src/everything/libXcursor-1.1.11.tar.bz2 @@ -69,7 +69,7 @@ mirror://xorg/X11R7.6/src/everything/libXext-1.2.0.tar.bz2 mirror://xorg/X11R7.6/src/everything/libXfixes-4.0.5.tar.bz2 mirror://xorg/X11R7.6/src/everything/libXfont-1.4.3.tar.bz2 mirror://xorg/X11R7.6/src/everything/libXft-2.2.0.tar.bz2 -mirror://xorg/individual/lib/libXi-1.4.1.tar.bz2 +mirror://xorg/X11R7.6/src/everything/libXi-1.4.0.tar.bz2 mirror://xorg/X11R7.6/src/everything/libXinerama-1.1.1.tar.bz2 mirror://xorg/X11R7.6/src/everything/libxkbfile-1.0.7.tar.bz2 mirror://xorg/X11R7.6/src/everything/libXmu-1.1.0.tar.bz2 @@ -99,7 +99,7 @@ mirror://xorg/X11R7.6/src/everything/smproxy-1.0.4.tar.bz2 mirror://xorg/X11R7.6/src/everything/util-macros-1.11.0.tar.bz2 mirror://xorg/X11R7.6/src/everything/videoproto-2.3.1.tar.bz2 mirror://xorg/X11R7.6/src/everything/windowswmproto-1.0.4.tar.bz2 -mirror://xorg/individual/app/x11perf-1.5.3.tar.bz2 +mirror://xorg/X11R7.6/src/everything/x11perf-1.5.2.tar.bz2 mirror://xorg/X11R7.6/src/everything/xauth-1.0.5.tar.bz2 mirror://xorg/X11R7.6/src/everything/xbacklight-1.1.2.tar.bz2 mirror://xorg/X11R7.6/src/everything/xbitmaps-1.1.1.tar.bz2 @@ -114,10 +114,10 @@ mirror://xorg/X11R7.6/src/everything/xev-1.1.0.tar.bz2 mirror://xorg/X11R7.6/src/everything/xextproto-7.1.2.tar.bz2 mirror://xorg/X11R7.6/src/everything/xf86bigfontproto-1.2.0.tar.bz2 mirror://xorg/X11R7.6/src/everything/xf86dgaproto-2.1.tar.bz2 -mirror://xorg/individual/proto/xf86driproto-2.1.1.tar.bz2 +mirror://xorg/X11R7.6/src/everything/xf86driproto-2.1.0.tar.bz2 mirror://xorg/X11R7.6/src/everything/xf86-input-acecad-1.4.0.tar.bz2 mirror://xorg/X11R7.6/src/everything/xf86-input-aiptek-1.3.1.tar.bz2 -mirror://xorg/individual/driver/xf86-input-evdev-2.6.0.tar.bz2 +mirror://xorg/X11R7.6/src/everything/xf86-input-evdev-2.5.0.tar.bz2 mirror://xorg/X11R7.6/src/everything/xf86-input-joystick-1.5.0.tar.bz2 mirror://xorg/X11R7.6/src/everything/xf86-input-keyboard-1.5.0.tar.bz2 mirror://xorg/X11R7.6/src/everything/xf86-input-mouse-1.6.0.tar.bz2 @@ -127,7 +127,7 @@ mirror://xorg/X11R7.6/src/everything/xf86-input-void-1.3.1.tar.bz2 mirror://xorg/X11R7.6/src/everything/xf86-video-apm-1.2.3.tar.bz2 mirror://xorg/X11R7.6/src/everything/xf86-video-ark-0.7.3.tar.bz2 mirror://xorg/X11R7.6/src/everything/xf86-video-ast-0.91.10.tar.bz2 -mirror://xorg/individual/driver/xf86-video-ati-6.14.2.tar.bz2 +mirror://xorg/X11R7.6/src/everything/xf86-video-ati-6.13.2.tar.bz2 mirror://xorg/X11R7.6/src/everything/xf86-video-chips-1.2.3.tar.bz2 mirror://xorg/X11R7.6/src/everything/xf86-video-cirrus-1.3.2.tar.bz2 mirror://xorg/X11R7.6/src/everything/xf86-video-dummy-0.3.4.tar.bz2 @@ -137,7 +137,7 @@ mirror://xorg/X11R7.6/src/everything/xf86-video-glide-1.1.0.tar.bz2 mirror://xorg/X11R7.6/src/everything/xf86-video-glint-1.2.5.tar.bz2 mirror://xorg/X11R7.6/src/everything/xf86-video-i128-1.3.4.tar.bz2 mirror://xorg/X11R7.6/src/everything/xf86-video-i740-1.3.2.tar.bz2 -mirror://xorg/individual/driver/xf86-video-intel-2.14.0.tar.bz2 +mirror://xorg/X11R7.6/src/everything/xf86-video-intel-2.13.0.tar.bz2 mirror://xorg/X11R7.6/src/everything/xf86-video-mach64-6.8.2.tar.bz2 mirror://xorg/X11R7.6/src/everything/xf86-video-mga-1.4.13.tar.bz2 mirror://xorg/X11R7.6/src/everything/xf86-video-neomagic-1.2.5.tar.bz2 @@ -169,12 +169,12 @@ mirror://xorg/X11R7.6/src/everything/xf86-video-voodoo-1.2.4.tar.bz2 mirror://xorg/X11R7.6/src/everything/xf86-video-wsfb-0.3.0.tar.bz2 mirror://xorg/X11R7.6/src/everything/xf86-video-xgi-1.6.0.tar.bz2 mirror://xorg/X11R7.6/src/everything/xf86-video-xgixp-1.8.0.tar.bz2 -mirror://xorg/individual/proto/xf86vidmodeproto-2.3.1.tar.bz2 +mirror://xorg/X11R7.6/src/everything/xf86vidmodeproto-2.3.tar.bz2 mirror://xorg/X11R7.6/src/everything/xgamma-1.0.4.tar.bz2 mirror://xorg/X11R7.6/src/everything/xhost-1.0.4.tar.bz2 -mirror://xorg/individual/proto/xineramaproto-1.2.1.tar.bz2 +mirror://xorg/X11R7.6/src/everything/xineramaproto-1.2.tar.bz2 mirror://xorg/X11R7.6/src/everything/xinput-1.5.3.tar.bz2 -mirror://xorg/individual/app/xkbcomp-1.2.1.tar.bz2 +mirror://xorg/X11R7.6/src/everything/xkbcomp-1.2.0.tar.bz2 mirror://xorg/X11R7.6/src/everything/xkbevd-1.1.2.tar.bz2 mirror://xorg/X11R7.6/src/everything/xkbutils-1.0.3.tar.bz2 mirror://xorg/X11R7.6/src/everything/xkill-1.0.3.tar.bz2 @@ -182,13 +182,13 @@ mirror://xorg/X11R7.6/src/everything/xlsatoms-1.1.0.tar.bz2 mirror://xorg/X11R7.6/src/everything/xlsclients-1.1.1.tar.bz2 mirror://xorg/X11R7.6/src/everything/xmodmap-1.0.5.tar.bz2 mirror://xorg/X11R7.6/src/everything/xorg-docs-1.6.tar.bz2 -mirror://xorg/individual/xserver/xorg-server-1.9.5.tar.bz2 +mirror://xorg/X11R7.6/src/everything/xorg-server-1.9.3.tar.bz2 mirror://xorg/X11R7.6/src/everything/xorg-sgml-doctools-1.6.tar.bz2 mirror://xorg/X11R7.6/src/everything/xpr-1.0.3.tar.bz2 mirror://xorg/X11R7.6/src/everything/xprop-1.2.0.tar.bz2 mirror://xorg/X11R7.6/src/everything/xproto-7.0.20.tar.bz2 mirror://xorg/X11R7.6/src/everything/xrandr-1.3.4.tar.bz2 -mirror://xorg/individual/app/xrdb-1.0.8.tar.bz2 +mirror://xorg/X11R7.6/src/everything/xrdb-1.0.7.tar.bz2 mirror://xorg/X11R7.6/src/everything/xrefresh-1.0.4.tar.bz2 mirror://xorg/X11R7.6/src/everything/xset-1.2.1.tar.bz2 mirror://xorg/X11R7.6/src/everything/xsetroot-1.1.0.tar.bz2 From c9b2b8a1821648f5d30795c81f0decca64d8ae46 Mon Sep 17 00:00:00 2001 From: Florian Friesdorf Date: Sat, 31 Dec 2011 06:07:18 +0000 Subject: [PATCH 163/186] xcb-util(-*)-0.3.8 and xlsclients-1.1.2 in extra.list svn path=/nixpkgs/trunk/; revision=31178 --- pkgs/servers/x11/xorg/extra.list | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/pkgs/servers/x11/xorg/extra.list b/pkgs/servers/x11/xorg/extra.list index 2f384dbd336..ce4781b9843 100644 --- a/pkgs/servers/x11/xorg/extra.list +++ b/pkgs/servers/x11/xorg/extra.list @@ -1,4 +1,9 @@ -mirror://xorg/individual/xcb/xcb-util-0.3.6.tar.bz2 +mirror://xorg/individual/app/xlsclients-1.1.2.tar.bz2 +mirror://xorg/individual/xcb/xcb-util-0.3.8.tar.bz2 +mirror://xorg/individual/xcb/xcb-util-image-0.3.8.tar.bz2 +mirror://xorg/individual/xcb/xcb-util-keysyms-0.3.8.tar.bz2 +mirror://xorg/individual/xcb/xcb-util-renderutil-0.3.8.tar.bz2 +mirror://xorg/individual/xcb/xcb-util-wm-0.3.8.tar.bz2 mirror://xorg/individual/lib/pixman-0.20.2.tar.bz2 mirror://xorg/individual/proto/dmxproto-2.3.1.tar.bz2 mirror://xorg/individual/lib/libpciaccess-0.12.1.tar.bz2 From 0bb20084b56bf748709d6f6bf7325ae72309b619 Mon Sep 17 00:00:00 2001 From: Florian Friesdorf Date: Sat, 31 Dec 2011 06:07:21 +0000 Subject: [PATCH 164/186] xorg: alphabetical extra.list svn path=/nixpkgs/trunk/; revision=31179 --- pkgs/servers/x11/xorg/extra.list | 30 +++++++++++++++--------------- 1 file changed, 15 insertions(+), 15 deletions(-) diff --git a/pkgs/servers/x11/xorg/extra.list b/pkgs/servers/x11/xorg/extra.list index ce4781b9843..73c0355eafe 100644 --- a/pkgs/servers/x11/xorg/extra.list +++ b/pkgs/servers/x11/xorg/extra.list @@ -1,22 +1,22 @@ +mirror://xorg/individual/app/x11perf-1.5.3.tar.bz2 +mirror://xorg/individual/app/xkbcomp-1.2.1.tar.bz2 mirror://xorg/individual/app/xlsclients-1.1.2.tar.bz2 +mirror://xorg/individual/app/xrdb-1.0.8.tar.bz2 +mirror://xorg/individual/driver/xf86-input-evdev-2.6.0.tar.bz2 +mirror://xorg/individual/driver/xf86-video-ati-6.14.2.tar.bz2 +mirror://xorg/individual/driver/xf86-video-intel-2.14.0.tar.bz2 +mirror://xorg/individual/lib/libX11-1.4.1.tar.bz2 +mirror://xorg/individual/lib/libXaw-1.0.9.tar.bz2 +mirror://xorg/individual/lib/libXi-1.4.1.tar.bz2 +mirror://xorg/individual/lib/libpciaccess-0.12.1.tar.bz2 +mirror://xorg/individual/lib/pixman-0.20.2.tar.bz2 +mirror://xorg/individual/proto/dmxproto-2.3.1.tar.bz2 +mirror://xorg/individual/proto/xf86driproto-2.1.1.tar.bz2 +mirror://xorg/individual/proto/xf86vidmodeproto-2.3.1.tar.bz2 +mirror://xorg/individual/proto/xineramaproto-1.2.1.tar.bz2 mirror://xorg/individual/xcb/xcb-util-0.3.8.tar.bz2 mirror://xorg/individual/xcb/xcb-util-image-0.3.8.tar.bz2 mirror://xorg/individual/xcb/xcb-util-keysyms-0.3.8.tar.bz2 mirror://xorg/individual/xcb/xcb-util-renderutil-0.3.8.tar.bz2 mirror://xorg/individual/xcb/xcb-util-wm-0.3.8.tar.bz2 -mirror://xorg/individual/lib/pixman-0.20.2.tar.bz2 -mirror://xorg/individual/proto/dmxproto-2.3.1.tar.bz2 -mirror://xorg/individual/lib/libpciaccess-0.12.1.tar.bz2 -mirror://xorg/individual/lib/libX11-1.4.1.tar.bz2 -mirror://xorg/individual/lib/libXaw-1.0.9.tar.bz2 -mirror://xorg/individual/lib/libXi-1.4.1.tar.bz2 -mirror://xorg/individual/app/x11perf-1.5.3.tar.bz2 -mirror://xorg/individual/proto/xf86driproto-2.1.1.tar.bz2 -mirror://xorg/individual/driver/xf86-input-evdev-2.6.0.tar.bz2 -mirror://xorg/individual/driver/xf86-video-ati-6.14.2.tar.bz2 -mirror://xorg/individual/driver/xf86-video-intel-2.14.0.tar.bz2 -mirror://xorg/individual/proto/xf86vidmodeproto-2.3.1.tar.bz2 -mirror://xorg/individual/proto/xineramaproto-1.2.1.tar.bz2 -mirror://xorg/individual/app/xkbcomp-1.2.1.tar.bz2 mirror://xorg/individual/xserver/xorg-server-1.9.5.tar.bz2 -mirror://xorg/individual/app/xrdb-1.0.8.tar.bz2 From e45921800c7d7b34150d05ef8a13a775bfd9b962 Mon Sep 17 00:00:00 2001 From: Florian Friesdorf Date: Sat, 31 Dec 2011 06:07:23 +0000 Subject: [PATCH 165/186] adjusted example generate-expr-from-tarballs.pl call to 7.6 svn path=/nixpkgs/trunk/; revision=31180 --- pkgs/servers/x11/xorg/generate-expr-from-tarballs.pl | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/x11/xorg/generate-expr-from-tarballs.pl b/pkgs/servers/x11/xorg/generate-expr-from-tarballs.pl index 444a0637906..6acdc21ae65 100755 --- a/pkgs/servers/x11/xorg/generate-expr-from-tarballs.pl +++ b/pkgs/servers/x11/xorg/generate-expr-from-tarballs.pl @@ -2,9 +2,9 @@ # Typical command to generate the list of tarballs: -# export i="mirror://xorg/X11R7.4/src/everything/"; cat $(PRINT_PATH=1 nix-prefetch-url $i | tail -n 1) | perl -e 'while (<>) { if (/(href|HREF)="([^"]*.bz2)"/) { print "$ENV{'i'}$2\n"; }; }' | sort > tarballs-7.4.list +# export i="mirror://xorg/X11R7.6/src/everything/"; cat $(PRINT_PATH=1 nix-prefetch-url $i | tail -n 1) | perl -e 'while (<>) { if (/(href|HREF)="([^"]*.bz2)"/) { print "$ENV{'i'}$2\n"; }; }' | sort > tarballs-7.6.list # manually update extra.list -# then run: cat tarballs-7.4.list extra.list old.list | perl ./generate-expr-from-tarballs.pl +# then run: cat tarballs-7.6.list extra.list old.list | perl ./generate-expr-from-tarballs.pl use strict; From cebb40f53337efbba3ae52443e72cd583dd23938 Mon Sep 17 00:00:00 2001 From: Florian Friesdorf Date: Sat, 31 Dec 2011 06:07:26 +0000 Subject: [PATCH 166/186] adjusted oder of *.list in generate-expr-from-tarballs.pl example svn path=/nixpkgs/trunk/; revision=31181 --- pkgs/servers/x11/xorg/generate-expr-from-tarballs.pl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/servers/x11/xorg/generate-expr-from-tarballs.pl b/pkgs/servers/x11/xorg/generate-expr-from-tarballs.pl index 6acdc21ae65..6183c806491 100755 --- a/pkgs/servers/x11/xorg/generate-expr-from-tarballs.pl +++ b/pkgs/servers/x11/xorg/generate-expr-from-tarballs.pl @@ -4,7 +4,7 @@ # export i="mirror://xorg/X11R7.6/src/everything/"; cat $(PRINT_PATH=1 nix-prefetch-url $i | tail -n 1) | perl -e 'while (<>) { if (/(href|HREF)="([^"]*.bz2)"/) { print "$ENV{'i'}$2\n"; }; }' | sort > tarballs-7.6.list # manually update extra.list -# then run: cat tarballs-7.6.list extra.list old.list | perl ./generate-expr-from-tarballs.pl +# then run: cat extra.list tarballs-7.6.list old.list | perl ./generate-expr-from-tarballs.pl use strict; From f6090f6bbae488422a1c58b50c01fdc12b1f08bc Mon Sep 17 00:00:00 2001 From: Florian Friesdorf Date: Sat, 31 Dec 2011 06:07:28 +0000 Subject: [PATCH 167/186] reproduced my previous manual changes through generation of default.nix svn path=/nixpkgs/trunk/; revision=31182 --- pkgs/servers/x11/xorg/default.nix | 36 +++++++++++++++---------------- 1 file changed, 17 insertions(+), 19 deletions(-) diff --git a/pkgs/servers/x11/xorg/default.nix b/pkgs/servers/x11/xorg/default.nix index b10db9309f4..b5e4d0e7b98 100644 --- a/pkgs/servers/x11/xorg/default.nix +++ b/pkgs/servers/x11/xorg/default.nix @@ -1152,52 +1152,50 @@ let builder = ./builder.sh; src = fetchurl { url = mirror://xorg/individual/xcb/xcb-util-0.3.8.tar.bz2; - sha256 = "c1eed9284750bc09352e60654df77bb585dbbe7673fdcc675e58b7f3a0b447b9"; + sha256 = "1fa7njhg7dsqbrkwrzbkfszdp1dmggvlsrb05qshkg2h8wldkvn1"; }; buildInputs = [pkgconfig gperf m4 libxcb xproto ]; })) // {inherit gperf m4 libxcb xproto ;}; - xcbutilImage = (stdenv.mkDerivation ((if overrides ? xcbutil then overrides.xcbutil else x: x) { + xcbutilimage = (stdenv.mkDerivation ((if overrides ? xcbutilimage then overrides.xcbutilimage else x: x) { name = "xcb-util-image-0.3.8"; builder = ./builder.sh; src = fetchurl { url = mirror://xorg/individual/xcb/xcb-util-image-0.3.8.tar.bz2; - sha256 = "40390528c26e8231132540f16579b821de68bb2e9152918f72182d5a4038a6d9"; + sha256 = "1nd67105lb8qfa7r2lli5sxnipi1p1wnbwa04l9k30kfq8l0afa0"; }; buildInputs = [pkgconfig gperf m4 libxcb xcbutil xproto ]; })) // {inherit gperf m4 libxcb xcbutil xproto ;}; - # XXX: No package 'xorg-macros' found - xcbutilKeysyms = (stdenv.mkDerivation ((if overrides ? xcbutil then overrides.xcbutil else x: x) { + xcbutilkeysyms = (stdenv.mkDerivation ((if overrides ? xcbutilkeysyms then overrides.xcbutilkeysyms else x: x) { name = "xcb-util-keysyms-0.3.8"; builder = ./builder.sh; src = fetchurl { url = mirror://xorg/individual/xcb/xcb-util-keysyms-0.3.8.tar.bz2; - sha256 = "913d32f7afe380c580da7636ee13f2728790237bb5c03def536363f552686121"; + sha256 = "08b1d19gaqv3agpkvh5mgcir11vjy89ywdknva0cb073mzvk4gci"; }; buildInputs = [pkgconfig gperf m4 libxcb xproto ]; })) // {inherit gperf m4 libxcb xproto ;}; - # XXX: No package 'xorg-macros' found - xcbutilRenderutil = (stdenv.mkDerivation ((if overrides ? xcbutil then overrides.xcbutil else x: x) { + xcbutilrenderutil = (stdenv.mkDerivation ((if overrides ? xcbutilrenderutil then overrides.xcbutilrenderutil else x: x) { name = "xcb-util-renderutil-0.3.8"; builder = ./builder.sh; src = fetchurl { url = mirror://xorg/individual/xcb/xcb-util-renderutil-0.3.8.tar.bz2; - sha256 = "9789a5c55728fa7bae374d9fdf1c61095869bdc68561911760879095644c7452"; + sha256 = "0lkl9ij9b447c0br2qc5qsynjn09c4fdz7sd6yp7pyi8az2sb2cp"; }; - buildInputs = [pkgconfig gperf m4 libxcb ]; - })) // {inherit gperf m4 libxcb ;}; + buildInputs = [pkgconfig gperf m4 libxcb xproto ]; + })) // {inherit gperf m4 libxcb xproto ;}; - xcbutilWm = (stdenv.mkDerivation ((if overrides ? xcbutil then overrides.xcbutil else x: x) { + xcbutilwm = (stdenv.mkDerivation ((if overrides ? xcbutilwm then overrides.xcbutilwm else x: x) { name = "xcb-util-wm-0.3.8"; builder = ./builder.sh; src = fetchurl { url = mirror://xorg/individual/xcb/xcb-util-wm-0.3.8.tar.bz2; - sha256 = "c557abbe4c7d45268f0541ee3d8f9a1a8799692fcc28aa33f39db93cc2e65007"; + sha256 = "01shwv13rfcxycrsla6c5xlrk1qska7kvvj10n7jcibx9jzanmy5"; }; - buildInputs = [pkgconfig gperf m4 libxcb ]; - })) // {inherit gperf m4 libxcb ;}; + buildInputs = [pkgconfig gperf m4 libxcb xproto ]; + })) // {inherit gperf m4 libxcb xproto ;}; xclock = (stdenv.mkDerivation ((if overrides ? xclock then overrides.xclock else x: x) { name = "xclock-1.0.5"; @@ -1474,7 +1472,7 @@ let builder = ./builder.sh; src = fetchurl { url = mirror://xorg/individual/driver/xf86-video-ati-6.14.2.tar.bz2; - sha256 = "017974b622eea3b4483405368492b0c6f178854a9b9753d50e13c578b8a328dc"; + sha256 = "1p18lfw7ii8k1vam75wv9a2piwf6n2988dh56i4b98zf4av78y81"; }; buildInputs = [pkgconfig fontsproto libdrm udev libpciaccess randrproto renderproto videoproto xextproto xf86driproto xorgserver xproto ]; })) // {inherit fontsproto libdrm udev libpciaccess randrproto renderproto videoproto xextproto xf86driproto xorgserver xproto ;}; @@ -2024,10 +2022,10 @@ let builder = ./builder.sh; src = fetchurl { url = mirror://xorg/individual/app/xlsclients-1.1.2.tar.bz2; - sha256 = "1ce5f3987b63ea79b3f8421fcb1dd9c739e99efa97f280eafd8e93574b9027d1"; + sha256 = "1l97j15mg4wfzpm81wlpzagfjff7v4fwn7s2z2rpksk3gfcg7r8w"; }; - buildInputs = [pkgconfig libxcb xcbutil ]; - })) // {inherit libxcb xcbutil ;}; + buildInputs = [pkgconfig libxcb ]; + })) // {inherit libxcb ;}; xmessage = (stdenv.mkDerivation ((if overrides ? xmessage then overrides.xmessage else x: x) { name = "xmessage-1.0.3"; From 2a2ceace7f3ae9a6cf91a8972f0e903f28bcdc4c Mon Sep 17 00:00:00 2001 From: Florian Friesdorf Date: Sat, 31 Dec 2011 06:07:32 +0000 Subject: [PATCH 168/186] generate-expr-from-tarballs.pl support multiple versions svn path=/nixpkgs/trunk/; revision=31183 --- .../x11/xorg/generate-expr-from-tarballs.pl | 15 ++++++++++----- 1 file changed, 10 insertions(+), 5 deletions(-) diff --git a/pkgs/servers/x11/xorg/generate-expr-from-tarballs.pl b/pkgs/servers/x11/xorg/generate-expr-from-tarballs.pl index 6183c806491..b53f436ffb8 100755 --- a/pkgs/servers/x11/xorg/generate-expr-from-tarballs.pl +++ b/pkgs/servers/x11/xorg/generate-expr-from-tarballs.pl @@ -44,11 +44,16 @@ while (<>) { my $tarball = "$_"; print "\nDOING TARBALL $tarball\n"; - $tarball =~ /\/((?:(?:[A-Za-z0-9]|(?:-[^0-9])|(?:-[0-9]*[a-z]))+))[^\/]*$/; - die unless defined $1; - my $pkg = $1; - $pkg =~ s/-//g; - #next unless $pkg eq "xcbutil"; + my $pkg; + if ($tarball =~ s/:([a-zA-Z0-9_]+)$//) { + $pkg = $1; + } else { + $tarball =~ /\/((?:(?:[A-Za-z0-9]|(?:-[^0-9])|(?:-[0-9]*[a-z]))+))[^\/]*$/; + die unless defined $1; + $pkg = $1; + $pkg =~ s/-//g; + #next unless $pkg eq "xcbutil"; + } $tarball =~ /\/([^\/]*)\.tar\.bz2$/; my $pkgName = $1; From 174590039627261b347b5030b710304c6285924c Mon Sep 17 00:00:00 2001 From: Florian Friesdorf Date: Sat, 31 Dec 2011 06:07:34 +0000 Subject: [PATCH 169/186] add xf86-video-intel-2.14.901 (and while at it 2.17.0) to extra.list svn path=/nixpkgs/trunk/; revision=31184 --- pkgs/servers/x11/xorg/extra.list | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/servers/x11/xorg/extra.list b/pkgs/servers/x11/xorg/extra.list index 73c0355eafe..f8c7c85d0dc 100644 --- a/pkgs/servers/x11/xorg/extra.list +++ b/pkgs/servers/x11/xorg/extra.list @@ -5,6 +5,8 @@ mirror://xorg/individual/app/xrdb-1.0.8.tar.bz2 mirror://xorg/individual/driver/xf86-input-evdev-2.6.0.tar.bz2 mirror://xorg/individual/driver/xf86-video-ati-6.14.2.tar.bz2 mirror://xorg/individual/driver/xf86-video-intel-2.14.0.tar.bz2 +mirror://xorg/individual/driver/xf86-video-intel-2.14.901.tar.bz2:xf86videointel_2_14_901 +mirror://xorg/individual/driver/xf86-video-intel-2.17.0.tar.bz2:xf86videointel_2_17_0 mirror://xorg/individual/lib/libX11-1.4.1.tar.bz2 mirror://xorg/individual/lib/libXaw-1.0.9.tar.bz2 mirror://xorg/individual/lib/libXi-1.4.1.tar.bz2 From d2e8c37e416590a624470afcda9ed0c054a50277 Mon Sep 17 00:00:00 2001 From: Florian Friesdorf Date: Sat, 31 Dec 2011 06:07:37 +0000 Subject: [PATCH 170/186] default.nix now fully generated again with additional xf86-video-intel-2.17.0 and what looks like a fixed xf86-video-intel-2.14.901. svn path=/nixpkgs/trunk/; revision=31185 --- pkgs/servers/x11/xorg/default.nix | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/pkgs/servers/x11/xorg/default.nix b/pkgs/servers/x11/xorg/default.nix index b5e4d0e7b98..17f0afadef4 100644 --- a/pkgs/servers/x11/xorg/default.nix +++ b/pkgs/servers/x11/xorg/default.nix @@ -1577,7 +1577,7 @@ let buildInputs = [pkgconfig dri2proto fontsproto libdrm udev libpciaccess randrproto renderproto libX11 xcbutil libxcb libXext xextproto xf86driproto libXfixes xorgserver xproto libXvMC ]; })) // {inherit dri2proto fontsproto libdrm udev libpciaccess randrproto renderproto libX11 xcbutil libxcb libXext xextproto xf86driproto libXfixes xorgserver xproto libXvMC ;}; - xf86videointel_2_14_901 = (stdenv.mkDerivation ((if overrides ? xf86videointel then overrides.xf86videointel else x: x) { + xf86videointel_2_14_901 = (stdenv.mkDerivation ((if overrides ? xf86videointel_2_14_901 then overrides.xf86videointel_2_14_901 else x: x) { name = "xf86-video-intel-2.14.901"; builder = ./builder.sh; src = fetchurl { @@ -1587,6 +1587,16 @@ let buildInputs = [pkgconfig dri2proto fontsproto libdrm udev libpciaccess randrproto renderproto libX11 xcbutil libxcb libXext xextproto xf86driproto libXfixes xorgserver xproto libXvMC ]; })) // {inherit dri2proto fontsproto libdrm udev libpciaccess randrproto renderproto libX11 xcbutil libxcb libXext xextproto xf86driproto libXfixes xorgserver xproto libXvMC ;}; + xf86videointel_2_17_0 = (stdenv.mkDerivation ((if overrides ? xf86videointel_2_17_0 then overrides.xf86videointel_2_17_0 else x: x) { + name = "xf86-video-intel-2.17.0"; + builder = ./builder.sh; + src = fetchurl { + url = mirror://xorg/individual/driver/xf86-video-intel-2.17.0.tar.bz2; + sha256 = "11s3vjp0lrfmb4bv848fd5bajj77j3rf451lm0qyylnclbr5114b"; + }; + buildInputs = [pkgconfig dri2proto fontsproto libdrm udev libpciaccess pixman randrproto renderproto libX11 xcbutil libxcb libXext xextproto xf86driproto libXfixes xorgserver xproto libXrender libXvMC ]; + })) // {inherit dri2proto fontsproto libdrm udev libpciaccess pixman randrproto renderproto libX11 xcbutil libxcb libXext xextproto xf86driproto libXfixes xorgserver xproto libXrender libXvMC ;}; + xf86videomach64 = (stdenv.mkDerivation ((if overrides ? xf86videomach64 then overrides.xf86videomach64 else x: x) { name = "xf86-video-mach64-6.8.2"; builder = ./builder.sh; From 90dda8a07f80380a33ee1ef828384a0bd372ff8c Mon Sep 17 00:00:00 2001 From: Florian Friesdorf Date: Sat, 31 Dec 2011 06:14:31 +0000 Subject: [PATCH 171/186] adjusted awesome to generated names of xcbutil-* svn path=/nixpkgs/trunk/; revision=31186 --- pkgs/applications/window-managers/awesome/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/window-managers/awesome/default.nix b/pkgs/applications/window-managers/awesome/default.nix index fbf3b087cc7..b44f6d9f3aa 100644 --- a/pkgs/applications/window-managers/awesome/default.nix +++ b/pkgs/applications/window-managers/awesome/default.nix @@ -1,6 +1,6 @@ {stdenv, fetchurl, xz, cmake, gperf, imagemagick, pkgconfig, lua , glib, cairo, pango, imlib2, libxcb, libxdg_basedir, xcbutil -, xcbutilImage, xcbutilKeysyms, xcbutilWm, libpthreadstubs, libXau +, xcbutilimage, xcbutilkeysyms, xcbutilwm, libpthreadstubs, libXau , libXdmcp, pixman, doxygen , libstartup_notification, libev, asciidoc, xmlto, dbus, docbook_xsl , docbook_xml_dtd_45, libxslt, coreutils}: @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { }; buildInputs = [ xz cmake gperf imagemagick pkgconfig lua glib cairo pango - imlib2 libxcb libxdg_basedir xcbutil xcbutilImage xcbutilKeysyms xcbutilWm + imlib2 libxcb libxdg_basedir xcbutil xcbutilimage xcbutilkeysyms xcbutilwm libstartup_notification libev libpthreadstubs libXau libXdmcp pixman doxygen asciidoc xmlto dbus docbook_xsl docbook_xml_dtd_45 libxslt ]; From 2e31e7293acbae24aba278995853dbb6cf0a7901 Mon Sep 17 00:00:00 2001 From: Florian Friesdorf Date: Sat, 31 Dec 2011 15:37:51 +0000 Subject: [PATCH 172/186] moved parts of extra.list back to tarballs-7.6.list also added an short description about them to generate-expr-from-tarballs.pl svn path=/nixpkgs/trunk/; revision=31189 --- pkgs/servers/x11/xorg/extra.list | 16 ---------- .../x11/xorg/generate-expr-from-tarballs.pl | 6 +++- pkgs/servers/x11/xorg/tarballs-7.6.list | 32 +++++++++---------- 3 files changed, 21 insertions(+), 33 deletions(-) diff --git a/pkgs/servers/x11/xorg/extra.list b/pkgs/servers/x11/xorg/extra.list index f8c7c85d0dc..744eb66d84c 100644 --- a/pkgs/servers/x11/xorg/extra.list +++ b/pkgs/servers/x11/xorg/extra.list @@ -1,24 +1,8 @@ -mirror://xorg/individual/app/x11perf-1.5.3.tar.bz2 -mirror://xorg/individual/app/xkbcomp-1.2.1.tar.bz2 -mirror://xorg/individual/app/xlsclients-1.1.2.tar.bz2 -mirror://xorg/individual/app/xrdb-1.0.8.tar.bz2 -mirror://xorg/individual/driver/xf86-input-evdev-2.6.0.tar.bz2 -mirror://xorg/individual/driver/xf86-video-ati-6.14.2.tar.bz2 -mirror://xorg/individual/driver/xf86-video-intel-2.14.0.tar.bz2 mirror://xorg/individual/driver/xf86-video-intel-2.14.901.tar.bz2:xf86videointel_2_14_901 mirror://xorg/individual/driver/xf86-video-intel-2.17.0.tar.bz2:xf86videointel_2_17_0 -mirror://xorg/individual/lib/libX11-1.4.1.tar.bz2 -mirror://xorg/individual/lib/libXaw-1.0.9.tar.bz2 -mirror://xorg/individual/lib/libXi-1.4.1.tar.bz2 -mirror://xorg/individual/lib/libpciaccess-0.12.1.tar.bz2 mirror://xorg/individual/lib/pixman-0.20.2.tar.bz2 -mirror://xorg/individual/proto/dmxproto-2.3.1.tar.bz2 -mirror://xorg/individual/proto/xf86driproto-2.1.1.tar.bz2 -mirror://xorg/individual/proto/xf86vidmodeproto-2.3.1.tar.bz2 -mirror://xorg/individual/proto/xineramaproto-1.2.1.tar.bz2 mirror://xorg/individual/xcb/xcb-util-0.3.8.tar.bz2 mirror://xorg/individual/xcb/xcb-util-image-0.3.8.tar.bz2 mirror://xorg/individual/xcb/xcb-util-keysyms-0.3.8.tar.bz2 mirror://xorg/individual/xcb/xcb-util-renderutil-0.3.8.tar.bz2 mirror://xorg/individual/xcb/xcb-util-wm-0.3.8.tar.bz2 -mirror://xorg/individual/xserver/xorg-server-1.9.5.tar.bz2 diff --git a/pkgs/servers/x11/xorg/generate-expr-from-tarballs.pl b/pkgs/servers/x11/xorg/generate-expr-from-tarballs.pl index b53f436ffb8..89edb571e0f 100755 --- a/pkgs/servers/x11/xorg/generate-expr-from-tarballs.pl +++ b/pkgs/servers/x11/xorg/generate-expr-from-tarballs.pl @@ -4,7 +4,11 @@ # export i="mirror://xorg/X11R7.6/src/everything/"; cat $(PRINT_PATH=1 nix-prefetch-url $i | tail -n 1) | perl -e 'while (<>) { if (/(href|HREF)="([^"]*.bz2)"/) { print "$ENV{'i'}$2\n"; }; }' | sort > tarballs-7.6.list # manually update extra.list -# then run: cat extra.list tarballs-7.6.list old.list | perl ./generate-expr-from-tarballs.pl +# then run: cat tarballs-7.6.list extra.list old.list | perl ./generate-expr-from-tarballs.pl +# tarballs-x.y.list is generated + changes for individual packages +# extra.list are packages not contained in the tarballs +# old.list are packages that used to be part of the tarballs + use strict; diff --git a/pkgs/servers/x11/xorg/tarballs-7.6.list b/pkgs/servers/x11/xorg/tarballs-7.6.list index fdd6409f028..b90f4780cfa 100644 --- a/pkgs/servers/x11/xorg/tarballs-7.6.list +++ b/pkgs/servers/x11/xorg/tarballs-7.6.list @@ -3,8 +3,8 @@ mirror://xorg/X11R7.6/src/everything/bdftopcf-1.0.3.tar.bz2 mirror://xorg/X11R7.6/src/everything/bigreqsproto-1.1.1.tar.bz2 mirror://xorg/X11R7.6/src/everything/compositeproto-0.4.2.tar.bz2 mirror://xorg/X11R7.6/src/everything/damageproto-1.2.1.tar.bz2 -mirror://xorg/X11R7.6/src/everything/dmxproto-2.3.tar.bz2 mirror://xorg/X11R7.6/src/everything/dri2proto-2.3.tar.bz2 +mirror://xorg/individual/proto/dmxproto-2.3.1.tar.bz2 mirror://xorg/X11R7.6/src/everything/encodings-1.0.4.tar.bz2 mirror://xorg/X11R7.6/src/everything/fixesproto-4.1.2.tar.bz2 mirror://xorg/X11R7.6/src/everything/font-adobe-100dpi-1.0.3.tar.bz2 @@ -53,13 +53,13 @@ mirror://xorg/X11R7.6/src/everything/libdmx-1.1.1.tar.bz2 mirror://xorg/X11R7.6/src/everything/libfontenc-1.1.0.tar.bz2 mirror://xorg/X11R7.6/src/everything/libFS-1.0.3.tar.bz2 mirror://xorg/X11R7.6/src/everything/libICE-1.0.7.tar.bz2 -mirror://xorg/X11R7.6/src/everything/libpciaccess-0.12.0.tar.bz2 +mirror://xorg/individual/lib/libpciaccess-0.12.1.tar.bz2 mirror://xorg/X11R7.6/src/everything/libpthread-stubs-0.3.tar.bz2 mirror://xorg/X11R7.6/src/everything/libSM-1.2.0.tar.bz2 mirror://xorg/X11R7.6/src/everything/libWindowsWM-1.0.1.tar.bz2 -mirror://xorg/X11R7.6/src/everything/libX11-1.4.0.tar.bz2 +mirror://xorg/individual/lib/libX11-1.4.1.tar.bz2 mirror://xorg/X11R7.6/src/everything/libXau-1.0.6.tar.bz2 -mirror://xorg/X11R7.6/src/everything/libXaw-1.0.8.tar.bz2 +mirror://xorg/individual/lib/libXaw-1.0.9.tar.bz2 mirror://xorg/X11R7.6/src/everything/libxcb-1.7.tar.bz2 mirror://xorg/X11R7.6/src/everything/libXcomposite-0.4.3.tar.bz2 mirror://xorg/X11R7.6/src/everything/libXcursor-1.1.11.tar.bz2 @@ -69,7 +69,7 @@ mirror://xorg/X11R7.6/src/everything/libXext-1.2.0.tar.bz2 mirror://xorg/X11R7.6/src/everything/libXfixes-4.0.5.tar.bz2 mirror://xorg/X11R7.6/src/everything/libXfont-1.4.3.tar.bz2 mirror://xorg/X11R7.6/src/everything/libXft-2.2.0.tar.bz2 -mirror://xorg/X11R7.6/src/everything/libXi-1.4.0.tar.bz2 +mirror://xorg/individual/lib/libXi-1.4.1.tar.bz2 mirror://xorg/X11R7.6/src/everything/libXinerama-1.1.1.tar.bz2 mirror://xorg/X11R7.6/src/everything/libxkbfile-1.0.7.tar.bz2 mirror://xorg/X11R7.6/src/everything/libXmu-1.1.0.tar.bz2 @@ -99,7 +99,7 @@ mirror://xorg/X11R7.6/src/everything/smproxy-1.0.4.tar.bz2 mirror://xorg/X11R7.6/src/everything/util-macros-1.11.0.tar.bz2 mirror://xorg/X11R7.6/src/everything/videoproto-2.3.1.tar.bz2 mirror://xorg/X11R7.6/src/everything/windowswmproto-1.0.4.tar.bz2 -mirror://xorg/X11R7.6/src/everything/x11perf-1.5.2.tar.bz2 +mirror://xorg/individual/app/x11perf-1.5.3.tar.bz2 mirror://xorg/X11R7.6/src/everything/xauth-1.0.5.tar.bz2 mirror://xorg/X11R7.6/src/everything/xbacklight-1.1.2.tar.bz2 mirror://xorg/X11R7.6/src/everything/xbitmaps-1.1.1.tar.bz2 @@ -114,10 +114,10 @@ mirror://xorg/X11R7.6/src/everything/xev-1.1.0.tar.bz2 mirror://xorg/X11R7.6/src/everything/xextproto-7.1.2.tar.bz2 mirror://xorg/X11R7.6/src/everything/xf86bigfontproto-1.2.0.tar.bz2 mirror://xorg/X11R7.6/src/everything/xf86dgaproto-2.1.tar.bz2 -mirror://xorg/X11R7.6/src/everything/xf86driproto-2.1.0.tar.bz2 +mirror://xorg/individual/proto/xf86driproto-2.1.1.tar.bz2 mirror://xorg/X11R7.6/src/everything/xf86-input-acecad-1.4.0.tar.bz2 mirror://xorg/X11R7.6/src/everything/xf86-input-aiptek-1.3.1.tar.bz2 -mirror://xorg/X11R7.6/src/everything/xf86-input-evdev-2.5.0.tar.bz2 +mirror://xorg/individual/driver/xf86-input-evdev-2.6.0.tar.bz2 mirror://xorg/X11R7.6/src/everything/xf86-input-joystick-1.5.0.tar.bz2 mirror://xorg/X11R7.6/src/everything/xf86-input-keyboard-1.5.0.tar.bz2 mirror://xorg/X11R7.6/src/everything/xf86-input-mouse-1.6.0.tar.bz2 @@ -127,7 +127,7 @@ mirror://xorg/X11R7.6/src/everything/xf86-input-void-1.3.1.tar.bz2 mirror://xorg/X11R7.6/src/everything/xf86-video-apm-1.2.3.tar.bz2 mirror://xorg/X11R7.6/src/everything/xf86-video-ark-0.7.3.tar.bz2 mirror://xorg/X11R7.6/src/everything/xf86-video-ast-0.91.10.tar.bz2 -mirror://xorg/X11R7.6/src/everything/xf86-video-ati-6.13.2.tar.bz2 +mirror://xorg/individual/driver/xf86-video-ati-6.14.2.tar.bz2 mirror://xorg/X11R7.6/src/everything/xf86-video-chips-1.2.3.tar.bz2 mirror://xorg/X11R7.6/src/everything/xf86-video-cirrus-1.3.2.tar.bz2 mirror://xorg/X11R7.6/src/everything/xf86-video-dummy-0.3.4.tar.bz2 @@ -137,7 +137,7 @@ mirror://xorg/X11R7.6/src/everything/xf86-video-glide-1.1.0.tar.bz2 mirror://xorg/X11R7.6/src/everything/xf86-video-glint-1.2.5.tar.bz2 mirror://xorg/X11R7.6/src/everything/xf86-video-i128-1.3.4.tar.bz2 mirror://xorg/X11R7.6/src/everything/xf86-video-i740-1.3.2.tar.bz2 -mirror://xorg/X11R7.6/src/everything/xf86-video-intel-2.13.0.tar.bz2 +mirror://xorg/individual/driver/xf86-video-intel-2.14.0.tar.bz2 mirror://xorg/X11R7.6/src/everything/xf86-video-mach64-6.8.2.tar.bz2 mirror://xorg/X11R7.6/src/everything/xf86-video-mga-1.4.13.tar.bz2 mirror://xorg/X11R7.6/src/everything/xf86-video-neomagic-1.2.5.tar.bz2 @@ -169,26 +169,26 @@ mirror://xorg/X11R7.6/src/everything/xf86-video-voodoo-1.2.4.tar.bz2 mirror://xorg/X11R7.6/src/everything/xf86-video-wsfb-0.3.0.tar.bz2 mirror://xorg/X11R7.6/src/everything/xf86-video-xgi-1.6.0.tar.bz2 mirror://xorg/X11R7.6/src/everything/xf86-video-xgixp-1.8.0.tar.bz2 -mirror://xorg/X11R7.6/src/everything/xf86vidmodeproto-2.3.tar.bz2 +mirror://xorg/individual/proto/xf86vidmodeproto-2.3.1.tar.bz2 mirror://xorg/X11R7.6/src/everything/xgamma-1.0.4.tar.bz2 mirror://xorg/X11R7.6/src/everything/xhost-1.0.4.tar.bz2 -mirror://xorg/X11R7.6/src/everything/xineramaproto-1.2.tar.bz2 +mirror://xorg/individual/proto/xineramaproto-1.2.1.tar.bz2 mirror://xorg/X11R7.6/src/everything/xinput-1.5.3.tar.bz2 -mirror://xorg/X11R7.6/src/everything/xkbcomp-1.2.0.tar.bz2 +mirror://xorg/individual/app/xkbcomp-1.2.1.tar.bz2 mirror://xorg/X11R7.6/src/everything/xkbevd-1.1.2.tar.bz2 mirror://xorg/X11R7.6/src/everything/xkbutils-1.0.3.tar.bz2 mirror://xorg/X11R7.6/src/everything/xkill-1.0.3.tar.bz2 mirror://xorg/X11R7.6/src/everything/xlsatoms-1.1.0.tar.bz2 -mirror://xorg/X11R7.6/src/everything/xlsclients-1.1.1.tar.bz2 +mirror://xorg/individual/app/xlsclients-1.1.2.tar.bz2 mirror://xorg/X11R7.6/src/everything/xmodmap-1.0.5.tar.bz2 mirror://xorg/X11R7.6/src/everything/xorg-docs-1.6.tar.bz2 -mirror://xorg/X11R7.6/src/everything/xorg-server-1.9.3.tar.bz2 +mirror://xorg/individual/xserver/xorg-server-1.9.5.tar.bz2 mirror://xorg/X11R7.6/src/everything/xorg-sgml-doctools-1.6.tar.bz2 mirror://xorg/X11R7.6/src/everything/xpr-1.0.3.tar.bz2 mirror://xorg/X11R7.6/src/everything/xprop-1.2.0.tar.bz2 mirror://xorg/X11R7.6/src/everything/xproto-7.0.20.tar.bz2 mirror://xorg/X11R7.6/src/everything/xrandr-1.3.4.tar.bz2 -mirror://xorg/X11R7.6/src/everything/xrdb-1.0.7.tar.bz2 +mirror://xorg/individual/app/xrdb-1.0.8.tar.bz2 mirror://xorg/X11R7.6/src/everything/xrefresh-1.0.4.tar.bz2 mirror://xorg/X11R7.6/src/everything/xset-1.2.1.tar.bz2 mirror://xorg/X11R7.6/src/everything/xsetroot-1.1.0.tar.bz2 From 076977b46206b3ef93d6c3e1e7c6d478c78f9931 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?= Date: Sun, 1 Jan 2012 20:01:02 +0000 Subject: [PATCH 173/186] Making procps crossbuild. svn path=/nixpkgs/trunk/; revision=31190 --- pkgs/os-specific/linux/procps/default.nix | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/pkgs/os-specific/linux/procps/default.nix b/pkgs/os-specific/linux/procps/default.nix index dce0e36edb4..9c894256413 100644 --- a/pkgs/os-specific/linux/procps/default.nix +++ b/pkgs/os-specific/linux/procps/default.nix @@ -19,6 +19,10 @@ stdenv.mkDerivation { makeFlags = "DESTDIR=$(out)"; + crossAttrs = { + CC = stdenv.cross.config + "-gcc"; + }; + meta = { homepage = http://procps.sourceforge.net/; description = "Utilities that give information about processes using the /proc filesystem"; From be12dae1ec4c124571d4c18fb20696e6b9e924a1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?= Date: Sun, 1 Jan 2012 20:14:50 +0000 Subject: [PATCH 174/186] Fixing the busybox installation. All symlinks were pointing wrong. svn path=/nixpkgs/trunk/; revision=31191 --- pkgs/misc/busybox/default.nix | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) diff --git a/pkgs/misc/busybox/default.nix b/pkgs/misc/busybox/default.nix index f3a73514ed8..6ca30ddd96b 100644 --- a/pkgs/misc/busybox/default.nix +++ b/pkgs/misc/busybox/default.nix @@ -29,7 +29,7 @@ let nixConfig = '' CONFIG_PREFIX "$out" - CONFIG_INSTALL_NO_USR n + CONFIG_INSTALL_NO_USR y ''; staticConfig = (if enableStatic then '' @@ -58,12 +58,6 @@ stdenv.mkDerivation rec { make oldconfig ''; - postInstall = '' - mv -v $out/usr/bin/* $out/bin - mv -v $out/usr/sbin/* $out/sbin - rm -fRv $out/usr/ - ''; - crossAttrs = { extraCrossConfig = '' CONFIG_CROSS_COMPILER_PREFIX "${stdenv.cross.config}-" From 25db17f1b3c17a446564e8fe9742530563aba003 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Sun, 1 Jan 2012 21:24:11 +0000 Subject: [PATCH 175/186] haskell-data-accessor: updated to version 0.2.2.1 svn path=/nixpkgs/trunk/; revision=31192 --- .../libraries/haskell/data-accessor/data-accessor.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/data-accessor/data-accessor.nix b/pkgs/development/libraries/haskell/data-accessor/data-accessor.nix index f6b48befd5d..76bee6c05a8 100644 --- a/pkgs/development/libraries/haskell/data-accessor/data-accessor.nix +++ b/pkgs/development/libraries/haskell/data-accessor/data-accessor.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "data-accessor"; - version = "0.2.2"; - sha256 = "1jqd0qlv1yab83d5pdbzjw6q4a2kvbsar6kgczq0f0xn9gxm0qci"; + version = "0.2.2.1"; + sha256 = "1zb7z9fnlnxxlvjd655vadfscanzq9msvjv21cjmdric0ja24hxb"; buildDepends = [ transformers ]; meta = { homepage = "http://www.haskell.org/haskellwiki/Record_access"; From e2c7b54f8c8247a2a93a7eb7e9cbab5983ef3d40 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Sun, 1 Jan 2012 21:24:14 +0000 Subject: [PATCH 176/186] haskell-derive: updated to version 2.5.5 svn path=/nixpkgs/trunk/; revision=31193 --- pkgs/development/libraries/haskell/derive/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/derive/default.nix b/pkgs/development/libraries/haskell/derive/default.nix index 7f28ad8b10d..c98ddb04cd5 100644 --- a/pkgs/development/libraries/haskell/derive/default.nix +++ b/pkgs/development/libraries/haskell/derive/default.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "derive"; - version = "2.5.4"; - sha256 = "0gmj24qzh3vyvp0a44v4mf1qpkrg4d9q0m15d0yfbyzrimyjx1c7"; + version = "2.5.5"; + sha256 = "1vv7y2jfyxq2abh4avyjwia309a6rylbyiqia1m0ka7zwv2rxd6y"; isLibrary = true; isExecutable = true; buildDepends = [ haskellSrcExts syb transformers uniplate ]; From ff5e4c4f4be3269f25d869478bcaddf9caf91bdd Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Sun, 1 Jan 2012 21:24:17 +0000 Subject: [PATCH 177/186] haskell-syb-with-class: updated to version 0.6.1.3 svn path=/nixpkgs/trunk/; revision=31194 --- pkgs/development/libraries/haskell/syb/syb-with-class.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/syb/syb-with-class.nix b/pkgs/development/libraries/haskell/syb/syb-with-class.nix index 980c24b2d45..79b90feaa85 100644 --- a/pkgs/development/libraries/haskell/syb/syb-with-class.nix +++ b/pkgs/development/libraries/haskell/syb/syb-with-class.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "syb-with-class"; - version = "0.6.1.2"; - sha256 = "1hzwhfpl4w5nblkr2l4l4i7xxkvv7n5adr3i9miqmw1krlxs852d"; + version = "0.6.1.3"; + sha256 = "0dmj9ah7az5lckamvm46pff0595p6v4pvzdv0lqq97gjs5i59y9d"; meta = { description = "Scrap Your Boilerplate With Class"; license = self.stdenv.lib.licenses.bsd3; From a0e70167099bccee14c9318085ba3161b4d3e83a Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Sun, 1 Jan 2012 21:24:20 +0000 Subject: [PATCH 178/186] haskell-texmath: updated to version 0.5.0.4 svn path=/nixpkgs/trunk/; revision=31195 --- pkgs/development/libraries/haskell/texmath/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/texmath/default.nix b/pkgs/development/libraries/haskell/texmath/default.nix index d25c80a1810..032f79ce077 100644 --- a/pkgs/development/libraries/haskell/texmath/default.nix +++ b/pkgs/development/libraries/haskell/texmath/default.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "texmath"; - version = "0.5.0.3"; - sha256 = "0pw3b5qvsngy0wdny8y3widkaphvjksg7mnpa8yzqfsw0rl36s0p"; + version = "0.5.0.4"; + sha256 = "0wi7zix10p73hb8aiyq47d27k5hi0l0ba5p6h7kdbhia9xm5w5w5"; isLibrary = true; isExecutable = true; buildDepends = [ parsec syb xml ]; From 6639c58398f5c79996ca32243f8d650242a5704e Mon Sep 17 00:00:00 2001 From: "Yury G. Kudryashov" Date: Mon, 2 Jan 2012 10:42:25 +0000 Subject: [PATCH 179/186] Use qt-4.8 by default Some packages may break because pkgconfig is no longer propagated. svn path=/nixpkgs/trunk/; revision=31196 --- pkgs/desktops/kde-4.7/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/desktops/kde-4.7/default.nix b/pkgs/desktops/kde-4.7/default.nix index 3bdf825410c..6abcc02139d 100644 --- a/pkgs/desktops/kde-4.7/default.nix +++ b/pkgs/desktops/kde-4.7/default.nix @@ -1,4 +1,4 @@ -{ callPackage, callPackageOrig, stdenv, qt47 }: +{ callPackage, callPackageOrig, stdenv, qt48 }: let release = "4.7.4"; @@ -44,7 +44,7 @@ kde.modules // kde.individual // akonadi = callPackage ./support/akonadi { }; - qt4 = qt47; + qt4 = qt48; kdebase_workspace = kde.modules.kde_workspace; From 097b7635af59d6b767aebfbeff1adca98e0898ee Mon Sep 17 00:00:00 2001 From: "Yury G. Kudryashov" Date: Mon, 2 Jan 2012 10:42:36 +0000 Subject: [PATCH 180/186] Explicitly add sqlite to calibre.buildInputs The better way would be adding sqlite to pythonPackages.sqlite3.propagatedBuildInputs but I don't want to touch this code. svn path=/nixpkgs/trunk/; revision=31197 --- pkgs/applications/misc/calibre/default.nix | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/misc/calibre/default.nix b/pkgs/applications/misc/calibre/default.nix index 1685ef50b8d..b8100fbd709 100644 --- a/pkgs/applications/misc/calibre/default.nix +++ b/pkgs/applications/misc/calibre/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, python, pyqt4, sip, popplerQt4, pkgconfig, libpng -, imagemagick, libjpeg, fontconfig, podofo, qt4, icu +, imagemagick, libjpeg, fontconfig, podofo, qt4, icu, sqlite , pil, makeWrapper, unrar, chmlib, pythonPackages, xz }: @@ -19,7 +19,8 @@ stdenv.mkDerivation rec { [ python pyqt4 sip popplerQt4 libpng imagemagick libjpeg fontconfig podofo qt4 pil chmlib icu pythonPackages.mechanize pythonPackages.lxml pythonPackages.dateutil - pythonPackages.cssutils pythonPackages.beautifulsoap pythonPackages.sqlite3 + pythonPackages.cssutils pythonPackages.beautifulsoap + pythonPackages.sqlite3 sqlite ]; installPhase = '' From 78c300f0150f1ec8742d4b1fa80005a1b07f1950 Mon Sep 17 00:00:00 2001 From: "Yury G. Kudryashov" Date: Mon, 2 Jan 2012 11:12:27 +0000 Subject: [PATCH 181/186] soprano-2.7.4, pass pkgconfig explicitly svn path=/nixpkgs/trunk/; revision=31198 --- pkgs/development/libraries/soprano/default.nix | 18 ++++++------------ 1 file changed, 6 insertions(+), 12 deletions(-) diff --git a/pkgs/development/libraries/soprano/default.nix b/pkgs/development/libraries/soprano/default.nix index 49e6e6b96df..40fd36840fd 100644 --- a/pkgs/development/libraries/soprano/default.nix +++ b/pkgs/development/libraries/soprano/default.nix @@ -1,26 +1,20 @@ -{ stdenv, fetchurl, cmake, qt4, clucene_core, librdf_redland, libiodbc }: +{ stdenv, fetchurl, cmake, qt4, clucene_core, librdf_redland, libiodbc +, pkgconfig }: stdenv.mkDerivation rec { - name = "soprano-2.7.0"; + name = "soprano-2.7.4"; src = fetchurl { url = "mirror://sourceforge/soprano/${name}.tar.bz2"; - sha256 = "1ki92wg0i9nhn1fh5mdcls5h9h3lf2k5r66snsags4x7zw0dmv2z"; + sha256 = "0f6kg39bi4h4iblfs9ny88cs951sigm50yr6w50afc3f1nqzdmhp"; }; - patches = - [ (fetchurl { # Applied upstream, remove if upgrading - url = https://git.reviewboard.kde.org/r/102466/diff/raw/; - name = "soprano-virtuoso-restart.patch"; - sha256 = "0jk038fp7ii6847mbxdajhhc7f6ap6lriaklxcqqxf6ddj37gf3y"; - }) - ./find-virtuoso.patch - ]; + patches = [ ./find-virtuoso.patch ]; # We disable the Java backend, since we do not need them and they make the closure size much bigger buildInputs = [ qt4 clucene_core librdf_redland libiodbc ]; - buildNativeInputs = [ cmake ]; + buildNativeInputs = [ cmake pkgconfig ]; meta = { homepage = http://soprano.sourceforge.net/; From 0c824aa4567c8dc52685caedc547b463568d21f0 Mon Sep 17 00:00:00 2001 From: "Yury G. Kudryashov" Date: Mon, 2 Jan 2012 11:16:48 +0000 Subject: [PATCH 182/186] Pass pkgconfig to strigi svn path=/nixpkgs/trunk/; revision=31199 --- pkgs/development/libraries/strigi/default.nix | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/strigi/default.nix b/pkgs/development/libraries/strigi/default.nix index 1888ef2aab6..6d7212f5c5c 100644 --- a/pkgs/development/libraries/strigi/default.nix +++ b/pkgs/development/libraries/strigi/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, cmake, qt4, perl, bzip2, libxml2, exiv2 -, clucene_core, fam, zlib, dbus_tools +, clucene_core, fam, zlib, dbus_tools, pkgconfig }: stdenv.mkDerivation rec { @@ -16,7 +16,9 @@ stdenv.mkDerivation rec { CLUCENE_HOME = clucene_core; buildInputs = - [ cmake perl zlib bzip2 stdenv.gcc.libc libxml2 qt4 exiv2 clucene_core fam dbus_tools ]; + [ zlib bzip2 stdenv.gcc.libc libxml2 qt4 exiv2 clucene_core fam dbus_tools ]; + + buildNativeInputs = [ cmake pkgconfig perl ]; enableParallelBuilding = true; From 2a0453e43e280b42ea94217442c759d8891d20f8 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 2 Jan 2012 11:22:58 +0000 Subject: [PATCH 183/186] haskell-enumerator: updated to version 0.4.17 svn path=/nixpkgs/trunk/; revision=31200 --- pkgs/development/libraries/haskell/enumerator/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/enumerator/default.nix b/pkgs/development/libraries/haskell/enumerator/default.nix index 12e801516a6..58e5ab4b62d 100644 --- a/pkgs/development/libraries/haskell/enumerator/default.nix +++ b/pkgs/development/libraries/haskell/enumerator/default.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "enumerator"; - version = "0.4.16"; - sha256 = "16556x3km4si7gvprf7xmsiqw1ygjwavhbgh32fmzf7709bpqnhs"; + version = "0.4.17"; + sha256 = "009h9phdgnkbvz5fri81b895y2hbmw5x7z67rnn31j87khbhnfz9"; buildDepends = [ text transformers ]; meta = { homepage = "https://john-millikin.com/software/enumerator/"; From a6c6878f5b1a466b5a401ee1b0f3698c250ca66d Mon Sep 17 00:00:00 2001 From: "Yury G. Kudryashov" Date: Mon, 2 Jan 2012 11:35:13 +0000 Subject: [PATCH 184/186] libdbusmenu-qt-0.9.0, disable apidocs svn path=/nixpkgs/trunk/; revision=31201 --- pkgs/development/libraries/libdbusmenu-qt/default.nix | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/pkgs/development/libraries/libdbusmenu-qt/default.nix b/pkgs/development/libraries/libdbusmenu-qt/default.nix index 3c138cca416..4c12880f557 100644 --- a/pkgs/development/libraries/libdbusmenu-qt/default.nix +++ b/pkgs/development/libraries/libdbusmenu-qt/default.nix @@ -1,8 +1,8 @@ -{ stdenv, fetchurl, qt4, cmake, doxygen }: +{ stdenv, fetchurl, qt4, cmake }: let baseName = "libdbusmenu-qt"; - v = "0.8.3"; + v = "0.9.0"; in stdenv.mkDerivation rec { @@ -10,10 +10,13 @@ stdenv.mkDerivation rec { src = fetchurl { url = "http://launchpad.net/${baseName}/trunk/${v}/+download/${name}.tar.bz2"; - sha256 = "1fkw6wpxjmmx4p8779z662qphip3pgdcsn6cyb0frryfj4sa32ka"; + sha256 = "0xdicb3fmwgbyhc6cpcmdkwysdg18m5rcqc3izpwv6brq4aq4787"; }; - buildInputs = [ cmake qt4 doxygen ]; + buildInputs = [ qt4 ]; + buildNativeInputs = [ cmake ]; + + cmakeFlags = "-DWITH_DOC=OFF"; meta = with stdenv.lib; { description = "Provides a Qt implementation of the DBusMenu spec"; From b8a3e5fbc91e6b36a7bc07b3a619fa7749275157 Mon Sep 17 00:00:00 2001 From: "Yury G. Kudryashov" Date: Mon, 2 Jan 2012 12:52:43 +0000 Subject: [PATCH 185/186] kdelibs: depend on libjpeg svn path=/nixpkgs/trunk/; revision=31202 --- pkgs/desktops/kde-4.7/kdelibs.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/desktops/kde-4.7/kdelibs.nix b/pkgs/desktops/kde-4.7/kdelibs.nix index 83de4e95136..d4383b3e93a 100644 --- a/pkgs/desktops/kde-4.7/kdelibs.nix +++ b/pkgs/desktops/kde-4.7/kdelibs.nix @@ -3,7 +3,7 @@ , xz, openexr, avahi, kerberos, acl, attr, shared_desktop_ontologies, libXScrnSaver , automoc4, strigi, soprano, qca2, attica, enchant, libdbusmenu_qt , docbook_xml_dtd_42, docbook_xsl, polkit_qt_1 -, getopt, udev, herqq, phonon +, getopt, udev, herqq, phonon, libjpeg }: kde { @@ -11,7 +11,7 @@ kde { [ acl attr attica avahi bzip2 enchant fam getopt giflib herqq jasper libdbusmenu_qt libXScrnSaver libxslt pcre polkit_qt_1 qca2 - shared_desktop_ontologies udev xz libxml2 + shared_desktop_ontologies udev xz libxml2 libjpeg ]; propagatedBuildInputs = [ qt4 soprano strigi phonon ]; From 15ab248bca6518e0a7e109e3276141c43f68ea99 Mon Sep 17 00:00:00 2001 From: "Yury G. Kudryashov" Date: Mon, 2 Jan 2012 12:54:22 +0000 Subject: [PATCH 186/186] Revert "Use qt-4.8 by default" This reverts r31196. Will re-apply after fixing most packages broken by this change. svn path=/nixpkgs/trunk/; revision=31203 --- pkgs/desktops/kde-4.7/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/desktops/kde-4.7/default.nix b/pkgs/desktops/kde-4.7/default.nix index 6abcc02139d..3bdf825410c 100644 --- a/pkgs/desktops/kde-4.7/default.nix +++ b/pkgs/desktops/kde-4.7/default.nix @@ -1,4 +1,4 @@ -{ callPackage, callPackageOrig, stdenv, qt48 }: +{ callPackage, callPackageOrig, stdenv, qt47 }: let release = "4.7.4"; @@ -44,7 +44,7 @@ kde.modules // kde.individual // akonadi = callPackage ./support/akonadi { }; - qt4 = qt48; + qt4 = qt47; kdebase_workspace = kde.modules.kde_workspace;