From 5763650f455a6be5cb2771b92f83649c383fb72b Mon Sep 17 00:00:00 2001 From: Russell O'Connor Date: Mon, 4 Oct 2010 01:22:27 +0000 Subject: [PATCH 01/72] adding roconnor to maintainers. svn path=/nixpkgs/trunk/; revision=24039 --- pkgs/lib/maintainers.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/lib/maintainers.nix b/pkgs/lib/maintainers.nix index 423a08a31f2..8b664998d92 100644 --- a/pkgs/lib/maintainers.nix +++ b/pkgs/lib/maintainers.nix @@ -16,6 +16,7 @@ phreedom = "Evgeny Egorochkin "; pierron = "Nicolas B. Pierron "; raskin = "Michael Raskin <7c6f434c@mail.ru>"; + roconnor = "Russell O'Connor "; sander = "Sander van der Burg "; simons = "Peter Simons "; urkud = "Yury G. Kudryashov "; From c9ad6ec90ad8424b35d9a6129762f1b201ce021d Mon Sep 17 00:00:00 2001 From: Evgeny Egorochkin Date: Mon, 4 Oct 2010 04:15:23 +0000 Subject: [PATCH 02/72] Packaged Gobby svn path=/nixpkgs/trunk/; revision=24040 --- pkgs/applications/editors/gobby/default.nix | 31 +++++++++++++++++++++ pkgs/top-level/all-packages.nix | 5 ++++ 2 files changed, 36 insertions(+) create mode 100644 pkgs/applications/editors/gobby/default.nix diff --git a/pkgs/applications/editors/gobby/default.nix b/pkgs/applications/editors/gobby/default.nix new file mode 100644 index 00000000000..ea86f9caf52 --- /dev/null +++ b/pkgs/applications/editors/gobby/default.nix @@ -0,0 +1,31 @@ +{ avahiSupport ? false # build support for Avahi in libinfinity +, gnomeSupport ? false # build support for Gnome(gnome-vfs) +, stdenv, fetchurl, pkgconfig +, gtkmm, gsasl, gtksourceview, libxmlxx, libinfinity, intltool +, gnomevfs ? null}: + +let + libinf = libinfinity.override { gtkWidgets = true; inherit avahiSupport; }; + +in stdenv.mkDerivation rec { + + name = "gobby-0.4.93"; + src = fetchurl { + url = "http://releases.0x539.de/gobby/${name}.tar.gz"; + sha256 = "1zk6p0kdp9vcvrr3kx0kw106ln309hd7bbsq8li1g0pcnkgrf4q4"; + }; + + buildInputs = [ pkgconfig gtkmm gsasl gtksourceview libxmlxx libinf intltool ] + ++ stdenv.lib.optional gnomeSupport gnomevfs; + + configureFlags = '' + ''; + + meta = with stdenv.lib; { + homepage = http://gobby.0x539.de/; + description = "A GTK-based collaborative editor supporting multiple documents in one session and a multi-user chat"; + license = "GPLv2+"; + maintainers = [ maintainers.phreedom ]; + platforms = platforms.all; + }; +} \ No newline at end of file diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 29e8871c214..313d6957e76 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -5641,6 +5641,11 @@ let gocr = callPackage ../applications/graphics/gocr { }; + gobby = callPackage ../applications/editors/gobby { + inherit (gtkLibs) gtkmm; + inherit (gnome) gtksourceview; + }; + gphoto2 = callPackage ../applications/misc/gphoto2 { }; gphoto2fs = builderDefsPackage ../applications/misc/gphoto2/gphotofs.nix { From 95e5ea95692bc8b79487907e5af89ad2c398a7d4 Mon Sep 17 00:00:00 2001 From: Evgeny Egorochkin Date: Mon, 4 Oct 2010 04:15:45 +0000 Subject: [PATCH 03/72] libxml++: propagate libxml svn path=/nixpkgs/trunk/; revision=24041 --- pkgs/development/libraries/libxmlxx/default.nix | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/pkgs/development/libraries/libxmlxx/default.nix b/pkgs/development/libraries/libxmlxx/default.nix index 7066bc6f9d5..36c8073348d 100644 --- a/pkgs/development/libraries/libxmlxx/default.nix +++ b/pkgs/development/libraries/libxmlxx/default.nix @@ -7,7 +7,9 @@ stdenv.mkDerivation rec { sha256 = "1hgpw9lld0k6z34kxrapz8dxf3cbgnnhkx6himnvw9ax3qf7p5gk"; }; - buildInputs = [ pkgconfig libxml2 glibmm perl ]; + buildInputs = [ pkgconfig glibmm perl ]; + + propagatedBuildInputs = [ libxml2 ]; configureFlags = "--disable-documentation"; #doesn't build without this for some reason From f1a83d3e33b9db8fd8b9829002f6f9759384f023 Mon Sep 17 00:00:00 2001 From: Evgeny Egorochkin Date: Mon, 4 Oct 2010 04:15:50 +0000 Subject: [PATCH 04/72] libinfinity: propagate the necessary deps svn path=/nixpkgs/trunk/; revision=24042 --- pkgs/development/libraries/libinfinity/default.nix | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/pkgs/development/libraries/libinfinity/default.nix b/pkgs/development/libraries/libinfinity/default.nix index 83707b2477e..3d34f6303e3 100644 --- a/pkgs/development/libraries/libinfinity/default.nix +++ b/pkgs/development/libraries/libinfinity/default.nix @@ -17,11 +17,13 @@ in stdenv.mkDerivation rec { sha256 = "1vdyj6xvwkisrc222i84mq93gasywad4i0ismafdjq2wapxn30r6"; }; - buildInputs = [ pkgconfig glib libxml2 gnutls gsasl ] + buildInputs = [ pkgconfig glib libxml2 gsasl ] ++ optional gtkWidgets gtk ++ optional documentation gtkdoc ++ optional avahiSupport avahi ++ optional daemon libdaemon; + + propagatedBuildInputs = [ gnutls ]; configureFlags = '' ${if documentation then "--enable-gtk-doc" else "--disable-gtk-doc"} From ef403beb481ef81512cc9b25ac692625ce3b4105 Mon Sep 17 00:00:00 2001 From: Evgeny Egorochkin Date: Mon, 4 Oct 2010 04:15:55 +0000 Subject: [PATCH 05/72] Gobby: rename to gobby5 because it's apparently still considered very new and incompatible with stable gobby4 svn path=/nixpkgs/trunk/; revision=24043 --- 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 313d6957e76..23907b7a944 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -5641,7 +5641,7 @@ let gocr = callPackage ../applications/graphics/gocr { }; - gobby = callPackage ../applications/editors/gobby { + gobby5 = callPackage ../applications/editors/gobby { inherit (gtkLibs) gtkmm; inherit (gnome) gtksourceview; }; From 600b4b7ee73438b76326e3fdf2c2442fda8900f9 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 4 Oct 2010 09:49:09 +0000 Subject: [PATCH 06/72] Moved "flup" from all-packages.nix into python-packages.nix. svn path=/nixpkgs/trunk/; revision=24044 --- .../python-modules/flup/default.nix | 18 ------------------ pkgs/top-level/all-packages.nix | 8 ++------ pkgs/top-level/python-packages.nix | 14 ++++++++++++++ 3 files changed, 16 insertions(+), 24 deletions(-) delete mode 100644 pkgs/development/python-modules/flup/default.nix diff --git a/pkgs/development/python-modules/flup/default.nix b/pkgs/development/python-modules/flup/default.nix deleted file mode 100644 index 2c0a84aec1a..00000000000 --- a/pkgs/development/python-modules/flup/default.nix +++ /dev/null @@ -1,18 +0,0 @@ -{ stdenv, fetchurl, python, setuptools, ... }: - -rec { - name = "flup-1.0.2"; - - src = fetchurl { - url = "http://www.saddi.com/software/flup/dist/${name}.tar.gz"; - sha256 = "1nbx174g40l1z3a8arw72qz05a1qxi3didp9wm7kvkn1bxx33bab"; - }; - - buildInputs = [ python setuptools ]; - - phaseNames = ["addInputs" "createPythonInstallationTarget" "installPythonPackage"]; - - meta = { - description = "FastCGI Python module set"; - }; -} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 23907b7a944..688e4e4bfa4 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -4046,10 +4046,6 @@ let bsddb3 = callPackage ../development/python-modules/bsddb3 { }; - flup = builderDefsPackage ../development/python-modules/flup { - inherit fetchurl stdenv python setuptools; - }; - numeric = callPackage ../development/python-modules/numeric { }; pil = callPackage ../development/python-modules/pil { }; @@ -6223,9 +6219,9 @@ let viewMtn = builderDefsPackage (import ../applications/version-management/viewmtn/0.10.nix) { - inherit - monotone flup cheetahTemplate highlight ctags + inherit monotone cheetahTemplate highlight ctags makeWrapper graphviz which python; + flup = pythonPackages.flup; }; vim = callPackage ../applications/editors/vim { }; diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 58bfa7e341b..a380e5f30c8 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -171,6 +171,20 @@ rec { }; }); + flup = buildPythonPackage (rec { + name = "flup-1.0.2"; + + src = fetchurl { + url = "http://www.saddi.com/software/flup/dist/${name}.tar.gz"; + sha256 = "1nbx174g40l1z3a8arw72qz05a1qxi3didp9wm7kvkn1bxx33bab"; + }; + + meta = { + homepage = "http://trac.saddi.com/flup"; + description = "FastCGI Python module set"; + }; + }); + foolscap = buildPythonPackage (rec { name = "foolscap-0.5.1"; From a0bee2ae1b8f220b9312cf537fe8eba6ff0343d9 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 4 Oct 2010 09:49:25 +0000 Subject: [PATCH 07/72] pkgs/top-level/all-packages.nix: strip trailing whitespace svn path=/nixpkgs/trunk/; revision=24045 --- pkgs/top-level/all-packages.nix | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 688e4e4bfa4..fb293b718a9 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -369,12 +369,12 @@ let monolithic = false; daemon = true; }; - + amuleGui = amule.override { monolithic = false; client = true; }; - + aria = builderDefsPackage (import ../tools/networking/aria) { }; @@ -1215,7 +1215,7 @@ let unetbootin = callPackage ../tools/cd-dvd/unetbootin { }; upx = callPackage ../tools/compression/upx { }; - + usbmuxd = callPackage ../tools/misc/usbmuxd {}; vacuum = callPackage ../applications/networking/instant-messengers/vacuum {}; @@ -2232,7 +2232,7 @@ let antDarwin = apacheAnt.override rec { jdk = openjdkDarwin; name = "ant-" + jdk.name; } ; ant = apacheAnt; - + apacheAnt = callPackage ../development/tools/build-managers/apache-ant { name = "ant-" + jdk.name; }; @@ -3713,12 +3713,12 @@ let monolithic = false; daemon = true; }; - + quasselClient = quassel.override { monolithic = false; client = true; }; - + quesoglc = callPackage ../development/libraries/quesoglc { }; readline = readline6; @@ -3810,7 +3810,7 @@ let t1lib = callPackage ../development/libraries/t1lib { }; taglib = callPackage ../development/libraries/taglib { }; - + taglib17 = callPackage ../development/libraries/taglib/1.7.nix { }; taglib_extras = callPackage ../development/libraries/taglib-extras { }; @@ -6967,7 +6967,7 @@ let tex = tetex; }; - mysqlWorkbench = newScope gnome ../applications/misc/mysql-workbench { + mysqlWorkbench = newScope gnome ../applications/misc/mysql-workbench { lua = lua5; inherit (pythonPackages) pexpect paramiko; }; From 6aaf62e8d71b4f1c69c808fe3924e409b069f4d9 Mon Sep 17 00:00:00 2001 From: "Yury G. Kudryashov" Date: Mon, 4 Oct 2010 11:32:56 +0000 Subject: [PATCH 08/72] Remove kde-l10n-ca@valencia to make hydra happy svn path=/nixpkgs/trunk/; revision=24048 --- pkgs/desktops/kde-4.5/l10n/manifest.nix | 5 ----- 1 file changed, 5 deletions(-) diff --git a/pkgs/desktops/kde-4.5/l10n/manifest.nix b/pkgs/desktops/kde-4.5/l10n/manifest.nix index 8e890f54e3d..8f8aa3b9817 100644 --- a/pkgs/desktops/kde-4.5/l10n/manifest.nix +++ b/pkgs/desktops/kde-4.5/l10n/manifest.nix @@ -14,11 +14,6 @@ version = "4.5.1"; sha256 = "0097sk50cf1cq6wnah3kiab8vkh68snzahcng2blk63gw908yfvx"; } -{ - lang = "ca@valencia"; - version = "4.5.1"; - sha256 = "1nfj4pgh4k7ld42arlw8vkh646mar615x7r0av02gskdgmixzqm8"; -} { lang = "cs"; version = "4.5.1"; From 94826ffee2df443b922bf61a15e62f7b87d84db8 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 4 Oct 2010 11:51:10 +0000 Subject: [PATCH 09/72] pkgs/misc/emulators/wine: encode paths to libpng and libjpeg in RPATH to ensure that WINE will find them at run-time svn path=/nixpkgs/trunk/; revision=24050 --- pkgs/misc/emulators/wine/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/misc/emulators/wine/default.nix b/pkgs/misc/emulators/wine/default.nix index 640aa31742b..e1901d165f7 100644 --- a/pkgs/misc/emulators/wine/default.nix +++ b/pkgs/misc/emulators/wine/default.nix @@ -37,7 +37,7 @@ stdenv.mkDerivation rec { NIX_LDFLAGS = map (path: "-rpath ${path}/lib ") [ freetype fontconfig stdenv.gcc.gcc mesa mesa.libdrm xlibs.libXinerama xlibs.libXrender xlibs.libXrandr - xlibs.libXcursor xlibs.libXcomposite + xlibs.libXcursor xlibs.libXcomposite libpng libjpeg openssl gnutls ]; From 8b37e1a514bec50cbbfa9ab1857891fc227ea900 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 4 Oct 2010 11:51:17 +0000 Subject: [PATCH 10/72] pkgs/misc/emulators/wine: enable multi-threaded builds svn path=/nixpkgs/trunk/; revision=24051 --- pkgs/misc/emulators/wine/default.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/misc/emulators/wine/default.nix b/pkgs/misc/emulators/wine/default.nix index e1901d165f7..6a4fdd3f0dd 100644 --- a/pkgs/misc/emulators/wine/default.nix +++ b/pkgs/misc/emulators/wine/default.nix @@ -47,6 +47,8 @@ stdenv.mkDerivation rec { postInstall = "install -D ${gecko} $out/share/wine/gecko/wine_gecko-1.1.0-x86.cab"; + enableParallelBuilding = true; + meta = { homepage = "http://www.winehq.org/"; license = "LGPL"; From 17670a541295caeafd84270b553e79597abe7dbd Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Mon, 4 Oct 2010 14:30:34 +0000 Subject: [PATCH 11/72] * Add some openSUSE mirrors that still have 10.3 and 11.0. svn path=/nixpkgs/trunk/; revision=24053 --- pkgs/build-support/fetchurl/mirrors.nix | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/pkgs/build-support/fetchurl/mirrors.nix b/pkgs/build-support/fetchurl/mirrors.nix index cd53f0d0d55..abb133cd50a 100644 --- a/pkgs/build-support/fetchurl/mirrors.nix +++ b/pkgs/build-support/fetchurl/mirrors.nix @@ -190,7 +190,6 @@ rec { # since SUSE actually delete their old distributions (see # ftp://ftp.suse.com/pub/suse/discontinued/deleted-20070817/README.txt). oldsuse = [ - http://ftp.hosteurope.de/pub/linux/suse/discontinued/i386/ ftp://ftp.gmd.de/ftp.suse.com-discontinued/ ]; @@ -198,8 +197,12 @@ rec { opensuse = [ http://opensuse.hro.nl/opensuse/distribution/ http://ftp.funet.fi/pub/linux/mirrors/opensuse/distribution/ + http://ftp.belnet.be/mirror/ftp.opensuse.org/distribution/ + http://ftp.uni-kassel.de/opensuse/distribution/ http://ftp.opensuse.org/pub/opensuse/distribution/ http://ftp.hosteurope.de/mirror/ftp.opensuse.org/discontinued/ + http://opensuse.mirror.server4you.net/distribution/ + http://ftp.nsysu.edu.tw/Linux/OpenSuSE/distribution/ ]; # Gnome (see http://ftp.gnome.org/pub/GNOME/MIRRORS). From 228303d47eed0900c9fca8418a5489bf772d8c4f Mon Sep 17 00:00:00 2001 From: Russell O'Connor Date: Mon, 4 Oct 2010 15:07:38 +0000 Subject: [PATCH 12/72] Merging roconnor's and ludo' texmacs derivations. texmacs now has extra font options. texmacs is abstracted over which tex it uses (AFAIK texmacs only uses metafont). texmacs now depends on aspell, ghostscript soft dependencies. svn path=/nixpkgs/trunk/; revision=24054 --- pkgs/applications/editors/texmacs/default.nix | 95 +++++++++++++++++++ pkgs/applications/office/texmacs/default.nix | 44 --------- pkgs/top-level/all-packages.nix | 5 +- 3 files changed, 99 insertions(+), 45 deletions(-) create mode 100644 pkgs/applications/editors/texmacs/default.nix delete mode 100644 pkgs/applications/office/texmacs/default.nix diff --git a/pkgs/applications/editors/texmacs/default.nix b/pkgs/applications/editors/texmacs/default.nix new file mode 100644 index 00000000000..e4270ef3f83 --- /dev/null +++ b/pkgs/applications/editors/texmacs/default.nix @@ -0,0 +1,95 @@ +{stdenv, fetchurl, guile, libX11, libXext, xmodmap, which, makeWrapper, + tex ? null, + aspell ? null, + ghostscriptX ? null, + extraFonts ? false, + chineseFonts ? false, + japaneseFonts ? false, + koreanFonts ? false }: + +let + pname = "TeXmacs"; + version = "1.0.7"; + extraFontsSrc = fetchurl { + url = "ftp://ftp.texmacs.org/pub/TeXmacs/fonts/TeXmacs-extra-fonts-1.0-noarch.tar.gz"; + sha256 = "0hylgjmd95y9yahbblmawkkw0i71vb145xxv2xqrmff81301n6k7"; + }; + + fullFontsSrc = fetchurl { + url = "ftp://ftp.texmacs.org/pub/TeXmacs/fonts/TeXmacs-windows-fonts-1.0-noarch.tar.gz"; + sha256 = "1yxzjpqpm7kvx0ly5jmfpzlfhsh41b0ibn1v84qv6xy73r2vis2f"; + }; + + chineseFontsSrc = fetchurl { + url = "ftp://ftp.texmacs.org/pub/TeXmacs/fonts/TeXmacs-chinese-fonts.tar.gz"; + sha256 = "0yprqjsx5mfsaxr525mcm3xqwcadzxp14njm38ir1325baada2fp"; + }; + + japaneseFontsSrc = fetchurl { + url = "ftp://ftp.texmacs.org/pub/TeXmacs/fonts/TeXmacs-japanese-fonts.tar.gz"; + sha256 = "1dn6zvsa7gk59d61xicwpbapab3rm6kz48rp5w1bhmihxixw21jn"; + }; + + koreanFontsSrc = fetchurl { + url = "ftp://ftp.texmacs.org/pub/TeXmacs/fonts/TeXmacs-korean-fonts.tar.gz"; + sha256 = "07axg57mqm3jbnm4lawx0h3r2h56xv9acwzjppryfklw4c27f5hh"; + }; +in +stdenv.mkDerivation rec { + name = "${pname}-${version}"; + + src = fetchurl { + url = "ftp://ftp.texmacs.org/pub/${pname}/targz/${name}-src.tar.gz"; + sha256 = "1jdynapwc4fnp4ff71whq7l2jv0v3zwq2v2w463ppxm9cbi3bm5v"; + }; + + buildInputs = [ guile libX11 libXext makeWrapper ]; + + patchPhase = (if tex == null then '' + gunzip < ${fullFontsSrc} | (cd TeXmacs && tar xvf -) + '' else if extraFonts then '' + gunzip < ${extraFontsSrc} | (cd TeXmacs && tar xvf -) + '' else "") + + (if chineseFonts then '' + gunzip < ${chineseFontsSrc} | (cd TeXmacs && tar xvf -) + '' else "") + + (if japaneseFonts then '' + gunzip < ${japaneseFontsSrc} | (cd TeXmacs && tar xvf -) + '' else "") + + (if koreanFonts then '' + gunzip < ${koreanFontsSrc} | (cd TeXmacs && tar xvf -) + '' else ""); + + postInstall = "wrapProgram $out/bin/texmacs --suffix PATH : " + + (if ghostscriptX == null then "" else "${ghostscriptX}/bin:") + + (if aspell == null then "" else "${aspell}/bin:") + + (if tex == null then "" else "${tex}/bin:") + + "${xmodmap}/bin:${which}/bin"; + + meta = { + description = "GNU TeXmacs, a free WYSIWYW editing platform with special features for scientists"; + longDescription = + '' GNU TeXmacs is a free wysiwyw (what you see is what you want) + editing platform with special features for scientists. The software + aims to provide a unified and user friendly framework for editing + structured documents with different types of content (text, + graphics, mathematics, interactive content, etc.). The rendering + engine uses high-quality typesetting algorithms so as to produce + professionally looking documents, which can either be printed out or + presented from a laptop. + + The software includes a text editor with support for mathematical + formulas, a small technical picture editor and a tool for making + presentations from a laptop. Moreover, TeXmacs can be used as an + interface for many external systems for computer algebra, numerical + analysis, statistics, etc. New presentation styles can be written + by the user and new features can be added to the editor using the + Scheme extension language. A native spreadsheet and tools for + collaborative authoring are planned for later. + ''; + homepage = http://texmacs.org/; + license = "GPLv2+"; + maintainers = [ stdenv.lib.maintainers.ludo stdenv.lib.maintainers.roconnor ]; + platforms = stdenv.lib.platforms.gnu; # arbitrary choice + }; +} diff --git a/pkgs/applications/office/texmacs/default.nix b/pkgs/applications/office/texmacs/default.nix deleted file mode 100644 index 6172c055c07..00000000000 --- a/pkgs/applications/office/texmacs/default.nix +++ /dev/null @@ -1,44 +0,0 @@ -{ fetchurl, stdenv, texLive, guile, libX11, libXext }: - -let version = "1.0.7"; in -stdenv.mkDerivation { - name = "texmacs-${version}"; - - src = fetchurl { - url = "ftp://ftp.texmacs.org/pub/TeXmacs/targz/TeXmacs-${version}-src.tar.gz"; - sha256 = "1jdynapwc4fnp4ff71whq7l2jv0v3zwq2v2w463ppxm9cbi3bm5v"; - }; - - buildInputs = [ texLive guile libX11 libXext ]; - - meta = { - description = "GNU TeXmacs, a WYSIWYW editing platform with special features for scientists"; - - longDescription = - '' GNU TeXmacs is a free wysiwyw (what you see is what you want) - editing platform with special features for scientists. The software - aims to provide a unified and user friendly framework for editing - structured documents with different types of content (text, - graphics, mathematics, interactive content, etc.). The rendering - engine uses high-quality typesetting algorithms so as to produce - professionally looking documents, which can either be printed out or - presented from a laptop. - - The software includes a text editor with support for mathematical - formulas, a small technical picture editor and a tool for making - presentations from a laptop. Moreover, TeXmacs can be used as an - interface for many external systems for computer algebra, numerical - analysis, statistics, etc. New presentation styles can be written - by the user and new features can be added to the editor using the - Scheme extension language. A native spreadsheet and tools for - collaborative authoring are planned for later. - ''; - - homepage = http://texmacs.org/; - - license = "GPLv2+"; - - maintainers = [ stdenv.lib.maintainers.ludo ]; - platforms = stdenv.lib.platforms.gnu; # arbitrary choice - }; -} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index fb293b718a9..bca17e77d13 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -1197,7 +1197,10 @@ let telnet = callPackage ../tools/networking/telnet { }; - texmacs = callPackage ../applications/office/texmacs { }; + texmacs = callPackage ../applications/editors/texmacs { + tex = texLive; /* tetex is also an option */ + extraFonts = true; + }; tor = callPackage ../tools/security/tor { }; From b36f4c74bd169ec9516c06c2a22307b6237e93aa Mon Sep 17 00:00:00 2001 From: Russell O'Connor Date: Mon, 4 Oct 2010 17:05:22 +0000 Subject: [PATCH 13/72] openjade requires a version of opensp built with gcc33 in order to compile. svn path=/nixpkgs/trunk/; revision=24057 --- pkgs/top-level/all-packages.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index bca17e77d13..0d0d0e40313 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -942,6 +942,7 @@ let openjade = callPackage ../tools/text/sgml/openjade { stdenv = overrideGCC stdenv gcc33; + opensp = opensp.override { stdenv = overrideGCC stdenv gcc33; }; }; openobex = callPackage ../tools/bluetooth/openobex { }; From 05b8ee73c4b08084899ed14d81533b7e17454462 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= Date: Mon, 4 Oct 2010 22:23:37 +0000 Subject: [PATCH 14/72] OpenOCD: Comment on the pitiful GuruPlug situation. svn path=/nixpkgs/trunk/; revision=24059 --- .../tools/misc/openocd/default.nix | 38 +++++++++++++++++-- 1 file changed, 35 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/misc/openocd/default.nix b/pkgs/development/tools/misc/openocd/default.nix index c6f34f8e837..4b01c9d33e8 100644 --- a/pkgs/development/tools/misc/openocd/default.nix +++ b/pkgs/development/tools/misc/openocd/default.nix @@ -1,5 +1,15 @@ {stdenv, fetchurl, libftdi}: +let + # The "GuruPlug installer" from Marvell. See + # , + # linked from . + guruplug_installer = fetchurl { + url = "http://www.plugcomputer.org/index.php/us/resources/downloads?func=download&id=65&chk=d6878f4bf86070f7b4f7bc93317fcb0f&no_html=1"; + sha256 = "1nps9li9k1kxb31f9x6d114hh0a3bx886abvgh8vg004ni996hlv"; + name = "guruplug-installer.tar.gz"; + }; +in stdenv.mkDerivation { name = "openocd-0.4.0"; @@ -8,15 +18,37 @@ stdenv.mkDerivation { sha256 = "1c9j8s3mqgw5spv6nd4lqfkd1l9jmjipi0ya054vnjfsy2617kzv"; }; - configureFlags = [ "--enable-ft2232_libftdi" "--disable-werror" ]; buildInputs = [ libftdi ]; + # Copy the GuruPlug stuff. + # XXX: Unfortunately, these files were written for OpenOCD 0.2.0 and don't + # work with 0.4.0. + # postInstall = + # '' tar xf "${guruplug_installer}" + # for dir in interface target board + # do + # cp -v "guruplug-installer/openocd/$dir/"* \ + # "$out/share/openocd/scripts/$dir/" + # done + # ''; + meta = { homepage = http://openocd.berlios.de; - description = "Open On Chip Debugger"; - license = "GPLv2"; + description = "OpenOCD, an on-chip debugger"; + + longDescription = + '' OpenOCD provides on-chip programming and debugging support with a + layered architecture of JTAG interface and TAP support, debug target + support (e.g. ARM, MIPS), and flash chip drivers (e.g. CFI, NAND, + etc.). Several network interfaces are available for interactiving + with OpenOCD: HTTP, telnet, TCL, and GDB. The GDB server enables + OpenOCD to function as a "remote target" for source-level debugging + of embedded systems using the GNU GDB program. + ''; + + license = "GPLv2+"; maintainers = with stdenv.lib.maintainers; [viric]; platforms = with stdenv.lib.platforms; linux; }; From bcba3664d9b57bb15cc27928236e445b0b83846e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= Date: Mon, 4 Oct 2010 22:23:57 +0000 Subject: [PATCH 15/72] Add U-Boot for the GuruPlug. svn path=/nixpkgs/trunk/; revision=24060 --- pkgs/misc/uboot/guruplug-file-systems.patch | 34 ++++++ .../uboot/guruplug-usb-msd-multi-lun.patch | 106 ++++++++++++++++++ pkgs/misc/uboot/guruplug.nix | 54 +++++++++ pkgs/top-level/all-packages.nix | 2 + 4 files changed, 196 insertions(+) create mode 100644 pkgs/misc/uboot/guruplug-file-systems.patch create mode 100644 pkgs/misc/uboot/guruplug-usb-msd-multi-lun.patch create mode 100644 pkgs/misc/uboot/guruplug.nix diff --git a/pkgs/misc/uboot/guruplug-file-systems.patch b/pkgs/misc/uboot/guruplug-file-systems.patch new file mode 100644 index 00000000000..76734456c2f --- /dev/null +++ b/pkgs/misc/uboot/guruplug-file-systems.patch @@ -0,0 +1,34 @@ +Add support for the various file systems as found in `sheevaplug.h'. +In addition, increase the malloc area size to allow compilation of UbiFS. + +--- u-boot/include/configs/guruplug.h 1970-01-01 01:00:01.000000000 +0100 ++++ u-boot/include/configs/guruplug.h 2010-09-29 18:59:52.000000000 +0200 +@@ -145,7 +145,7 @@ + /* + * Size of malloc() pool + */ +-#define CONFIG_SYS_MALLOC_LEN (1024 * 128) /* 128kB for malloc() */ ++#define CONFIG_SYS_MALLOC_LEN (1024 * 1024) /* 1 MiB for malloc() */ + /* size in bytes reserved for initial data */ + #define CONFIG_SYS_GBL_DATA_SIZE 128 + +@@ -195,4 +195,18 @@ + + #define CONFIG_SYS_ALT_MEMTEST + ++/* ++ * File system ++ */ ++#define CONFIG_CMD_EXT2 ++#define CONFIG_CMD_FAT ++#define CONFIG_CMD_JFFS2 ++#define CONFIG_CMD_UBI ++#define CONFIG_CMD_UBIFS ++#define CONFIG_RBTREE ++#define CONFIG_MTD_DEVICE /* needed for mtdparts commands */ ++#define CONFIG_MTD_PARTITIONS ++#define CONFIG_CMD_MTDPARTS ++#define CONFIG_LZO ++ + #endif /* _CONFIG_GURUPLUG_H */ + diff --git a/pkgs/misc/uboot/guruplug-usb-msd-multi-lun.patch b/pkgs/misc/uboot/guruplug-usb-msd-multi-lun.patch new file mode 100644 index 00000000000..4f32dd89031 --- /dev/null +++ b/pkgs/misc/uboot/guruplug-usb-msd-multi-lun.patch @@ -0,0 +1,106 @@ +The GuruPlug's microSD card reader is a USB mass storage device that +has two logical units (LUNs), i.e., two "SCSI disks". This patch +adds multi-LUN support to the USB MSD driver. + +See the thread at . + +--- u-boot/common/usb_storage.c 1970-01-01 01:00:01.000000000 +0100 ++++ u-boot/common/usb_storage.c 2010-10-02 00:38:15.000000000 +0200 +@@ -204,6 +204,22 @@ int usb_stor_info(void) + return 1; + } + ++static unsigned int usb_get_max_lun(struct us_data *us) ++{ ++ int len; ++ unsigned char result; ++ len = usb_control_msg(us->pusb_dev, ++ usb_rcvctrlpipe(us->pusb_dev, 0), ++ US_BBB_GET_MAX_LUN, ++ USB_TYPE_CLASS | USB_RECIP_INTERFACE | USB_DIR_IN, ++ 0, us->ifnum, ++ &result, sizeof(result), ++ USB_CNTL_TIMEOUT * 5); ++ USB_STOR_PRINTF("Get Max LUN -> len = %i, result = %i\n", ++ len, (int) result); ++ return (len > 0) ? result : 0; ++} ++ + /******************************************************************************* + * scan the usb and reports device info + * to the user if mode = 1 +@@ -241,13 +257,21 @@ int usb_stor_scan(int mode) + break; /* no more devices avaiable */ + + if (usb_storage_probe(dev, 0, &usb_stor[usb_max_devs])) { +- /* ok, it is a storage devices +- * get info and fill it in +- */ +- if (usb_stor_get_info(dev, &usb_stor[usb_max_devs], +- &usb_dev_desc[usb_max_devs]) == 1) ++ /* OK, it's a storage device. Iterate over its LUNs ++ * and populate `usb_dev_desc'. */ ++ int lun, max_lun, start = usb_max_devs; ++ ++ max_lun = usb_get_max_lun(&usb_stor[usb_max_devs]); ++ for (lun = 0; ++ lun <= max_lun && usb_max_devs < USB_MAX_STOR_DEV; ++ lun++) { ++ usb_dev_desc[usb_max_devs].lun = lun; ++ if (usb_stor_get_info(dev, &usb_stor[start], ++ &usb_dev_desc[usb_max_devs]) == 1) { + usb_max_devs++; + } ++ } ++ } + /* if storage device */ + if (usb_max_devs == USB_MAX_STOR_DEV) { + printf("max USB Storage Device reached: %d stopping\n", +@@ -882,6 +906,7 @@ static int usb_inquiry(ccb *srb, struct + do { + memset(&srb->cmd[0], 0, 12); + srb->cmd[0] = SCSI_INQUIRY; ++ srb->cmd[1] = srb->lun << 5; + srb->cmd[4] = 36; + srb->datalen = 36; + srb->cmdlen = 12; +@@ -905,6 +930,7 @@ static int usb_request_sense(ccb *srb, s + ptr = (char *)srb->pdata; + memset(&srb->cmd[0], 0, 12); + srb->cmd[0] = SCSI_REQ_SENSE; ++ srb->cmd[1] = srb->lun << 5; + srb->cmd[4] = 18; + srb->datalen = 18; + srb->pdata = &srb->sense_buf[0]; +@@ -924,6 +950,7 @@ static int usb_test_unit_ready(ccb *srb, + do { + memset(&srb->cmd[0], 0, 12); + srb->cmd[0] = SCSI_TST_U_RDY; ++ srb->cmd[1] = srb->lun << 5; + srb->datalen = 0; + srb->cmdlen = 12; + if (ss->transport(srb, ss) == USB_STOR_TRANSPORT_GOOD) +@@ -943,6 +970,7 @@ static int usb_read_capacity(ccb *srb, s + do { + memset(&srb->cmd[0], 0, 12); + srb->cmd[0] = SCSI_RD_CAPAC; ++ srb->cmd[1] = srb->lun << 5; + srb->datalen = 8; + srb->cmdlen = 12; + if (ss->transport(srb, ss) == USB_STOR_TRANSPORT_GOOD) +@@ -957,6 +985,7 @@ static int usb_read_10(ccb *srb, struct + { + memset(&srb->cmd[0], 0, 12); + srb->cmd[0] = SCSI_READ10; ++ srb->cmd[1] = srb->lun << 5; + srb->cmd[2] = ((unsigned char) (start >> 24)) & 0xff; + srb->cmd[3] = ((unsigned char) (start >> 16)) & 0xff; + srb->cmd[4] = ((unsigned char) (start >> 8)) & 0xff; +@@ -973,6 +1002,7 @@ static int usb_write_10(ccb *srb, struct + { + memset(&srb->cmd[0], 0, 12); + srb->cmd[0] = SCSI_WRITE10; ++ srb->cmd[1] = srb->lun << 5; + srb->cmd[2] = ((unsigned char) (start >> 24)) & 0xff; + srb->cmd[3] = ((unsigned char) (start >> 16)) & 0xff; + srb->cmd[4] = ((unsigned char) (start >> 8)) & 0xff; diff --git a/pkgs/misc/uboot/guruplug.nix b/pkgs/misc/uboot/guruplug.nix new file mode 100644 index 00000000000..f8048bbe0f4 --- /dev/null +++ b/pkgs/misc/uboot/guruplug.nix @@ -0,0 +1,54 @@ +{stdenv, fetchgit, unzip}: + +# Marvell's branch of U-Boot for the GuruPlug. + +let + # Aug 2010 revision of the `testing' branch of Marvell's U-Boot repository. + # See + # + # for details. + rev = "f106056095049c2c748c2a2797e5353295240e04"; +in +stdenv.mkDerivation { + name = "uboot-guruplug-0.0pre${rev}"; + + src = fetchgit { + url = "git://git.denx.de/u-boot-marvell.git"; + sha256 = "18gwyj16vml7aja9cyan51jwfcysy4cs062z7wmgdc0l9bha6iw7"; + inherit rev; + }; + + patches = + [ ./guruplug-file-systems.patch ./guruplug-usb-msd-multi-lun.patch ]; + + enableParallelBuilding = true; + + # Remove the cross compiler prefix. + configurePhase = '' + make mrproper + make guruplug_config + sed -i /CROSS_COMPILE/d include/config.mk + ''; + + buildPhase = '' + unset src + if test -z "$crossConfig"; then + make all u-boot.kwb + else + make all u-boot.kwb ARCH=arm CROSS_COMPILE=$crossConfig- + fi + ''; + + buildNativeInputs = [ unzip ]; + + dontStrip = true; + NIX_STRIP_DEBUG = false; + + installPhase = '' + ensureDir $out + cp -v u-boot u-boot.{kwb,map} $out + + ensureDir $out/bin + cp tools/{envcrc,mkimage} $out/bin + ''; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 0d0d0e40313..4afc63e85bb 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -4938,6 +4938,8 @@ let ubootSheevaplug = callPackage ../misc/uboot/sheevaplug.nix { }; + ubootGuruplug = callPackage ../misc/uboot/guruplug.nix { }; + uclibc = callPackage ../os-specific/linux/uclibc { }; uclibcCross = import ../os-specific/linux/uclibc { From b801c21d1f49163a357c4949d0978b7c0b64b96c Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Mon, 4 Oct 2010 23:25:03 +0000 Subject: [PATCH 16/72] * Build Xen's stubdoms, in particular pv-grub (needed to securely boot from a kernel/initrd stored on a guest filesystem). svn path=/nixpkgs/trunk/; revision=24062 --- .../virtualization/xen/default.nix | 42 +++++++++++++++++-- 1 file changed, 38 insertions(+), 4 deletions(-) diff --git a/pkgs/applications/virtualization/xen/default.nix b/pkgs/applications/virtualization/xen/default.nix index 0a0bf9d431d..314ce974a6c 100644 --- a/pkgs/applications/virtualization/xen/default.nix +++ b/pkgs/applications/virtualization/xen/default.nix @@ -1,8 +1,34 @@ { stdenv, fetchurl, which, zlib, pkgconfig, SDL, openssl, python , libuuid, gettext, ncurses, dev86, iasl, pciutils, bzip2, xz -, lvm2, utillinux, procps }: +, lvm2, utillinux, procps, texinfo }: -let version = "4.0.1"; in +with stdenv.lib; + +let + + version = "4.0.1"; + + # Sources needed to build the stubdoms. + + stubdomSrcs = + [ { url = http://xenbits.xensource.com/xen-extfiles/lwip-1.3.0.tar.gz; + sha256 = "13wlr85s1hnvia6a698qpryyy12lvmqw0a05xmjnd0h71ralsbkp"; + } + { url = http://xenbits.xensource.com/xen-extfiles/zlib-1.2.3.tar.gz; + sha256 = "0pmh8kifb6sfkqfxc23wqp3f2wzk69sl80yz7w8p8cd4cz8cg58p"; + } + { url = http://xenbits.xensource.com/xen-extfiles/newlib-1.16.0.tar.gz; + sha256 = "01rxk9js833mwadq92jx0flvk9jyjrnwrq93j39c2j2wjsa66hnv"; + } + { url = http://xenbits.xensource.com/xen-extfiles/grub-0.97.tar.gz; + sha256 = "02r6b52r0nsp6ryqfiqchnl7r1d9smm80sqx24494gmx5p8ia7af"; + } + { url = http://xenbits.xensource.com/xen-extfiles/pciutils-2.2.9.tar.bz2; + sha256 = "092v4q478i1gc7f3s2wz6p4xlf1wb4gs5shbkn21vnnmzcffc2pn"; + } + ]; + +in stdenv.mkDerivation { name = "xen-${version}"; @@ -20,12 +46,12 @@ stdenv.mkDerivation { buildInputs = [ which zlib pkgconfig SDL openssl python libuuid gettext ncurses - dev86 iasl pciutils bzip2 xz + dev86 iasl pciutils bzip2 xz texinfo ]; makeFlags = "PREFIX=$(out) CONFIG_DIR=/etc"; - buildFlags = "xen tools"; + buildFlags = "xen tools stubdom"; preBuild = '' @@ -55,6 +81,12 @@ stdenv.mkDerivation { substituteInPlace tools/python/xen/xend/XendQCoWStorageRepo.py \ --replace /usr/sbin/qcow-create $out/sbin/qcow-create + + # Xen's stubdoms need various sources that it usually fetches at + # build time using wget. We can't have that. + ${flip concatMapStrings stubdomSrcs (x: let src = fetchurl x; in '' + cp ${src} stubdom/${src.name} + '')} ''; installPhase = @@ -80,5 +112,7 @@ stdenv.mkDerivation { meta = { homepage = http://www.xen.org/; description = "Xen hypervisor and management tools for Dom0"; + platforms = [ "i686-linux" "x86_64-linux" ]; + maintainers = [ stdenv.lib.maintainers.eelco ]; }; } From 67b5d732a20562627cfe7eae4b031b3dd08eaf75 Mon Sep 17 00:00:00 2001 From: "Yury G. Kudryashov" Date: Tue, 5 Oct 2010 05:43:39 +0000 Subject: [PATCH 17/72] Move kdevplatform and kdevelop to all-packages.nix svn path=/nixpkgs/trunk/; revision=24063 --- .../editors}/kdevelop/default.nix | 8 +++++--- pkgs/desktops/kde-4.4/default.nix | 14 ++------------ .../libraries}/kdevplatform/default.nix | 6 +++--- pkgs/top-level/all-packages.nix | 4 ++++ 4 files changed, 14 insertions(+), 18 deletions(-) rename pkgs/{desktops/kde-4.4/extragear => applications/editors}/kdevelop/default.nix (79%) rename pkgs/{desktops/kde-4.4/extragear => development/libraries}/kdevplatform/default.nix (82%) diff --git a/pkgs/desktops/kde-4.4/extragear/kdevelop/default.nix b/pkgs/applications/editors/kdevelop/default.nix similarity index 79% rename from pkgs/desktops/kde-4.4/extragear/kdevelop/default.nix rename to pkgs/applications/editors/kdevelop/default.nix index 6e4fcbad25c..1b72f8f0b7f 100644 --- a/pkgs/desktops/kde-4.4/extragear/kdevelop/default.nix +++ b/pkgs/applications/editors/kdevelop/default.nix @@ -2,11 +2,13 @@ kdebase_workspace, gettext, perl }: stdenv.mkDerivation rec { - name = "kdevelop-4.0.0"; + name = "${pname}-${version}"; + version = "4.0.2"; + pname = "kdevelop"; src = fetchurl { - url = "mirror://kde/stable/kdevelop/4.0.0/src/${name}.tar.bz2"; - sha256 = "0cnwhfk71iksip17cjzf3g68n751k8fz2acin6qb27k7sh71pdfp"; + url = "mirror://kde/stable/${pname}/${version}/src/${name}.tar.bz2"; + sha256 = "1y8ydx0fcmsab31qf5id5r5fcmp3j2l8mibvbbjfy66xgxarmnpc"; }; buildInputs = [ kdevplatform cmake pkgconfig automoc4 shared_mime_info diff --git a/pkgs/desktops/kde-4.4/default.nix b/pkgs/desktops/kde-4.4/default.nix index bbd654f5da2..2c474df78d6 100644 --- a/pkgs/desktops/kde-4.4/default.nix +++ b/pkgs/desktops/kde-4.4/default.nix @@ -235,17 +235,6 @@ pkgs.recurseIntoAttrs (rec { inherit automoc4 phonon; }; - kdevelop = import ./extragear/kdevelop { - inherit (pkgs) stdenv fetchurl cmake pkgconfig shared_mime_info gettext perl; - inherit kdevplatform automoc4 kdebase_workspace; - }; - - kdevplatform = import ./extragear/kdevplatform { - inherit (pkgs) stdenv fetchurl cmake subversion qt4 perl gettext pkgconfig - apr aprutil boost; - inherit kdelibs automoc4 phonon; - }; - kdesvn = import ./extragear/kdesvn { inherit (pkgs) stdenv fetchurl lib cmake qt4 perl gettext apr aprutil subversion db4; inherit kdelibs; @@ -277,7 +266,8 @@ pkgs.recurseIntoAttrs (rec { inherit automoc4 phonon; }; - inherit (pkgs) konversation yakuake ktorrent koffice amarok; + inherit (pkgs) konversation yakuake ktorrent koffice amarok kdevplatform + kdevelop; gtk_qt_engine = import ./extragear/gtk-qt-engine { inherit (pkgs) stdenv fetchurl cmake qt4 perl gettext; diff --git a/pkgs/desktops/kde-4.4/extragear/kdevplatform/default.nix b/pkgs/development/libraries/kdevplatform/default.nix similarity index 82% rename from pkgs/desktops/kde-4.4/extragear/kdevplatform/default.nix rename to pkgs/development/libraries/kdevplatform/default.nix index 7be3c89319e..be0e9a44ae8 100644 --- a/pkgs/desktops/kde-4.4/extragear/kdevplatform/default.nix +++ b/pkgs/development/libraries/kdevplatform/default.nix @@ -2,11 +2,11 @@ gettext, pkgconfig, apr, aprutil, boost }: stdenv.mkDerivation rec { - name = "kdevplatform-1.0.0"; + name = "kdevplatform-1.0.2"; src = fetchurl { - url = "mirror://kde/stable/kdevelop/4.0.0/src/${name}.tar.bz2"; - sha256 = "05qgi5hwvzqzysihd5nrn28kiz0l6rp9dbxlf25jcjs5dml3dza6"; + url = "mirror://kde/stable/kdevelop/4.0.2/src/${name}.tar.bz2"; + sha256 = "0yn4v3jx1dks84nvi7s40a1pmnvipqx5hlbvbmdgqhhpqik5y9qg"; }; propagatedBuildInputs = [ kdelibs subversion qt4 phonon ]; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 4afc63e85bb..98411d086df 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -3118,6 +3118,8 @@ let judy = callPackage ../development/libraries/judy { }; + kdevplatform = newScope pkgs.kde4 ../development/libraries/kdevplatform { }; + krb5 = callPackage ../development/libraries/kerberos/krb5.nix { }; lablgtk = callPackage ../development/libraries/lablgtk { @@ -5797,6 +5799,8 @@ let kbluetooth = newScope pkgs.kde4 ../tools/bluetooth/kbluetooth { }; + kdevelop = newScope pkgs.kde4 ../applications/editors/kdevelop { }; + kermit = callPackage ../tools/misc/kermit { }; kino = import ../applications/video/kino { From 1099a83b547f3418e552df7be431560bf91d24e7 Mon Sep 17 00:00:00 2001 From: "Yury G. Kudryashov" Date: Tue, 5 Oct 2010 05:43:59 +0000 Subject: [PATCH 18/72] Make kadu build in chroot. TODO: re-enable icons svn path=/nixpkgs/trunk/; revision=24064 --- .../instant-messengers/kadu/default.nix | 17 ++++++----------- pkgs/top-level/all-packages.nix | 6 +----- 2 files changed, 7 insertions(+), 16 deletions(-) diff --git a/pkgs/applications/networking/instant-messengers/kadu/default.nix b/pkgs/applications/networking/instant-messengers/kadu/default.nix index a9b5e0d7a86..c35d71fbca0 100644 --- a/pkgs/applications/networking/instant-messengers/kadu/default.nix +++ b/pkgs/applications/networking/instant-messengers/kadu/default.nix @@ -1,4 +1,5 @@ -{ stdenv, fetchurl, cmake, qt, libgadu, bash, libXScrnSaver, libsndfile, qca2, wget, libX11, alsaLib }: +{ stdenv, fetchurl, cmake, qt4, libgadu, libXScrnSaver, libsndfile, qca2 +, libX11, alsaLib }: stdenv.mkDerivation { @@ -10,19 +11,13 @@ stdenv.mkDerivation { }; buildInputs = [ - cmake qt libgadu bash libXScrnSaver libsndfile qca2 wget libX11 alsaLib + cmake qt4 libgadu libXScrnSaver libsndfile qca2 libX11 alsaLib ]; - cmakeFlags = "-Wno-dev"; + cmakeFlags = "-DENABLE_AUTODOWNLOAD=OFF"; - NIX_LDFLAGS="-lX11"; - - patches = [ ./more-icons.patch ]; - - patchPhase = '' - unset patchPhase; patchPhase - sed 's=/bin/bash=/${stdenv.shell}=g' -i \ - `find -type f -name '*.sh' -or -name 'autodownload'` + prePatch = '' + patchShebangs . ''; meta = { diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 98411d086df..6172838474a 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -5789,12 +5789,8 @@ let jwm = callPackage ../applications/window-managers/jwm { }; - kadu = callPackage ../applications/networking/instant-messengers/kadu { + kadu = newScope pkgs.kde45 ../applications/networking/instant-messengers/kadu { stdenv = stdenv2; - qt = qt4; - inherit fetchurl cmake libgadu bash libsndfile wget alsaLib; - inherit (xlibs) libXScrnSaver libX11; - inherit (kde45) qca2; }; kbluetooth = newScope pkgs.kde4 ../tools/bluetooth/kbluetooth { }; From 80607fd2851869c98955aa39b3521cb587acee69 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Tue, 5 Oct 2010 10:38:25 +0000 Subject: [PATCH 19/72] * Linux 2.6.32.24, which fixes booting on Xen. svn path=/nixpkgs/trunk/; revision=24065 --- pkgs/os-specific/linux/kernel/linux-2.6.32.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/linux-2.6.32.nix b/pkgs/os-specific/linux/kernel/linux-2.6.32.nix index e80a74b0f88..8924ffe1d59 100644 --- a/pkgs/os-specific/linux/kernel/linux-2.6.32.nix +++ b/pkgs/os-specific/linux/kernel/linux-2.6.32.nix @@ -198,11 +198,11 @@ in import ./generic.nix ( rec { - version = "2.6.32.23"; + version = "2.6.32.24"; src = fetchurl { url = "mirror://kernel/linux/kernel/v2.6/linux-${version}.tar.bz2"; - sha256 = "0xhxcdrxd6v21zjwf16m1bc0zrpy1scgxdp7xby2yhg63abh97nr"; + sha256 = "0girs793499ig4p4rp1pi3fdigbdv4h2slavxs8jlj9kxd2x19y7"; }; config = configWithPlatform stdenv.platform; From 0bd5f00696dead2c976be4b180e9dc3dd2ea14e4 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Tue, 5 Oct 2010 10:39:12 +0000 Subject: [PATCH 20/72] * Updated Tomcat to 5.0.27. svn path=/nixpkgs/trunk/; revision=24066 --- .../http/tomcat/{default.nix => 5.0.nix} | 0 pkgs/servers/http/tomcat/6.0.nix | 24 ++++++++++++------- pkgs/servers/http/tomcat/builder-6.0.sh | 6 ----- pkgs/top-level/all-packages.nix | 2 +- 4 files changed, 17 insertions(+), 15 deletions(-) rename pkgs/servers/http/tomcat/{default.nix => 5.0.nix} (100%) delete mode 100644 pkgs/servers/http/tomcat/builder-6.0.sh diff --git a/pkgs/servers/http/tomcat/default.nix b/pkgs/servers/http/tomcat/5.0.nix similarity index 100% rename from pkgs/servers/http/tomcat/default.nix rename to pkgs/servers/http/tomcat/5.0.nix diff --git a/pkgs/servers/http/tomcat/6.0.nix b/pkgs/servers/http/tomcat/6.0.nix index 256612f94fc..317634d9ab4 100644 --- a/pkgs/servers/http/tomcat/6.0.nix +++ b/pkgs/servers/http/tomcat/6.0.nix @@ -1,15 +1,23 @@ -{stdenv, fetchurl, jdk}: +{ stdenv, fetchurl }: -stdenv.mkDerivation { +let version = "6.0.29"; in - name = "apache-tomcat-6.0.26"; - - builder = ./builder-6.0.sh; +stdenv.mkDerivation rec { + name = "apache-tomcat-${version}"; src = fetchurl { - url = http://apache.proserve.nl/tomcat/tomcat-6/v6.0.26/bin/apache-tomcat-6.0.26.tar.gz; - sha256 = "0rxaz7wkw6xas9f2jslb6kp1prllhpqmq7c3h0ig19j146mrjbls"; + url = "mirror://apache/tomcat/tomcat-6/v${version}/bin/${name}.tar.gz"; + sha256 = "0v96wmd4fnk3qskw32k8mb77f7yssqqinsrf9sir672l5ggmmcjc"; }; - inherit jdk; + installPhase = + '' + mkdir $out + mv * $out + ''; + + meta = { + homepage = http://tomcat.apache.org/; + description = "An implementation of the Java Servlet and JavaServer Pages technologies"; + }; } diff --git a/pkgs/servers/http/tomcat/builder-6.0.sh b/pkgs/servers/http/tomcat/builder-6.0.sh deleted file mode 100644 index bcb56ee61d8..00000000000 --- a/pkgs/servers/http/tomcat/builder-6.0.sh +++ /dev/null @@ -1,6 +0,0 @@ -source $stdenv/setup - -tar zxf $src - -mkdir $out -mv apache-tomcat-*/* $out diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 6172838474a..cbaffc631a5 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -4241,7 +4241,7 @@ let }); squid = squids.squid3Beta; # has ipv6 support - tomcat5 = callPackage ../servers/http/tomcat { }; + tomcat5 = callPackage ../servers/http/tomcat/5.0.nix { }; tomcat6 = callPackage ../servers/http/tomcat/6.0.nix { }; From 00dd2f39ed98aa2690e136182b3bb782b703882a Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Tue, 5 Oct 2010 13:12:49 +0000 Subject: [PATCH 21/72] pkgs/development/libraries/pcre: updated the meta section and enabled hydra builds of this package svn path=/nixpkgs/trunk/; revision=24069 --- pkgs/development/libraries/pcre/default.nix | 18 +++++++++++++++--- 1 file changed, 15 insertions(+), 3 deletions(-) diff --git a/pkgs/development/libraries/pcre/default.nix b/pkgs/development/libraries/pcre/default.nix index 3d3385c83f8..fba3844bf8e 100644 --- a/pkgs/development/libraries/pcre/default.nix +++ b/pkgs/development/libraries/pcre/default.nix @@ -2,19 +2,31 @@ stdenv.mkDerivation { name = "pcre-7.8"; - + src = fetchurl { url = mirror://sourceforge/pcre/pcre-7.8.tar.bz2; sha256 = "1zsqk352mx2zklf9bgpg9d88ckfdssbbbiyslhrycfckw8m3qpvr"; }; - + configureFlags = '' ${if unicodeSupport then "--enable-unicode-properties" else ""} ${if !cplusplusSupport then "--disable-cpp" else ""} ''; meta = { - homepage = http://www.pcre.org/; + homepage = "http://www.pcre.org/"; description = "A library for Perl Compatible Regular Expressions"; + license = "BSD-3"; + + longDescription = '' + The PCRE library is a set of functions that implement regular + expression pattern matching using the same syntax and semantics as + Perl 5. PCRE has its own native API, as well as a set of wrapper + functions that correspond to the POSIX regular expression API. The + PCRE library is free, even for building proprietary software. + ''; + + platforms = stdenv.lib.platforms.all; + maintainers = [ stdenv.lib.maintainers.simons ]; }; } From 5649af8523e2f7ea038fce35fdacf69868a7cc86 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Tue, 5 Oct 2010 13:45:53 +0000 Subject: [PATCH 22/72] pkgs/development/libraries/pcre: fixed build on Darwin The gcc version used on Darwin fails to compile the C++ interface to the PCRE library when optimizations are enabled. Building C++ code with -O0 remedies the problem. This is unsatisfactory, though, because the resulting library is likely to perform more poorly than it would if built with -O2 or -O3. svn path=/nixpkgs/trunk/; revision=24072 --- pkgs/development/libraries/pcre/default.nix | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/pkgs/development/libraries/pcre/default.nix b/pkgs/development/libraries/pcre/default.nix index fba3844bf8e..c831f004c12 100644 --- a/pkgs/development/libraries/pcre/default.nix +++ b/pkgs/development/libraries/pcre/default.nix @@ -8,7 +8,12 @@ stdenv.mkDerivation { sha256 = "1zsqk352mx2zklf9bgpg9d88ckfdssbbbiyslhrycfckw8m3qpvr"; }; + # The compiler on Darwin crashes with an internal error while building the + # C++ interface. Disabling optimizations on that platform remedies the + # problem. In case we ever update the Darwin GCC version, the exception for + # that platform ought to be removed. configureFlags = '' + CPPFLAGS=-NDEBUG CFLAGS=-O3 CXXFLAGS=${if stdenv.isDarwin then "-O0" else "-O3"} ${if unicodeSupport then "--enable-unicode-properties" else ""} ${if !cplusplusSupport then "--disable-cpp" else ""} ''; From e3d3ee1af374fe9fe801475f7a285d4b2967ef4e Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Tue, 5 Oct 2010 13:45:57 +0000 Subject: [PATCH 23/72] pkgs/development/interpreters/maude: don't run the test suite on Darwin; it's known to fail svn path=/nixpkgs/trunk/; revision=24073 --- pkgs/development/interpreters/maude/default.nix | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/pkgs/development/interpreters/maude/default.nix b/pkgs/development/interpreters/maude/default.nix index c9330a50670..594ee980bbd 100644 --- a/pkgs/development/interpreters/maude/default.nix +++ b/pkgs/development/interpreters/maude/default.nix @@ -17,7 +17,9 @@ stdenv.mkDerivation rec { configurePhase = ''./configure --disable-dependency-tracking --prefix=$out --datadir=$out/share/maude TECLA_LIBS="-ltecla -lncursesw" CFLAGS="-O3" CXXFLAGS="-O3"''; - doCheck = true; + # The test suite is known to fail on Darwin. If maude is ever updated to a + # new version, this exception ought to be removed again. + doCheck = !stdenv.isDarwin; postInstall = '' From dd6e852f3e1afcaf44c456163b1f8cb7ff496d80 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Tue, 5 Oct 2010 13:48:37 +0000 Subject: [PATCH 24/72] pkgs/development/libraries/pcre: enable regression test suite svn path=/nixpkgs/trunk/; revision=24074 --- pkgs/development/libraries/pcre/default.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/development/libraries/pcre/default.nix b/pkgs/development/libraries/pcre/default.nix index c831f004c12..b30cdb023e2 100644 --- a/pkgs/development/libraries/pcre/default.nix +++ b/pkgs/development/libraries/pcre/default.nix @@ -18,6 +18,8 @@ stdenv.mkDerivation { ${if !cplusplusSupport then "--disable-cpp" else ""} ''; + doCheck = true; + meta = { homepage = "http://www.pcre.org/"; description = "A library for Perl Compatible Regular Expressions"; From d845bf6b8cc21fe67642c1db5cbe59ea835ead0f Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Tue, 5 Oct 2010 13:49:54 +0000 Subject: [PATCH 25/72] * Revert last two commits, they should be in the stdenv-branch. svn path=/nixpkgs/trunk/; revision=24075 --- pkgs/development/libraries/pcre/default.nix | 7 ------- 1 file changed, 7 deletions(-) diff --git a/pkgs/development/libraries/pcre/default.nix b/pkgs/development/libraries/pcre/default.nix index b30cdb023e2..fba3844bf8e 100644 --- a/pkgs/development/libraries/pcre/default.nix +++ b/pkgs/development/libraries/pcre/default.nix @@ -8,18 +8,11 @@ stdenv.mkDerivation { sha256 = "1zsqk352mx2zklf9bgpg9d88ckfdssbbbiyslhrycfckw8m3qpvr"; }; - # The compiler on Darwin crashes with an internal error while building the - # C++ interface. Disabling optimizations on that platform remedies the - # problem. In case we ever update the Darwin GCC version, the exception for - # that platform ought to be removed. configureFlags = '' - CPPFLAGS=-NDEBUG CFLAGS=-O3 CXXFLAGS=${if stdenv.isDarwin then "-O0" else "-O3"} ${if unicodeSupport then "--enable-unicode-properties" else ""} ${if !cplusplusSupport then "--disable-cpp" else ""} ''; - doCheck = true; - meta = { homepage = "http://www.pcre.org/"; description = "A library for Perl Compatible Regular Expressions"; From a6db62e721bd1d87fb176ba534bcf2e6fde6a816 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Tue, 5 Oct 2010 15:15:49 +0000 Subject: [PATCH 26/72] * Avahi 0.6.28, which fixes avahi-browse. svn path=/nixpkgs/trunk/; revision=24080 --- pkgs/development/libraries/avahi/default.nix | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/avahi/default.nix b/pkgs/development/libraries/avahi/default.nix index b4424b445c5..9e72862a5c2 100644 --- a/pkgs/development/libraries/avahi/default.nix +++ b/pkgs/development/libraries/avahi/default.nix @@ -5,10 +5,11 @@ assert qt4Support -> qt4 != null; stdenv.mkDerivation rec { - name = "avahi-0.6.27"; + name = "avahi-0.6.28"; + src = fetchurl { url = "${meta.homepage}/download/${name}.tar.gz"; - sha256 = "112yqh5k4ph5f1fsd98q1035477wmzq5nm2jrkivz5fnn3hgabf2"; + sha256 = "14gw611d3srn2r18a6g4y04r571w3l4lihiiaffryar1i2n0mn50"; }; patches = [ ./no-mkdir-localstatedir.patch ]; From 01955a51a20c627a4173978363d51fcda2ca6b15 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= Date: Tue, 5 Oct 2010 16:00:10 +0000 Subject: [PATCH 27/72] Tidy up Nix expression for Racket. Patch by Karn Kallio . svn path=/nixpkgs/trunk/; revision=24085 --- .../interpreters/racket/default.nix | 26 +++++-------------- 1 file changed, 6 insertions(+), 20 deletions(-) diff --git a/pkgs/development/interpreters/racket/default.nix b/pkgs/development/interpreters/racket/default.nix index 7f11ee7c3df..f9b6c5ab241 100644 --- a/pkgs/development/interpreters/racket/default.nix +++ b/pkgs/development/interpreters/racket/default.nix @@ -1,20 +1,6 @@ -{ stdenv -, fetchurl -, cairo -, coreutils -, file -, libjpeg -, libpng -, libtool -, libXaw -, libXext -, libXft -, libXrender -, libXt -, libXmu -, mesa -, pkgconfig -, which } : +{ stdenv, fetchurl, cairo, file, libjpeg +, libpng, libtool, libXaw, libXext, libXft, libXrender +, libXt, libXmu, mesa, pkgconfig, which } : stdenv.mkDerivation rec { name = "racket"; @@ -27,7 +13,6 @@ stdenv.mkDerivation rec { }; buildInputs = [ cairo - coreutils file libjpeg libpng @@ -64,7 +49,8 @@ stdenv.mkDerivation rec { ''; homepage = http://racket-lang.org/; - license = "LGPL"; - platforms = [ "i686-linux" "x86_64-linux" ]; + license = stdenv.lib.licenses.lgpl2Plus; + maintainers = [ stdenv.lib.maintainers.kkallio ]; + platforms = stdenv.lib.platforms.linux; }; } From 657572abc8b6b36b1de9c0906f3e7f7c1e8cbec0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andres=20L=C3=B6h?= Date: Tue, 5 Oct 2010 17:30:17 +0000 Subject: [PATCH 28/72] Added new (modular) gtk2hs and threadscope. svn path=/nixpkgs/trunk/; revision=24086 --- .../libraries/haskell/cairo/default.nix | 4 ++-- .../libraries/haskell/ghc-events/default.nix | 13 +++++++++++ .../libraries/haskell/glade/default.nix | 14 ++++++++++++ .../libraries/haskell/glib/default.nix | 13 +++++++++++ .../libraries/haskell/gtk/default.nix | 14 ++++++++++++ .../haskell/gtk2hs-buildtools/default.nix | 4 ++-- .../libraries/haskell/pango/default.nix | 14 ++++++++++++ .../tools/haskell/threadscope/default.nix | 14 ++++++++++++ pkgs/top-level/haskell-packages.nix | 22 +++++++++++++++++++ 9 files changed, 108 insertions(+), 4 deletions(-) create mode 100644 pkgs/development/libraries/haskell/ghc-events/default.nix create mode 100644 pkgs/development/libraries/haskell/glade/default.nix create mode 100644 pkgs/development/libraries/haskell/glib/default.nix create mode 100644 pkgs/development/libraries/haskell/gtk/default.nix create mode 100644 pkgs/development/libraries/haskell/pango/default.nix create mode 100644 pkgs/development/tools/haskell/threadscope/default.nix diff --git a/pkgs/development/libraries/haskell/cairo/default.nix b/pkgs/development/libraries/haskell/cairo/default.nix index df4cdf5b464..98fc62c0568 100644 --- a/pkgs/development/libraries/haskell/cairo/default.nix +++ b/pkgs/development/libraries/haskell/cairo/default.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self : { pname = "cairo"; - version = "0.11.0"; - sha256 = "f7971180bbd40c2a19b2e97fe40bd4a296b3aaf3edcf6621009780d723405c5a"; + version = "0.11.1"; + sha256 = "6d7209bcdb92b09437980c51646c324f501edd2893393e48aa185462dfc07b58"; extraBuildInputs = [pkgconfig glibc cairo zlib gtk2hsBuildtools]; propagatedBuildInputs = [mtl]; meta = { diff --git a/pkgs/development/libraries/haskell/ghc-events/default.nix b/pkgs/development/libraries/haskell/ghc-events/default.nix new file mode 100644 index 00000000000..b9d3ee4d13e --- /dev/null +++ b/pkgs/development/libraries/haskell/ghc-events/default.nix @@ -0,0 +1,13 @@ +{cabal, binary, mtl}: + +cabal.mkDerivation (self : { + pname = "ghc-events"; + version = "0.2.0.1"; + sha256 = "18cb82ebe143f58a25bf32ee88118a8bfb333b67a53285c2550e866f2afebbc6"; + propagatedBuildInputs = [binary mtl]; + meta = { + description = "Library and tool for parsing .eventlog files from GHC"; + license = "BSD"; + maintainers = [self.stdenv.lib.maintainers.andres]; + }; +}) diff --git a/pkgs/development/libraries/haskell/glade/default.nix b/pkgs/development/libraries/haskell/glade/default.nix new file mode 100644 index 00000000000..f3152a92483 --- /dev/null +++ b/pkgs/development/libraries/haskell/glade/default.nix @@ -0,0 +1,14 @@ +{cabal, cairo, glib, gtk, mtl, pango, gtk2hsBuildtools, pkgconfig, gnome, glibc}: + +cabal.mkDerivation (self : { + pname = "glade"; + version = "0.11.1"; + sha256 = "0d96a8576f89a81aa1ecdaf172e42e9eb1e7b40ce1b23cff36ab473165832c6a"; + extraBuildInputs = [pkgconfig gtk2hsBuildtools gnome.libglade gnome.gtk glibc]; + propagatedBuildInputs = [cairo glib gtk mtl pango]; + meta = { + description = "Binding to the glade library"; + license = "LGPLv2+"; + maintainers = [self.stdenv.lib.maintainers.andres]; + }; +}) diff --git a/pkgs/development/libraries/haskell/glib/default.nix b/pkgs/development/libraries/haskell/glib/default.nix new file mode 100644 index 00000000000..d56a9abe595 --- /dev/null +++ b/pkgs/development/libraries/haskell/glib/default.nix @@ -0,0 +1,13 @@ +{cabal, gtk2hsBuildtools, pkgconfig, glib, glibc}: + +cabal.mkDerivation (self : { + pname = "glib"; + version = "0.11.2"; + sha256 = "e0fb5f3c22701807db364dff86d55f2a33a57d8a4e58d37a80d367bca50b3dbb"; + extraBuildInputs = [pkgconfig glib glibc gtk2hsBuildtools]; + meta = { + description = "Binding to the GLIB library for Gtk2Hs"; + license = "LGPLv2+"; + maintainers = [self.stdenv.lib.maintainers.andres]; + }; +}) diff --git a/pkgs/development/libraries/haskell/gtk/default.nix b/pkgs/development/libraries/haskell/gtk/default.nix new file mode 100644 index 00000000000..5e940e4e8c5 --- /dev/null +++ b/pkgs/development/libraries/haskell/gtk/default.nix @@ -0,0 +1,14 @@ +{cabal, cairo, glib, mtl, pango, gtk2hsBuildtools, pkgconfig, gtk, glibc}: + +cabal.mkDerivation (self : { + pname = "gtk"; + version = "0.11.2"; + sha256 = "c9de86278780badbd874fb75ef01ca12a70364a9985b75f98957ba940df27aa6"; + extraBuildInputs = [pkgconfig gtk2hsBuildtools gtk glibc]; + propagatedBuildInputs = [cairo glib mtl pango]; + meta = { + description = "Binding to the Gtk+ graphical user interface library"; + license = "LGPLv2+"; + maintainers = [self.stdenv.lib.maintainers.andres]; + }; +}) diff --git a/pkgs/development/libraries/haskell/gtk2hs-buildtools/default.nix b/pkgs/development/libraries/haskell/gtk2hs-buildtools/default.nix index 41a3ac41e54..07fa2fbf9a9 100644 --- a/pkgs/development/libraries/haskell/gtk2hs-buildtools/default.nix +++ b/pkgs/development/libraries/haskell/gtk2hs-buildtools/default.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self : { pname = "gtk2hs-buildtools"; - version = "0.9"; - sha256 = "2586c419394601c1840d827d32cdb9d76bc94d71c03fdfa23c8d04cba99c6b20"; + version = "0.11.2"; + sha256 = "330c52830358966bcff308f58a570e84bb0b4d6004b6f01107d55dd88faa54ad"; extraBuildInputs = [alex happy]; meta = { description = "Tools to build the Gtk2Hs suite of User Interface libraries"; diff --git a/pkgs/development/libraries/haskell/pango/default.nix b/pkgs/development/libraries/haskell/pango/default.nix new file mode 100644 index 00000000000..2a8ba497f3f --- /dev/null +++ b/pkgs/development/libraries/haskell/pango/default.nix @@ -0,0 +1,14 @@ +{cabal, cairo, glib, mtl, gtk2hsBuildtools, pkgconfig, pango, glibc}: + +cabal.mkDerivation (self : { + pname = "pango"; + version = "0.11.2"; + sha256 = "fb7f5dc303d3d49a330aaa3acf29560f78746edb9c67f6191756baa1b08fb504"; + extraBuildInputs = [pkgconfig gtk2hsBuildtools pango glibc]; + propagatedBuildInputs = [cairo glib mtl]; + meta = { + description = "Binding to the Pango text rendering engine"; + license = "LGPLv2+"; + maintainers = [self.stdenv.lib.maintainers.andres]; + }; +}) diff --git a/pkgs/development/tools/haskell/threadscope/default.nix b/pkgs/development/tools/haskell/threadscope/default.nix new file mode 100644 index 00000000000..1d1d5ed25a9 --- /dev/null +++ b/pkgs/development/tools/haskell/threadscope/default.nix @@ -0,0 +1,14 @@ +{cabal, binary, cairo, ghcEvents, glade, gtk, mtl}: + +cabal.mkDerivation (self : { + pname = "threadscope"; + version = "0.1.2"; + sha256 = "ce1116016f6b2d38e6063ba3dd147f38147a9c4399160f37aba9c50c96d00a90"; + propagatedBuildInputs = [binary cairo ghcEvents glade gtk mtl]; + meta = { + description = "A graphical thread profiler"; + license = "BSD"; + maintainers = [self.stdenv.lib.maintainers.andres]; + }; +}) + diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix index f4f84067899..15b41b6f3de 100644 --- a/pkgs/top-level/haskell-packages.nix +++ b/pkgs/top-level/haskell-packages.nix @@ -137,6 +137,8 @@ rec { ghcCore = callPackage ../development/libraries/haskell/ghc-core {}; + ghcEvents = callPackage ../development/libraries/haskell/ghc-events {}; + ghcMtl = callPackage ../development/libraries/haskell/ghc-mtl {}; ghcPaths_0_1_0_6 = callPackage ../development/libraries/haskell/ghc-paths/0.1.0.6.nix {}; @@ -151,6 +153,14 @@ rec { network = network_2_2_1_7; }; + glade = callPackage ../development/libraries/haskell/glade { + inherit (pkgs) pkgconfig gnome glibc; + }; + + glib = callPackage ../development/libraries/haskell/glib { + inherit (pkgs) pkgconfig glib glibc; + }; + GlomeVec = callPackage ../development/libraries/haskell/GlomeVec {}; GLUT2121 = callPackage ../development/libraries/haskell/GLUT/2.1.2.1.nix { @@ -166,6 +176,11 @@ rec { inherit (pkgs.xlibs) libSM libICE libXmu libXi; }; + gtk = callPackage ../development/libraries/haskell/gtk { + inherit (pkgs) pkgconfig glibc; + inherit (pkgs.gtkLibs) gtk; + }; + gtk2hs = callPackage ../development/libraries/haskell/gtk2hs { inherit (pkgs) pkgconfig gnome cairo; }; @@ -417,6 +432,11 @@ rec { random = random_newtime; }; + pango = callPackage ../development/libraries/haskell/pango { + inherit (pkgs) pkgconfig glibc; + inherit (pkgs.gtkLibs) pango; + }; + parallel_2_2_0_1 = callPackage ../development/libraries/haskell/parallel/2.2.0.1.nix {}; parallel = callPackage ../development/libraries/haskell/parallel {}; @@ -732,6 +752,8 @@ rec { tar = callPackage ../development/tools/haskell/tar {}; + threadscope = callPackage ../development/tools/haskell/threadscope {}; + uuagc = callPackage ../development/tools/haskell/uuagc {}; # Applications. From abbd67b2d5c01344a9bbf1c03dcc52c64b4f8163 Mon Sep 17 00:00:00 2001 From: "Yury G. Kudryashov" Date: Tue, 5 Oct 2010 17:43:50 +0000 Subject: [PATCH 29/72] Remove kde44 from release.nix. Will use meta.platforms svn path=/nixpkgs/trunk/; revision=24087 --- pkgs/top-level/release.nix | 16 ---------------- 1 file changed, 16 deletions(-) diff --git a/pkgs/top-level/release.nix b/pkgs/top-level/release.nix index b27f984d28f..8e72c7c60cc 100644 --- a/pkgs/top-level/release.nix +++ b/pkgs/top-level/release.nix @@ -449,22 +449,6 @@ with (import ./release-lib.nix); kile = linux; }; - kde44 = { - krusader = linux; - kmplayer = linux; - ktorrent = linux; - koffice = linux; - konversation = linux; - kdesvn = linux; - amarok = linux; - k3b = linux; - l10n.ca = linux; - l10n.de = linux; - l10n.fr = linux; - l10n.nl = linux; - l10n.ru = linux; - }; - linuxPackages_2_6_27 = { aufs = linux; kernel = linux; From bf340ad55aa151cdf02eddb6ea0114b78c827eb9 Mon Sep 17 00:00:00 2001 From: "Yury G. Kudryashov" Date: Tue, 5 Oct 2010 17:43:57 +0000 Subject: [PATCH 30/72] Move kipi-plugins to apps/graphics svn path=/nixpkgs/trunk/; revision=24088 --- .../graphics/kipi-plugins/default.nix | 24 +++++++++++++++++++ pkgs/desktops/kde-4.4/default.nix | 8 +------ .../extragear/kipi-plugins/default.nix | 22 ----------------- pkgs/top-level/all-packages.nix | 2 ++ 4 files changed, 27 insertions(+), 29 deletions(-) create mode 100644 pkgs/applications/graphics/kipi-plugins/default.nix delete mode 100644 pkgs/desktops/kde-4.4/extragear/kipi-plugins/default.nix diff --git a/pkgs/applications/graphics/kipi-plugins/default.nix b/pkgs/applications/graphics/kipi-plugins/default.nix new file mode 100644 index 00000000000..a656f7026fb --- /dev/null +++ b/pkgs/applications/graphics/kipi-plugins/default.nix @@ -0,0 +1,24 @@ +{ stdenv, fetchurl, cmake, qt4, kdelibs, automoc4, phonon, qimageblitz, qca2, +kdegraphics, kdepimlibs, libxml2, libxslt, gettext, opencv, libgpod}: + +stdenv.mkDerivation rec { + name = "kipi-plugins-1.4.0"; + + src = fetchurl { + url = "mirror://sourceforge/kipi/${name}.tar.bz2"; + sha256 = "1ybxhp4rs6c5xlrs0q765vrx4mvw4k0kq6n42dyk3kxvmcb9iq34"; + }; + + buildInputs = [ cmake qt4 kdelibs kdegraphics automoc4 phonon qimageblitz qca2 kdepimlibs + libxml2 libxslt gettext opencv libgpod ]; + + KDEDIRS = kdegraphics; + + meta = { + description = "Photo Management Program"; + license = "GPL"; + homepage = http://www.kipi-plugins.org; + inherit (kdelibs.meta) platforms; + maintainers = with stdenv.lib.maintainers; [ viric urkud ]; + }; +} diff --git a/pkgs/desktops/kde-4.4/default.nix b/pkgs/desktops/kde-4.4/default.nix index 2c474df78d6..fff00de1942 100644 --- a/pkgs/desktops/kde-4.4/default.nix +++ b/pkgs/desktops/kde-4.4/default.nix @@ -247,12 +247,6 @@ pkgs.recurseIntoAttrs (rec { inherit automoc4 phonon; }; - kipiplugins = import ./extragear/kipi-plugins { - inherit (pkgs) stdenv fetchurl lib cmake qt4 libxml2 libxslt gettext; - inherit kdelibs kdepimlibs kdegraphics; - inherit automoc4 phonon qimageblitz qca2; - }; - kmplayer = import ./extragear/kmplayer { inherit (pkgs) stdenv fetchurl lib cmake qt4 perl gettext dbus_glib; inherit (pkgs.gtkLibs) pango gtk; @@ -267,7 +261,7 @@ pkgs.recurseIntoAttrs (rec { }; inherit (pkgs) konversation yakuake ktorrent koffice amarok kdevplatform - kdevelop; + kdevelop kipi_plugins; gtk_qt_engine = import ./extragear/gtk-qt-engine { inherit (pkgs) stdenv fetchurl cmake qt4 perl gettext; diff --git a/pkgs/desktops/kde-4.4/extragear/kipi-plugins/default.nix b/pkgs/desktops/kde-4.4/extragear/kipi-plugins/default.nix deleted file mode 100644 index 188e9df8874..00000000000 --- a/pkgs/desktops/kde-4.4/extragear/kipi-plugins/default.nix +++ /dev/null @@ -1,22 +0,0 @@ -{ stdenv, fetchurl, lib, cmake, qt4, kdelibs, automoc4, phonon, qimageblitz, qca2, -kdegraphics, kdepimlibs, libxml2, libxslt, gettext}: - -stdenv.mkDerivation rec { - name = "kipi-plugins-1.1.0"; - - src = fetchurl { - url = "mirror://sourceforge/kipi/${name}.tar.bz2"; - sha256 = "0vclb906g2jgzfl9f2qapaxcqq412j01yn7686682xx8iwrxm2cy"; - }; - - buildInputs = [ cmake qt4 kdelibs kdegraphics automoc4 phonon qimageblitz qca2 kdepimlibs - libxml2 libxslt gettext ]; - cmakeFlags = [ "-DGETTEXT_INCLUDE_DIR=${gettext}/include" ]; - meta = { - description = "Photo Management Program"; - license = "GPL"; - homepage = http://www.kipi-plugins.org; - maintainers = [ lib.maintainers.viric ]; - platforms = with lib.platforms; linux; - }; -} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index cbaffc631a5..782f6ae2006 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -5807,6 +5807,8 @@ let inherit (xlibs) libXv libX11; }; + kipi_plugins = newScope pkgs.kde4 ../applications/graphics/kipi-plugins { }; + koffice = newScope pkgs.kde4 ../applications/office/koffice { }; konversation = newScope pkgs.kde4 ../applications/networking/irc/konversation { }; From 739f82a526c76b3bf3922287d6d34001bb244bfb Mon Sep 17 00:00:00 2001 From: "Yury G. Kudryashov" Date: Tue, 5 Oct 2010 17:44:05 +0000 Subject: [PATCH 31/72] Digikam-1.4.0, move to all-packages.nix svn path=/nixpkgs/trunk/; revision=24089 --- .../graphics}/digikam/default.nix | 17 +++++++++-------- pkgs/desktops/kde-4.4/default.nix | 9 +-------- pkgs/top-level/all-packages.nix | 2 ++ 3 files changed, 12 insertions(+), 16 deletions(-) rename pkgs/{desktops/kde-4.4/extragear => applications/graphics}/digikam/default.nix (63%) diff --git a/pkgs/desktops/kde-4.4/extragear/digikam/default.nix b/pkgs/applications/graphics/digikam/default.nix similarity index 63% rename from pkgs/desktops/kde-4.4/extragear/digikam/default.nix rename to pkgs/applications/graphics/digikam/default.nix index 51e7365a854..a126402cadf 100644 --- a/pkgs/desktops/kde-4.4/extragear/digikam/default.nix +++ b/pkgs/applications/graphics/digikam/default.nix @@ -1,23 +1,24 @@ { stdenv, fetchurl, cmake, qt4, kdelibs, automoc4, phonon, qimageblitz, qca2, eigen, kdegraphics, lcms, jasper, libgphoto2, kdepimlibs, gettext, soprano, kdeedu, -liblqr1, lensfun }: +liblqr1, lensfun, pkgconfig }: stdenv.mkDerivation rec { - name = "digikam-1.2.0"; + name = "digikam-1.4.0"; - src = fetchurl { + src = fetchurl { url = "mirror://sourceforge/digikam/${name}.tar.bz2"; - sha256 = "01hjcdm3l5rxz8wb7rvsplysy8hw2b3hcggg9dgk9bskpfskj1ck"; + sha256 = "1fky4jkji9fkhzzvw7wic6xy7vkj9g39hx1xm76qxxq8i2nzlynk"; }; buildInputs = [ cmake qt4 kdelibs kdegraphics automoc4 phonon qimageblitz qca2 eigen - lcms jasper libgphoto2 kdepimlibs gettext soprano kdeedu liblqr1 lensfun ]; - cmakeFlags = [ "-DGETTEXT_INCLUDE_DIR=${gettext}/include" ]; + lcms jasper libgphoto2 kdepimlibs gettext soprano kdeedu liblqr1 lensfun + pkgconfig ]; + meta = { description = "Photo Management Program"; license = "GPL"; homepage = http://www.digikam.org; - maintainers = [ stdenv.lib.maintainers.viric ]; - platforms = stdenv.lib.platforms.linux; + maintainers = with stdenv.lib.maintainers; [ viric urkud ]; + inherit (kdelibs.meta) platforms; }; } diff --git a/pkgs/desktops/kde-4.4/default.nix b/pkgs/desktops/kde-4.4/default.nix index fff00de1942..33b97d5cfb5 100644 --- a/pkgs/desktops/kde-4.4/default.nix +++ b/pkgs/desktops/kde-4.4/default.nix @@ -216,13 +216,6 @@ pkgs.recurseIntoAttrs (rec { #### EXTRA GEAR - digikam = import ./extragear/digikam { - inherit (pkgs) stdenv fetchurl cmake qt4 lcms jasper libgphoto2 gettext - liblqr1 lensfun; - inherit kdelibs kdepimlibs kdegraphics kdeedu; - inherit automoc4 phonon qimageblitz qca2 eigen soprano; - }; - filelight = import ./extragear/filelight { inherit (pkgs) stdenv fetchurl lib cmake qt4 perl; inherit kdelibs kdebase_workspace; @@ -261,7 +254,7 @@ pkgs.recurseIntoAttrs (rec { }; inherit (pkgs) konversation yakuake ktorrent koffice amarok kdevplatform - kdevelop kipi_plugins; + kdevelop kipi_plugins digikam; gtk_qt_engine = import ./extragear/gtk-qt-engine { inherit (pkgs) stdenv fetchurl cmake qt4 perl gettext; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 782f6ae2006..95197816baa 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -5373,6 +5373,8 @@ let dia = callPackage ../applications/graphics/dia { }; + digikam = newScope pkgs.kde4 ../applications/graphics/digikam { }; + djvulibre = callPackage ../applications/misc/djvulibre { }; djview4 = callPackage ../applications/graphics/djview { }; From d7d8f7d64fc0542053ee92d9762f7397699163ce Mon Sep 17 00:00:00 2001 From: "Yury G. Kudryashov" Date: Tue, 5 Oct 2010 17:44:11 +0000 Subject: [PATCH 32/72] Force stdenv2 in kde4 scope svn path=/nixpkgs/trunk/; revision=24090 --- pkgs/desktops/kde-4.4/default.nix | 2 +- pkgs/desktops/kde-4.5/default.nix | 6 ++---- pkgs/top-level/all-packages.nix | 6 ++---- 3 files changed, 5 insertions(+), 9 deletions(-) diff --git a/pkgs/desktops/kde-4.4/default.nix b/pkgs/desktops/kde-4.4/default.nix index 33b97d5cfb5..1f346c99403 100644 --- a/pkgs/desktops/kde-4.4/default.nix +++ b/pkgs/desktops/kde-4.4/default.nix @@ -1,7 +1,7 @@ pkgs: pkgs.recurseIntoAttrs (rec { - inherit (pkgs) qt4; + inherit (pkgs) qt4 stdenv; ### SUPPORT automoc4 = import ./support/automoc4 { diff --git a/pkgs/desktops/kde-4.5/default.nix b/pkgs/desktops/kde-4.5/default.nix index 79d9036e2ad..7ccbc75a0e3 100644 --- a/pkgs/desktops/kde-4.5/default.nix +++ b/pkgs/desktops/kde-4.5/default.nix @@ -3,15 +3,13 @@ { recurseForRelease = true; - inherit callPackage; + inherit callPackage stdenv; qt4 = qt47; phonon = null; - kde = import ./kde-package { - inherit stdenv fetchurl; - }; + kde = callPackage ./kde-package { }; ### SUPPORT akonadi = callPackage ./support/akonadi { }; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 95197816baa..76a2b929205 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -5791,9 +5791,7 @@ let jwm = callPackage ../applications/window-managers/jwm { }; - kadu = newScope pkgs.kde45 ../applications/networking/instant-messengers/kadu { - stdenv = stdenv2; - }; + kadu = newScope pkgs.kde45 ../applications/networking/instant-messengers/kadu { }; kbluetooth = newScope pkgs.kde4 ../tools/bluetooth/kbluetooth { }; @@ -6687,8 +6685,8 @@ let inherit (pkgs.kde45) qt4 kdelibs; }; shared_desktop_ontologies = pkgs.shared_desktop_ontologies.override { v = "0.5"; }; - stdenv = pkgs.stdenv2; } // pkgs.kde45); + stdenv = pkgs.stdenv2; }; xfce = xfce4; From 4591f1fe519e6e49cb9ba5f908c9b80975491b93 Mon Sep 17 00:00:00 2001 From: "Yury G. Kudryashov" Date: Tue, 5 Oct 2010 17:44:17 +0000 Subject: [PATCH 33/72] kipi-plugins: find gdk svn path=/nixpkgs/trunk/; revision=24091 --- .../graphics/kipi-plugins/default.nix | 6 ++++-- .../graphics/kipi-plugins/find-gdk.patch | 16 ++++++++++++++++ 2 files changed, 20 insertions(+), 2 deletions(-) create mode 100644 pkgs/applications/graphics/kipi-plugins/find-gdk.patch diff --git a/pkgs/applications/graphics/kipi-plugins/default.nix b/pkgs/applications/graphics/kipi-plugins/default.nix index a656f7026fb..22174333a4d 100644 --- a/pkgs/applications/graphics/kipi-plugins/default.nix +++ b/pkgs/applications/graphics/kipi-plugins/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, cmake, qt4, kdelibs, automoc4, phonon, qimageblitz, qca2, -kdegraphics, kdepimlibs, libxml2, libxslt, gettext, opencv, libgpod}: +kdegraphics, kdepimlibs, libxml2, libxslt, gettext, opencv, libgpod, gtk }: stdenv.mkDerivation rec { name = "kipi-plugins-1.4.0"; @@ -10,10 +10,12 @@ stdenv.mkDerivation rec { }; buildInputs = [ cmake qt4 kdelibs kdegraphics automoc4 phonon qimageblitz qca2 kdepimlibs - libxml2 libxslt gettext opencv libgpod ]; + libxml2 libxslt gettext opencv libgpod gtk ]; KDEDIRS = kdegraphics; + patches = [ ./find-gdk.patch ]; + meta = { description = "Photo Management Program"; license = "GPL"; diff --git a/pkgs/applications/graphics/kipi-plugins/find-gdk.patch b/pkgs/applications/graphics/kipi-plugins/find-gdk.patch new file mode 100644 index 00000000000..22dcf0323fc --- /dev/null +++ b/pkgs/applications/graphics/kipi-plugins/find-gdk.patch @@ -0,0 +1,16 @@ +diff --git a/cmake/modules/FindGdk.cmake b/cmake/modules/FindGdk.cmake +index 033959a..ff61961 100644 +--- a/cmake/modules/FindGdk.cmake ++++ b/cmake/modules/FindGdk.cmake +@@ -23,8 +23,9 @@ else (GDK_INCLUDE_DIR AND GDK_LIBRARIES) + set(GDK_DEFINITIONS ${_GDKCflags}) + endif(NOT WIN32) + +- FIND_PATH(GDK_INCLUDE_DIR gdk-pixbuf/gdk-pixbuf.h /usr/include/gtk-2.0 +- ${_GDKIncDir} ++ FIND_PATH(GDK_INCLUDE_DIR gdk-pixbuf/gdk-pixbuf.h ++ HINTS ${_GDKIncDir} ++ PATH_SUFFIXES gtk-2.0 + ) + + FIND_LIBRARY(GDK_LIBRARIES NAMES gdk_pixbuf-2.0 From 673e66e3a3afb92d96fa806b7dc2e0cb615d0bd7 Mon Sep 17 00:00:00 2001 From: "Yury G. Kudryashov" Date: Tue, 5 Oct 2010 17:44:33 +0000 Subject: [PATCH 34/72] Move most kde-extragear apps to top-level svn path=/nixpkgs/trunk/; revision=24092 --- .../misc}/filelight/default.nix | 0 .../misc}/krusader/default.nix | 0 .../misc}/krusader/krusader-gcc44.patch | 0 .../browsers}/konq-plugins/default.nix | 0 .../version-management}/kdesvn/builder.sh | 0 .../version-management}/kdesvn/default.nix | 0 .../video}/kdenlive/default.nix | 0 .../video}/kmplayer/builder.sh | 0 .../video}/kmplayer/default.nix | 0 pkgs/desktops/kde-4.4/default.nix | 55 ------------------- .../extragear/gtk-qt-engine/builder.sh | 11 ---- .../extragear/gtk-qt-engine/default.nix | 11 ---- .../text}/kdiff3/default.nix | 0 pkgs/top-level/all-packages.nix | 14 +++++ 14 files changed, 14 insertions(+), 77 deletions(-) rename pkgs/{desktops/kde-4.4/extragear => applications/misc}/filelight/default.nix (100%) rename pkgs/{desktops/kde-4.4/extragear => applications/misc}/krusader/default.nix (100%) rename pkgs/{desktops/kde-4.4/extragear => applications/misc}/krusader/krusader-gcc44.patch (100%) rename pkgs/{desktops/kde-4.4/extragear => applications/networking/browsers}/konq-plugins/default.nix (100%) rename pkgs/{desktops/kde-4.4/extragear => applications/version-management}/kdesvn/builder.sh (100%) rename pkgs/{desktops/kde-4.4/extragear => applications/version-management}/kdesvn/default.nix (100%) rename pkgs/{desktops/kde-4.4/extragear => applications/video}/kdenlive/default.nix (100%) rename pkgs/{desktops/kde-4.4/extragear => applications/video}/kmplayer/builder.sh (100%) rename pkgs/{desktops/kde-4.4/extragear => applications/video}/kmplayer/default.nix (100%) delete mode 100644 pkgs/desktops/kde-4.4/extragear/gtk-qt-engine/builder.sh delete mode 100644 pkgs/desktops/kde-4.4/extragear/gtk-qt-engine/default.nix rename pkgs/{desktops/kde-4.4/extragear => tools/text}/kdiff3/default.nix (100%) diff --git a/pkgs/desktops/kde-4.4/extragear/filelight/default.nix b/pkgs/applications/misc/filelight/default.nix similarity index 100% rename from pkgs/desktops/kde-4.4/extragear/filelight/default.nix rename to pkgs/applications/misc/filelight/default.nix diff --git a/pkgs/desktops/kde-4.4/extragear/krusader/default.nix b/pkgs/applications/misc/krusader/default.nix similarity index 100% rename from pkgs/desktops/kde-4.4/extragear/krusader/default.nix rename to pkgs/applications/misc/krusader/default.nix diff --git a/pkgs/desktops/kde-4.4/extragear/krusader/krusader-gcc44.patch b/pkgs/applications/misc/krusader/krusader-gcc44.patch similarity index 100% rename from pkgs/desktops/kde-4.4/extragear/krusader/krusader-gcc44.patch rename to pkgs/applications/misc/krusader/krusader-gcc44.patch diff --git a/pkgs/desktops/kde-4.4/extragear/konq-plugins/default.nix b/pkgs/applications/networking/browsers/konq-plugins/default.nix similarity index 100% rename from pkgs/desktops/kde-4.4/extragear/konq-plugins/default.nix rename to pkgs/applications/networking/browsers/konq-plugins/default.nix diff --git a/pkgs/desktops/kde-4.4/extragear/kdesvn/builder.sh b/pkgs/applications/version-management/kdesvn/builder.sh similarity index 100% rename from pkgs/desktops/kde-4.4/extragear/kdesvn/builder.sh rename to pkgs/applications/version-management/kdesvn/builder.sh diff --git a/pkgs/desktops/kde-4.4/extragear/kdesvn/default.nix b/pkgs/applications/version-management/kdesvn/default.nix similarity index 100% rename from pkgs/desktops/kde-4.4/extragear/kdesvn/default.nix rename to pkgs/applications/version-management/kdesvn/default.nix diff --git a/pkgs/desktops/kde-4.4/extragear/kdenlive/default.nix b/pkgs/applications/video/kdenlive/default.nix similarity index 100% rename from pkgs/desktops/kde-4.4/extragear/kdenlive/default.nix rename to pkgs/applications/video/kdenlive/default.nix diff --git a/pkgs/desktops/kde-4.4/extragear/kmplayer/builder.sh b/pkgs/applications/video/kmplayer/builder.sh similarity index 100% rename from pkgs/desktops/kde-4.4/extragear/kmplayer/builder.sh rename to pkgs/applications/video/kmplayer/builder.sh diff --git a/pkgs/desktops/kde-4.4/extragear/kmplayer/default.nix b/pkgs/applications/video/kmplayer/default.nix similarity index 100% rename from pkgs/desktops/kde-4.4/extragear/kmplayer/default.nix rename to pkgs/applications/video/kmplayer/default.nix diff --git a/pkgs/desktops/kde-4.4/default.nix b/pkgs/desktops/kde-4.4/default.nix index 1f346c99403..9e64b0b7c5f 100644 --- a/pkgs/desktops/kde-4.4/default.nix +++ b/pkgs/desktops/kde-4.4/default.nix @@ -216,55 +216,6 @@ pkgs.recurseIntoAttrs (rec { #### EXTRA GEAR - filelight = import ./extragear/filelight { - inherit (pkgs) stdenv fetchurl lib cmake qt4 perl; - inherit kdelibs kdebase_workspace; - inherit automoc4 phonon qimageblitz; - }; - - kdenlive = import ./extragear/kdenlive { - inherit (pkgs) stdenv fetchurl lib cmake qt4 perl mlt gettext shared_mime_info; - inherit kdelibs soprano; - inherit automoc4 phonon; - }; - - kdesvn = import ./extragear/kdesvn { - inherit (pkgs) stdenv fetchurl lib cmake qt4 perl gettext apr aprutil subversion db4; - inherit kdelibs; - inherit automoc4 phonon; - }; - - kdiff3 = import ./extragear/kdiff3 { - inherit (pkgs) stdenv fetchurl cmake qt4 gettext perl; - inherit kdelibs kdebase; - inherit automoc4 phonon; - }; - - kmplayer = import ./extragear/kmplayer { - inherit (pkgs) stdenv fetchurl lib cmake qt4 perl gettext dbus_glib; - inherit (pkgs.gtkLibs) pango gtk; - inherit kdelibs; - inherit automoc4 phonon; - }; - - krusader = import ./extragear/krusader { - inherit (pkgs) stdenv fetchurl lib cmake qt4 perl gettext; - inherit kdelibs; - inherit automoc4 phonon; - }; - - inherit (pkgs) konversation yakuake ktorrent koffice amarok kdevplatform - kdevelop kipi_plugins digikam; - - gtk_qt_engine = import ./extragear/gtk-qt-engine { - inherit (pkgs) stdenv fetchurl cmake qt4 perl gettext; - inherit (pkgs.xlibs) libX11; - inherit (pkgs.gtkLibs) gtk; - inherit (pkgs.gnome) libbonoboui; - inherit kdelibs; - inherit automoc4 phonon; - }; - k3b = import ./extragear/k3b { inherit (pkgs) stdenv fetchurl cmake qt4 perl shared_mime_info libvorbis taglib gettext; inherit (pkgs) ffmpeg flac libsamplerate libdvdread lame libsndfile libmad; @@ -272,12 +223,6 @@ pkgs.recurseIntoAttrs (rec { inherit automoc4 phonon; }; - konqPlugins = import ./extragear/konq-plugins { - inherit (pkgs) stdenv fetchurl cmake qt4 gettext; - inherit kdelibs automoc4 phonon kdebase; - }; -### LOCALIZATION - l10n = pkgs.recurseIntoAttrs (import ./l10n { inherit (pkgs) stdenv fetchurl lib cmake qt4 perl gettext; inherit kdelibs; diff --git a/pkgs/desktops/kde-4.4/extragear/gtk-qt-engine/builder.sh b/pkgs/desktops/kde-4.4/extragear/gtk-qt-engine/builder.sh deleted file mode 100644 index 259263ca27b..00000000000 --- a/pkgs/desktops/kde-4.4/extragear/gtk-qt-engine/builder.sh +++ /dev/null @@ -1,11 +0,0 @@ -source $stdenv/setup - -cmakeFlags="-DINSTALL_PATH_GTK_ENGINES=$out/lib/gtk-2.0/2.10.0/engines -DINSTALL_PATH_GTK_THEMES=$out/share/themes -DINSTALL_PATH_KCONTROL_MODULES=$out/lib"; - -myPatchPhase() -{ - sed -i -e "s|\${KDE4_INCLUDE_DIR}|\${KDE4_INCLUDE_DIR} ../build/kcm_gtk|" kcm_gtk/CMakeLists.txt - sed -i -e "s|\*.po|../../\*.po|" po/CMakeLists.txt -} -patchPhase=myPatchPhase -genericBuild diff --git a/pkgs/desktops/kde-4.4/extragear/gtk-qt-engine/default.nix b/pkgs/desktops/kde-4.4/extragear/gtk-qt-engine/default.nix deleted file mode 100644 index 8a572ba39fb..00000000000 --- a/pkgs/desktops/kde-4.4/extragear/gtk-qt-engine/default.nix +++ /dev/null @@ -1,11 +0,0 @@ -{stdenv, fetchurl, cmake, qt4, perl, libX11, gtk, libbonoboui, gettext, kdelibs, automoc4, phonon}: - -stdenv.mkDerivation { - name = "gtk-qt-engine-1.1"; - src = fetchurl { - url = http://gtk-qt-engine.googlecode.com/files/gtk-qt-engine-1.1.tar.bz2; - sha256 = "4310f8f179c5ab70cea614a07b0c3e84234d05388dded85596200fa754c290a6"; - }; - buildInputs = [ cmake qt4 perl libX11 gtk libbonoboui gettext kdelibs automoc4 phonon ]; - builder = ./builder.sh; -} diff --git a/pkgs/desktops/kde-4.4/extragear/kdiff3/default.nix b/pkgs/tools/text/kdiff3/default.nix similarity index 100% rename from pkgs/desktops/kde-4.4/extragear/kdiff3/default.nix rename to pkgs/tools/text/kdiff3/default.nix diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 76a2b929205..125139f95b6 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -777,6 +777,8 @@ let jwhois = callPackage ../tools/networking/jwhois { }; + kdiff3 = newScope pkgs.kde4 ../tools/text/kdiff3 { }; + keychain = callPackage ../tools/misc/keychain { }; kismet = callPackage ../applications/networking/sniffers/kismet { }; @@ -5550,6 +5552,8 @@ let feh = callPackage ../applications/graphics/feh { }; + filelight = newScope pkgs.kde4 ../applications/misc/filelight { }; + firefox = firefox36Pkgs.firefox; firefoxWrapper = firefox36Wrapper; @@ -5795,6 +5799,10 @@ let kbluetooth = newScope pkgs.kde4 ../tools/bluetooth/kbluetooth { }; + kdenlive = newScope pkgs.kde4 ../applications/video/kdenlive { }; + + kdesvn = newScope pkgs.kde4 ../applications/version-management/kdesvn { }; + kdevelop = newScope pkgs.kde4 ../applications/editors/kdevelop { }; kermit = callPackage ../tools/misc/kermit { }; @@ -5809,12 +5817,18 @@ let kipi_plugins = newScope pkgs.kde4 ../applications/graphics/kipi-plugins { }; + kmplayer = newScope pkgs.kde4 ../applications/video/kmplayer { }; + koffice = newScope pkgs.kde4 ../applications/office/koffice { }; + konq_plugins = newScope pkgs.kde4 ../applications/networking/browsers/konq-plugins { }; + konversation = newScope pkgs.kde4 ../applications/networking/irc/konversation { }; krename = newScope pkgs.kde4 ../applications/misc/krename { }; + krusader = newScope pkgs.kde4 ../applications/misc/krusader { }; + ktorrent = newScope pkgs.kde4 ../applications/networking/ktorrent { }; lame = callPackage ../applications/audio/lame { }; From d25e79afec8f2a858b97188e32de1920c0a73f97 Mon Sep 17 00:00:00 2001 From: "Yury G. Kudryashov" Date: Tue, 5 Oct 2010 18:08:40 +0000 Subject: [PATCH 35/72] Pass pango to kmplayer svn path=/nixpkgs/trunk/; revision=24095 --- 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 125139f95b6..5c45304edfb 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -5817,7 +5817,9 @@ let kipi_plugins = newScope pkgs.kde4 ../applications/graphics/kipi-plugins { }; - kmplayer = newScope pkgs.kde4 ../applications/video/kmplayer { }; + kmplayer = newScope pkgs.kde4 ../applications/video/kmplayer { + inherit (pkgs.gtkLibs) pango; + }; koffice = newScope pkgs.kde4 ../applications/office/koffice { }; From fb8d50d76a974fe726373433f434d3803d8d9075 Mon Sep 17 00:00:00 2001 From: "Yury G. Kudryashov" Date: Tue, 5 Oct 2010 18:08:45 +0000 Subject: [PATCH 36/72] Make quassel compile with kde-4.5 kde45.kde is an attribute set, so rename flag to withKDE. svn path=/nixpkgs/trunk/; revision=24096 --- .../networking/irc/quassel/default.nix | 14 ++++++-------- 1 file changed, 6 insertions(+), 8 deletions(-) diff --git a/pkgs/applications/networking/irc/quassel/default.nix b/pkgs/applications/networking/irc/quassel/default.nix index d94c00daed9..2be964db331 100644 --- a/pkgs/applications/networking/irc/quassel/default.nix +++ b/pkgs/applications/networking/irc/quassel/default.nix @@ -1,12 +1,10 @@ { monolithic ? true # build monolithic Quassel , daemon ? false # build Quassel daemon , client ? false # build Quassel client -, kde ? true # enable KDE integration +, withKDE ? true # enable KDE integration , ssl ? true # enable SSL support , previews ? false # enable webpage previews on hovering over URLs -, stdenv, fetchurl, cmake, qt4, kdelibs ? null, automoc4 ? null, phonon ? null }: - -assert kde -> kdelibs != null && automoc4 != null && phonon != null; +, stdenv, fetchurl, cmake, qt4, kdelibs, automoc4, phonon }: let edf = flag: feature: [("-D" + feature + (if flag then "=ON" else "=OFF"))]; @@ -21,9 +19,9 @@ in with stdenv; mkDerivation rec { }; buildInputs = [ cmake qt4 ] - ++ lib.optional kde kdelibs - ++ lib.optional kde automoc4 - ++ lib.optional kde phonon; + ++ lib.optional withKDE kdelibs + ++ lib.optional withKDE automoc4 + ++ lib.optional withKDE phonon; cmakeFlags = [ "-DWITH_DBUS=OFF" @@ -34,7 +32,7 @@ in with stdenv; mkDerivation rec { ++ edf monolithic "WANT_MONO" ++ edf daemon "WANT_CORE" ++ edf client "WANT_QTCLIENT" - ++ edf kde "WITH_KDE" + ++ edf withKDE "WITH_KDE" ++ edf ssl "WITH_OPENSSL" ++ edf previews "WITH_WEBKIT" ; From 2ca7b3c62c949e13601ce753bd209b1cad4cca8c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= Date: Tue, 5 Oct 2010 22:08:37 +0000 Subject: [PATCH 37/72] GNU bc: Fix `name'; clean things up. svn path=/nixpkgs/trunk/; revision=24100 --- pkgs/tools/misc/bc/default.nix | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/pkgs/tools/misc/bc/default.nix b/pkgs/tools/misc/bc/default.nix index b8c3657bb64..2d3d70d5ead 100644 --- a/pkgs/tools/misc/bc/default.nix +++ b/pkgs/tools/misc/bc/default.nix @@ -1,20 +1,23 @@ {stdenv, fetchurl, flex, readline}: -stdenv.mkDerivation { - name = "bc-1.0.6"; +stdenv.mkDerivation rec { + name = "bc-1.06"; src = fetchurl { - url = mirror://gnu/bc/bc-1.06.tar.gz; - md5 = "d44b5dddebd8a7a7309aea6c36fda117"; + url = "mirror://gnu/bc/${name}.tar.gz"; + sha256 = "0cqf5jkwx6awgd2xc2a0mkpxilzcfmhncdcfg7c9439wgkqxkxjf"; }; patches = [ ./readlinefix.patch ]; - configureFlags = "--with-readline"; + configureFlags = [ "--with-readline" ]; buildInputs = [flex readline]; + doCheck = true; + meta = { description = "GNU software calculator"; homepage = http://www.gnu.org/software/bc/; + platforms = stdenv.lib.platforms.all; }; } From bb7674f8d7263bc4364b8ce6280d33faa6ce73f8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= Date: Tue, 5 Oct 2010 22:08:43 +0000 Subject: [PATCH 38/72] GNU libtasn1 2.8. svn path=/nixpkgs/trunk/; revision=24101 --- pkgs/development/libraries/libtasn1/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/libtasn1/default.nix b/pkgs/development/libraries/libtasn1/default.nix index b02fca888e0..a2fdeb09ce0 100644 --- a/pkgs/development/libraries/libtasn1/default.nix +++ b/pkgs/development/libraries/libtasn1/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl }: stdenv.mkDerivation rec { - name = "libtasn1-2.7"; + name = "libtasn1-2.8"; src = fetchurl { url = "mirror://gnu/libtasn1/${name}.tar.gz"; - sha256 = "0rhyg043cqhajrmk30ylfvpk4dfig4djgy1j3q957vj5pqg7zzqh"; + sha256 = "0njl5l9h48v2ikfim96yxpnwjhhfwfmszz4i08psw60bn7s78z9b"; }; doCheck = true; From 65b6fc1992d973fa0f44ab2faf84e6c9f210d512 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= Date: Tue, 5 Oct 2010 22:08:48 +0000 Subject: [PATCH 39/72] GNU Parallel 20100922. svn path=/nixpkgs/trunk/; revision=24102 --- pkgs/tools/misc/parallel/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/misc/parallel/default.nix b/pkgs/tools/misc/parallel/default.nix index 7b60bc3f583..05c1ffaa965 100644 --- a/pkgs/tools/misc/parallel/default.nix +++ b/pkgs/tools/misc/parallel/default.nix @@ -1,11 +1,11 @@ { fetchurl, stdenv, perl }: stdenv.mkDerivation rec { - name = "parallel-20100906"; + name = "parallel-20100922"; src = fetchurl { url = "mirror://gnu/parallel/${name}.tar.bz2"; - sha256 = "1h27ffq0hk2dlnffsk377lpp65l2zmvija7r831lpvdfssklmxvw"; + sha256 = "0bn1pka242pgm5dm0wkd4zf63rwv0wxxb0fjdjivlxyid72r7g8d"; }; patchPhase = From 97ae4239e4dd603e3228fceee0ab2b190a1901a4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= Date: Tue, 5 Oct 2010 22:08:53 +0000 Subject: [PATCH 40/72] GnuTLS 2.10.2. svn path=/nixpkgs/trunk/; revision=24103 --- pkgs/development/libraries/gnutls/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/gnutls/default.nix b/pkgs/development/libraries/gnutls/default.nix index 93cec825d6b..666e5f539ed 100644 --- a/pkgs/development/libraries/gnutls/default.nix +++ b/pkgs/development/libraries/gnutls/default.nix @@ -5,11 +5,11 @@ assert guileBindings -> guile != null; stdenv.mkDerivation rec { - name = "gnutls-2.10.1"; + name = "gnutls-2.10.2"; src = fetchurl { url = "mirror://gnu/gnutls/${name}.tar.bz2"; - sha256 = "1vh2qc2pk6srlqk4ag0v7ba41jmy9816a2mj8yx1253626y7h43k"; + sha256 = "09479y0qy91qg20kkq9j0yy4agnpi4knb8ciq83cq0lvqqzplbp8"; }; configurePhase = '' From d6c74382d9cfe2c82d7b40e94133a6ebaacb2aff Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= Date: Tue, 5 Oct 2010 22:08:58 +0000 Subject: [PATCH 41/72] GNU Autoconf 2.68. svn path=/nixpkgs/trunk/; revision=24104 --- pkgs/development/tools/misc/autoconf/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/misc/autoconf/default.nix b/pkgs/development/tools/misc/autoconf/default.nix index 6896da2ec4c..f0c3458dd5a 100644 --- a/pkgs/development/tools/misc/autoconf/default.nix +++ b/pkgs/development/tools/misc/autoconf/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, m4, perl }: stdenv.mkDerivation rec { - name = "autoconf-2.67"; + name = "autoconf-2.68"; src = fetchurl { url = "mirror://gnu/autoconf/${name}.tar.bz2"; - sha256 = "1vwalyqzgk1liyinblbc78isxa5qa4fvs5bx2fkjd7crfhhdkph0"; + sha256 = "1j1j8d2p3r9mzx8b2hnmfqy2683r2wyyvki6bs9cmm6n7wkzp4f4"; }; buildInputs = [ m4 perl ]; From 1f136b4630df84083dcc06dd3261d784eb14ecbc Mon Sep 17 00:00:00 2001 From: Michael Raskin <7c6f434c@mail.ru> Date: Wed, 6 Oct 2010 06:58:05 +0000 Subject: [PATCH 42/72] Update Linux 2.6.35 to .35.7 svn path=/nixpkgs/trunk/; revision=24105 --- pkgs/os-specific/linux/kernel/linux-2.6.35.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/linux-2.6.35.nix b/pkgs/os-specific/linux/kernel/linux-2.6.35.nix index 56f0c49e8d4..edc86c51890 100644 --- a/pkgs/os-specific/linux/kernel/linux-2.6.35.nix +++ b/pkgs/os-specific/linux/kernel/linux-2.6.35.nix @@ -190,11 +190,11 @@ in import ./generic.nix ( rec { - version = "2.6.35.6"; + version = "2.6.35.7"; src = fetchurl { url = "mirror://kernel/linux/kernel/v2.6/linux-${version}.tar.bz2"; - sha256 = "1mz0sk7flyr115dcqwqmrzwk845v6pghmlp7j133p8z3jii49c8r"; + sha256 = "f19c830e52d97fe35e9e32e1911de238e75b1cd29ca779de0d83f0906073ee2c"; }; config = configWithPlatform stdenv.platform; From 5d962bc1b2a47251316f79d9a10b6aae62717b7a Mon Sep 17 00:00:00 2001 From: Michael Raskin <7c6f434c@mail.ru> Date: Wed, 6 Oct 2010 08:49:35 +0000 Subject: [PATCH 43/72] Update SBCL svn path=/nixpkgs/trunk/; revision=24106 --- pkgs/development/compilers/sbcl/src-for-default.nix | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/development/compilers/sbcl/src-for-default.nix b/pkgs/development/compilers/sbcl/src-for-default.nix index adfa92b428d..73ba92e8d06 100644 --- a/pkgs/development/compilers/sbcl/src-for-default.nix +++ b/pkgs/development/compilers/sbcl/src-for-default.nix @@ -1,9 +1,9 @@ rec { - version="1.0.42"; - name="sbcl-1.0.42"; - hash="0j699rb3nw7akcmpqjlzwsrc0yg6kj6nf9bzfhnw19q1m4kl4pm5"; - url="http://downloads.sourceforge.net/project/sbcl/sbcl/1.0.42/sbcl-1.0.42-source.tar.bz2"; - advertisedUrl="http://downloads.sourceforge.net/project/sbcl/sbcl/1.0.42/sbcl-1.0.42-source.tar.bz2"; + version="1.0.43"; + name="sbcl-1.0.43"; + hash="0csykjcmy0gjlvxx7pg7kd2b7h610zpys3xla85qjj9ngjzpmbcq"; + url="http://downloads.sourceforge.net/project/sbcl/sbcl/1.0.43/sbcl-1.0.43-source.tar.bz2"; + advertisedUrl="http://downloads.sourceforge.net/project/sbcl/sbcl/1.0.43/sbcl-1.0.43-source.tar.bz2"; } From d095fbb13e4e91a336ef6af6721ef8012b0a928c Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Wed, 6 Oct 2010 10:29:45 +0000 Subject: [PATCH 44/72] pkgs/development/libraries/pcre: fixed build on Darwin The gcc version used on Darwin crashes while compiling the C++ interface of PCRE. Building that code with -O0 avoids the crash. svn path=/nixpkgs/trunk/; revision=24107 --- pkgs/development/libraries/pcre/default.nix | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/pkgs/development/libraries/pcre/default.nix b/pkgs/development/libraries/pcre/default.nix index fba3844bf8e..1dd860aeaeb 100644 --- a/pkgs/development/libraries/pcre/default.nix +++ b/pkgs/development/libraries/pcre/default.nix @@ -8,10 +8,14 @@ stdenv.mkDerivation { sha256 = "1zsqk352mx2zklf9bgpg9d88ckfdssbbbiyslhrycfckw8m3qpvr"; }; + # The compiler on Darwin crashes with an internal error while building the + # C++ interface. Disabling optimizations on that platform remedies the + # problem. In case we ever update the Darwin GCC version, the exception for + # that platform ought to be removed. configureFlags = '' ${if unicodeSupport then "--enable-unicode-properties" else ""} ${if !cplusplusSupport then "--disable-cpp" else ""} - ''; + '' + stdenv.lib.optionalString stdenv.isDarwin "CXXFLAGS=-O0"; meta = { homepage = "http://www.pcre.org/"; From 3b018566d67f812207c2a889093d3ba308311185 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?= Date: Wed, 6 Oct 2010 11:02:18 +0000 Subject: [PATCH 45/72] =?UTF-8?q?Update=20awesome=20(patch=20by=20Carles?= =?UTF-8?q?=20Pag=C3=A8s)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit svn path=/nixpkgs/trunk/; revision=24108 --- pkgs/applications/window-managers/awesome/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/window-managers/awesome/default.nix b/pkgs/applications/window-managers/awesome/default.nix index 741fcfd14c2..4bc0610082b 100644 --- a/pkgs/applications/window-managers/awesome/default.nix +++ b/pkgs/applications/window-managers/awesome/default.nix @@ -4,11 +4,11 @@ , docbook_xml_dtd_45, libxslt, coreutils}: stdenv.mkDerivation rec { - name = "awesome-3.4.7"; + name = "awesome-3.4.8"; src = fetchurl { - url = http://awesome.naquadah.org/download/awesome-3.4.7.tar.xz; - sha256 = "1l5c730y17wxqm6p9fybjg84nk01jpg30wg14qjpc7xs5pd11993"; + url = http://awesome.naquadah.org/download/awesome-3.4.8.tar.xz; + sha256 = "1mrdk8q0kj1p7zp5mchr2zl3cnja4z4ir0wx3yz5y361py5bjy78"; }; buildInputs = [ xz cmake gperf imagemagick pkgconfig lua glib cairo pango From d11c271dcb00c36713bcd5430d31d2f00b2ba9db Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Wed, 6 Oct 2010 11:04:07 +0000 Subject: [PATCH 46/72] * Install the Xen manpages. svn path=/nixpkgs/trunk/; revision=24109 --- .../virtualization/xen/default.nix | 18 ++++++++++++++++-- 1 file changed, 16 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/virtualization/xen/default.nix b/pkgs/applications/virtualization/xen/default.nix index 314ce974a6c..04c53dec8a5 100644 --- a/pkgs/applications/virtualization/xen/default.nix +++ b/pkgs/applications/virtualization/xen/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchurl, which, zlib, pkgconfig, SDL, openssl, python , libuuid, gettext, ncurses, dev86, iasl, pciutils, bzip2, xz -, lvm2, utillinux, procps, texinfo }: +, lvm2, utillinux, procps, texinfo, perl }: with stdenv.lib; @@ -8,6 +8,8 @@ let version = "4.0.1"; + libDir = if stdenv.is64bit then "lib64" else "lib"; + # Sources needed to build the stubdoms. stubdomSrcs = @@ -46,7 +48,7 @@ stdenv.mkDerivation { buildInputs = [ which zlib pkgconfig SDL openssl python libuuid gettext ncurses - dev86 iasl pciutils bzip2 xz texinfo + dev86 iasl pciutils bzip2 xz texinfo perl ]; makeFlags = "PREFIX=$(out) CONFIG_DIR=/etc"; @@ -82,6 +84,12 @@ stdenv.mkDerivation { substituteInPlace tools/python/xen/xend/XendQCoWStorageRepo.py \ --replace /usr/sbin/qcow-create $out/sbin/qcow-create + substituteInPlace tools/python/xen/remus/save.py \ + --replace /usr/lib/xen/bin/xc_save $out/${libDir}/xen/bin/xc_save + + substituteInPlace tools/python/xen/remus/device.py \ + --replace /usr/lib/xen/bin/imqebt $out/${libDir}/xen/bin/imqebt + # Xen's stubdoms need various sources that it usually fetches at # build time using wget. We can't have that. ${flip concatMapStrings stubdomSrcs (x: let src = fetchurl x; in '' @@ -89,11 +97,17 @@ stdenv.mkDerivation { '')} ''; + postBuild = + '' + make -C docs man-pages + ''; + installPhase = '' cp -prvd dist/install/nix/store/* $out cp -prvd dist/install/boot $out/boot cp -prvd dist/install/etc $out/etc + cp -dR docs/man1 docs/man5 $out/share/man/ ''; # */ postFixup = From 006528b42d39183b6ad5b198b97dc5c2ab642027 Mon Sep 17 00:00:00 2001 From: Rob Vermaas Date: Wed, 6 Oct 2010 11:20:20 +0000 Subject: [PATCH 47/72] mercurial: update to 1.6.4 and install hgweb.cgi svn path=/nixpkgs/trunk/; revision=24110 --- .../version-management/mercurial/default.nix | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/version-management/mercurial/default.nix b/pkgs/applications/version-management/mercurial/default.nix index bc5af2f37c7..f3d18036d07 100644 --- a/pkgs/applications/version-management/mercurial/default.nix +++ b/pkgs/applications/version-management/mercurial/default.nix @@ -2,11 +2,11 @@ , guiSupport ? false, tk ? null }: stdenv.mkDerivation rec { - name = "mercurial-1.5.1"; + name = "mercurial-1.6.4"; src = fetchurl { url = "http://www.selenic.com/mercurial/release/${name}.tar.gz"; - sha256 = "5796dd27c884c0effb027c71925fe2c2506b08e0ac8c5f53db259d378ef96569"; + sha256 = "04c8vj942ys71dn0bjga33i0qi5hybjjhq087xd0jp29ijzxp3hy"; }; inherit python; # pass it so that the same version can be used in hg2git @@ -34,6 +34,11 @@ stdenv.mkDerivation rec { --prefix PYTHONPATH : "$(toPythonPath $out)" \ $WRAP_TK done + + # copy hgweb.cgi to allow use in apache + ensureDir $out/share/cgi-bin + cp -v hgweb.cgi $out/share/cgi-bin + chmod u+x $out/share/cgi-bin/hgweb.cgi ''; meta = { From fc97834dd54db1a2bdca9819e5100f393b153bb2 Mon Sep 17 00:00:00 2001 From: Michael Raskin <7c6f434c@mail.ru> Date: Wed, 6 Oct 2010 11:47:04 +0000 Subject: [PATCH 48/72] Update Veracity svn path=/nixpkgs/trunk/; revision=24112 --- .../version-management/veracity/src-for-default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/applications/version-management/veracity/src-for-default.nix b/pkgs/applications/version-management/veracity/src-for-default.nix index 7a3e72c940f..097bb5974aa 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="0.3.1.10298"; - name="veracity-0.3.1.10298"; - hash="1mqlmh01qv6y1sd9zc89caig4j8b8h7lbrqsm4d171fq4qzgq5s5"; + version="0.3.1.10304"; + name="veracity-0.3.1.10304"; + hash="0izbs3v7incy9799sh6idfy7r2mchq2v152k8qc1k5l2r1jq4vik"; url="http://download-us.sourcegear.com/Veracity/nightly/veracity-source-${version}.tar.gz"; - advertisedUrl="http://download-us.sourcegear.com/Veracity/nightly/veracity-source-0.3.1.10298.tar.gz"; + advertisedUrl="http://download-us.sourcegear.com/Veracity/nightly/veracity-source-0.3.1.10304.tar.gz"; } From 69aa532b327fdcba0110cf241879ea6fe7f82ef2 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Wed, 6 Oct 2010 11:51:53 +0000 Subject: [PATCH 49/72] pkgs/development/libraries/pango: updated to version 1.28.3 svn path=/nixpkgs/trunk/; revision=24113 --- pkgs/development/libraries/pango/1.28.x.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/pango/1.28.x.nix b/pkgs/development/libraries/pango/1.28.x.nix index 14d425b23a2..db77fd9ce51 100644 --- a/pkgs/development/libraries/pango/1.28.x.nix +++ b/pkgs/development/libraries/pango/1.28.x.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, pkgconfig, gettext, x11, glib, cairo, libpng }: stdenv.mkDerivation rec { - name = "pango-1.28.1"; + name = "pango-1.28.3"; src = fetchurl { url = "mirror://gnome/sources/pango/1.28/${name}.tar.bz2"; - sha256 = "8f3eaab506f613dd25bb1fa65ea87a145d523d066d90c227bdb3016523451bc2"; + sha256 = "0ch640zmf159gr9qp3i4a5mh1ib2s9h3660g4w0bpiqc8g4qn9sy"; }; buildInputs = [ pkgconfig ] ++ stdenv.lib.optional (stdenv.system == "i686-darwin") gettext; From 8a3066dca8aec9eb09d9e56c0a0cb4846ff7552d Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Wed, 6 Oct 2010 11:52:00 +0000 Subject: [PATCH 50/72] pkgs/development/libraries/pango: support 64-bit Darwin svn path=/nixpkgs/trunk/; revision=24114 --- pkgs/development/libraries/pango/1.28.x.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/libraries/pango/1.28.x.nix b/pkgs/development/libraries/pango/1.28.x.nix index db77fd9ce51..47418be6693 100644 --- a/pkgs/development/libraries/pango/1.28.x.nix +++ b/pkgs/development/libraries/pango/1.28.x.nix @@ -8,7 +8,7 @@ stdenv.mkDerivation rec { sha256 = "0ch640zmf159gr9qp3i4a5mh1ib2s9h3660g4w0bpiqc8g4qn9sy"; }; - buildInputs = [ pkgconfig ] ++ stdenv.lib.optional (stdenv.system == "i686-darwin") gettext; + buildInputs = [ pkgconfig ] ++ stdenv.lib.optional stdenv.isDarwin gettext; propagatedBuildInputs = [ x11 glib cairo libpng ]; From 6abc00fb671c5dce75ff9bd146a79cce922ab094 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?= Date: Wed, 6 Oct 2010 13:30:06 +0000 Subject: [PATCH 51/72] Updating fossil svn path=/nixpkgs/trunk/; revision=24116 --- pkgs/applications/version-management/fossil/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/version-management/fossil/default.nix b/pkgs/applications/version-management/fossil/default.nix index a5f6bbfcb0c..ff682e63364 100644 --- a/pkgs/applications/version-management/fossil/default.nix +++ b/pkgs/applications/version-management/fossil/default.nix @@ -1,7 +1,7 @@ {stdenv, fetchurl, zlib, openssl}: let - version = "20100918155143"; + version = "20101005035549"; in stdenv.mkDerivation { @@ -9,7 +9,7 @@ stdenv.mkDerivation { src = fetchurl { url = "http://www.fossil-scm.org/download/fossil-src-${version}.tar.gz"; - sha256 = "1xkk5girwvhayl54fmya48k4akzpsdcg2qllgp1c6ckv169kggb9"; + sha256 = "14d7sibz9vfmb96xsaia5x6x0059xpn09x3la0xph0ym9gjqp8kb"; }; buildInputs = [ zlib openssl ]; From b7ce93bfc4f3ce59135f54ef695de3fa020f3372 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?= Date: Wed, 6 Oct 2010 15:32:25 +0000 Subject: [PATCH 52/72] Making wxGTK28 use gtkLibs instead of the older gtkLibs218 (this gave trouble when linking wxGTK28 programs with other glib based things like gstreamer, ...) svn path=/nixpkgs/trunk/; revision=24117 --- 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 5c45304edfb..0d0992d4641 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -3879,7 +3879,7 @@ let }; wxGTK28 = callPackage ../development/libraries/wxGTK-2.8 { - inherit (gtkLibs216) gtk; + inherit (gtkLibs) gtk; }; wtk = callPackage ../development/libraries/wtk { }; From 4e9457501420fb9d5a0dec0d87a6e4cec8ed4fcf Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Wed, 6 Oct 2010 16:02:44 +0000 Subject: [PATCH 53/72] * NTP updated to 4.2.6p2. svn path=/nixpkgs/trunk/; revision=24118 --- pkgs/tools/networking/ntp/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/networking/ntp/default.nix b/pkgs/tools/networking/ntp/default.nix index 1a4076aab6b..8b7ca552545 100644 --- a/pkgs/tools/networking/ntp/default.nix +++ b/pkgs/tools/networking/ntp/default.nix @@ -3,11 +3,11 @@ assert stdenv.isLinux -> libcap != null; stdenv.mkDerivation rec { - name = "ntp-4.2.6"; + name = "ntp-4.2.6p2"; src = fetchurl { url = "http://www.eecis.udel.edu/~ntp/ntp_spool/ntp4/ntp-4.2/${name}.tar.gz"; - sha256 = "04cam5l804ws6cs0ihlmx26n39vpap5wb39i1vxfff01mri4q38b"; + sha256 = "1n79scfvgjk8hn1fr4q2kkk6xm83k68r4p488ai09nm20dwqp2a2"; }; configureFlags = '' From 3137cb5c5931d3e674201cd68fdf2acef5b1842a Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Wed, 6 Oct 2010 16:04:04 +0000 Subject: [PATCH 54/72] * Apply some fixes to the xendomains script. svn path=/nixpkgs/trunk/; revision=24120 --- pkgs/applications/virtualization/xen/default.nix | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/pkgs/applications/virtualization/xen/default.nix b/pkgs/applications/virtualization/xen/default.nix index 04c53dec8a5..b7a7d1ed31f 100644 --- a/pkgs/applications/virtualization/xen/default.nix +++ b/pkgs/applications/virtualization/xen/default.nix @@ -90,6 +90,12 @@ stdenv.mkDerivation { substituteInPlace tools/python/xen/remus/device.py \ --replace /usr/lib/xen/bin/imqebt $out/${libDir}/xen/bin/imqebt + # Allow the location of the xendomains config file to be + # overriden at runtime. + substituteInPlace tools/hotplug/Linux/init.d/xendomains \ + --replace 'XENDOM_CONFIG=/etc/sysconfig/xendomains' "" \ + --replace /bin/ls ls + # Xen's stubdoms need various sources that it usually fetches at # build time using wget. We can't have that. ${flip concatMapStrings stubdomSrcs (x: let src = fetchurl x; in '' From 0f5aed60d4580557ad634b223c4683211739b2fe Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= Date: Thu, 7 Oct 2010 07:29:12 +0000 Subject: [PATCH 55/72] U-Boot: Fix the environment address for the GuruPlug. svn path=/nixpkgs/trunk/; revision=24126 --- pkgs/misc/uboot/guruplug-file-systems.patch | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/pkgs/misc/uboot/guruplug-file-systems.patch b/pkgs/misc/uboot/guruplug-file-systems.patch index 76734456c2f..30dc1994303 100644 --- a/pkgs/misc/uboot/guruplug-file-systems.patch +++ b/pkgs/misc/uboot/guruplug-file-systems.patch @@ -1,8 +1,22 @@ Add support for the various file systems as found in `sheevaplug.h'. +As for the SheevaPlug, the increase in size means that the environment +must be pushed further away. + In addition, increase the malloc area size to allow compilation of UbiFS. --- u-boot/include/configs/guruplug.h 1970-01-01 01:00:01.000000000 +0100 +++ u-boot/include/configs/guruplug.h 2010-09-29 18:59:52.000000000 +0200 +@@ -123,8 +123,8 @@ + * it has to be rounded to sector size + */ + #define CONFIG_ENV_SIZE 0x20000 /* 128k */ +-#define CONFIG_ENV_ADDR 0x40000 +-#define CONFIG_ENV_OFFSET 0x40000 /* env starts here */ ++#define CONFIG_ENV_ADDR 0x60000 ++#define CONFIG_ENV_OFFSET 0x60000 /* env starts here */ + + /* + * Default environment variables @@ -145,7 +145,7 @@ /* * Size of malloc() pool From 40e57793f951817e50f5be53c4cce7868f83e6af Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= Date: Thu, 7 Oct 2010 07:29:36 +0000 Subject: [PATCH 56/72] Add Check, a unit testing framework for C. svn path=/nixpkgs/trunk/; revision=24127 --- pkgs/development/libraries/check/default.nix | 30 ++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 32 insertions(+) create mode 100644 pkgs/development/libraries/check/default.nix diff --git a/pkgs/development/libraries/check/default.nix b/pkgs/development/libraries/check/default.nix new file mode 100644 index 00000000000..d04f8c8e750 --- /dev/null +++ b/pkgs/development/libraries/check/default.nix @@ -0,0 +1,30 @@ +{ fetchurl, stdenv }: + +let version = "0.9.8"; in +stdenv.mkDerivation { + name = "check-${version}"; + + src = fetchurl { + url = "mirror://sourceforge/check/${version}/check-${version}.tar.gz"; + sha256 = "0zvak7vx0zq344x174yg9vkw6fg9kycda15zlbz4yn07pdbgkb42"; + }; + + doCheck = true; + + meta = { + description = "Check, a unit testing framework for C"; + + longDescription = + '' Check is a unit testing framework for C. It features a simple + interface for defining unit tests, putting little in the way of the + developer. Tests are run in a separate address space, so Check can + catch both assertion failures and code errors that cause + segmentation faults or other signals. The output from unit tests + can be used within source code editors and IDEs. + ''; + + homepage = http://check.sourceforge.net/; + + license = "LGPLv2+"; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 0d0992d4641..24a8c9ca3cc 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -2601,6 +2601,8 @@ let ccrtp = callPackage ../development/libraries/ccrtp { }; + check = callPackage ../development/libraries/check { }; + chipmunk = builderDefsPackage (import ../development/libraries/chipmunk) { inherit cmake freeglut mesa; inherit (xlibs) libX11 xproto inputproto libXi libXmu; From b67487377d28c8520d6a853cd4d4b15344cd1013 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= Date: Thu, 7 Oct 2010 07:29:44 +0000 Subject: [PATCH 57/72] BitlBee 1.2.8. svn path=/nixpkgs/trunk/; revision=24128 --- .../instant-messengers/bitlbee/default.nix | 16 +++++++++++----- 1 file changed, 11 insertions(+), 5 deletions(-) diff --git a/pkgs/applications/networking/instant-messengers/bitlbee/default.nix b/pkgs/applications/networking/instant-messengers/bitlbee/default.nix index e136670a589..f207eaed703 100644 --- a/pkgs/applications/networking/instant-messengers/bitlbee/default.nix +++ b/pkgs/applications/networking/instant-messengers/bitlbee/default.nix @@ -1,14 +1,17 @@ -{ fetchurl, stdenv, gnutls, glib, pkgconfig }: +{ fetchurl, stdenv, gnutls, glib, pkgconfig, check }: stdenv.mkDerivation rec { - name = "bitlbee-1.2.4"; + name = "bitlbee-1.2.8"; src = fetchurl { - url = "mirror://bitlbee/src/" + name + ".tar.gz"; - sha256 = "1lwcjh1r81xqf6fxjwd2a2hv8dq9g0iyc8dnbr1pgas4vmjg9xf2"; + url = "mirror://bitlbee/src/${name}.tar.gz"; + sha256 = "11lfxvra46mwcnlxvhnywv6xbp7zl3h27hsbfwdh16b6fy41n1is"; }; - buildInputs = [ gnutls glib pkgconfig ]; + buildInputs = [ gnutls glib pkgconfig ] + ++ stdenv.lib.optional doCheck check; + + doCheck = true; meta = { description = "BitlBee, an IRC to other chat networks gateway"; @@ -26,5 +29,8 @@ stdenv.mkDerivation rec { homepage = http://www.bitlbee.org/; license = "GPLv2+"; + + maintainers = [ stdenv.lib.maintainers.ludo ]; + platforms = stdenv.lib.platforms.gnu; # arbitrary choice }; } From 4325bd0b28a97e0ddb31dab37b689c2441d376e2 Mon Sep 17 00:00:00 2001 From: Michael Raskin <7c6f434c@mail.ru> Date: Thu, 7 Oct 2010 07:56:00 +0000 Subject: [PATCH 58/72] Update Wireshark to release svn path=/nixpkgs/trunk/; revision=24129 --- .../networking/sniffers/wireshark/default.nix | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/pkgs/applications/networking/sniffers/wireshark/default.nix b/pkgs/applications/networking/sniffers/wireshark/default.nix index b0e9347a764..3c2e94c0595 100644 --- a/pkgs/applications/networking/sniffers/wireshark/default.nix +++ b/pkgs/applications/networking/sniffers/wireshark/default.nix @@ -1,10 +1,11 @@ {stdenv, fetchurl, perl, pkgconfig, gtk, libpcap, flex, bison}: -stdenv.mkDerivation { - name = "wireshark-1.4.0rc2"; +stdenv.mkDerivation rec { + version = "1.4.0"; + name = "wireshark-${version}"; src = fetchurl { - url = "http://www.wireshark.org/download/src/wireshark-1.4.0rc2.tar.bz2"; - sha256 = "16fd00e1e120c7f57a8c5c8532f26d77a14ca254c2cb2c4816ec9a0499744f79"; + url = "http://www.wireshark.org/download/src/${name}.tar.bz2"; + sha256 = "1c0df77d11c643b1142b6ed3fd21e0c79b3f05f1749fe10e9ba5fd3beee8b743"; }; configureFlags = "--with-pcap=${libpcap}"; buildInputs = [perl pkgconfig gtk libpcap flex bison]; From 48ecb667ab5e27a42a65d9e60de238582892c23d Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Thu, 7 Oct 2010 13:13:42 +0000 Subject: [PATCH 59/72] pkgs/applications/editors/emacs-modes/haskell: added meta section svn path=/nixpkgs/trunk/; revision=24134 --- pkgs/applications/editors/emacs-modes/haskell/default.nix | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/pkgs/applications/editors/emacs-modes/haskell/default.nix b/pkgs/applications/editors/emacs-modes/haskell/default.nix index 9dcec717861..4871f26176b 100644 --- a/pkgs/applications/editors/emacs-modes/haskell/default.nix +++ b/pkgs/applications/editors/emacs-modes/haskell/default.nix @@ -14,4 +14,12 @@ stdenv.mkDerivation rec { ensureDir "$out/share/emacs/site-lisp" cp *.el *.elc *.hs "$out/share/emacs/site-lisp/" ''; + + meta = { + homepage = "http://projects.haskell.org/haskellmode-emacs/"; + description = "Haskell mode package for Emacs"; + + platforms = stdenv.lib.platforms.unix; + maintainers = [ stdenv.lib.maintainers.simons ]; + }; } From a158e67b19bb4ff1fc6550f7b69c3a405de1f21e Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Thu, 7 Oct 2010 13:13:57 +0000 Subject: [PATCH 60/72] pkgs/tools/networking/x11-ssh-askpass: added meta section svn path=/nixpkgs/trunk/; revision=24135 --- pkgs/tools/networking/x11-ssh-askpass/default.nix | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/pkgs/tools/networking/x11-ssh-askpass/default.nix b/pkgs/tools/networking/x11-ssh-askpass/default.nix index b3244feaf75..0a03d2d755d 100644 --- a/pkgs/tools/networking/x11-ssh-askpass/default.nix +++ b/pkgs/tools/networking/x11-ssh-askpass/default.nix @@ -15,4 +15,12 @@ stdenv.mkDerivation { buildPhase = "xmkmf; make includes; make"; buildInputs = [x11 imake]; + + meta = { + homepage = "http://www.jmknoble.net/software/x11-ssh-askpass/"; + description = "lightweight passphrase dialog for OpenSSH or other open variants of SSH"; + + platforms = stdenv.lib.platforms.unix; + maintainers = []; + }; } From 789c12add5348cb5cd88a4241b90e459aa2003c4 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Thu, 7 Oct 2010 13:14:01 +0000 Subject: [PATCH 61/72] pkgs/applications/editors/emacs-modes/haskell: updated to version 2.8.0 svn path=/nixpkgs/trunk/; revision=24136 --- pkgs/applications/editors/emacs-modes/haskell/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/editors/emacs-modes/haskell/default.nix b/pkgs/applications/editors/emacs-modes/haskell/default.nix index 4871f26176b..5813fde815f 100644 --- a/pkgs/applications/editors/emacs-modes/haskell/default.nix +++ b/pkgs/applications/editors/emacs-modes/haskell/default.nix @@ -1,11 +1,11 @@ {stdenv, fetchurl, emacs}: stdenv.mkDerivation rec { - name = "haskell-mode-2.7.0"; + name = "haskell-mode-2.8.0"; src = fetchurl { url = "http://projects.haskell.org/haskellmode-emacs/${name}.tar.gz"; - sha256 = "8b45c55ed5f2b498529a6d7e01b77fea899c1de93e24653cab188cb3a4f495bc"; + sha256 = "1065g4xy3ca72xhqh6hfxs5j3mls82bli8w5rhz1npzyfwlwhkb1"; }; buildInputs = [emacs]; From d2c4a70a0e691bb75b6ff3a30a1c7f5f7c41685e Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Thu, 7 Oct 2010 13:14:05 +0000 Subject: [PATCH 62/72] pkgs/tools/misc/screen: added meta section svn path=/nixpkgs/trunk/; revision=24137 --- pkgs/tools/misc/screen/default.nix | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/pkgs/tools/misc/screen/default.nix b/pkgs/tools/misc/screen/default.nix index 39e763c4ca7..f31a28c221a 100644 --- a/pkgs/tools/misc/screen/default.nix +++ b/pkgs/tools/misc/screen/default.nix @@ -8,4 +8,12 @@ stdenv.mkDerivation { }; buildInputs = [ncurses]; + + meta = { + homepage = "http://www.gnu.org/software/screen/"; + description = "Full-screen window manager that multiplexes a physical terminal"; + + platforms = stdenv.lib.platforms.unix; + maintainers = []; + }; } From 5b87d8b27db344f8e861d9c273964da7f736fc75 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Thu, 7 Oct 2010 13:14:09 +0000 Subject: [PATCH 63/72] pkgs/tools/compression/bzip2: completed meta section svn path=/nixpkgs/trunk/; revision=24138 --- pkgs/tools/compression/bzip2/default.nix | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/pkgs/tools/compression/bzip2/default.nix b/pkgs/tools/compression/bzip2/default.nix index 0523067cbad..f9cf4f5c0a1 100644 --- a/pkgs/tools/compression/bzip2/default.nix +++ b/pkgs/tools/compression/bzip2/default.nix @@ -18,6 +18,10 @@ stdenv.mkDerivation { inherit linkStatic; meta = { - homepage = http://www.bzip.org; + homepage = "http://www.bzip.org"; + description = "high-quality data compression program"; + + platforms = stdenv.lib.platforms.all; + maintainers = []; }; } From 948b839e3dd4a6a5891dd83488f26b47f832e90a Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Thu, 7 Oct 2010 13:14:13 +0000 Subject: [PATCH 64/72] pkgs/applications/misc/xpdf: added meta section svn path=/nixpkgs/trunk/; revision=24139 --- pkgs/applications/misc/xpdf/default.nix | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/pkgs/applications/misc/xpdf/default.nix b/pkgs/applications/misc/xpdf/default.nix index 8e2abada55d..259924cd3e3 100644 --- a/pkgs/applications/misc/xpdf/default.nix +++ b/pkgs/applications/misc/xpdf/default.nix @@ -53,4 +53,12 @@ stdenv.mkDerivation { --replace '#displayFontT1' displayFontT1 fi "; + + meta = { + homepage = "http://www.foolabs.com/xpdf/"; + description = "viewer for Portable Document Format (PDF) files"; + + platforms = stdenv.lib.platforms.unix; + maintainers = []; + }; } From 59fa83419342118d2044d8888df7e25ad698a5f6 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Thu, 7 Oct 2010 13:14:17 +0000 Subject: [PATCH 65/72] pkgs/applications/version-management/cvs: added meta section svn path=/nixpkgs/trunk/; revision=24140 --- pkgs/applications/version-management/cvs/default.nix | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/pkgs/applications/version-management/cvs/default.nix b/pkgs/applications/version-management/cvs/default.nix index 05b33f2bcf2..73d90afb93b 100644 --- a/pkgs/applications/version-management/cvs/default.nix +++ b/pkgs/applications/version-management/cvs/default.nix @@ -20,4 +20,12 @@ stdenv.mkDerivation { ''; buildInputs = [ nano ]; + + meta = { + homepage = "http://cvs.nongnu.org"; + description = "Concurrent Versions System - a source control system"; + + platforms = stdenv.lib.platforms.all; + maintainers = []; + }; } From 113075207e09d4e1e919f3b84b29940f2a936603 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Thu, 7 Oct 2010 13:14:21 +0000 Subject: [PATCH 66/72] pkgs/tools/networking/x11-ssh-askpass: strip trailing whitespace svn path=/nixpkgs/trunk/; revision=24141 --- pkgs/tools/networking/x11-ssh-askpass/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/tools/networking/x11-ssh-askpass/default.nix b/pkgs/tools/networking/x11-ssh-askpass/default.nix index 0a03d2d755d..e9d68c3f6da 100644 --- a/pkgs/tools/networking/x11-ssh-askpass/default.nix +++ b/pkgs/tools/networking/x11-ssh-askpass/default.nix @@ -2,7 +2,7 @@ stdenv.mkDerivation { name = "x11-ssh-askpass-1.2.4.1"; - + src = fetchurl { url = http://www.jmknoble.net/software/x11-ssh-askpass/x11-ssh-askpass-1.2.4.1.tar.gz; sha1 = "78c992951685d4dbffb77536f37b83ae2a6eafc7"; From d0cdb3a02a359d697d3d42889ee33c6b51f3425f Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Thu, 7 Oct 2010 13:14:25 +0000 Subject: [PATCH 67/72] pkgs/tools/compression/bzip2: strip trailing whitespace svn path=/nixpkgs/trunk/; revision=24142 --- pkgs/tools/compression/bzip2/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/compression/bzip2/default.nix b/pkgs/tools/compression/bzip2/default.nix index f9cf4f5c0a1..9321ff6e522 100644 --- a/pkgs/tools/compression/bzip2/default.nix +++ b/pkgs/tools/compression/bzip2/default.nix @@ -2,9 +2,9 @@ stdenv.mkDerivation { name = "bzip2-1.0.5"; - + builder = ./builder.sh; - + src = fetchurl { url = http://www.bzip.org/1.0.5/bzip2-1.0.5.tar.gz; sha256 = "08py2s9vw6dgw457lbklh1vsr3b8x8dlv7d8ygdfaxlx61l57gzp"; @@ -16,7 +16,7 @@ stdenv.mkDerivation { makeFlags = if linkStatic then "LDFLAGS=-static" else ""; inherit linkStatic; - + meta = { homepage = "http://www.bzip.org"; description = "high-quality data compression program"; From c7b5ea13eae0e45be273d59522a38d83dcd1c35c Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Thu, 7 Oct 2010 13:14:29 +0000 Subject: [PATCH 68/72] pkgs/applications/misc/xpdf: strip trailing whitespace svn path=/nixpkgs/trunk/; revision=24143 --- pkgs/applications/misc/xpdf/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/misc/xpdf/default.nix b/pkgs/applications/misc/xpdf/default.nix index 259924cd3e3..7b897e59d4e 100644 --- a/pkgs/applications/misc/xpdf/default.nix +++ b/pkgs/applications/misc/xpdf/default.nix @@ -14,7 +14,7 @@ stdenv.mkDerivation { url = ftp://ftp.foolabs.com/pub/xpdf/xpdf-3.02.tar.gz; sha256 = "000zq4ddbwyxiki4vdwpmxbnw5n9hsg9hvwra2p33hslyib7sfmk"; }; - + buildInputs = (if enableGUI then [x11 motif] else []) ++ (if useT1Lib then [t1lib] else []); @@ -38,7 +38,7 @@ stdenv.mkDerivation { }) ./xpdf-3.02-protection.patch ]; - + configureFlags = [ "--enable-a4-paper" ] /* We obey ISO standards! */ ++ (if enablePDFtoPPM then [ From 73a08a19149c756ffe939105520381ecb330d37b Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Thu, 7 Oct 2010 14:05:19 +0000 Subject: [PATCH 69/72] pkgs/tools/networking/x11-ssh-askpass: capitalize first letter of meta.description svn path=/nixpkgs/trunk/; revision=24144 --- pkgs/tools/networking/x11-ssh-askpass/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/tools/networking/x11-ssh-askpass/default.nix b/pkgs/tools/networking/x11-ssh-askpass/default.nix index e9d68c3f6da..5088d92a8c7 100644 --- a/pkgs/tools/networking/x11-ssh-askpass/default.nix +++ b/pkgs/tools/networking/x11-ssh-askpass/default.nix @@ -18,7 +18,7 @@ stdenv.mkDerivation { meta = { homepage = "http://www.jmknoble.net/software/x11-ssh-askpass/"; - description = "lightweight passphrase dialog for OpenSSH or other open variants of SSH"; + description = "Lightweight passphrase dialog for OpenSSH or other open variants of SSH"; platforms = stdenv.lib.platforms.unix; maintainers = []; From 872fa6577d608082c39aac1a82e9ebeb6f774a24 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Thu, 7 Oct 2010 14:06:44 +0000 Subject: [PATCH 70/72] * Update the Xen pvops kernel. svn path=/nixpkgs/trunk/; revision=24145 --- pkgs/os-specific/linux/kernel/linux-2.6.32-xen.nix | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/linux-2.6.32-xen.nix b/pkgs/os-specific/linux/kernel/linux-2.6.32-xen.nix index d77297b2475..20e14ccf5e2 100644 --- a/pkgs/os-specific/linux/kernel/linux-2.6.32-xen.nix +++ b/pkgs/os-specific/linux/kernel/linux-2.6.32-xen.nix @@ -202,11 +202,12 @@ in import ./generic.nix ( rec { - version = "2.6.32.21-xen-2968b25"; + version = "2.6.32.24-xen-179eca5"; + localVersion = "-xen-179eca5"; src = fetchurl { url = "http://nixos.org/tarballs/linux-${version}.tar.bz2"; - sha256 = "06dxwchyxvfwg35y78bs0bm91ah6jlb6pjkqwgdnsgfjnxhibfx9"; + sha256 = "09a7xh4hvw0hzq67dqdxn8p4rkd907937xvshx30rg4ab6717scf"; }; config = configWithPlatform stdenv.platform; From c6f26ed7974fe0b0a3a375fc68df759da5da42e3 Mon Sep 17 00:00:00 2001 From: Sander van der Burg Date: Thu, 7 Oct 2010 15:14:15 +0000 Subject: [PATCH 71/72] Bumped VirtualBox version to 3.2.8 svn path=/nixpkgs/trunk/; revision=24147 --- .../applications/virtualization/virtualbox/default.nix | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/applications/virtualization/virtualbox/default.nix b/pkgs/applications/virtualization/virtualbox/default.nix index d03e30c6603..13b523648c5 100644 --- a/pkgs/applications/virtualization/virtualbox/default.nix +++ b/pkgs/applications/virtualization/virtualbox/default.nix @@ -1,17 +1,17 @@ -{ stdenv, fetchurl, lib, iasl, dev86, libxslt, libxml2, libX11, xproto, libXext +{ stdenv, fetchurl, lib, iasl, dev86, pam, libxslt, libxml2, libX11, xproto, libXext , libXcursor, qt4, libIDL, SDL, hal, libcap, zlib, libpng, glib, kernel , python, which, alsaLib, curl, gawk }: stdenv.mkDerivation { - name = "virtualbox-3.1.8-${kernel.version}"; + name = "virtualbox-3.2.8-${kernel.version}"; src = fetchurl { - url = http://download.virtualbox.org/virtualbox/3.1.8/VirtualBox-3.1.8-OSE.tar.bz2; - sha256 = "118y12k9kv8nfhgnzn3z4d8v75jz6nvy7y1il84cj09lnkkqlz5p"; + url = http://download.virtualbox.org/virtualbox/3.2.8/VirtualBox-3.2.8-OSE.tar.bz2; + sha256 = "00qvgaqg4gsabrc0rba5rh0jxqrjzk2vn6qbkc6nlxvngha95klh"; }; - buildInputs = [iasl dev86 libxslt libxml2 xproto libX11 libXext libXcursor qt4 libIDL SDL hal libcap glib kernel python alsaLib curl]; + buildInputs = [iasl dev86 libxslt libxml2 xproto libX11 libXext libXcursor qt4 libIDL SDL hal libcap glib kernel python alsaLib curl pam]; patchPhase = " set -x From 89a3dc9adac5aa195ec9334c2f7e255e02388157 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= Date: Thu, 7 Oct 2010 20:07:59 +0000 Subject: [PATCH 72/72] nss-mdns: Fix the path to the `avahi-daemon' socket. svn path=/nixpkgs/trunk/; revision=24149 --- pkgs/tools/networking/nss-mdns/default.nix | 22 +++++++++++++--------- 1 file changed, 13 insertions(+), 9 deletions(-) diff --git a/pkgs/tools/networking/nss-mdns/default.nix b/pkgs/tools/networking/nss-mdns/default.nix index 1dd430c7493..dfade689124 100644 --- a/pkgs/tools/networking/nss-mdns/default.nix +++ b/pkgs/tools/networking/nss-mdns/default.nix @@ -1,25 +1,24 @@ -{ fetchurl, stdenv, avahi }: +{ fetchurl, stdenv }: stdenv.mkDerivation rec { name = "nss-mdns-0.10"; + src = fetchurl { url = "http://0pointer.de/lennart/projects/nss-mdns/${name}.tar.gz"; sha256 = "0vgs6j0qsl0mwzh5a0m0bykr7x6bx79vnbyn0r3q289rghp3qs0y"; }; - configureFlags = "--enable-avahi"; - # Note: Although `nss-mdns' works by talking to `avahi-daemon', it # doesn't depend on the Avahi libraries. Instead, it contains # hand-written D-Bus code to talk to the Avahi daemon. - buildInput = [ avahi ]; + configureFlags = + [ # Try to use the Avahi daemon before resolving on our own. + "--enable-avahi" - patchPhase = '' - substituteInPlace "src/Makefile.in" \ - --replace 'AVAHI_SOCKET=\"$(localstatedir)/run/avahi-daemon/socket\"' \ - 'AVAHI_SOCKET=\"${avahi}/var/run/avahi-daemon/socket\"' - ''; + # Connect to the daemon at `/var/run/avahi-daemon/socket'. + "--localstatedir=/var" + ]; meta = { description = "The mDNS Name Service Switch (NSS) plug-in"; @@ -33,5 +32,10 @@ stdenv.mkDerivation rec { homepage = http://0pointer.de/lennart/projects/nss-mdns/; license = "LGPLv2+"; + + # Supports both the GNU and FreeBSD NSS. + platforms = stdenv.lib.platforms.gnu ++ stdenv.lib.platforms.freebsd; + + maintainers = [ stdenv.lib.maintainers.ludo ]; }; }