From b8941c934af747573243fc05e87dadd463775b7b Mon Sep 17 00:00:00 2001 From: Tobias Hammerschmidt Date: Fri, 26 Nov 2010 19:16:31 +0000 Subject: [PATCH 01/86] added myself to maintainers svn path=/nixpkgs/trunk/; revision=24883 --- pkgs/lib/maintainers.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/lib/maintainers.nix b/pkgs/lib/maintainers.nix index e795201755f..9f1f04eec67 100644 --- a/pkgs/lib/maintainers.nix +++ b/pkgs/lib/maintainers.nix @@ -19,6 +19,7 @@ roconnor = "Russell O'Connor "; sander = "Sander van der Burg "; simons = "Peter Simons "; + thammers = "Tobias Hammerschmidt "; urkud = "Yury G. Kudryashov "; viric = "Lluís Batlle i Rossell "; winden = "Antonio Vargas Gonzalez "; From 57c1632f1158da2f6e60b59b029aa212bd55a8e4 Mon Sep 17 00:00:00 2001 From: Tobias Hammerschmidt Date: Fri, 26 Nov 2010 20:04:07 +0000 Subject: [PATCH 02/86] added flvstreamer svn path=/nixpkgs/trunk/; revision=24884 --- pkgs/tools/networking/flvstreamer/default.nix | 39 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 + 2 files changed, 41 insertions(+) create mode 100644 pkgs/tools/networking/flvstreamer/default.nix diff --git a/pkgs/tools/networking/flvstreamer/default.nix b/pkgs/tools/networking/flvstreamer/default.nix new file mode 100644 index 00000000000..c3ac4e205ae --- /dev/null +++ b/pkgs/tools/networking/flvstreamer/default.nix @@ -0,0 +1,39 @@ +{ stdenv, fetchurl }: + +stdenv.mkDerivation rec { + + name = "flvstreamer-2.1c1"; + + src = fetchurl { + url = "http://download.savannah.gnu.org/releases/flvstreamer/source/${name}.tar.gz"; + sha256 = "e90e24e13a48c57b1be01e41c9a7ec41f59953cdb862b50cf3e667429394d1ee"; + }; + + buildPhase = '' + make posix + ''; + + installPhase = '' + ensureDir $out/bin + cp flvstreamer $out/bin + cp streams $out/bin + cp rtmpsrv $out/bin + cp rtmpsuck $out/bin + ''; + + meta = { + description = "flvstreamer is an command-line RTMP client"; + + longDescription = + '' flvstreamer is an open source command-line RTMP client intended to + stream audio or video content from all types of flash or rtmp servers. + ''; + + license = "GPLv2+"; + + homepage = http://savannah.nongnu.org/projects/flvstreamer; + + maintainers = [ stdenv.lib.maintainers.thammers ]; + platforms = stdenv.lib.platforms.linux; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index eaeed3a2104..b0775f888d9 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -616,6 +616,8 @@ let finger_bsd = callPackage ../tools/networking/bsd-finger { }; + flvstreamer = callPackage ../tools/networking/flvstreamer { }; + fontforge = callPackage ../tools/misc/fontforge { }; fontforgeX = callPackage ../tools/misc/fontforge { From 484a795b429eb9e40c526a56ddc6514e22b3b526 Mon Sep 17 00:00:00 2001 From: Michael Raskin <7c6f434c@mail.ru> Date: Sat, 27 Nov 2010 12:59:55 +0000 Subject: [PATCH 03/86] Update Xneur to 0.11.1 svn path=/nixpkgs/trunk/; revision=24889 --- pkgs/applications/misc/xneur/default.nix | 4 ++-- pkgs/applications/misc/xneur/src-for-default.nix | 8 ++++---- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/pkgs/applications/misc/xneur/default.nix b/pkgs/applications/misc/xneur/default.nix index 5a0c5fc1273..c7a302c6589 100644 --- a/pkgs/applications/misc/xneur/default.nix +++ b/pkgs/applications/misc/xneur/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, pkgconfig, xorg, pcre, GStreamer, glib, libxml2 -, aspell, cairo, imlib2, xosd, libnotify, gtk, pango, atk }: +, aspell, cairo, imlib2, xosd, libnotify, gtk, pango, atk, enchant }: let s = import ./src-for-default.nix; in @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { buildInputs = [ xorg.libX11 pkgconfig pcre GStreamer glib libxml2 aspell cairo xorg.libXpm imlib2 xosd xorg.libXt xorg.libXext xorg.libXi libnotify - gtk pango + gtk pango enchant ]; preConfigure = '' diff --git a/pkgs/applications/misc/xneur/src-for-default.nix b/pkgs/applications/misc/xneur/src-for-default.nix index 497d2adfd2c..04a22cea79a 100644 --- a/pkgs/applications/misc/xneur/src-for-default.nix +++ b/pkgs/applications/misc/xneur/src-for-default.nix @@ -1,9 +1,9 @@ rec { - version="0.10.0"; - name="xneur-0.10.0"; - hash="1jh40awnc5bvdj07jv99ymiln8nzr5ac5ahz9v4w0m560b7qq48f"; + version="0.11.1"; + name="xneur-0.11.1"; + hash="12r2wv1glnx3ilqkrypff9r3mxzk1m3yma3khmam1b0z32lfbxxx"; url="http://dists.xneur.ru/release-${version}/tgz/xneur-${version}.tar.bz2"; - advertisedUrl="http://dists.xneur.ru/release-0.10.0/tgz/xneur-0.10.0.tar.bz2"; + advertisedUrl="http://dists.xneur.ru/release-0.11.1/tgz/xneur-0.11.1.tar.bz2"; } From ec741fee8c1fc4207de53c2965d758412817a531 Mon Sep 17 00:00:00 2001 From: Michael Raskin <7c6f434c@mail.ru> Date: Sat, 27 Nov 2010 18:31:05 +0000 Subject: [PATCH 04/86] Adding Allegro library svn path=/nixpkgs/trunk/; revision=24891 --- .../development/libraries/allegro/default.nix | 59 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 + 2 files changed, 61 insertions(+) create mode 100644 pkgs/development/libraries/allegro/default.nix diff --git a/pkgs/development/libraries/allegro/default.nix b/pkgs/development/libraries/allegro/default.nix new file mode 100644 index 00000000000..1669d083f22 --- /dev/null +++ b/pkgs/development/libraries/allegro/default.nix @@ -0,0 +1,59 @@ +x@{builderDefsPackage + , texinfo, libXext, xextproto, libX11, xproto, libXpm, libXt, libXcursor + , alsaLib, cmake, zlib, libpng, libvorbis, libXxf86dga, libXxf86misc + , xf86dgaproto, xf86miscproto, xf86vidmodeproto, libXxf86vm, openal + , ...}: +builderDefsPackage +(a : +let + helperArgNames = ["stdenv" "fetchurl" "builderDefsPackage"] ++ + []; + + buildInputs = map (n: builtins.getAttr n x) + (builtins.attrNames (builtins.removeAttrs x helperArgNames)); + sourceInfo = rec { + baseName="allegro"; + version="4.4.0.1"; + name="${baseName}-${version}"; + project="alleg"; + url="mirror://sourceforge/project/${project}/${baseName}/${version}/${name}.tar.gz"; + hash="0qgkmazr07lmnbj6h6yk10vmcm15gafcwy5jn7xpwy7bahzraiz0"; + }; +in +rec { + src = a.fetchurl { + url = sourceInfo.url; + sha256 = sourceInfo.hash; + }; + + inherit (sourceInfo) name version; + inherit buildInputs; + + /* doConfigure should be removed if not needed */ + phaseNames = ["doCmake" "doMakeInstall"]; + + doCmake = a.fullDepEntry ('' + export NIX_LDFLAGS="$NIX_LDFLAGS -lXext -lX11 -lXpm -lXcursor -lXxf86vm" + cmake -D CMAKE_INSTALL_PREFIX=$out -D CMAKE_SKIP_RPATH=ON . + '') ["minInit" "doUnpack" "addInputs"]; + + makeFlags = [ + ]; + + meta = { + description = "A game programming library"; + license = "free-noncopyleft"; # giftware + maintainers = with a.lib.maintainers; + [ + raskin + ]; + platforms = with a.lib.platforms; + linux; + }; + passthru = { + updateInfo = { + downloadPage = "http://sourceforge.net/projects/alleg/files/"; + }; + }; +}) x + diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index b0775f888d9..a4d83621fd3 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -2584,6 +2584,8 @@ let agg = callPackage ../development/libraries/agg { }; + allegro = callPackage ../development/libraries/allegro {}; + amrnb = callPackage ../development/libraries/amrnb { }; amrwb = callPackage ../development/libraries/amrwb { }; From 961c737634fd3131a190b86442e0f0ff7da8a7e3 Mon Sep 17 00:00:00 2001 From: Michael Raskin <7c6f434c@mail.ru> Date: Sat, 27 Nov 2010 18:41:49 +0000 Subject: [PATCH 05/86] Update Wine svn path=/nixpkgs/trunk/; revision=24892 --- pkgs/misc/emulators/wine/src-for-default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/misc/emulators/wine/src-for-default.nix b/pkgs/misc/emulators/wine/src-for-default.nix index 9f8e7c8914c..86d6bfd00ee 100644 --- a/pkgs/misc/emulators/wine/src-for-default.nix +++ b/pkgs/misc/emulators/wine/src-for-default.nix @@ -1,9 +1,9 @@ rec { - version="1.3.4"; - name="wine-1.3.4"; - hash="1p2zh9c3k0b2ryy8cdldcz6x7mdg0c2gkvj0hxa3bi9cczsqg4s4"; + version="1.3.8"; + name="wine-1.3.8"; + hash="1nxz2xm9xndrsiaiw18g0098dkw7p2k32qsnm0l47giw2h6gdsvf"; url="http://prdownloads.sourceforge.net/wine/wine-${version}.tar.bz2"; - advertisedUrl="http://prdownloads.sourceforge.net/wine/wine-1.3.4.tar.bz2"; + advertisedUrl="http://prdownloads.sourceforge.net/wine/wine-1.3.8.tar.bz2"; } From e5137b9bbfca2654a78f689a1fabe020b70b27c6 Mon Sep 17 00:00:00 2001 From: Michael Raskin <7c6f434c@mail.ru> Date: Sat, 27 Nov 2010 19:18:22 +0000 Subject: [PATCH 06/86] Adding atanks svn path=/nixpkgs/trunk/; revision=24893 --- pkgs/games/atanks/default.nix | 55 +++++++++++++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 57 insertions(+) create mode 100644 pkgs/games/atanks/default.nix diff --git a/pkgs/games/atanks/default.nix b/pkgs/games/atanks/default.nix new file mode 100644 index 00000000000..211e388b871 --- /dev/null +++ b/pkgs/games/atanks/default.nix @@ -0,0 +1,55 @@ +x@{builderDefsPackage + , allegro + , ...}: +builderDefsPackage +(a : +let + helperArgNames = ["stdenv" "fetchurl" "builderDefsPackage"] ++ + []; + + buildInputs = map (n: builtins.getAttr n x) + (builtins.attrNames (builtins.removeAttrs x helperArgNames)); + sourceInfo = rec { + baseName="atanks"; + version="4.7"; + name="${baseName}-${version}"; + project="${baseName}"; + url="mirror://sourceforge/project/${project}/${baseName}/${name}/${name}.tar.gz"; + hash="0kd98anwb785irv4qm1gqpk2xnh1q0fxnfazkjqpwjvgrliyj2rh"; + }; +in +rec { + src = a.fetchurl { + url = sourceInfo.url; + sha256 = sourceInfo.hash; + }; + + inherit (sourceInfo) name version; + inherit buildInputs; + + /* doConfigure should be removed if not needed */ + phaseNames = ["fixInstall" "doMakeInstall"]; + makeFlags=[ + "PREFIX=$out/" + ]; + fixInstall = a.fullDepEntry ('' + sed -e "s@INSTALL=.*bin/install @INSTALL=install @" -i Makefile + sed -e "s@-g 0 -m ... -o 0@@" -i Makefile + '') ["doUnpack" "minInit"]; + + meta = { + description = "Atomic Tanks ballistics game"; + maintainers = with a.lib.maintainers; + [ + raskin + ]; + platforms = with a.lib.platforms; + linux; + }; + passthru = { + updateInfo = { + downloadPage = "http://sourceforge.net/projects/atanks/files/atanks/"; + }; + }; +}) x + diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index a4d83621fd3..32a0291cf26 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -6584,6 +6584,8 @@ let libsigcxx = libsigcxx12; }; + atanks = callPackage ../games/atanks {}; + ballAndPaddle = callPackage ../games/ball-and-paddle { }; blackshades = callPackage ../games/blackshades { }; From 94585b97760988f66c236e38cd7d8ef23237e90c Mon Sep 17 00:00:00 2001 From: Michael Raskin <7c6f434c@mail.ru> Date: Sat, 27 Nov 2010 19:38:34 +0000 Subject: [PATCH 07/86] Add CGUI library svn path=/nixpkgs/trunk/; revision=24894 --- pkgs/development/libraries/cgui/default.nix | 57 +++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 + 2 files changed, 59 insertions(+) create mode 100644 pkgs/development/libraries/cgui/default.nix diff --git a/pkgs/development/libraries/cgui/default.nix b/pkgs/development/libraries/cgui/default.nix new file mode 100644 index 00000000000..6bd3dd41de7 --- /dev/null +++ b/pkgs/development/libraries/cgui/default.nix @@ -0,0 +1,57 @@ +x@{builderDefsPackage + , texinfo, allegro, perl + , ...}: +builderDefsPackage +(a : +let + helperArgNames = ["stdenv" "fetchurl" "builderDefsPackage"] ++ + []; + + buildInputs = map (n: builtins.getAttr n x) + (builtins.attrNames (builtins.removeAttrs x helperArgNames)); + sourceInfo = rec { + baseName="cgui"; + version="2.0.3"; + name="${baseName}-${version}"; + project="${baseName}"; + url="mirror://sourceforge/project/${project}/${version}/${name}.tar.gz"; + hash="00kk4xaw68m44awy8zq4g5plx372swwccvzshn68a0a8f3f2wi4x"; + }; +in +rec { + src = a.fetchurl { + url = sourceInfo.url; + sha256 = sourceInfo.hash; + }; + + inherit (sourceInfo) name version; + inherit buildInputs; + + /* doConfigure should be removed if not needed */ + phaseNames = ["genMakefile" "doMakeInstall"]; + + genMakefile = a.fullDepEntry ('' + export NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE -fPIC" + sh fix.sh unix + '') ["minInit" "doUnpack" "addInputs"]; + + makeFlags = [ + "SYSTEM_DIR=$out" + ]; + + meta = { + description = "A multiplatform basic GUI library"; + maintainers = with a.lib.maintainers; + [ + raskin + ]; + platforms = with a.lib.platforms; + linux; + }; + passthru = { + updateInfo = { + downloadPage = "http://sourceforge.net/projects/cgui/files/"; + }; + }; +}) x + diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 32a0291cf26..fe38c3e263c 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -2650,6 +2650,8 @@ let ccrtp = callPackage ../development/libraries/ccrtp { }; + cgui = callPackage ../development/libraries/cgui {}; + check = callPackage ../development/libraries/check { }; chipmunk = builderDefsPackage (import ../development/libraries/chipmunk) { From 675f6eb0c89a9d3ae68496192e55d70fc9b23a3f Mon Sep 17 00:00:00 2001 From: Karn Kallio Date: Sat, 27 Nov 2010 20:54:35 +0000 Subject: [PATCH 08/86] Add Nix expression for Perl module SQL::Translator ( also known as SQL Fairy) and dependencies. svn path=/nixpkgs/trunk/; revision=24895 --- ...d-options-passthrough-and-fontconfig.patch | 49 ++++++ pkgs/top-level/perl-packages.nix | 151 +++++++++++++++++- 2 files changed, 195 insertions(+), 5 deletions(-) create mode 100644 pkgs/development/perl-modules/gd-options-passthrough-and-fontconfig.patch diff --git a/pkgs/development/perl-modules/gd-options-passthrough-and-fontconfig.patch b/pkgs/development/perl-modules/gd-options-passthrough-and-fontconfig.patch new file mode 100644 index 00000000000..24eab55f6eb --- /dev/null +++ b/pkgs/development/perl-modules/gd-options-passthrough-and-fontconfig.patch @@ -0,0 +1,49 @@ +This patch configures Getopt::Long to pass options +so they will be available at the second GetOptions call. + +Also an option to specify the search path for libfontconfig +is added. +diff -Naur GD-2.45/Makefile.PL GD-2.45-patched/Makefile.PL +--- GD-2.45/Makefile.PL 2009-07-10 13:40:07.000000000 -0430 ++++ GD-2.45-patched/Makefile.PL 2010-11-26 22:48:52.372992578 -0430 +@@ -16,9 +16,9 @@ + my (@INC,@LIBPATH,@LIBS); + my $AUTOCONFIG = 0; # global set by try_to_autoconfigure() below + +-my ($options,$lib_gd_path,$lib_ft_path,$lib_png_path,$lib_jpeg_path,$lib_xpm_path,$lib_zlib_path,$force); ++my ($options,$lib_gd_path,$lib_ft_path,$lib_png_path,$lib_jpeg_path,$lib_xpm_path,$lib_zlib_path,$lib_fontconfig_path,$force); + +-use Getopt::Long; ++use Getopt::Long qw(:config pass_through); + GetOptions("ignore_missing_gd" => \$force); + + unless (try_to_autoconfigure(\$options,\$lib_gd_path,\@INC,\@LIBPATH,\@LIBS) || $force) { +@@ -49,6 +49,7 @@ + "lib_jpeg_path=s" => \$lib_jpeg_path, + "lib_xpm_path=s" => \$lib_xpm_path, + "lib_zlib_path=s" => \$lib_zlib_path, ++ "lib_fontconfig_path=s" => \$lib_fontconfig_path, + ); + unless ($result) { + print STDERR < Date: Sun, 28 Nov 2010 09:17:42 +0000 Subject: [PATCH 09/86] =?UTF-8?q?ati-drivers:=20version=20bump.=20Patch=20?= =?UTF-8?q?by:=20Cillian=20de=20R=C3=B3iste.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit svn path=/nixpkgs/trunk/; revision=24896 --- pkgs/os-specific/linux/ati-drivers/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/os-specific/linux/ati-drivers/default.nix b/pkgs/os-specific/linux/ati-drivers/default.nix index db25bebb06c..248e24c90bd 100644 --- a/pkgs/os-specific/linux/ati-drivers/default.nix +++ b/pkgs/os-specific/linux/ati-drivers/default.nix @@ -21,7 +21,7 @@ in stdenv.mkDerivation rec { name = "ati-drivers-${version}"; - version = "10-10-x86"; + version = "10-11-x86"; builder = ./builder.sh; @@ -30,8 +30,8 @@ stdenv.mkDerivation rec { src = assert stdenv.system == "x86_64-linux"; fetchurl { - url = https://a248.e.akamai.net/f/674/9206/0/www2.ati.com/drivers/linux/ati-driver-installer-10-10-x86.x86_64.run; - sha256 = "1g71sj8qbarshw3hfds2v6y9q7lma3d36d0x79c7vvgllcd5c76x"; + url = https://a248.e.akamai.net/f/674/9206/0/www2.ati.com/drivers/linux/ati-driver-installer-10-11-x86.x86_64.run; + sha256 = "1z33w831ayx1j5lm9d1xv6whkmzsz9v8li3s8c96hwnwki6zpimr"; }; buildInputs = [xlibs.libXext xlibs.libX11 From 5e994b9153f07e08f462de9f253a0ceb6ad1d84e Mon Sep 17 00:00:00 2001 From: Evgeny Egorochkin Date: Sun, 28 Nov 2010 09:21:36 +0000 Subject: [PATCH 10/86] ekiga: fix build failure. Patch by Karn Kallio. svn path=/nixpkgs/trunk/; revision=24897 --- pkgs/applications/networking/ekiga/default.nix | 2 +- pkgs/servers/evolution-data-server/default.nix | 2 +- pkgs/top-level/all-packages.nix | 3 +-- 3 files changed, 3 insertions(+), 4 deletions(-) diff --git a/pkgs/applications/networking/ekiga/default.nix b/pkgs/applications/networking/ekiga/default.nix index 46af2275c37..d411c3b0f57 100644 --- a/pkgs/applications/networking/ekiga/default.nix +++ b/pkgs/applications/networking/ekiga/default.nix @@ -3,7 +3,7 @@ x@{builderDefsPackage , perl, perlXMLParser, evolution_data_server, gnome_doc_utils, avahi , libsigcxx, gtk, dbus_glib, libnotify, libXext, xextproto, automake , autoconf, pkgconfig, libxml2, videoproto, unixODBC, db4, nspr, nss, zlib - , libXrandr, randrproto, which, libxslt + , libXrandr, randrproto, which, libxslt, libtasn1 , ...}: builderDefsPackage (a : diff --git a/pkgs/servers/evolution-data-server/default.nix b/pkgs/servers/evolution-data-server/default.nix index d313da9f2f9..84c1eee57e5 100644 --- a/pkgs/servers/evolution-data-server/default.nix +++ b/pkgs/servers/evolution-data-server/default.nix @@ -3,7 +3,7 @@ x@{builderDefsPackage , db4, krb5, openldap, glib, libxml2, GConf , nss, gtk, libgnome, libsoup, gnome_keyring , gtkdoc, sqlite, libgweather, libical, icu - , dbus_glib, gperf, nspr, gdk_pixbuf ? null + , dbus_glib, gperf, nspr , ...}: builderDefsPackage (a : diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index fe38c3e263c..cab56d41736 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -7034,8 +7034,7 @@ let dpkg = callPackage ../tools/package-management/dpkg { }; - ekiga = lib.callPackageWith (pkgs // pkgs.xorg // pkgs.gtkLibs // pkgs.gnome) - ../applications/networking/ekiga {}; + ekiga = newScope (pkgs.gtkLibs // pkgs.gnome) ../applications/networking/ekiga { }; electricsheep = callPackage ../misc/screensavers/electricsheep { }; From a729c92721c32844fed9fe4152f18b8dccba2dd1 Mon Sep 17 00:00:00 2001 From: Evgeny Egorochkin Date: Sun, 28 Nov 2010 09:27:45 +0000 Subject: [PATCH 11/86] =?UTF-8?q?Chromium:=20fix=20deps=20and=20clean=20up?= =?UTF-8?q?.=20Patch=20by=20Cillian=20de=20R=C3=B3iste.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit svn path=/nixpkgs/trunk/; revision=24898 --- .../networking/browsers/chromium/default.nix | 57 ++++++------------- 1 file changed, 16 insertions(+), 41 deletions(-) diff --git a/pkgs/applications/networking/browsers/chromium/default.nix b/pkgs/applications/networking/browsers/chromium/default.nix index caa8430f0cd..db8adeeb45f 100644 --- a/pkgs/applications/networking/browsers/chromium/default.nix +++ b/pkgs/applications/networking/browsers/chromium/default.nix @@ -1,61 +1,37 @@ -{ stdenv -, fetchurl -, ffmpeg -, cairo -, pango -, glib -, libXrender -, libXScrnSaver -, gtk -, nspr -, nss -, fontconfig -, freetype -, alsaLib -, libX11 -, GConf -, libXext -, libXt -, atk -, makeWrapper -, unzip -, expat -, zlib -, libjpeg -, bzip2 -, libpng -, dbus -, dbus_glib -, patchelf -, cups -, libgcrypt -}: +{ GConf, alsaLib, atk, bzip2, cairo, cups, dbus, dbus_glib, + expat, fetchurl, ffmpeg, fontconfig, freetype, glib, gtk, + libX11, libXScrnSaver, libXdamage, libXext, libXrender, libXt, + libgcrypt, libjpeg, libpng, makeWrapper, nspr, nss, pango, + patchelf, stdenv, unzip, zlib }: assert stdenv.system == "i686-linux" || stdenv.system == "x86_64-linux" ; stdenv.mkDerivation rec { name = "chrome-${version}"; version = "65039"; - src = - if stdenv.system == "x86_64-linux" then + src = + if stdenv.system == "x86_64-linux" then fetchurl { url = "http://build.chromium.org/buildbot/snapshots/chromium-rel-linux-64/${version}/chrome-linux.zip"; sha256 = "1ad7kwd1w1958mb3pwzhshawrf2nlxdsf0gy7d2q4qnx5d809vws"; - } - else if stdenv.system == "i686-linux" then + } + else if stdenv.system == "i686-linux" then fetchurl { url = "http://build.chromium.org/buildbot/snapshots/chromium-rel-linux/${version}/chrome-linux.zip"; sha256 = "06hz3gvv3623ldrj141w3mnzw049yylvv9b9q5r6my8icm722phf"; - } + } else throw "Chromium is not supported on this platform."; phases = "unpackPhase installPhase"; buildInputs = [makeWrapper unzip]; - libPath = + libPath = stdenv.lib.makeLibraryPath - [ stdenv.gcc.libc stdenv.gcc.gcc ffmpeg cairo pango glib libXrender gtk nspr nss fontconfig freetype alsaLib libX11 GConf libXext atk libXt expat zlib libjpeg bzip2 libpng libXScrnSaver dbus dbus_glib cups libgcrypt] ; + [ GConf alsaLib atk bzip2 cairo cups dbus dbus_glib expat + ffmpeg fontconfig freetype glib gtk libX11 libXScrnSaver + libXdamage libXext libXrender libXt libgcrypt libjpeg libpng + nspr nss pango stdenv.gcc.gcc zlib stdenv.gcc.libc ]; installPhase = '' ensureDir $out/bin @@ -64,8 +40,7 @@ stdenv.mkDerivation rec { cp -R * $out/chrome ln -s $out/chrome/chrome $out/bin/chrome - ${patchelf}/bin/patchelf --interpreter "$(cat $NIX_GCC/nix-support/dynamic-linker)" --set-rpath ${libPath}:$out/lib:${stdenv.gcc.gcc}/lib64:${stdenv.gcc.gcc}/lib $out/chrome/chrome - + ${patchelf}/bin/patchelf --interpreter "$(cat $NIX_GCC/nix-support/dynamic-linker)" --set-rpath ${libPath}:$out/lib:${stdenv.gcc.gcc}/lib64:${stdenv.gcc.gcc}/lib $out/chrome/chrome ln -s ${nss}/lib/libsmime3.so $out/lib/libsmime3.so.1d ln -s ${nss}/lib/libnssutil3.so $out/lib/libnssutil3.so.1d From b89f2ef1e4061358d9b27a0bd19569b7b01534c0 Mon Sep 17 00:00:00 2001 From: Evgeny Egorochkin Date: Sun, 28 Nov 2010 09:46:51 +0000 Subject: [PATCH 12/86] system-config-printer: fix runtime errors. Patch by Karn Kallio. svn path=/nixpkgs/trunk/; revision=24899 --- pkgs/tools/misc/system-config-printer/default.nix | 11 +++++++++-- pkgs/top-level/all-packages.nix | 5 ++++- 2 files changed, 13 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/misc/system-config-printer/default.nix b/pkgs/tools/misc/system-config-printer/default.nix index 4191ffd6f80..99873766024 100644 --- a/pkgs/tools/misc/system-config-printer/default.nix +++ b/pkgs/tools/misc/system-config-printer/default.nix @@ -1,5 +1,7 @@ {stdenv, fetchurl, udev, intltool, python, pkgconfig, glib, xmlto, - docbook_xml_dtd_412, docbook_xsl, libxml2, desktop_file_utils, libusb, cups}: + makeWrapper, pygobject, pygtk, docbook_xml_dtd_412, docbook_xsl, + pythonDBus, libxml2, desktop_file_utils, libusb, cups, pycups, + notify }: stdenv.mkDerivation rec { name = "${meta.name}-${meta.version}"; @@ -9,10 +11,15 @@ stdenv.mkDerivation rec { sha256 = "16xjvahmdkkix7281gx7ac9zqaxgfb7pjjlgcc6kmw52cifk86ww"; }; buildInputs = [ udev intltool python pkgconfig glib xmlto docbook_xml_dtd_412 - libxml2 docbook_xsl desktop_file_utils libusb cups]; + libxml2 docbook_xsl desktop_file_utils libusb cups makeWrapper pygobject + pygtk pythonDBus pycups notify ]; configureFlags = "--with-udev-rules"; + postInstall = '' + wrapProgram $out/bin/system-config-printer --set PYTHONPATH "$PYTHONPATH:$(toPythonPath $out):$(toPythonPath ${notify})/gtk-2.0" + ''; + meta = { name = "system-config-printer"; version = "1.2.4"; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index cab56d41736..11baab26eb2 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -1213,7 +1213,10 @@ let svnfs = callPackage ../tools/filesystems/svnfs { }; - system_config_printer = callPackage ../tools/misc/system-config-printer { }; + system_config_printer = callPackage ../tools/misc/system-config-printer { + inherit (pythonPackages) notify; + libxml2 = libxml2Python; + }; sitecopy = callPackage ../tools/networking/sitecopy { }; From 676562ac1516494bbfec627361ef364c81ceb50c Mon Sep 17 00:00:00 2001 From: Evgeny Egorochkin Date: Sun, 28 Nov 2010 09:59:13 +0000 Subject: [PATCH 13/86] encfs: packaged. Patch by Ambrus Kaposi. svn path=/nixpkgs/trunk/; revision=24900 --- pkgs/development/libraries/rlog/default.nix | 15 +++++++++++++++ pkgs/tools/filesystems/encfs/default.nix | 19 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 4 ++++ 3 files changed, 38 insertions(+) create mode 100644 pkgs/development/libraries/rlog/default.nix create mode 100644 pkgs/tools/filesystems/encfs/default.nix diff --git a/pkgs/development/libraries/rlog/default.nix b/pkgs/development/libraries/rlog/default.nix new file mode 100644 index 00000000000..aae67868884 --- /dev/null +++ b/pkgs/development/libraries/rlog/default.nix @@ -0,0 +1,15 @@ +{ stdenv, fetchurl }: + +stdenv.mkDerivation { + name = "rlog-1.4"; + + src = fetchurl { + url = "http://rlog.googlecode.com/files/rlog-1.4.tar.gz"; + sha256 = "0y9zg0pd7vmnskwac1qdyzl282z7kb01nmn57lsg2mjdxgnywf59"; + }; + + meta = { + homepage = http://www.arg0.net/rlog; + description = "A C++ logging library used in encfs"; + }; +} diff --git a/pkgs/tools/filesystems/encfs/default.nix b/pkgs/tools/filesystems/encfs/default.nix new file mode 100644 index 00000000000..c950810026a --- /dev/null +++ b/pkgs/tools/filesystems/encfs/default.nix @@ -0,0 +1,19 @@ +{ stdenv, fetchurl, openssl, fuse, boost, rlog }: + +stdenv.mkDerivation { + name = "encfs-1.6.1"; + + src = fetchurl { + url = "http://encfs.googlecode.com/files/encfs-1.6-1.tgz"; + sha256 = "0k50ic5nyibb9giif9dqm6sj20q0yzri3drg78m788z17xp060mw"; + }; + + buildInputs = [ boost fuse openssl rlog ]; + + configureFlags = "--with-boost-serialization=boost_wserialization --with-boost-filesystem=boost_filesystem"; + + meta = { + homepage = http://www.arg0.net/encfs; + description = "EncFS provides an encrypted filesystem in user-space via FUSE"; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 11baab26eb2..d8506eb166c 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -584,6 +584,8 @@ let enblendenfuse = callPackage ../tools/graphics/enblend-enfuse { }; + encfs = callPackage ../tools/filesystems/encfs { }; + enscript = callPackage ../tools/text/enscript { }; ethtool = callPackage ../tools/misc/ethtool { }; @@ -3818,6 +3820,8 @@ let jvm = gcj; }; + rlog = callPackage ../development/libraries/rlog { }; + rte = callPackage ../development/libraries/rte { }; rubberband = callPackage ../development/libraries/rubberband { From 4d715b2e5378f1f5c0bcadf21ad7142a6c2ee3c2 Mon Sep 17 00:00:00 2001 From: Evgeny Egorochkin Date: Sun, 28 Nov 2010 10:04:41 +0000 Subject: [PATCH 14/86] kmplayer: version bump svn path=/nixpkgs/trunk/; revision=24901 --- pkgs/applications/video/kmplayer/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/video/kmplayer/default.nix b/pkgs/applications/video/kmplayer/default.nix index 51ae56cc8e4..a665670d9c9 100644 --- a/pkgs/applications/video/kmplayer/default.nix +++ b/pkgs/applications/video/kmplayer/default.nix @@ -1,10 +1,10 @@ {stdenv, fetchurl, lib, cmake, qt4, perl, gettext, pango, gtk, dbus_glib, kdelibs, automoc4, phonon}: stdenv.mkDerivation { - name = "kmplayer-0.11.2a"; + name = "kmplayer-0.11.2b"; src = fetchurl { - url = http://kmplayer.kde.org/pkgs/kmplayer-0.11.2a.tar.bz2; - sha256 = "1ddrghwsz11nhdxkca7jz0q2z1ajdb47n325h32jp5q7rm2qz80k"; + url = http://kmplayer.kde.org/pkgs/kmplayer-0.11.2b.tar.bz2; + sha256 = "00a1pw31p849cbgskyfi8jni9ar6yi2ivr625vza2za6apdxvkr7"; }; builder = ./builder.sh; buildInputs = [ cmake qt4 perl gettext stdenv.gcc.libc pango gtk dbus_glib kdelibs automoc4 phonon ]; From 51492e55337f0022073a11c0ec60ea8669b536c4 Mon Sep 17 00:00:00 2001 From: Evgeny Egorochkin Date: Sun, 28 Nov 2010 10:07:49 +0000 Subject: [PATCH 15/86] openbox: packaged. Patch by rixed@happyleptic.org. svn path=/nixpkgs/trunk/; revision=24902 --- .../window-managers/openbox/default.nix | 18 ++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 20 insertions(+) create mode 100644 pkgs/applications/window-managers/openbox/default.nix diff --git a/pkgs/applications/window-managers/openbox/default.nix b/pkgs/applications/window-managers/openbox/default.nix new file mode 100644 index 00000000000..016325140e0 --- /dev/null +++ b/pkgs/applications/window-managers/openbox/default.nix @@ -0,0 +1,18 @@ +{ stdenv, fetchurl, pkgconfig, glib, pango, libxml2, libXau }: + +stdenv.mkDerivation rec { + name = "openbox-3-4-11-2"; + + buildInputs = [ pkgconfig glib pango libxml2 libXau ]; + + src = fetchurl { + url = http://openbox.org/dist/openbox/openbox-3.4.11.2.tar.gz; + sha256 = "2e7579389c30e6bb08cc721a2c1af512e049fec2670e71715aa1c4e129ec349d"; + }; + + meta = { + description = "X window manager for non-desktop embedded systems"; + homepage = http://openbox.org/; + license = "GPLv2+"; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index d8506eb166c..29126ce8ba0 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -6107,6 +6107,8 @@ let nvi = callPackage ../applications/editors/nvi { }; + openbox = callPackage ../applications/window-managers/openbox { }; + openjump = callPackage ../applications/misc/openjump { }; openoffice = callPackage ../applications/office/openoffice { From b909a4ce765082248eac1fa4c60352ed818d3fa9 Mon Sep 17 00:00:00 2001 From: Evgeny Egorochkin Date: Sun, 28 Nov 2010 10:14:07 +0000 Subject: [PATCH 16/86] Virtualbox guest additions: fix runtime dep on which. Patch by Rohan Hart. svn path=/nixpkgs/trunk/; revision=24903 --- .../virtualbox/guest-additions/default.nix | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/virtualization/virtualbox/guest-additions/default.nix b/pkgs/applications/virtualization/virtualbox/guest-additions/default.nix index bb9b8eea08c..eb8a9155142 100644 --- a/pkgs/applications/virtualization/virtualbox/guest-additions/default.nix +++ b/pkgs/applications/virtualization/virtualbox/guest-additions/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, lib, patchelf, cdrkit, kernel +{ stdenv, fetchurl, lib, patchelf, cdrkit, kernel, which, makeWrapper , libX11, libXt, libXext, libXmu, libXcomposite, libXfixes, libXrandr, libXcursor}: stdenv.mkDerivation { @@ -8,7 +8,14 @@ stdenv.mkDerivation { sha256 = "1pyfgrcdmw6zf3yxgzcd8c5qzqqn62bz4085ka453gfmi9d65lys"; }; KERN_DIR = "${kernel}/lib/modules/*/build"; - buildInputs = [ patchelf cdrkit ]; + buildInputs = [ patchelf cdrkit makeWrapper ]; + + installPhase = '' + ensureDir $out + cp -r install/* $out + + ''; + buildCommand = '' ${if stdenv.system == "i686-linux" then '' isoinfo -J -i $src -x /VBoxLinuxAdditions-x86.run > ./VBoxLinuxAdditions-x86.run @@ -73,6 +80,9 @@ stdenv.mkDerivation { install -m 755 bin/VBoxControl $out/bin install -m 755 bin/VBoxClient-all $out/bin + wrapProgram $out/bin/VBoxClient-all \ + --prefix PATH : "${which}/bin" + # Install OpenGL libraries ensureDir $out/lib cp -v lib/VBoxOGL*.so $out/lib From 1db5a9df76d1fbad40077acc03141782edd900e3 Mon Sep 17 00:00:00 2001 From: Tobias Hammerschmidt Date: Sun, 28 Nov 2010 12:38:35 +0000 Subject: [PATCH 17/86] added tmux svn path=/nixpkgs/trunk/; revision=24904 --- pkgs/tools/misc/tmux/default.nix | 40 ++++++++++++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 42 insertions(+) create mode 100644 pkgs/tools/misc/tmux/default.nix diff --git a/pkgs/tools/misc/tmux/default.nix b/pkgs/tools/misc/tmux/default.nix new file mode 100644 index 00000000000..10793753ab5 --- /dev/null +++ b/pkgs/tools/misc/tmux/default.nix @@ -0,0 +1,40 @@ +{stdenv, fetchurl, ncurses, libevent}: + +stdenv.mkDerivation rec { + pname = "tmux"; + version = "1.3"; + name = "${pname}-${version}"; + + src = fetchurl { + url = "mirror://sourceforge/${pname}/${name}.tar.gz"; + sha256 = "72c2d6f1c30fb4ccbd29b530a7d8a08e67c9c2d87ac8d67e3806561670fc0362"; + }; + + makeFlags = "PREFIX=\${out}"; + + buildInputs = [ ncurses libevent ]; + + meta = { + homepage = http://tmux.sourceforge.net/; + description = "tmux is a terminal multiplexer"; + + longDescription = + '' tmux is intended to be a modern, BSD-licensed alternative to programs such as GNU screen. Major features include: + + * A powerful, consistent, well-documented and easily scriptable command interface. + * A window may be split horizontally and vertically into panes. + * Panes can be freely moved and resized, or arranged into preset layouts. + * Support for UTF-8 and 256-colour terminals. + * Copy and paste with multiple buffers. + * Interactive menus to select windows, sessions or clients. + * Change the current window by searching for text in the target. + * Terminal locking, manually or after a timeout. + * A clean, easily extended, BSD-licensed codebase, under active development. + ''; + + license = stdenv.lib.licenses.bsd3; + + platforms = stdenv.lib.platforms.unix; + maintainers = [ stdenv.lib.maintainers.thammers ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 29126ce8ba0..79a6c8db974 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -1239,6 +1239,8 @@ let extraFonts = true; }; + tmux = callPackage ../tools/misc/tmux { }; + tor = callPackage ../tools/security/tor { }; torsocks = callPackage ../tools/security/tor/torsocks.nix { }; From a095746651fc90105f3eabdd69a63308e476f40c Mon Sep 17 00:00:00 2001 From: Michael Raskin <7c6f434c@mail.ru> Date: Sun, 28 Nov 2010 13:16:47 +0000 Subject: [PATCH 18/86] Add stardust svn path=/nixpkgs/trunk/; revision=24905 --- pkgs/games/stardust/default.nix | 62 +++++++++++++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 64 insertions(+) create mode 100644 pkgs/games/stardust/default.nix diff --git a/pkgs/games/stardust/default.nix b/pkgs/games/stardust/default.nix new file mode 100644 index 00000000000..c7ee0df6a7a --- /dev/null +++ b/pkgs/games/stardust/default.nix @@ -0,0 +1,62 @@ +x@{builderDefsPackage + , zlib, libtiff, libxml2, SDL, xproto, libX11, libXi, inputproto, libXmu + , libXext, xextproto, mesa + , ...}: +builderDefsPackage +(a : +let + helperArgNames = ["stdenv" "fetchurl" "builderDefsPackage"] ++ + []; + + buildInputs = map (n: builtins.getAttr n x) + (builtins.attrNames (builtins.removeAttrs x helperArgNames)); + sourceInfo = rec { + baseName="stardust"; + version="0.1.13"; + name="${baseName}-${version}"; + url="http://iwar.free.fr/IMG/gz/${name}.tar.gz"; + hash="19rs9lz5y5g2yiq1cw0j05b11digw40gar6rw8iqc7bk3s8355xp"; + }; +in +rec { + src = a.fetchurl { + url = sourceInfo.url; + sha256 = sourceInfo.hash; + }; + + inherit (sourceInfo) name version; + inherit buildInputs; + + /* doConfigure should be removed if not needed */ + phaseNames = ["doConfigure" "fixPaths" "doMakeInstall"]; + + configureFlags = [ + "--bindir=$out/bin" + "--datadir=$out/share" + ]; + + makeFlags = [ + "bindir=$out/bin" + "datadir=$out/share" + ]; + + fixPaths = a.fullDepEntry ('' + sed -e "s@#define PACKAGE .*@#define PACKAGE \"stardust\"@" -i config.h + '') ["minInit"]; + + meta = { + description = "Space flight simulator"; + maintainers = with a.lib.maintainers; + [ + raskin + ]; + platforms = with a.lib.platforms; + linux; + }; + passthru = { + updateInfo = { + downloadPage = "http://iwar.free.fr/article.php3?id_article=6"; + }; + }; +}) x + diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 79a6c8db974..6203a896004 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -6725,6 +6725,8 @@ let stdenv = stdenv2; }; + stardust = callPackage ../games/stardust {}; + superTux = callPackage ../games/super-tux { }; superTuxKart = callPackage ../games/super-tux-kart { }; From b01f33c2b8cd11cf3596fa07194b9d7201ebbb06 Mon Sep 17 00:00:00 2001 From: Michael Raskin <7c6f434c@mail.ru> Date: Sun, 28 Nov 2010 13:46:32 +0000 Subject: [PATCH 19/86] Update gajim svn path=/nixpkgs/trunk/; revision=24906 --- .../networking/instant-messengers/gajim/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/instant-messengers/gajim/default.nix b/pkgs/applications/networking/instant-messengers/gajim/default.nix index 2d0b8fa0105..bca70d14c00 100644 --- a/pkgs/applications/networking/instant-messengers/gajim/default.nix +++ b/pkgs/applications/networking/instant-messengers/gajim/default.nix @@ -2,7 +2,7 @@ a : let fetchurl = a.fetchurl; - version = a.lib.attrByPath ["version"] "0.14" a; + version = a.lib.attrByPath ["version"] "0.14.1" a; buildInputs = with a; [ python pyGtkGlade gtk perl intltool dbus gettext pkgconfig makeWrapper libglade pyopenssl libXScrnSaver @@ -14,7 +14,7 @@ in rec { src = fetchurl { url = "http://www.gajim.org/downloads/0.14/gajim-${version}.tar.gz"; - sha256 = "3dc31b76f5e019515947b81685ec0e62ca20318b13cb80df4f4d7a045242d5bd"; + sha256 = "ef757572acf3f3d59408fd95b7ec99bc0e39c5b8c66bc61c78ba65e71c3d8e18"; }; inherit buildInputs; From aa01c8abd6a53e61f091091677a474e8600f91d2 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Sun, 28 Nov 2010 16:37:48 +0000 Subject: [PATCH 20/86] * Added xdelta. svn path=/nixpkgs/trunk/; revision=24907 --- pkgs/tools/compression/xdelta/default.nix | 24 +++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 26 insertions(+) create mode 100644 pkgs/tools/compression/xdelta/default.nix diff --git a/pkgs/tools/compression/xdelta/default.nix b/pkgs/tools/compression/xdelta/default.nix new file mode 100644 index 00000000000..c85c7366cda --- /dev/null +++ b/pkgs/tools/compression/xdelta/default.nix @@ -0,0 +1,24 @@ +{ stdenv, fetchurl }: + +stdenv.mkDerivation { + name = "xdelta-3.0z"; + + src = fetchurl { + url = http://xdelta.googlecode.com/files/xdelta3.0z.tar.gz; + sha256 = "1rpk4n3yz8x81vakzn3n75h79a2ycm06p5v72djklx0wn9gb412m"; + }; + + installPhase = + '' + mkdir -p $out/bin + cp xdelta3 $out/bin/ + + mkdir -p $out/share/man/man1 + cp xdelta3.1 $out/share/man/man1/ + ''; + + meta = { + homepage = http://xdelta.org/; + description = "A binary diff tool that uses the VCDIFF (RFC 3284) format and compression"; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 6203a896004..fe9ad364e75 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -1397,6 +1397,8 @@ let xclip = callPackage ../tools/misc/xclip { }; + xdelta = callPackage ../tools/compression/xdelta { }; + xfsprogs = callPackage ../tools/filesystems/xfsprogs { }; xmlroff = callPackage ../tools/typesetting/xmlroff { From 9feaa9db9494f0529210b38aee7adb37d97871d7 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Mon, 29 Nov 2010 09:52:50 +0000 Subject: [PATCH 21/86] * Linux 2.6.32.26. svn path=/nixpkgs/trunk/; revision=24911 --- 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 3466b399722..a81085fd5e2 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.25"; + version = "2.6.32.26"; src = fetchurl { url = "mirror://kernel/linux/kernel/v2.6/linux-${version}.tar.bz2"; - sha256 = "1ycri78c335qqmfqxg8c4m03f6gy0q1y35yv7yg2f2m6aqhylh2z"; + sha256 = "1kpkl5ps8xrwddmn90rzynra49am9rdm37smplhf3w3ifvpc1mf3"; }; config = configWithPlatform stdenv.platform; From c7e8b0132380ef384f8e3e16f15c7eafa6d07cd6 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Mon, 29 Nov 2010 09:54:37 +0000 Subject: [PATCH 22/86] * Subversion 1.6.15. svn path=/nixpkgs/trunk/; revision=24912 --- pkgs/applications/version-management/subversion/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/version-management/subversion/default.nix b/pkgs/applications/version-management/subversion/default.nix index 0c94d96a999..f66b0ed78b3 100644 --- a/pkgs/applications/version-management/subversion/default.nix +++ b/pkgs/applications/version-management/subversion/default.nix @@ -19,13 +19,13 @@ assert compressionSupport -> neon.compressionSupport; stdenv.mkDerivation rec { - version = "1.6.12"; + version = "1.6.15"; name = "subversion-${version}"; src = fetchurl { url = "http://subversion.tigris.org/downloads/${name}.tar.bz2"; - sha1 = "b4ae7c75abbbdade8b2c9122ca7e2e26c6468a82"; + sha1 = "b6fadf944a94b86f989f07bc2d781be41df017bf"; }; buildInputs = [ zlib apr aprutil sqlite ] From 9d4fb7d641e176f99813598db8d45f57ccd80fa5 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 29 Nov 2010 11:12:43 +0000 Subject: [PATCH 23/86] pkgs/development/interpreters/r-lang: updated to version 2.12.0 svn path=/nixpkgs/trunk/; revision=24913 --- pkgs/development/interpreters/r-lang/default.nix | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) diff --git a/pkgs/development/interpreters/r-lang/default.nix b/pkgs/development/interpreters/r-lang/default.nix index 63971dece1f..e410f8ea84d 100644 --- a/pkgs/development/interpreters/r-lang/default.nix +++ b/pkgs/development/interpreters/r-lang/default.nix @@ -4,14 +4,20 @@ withBioconductor ? false stdenv.mkDerivation { name = "r-lang"; - version = "2.7.0"; + version = "2.12.0"; src = fetchurl { - url = http://cran.r-project.org/src/base/R-2/R-2.7.0.tar.gz; - sha256 = "17ql1j5d9rfpxs04j9v9qyxiysc9nh6yr43lgfdamayzjpia5jqm"; + url = http://cran.r-project.org/src/base/R-2/R-2.12.0.tar.gz; + sha256 = "93d72d845b01c6cd00e58f04b5e78fd6c83de96a8620505ad2a016772af02179"; }; bioconductor = if withBioconductor then import ../development/libraries/science/biology/bioconductor { inherit fetchurl stdenv readline; } else null; - + + postUnpack = '' + gunzip R-2.12.0/src/library/Recommended/Matrix_0.999375-44.tar.gz + tar --file=R-2.12.0/src/library/Recommended/Matrix_0.999375-44.tar --delete Matrix/src/dummy.cpp + gzip R-2.12.0/src/library/Recommended/Matrix_0.999375-44.tar + ''; + buildInputs = [readline perl gfortran libpng libX11 libXt zlib]; configureFlags = ["--enable-R-shlib"] ; From b173267123573e34223d2aded9b9fd2b8323aebc Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 29 Nov 2010 11:13:03 +0000 Subject: [PATCH 24/86] pkgs/development/interpreters/r-lang: cosmetic improvements to package description, etc. svn path=/nixpkgs/trunk/; revision=24914 --- .../interpreters/r-lang/default.nix | 19 ++++++++++--------- 1 file changed, 10 insertions(+), 9 deletions(-) diff --git a/pkgs/development/interpreters/r-lang/default.nix b/pkgs/development/interpreters/r-lang/default.nix index e410f8ea84d..43219899380 100644 --- a/pkgs/development/interpreters/r-lang/default.nix +++ b/pkgs/development/interpreters/r-lang/default.nix @@ -1,5 +1,5 @@ -{stdenv, fetchurl, readline, perl, gfortran, libX11, libpng, libXt, zlib, -withBioconductor ? false +{ stdenv, fetchurl, readline, perl, gfortran, libX11, libpng, libXt, zlib +, withBioconductor ? false }: stdenv.mkDerivation { @@ -23,14 +23,15 @@ stdenv.mkDerivation { meta = { description = "R is a language and environment for statistical computing and graphics"; - longDescription = ''R is a language and environment for statistical computin -g and graphics. It is a GNU project which is similar to the S language. R provid -es a wide variety of statistical (linear and nonlinear modelling, classical stat -istical tests, time-series analysis, classification, clustering, ...) and graphi -cal techniques, and is highly extensible.''; license = "GPL2"; homepage = http://www.r-project.org/; + longDescription = '' + R is a language and environment for statistical computing and + graphics. It is a GNU project which is similar to the S language. + R provides a wide variety of statistical (linear and nonlinear + modelling, classical statistical tests, time-series analysis, + classification, clustering, ...) and graphical techniques, and is + highly extensible. + ''; }; } - - From 6ff77b7f6cc91746a23c01ecb6ad7ddd04b1c675 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Mon, 29 Nov 2010 15:25:07 +0000 Subject: [PATCH 25/86] * tcpdump 4.1.1. svn path=/nixpkgs/trunk/; revision=24919 --- pkgs/tools/networking/tcpdump/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/networking/tcpdump/default.nix b/pkgs/tools/networking/tcpdump/default.nix index 640b305591e..e9e55f48bee 100644 --- a/pkgs/tools/networking/tcpdump/default.nix +++ b/pkgs/tools/networking/tcpdump/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, libpcap, enableStatic ? false }: stdenv.mkDerivation rec { - name = "tcpdump-4.1.0"; + name = "tcpdump-4.1.1"; src = fetchurl { url = "http://www.tcpdump.org/release/${name}.tar.gz"; - sha256 = "1yhmz23cb0qx16nwnmyk2v7nnqai20lzcc4lx34v728qdpkmc1in"; + sha256 = "02kz3sghpg16p26dhid8ma67pxil8x5jqdd83fvdnypcc6ylpkg6"; }; buildInputs = [ libpcap ]; From 76f6893e6ad19e3e7cdfa3289ff4ff9fc27b50aa Mon Sep 17 00:00:00 2001 From: Karn Kallio Date: Mon, 29 Nov 2010 17:34:08 +0000 Subject: [PATCH 26/86] Update version of MySQL Workbench to 5.2.30 svn path=/nixpkgs/trunk/; revision=24924 --- pkgs/applications/misc/mysql-workbench/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/misc/mysql-workbench/default.nix b/pkgs/applications/misc/mysql-workbench/default.nix index f3aac956c36..e373392155a 100644 --- a/pkgs/applications/misc/mysql-workbench/default.nix +++ b/pkgs/applications/misc/mysql-workbench/default.nix @@ -6,12 +6,12 @@ stdenv.mkDerivation rec { pname = "mysql-workbench"; - version = "5.2.28"; + version = "5.2.30"; name = "${pname}-${version}"; src = fetchurl { url = "http://mirror.services.wisc.edu/mysql/Downloads/MySQLGUITools/mysql-workbench-gpl-${version}-src.tar.gz"; - sha256 = "1i7icrf3z09rijlvlg99w6m1n3xw0650840hk95ymgrb95kc3437"; + sha256 = "0dlhnq7pv2ccgm0d7a3hzf9jxa09jzw36h0ljs9vw9q5nyd5kq71"; }; buildInputs = [ autoconf automake boost file gettext glib glibc gnome_keyring gtk gtkmm intltool From 50a167ba7b55ecd7ec1a5ed70e26592c59b0bcf8 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 29 Nov 2010 18:04:56 +0000 Subject: [PATCH 27/86] pkgs/shells/ipython: added initial version of ipython 0.10.1 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Committing on behalf of Cillian de Róiste . svn path=/nixpkgs/trunk/; revision=24928 --- pkgs/shells/ipython/default.nix | 25 +++++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 14 ++++++++++++++ 2 files changed, 39 insertions(+) create mode 100644 pkgs/shells/ipython/default.nix diff --git a/pkgs/shells/ipython/default.nix b/pkgs/shells/ipython/default.nix new file mode 100644 index 00000000000..68064dded3d --- /dev/null +++ b/pkgs/shells/ipython/default.nix @@ -0,0 +1,25 @@ +{ stdenv, fetchurl, buildPythonPackage }: + +buildPythonPackage { + name = "ipython-0.10.1"; + + src = fetchurl { + url = "http://ipython.scipy.org/dist/0.10.1/ipython-0.10.1.tar.gz"; + sha256 = "18zwrg25zn72w4rmcwxzcw11ibgp001fawm2sz189zv86z70fxi2"; + }; + + doCheck = false; + + meta = { + homepage = http://ipython.scipy.org/; + description = "An interactive computing environment for Python"; + license = "BSD"; + + longDescription = '' + The goal of IPython is to create a comprehensive environment + for interactive and exploratory computing. It consists of an + enhanced interactive Python shell and an architecture for + interactive parallel computing. + ''; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index fe9ad364e75..c71f47468db 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -1443,6 +1443,20 @@ let dash = callPackage ../shells/dash { }; + ipython = callPackage ../shells/ipython { + # I did not find any better way of reusing buildPythonPackage+setuptools + # for a python with openssl support + buildPythonPackage = assert pythonFull.readlineSupport; + import ../development/python-modules/generic { + inherit makeWrapper lib; + python = pythonFull; + setuptools = builderDefsPackage (import ../development/python-modules/setuptools) { + inherit makeWrapper; + python = pythonFull; + }; + }; + }; + tcsh = callPackage ../shells/tcsh { }; rush = callPackage ../shells/rush { }; From 7f65afe3f3a602239951c26443f45774c549a44b Mon Sep 17 00:00:00 2001 From: Russell O'Connor Date: Mon, 29 Nov 2010 20:15:44 +0000 Subject: [PATCH 28/86] Update wicd to 1.7.0 svn path=/nixpkgs/trunk/; revision=24929 --- pkgs/tools/networking/wicd/default.nix | 29 +++++++++++---- .../networking/wicd/mkdir-networks.patch | 13 +++---- .../networking/wicd/no-var-install.patch | 36 ++++++++----------- pkgs/tools/networking/wicd/pygtk.patch | 4 +-- 4 files changed, 46 insertions(+), 36 deletions(-) diff --git a/pkgs/tools/networking/wicd/default.nix b/pkgs/tools/networking/wicd/default.nix index 52bbf7d7a1f..70cc4a3b46c 100644 --- a/pkgs/tools/networking/wicd/default.nix +++ b/pkgs/tools/networking/wicd/default.nix @@ -6,11 +6,11 @@ # on urwid which has not been packaged at this time (2009-12-27). stdenv.mkDerivation rec { - name = "wicd-1.6.2.2"; + name = "wicd-1.7.0"; src = fetchurl { - url = "mirror://sourceforge/wicd/files/wicd-stable/${name}/${name}.tar.bz2"; - sha256 = "1gpjrlanz7rrzkchnpm1dgik333rz1fsg4c4046c5pwdfpp1crxr"; + url = "mirror://sourceforge/project/wicd/wicd-stable/${name}/${name}.tar.bz2"; + sha256 = "0civfmpjlsvnaiw7fkpq34mh5ndhfzb9mkl3q2d3rjd4z0mnki8l"; }; buildInputs = [ python ]; @@ -19,24 +19,34 @@ stdenv.mkDerivation rec { # Should I be using pygtk's propogated build inputs? postPatch = '' + substituteInPlace in/scripts=wicd.in --subst-var-by TEMPLATE-DEFAULT $out/share/other/dhclient.conf.template.default sed -i "2iexport PATH=\$PATH\$\{PATH:+:\}${python}/bin:${wpa_supplicant}/sbin:${dhcp}/sbin:${wirelesstools}/sbin:${nettools}/sbin:${iproute}/sbin" in/scripts=wicd.in sed -i "3iexport PYTHONPATH=\$PYTHONPATH\$\{PYTHONPATH:+:\}$(toPythonPath $out):$(toPythonPath ${pygobject})/gtk-2.0:$(toPythonPath ${pythonDBus})" in/scripts=wicd.in sed -i "4iexport LC_ALL=\\\"${locale}\\\"" in/scripts=wicd.in sed -i "2iexport PATH=\$PATH\$\{PATH:+:\}${python}/bin" in/scripts=wicd-client.in sed -i "3iexport PYTHONPATH=\$PYTHONPATH\$\{PYTHONPATH:+:\}$(toPythonPath $out):$(toPythonPath ${pyGtkGlade})/gtk-2.0:$(toPythonPath ${pygobject})/gtk-2.0:$(toPythonPath ${pycairo}):$(toPythonPath ${pythonDBus})" in/scripts=wicd-client.in + sed -i "2iexport PATH=\$PATH\$\{PATH:+:\}${python}/bin" in/scripts=wicd-gtk.in + sed -i "3iexport PYTHONPATH=\$PYTHONPATH\$\{PYTHONPATH:+:\}$(toPythonPath $out):$(toPythonPath ${pyGtkGlade})/gtk-2.0:$(toPythonPath ${pygobject})/gtk-2.0:$(toPythonPath ${pycairo}):$(toPythonPath ${pythonDBus})" in/scripts=wicd-gtk.in + sed -i "2iexport PATH=\$PATH\$\{PATH:+:\}${python}/bin" in/scripts=wicd-cli.in + sed -i "3iexport PYTHONPATH=\$PYTHONPATH\$\{PYTHONPATH:+:\}$(toPythonPath $out):$(toPythonPath ${pyGtkGlade})/gtk-2.0:$(toPythonPath ${pygobject})/gtk-2.0:$(toPythonPath ${pycairo}):$(toPythonPath ${pythonDBus})" in/scripts=wicd-cli.in ''; configurePhase = '' python setup.py configure \ --lib=$out/lib/ \ - --etc=/var/lib/wicd/ \ --share=$out/share/ \ + --etc=/var/lib/wicd/ \ --scripts=$out/etc/scripts/ \ - --images=$out/share/pixmaps/ \ + --pixmaps=$out/share/pixmaps/ \ + --images=$out/share/pixmaps/wicd/ \ --encryption=$out/etc/encryption/templates/ \ --bin=$out/bin/ \ --sbin=$out/sbin/ \ - --backends=$out/lib/backends/ \ + --backends=$out/share/backends/ \ + --daemon=$out/share/daemon/ \ + --curses=$out/share/curses/ \ + --gtk=$out/share/gtk/ \ + --cli=$out/share/cli/ \ --networks=/var/lib/wicd/configurations/ \ --resume=$out/etc/acpi/resume.d/ \ --suspend=$out/etc/acpi/suspend.d/ \ @@ -60,7 +70,11 @@ stdenv.mkDerivation rec { --no-install-ncurses \ ''; - installPhase = ''python setup.py install --prefix=$out''; + installPhase = '' + python setup.py install --prefix=$out + ensureDir $out/share/other + cp other/dhclient.conf.template.default $out/share/other/dhclient.conf.template.default + ''; meta = { homepage = http://wicd.net/; @@ -74,6 +88,7 @@ stdenv.mkDerivation rec { encryption types, such as WPA and WEP. Wicd will automatically connect at startup to any preferred network within range. ''; + maintainers = [ stdenv.lib.maintainers.roconnor ]; license="GPLv2"; }; } diff --git a/pkgs/tools/networking/wicd/mkdir-networks.patch b/pkgs/tools/networking/wicd/mkdir-networks.patch index df3f0487d1d..01563fd55da 100644 --- a/pkgs/tools/networking/wicd/mkdir-networks.patch +++ b/pkgs/tools/networking/wicd/mkdir-networks.patch @@ -1,11 +1,12 @@ -wicd normally makes the NETWORKS directory at install time, but we cannot do that, -so we make it at runtime instead. +wicd normally makes the NETWORKS directory and install the dhclient.conf.template.default at install time, +but we cannot do that, so we make it at runtime instead. ---- wicd-1.6.2.2/in/scripts=wicd.in 2009-09-01 11:05:31.000000000 -0400 -+++ wicd-1.6.2.2/in/scripts=wicd.in 2010-01-04 18:01:57.000000000 -0500 -@@ -1,3 +1,5 @@ +--- wicd-1.7.0/in/scripts=wicd.in 2010-01-14 23:49:11.000000000 -0500 ++++ wicd-1.7.0/in/scripts=wicd.in 2010-11-16 22:35:50.272555487 -0500 +@@ -1,3 +1,6 @@ #!/bin/bash +mkdir -p %NETWORKS% ++ln -sf @TEMPLATE-DEFAULT@ %ETC%dhclient.conf.template.default + - exec python -O %LIB%wicd-daemon.py $@ + exec %PYTHON% -O %SHARE%daemon/wicd-daemon.py $@ diff --git a/pkgs/tools/networking/wicd/no-var-install.patch b/pkgs/tools/networking/wicd/no-var-install.patch index 9ab5a0520d9..d2ed8d5953e 100644 --- a/pkgs/tools/networking/wicd/no-var-install.patch +++ b/pkgs/tools/networking/wicd/no-var-install.patch @@ -1,21 +1,15 @@ -The install tries to create files in /var. This patch removes those steps. - ---- wicd-1.6.2.2/setup.py 2009-09-01 11:05:31.000000000 -0400 -+++ wicd-1.6.2.2/setup.py 2009-12-27 21:27:57.000000000 -0500 -@@ -464,8 +464,6 @@ - data = [ - (wpath.dbus, ['other/wicd.conf']), - (wpath.desktop, ['other/wicd.desktop']), -- (wpath.log, []), -- (wpath.etc, []), - (wpath.icons + 'scalable/apps/', ['icons/scalable/wicd-client.svg']), - (wpath.icons + '192x192/apps/', ['icons/192px/wicd-client.png']), - (wpath.icons + '128x128/apps/', ['icons/128px/wicd-client.png']), -@@ -481,7 +479,6 @@ - (wpath.images, [('images/' + b) for b in os.listdir('images') if not b.startswith('.')]), - (wpath.encryption, [('encryption/templates/' + b) for b in - os.listdir('encryption/templates') if not b.startswith('.')]), -- (wpath.networks, []), - (wpath.bin, ['scripts/wicd-client', ]), - (wpath.sbin, ['scripts/wicd', ]), - (wpath.share, ['data/wicd.glade', ]), +The install tries to create files in /var. This patch removes those steps. + +--- wicd-1.7.0/setup.py 2010-01-14 23:49:11.000000000 -0500 ++++ wicd-1.7.0/setup.py 2010-11-16 22:15:33.855977242 -0500 +@@ -494,10 +494,8 @@ + data = [ + (wpath.dbus, ['other/wicd.conf']), + (wpath.log, [empty_file]), +- (wpath.etc, ['other/dhclient.conf.template.default']), + (wpath.encryption, [('encryption/templates/' + b) for b in + os.listdir('encryption/templates') if not b.startswith('.')]), +- (wpath.networks, [empty_file]), + (wpath.sbin, ['scripts/wicd']), + (wpath.daemon, ['wicd/monitor.py', 'wicd/wicd-daemon.py', + 'wicd/suspend.py', 'wicd/autoconnect.py']), diff --git a/pkgs/tools/networking/wicd/pygtk.patch b/pkgs/tools/networking/wicd/pygtk.patch index e72228f75a5..f015e50d684 100644 --- a/pkgs/tools/networking/wicd/pygtk.patch +++ b/pkgs/tools/networking/wicd/pygtk.patch @@ -1,8 +1,8 @@ For some reason nix's pygtk doesn't have a pygtk module so we remove the version check. If this ever changes we could remove this patch. ---- wicd-1.6.2.2/wicd/wicd-client.py 2009-09-01 11:05:31.000000000 -0400 -+++ wicd-1.6.2.2/wicd/wicd-client.py 2009-12-28 00:22:57.000000000 -0500 +--- wicd-1.7.0/gtk/wicd-client.py 2009-09-01 11:05:31.000000000 -0400 ++++ wicd-1.7.0/gtk/wicd-client.py 2009-12-28 00:22:57.000000000 -0500 @@ -43,9 +43,6 @@ import atexit from dbus import DBusException From cfce1c0b98ed16dbd8c9c8c7f8dbcaaf3ef5d723 Mon Sep 17 00:00:00 2001 From: Michael Raskin <7c6f434c@mail.ru> Date: Mon, 29 Nov 2010 20:51:09 +0000 Subject: [PATCH 29/86] Adding GL-117 svn path=/nixpkgs/trunk/; revision=24930 --- pkgs/games/gl-117/default.nix | 41 +++++++++++++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 43 insertions(+) create mode 100644 pkgs/games/gl-117/default.nix diff --git a/pkgs/games/gl-117/default.nix b/pkgs/games/gl-117/default.nix new file mode 100644 index 00000000000..e37f474b597 --- /dev/null +++ b/pkgs/games/gl-117/default.nix @@ -0,0 +1,41 @@ +x@{builderDefsPackage + , mesa, SDL, freeglut, SDL_mixer, autoconf, automake, libtool + , ...}: +builderDefsPackage +(a : +let + helperArgNames = ["stdenv" "fetchurl" "builderDefsPackage"] ++ + []; + + buildInputs = map (n: builtins.getAttr n x) + (builtins.attrNames (builtins.removeAttrs x helperArgNames)); + sourceInfo = rec { + version = "1.3.2"; + name = "gl-117-1.3.2"; + url = "mirror://sourceforge/project/gl-117/gl-117/GL-117%20Source/gl-117-1.3.2-src.tar.bz2"; + hash = "1yvg1rp1yijv0b45cz085b29x5x0g5fkm654xdv5qwh2l6803gb4"; + }; +in +rec { + src = a.fetchurl { + url = sourceInfo.url; + sha256 = sourceInfo.hash; + }; + + inherit (sourceInfo) name version; + inherit buildInputs; + + /* doConfigure should be removed if not needed */ + phaseNames = ["doConfigure" "doMakeInstall"]; + + meta = { + description = "An air combat simulator"; + maintainers = with a.lib.maintainers; + [ + raskin + ]; + platforms = with a.lib.platforms; + linux; + }; +}) x + diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index c71f47468db..ad3df00d9a3 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -6665,6 +6665,8 @@ let stdenv = stdenv2; }; + gl117 = callPackage ../games/gl-117 {}; + gltron = callPackage ../games/gltron { }; gnuchess = builderDefsPackage (import ../games/gnuchess) { From f5e7bc623f8c03fb7f13e98c4b79442bee1fd05c Mon Sep 17 00:00:00 2001 From: Michael Raskin <7c6f434c@mail.ru> Date: Mon, 29 Nov 2010 21:12:53 +0000 Subject: [PATCH 30/86] Adding crrcsim model airplane flight simulator svn path=/nixpkgs/trunk/; revision=24931 --- pkgs/games/crrcsim/default.nix | 48 +++++++++++++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 50 insertions(+) create mode 100644 pkgs/games/crrcsim/default.nix diff --git a/pkgs/games/crrcsim/default.nix b/pkgs/games/crrcsim/default.nix new file mode 100644 index 00000000000..080265e1395 --- /dev/null +++ b/pkgs/games/crrcsim/default.nix @@ -0,0 +1,48 @@ +x@{builderDefsPackage + , mesa, SDL, SDL_mixer, plib, libjpeg + , ...}: +builderDefsPackage +(a : +let + helperArgNames = ["stdenv" "fetchurl" "builderDefsPackage"] ++ + []; + + buildInputs = map (n: builtins.getAttr n x) + (builtins.attrNames (builtins.removeAttrs x helperArgNames)); + sourceInfo = rec { + baseName="crrcsim"; + version="0.9.11"; + name="${baseName}-${version}"; + url="http://download.berlios.de/${baseName}/${name}.tar.gz"; + hash="16z9gixp60920lqckij8kdw90jys0llls4lw5c8vqgk14ck5hhiz"; + }; +in +rec { + src = a.fetchurl { + url = sourceInfo.url; + sha256 = sourceInfo.hash; + }; + + inherit (sourceInfo) name version; + inherit buildInputs; + + /* doConfigure should be removed if not needed */ + phaseNames = ["doConfigure" "doMakeInstall"]; + + meta = { + description = "A model-airplane flight simulator"; + maintainers = with a.lib.maintainers; + [ + raskin + ]; + platforms = with a.lib.platforms; + linux; + license = "GPLv2"; + }; + passthru = { + updateInfo = { + downloadPage = "http://crrcsim.berlios.de/wiki/index.php?n=CRRCsim.DownLoad"; + }; + }; +}) x + diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index ad3df00d9a3..0197c1da2e0 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -6636,6 +6636,8 @@ let crack_attack = callPackage ../games/crack-attack { }; + crrcsim = callPackage ../games/crrcsim {}; + dwarf_fortress = callPackage_i686 ../games/dwarf-fortress { gnomegtk = pkgsi686Linux.gnome.gtk; }; From d07675c415c62a2cc214cb864bb68cb1bcffb0da Mon Sep 17 00:00:00 2001 From: Russell O'Connor Date: Tue, 30 Nov 2010 04:09:51 +0000 Subject: [PATCH 31/86] Maybe this will fix wicd. svn path=/nixpkgs/trunk/; revision=24933 --- pkgs/tools/networking/wicd/no-var-install.patch | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/networking/wicd/no-var-install.patch b/pkgs/tools/networking/wicd/no-var-install.patch index d2ed8d5953e..9a333332fcf 100644 --- a/pkgs/tools/networking/wicd/no-var-install.patch +++ b/pkgs/tools/networking/wicd/no-var-install.patch @@ -2,10 +2,11 @@ The install tries to create files in /var. This patch removes those steps. --- wicd-1.7.0/setup.py 2010-01-14 23:49:11.000000000 -0500 +++ wicd-1.7.0/setup.py 2010-11-16 22:15:33.855977242 -0500 -@@ -494,10 +494,8 @@ +@@ -493,11 +493,8 @@ + print "Using init file",(wpath.init, wpath.initfile) data = [ (wpath.dbus, ['other/wicd.conf']), - (wpath.log, [empty_file]), +- (wpath.log, [empty_file]), - (wpath.etc, ['other/dhclient.conf.template.default']), (wpath.encryption, [('encryption/templates/' + b) for b in os.listdir('encryption/templates') if not b.startswith('.')]), From ab6627ac0e2d9cc7952783ae90e1bae87060a2b4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?= Date: Tue, 30 Nov 2010 11:23:36 +0000 Subject: [PATCH 32/86] Fix for the verilog package, from Antonio Vargas Gonzalez svn path=/nixpkgs/trunk/; revision=24934 --- pkgs/applications/science/electronics/verilog/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/applications/science/electronics/verilog/default.nix b/pkgs/applications/science/electronics/verilog/default.nix index 8f48879f76a..eff322c8441 100644 --- a/pkgs/applications/science/electronics/verilog/default.nix +++ b/pkgs/applications/science/electronics/verilog/default.nix @@ -4,7 +4,7 @@ stdenv.mkDerivation rec { name = "verilog-0.9.3"; src = fetchurl { - url = "mirror://sourceforce/${name}.tar.gz"; + url = "mirror://sourceforge/iverilog/0.9.3/verilog-0.9.3.tar.gz"; sha256 = "dd68c8ab874a93805d1e93fa76ee1e91fc0c7b20822ded3e57b6536cd8c0d1ba"; }; From d71ad68d43723f88c25b13c07255d4929827faaa Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?= Date: Tue, 30 Nov 2010 11:24:12 +0000 Subject: [PATCH 33/86] Fixing the verilog URL (contributed by Antonio Vargas) svn path=/nixpkgs/trunk/; revision=24935 --- pkgs/applications/science/electronics/verilog/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/applications/science/electronics/verilog/default.nix b/pkgs/applications/science/electronics/verilog/default.nix index eff322c8441..a4c803e2952 100644 --- a/pkgs/applications/science/electronics/verilog/default.nix +++ b/pkgs/applications/science/electronics/verilog/default.nix @@ -4,7 +4,7 @@ stdenv.mkDerivation rec { name = "verilog-0.9.3"; src = fetchurl { - url = "mirror://sourceforge/iverilog/0.9.3/verilog-0.9.3.tar.gz"; + url = "mirror://sourceforge/iverilog/${name}.tar.gz"; sha256 = "dd68c8ab874a93805d1e93fa76ee1e91fc0c7b20822ded3e57b6536cd8c0d1ba"; }; From f088bd47910299b3bfc43403d020516c23eef6cc Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Tue, 30 Nov 2010 18:32:23 +0000 Subject: [PATCH 34/86] * nixUnstable updated, now with garbage collector. svn path=/nixpkgs/trunk/; revision=24943 --- pkgs/tools/package-management/nix/unstable.nix | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/pkgs/tools/package-management/nix/unstable.nix b/pkgs/tools/package-management/nix/unstable.nix index b5e56464eec..2dac26dd1b1 100644 --- a/pkgs/tools/package-management/nix/unstable.nix +++ b/pkgs/tools/package-management/nix/unstable.nix @@ -1,24 +1,26 @@ { stdenv, fetchurl, perl, curl, bzip2, openssl ? null +, pkgconfig, boehmgc , storeDir ? "/nix/store" , stateDir ? "/nix/var" }: stdenv.mkDerivation rec { - name = "nix-1.0pre24122"; + name = "nix-1.0pre24855"; src = fetchurl { - url = "http://hydra.nixos.org/build/667798/download/4/${name}.tar.bz2"; - sha256 = "0rz9radz4452bp3sy9yzcawn9yz5z4nyng43a0zrsa5v72cv695f"; + url = "http://hydra.nixos.org/build/774404/download/4/${name}.tar.bz2"; + sha256 = "cd2a75a04fc03dcafbab1d183e6ee485b491e17f1680bb7ee38738a2b1235932"; }; - buildNativeInputs = [ perl ]; - buildInputs = [ curl openssl ]; + buildNativeInputs = [ perl pkgconfig ]; + buildInputs = [ curl openssl boehmgc ]; configureFlags = '' --with-store-dir=${storeDir} --localstatedir=${stateDir} --with-bzip2=${bzip2} --disable-init-state + --enable-gc CFLAGS=-O3 CXXFLAGS=-O3 ''; From c76f114d2002b7b2b63c70be10db0181b37ac45d Mon Sep 17 00:00:00 2001 From: Evgeny Egorochkin Date: Wed, 1 Dec 2010 04:07:44 +0000 Subject: [PATCH 35/86] tor:version bump svn path=/nixpkgs/trunk/; revision=24944 --- pkgs/tools/security/tor/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/security/tor/default.nix b/pkgs/tools/security/tor/default.nix index d896e442959..040e53774a3 100644 --- a/pkgs/tools/security/tor/default.nix +++ b/pkgs/tools/security/tor/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, libevent, openssl, zlib }: stdenv.mkDerivation rec { - name = "tor-0.2.1.26"; + name = "tor-0.2.1.27"; src = fetchurl { url = "http://www.torproject.org/dist/${name}.tar.gz"; - sha256 = "18kz1hs6lvckkddy4y36gi7ly03ar2il2xzkrf8bfgif1gnn1p3c"; + sha256 = "07367wynpbbqnwzis3z8zf8k9b6cgywcrjzn7gpdal8m4dkmqkgc"; }; patchPhase = From 77672ac3a42484fbb540bc21cc9e6e3a1cf9e9ac Mon Sep 17 00:00:00 2001 From: Michael Raskin <7c6f434c@mail.ru> Date: Wed, 1 Dec 2010 11:03:52 +0000 Subject: [PATCH 36/86] update muPDF svn path=/nixpkgs/trunk/; revision=24945 --- pkgs/applications/misc/mupdf/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/misc/mupdf/default.nix b/pkgs/applications/misc/mupdf/default.nix index 15d2ac98804..8127fa23115 100644 --- a/pkgs/applications/misc/mupdf/default.nix +++ b/pkgs/applications/misc/mupdf/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, pkgconfig, zlib, freetype, libjpeg, jbig2dec, openjpeg , libX11, libXext }: stdenv.mkDerivation rec { - name = "mupdf-0.6"; + name = "mupdf-0.7"; src = fetchurl { - url = "http://mupdf.com/download/source/${name}.tar.gz"; - sha256 = "01cn2kz4zx53qhqvbxy8xd7xqbh58kpid8ykvx5hz7pf2gqw91vg"; + url = "http://mupdf.com/download/${name}.tar.gz"; + sha256 = "e7f6307fa472575d27fe893e787ddb3fc927f03ba4ae23105f917189e81960a6"; }; buildInputs = [ pkgconfig zlib freetype libjpeg jbig2dec openjpeg libX11 libXext ]; From 2c814a5b2e14a000db2c5c0f3a1008a492169cd5 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Wed, 1 Dec 2010 12:28:37 +0000 Subject: [PATCH 37/86] * Updated sysstat to the latest stable version. svn path=/nixpkgs/trunk/; revision=24946 --- pkgs/os-specific/linux/sysstat/default.nix | 20 ++++++++++++++------ 1 file changed, 14 insertions(+), 6 deletions(-) diff --git a/pkgs/os-specific/linux/sysstat/default.nix b/pkgs/os-specific/linux/sysstat/default.nix index 998670712d6..dd3d585c0dd 100644 --- a/pkgs/os-specific/linux/sysstat/default.nix +++ b/pkgs/os-specific/linux/sysstat/default.nix @@ -1,18 +1,26 @@ -{stdenv, fetchurl, gettext}: +{ stdenv, fetchurl, gettext }: -stdenv.mkDerivation { - name = "sysstat-8.0.4.1"; +stdenv.mkDerivation rec { + name = "sysstat-9.0.6.1"; src = fetchurl { - url = http://perso.orange.fr/sebastien.godard/sysstat-8.0.4.1.tar.bz2; - sha256 = "17bzyz6bp63br4pns40ypc0qac0299lh90p7fhis5sn31sx811rf"; + url = "http://perso.orange.fr/sebastien.godard/${name}.tar.bz2"; + sha256 = "061r616cc0wfjkrk5ywqcwh5gwvm3gw92phfkj9bhlzxhi9srkr7"; }; - buildInputs = [gettext]; + buildInputs = [ gettext ]; preConfigure = '' export PATH_CP=$(type -tp cp) export PATH_CHKCONFIG=/no-such-program makeFlagsArray=(SA_DIR=$out/var/log/sa SYSCONFIG_DIR=$out/etc CHOWN=true IGNORE_MAN_GROUP=y) ''; + + meta = { + homepage = http://sebastien.godard.pagesperso-orange.fr/; + description = "A collection of performance monitoring tools for Linux (such as sar, iostat and pidstat)"; + license = "GPLv2+"; + platforms = stdenv.lib.platforms.linux; + maintainers = [ stdenv.lib.maintainers.eelco ]; + }; } From c1e384b3ebdc87e6010a7a5ef9fbdeddc408a07e Mon Sep 17 00:00:00 2001 From: Michael Raskin <7c6f434c@mail.ru> Date: Wed, 1 Dec 2010 21:11:28 +0000 Subject: [PATCH 38/86] Tests fail for a reason that tells more about tests than sabout built binary svn path=/nixpkgs/trunk/; revision=24949 --- pkgs/development/interpreters/clisp/2.44.1.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/interpreters/clisp/2.44.1.nix b/pkgs/development/interpreters/clisp/2.44.1.nix index 3b881558aed..891fd809bf0 100644 --- a/pkgs/development/interpreters/clisp/2.44.1.nix +++ b/pkgs/development/interpreters/clisp/2.44.1.nix @@ -40,7 +40,7 @@ stdenv.mkDerivation rec { NIX_CFLAGS_COMPILE="-O0"; # TODO : make mod-check fails - doCheck = 1; + doCheck = false; meta = { description = "ANSI Common Lisp Implementation"; From b89881d098ad69ccfc446be5c6cadec5eba13774 Mon Sep 17 00:00:00 2001 From: Michael Raskin <7c6f434c@mail.ru> Date: Wed, 1 Dec 2010 21:25:21 +0000 Subject: [PATCH 39/86] Update Isabelle svn path=/nixpkgs/trunk/; revision=24950 --- pkgs/applications/science/logic/isabelle/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/science/logic/isabelle/default.nix b/pkgs/applications/science/logic/isabelle/default.nix index 2471aa8b594..b9e756e0423 100644 --- a/pkgs/applications/science/logic/isabelle/default.nix +++ b/pkgs/applications/science/logic/isabelle/default.nix @@ -3,7 +3,7 @@ let pname = "Isabelle"; - version = "2009-1"; + version = "2009-2"; name = "${pname}${version}"; theories = ["HOL" "FOL" "ZF"]; in @@ -13,7 +13,7 @@ stdenv.mkDerivation { src = fetchurl { url = "http://www.cl.cam.ac.uk/research/hvg/${pname}/dist/${name}.tar.gz"; - sha256 = "43ad7794e8b4214b3ace49fc136a69ed6cc65ead02831ae6071f846ecbe56f68"; + sha256 = "f92a275b78bd8844de47a5902e339b58f3b768c07a7fb19d8e606b68499d5ac4"; }; buildInputs = [ perl polyml nettools ]; From 373fabf1c0d3d6bdf6c8a029f59854080172baef Mon Sep 17 00:00:00 2001 From: Michael Raskin <7c6f434c@mail.ru> Date: Wed, 1 Dec 2010 21:29:20 +0000 Subject: [PATCH 40/86] Fix settings patch for Isabelle svn path=/nixpkgs/trunk/; revision=24951 --- pkgs/applications/science/logic/isabelle/settings.patch | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/applications/science/logic/isabelle/settings.patch b/pkgs/applications/science/logic/isabelle/settings.patch index 15a70944087..dc9c611d488 100644 --- a/pkgs/applications/science/logic/isabelle/settings.patch +++ b/pkgs/applications/science/logic/isabelle/settings.patch @@ -6,7 +6,7 @@ diff -Naur Isabelle2009-1/etc/settings Isabelle2009-1-patched/etc/settings # Poly/ML 5.x (automated settings) -POLY_HOME="$(type -p poly)"; [ -n "$POLY_HOME" ] && POLY_HOME="$(dirname "$POLY_HOME")" - ML_PLATFORM=$("$ISABELLE_HOME/lib/scripts/polyml-platform") + ML_PLATFORM="$ISABELLE_PLATFORM" -ML_HOME=$(choosefrom \ - "$ISABELLE_HOME/contrib/polyml/$ML_PLATFORM" \ - "$ISABELLE_HOME/../polyml/$ML_PLATFORM" \ From c32bd62956738a6750f1f1e01d01629f2bf1d4f7 Mon Sep 17 00:00:00 2001 From: Michael Raskin <7c6f434c@mail.ru> Date: Wed, 1 Dec 2010 21:29:42 +0000 Subject: [PATCH 41/86] Adding LEO2 automated higher-order prover svn path=/nixpkgs/trunk/; revision=24952 --- .../science/logic/leo2/default.nix | 62 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 + 2 files changed, 64 insertions(+) create mode 100644 pkgs/applications/science/logic/leo2/default.nix diff --git a/pkgs/applications/science/logic/leo2/default.nix b/pkgs/applications/science/logic/leo2/default.nix new file mode 100644 index 00000000000..eb3a1359348 --- /dev/null +++ b/pkgs/applications/science/logic/leo2/default.nix @@ -0,0 +1,62 @@ +x@{builderDefsPackage + , ocaml, eprover + , ...}: +builderDefsPackage +(a : +let + helperArgNames = ["stdenv" "fetchurl" "builderDefsPackage"] ++ + ["eprover"]; + + buildInputs = map (n: builtins.getAttr n x) + (builtins.attrNames (builtins.removeAttrs x helperArgNames)); + sourceInfo = rec { + baseName="leo2"; + version="1.2.6"; + name="${baseName}_v${version}"; + url="http://www.ags.uni-sb.de/~leo/${name}.tgz"; + hash="0gjgcm6nb9kzdl0y72sgvf2w2q92s1ix70lh6wjz9lj2qdf7gi1z"; + }; +in +rec { + src = a.fetchurl { + url = sourceInfo.url; + sha256 = sourceInfo.hash; + }; + + inherit (sourceInfo) name version; + inherit buildInputs; + + phaseNames = ["makeInstallationDir" "doUnpack" "doMake" "doFinalize"]; + + makeInstallationDir = a.fullDepEntry ('' + ensureDir "$out/share/leo2/build-dir" + cd "$out/share/leo2/build-dir" + '') ["minInit" "defEnsureDir"]; + + goSrcDir = "cd src/"; + + doFinalize = a.fullDepEntry ('' + ensureDir "$out/bin" + echo -e "#! /bin/sh\\n$PWD/../bin/leo --atprc $out/etc/leoatprc \"\$@\"\\n" > "$out/bin/leo" + chmod a+x "$out/bin/leo" + ensureDir "$out/etc" + echo -e "e = ${eprover}/bin/eprover\\nepclextract = ${eprover}/bin/epclextract" > "$out/etc/leoatprc" + '') ["minInit" "doMake" "defEnsureDir"]; + + meta = { + description = "A high-performance typed higher order prover"; + maintainers = with a.lib.maintainers; + [ + raskin + ]; + platforms = with a.lib.platforms; + linux; + license = "BSD"; + }; + passthru = { + updateInfo = { + downloadPage = "http://www.ags.uni-sb.de/~leo/download.html"; + }; + }; +}) x + diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 0197c1da2e0..1657cb1ae48 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -6979,6 +6979,8 @@ let inherit (pkgs.emacs23Packages) proofgeneral; }; + leo2 = callPackage ../applications/science/logic/leo2 {}; + prover9 = callPackage ../applications/science/logic/prover9 { }; ssreflect = callPackage ../applications/science/logic/ssreflect { From 44e152f8d8ede72a1b4e9325dbfc347fa8be8727 Mon Sep 17 00:00:00 2001 From: Rob Vermaas Date: Fri, 3 Dec 2010 09:51:33 +0000 Subject: [PATCH 42/86] add Crypt::RandPasswd perl package svn path=/nixpkgs/trunk/; revision=24962 --- pkgs/top-level/perl-packages.nix | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 88f666b8c0d..6692c8e8289 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -782,6 +782,14 @@ rec { }; }; + CryptRandPasswd = buildPerlPackage rec { + name = "Crypt-RandPasswd-0.02"; + src = fetchurl { + url = "mirror://cpan/authors/id/J/JD/JDPORTER/${name}.tar.gz"; + sha256 = "0r5w5i81s02x756alad9psxmpqmcxahzjpqxsb3kacsqj8s5br9b"; + }; + }; + CryptSSLeay = buildPerlPackage rec { name = "Crypt-SSLeay-0.57"; src = fetchurl { From 64ed7e705d418aa34d8a14bf1e82f6627d9354a2 Mon Sep 17 00:00:00 2001 From: Michael Raskin <7c6f434c@mail.ru> Date: Fri, 3 Dec 2010 11:26:34 +0000 Subject: [PATCH 43/86] Adding Satallax prover svn path=/nixpkgs/trunk/; revision=24963 --- .../science/logic/satallax/default.nix | 72 +++++++++++++++++++ .../builder-defs/template-auto-callable.nix | 6 ++ pkgs/top-level/all-packages.nix | 2 + 3 files changed, 80 insertions(+) create mode 100644 pkgs/applications/science/logic/satallax/default.nix diff --git a/pkgs/applications/science/logic/satallax/default.nix b/pkgs/applications/science/logic/satallax/default.nix new file mode 100644 index 00000000000..4bf6e53737e --- /dev/null +++ b/pkgs/applications/science/logic/satallax/default.nix @@ -0,0 +1,72 @@ +x@{builderDefsPackage + , sbcl, zlib + , ...}: +builderDefsPackage +(a : +let + helperArgNames = ["stdenv" "fetchurl" "builderDefsPackage"] ++ + []; + + buildInputs = map (n: builtins.getAttr n x) + (builtins.attrNames (builtins.removeAttrs x helperArgNames)); + sourceInfo = rec { + baseName="satallax"; + version="1.4"; + name="${baseName}-${version}"; + url="http://www.ps.uni-saarland.de/~cebrown/satallax/downloads/${name}.tar.gz"; + hash="0l8dq4nyfw2bdsyqmgb4v6fjw3739p8nqv4bh2gh2924ibzrq5fc"; + }; +in +rec { + src = a.fetchurl { + url = sourceInfo.url; + sha256 = sourceInfo.hash; + }; + + inherit (sourceInfo) name version; + inherit buildInputs; + + phaseNames = ["doDeployMinisat" "doDeploy"]; + + doDeployMinisat = a.fullDepEntry ('' + ( + cd minisat/simp + make + ) + + ensureDir "$out/bin" + cp minisat/simp/minisat "$out/bin" + + echo "(setq *minisat-binary* \"$out/bin/minisat\")" > config.lisp + + '') ["defEnsureDir" "minInit" "addInputs" "doUnpack"]; + doDeploy = a.fullDepEntry ('' + ensureDir "$out/share/satallax/build-dir" + cp -r * "$out/share/satallax/build-dir" + cd "$out/share/satallax/build-dir" + + sbcl --load make.lisp + ! ( ./test | grep ERROR ) + + ensureDir "$out/bin" + cp bin/satallax "$out/bin" + '') ["defEnsureDir" "minInit" "addInputs" "doUnpack"]; + + meta = { + description = "A higher-order logic prover"; + maintainers = with a.lib.maintainers; + [ + raskin + ]; + platforms = with a.lib.platforms; + unix; + license = "free-noncopyleft"; + homepage = "http://www.ps.uni-saarland.de/~cebrown/satallax/"; + }; + passthru = { + updateInfo = { + downloadPage = "http://www.ps.uni-saarland.de/~cebrown/satallax/"; + }; + }; +}) x + diff --git a/pkgs/build-support/builder-defs/template-auto-callable.nix b/pkgs/build-support/builder-defs/template-auto-callable.nix index 769b9c1af76..1ff7ed0a96c 100644 --- a/pkgs/build-support/builder-defs/template-auto-callable.nix +++ b/pkgs/build-support/builder-defs/template-auto-callable.nix @@ -10,6 +10,11 @@ let buildInputs = map (n: builtins.getAttr n x) (builtins.attrNames (builtins.removeAttrs x helperArgNames)); sourceInfo = rec { + baseName="${abort ''Specify package name''}"; + version=""; + name="${baseName}-${version}"; + url="${name}"; + hash=""; }; in rec { @@ -32,6 +37,7 @@ rec { ]; platforms = with a.lib.platforms; (abort "Specify platforms"); + license = "${abort ''Specify license''}"; }; passthru = { updateInfo = { diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 1657cb1ae48..7fa7c5a6e82 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -6983,6 +6983,8 @@ let prover9 = callPackage ../applications/science/logic/prover9 { }; + satallax = callPackage ../applications/science/logic/satallax {}; + ssreflect = callPackage ../applications/science/logic/ssreflect { camlp5 = camlp5_transitional; }; From 0141bfec630702c6f31717e4382aae49ecd4ca50 Mon Sep 17 00:00:00 2001 From: Michael Raskin <7c6f434c@mail.ru> Date: Sat, 4 Dec 2010 11:16:39 +0000 Subject: [PATCH 44/86] Update SWI Prolog svn path=/nixpkgs/trunk/; revision=24966 --- pkgs/development/compilers/swi-prolog/default.nix | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/pkgs/development/compilers/swi-prolog/default.nix b/pkgs/development/compilers/swi-prolog/default.nix index 7690c980f5d..255ea1495d6 100644 --- a/pkgs/development/compilers/swi-prolog/default.nix +++ b/pkgs/development/compilers/swi-prolog/default.nix @@ -1,11 +1,12 @@ { stdenv, fetchurl, gmp, readline, openssl, libjpeg, unixODBC, zlib, libXinerama, libXft, libXpm, libSM, libXt }: -stdenv.mkDerivation { - name = "swi-prolog-5.6.64"; +stdenv.mkDerivation rec { + version = "5.10.2"; + name = "swi-prolog-${version}"; src = fetchurl { - url = "http://gollem.science.uva.nl/cgi-bin/nph-download/SWI-Prolog/pl-5.6.64.tar.gz"; - sha256 = "b0e70c3c02b7753ed440359746e7729d21c93e42689c1f0f32b148167b1b2c66"; + url = "http://www.swi-prolog.org/download/stable/src/pl-${version}.tar.gz"; + sha256 = "1a3ebbcd649f429a41b64561d38423692e00524c29227432d0eb5a0e24e2a4c9"; }; buildInputs = [gmp readline openssl libjpeg unixODBC libXinerama libXft libXpm libSM libXt zlib]; From 86e44e72bf4611d899b6a32b854b19ce583dedfa Mon Sep 17 00:00:00 2001 From: Michael Raskin <7c6f434c@mail.ru> Date: Sat, 4 Dec 2010 11:43:01 +0000 Subject: [PATCH 45/86] Adding SPASS svn path=/nixpkgs/trunk/; revision=24967 --- .../science/logic/spass/default.nix | 49 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 + 2 files changed, 51 insertions(+) create mode 100644 pkgs/applications/science/logic/spass/default.nix diff --git a/pkgs/applications/science/logic/spass/default.nix b/pkgs/applications/science/logic/spass/default.nix new file mode 100644 index 00000000000..2c6144baf0e --- /dev/null +++ b/pkgs/applications/science/logic/spass/default.nix @@ -0,0 +1,49 @@ +x@{builderDefsPackage + , ...}: +builderDefsPackage +(a : +let + helperArgNames = ["stdenv" "fetchurl" "builderDefsPackage"] ++ + []; + + buildInputs = map (n: builtins.getAttr n x) + (builtins.attrNames (builtins.removeAttrs x helperArgNames)); + sourceInfo = rec { + baseName="spass"; + baseVersion="3"; + minorVersion="7"; + version="${baseVersion}.${minorVersion}"; + name="${baseName}-${version}"; + url="http://www.spass-prover.org/download/sources/${baseName}${baseVersion}${minorVersion}.tgz"; + hash="1k5a98kr3vzga54zs7slwwaaf6v6agk1yfcayd8bl55q15g7xihk"; + }; +in +rec { + src = a.fetchurl { + url = sourceInfo.url; + sha256 = sourceInfo.hash; + }; + + inherit (sourceInfo) name version; + inherit buildInputs; + + /* doConfigure should be removed if not needed */ + phaseNames = ["doConfigure" "doMakeInstall"]; + + meta = { + description = "An automated theorem preover for FOL"; + maintainers = with a.lib.maintainers; + [ + raskin + ]; + platforms = with a.lib.platforms; + linux; + license = "BSD"; + }; + passthru = { + updateInfo = { + downloadPage = "http://www.spass-prover.org/download/index.html"; + }; + }; +}) x + diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 7fa7c5a6e82..30a3280110e 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -6985,6 +6985,8 @@ let satallax = callPackage ../applications/science/logic/satallax {}; + spass = callPackage ../applications/science/logic/spass {}; + ssreflect = callPackage ../applications/science/logic/ssreflect { camlp5 = camlp5_transitional; }; From c2a8d34118246a912fbfe1330719c72a59b59ea4 Mon Sep 17 00:00:00 2001 From: Michael Raskin <7c6f434c@mail.ru> Date: Sat, 4 Dec 2010 13:07:10 +0000 Subject: [PATCH 46/86] Add a note about chroot builds svn path=/nixpkgs/trunk/; revision=24968 --- pkgs/development/compilers/jdk/builder.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/development/compilers/jdk/builder.sh b/pkgs/development/compilers/jdk/builder.sh index 71dd6c433f6..e749fdba5ec 100644 --- a/pkgs/development/compilers/jdk/builder.sh +++ b/pkgs/development/compilers/jdk/builder.sh @@ -8,6 +8,7 @@ if ! test -e "$pathname"; then echo "SORRY!" echo "You should download \`$(basename $pathname)' from Sun and place it in $(dirname $pathname)." echo "Blame Sun, not us." + echo "If you are doing a chroot build - try a non-chroot build, because we need to access /tmp." echo "" exit 1 fi From 44ac8c5ea10c6dee3da9c83903f36ace2b520b55 Mon Sep 17 00:00:00 2001 From: Michael Raskin <7c6f434c@mail.ru> Date: Sat, 4 Dec 2010 18:39:44 +0000 Subject: [PATCH 47/86] Adding iProver svn path=/nixpkgs/trunk/; revision=24969 --- .../science/logic/iprover/default.nix | 58 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 + 2 files changed, 60 insertions(+) create mode 100644 pkgs/applications/science/logic/iprover/default.nix diff --git a/pkgs/applications/science/logic/iprover/default.nix b/pkgs/applications/science/logic/iprover/default.nix new file mode 100644 index 00000000000..7bfd8dff12e --- /dev/null +++ b/pkgs/applications/science/logic/iprover/default.nix @@ -0,0 +1,58 @@ +x@{builderDefsPackage + , ocaml, eprover + , ...}: +builderDefsPackage +(a : +let + helperArgNames = ["stdenv" "fetchurl" "builderDefsPackage"] ++ + []; + + buildInputs = map (n: builtins.getAttr n x) + (builtins.attrNames (builtins.removeAttrs x helperArgNames)); + sourceInfo = rec { + baseName="iprover"; + version="0.8.1"; + name="${baseName}_v${version}"; + url="${baseName}.googlecode.com/files/${name}.tar.gz"; + hash="15qn523w4l296np5rnkwi50a5x2xqz0kaza7bsh9bkazph7jma7w"; + }; +in +rec { + src = a.fetchurl { + url = sourceInfo.url; + sha256 = sourceInfo.hash; + }; + + inherit (sourceInfo) name version; + inherit buildInputs; + + /* doConfigure should be removed if not needed */ + phaseNames = ["doConfigure" "doMake" "doDeploy"]; + configureCommand = "sh configure"; + doDeploy = a.fullDepEntry ('' + ensureDir "$out/bin" + cp iproveropt "$out/bin" + + ensureDir "$out/share/${name}" + cp *.p "$out/share/${name}" + echo -e "#! /bin/sh\\n$out/bin/iproveropt --clausifier \"${eprover}/bin/eprover\" --clausifier_options \" --tstp-format --silent --cnf \" \"\$@\"" > "$out"/bin/iprover + chmod a+x "$out"/bin/iprover + '') ["defEnsureDir" "minInit" "doMake"]; + + meta = { + description = "An automated first-order logic theorem prover"; + maintainers = with a.lib.maintainers; + [ + raskin + ]; + platforms = with a.lib.platforms; + linux; + license = "GPLv3"; + }; + passthru = { + updateInfo = { + downloadPage = "http://code.google.com/p/iprover/downloads/list"; + }; + }; +}) x + diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 30a3280110e..0659b111102 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -6979,6 +6979,8 @@ let inherit (pkgs.emacs23Packages) proofgeneral; }; + iprover = callPackage ../applications/science/logic/iprover {}; + leo2 = callPackage ../applications/science/logic/leo2 {}; prover9 = callPackage ../applications/science/logic/prover9 { }; From c9c133ab1114182ce44340df5148430370fb65f2 Mon Sep 17 00:00:00 2001 From: Michael Raskin <7c6f434c@mail.ru> Date: Sun, 5 Dec 2010 11:42:24 +0000 Subject: [PATCH 48/86] Use requireFile for the form-hidden download of JDK 5 (or 1.5, who cares) svn path=/nixpkgs/trunk/; revision=24972 --- pkgs/development/compilers/jdk/builder.sh | 20 +------------ pkgs/development/compilers/jdk/default-5.nix | 4 +-- .../compilers/jdk/jdk5-oracle-linux.nix | 28 +++++++++++++------ pkgs/top-level/all-packages.nix | 4 +-- 4 files changed, 23 insertions(+), 33 deletions(-) diff --git a/pkgs/development/compilers/jdk/builder.sh b/pkgs/development/compilers/jdk/builder.sh index e749fdba5ec..7f402dab158 100644 --- a/pkgs/development/compilers/jdk/builder.sh +++ b/pkgs/development/compilers/jdk/builder.sh @@ -1,25 +1,7 @@ buildInputs="$unzip" source $stdenv/setup -src=$filename.bin - -if ! test -e "$pathname"; then - echo "" - echo "SORRY!" - echo "You should download \`$(basename $pathname)' from Sun and place it in $(dirname $pathname)." - echo "Blame Sun, not us." - echo "If you are doing a chroot build - try a non-chroot build, because we need to access /tmp." - echo "" - exit 1 -fi - -actual=$(md5sum -b $pathname | cut -c1-32) -if test "$actual" != "$md5"; then - echo "hash is $actual, expected $md5" - exit 1 -fi - -unzip $pathname || true +unzip $src || true ensureDir $out mv $dirname/* $out/ diff --git a/pkgs/development/compilers/jdk/default-5.nix b/pkgs/development/compilers/jdk/default-5.nix index fb25cd704c4..dfd4e31f4b3 100644 --- a/pkgs/development/compilers/jdk/default-5.nix +++ b/pkgs/development/compilers/jdk/default-5.nix @@ -1,9 +1,9 @@ -{stdenv, fetchurl, unzip}: +{stdenv, fetchurl, unzip, requireFile}: if stdenv.system == "i686-linux" || stdenv.system == "x86_64-linux" then (import ./jdk5-oracle-linux.nix) { - inherit stdenv fetchurl unzip; + inherit stdenv fetchurl unzip requireFile; } else abort "the Java 5 SDK is not supported on this platform" diff --git a/pkgs/development/compilers/jdk/jdk5-oracle-linux.nix b/pkgs/development/compilers/jdk/jdk5-oracle-linux.nix index 06471c482a1..8884585d154 100644 --- a/pkgs/development/compilers/jdk/jdk5-oracle-linux.nix +++ b/pkgs/development/compilers/jdk/jdk5-oracle-linux.nix @@ -8,19 +8,29 @@ * Note that this is not necessary if someone has already pushed a * binary. */ -{stdenv, fetchurl, unzip}: +{stdenv, fetchurl, unzip, requireFile}: assert stdenv.system == "i686-linux" || stdenv.system == "x86_64-linux"; -let name = "jdk-1_5_0_22"; in -stdenv.mkDerivation { - inherit name; - filename = "jdk-1_5_0_22"; +stdenv.mkDerivation rec { + name = "jdk-1_5_0_22"; dirname = "jdk1.5.0_22"; builder = ./builder.sh; - pathname = if stdenv.system == "x86_64-linux" then "/tmp/${name}-linux-amd64.bin" else "/tmp/${name}-linux-i586.bin"; - md5 = if stdenv.system == "x86_64-linux" then "b62abcaf9ea8617c50fa213bbc88824a" else "df5dae6d50d2abeafb472dde6d9a17f3"; + src = requireFile { + message = '' + SORRY! + We may not download the needed binary distribution automatically. + You should download ${distfilename} from Sun and add it to store. + For example, "nix-prefetch-url file:///\$PWD/${distfilename}" in the + directory where you saved it is OK. + Blame Sun, not us. + ''; + name = distfilename; + sha256 = if stdenv.system == "x86_64-linux" then + "1h63gigvg8id95igcj8xw7qvxs4p2y9hvx4xbvkwg8bji3ifb0sk" + else "0655n2q1y023zzwbk6gs9vwsnb29jc0m3bg3x3xdw623qgb4k6px"; + }; + distfilename = if stdenv.system == "x86_64-linux" then "${name}-linux-amd64.bin" else "${name}-linux-i586.bin"; - stdenv = stdenv; - inherit unzip; + inherit unzip stdenv; } diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 0659b111102..7aec966045e 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -1927,9 +1927,7 @@ let jdk5 = ( assert system == "i686-linux" || system == "x86_64-linux"; - import ../development/compilers/jdk/default-5.nix { - inherit fetchurl stdenv unzip; - }); + callPackage ../development/compilers/jdk/default-5.nix { }); jdk = if stdenv.isDarwin then openjdkDarwin else jdkdistro true false; jre = jdkdistro false false; From a9f70d542d1e492aaa4e012b264c2a19ae4af8bc Mon Sep 17 00:00:00 2001 From: Michael Raskin <7c6f434c@mail.ru> Date: Sun, 5 Dec 2010 17:28:41 +0000 Subject: [PATCH 49/86] Adding CVC3 satisfiability modulo theory (SMT) solver svn path=/nixpkgs/trunk/; revision=24975 --- .../science/logic/cvc3/default.nix | 54 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 + 2 files changed, 56 insertions(+) create mode 100644 pkgs/applications/science/logic/cvc3/default.nix diff --git a/pkgs/applications/science/logic/cvc3/default.nix b/pkgs/applications/science/logic/cvc3/default.nix new file mode 100644 index 00000000000..9bb8f8cde4c --- /dev/null +++ b/pkgs/applications/science/logic/cvc3/default.nix @@ -0,0 +1,54 @@ +x@{builderDefsPackage + , flex, bison, gmp, perl + , ...}: +builderDefsPackage +(a : +let + helperArgNames = ["stdenv" "fetchurl" "builderDefsPackage"] ++ + ["gmp"]; + + buildInputs = (map (n: builtins.getAttr n x) + (builtins.attrNames (builtins.removeAttrs x helperArgNames))) + ++ [(a.lib.overrideDerivation x.gmp (y: {dontDisableStatic=true;}))]; + sourceInfo = rec { + baseName="cvc3"; + version="2.2"; + name="${baseName}-${version}"; + url="http://www.cs.nyu.edu/acsys/cvc3/releases/${version}/${name}.tar.gz"; + hash="1dw12d5vrixfr6l9j6j7026vrr22zb433xyl6n5yxx4hgfywi0ji"; + }; +in +rec { + src = a.fetchurl { + url = sourceInfo.url; + sha256 = sourceInfo.hash; + }; + + inherit (sourceInfo) name version; + inherit buildInputs; + + /* doConfigure should be removed if not needed */ + phaseNames = ["fixPaths" "doConfigure" "doMakeInstall"]; + fixPaths = a.fullDepEntry ('' + sed -e "s@ /bin/bash@bash@g" -i Makefile.std + find . -exec sed -e "s@/usr/bin/perl@${perl}/bin/perl@g" -i '{}' ';' + '') ["minInit" "doUnpack"]; + + meta = { + description = "A prover for satisfiability modulo theory (SMT)"; + maintainers = with a.lib.maintainers; + [ + raskin + ]; + platforms = with a.lib.platforms; + linux; + license = "free-noncopyleft"; + homepage = "http://www.cs.nyu.edu/acsys/cvc3/index.html"; + }; + passthru = { + updateInfo = { + downloadPage = "http://www.cs.nyu.edu/acsys/cvc3/download.html"; + }; + }; +}) x + diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 7aec966045e..7fbe22c97e0 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -6955,6 +6955,8 @@ let camlp5 = camlp5_transitional; }; + cvc3 = callPackage ../applications/science/logic/cvc3 {}; + eprover = callPackage ../applications/science/logic/eProver { texLive = texLiveAggregationFun { paths = [ From 6b8abaa29ec490cd9ac1988ce63564672d472caa Mon Sep 17 00:00:00 2001 From: Michael Raskin <7c6f434c@mail.ru> Date: Sun, 5 Dec 2010 18:22:14 +0000 Subject: [PATCH 50/86] Adding OpenSMT svn path=/nixpkgs/trunk/; revision=24978 --- .../science/logic/opensmt/default.nix | 51 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 4 ++ 2 files changed, 55 insertions(+) create mode 100644 pkgs/applications/science/logic/opensmt/default.nix diff --git a/pkgs/applications/science/logic/opensmt/default.nix b/pkgs/applications/science/logic/opensmt/default.nix new file mode 100644 index 00000000000..165c8a2f148 --- /dev/null +++ b/pkgs/applications/science/logic/opensmt/default.nix @@ -0,0 +1,51 @@ +x@{builderDefsPackage + , automake, libtool, autoconf, intltool, perl + , gmpxx, flex, bison + , ...}: +builderDefsPackage +(a : +let + helperArgNames = ["stdenv" "fetchurl" "builderDefsPackage"] ++ + []; + + buildInputs = map (n: builtins.getAttr n x) + (builtins.attrNames (builtins.removeAttrs x helperArgNames)); + sourceInfo = rec { + baseName="opensmt"; + version="20101017"; + name="${baseName}-${version}"; + filename="${baseName}_src_${version}"; + url="${baseName}.googlecode.com/files/${filename}.tgz"; + hash="0xrky7ixjaby5x026v7hn72xh7d401w9jhccxjn0khhn1x87p2w1"; + }; +in +rec { + src = a.fetchurl { + url = sourceInfo.url; + sha256 = sourceInfo.hash; + }; + + inherit (sourceInfo) name version; + inherit buildInputs; + + /* doConfigure should be removed if not needed */ + phaseNames = ["doAutotools" "doConfigure" "doMakeInstall"]; + + meta = { + description = "A satisfiability modulo theory (SMT) solver"; + maintainers = with a.lib.maintainers; + [ + raskin + ]; + platforms = with a.lib.platforms; + linux; + license = "GPLv3"; + homepage = "http://code.google.com/p/opensmt/"; + }; + passthru = { + updateInfo = { + downloadPage = "http://code.google.com/p/opensmt/downloads/list"; + }; + }; +}) x + diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 7fbe22c97e0..b3b292cce16 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -6983,6 +6983,10 @@ let leo2 = callPackage ../applications/science/logic/leo2 {}; + opensmt = callPackage ../applications/science/logic/opensmt { + flex = flex2535; + }; + prover9 = callPackage ../applications/science/logic/prover9 { }; satallax = callPackage ../applications/science/logic/satallax {}; From 242d04a69af03b8ade231d2f4f3dfa1451a71363 Mon Sep 17 00:00:00 2001 From: Michael Raskin <7c6f434c@mail.ru> Date: Sun, 5 Dec 2010 18:36:07 +0000 Subject: [PATCH 51/86] Adding Singular CAS svn path=/nixpkgs/trunk/; revision=24980 --- pkgs/top-level/all-packages.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index b3b292cce16..d4806485668 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -7026,6 +7026,8 @@ let wxmaxima = callPackage ../applications/science/math/wxmaxima { }; + singular = callPackage ../applications/science/math/singular {}; + scilab = callPackage ../applications/science/math/scilab { withXaw3d = false; withTk = true; From 5cb3f8b6594f743e13595e5bc3ab49d9ee14f7ad Mon Sep 17 00:00:00 2001 From: Michael Raskin <7c6f434c@mail.ru> Date: Sun, 5 Dec 2010 18:37:47 +0000 Subject: [PATCH 52/86] Missing Singular files svn path=/nixpkgs/trunk/; revision=24981 --- .../science/math/singular/default.nix | 55 +++++++++++++++++++ 1 file changed, 55 insertions(+) create mode 100644 pkgs/applications/science/math/singular/default.nix diff --git a/pkgs/applications/science/math/singular/default.nix b/pkgs/applications/science/math/singular/default.nix new file mode 100644 index 00000000000..884d202e98e --- /dev/null +++ b/pkgs/applications/science/math/singular/default.nix @@ -0,0 +1,55 @@ +x@{builderDefsPackage + , gmp, bison, perl, autoconf, ncurses, readline + , coreutils + , ...}: +builderDefsPackage +(a : +let + helperArgNames = ["stdenv" "fetchurl" "builderDefsPackage"] ++ + []; + + buildInputs = map (n: builtins.getAttr n x) + (builtins.attrNames (builtins.removeAttrs x helperArgNames)); + sourceInfo = rec { + baseName="Singular"; + version="3-1-2"; + revision="-1"; + name="${baseName}-${version}${revision}"; + url="http://www.mathematik.uni-kl.de/ftp/pub/Math/Singular/SOURCES/${version}/${name}.tar.gz"; + hash="04f9i1xar0r7qrrbfki1h9rrmx5y2xg4w7rrvlbx05v2dy6s8djv"; + }; +in +rec { + src = a.fetchurl { + url = sourceInfo.url; + sha256 = sourceInfo.hash; + }; + + inherit (sourceInfo) name version; + inherit buildInputs; + + /* doConfigure should be removed if not needed */ + phaseNames = ["doFixPaths" "doConfigure" "doMakeInstall"]; + doFixPaths = a.fullDepEntry ('' + find . -exec sed -e 's@/bin/rm@${a.coreutils}&@g' -i '{}' ';' + find . -exec sed -e 's@/bin/uname@${a.coreutils}&@g' -i '{}' ';' + '') ["minInit" "doUnpack"]; + + meta = { + description = "A CAS for polynomial computations"; + maintainers = with a.lib.maintainers; + [ + raskin + ]; + platforms = with a.lib.platforms; + linux; + license = "GPLv3"; # Or GPLv2 at your option - but not GPLv4 + homepage = "http://www.singular.uni-kl.de/index.php"; + }; + passthru = { + updateInfo = { + downloadPage = "http://www.mathematik.uni-kl.de/ftp/pub/Math/Singular/SOURCES/"; + }; + }; +}) x + From 7768fa017806574447ae4948e29e771f1f8ce6f1 Mon Sep 17 00:00:00 2001 From: Michael Raskin <7c6f434c@mail.ru> Date: Sun, 5 Dec 2010 19:08:32 +0000 Subject: [PATCH 53/86] Fix installation layout svn path=/nixpkgs/trunk/; revision=24982 --- pkgs/applications/science/math/singular/default.nix | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/pkgs/applications/science/math/singular/default.nix b/pkgs/applications/science/math/singular/default.nix index 884d202e98e..dfc97eca8eb 100644 --- a/pkgs/applications/science/math/singular/default.nix +++ b/pkgs/applications/science/math/singular/default.nix @@ -29,11 +29,17 @@ rec { inherit buildInputs; /* doConfigure should be removed if not needed */ - phaseNames = ["doFixPaths" "doConfigure" "doMakeInstall"]; + phaseNames = ["doFixPaths" "doConfigure" "doMakeInstall" "fixInstall"]; doFixPaths = a.fullDepEntry ('' find . -exec sed -e 's@/bin/rm@${a.coreutils}&@g' -i '{}' ';' find . -exec sed -e 's@/bin/uname@${a.coreutils}&@g' -i '{}' ';' '') ["minInit" "doUnpack"]; + fixInstall = a.fullDepEntry ('' + rm -rf "$out/LIB" + cp -r Singular/LIB "$out" + ensureDir "$out/bin" + ln -s "$out"/*/Singular "$out/bin" + '') ["minInit" "defEnsureDir"]; meta = { description = "A CAS for polynomial computations"; From 011d71dcb854d45a0d637617656349cdee89273c Mon Sep 17 00:00:00 2001 From: Michael Raskin <7c6f434c@mail.ru> Date: Sun, 5 Dec 2010 19:11:21 +0000 Subject: [PATCH 54/86] Adding PARI/GP svn path=/nixpkgs/trunk/; revision=24983 --- .../science/math/pari/default.nix | 50 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 + 2 files changed, 52 insertions(+) create mode 100644 pkgs/applications/science/math/pari/default.nix diff --git a/pkgs/applications/science/math/pari/default.nix b/pkgs/applications/science/math/pari/default.nix new file mode 100644 index 00000000000..62763ac2198 --- /dev/null +++ b/pkgs/applications/science/math/pari/default.nix @@ -0,0 +1,50 @@ +x@{builderDefsPackage + , perl, zlib, gmp, readline + , ...}: +builderDefsPackage +(a : +let + helperArgNames = ["stdenv" "fetchurl" "builderDefsPackage"] ++ + []; + + buildInputs = map (n: builtins.getAttr n x) + (builtins.attrNames (builtins.removeAttrs x helperArgNames)); + sourceInfo = rec { + baseName="pari"; + version="2.3.5"; + name="${baseName}-${version}"; + url="http://pari.math.u-bordeaux.fr/pub/pari/unix/${name}.tar.gz"; + hash="124xr2jdz2c15v45i1zvgylng44lhf23729a1mk7ci1vywdaxpa7"; + }; +in +rec { + src = a.fetchurl { + url = sourceInfo.url; + sha256 = sourceInfo.hash; + }; + + inherit (sourceInfo) name version; + inherit buildInputs; + + /* doConfigure should be removed if not needed */ + phaseNames = ["doConfigure" "doMakeInstall"]; + configureCommand="./Configure"; + + meta = { + description = "Computer algebra system for high-performance number theory computations"; + maintainers = with a.lib.maintainers; + [ + raskin + ]; + platforms = with a.lib.platforms; + linux; + license = "GPLv2+"; + homepage = "http://pari.math.u-bordeaux.fr/"; + }; + passthru = { + updateInfo = { + downloadPage = "http://pari.math.u-bordeaux.fr/download.html"; + }; + }; +}) x + diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index d4806485668..8f29a5ead24 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -7026,6 +7026,8 @@ let wxmaxima = callPackage ../applications/science/math/wxmaxima { }; + pari = callPackage ../applications/science/math/pari {}; + singular = callPackage ../applications/science/math/singular {}; scilab = callPackage ../applications/science/math/scilab { From 07dd3f074b8a7f37e9943ab75913d80bd27ca501 Mon Sep 17 00:00:00 2001 From: Michael Raskin <7c6f434c@mail.ru> Date: Sun, 5 Dec 2010 19:54:27 +0000 Subject: [PATCH 55/86] Adding MiniSAT svn path=/nixpkgs/trunk/; revision=24984 --- .../science/logic/minisat/default.nix | 57 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 + 2 files changed, 59 insertions(+) create mode 100644 pkgs/applications/science/logic/minisat/default.nix diff --git a/pkgs/applications/science/logic/minisat/default.nix b/pkgs/applications/science/logic/minisat/default.nix new file mode 100644 index 00000000000..34a6bd7ceff --- /dev/null +++ b/pkgs/applications/science/logic/minisat/default.nix @@ -0,0 +1,57 @@ +x@{builderDefsPackage + , zlib + , ...}: +builderDefsPackage +(a : +let + helperArgNames = ["stdenv" "fetchurl" "builderDefsPackage"] ++ + []; + + buildInputs = map (n: builtins.getAttr n x) + (builtins.attrNames (builtins.removeAttrs x helperArgNames)); + sourceInfo = rec { + baseName="minisat"; + version="2.2.0"; + name="${baseName}-${version}"; + url="http://minisat.se/downloads/${name}.tar.gz"; + hash="023qdnsb6i18yrrawlhckm47q8x0sl7chpvvw3gssfyw3j2pv5cj"; + }; +in +rec { + src = a.fetchurl { + url = sourceInfo.url; + sha256 = sourceInfo.hash; + }; + + inherit (sourceInfo) name version; + inherit buildInputs; + + phaseNames = ["setVars" "doMake" "doDeploy"]; + goSrcDir = "cd simp"; + doDeploy = a.fullDepEntry ('' + ensureDir "$out"/bin + cp minisat_static "$out/bin"/minisat + '') ["minInit" "defEnsureDir"]; + makeFlags = ["rs"]; + setVars = a.fullDepEntry ('' + export MROOT=$PWD/../ + '') ["doUnpack"]; + + meta = { + description = "A compact and readable SAT-solver"; + maintainers = with a.lib.maintainers; + [ + raskin + ]; + platforms = with a.lib.platforms; + linux; + license = "MIT"; + homepage = "http://minisat.se/"; + }; + passthru = { + updateInfo = { + downloadPage = "http://minisat.se/MiniSat.html"; + }; + }; +}) x + diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 8f29a5ead24..e878bf2bd9d 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -6983,6 +6983,8 @@ let leo2 = callPackage ../applications/science/logic/leo2 {}; + minisat = callPackage ../applications/science/logic/minisat {}; + opensmt = callPackage ../applications/science/logic/opensmt { flex = flex2535; }; From f26b2678588b28d37d43526bd048b58d7446db2c Mon Sep 17 00:00:00 2001 From: Rob Vermaas Date: Mon, 6 Dec 2010 08:03:11 +0000 Subject: [PATCH 56/86] fix debian lenny hashes svn path=/nixpkgs/trunk/; revision=24986 --- pkgs/build-support/vm/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/build-support/vm/default.nix b/pkgs/build-support/vm/default.nix index b626a61ac68..5e0d77129c5 100644 --- a/pkgs/build-support/vm/default.nix +++ b/pkgs/build-support/vm/default.nix @@ -1117,7 +1117,7 @@ rec { fullName = "Debian 5.0.5 Lenny (i386)"; packagesList = fetchurl { url = mirror://debian/dists/lenny/main/binary-i386/Packages.bz2; - sha256 = "df450198f1597b526281e507e858f614ceafbd1b4f047c8ed994648f3e2ece19"; + sha256 = "1nzd0r44lnvw2bmshqpbhghs84fxbcr1jkg55d37v4d09gsdmln0"; }; urlPrefix = mirror://debian; packages = commonDebianPackages; @@ -1128,7 +1128,7 @@ rec { fullName = "Debian 5.0.5 Lenny (amd64)"; packagesList = fetchurl { url = mirror://debian/dists/lenny/main/binary-amd64/Packages.bz2; - sha256 = "1817h2ag6fmrlifh1b9kv3zjr5ghknf53f38s1rqwfq6vh0avsig"; + sha256 = "04hab4ybjilppr1hwnl4k50vr5y88w7zn6v22phfrsrxf23nrlv3"; }; urlPrefix = mirror://debian; packages = commonDebianPackages; From eeda98a67388b55915f08f758755f4c5b3d518eb Mon Sep 17 00:00:00 2001 From: "Yury G. Kudryashov" Date: Mon, 6 Dec 2010 12:04:09 +0000 Subject: [PATCH 57/86] Remove qt-4.5 svn path=/nixpkgs/trunk/; revision=24991 --- .../libraries/qt-4.x/4.5/default.nix | 86 ------------------- .../libraries/qt-4.x/4.5/setup-hook.sh | 9 -- pkgs/top-level/all-packages.nix | 4 - 3 files changed, 99 deletions(-) delete mode 100644 pkgs/development/libraries/qt-4.x/4.5/default.nix delete mode 100644 pkgs/development/libraries/qt-4.x/4.5/setup-hook.sh diff --git a/pkgs/development/libraries/qt-4.x/4.5/default.nix b/pkgs/development/libraries/qt-4.x/4.5/default.nix deleted file mode 100644 index 3b29043aeeb..00000000000 --- a/pkgs/development/libraries/qt-4.x/4.5/default.nix +++ /dev/null @@ -1,86 +0,0 @@ -{ stdenv, fetchurl -, libXft, libXrender, randrproto, xextproto, libXinerama, xineramaproto, libXcursor, libXmu -, libXext, libXfixes, inputproto, fixesproto, libXrandr, freetype, fontconfig -, zlib, libjpeg, mysql, libpng, which, mesa, openssl, dbus, cups, pkgconfig, libtiff, glib -, buildDemos ? false, buildExamples ? false, keepDocumentation ? false}: - -stdenv.mkDerivation { - name = "qt-4.5.3"; - - src = fetchurl { - url = ftp://ftp.trolltech.com/qt/source/qt-x11-opensource-src-4.5.3.tar.gz; - sha256 = "19ls11m5skcjfgrfcidwqdm72kl7qrbj4hdl1nbmcdaxh91gr1qc"; - }; - - setupHook = ./setup-hook.sh; - - propagatedBuildInputs = [ - libXft - libXrender - libXrandr - randrproto - xextproto - libXinerama - xineramaproto - libXcursor - zlib - libjpeg - mysql - libpng - which - mesa - libXmu - openssl - dbus.libs - cups - pkgconfig - libXext - freetype - fontconfig - inputproto - fixesproto - libXfixes - glib - libtiff - ]; - - # libQtNetwork will call libQtCore for it to dlopen openssl. - NIX_LDFLAGS = "-rpath ${openssl}/lib"; - # Don't shrink the rpath, to keep ${openssl} in it. - dontPatchELF = 1; - - prefixKey = "-prefix "; - - configureFlags = '' - -v -no-separate-debug-info -release - -system-zlib -system-libpng -system-libjpeg -fast - -qt-gif -confirm-license -opensource - -opengl -xrender -xrandr -xinerama -xcursor -qt-sql-mysql - -qdbus -cups -glib -xfixes -dbus-linked - -fontconfig -I${freetype}/include/freetype2 - ${if buildDemos == true then "" else "-nomake demos"} - ${if buildExamples == true then "" else "-nomake examples"} - ''; - - patchPhase = '' - substituteInPlace configure --replace /bin/pwd pwd - sed -e 's@/usr@/FOO@' -i config.tests/*/*.test -i mkspecs/*/*.conf - ''; - - # Remove the documentation: it takes up >= 130 MB, which is more - # than half of the installed size. Ideally we should put this in a - # separate package (as well as the Qt Designer). - postInstall = '' - ${if keepDocumentation == false then "rm -rf $out/doc" else ""} - ''; - - enableParallelBuilding = true; - - meta = { - homepage = http://www.qtsoftware.com/downloads/opensource/appdev/linux-x11-cpp; - description = "A cross-platform application framework for C++"; - license = "GPL/LGPL"; - maintainers = [ stdenv.lib.maintainers.sander ]; - platforms = stdenv.lib.platforms.mesaPlatforms; - }; -} diff --git a/pkgs/development/libraries/qt-4.x/4.5/setup-hook.sh b/pkgs/development/libraries/qt-4.x/4.5/setup-hook.sh deleted file mode 100644 index f9ecacbbb7d..00000000000 --- a/pkgs/development/libraries/qt-4.x/4.5/setup-hook.sh +++ /dev/null @@ -1,9 +0,0 @@ -export QTDIR=@out@ - -if [ -n "$includeAllQtDirs" ]; then - # This helps for g++, but not for moc. And no qt4 package should expect - # having all qt4 header files dirs into -I. - for d in @out@/include/*; do - export NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE -I$d" - done -fi diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index e878bf2bd9d..1d75a5c4adc 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -3780,10 +3780,6 @@ let qt4 = pkgs.kde4.qt4; - qt45 = callPackage ../development/libraries/qt-4.x/4.5 { - inherit (gnome) glib; - }; - qt46 = callPackage ../development/libraries/qt-4.x/4.6 { inherit (gnome) glib; }; From 1f558f78dffdb10c7ef577c7212a7ebf96de37da Mon Sep 17 00:00:00 2001 From: "Yury G. Kudryashov" Date: Mon, 6 Dec 2010 12:04:16 +0000 Subject: [PATCH 58/86] There will be no kdepim-4.5.x svn path=/nixpkgs/trunk/; revision=24992 --- pkgs/desktops/kde-4.5/default.nix | 4 ---- .../desktops/kde-4.5/pim-runtime45/default.nix | 15 --------------- pkgs/desktops/kde-4.5/pim45/boost-1.44.diff | 12 ------------ pkgs/desktops/kde-4.5/pim45/default.nix | 18 ------------------ 4 files changed, 49 deletions(-) delete mode 100644 pkgs/desktops/kde-4.5/pim-runtime45/default.nix delete mode 100644 pkgs/desktops/kde-4.5/pim45/boost-1.44.diff delete mode 100644 pkgs/desktops/kde-4.5/pim45/default.nix diff --git a/pkgs/desktops/kde-4.5/default.nix b/pkgs/desktops/kde-4.5/default.nix index 8ff7e970199..23be3c98129 100644 --- a/pkgs/desktops/kde-4.5/default.nix +++ b/pkgs/desktops/kde-4.5/default.nix @@ -152,10 +152,6 @@ recurseIntoAttrs rec { kdepim_runtime = callPackage ./pim-runtime { }; kdepim = callPackage ./pim { }; - # Experimental 4.5 versions - kdepim_runtime45 = callPackage ./pim-runtime45 { }; - kdepim45 = callPackage ./pim45 { }; - ### DEVELOPMENT kdebindings = callPackage ./bindings { }; diff --git a/pkgs/desktops/kde-4.5/pim-runtime45/default.nix b/pkgs/desktops/kde-4.5/pim-runtime45/default.nix deleted file mode 100644 index c5952120628..00000000000 --- a/pkgs/desktops/kde-4.5/pim-runtime45/default.nix +++ /dev/null @@ -1,15 +0,0 @@ -{ kde, cmake, kdelibs, qt4, kdepimlibs, akonadi, pkgconfig, boost, shared_mime_info, libxml2, shared_desktop_ontologies, soprano, strigi, automoc4, libxslt }: - -kde.package rec { - buildInputs = [ automoc4 cmake kdelibs qt4 kdepimlibs akonadi pkgconfig boost shared_mime_info shared_desktop_ontologies libxml2 soprano strigi libxslt ]; - - meta = { - description = "Runtime files for KDE PIM: akonadi agents etc."; - kde = rec { - name = "kdepim-runtime"; - version = "4.4.93"; - subdir = "kdepim/${version}/src/src"; - stable = false; - }; - }; -} diff --git a/pkgs/desktops/kde-4.5/pim45/boost-1.44.diff b/pkgs/desktops/kde-4.5/pim45/boost-1.44.diff deleted file mode 100644 index 7c5ab9ef31b..00000000000 --- a/pkgs/desktops/kde-4.5/pim45/boost-1.44.diff +++ /dev/null @@ -1,12 +0,0 @@ -diff --git a/kleopatra/crypto/gui/newresultpage.cpp b/kleopatra/crypto/gui/newresultpage.cpp -index 96d1cb2..5c7281a 100644 ---- a/kleopatra/crypto/gui/newresultpage.cpp -+++ b/kleopatra/crypto/gui/newresultpage.cpp -@@ -40,6 +40,7 @@ - #include - - #include -+#include - - #include - diff --git a/pkgs/desktops/kde-4.5/pim45/default.nix b/pkgs/desktops/kde-4.5/pim45/default.nix deleted file mode 100644 index 1c390e4c820..00000000000 --- a/pkgs/desktops/kde-4.5/pim45/default.nix +++ /dev/null @@ -1,18 +0,0 @@ -{ kde, automoc4, cmake, kdelibs, akonadi, kdepimlibs, boost, zlib, strigi, - shared_mime_info, soprano, grantlee, libassuan, perl, libxslt }: - -kde.package { - buildInputs = [ automoc4 cmake kdelibs akonadi kdepimlibs boost zlib strigi - shared_mime_info soprano grantlee libassuan perl libxslt ]; - - patches = [ ./boost-1.44.diff ]; - - meta = { - kde = rec { - name = "kdepim"; - version = "4.4.93"; - subdir = "kdepim/${version}/src/src"; - stable = false; - }; - }; -} From 9d8000c9686f891ecc8b5bf0fc59cb247a57b4c9 Mon Sep 17 00:00:00 2001 From: "Yury G. Kudryashov" Date: Mon, 6 Dec 2010 12:04:21 +0000 Subject: [PATCH 59/86] Fix l10n manifest generation script svn path=/nixpkgs/trunk/; revision=24993 --- pkgs/desktops/kde-4.5/l10n/l10n-manifest.sh | 3 --- 1 file changed, 3 deletions(-) diff --git a/pkgs/desktops/kde-4.5/l10n/l10n-manifest.sh b/pkgs/desktops/kde-4.5/l10n/l10n-manifest.sh index aa41ccd4278..baa235e0f75 100755 --- a/pkgs/desktops/kde-4.5/l10n/l10n-manifest.sh +++ b/pkgs/desktops/kde-4.5/l10n/l10n-manifest.sh @@ -24,9 +24,6 @@ for i in `cd "${dir}"; ls kde-l10n-*-${release}.tar.bz2`; do hash=$(nix-hash --type sha256 --flat --base32 "${dir}/${i}") echo "{" echo " lang = \"${lang}\";" - if [[ "${lang}" =~ "@" ]]; then - echo " langStripped = \"${lang/@/_}\";" - fi echo " sha256 = \"${hash}\";" echo "}" echo $hash >&2 From dc44c0eeebd4727325c02e5f8e63576220730e53 Mon Sep 17 00:00:00 2001 From: "Yury G. Kudryashov" Date: Mon, 6 Dec 2010 12:04:27 +0000 Subject: [PATCH 60/86] kde-l10n-4.5.3 svn path=/nixpkgs/trunk/; revision=24994 --- pkgs/desktops/kde-4.5/l10n/default.nix | 4 +- pkgs/desktops/kde-4.5/l10n/manifest-4.5.3.nix | 222 ++++++++++++++++++ 2 files changed, 224 insertions(+), 2 deletions(-) create mode 100644 pkgs/desktops/kde-4.5/l10n/manifest-4.5.3.nix diff --git a/pkgs/desktops/kde-4.5/l10n/default.nix b/pkgs/desktops/kde-4.5/l10n/default.nix index 18b234b28bc..6e561726c08 100644 --- a/pkgs/desktops/kde-4.5/l10n/default.nix +++ b/pkgs/desktops/kde-4.5/l10n/default.nix @@ -3,8 +3,8 @@ let overrides = { }; - defaultRelease = "4.5.2"; - releases = [ "4.5.1" "4.5.2" ]; + defaultRelease = "4.5.3"; + releases = [ "4.5.1" "4.5.2" "4.5.3" ]; sanitizeString = replaceChars [ "@" "." ] [ "_" "_" ]; getOverride = name: attrByPath [name] {} overrides; diff --git a/pkgs/desktops/kde-4.5/l10n/manifest-4.5.3.nix b/pkgs/desktops/kde-4.5/l10n/manifest-4.5.3.nix new file mode 100644 index 00000000000..b9b69d76a15 --- /dev/null +++ b/pkgs/desktops/kde-4.5/l10n/manifest-4.5.3.nix @@ -0,0 +1,222 @@ +[ +{ + lang = "ar"; + sha256 = "0i22kwm737ry3l3q9pwmbnv2ln317fz3r1z8x8i6l0czdkj5qxw6"; +} +{ + lang = "bg"; + sha256 = "0qa2x3zz5aaxlm88zvrkglsisc85la6asfh5yiijc9hga27ykp16"; +} +{ + lang = "ca"; + sha256 = "1ip55x72chxs9v1hr8rzi519xhfvkkbv7b4k4pc5nygpdqzj1whh"; +} +{ + lang = "ca@valencia"; + sha256 = "0g8x685a2ndvm9qh2wp6kxdlhbidgsjacw80p488hizgqczakbn7"; +} +{ + lang = "cs"; + sha256 = "19zx1zhd6wrkqmc6qnyj4rsll14difps0dzwnwa56l3h5ir1828v"; +} +{ + lang = "da"; + sha256 = "1q50w3dmxbpczgxgl6n49lc5qqym42r1kz4h7ijqfazb5mwk9zqc"; +} +{ + lang = "de"; + sha256 = "0ff4174szrxm4wn3jmkkzfr3jl0yqxkkqi3g3xj71mazsrsa1ghs"; +} +{ + lang = "el"; + sha256 = "1r5m3d7cc3mi748ckmkky53j3cmw20pibczvkwcs2c65q6l0vcjc"; +} +{ + lang = "en_GB"; + sha256 = "194jdjpqcpi861sxpvqagm8nammwksxyi55i75bw53p8x87i27pv"; +} +{ + lang = "eo"; + sha256 = "1gbmqm9mgmps37pwr7lb140pvrmm24m6aw989qaig27gjjqpmvnx"; +} +{ + lang = "es"; + sha256 = "1hnnk2zvlbppdqqbf1vi2d2c8mpw693bwb6dixba4p542ir7bi8i"; +} +{ + lang = "et"; + sha256 = "0qgv7v93n4mnpcdvjxkdbvyaji1nhgj0nxby5hxrznnvgwbvfzbf"; +} +{ + lang = "eu"; + sha256 = "1rmdak9pgkswrnwdpmgck2lq2cw5v3bjc8vv79mb3kyki901423g"; +} +{ + lang = "fi"; + sha256 = "17s9yqadgjq2dmp28syxzzprya80j0b2l60r293k0bdkdfrgz07p"; +} +{ + lang = "fr"; + sha256 = "15hh7k9dhi2mb27rihjc9dfii1ab8c1i2jbhihmjmb8hd5dm30bx"; +} +{ + lang = "fy"; + sha256 = "0q5vcnimnvl3gmrqj2fr6i7fvw2bd3lrg77s03hf25crkfsd7lr8"; +} +{ + lang = "ga"; + sha256 = "0cy8a0jvb0w35i3482a86rdnbbyswww9dlb57rjhw6mqwa3qp6j6"; +} +{ + lang = "gl"; + sha256 = "1xdzhf6kwkz2r77i86grcdbrwxm37shaif2vjhhwgimplsh7z5s3"; +} +{ + lang = "gu"; + sha256 = "1sky7kc5prg1bnkh2nhriqs33qa7rlfds9k31sf24x4jhfn75lji"; +} +{ + lang = "he"; + sha256 = "0bkfwilsvvaiklgnfnyf6p1dyamwj310b9xkrdga7szrsfgrviip"; +} +{ + lang = "hi"; + sha256 = "0fxz77pfv9ayx43pf037bpllhjwxdhsggl7yq5qg28d233602sxc"; +} +{ + lang = "hr"; + sha256 = "16nkrdh1y9mk5rkdyl70i9dh8xam2fr23lz7p0qmjf66npjnvcz1"; +} +{ + lang = "hu"; + sha256 = "141xhsxv2bk81sx3lzzd78a9qzp0qzrcp32i9d4bkmyppwiia9h2"; +} +{ + lang = "ia"; + sha256 = "1hgzk2yfwjqils8zd1rv1djdjsj932mqxcl4bnfv3az4vl0ly405"; +} +{ + lang = "id"; + sha256 = "12hqichrl7i3fjkqyhc2c3dp34bhjl0ps4g3vpc0m59w2vwyv4sw"; +} +{ + lang = "is"; + sha256 = "1ydx8sx7dwdzava4y3aj0vfd23nfqiwq5m9aw3ayaliipacrq1dg"; +} +{ + lang = "it"; + sha256 = "0z7zig48ixqs18dyi6q28k8dwn2a2giwsndignd5ck7xbi5h7rn8"; +} +{ + lang = "ja"; + sha256 = "0mpch19nk8pqizq2zcs8jpxrsj2nq9lx82m58dwgmxdn3qlpklm3"; +} +{ + lang = "kk"; + sha256 = "099hqac4a5z0aq3nw0znwjlxgxgpmmjb385nm2z74s3d8d4dw8bb"; +} +{ + lang = "km"; + sha256 = "09lmpxv3ljm7bhhnmj94dia7ldz4sdnf9v0cs7ia83iiaw008hc9"; +} +{ + lang = "kn"; + sha256 = "0bzwbncgzf3mhp7f24r9wrf8ip6d5slmvvycmyicvpwfj61dcwsx"; +} +{ + lang = "ko"; + sha256 = "0saxxrzvcsjjw4jascqk8vpr8lm7xq737vabhmsfqga0262h8wzl"; +} +{ + lang = "lt"; + sha256 = "1fn6dbncqdgnwgrd58jcdbc9c474kyb397djxk5lcf9gmdq7634q"; +} +{ + lang = "lv"; + sha256 = "0vml848hxynic4cg3w8zadmfxs7l0qqd7xb3c7kxznrqgkra7rqs"; +} +{ + lang = "ml"; + sha256 = "1d77wb1d7lsmpv2vh8jzfi4y30bd5nn8ljlfx42yfdyw9drkbm38"; +} +{ + lang = "nb"; + sha256 = "1mprsawqaqb6i2nhgbvq8hp1nmfwlxvd9chfx49xas7wk209jd25"; +} +{ + lang = "nds"; + sha256 = "005i6vvq6s8c9spjx0is29jj9d0x4lm766njvsgsa0mrzgfps6w7"; +} +{ + lang = "nl"; + sha256 = "0f0z2ql08pgdbqig67jjxk8p1bf6fk70br9nhmsk72k2lv7abb0y"; +} +{ + lang = "nn"; + sha256 = "08ajabbzrng3gn56bl0wk15rd43pwlrd0crj7c4n8aq61qgz1c1p"; +} +{ + lang = "pa"; + sha256 = "099d7fhk48c3vra7bcam89ffs86iw495vxycr3679ah1bfwf8k68"; +} +{ + lang = "pl"; + sha256 = "1qf6bycvzz6p0lvvkpq2lwvjiln42xrq0qhjzcb7m8zs1zan47hi"; +} +{ + lang = "pt"; + sha256 = "16726ggm87y3bvyhdpvvwcw6n5s8dw5bjw5kxpz7160iljabn71a"; +} +{ + lang = "pt_BR"; + sha256 = "12fp3gf0iicwv426ni7n45rbxywrv4ni73c1ljw1lahfdhmhkxsv"; +} +{ + lang = "ro"; + sha256 = "0bi25kmg7jcmz8c6xlqadzv5jr6kxx8z0pbbhgbh2nl6yfjw7fm9"; +} +{ + lang = "ru"; + sha256 = "0g7ibrv5x9dlhawjcmd302yg4vql31675w7cnzjcpkc9sga3i764"; +} +{ + lang = "sk"; + sha256 = "0jmndf6kxqhqgfiilzfzaf9hgq6c66ndcw1lc306kcw0qv90fm1s"; +} +{ + lang = "sl"; + sha256 = "1lic93q78kq831pzgzmydy6x9fgzkyrwpl5958sjpvbf2dra1xmp"; +} +{ + lang = "sr"; + sha256 = "0g9cdkq7lcm2gbgsk001ywpwjwbsi8xxv90cklifgxfvqnd351gw"; +} +{ + lang = "sv"; + sha256 = "0l7xqyya76np43acq3hjgvcipz0acc2iwqmwjs2hgnhbs12fny2c"; +} +{ + lang = "th"; + sha256 = "1pbjxng4p35zd2aw78x3z5ycil1diah39bknmdgpily5cd3g3bg8"; +} +{ + lang = "tr"; + sha256 = "1spsr67k9wmcaypk0yzqg60qq6ynw4xfi3xcsdm2vkhgcc9rk8cl"; +} +{ + lang = "uk"; + sha256 = "1jii27q1m0sj3vk7ly45m9zi49l4rkr2v05z8zzfbxi2gzg02kc1"; +} +{ + lang = "wa"; + sha256 = "0mqpqpwj1qnzrqyd4lc0fkhj1r42p228kg2yyy6xn2xa4na8sg2w"; +} +{ + lang = "zh_CN"; + sha256 = "0hx69djrd7nvm889b5ig2hjy73m0vhzxxj7njrh21y551pcj7s0q"; +} +{ + lang = "zh_TW"; + sha256 = "1axpangs004scmhq35m22axg3v6rdpidndvr1i49cxf3bhgpqpqs"; +} +] From f3d403097944331d14411f1841d53a788cb1f50f Mon Sep 17 00:00:00 2001 From: "Yury G. Kudryashov" Date: Mon, 6 Dec 2010 12:04:31 +0000 Subject: [PATCH 61/86] Remove unused items from manifest.nix svn path=/nixpkgs/trunk/; revision=24995 --- .../desktops/kde-4.5/kde-package/manifest.nix | 96 ------------------- 1 file changed, 96 deletions(-) diff --git a/pkgs/desktops/kde-4.5/kde-package/manifest.nix b/pkgs/desktops/kde-4.5/kde-package/manifest.nix index 5274035ea56..230533aaeb7 100644 --- a/pkgs/desktops/kde-4.5/kde-package/manifest.nix +++ b/pkgs/desktops/kde-4.5/kde-package/manifest.nix @@ -4,102 +4,6 @@ builtins.listToAttrs name = "polkit-qt-1-0.96.1.tar.bz2"; value = "1ng5bi1gmr5lg49c5kyqyjzbjhs4w90c2zlnfcyviv9p3wzfgzbr"; } -{ - name = "oxygen-icons-4.5.1.tar.bz2"; - value = "1gnz8jrdccw91p2n52my0609h7g9ws55gal3jan2jylz6b0zq6dm"; -} -{ - name = "kdelibs-4.5.1.tar.bz2"; - value = "1xqvrrbwz5i4m6lipg1j97l2yq3kmxsl5j62jkhvp56q7dh85i0d"; -} -{ - name = "kdeaccessibility-4.5.1.tar.bz2"; - value = "0jdd3n61lhabzs2dv6rfv6ksp7cqn5wpj6f2d8z33c354y9lqw24"; -} -{ - name = "kdepimlibs-4.5.1.tar.bz2"; - value = "1dlxnxxay6wbwgcfbkq0xak9z0h1bkh6rvysjx3djmawmwi5aw6b"; -} -{ - name = "kdepim-4.4.93.tar.bz2"; - value = "1xrqmsgbgqpa8qzqadp1hikhn8c1snh5k323kc6a5yqdpnsf2qa0"; -} -{ - name = "kdepim-runtime-4.4.93.tar.bz2"; - value = "18g8dz57pflmri7v013lsn2g4552c35lawcr7jxgig2x05zrwgf7"; -} -{ - name = "kdebase-4.5.1.tar.bz2"; - value = "06g8s3r153hdmxh24s2x98a0fb4lr6d00d4307ibgp7r29w6dklb"; -} -{ - name = "kdebase-runtime-4.5.1.tar.bz2"; - value = "1fjpyxzffl0ravyicgb56sqaw5zkwky98lj9ad6z4rdiysq5v5rz"; -} -{ - name = "kdebase-workspace-4.5.1.tar.bz2"; - value = "0mrx03bsb9qj78k0l04q28gc8l7ky0y0rqdshv4spbmrjfsa03fd"; -} -{ - name = "kdebindings-4.5.1.tar.bz2"; - value = "1j8bf7lwb70jc0m8d2hh6c1z6vgpxbqf47w5pkq58kgan8y3zcsw"; -} -{ - name = "kdeartwork-4.5.1.tar.bz2"; - value = "0fjcx6wwgzxl64s62wv2sf15plx49fck86nwzfbgbmdha1ra2gmi"; -} -{ - name = "kdenetwork-4.5.1.tar.bz2"; - value = "0wzbrhj4bzd4d432qqf5jwfagvxsv3flzdq7jzc449w6ybdgqw6n"; -} -{ - name = "kdeedu-4.5.1.tar.bz2"; - value = "026gdb6q06l9d8v3a0dcynxkdnv9cal1gnnxwdawvc5rky2vp07j"; -} -{ - name = "kdesdk-4.5.1.tar.bz2"; - value = "0kwgd3hxc6jwk7qk67z1jaks9jg04hgh5aywyfs2dc8w2ns1xyhp"; -} -{ - name = "kdetoys-4.5.1.tar.bz2"; - value = "194a6ylxi5jrfh3w3cy6jhdissshswdrv9pnir72z67ca13dvd9s"; -} -{ - name = "kdewebdev-4.5.1.tar.bz2"; - value = "0kgk3wwskvxw0hmzpify5by3mbnyprmy1c0nx44iw85xrk6riss0"; -} -{ - name = "kdeutils-4.5.1.tar.bz2"; - value = "13i13pga3dlhg6bwz6p3wrr8qa0vzhwqg809a0r5yn0kz4icaasq"; -} -{ - name = "kdegraphics-4.5.1.tar.bz2"; - value = "0z0fqqb868ywvdxvd94vp15drkizh59m4arblsx9cj19d157nbwd"; -} -{ - name = "kdemultimedia-4.5.1.tar.bz2"; - value = "1a5rgvznvykislif7igsb3b6xwps2g8s5ifkfj8dbkdvsmavlmjf"; -} -{ - name = "kdegames-4.5.1.tar.bz2"; - value = "1d158z2hqc7i7mh43ajhmsqixdazhjm7pxs6rjala0fcgmqk1lj1"; -} -{ - name = "kdeplasma-addons-4.5.1.tar.bz2"; - value = "17mjk2qdfgcz2l9f00q08dzxkqib8li5bjxawsb7fwzj93jc7lp5"; -} -{ - name = "kdeadmin-4.5.1.tar.bz2"; - value = "011ajsma8s9ay0dsjx383jn8yynkyshlzx6gjw68caxzjhpc0ib2"; -} -{ - name = "kdepim-4.4.6.tar.bz2"; - value = "0pymjjxg8qjiarcbs6saxkkb4n51qlfk4l0pwblhglsvgc4q3wjm"; -} -{ - name = "kdepim-runtime-4.4.6.tar.bz2"; - value = "1y0xxwsq9wlwbkd661i4f1iqvpzg3sbi3lq9dir45fjx406chgmd"; -} { name = "kdeaccessibility-4.5.2.tar.bz2"; value = "1iv94vvngxs94vl3ssjq1y2sd50wcc7s7gvngwqj534qjd1fj3a2"; From c87a2ea7134713baaa97949716097ffe05e6e5d3 Mon Sep 17 00:00:00 2001 From: "Yury G. Kudryashov" Date: Mon, 6 Dec 2010 12:04:36 +0000 Subject: [PATCH 62/86] Add Netlink library svn path=/nixpkgs/trunk/; revision=24996 --- pkgs/os-specific/linux/libnl/default.nix | 20 ++++++++++++++++++++ pkgs/top-level/all-packages.nix | 5 +++++ 2 files changed, 25 insertions(+) create mode 100644 pkgs/os-specific/linux/libnl/default.nix diff --git a/pkgs/os-specific/linux/libnl/default.nix b/pkgs/os-specific/linux/libnl/default.nix new file mode 100644 index 00000000000..cbe938d2ee4 --- /dev/null +++ b/pkgs/os-specific/linux/libnl/default.nix @@ -0,0 +1,20 @@ +{stdenv, fetchurl, bison, flex}: + +stdenv.mkDerivation rec { + name = "libnl-2.0"; + + src = fetchurl { + url = "${meta.homepage}files/${name}.tar.gz"; + sha256 = "173sr25xpsakdvjcg62790v6kwcgxj5r0js2lx6hg89w7n8dqh2s"; + }; + + buildInputs = [ bison flex ]; + postConfigure = "type -tp flex"; + + meta = { + homepage = "http://www.infradead.org/~tgr/libnl/"; + description = "Linux NetLink interface library"; + maintainers = [ stdenv.lib.maintainers.urkud ]; + platforms = stdenv.lib.platforms.linux; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 1d75a5c4adc..1a33bce2013 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -4577,6 +4577,11 @@ let libcroup = callPackage ../os-specific/linux/libcg { }; + libnl = callPackage ../os-specific/linux/libnl { + flex = flex2535; + bison = bison24; + }; + linuxHeaders = linuxHeaders_2_6_28; linuxHeaders26Cross = forceBuildDrv (import ../os-specific/linux/kernel-headers/2.6.32.nix { From 292db979cb19196a0f4ba1581364f993d50ad632 Mon Sep 17 00:00:00 2001 From: "Yury G. Kudryashov" Date: Mon, 6 Dec 2010 12:04:42 +0000 Subject: [PATCH 63/86] Be more verbose svn path=/nixpkgs/trunk/; revision=24997 --- pkgs/applications/audio/ladspa-plugins/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/applications/audio/ladspa-plugins/default.nix b/pkgs/applications/audio/ladspa-plugins/default.nix index 94e1e72d0f5..1557913f401 100644 --- a/pkgs/applications/audio/ladspa-plugins/default.nix +++ b/pkgs/applications/audio/ladspa-plugins/default.nix @@ -13,7 +13,7 @@ stdenv.mkDerivation { postInstall = '' ensureDir $out/share/ladspa/ - ln -s $out/lib/ladspa $out/share/ladspa/lib + ln -sv $out/lib/ladspa $out/share/ladspa/lib ''; meta = { From 528a471aa890b009dc26d253861e5b20978b582d Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Mon, 6 Dec 2010 13:34:00 +0000 Subject: [PATCH 64/86] * apr-util updated to 1.3.10. svn path=/nixpkgs/trunk/; revision=25000 --- pkgs/development/libraries/apr-util/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/apr-util/default.nix b/pkgs/development/libraries/apr-util/default.nix index 1c58aacfdf2..c59184007e5 100644 --- a/pkgs/development/libraries/apr-util/default.nix +++ b/pkgs/development/libraries/apr-util/default.nix @@ -5,11 +5,11 @@ assert bdbSupport -> db4 != null; stdenv.mkDerivation rec { - name = "apr-util-1.3.9"; + name = "apr-util-1.3.10"; src = fetchurl { url = "mirror://apache/apr/${name}.tar.bz2"; - sha256 = "10zcy1an5xkjx8nflirvm2a8rnp9psckws6r7xr5wq6ffxnafhc7"; + sha256 = "1vhps080b0f9z6ibq7xqbhdrclb89min7xwvc2zzc5wf0x4w1h0s"; }; configureFlags = '' From d1d201f11eb3ef0a6917faca2e80e3c39d8f227a Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 6 Dec 2010 18:01:22 +0000 Subject: [PATCH 65/86] subversion: don't specify both --disable-keychain and --enable-keychain svn path=/nixpkgs/trunk/; revision=25008 --- pkgs/applications/version-management/subversion/default.nix | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/pkgs/applications/version-management/subversion/default.nix b/pkgs/applications/version-management/subversion/default.nix index f66b0ed78b3..95d21e2f7a6 100644 --- a/pkgs/applications/version-management/subversion/default.nix +++ b/pkgs/applications/version-management/subversion/default.nix @@ -34,12 +34,11 @@ stdenv.mkDerivation rec { ++ stdenv.lib.optional perlBindings perl; configureFlags = '' - --disable-keychain ${if bdbSupport then "--with-berkeley-db" else "--without-berkeley-db"} ${if httpServer then "--with-apxs=${httpd}/bin/apxs" else "--without-apxs"} ${if pythonBindings || perlBindings then "--with-swig=${swig}" else "--without-swig"} ${if javahlBindings then "--enable-javahl --with-jdk=${jdk}" else ""} - ${if stdenv.isDarwin then "--enable-keychain" else ""} + ${if stdenv.isDarwin then "--enable-keychain" else "--disable-keychain"} --with-zlib=${zlib} --with-sqlite=${sqlite} ''; From 1e1610b37e161cebe0951df60e729348022aa087 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 6 Dec 2010 18:01:28 +0000 Subject: [PATCH 66/86] pkgs/development/tools/build-managers/scons: move --mandir and --infodir to standard locations svn path=/nixpkgs/trunk/; revision=25009 --- pkgs/development/tools/build-managers/scons/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/build-managers/scons/default.nix b/pkgs/development/tools/build-managers/scons/default.nix index d23940dda94..4e9edbde33a 100644 --- a/pkgs/development/tools/build-managers/scons/default.nix +++ b/pkgs/development/tools/build-managers/scons/default.nix @@ -14,8 +14,8 @@ stdenv.mkDerivation { }; preConfigure = '' - for i in script/* - do + configureFlags="--mandir=$out/share/man" + for i in "script/"*; do substituteInPlace $i --replace "/usr/bin/env python" "${python}/bin/python" done ''; From e47468ce769d417cce7153025d130847fae7b6c6 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 6 Dec 2010 18:01:34 +0000 Subject: [PATCH 67/86] pkgs/development/tools/documentation/doxygen: move --mandir and --infodir to standard locations svn path=/nixpkgs/trunk/; revision=25010 --- pkgs/development/tools/documentation/doxygen/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/tools/documentation/doxygen/default.nix b/pkgs/development/tools/documentation/doxygen/default.nix index 899343d12ff..9d15dc29772 100644 --- a/pkgs/development/tools/documentation/doxygen/default.nix +++ b/pkgs/development/tools/documentation/doxygen/default.nix @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { configureFlags = "--release" + (if qt == null then "" else " --with-doxywizard") ; - + makeFlags = "MAN1DIR=share/man/man1"; preConfigure = (if (qt == null) then "" From 747604d740822b2fbc7da68c168c2bda87aab9dd Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 6 Dec 2010 18:01:40 +0000 Subject: [PATCH 68/86] pkgs/development/tools/misc/distcc: move --mandir and --infodir to standard locations svn path=/nixpkgs/trunk/; revision=25011 --- pkgs/development/tools/misc/distcc/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/development/tools/misc/distcc/default.nix b/pkgs/development/tools/misc/distcc/default.nix index e372350e384..b81cb9223bc 100644 --- a/pkgs/development/tools/misc/distcc/default.nix +++ b/pkgs/development/tools/misc/distcc/default.nix @@ -19,6 +19,7 @@ stdenv.mkDerivation { '' configureFlagsArray=( CFLAGS="-O2 -fno-strict-aliasing" CXXFLAGS="-O2 -fno-strict-aliasing" + --mandir=$out/share/man ${if sysconfDir == "" then "" else "--sysconfdir=${sysconfDir}"} ${if static then "LDFLAGS=-static" else ""} --with${if static == true || popt == null then "" else "out"}-included-popt From dffe4189e708d3c66fd4ef29f577f9d0e5a25d04 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 6 Dec 2010 18:01:46 +0000 Subject: [PATCH 69/86] pkgs/tools/X11/x11vnc: move --mandir and --infodir to standard locations svn path=/nixpkgs/trunk/; revision=25012 --- pkgs/tools/X11/x11vnc/default.nix | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/pkgs/tools/X11/x11vnc/default.nix b/pkgs/tools/X11/x11vnc/default.nix index bc846312835..f51d3c2f290 100644 --- a/pkgs/tools/X11/x11vnc/default.nix +++ b/pkgs/tools/X11/x11vnc/default.nix @@ -16,6 +16,10 @@ stdenv.mkDerivation rec { xorg.recordproto xorg.libXi xorg.libXrender xorg.renderproto ]; + preConfigure = '' + configureFlags="--mandir=$out/share/man" + ''; + meta = { description = "A VNC server connected to a real X11 screen"; homepage = http://www.karlrunge.com/x11vnc/; From d46e80976c83a7889d239915499adfb5c281bf76 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 6 Dec 2010 18:01:51 +0000 Subject: [PATCH 70/86] pkgs/tools/admin/tightvnc: move --mandir and --infodir to standard locations svn path=/nixpkgs/trunk/; revision=25013 --- pkgs/tools/admin/tightvnc/builder.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/admin/tightvnc/builder.sh b/pkgs/tools/admin/tightvnc/builder.sh index 86729c0cdf8..72fced37728 100644 --- a/pkgs/tools/admin/tightvnc/builder.sh +++ b/pkgs/tools/admin/tightvnc/builder.sh @@ -32,8 +32,8 @@ buildPhase() { installPhase() { ensureDir $out/bin - ensureDir $out/man/man1 - ./vncinstall $out/bin $out/man + ensureDir $out/share/man/man1 + ./vncinstall $out/bin $out/share/man # fix HTTP client: t=$out/share/tightvnc From 9bd9e32aa859d58f6d2dafa51ef53ac99710bab3 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 6 Dec 2010 18:01:57 +0000 Subject: [PATCH 71/86] pkgs/tools/system/ipmitool: move --mandir and --infodir to standard locations svn path=/nixpkgs/trunk/; revision=25014 --- pkgs/tools/system/ipmitool/default.nix | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/system/ipmitool/default.nix b/pkgs/tools/system/ipmitool/default.nix index 0a4c4b01ef6..2b66bb2e081 100644 --- a/pkgs/tools/system/ipmitool/default.nix +++ b/pkgs/tools/system/ipmitool/default.nix @@ -13,13 +13,23 @@ stdenv.mkDerivation { }; buildInputs = [ openssl ]; - dontDisableStatic = static; - configureFlags = if static then "LDFLAGS=-static --enable-static --disable-shared" else "--enable-shared"; + + preConfigure = '' + configureFlagsArray=( + --infodir=$out/share/info + --mandir=$out/share/man + ${if static then "LDFLAGS=-static --enable-static --disable-shared" else "--enable-shared"} + ) + ''; makeFlags = if static then "AM_LDFLAGS=-all-static" else ""; + dontDisableStatic = static; meta = { description = ''Command-line interface to IPMI-enabled devices''; license = "BSD"; homepage = "http://ipmitool.sourceforge.net"; + + platforms = stdenv.lib.platforms.unix; + maintainers = [ stdenv.lib.maintainers.simons ]; }; } From c4d731f52b0cf29e10f89e418bf68b5a9cca061f Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Mon, 6 Dec 2010 18:59:07 +0000 Subject: [PATCH 72/86] * Samba updated to 3.5.6. Build with --localstatedir=/var to prevent smbd from writing in $out/var at runtime. Also added --with-fhs. svn path=/nixpkgs/trunk/; revision=25015 --- pkgs/servers/samba/default.nix | 40 +++++++++++++++++++++------------- 1 file changed, 25 insertions(+), 15 deletions(-) diff --git a/pkgs/servers/samba/default.nix b/pkgs/servers/samba/default.nix index 31db36c638a..af29fdb8d9f 100644 --- a/pkgs/servers/samba/default.nix +++ b/pkgs/servers/samba/default.nix @@ -13,39 +13,49 @@ , configDir ? "/etc/samba" }: + let - usewith = flag: option: if flag then "--with-"+option else ""; + + useWith = flag: option: if flag then "--with-"+option else ""; + in + stdenv.mkDerivation rec { - name = "samba-3.3.3"; + name = "samba-3.5.6"; src = fetchurl { url = "http://us3.samba.org/samba/ftp/stable/${name}.tar.gz"; - sha256 = "08x3ng7ls5c1a95v7djx362i55wdlmnvarpr7rhng5bb55s9n5qn"; + sha256 = "1nj78bahph9fwxv0v3lz31cy6z167jgmvz63d8l9mlbmhf310r26"; }; - buildInputs = [readline pam openldap popt iniparser libunwind fam acl] + buildInputs = [ readline pam openldap popt iniparser libunwind fam acl ] ++ stdenv.lib.optional useKerberos kerberos; - preConfigure = "cd source"; + preConfigure = "cd source3"; - postInstall = '' - mkdir -pv $out/lib/cups/backend - ln -sv ../../../bin/smbspool $out/lib/cups/backend/smb - '' + stdenv.lib.optionalString (configDir == "") "touch $out/lib/smb.conf"; - - # Don't pass --with-private-dir=/var/samba/private - # --with-lockdir=/var/samba/lock - # the build system will try to create it. configureFlags = '' --with-pam --with-cifsmount --with-aio-support --with-pam_smbpass --disable-swat - --enable-shared-libs --with-configdir=${configDir} - ${usewith winbind "winbind"} + --with-fhs + --localstatedir=/var + ${useWith winbind "winbind"} ${if stdenv.gcc.libc != null then "--with-libiconv=${stdenv.gcc.libc}" else ""} ''; + + # Need to use a DESTDIR because `make install' tries to write in /var and /etc. + installFlags = "DESTDIR=$(TMPDIR)/inst"; + + postInstall = + '' + mkdir -p $out + mv $TMPDIR/inst/$out/* $out/ + + mkdir -pv $out/lib/cups/backend + ln -sv ../../../bin/smbspool $out/lib/cups/backend/smb + '' # */ + + stdenv.lib.optionalString (configDir == "") "touch $out/lib/smb.conf"; } From 04ec671c8a809d987eeb79d69dd51377f907f29a Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Mon, 6 Dec 2010 19:03:32 +0000 Subject: [PATCH 73/86] * Run smbd in its own session / process group (setsid) because smbd now kills its process group when it exits. Without setsid, this ends up killing the parent (i.e., the builder). * Use port 445 instead of 139 because the CIFS kernel module tries port 445 first. If there is an actual Samba running on the host, it would end up connecting to that one instead of our own and fail. svn path=/nixpkgs/trunk/; revision=25017 --- pkgs/build-support/vm/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/build-support/vm/default.nix b/pkgs/build-support/vm/default.nix index 5e0d77129c5..4e63d8082c3 100644 --- a/pkgs/build-support/vm/default.nix +++ b/pkgs/build-support/vm/default.nix @@ -216,7 +216,7 @@ rec { -nographic -no-reboot \ -net nic,model=virtio \ -chardev socket,id=samba,path=./samba \ - -net user,guestfwd=tcp:10.0.2.4:139-chardev:samba \ + -net user,guestfwd=tcp:10.0.2.4:445-chardev:samba \ -drive file=$diskImage,if=virtio,boot=on,cache=writeback,werror=report \ -kernel ${kernel}/bzImage \ -initrd ${initrd}/initrd \ @@ -247,7 +247,7 @@ rec { SMB rm -f ./samba - ${socat}/bin/socat unix-listen:./samba exec:"${samba}/sbin/smbd -s $TMPDIR/smb.conf",nofork > /dev/null 2>&1 & + ${socat}/bin/socat unix-listen:./samba exec:"${utillinux}/bin/setsid ${samba}/sbin/smbd -s $TMPDIR/smb.conf",nofork > /dev/null 2>&1 & while [ ! -e ./samba ]; do sleep 0.1; done # ugly ''; From baa91501304dec0e6091411210f3f4a2a19a923a Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Tue, 7 Dec 2010 11:41:25 +0000 Subject: [PATCH 74/86] pkgs/development/tools/build-managers/scons: cosmetic build improvements - The flag "--mandir" has no effect with setup.py. Instead, "--install-data" must be used. - Don't generate wrappers for trivial symlink aliases in bin. - Prefer symlinks over hard-links. - The dependencies of this expression don't need to be propagated. svn path=/nixpkgs/trunk/; revision=25021 --- pkgs/development/tools/build-managers/scons/default.nix | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/pkgs/development/tools/build-managers/scons/default.nix b/pkgs/development/tools/build-managers/scons/default.nix index 4e9edbde33a..9d6ab6ba815 100644 --- a/pkgs/development/tools/build-managers/scons/default.nix +++ b/pkgs/development/tools/build-managers/scons/default.nix @@ -13,16 +13,15 @@ stdenv.mkDerivation { sha256 = "0qk74nrnm9qlijrq6gmy8cyhjgp0gis4zx44divnr8n487d5308a"; }; + buildInputs = [python makeWrapper]; + preConfigure = '' - configureFlags="--mandir=$out/share/man" for i in "script/"*; do substituteInPlace $i --replace "/usr/bin/env python" "${python}/bin/python" done ''; - - propagatedBuildInputs = [python makeWrapper]; - buildPhase = "python setup.py install --prefix=$out --install-lib=$(toPythonPath $out) --hardlink-scons -O1"; - installPhase = "for n in $out/bin/*; do wrapProgram $n --suffix PYTHONPATH ':' \"$(toPythonPath $out)\"; done"; + buildPhase = "python setup.py install --prefix=$out --install-data=$out/share --install-lib=$(toPythonPath $out) --symlink-scons -O1"; + installPhase = "for n in $out/bin/*-${version}; do wrapProgram $n --suffix PYTHONPATH ':' \"$(toPythonPath $out)\"; done"; meta = { homepage = "http://scons.org/"; From 41cffbd0c39d5e9aa30c9e0eab9d13ecd7e9ea25 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Tue, 7 Dec 2010 12:03:07 +0000 Subject: [PATCH 75/86] * nixSqlite: use SQLite 3.6.x. 3.7.x gives weird "malformed disk image" errors. svn path=/nixpkgs/trunk/; revision=25023 --- 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 1a33bce2013..34d45807b49 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -7164,6 +7164,7 @@ let nixSqlite = lowPrio (callPackage ../tools/package-management/nix/sqlite.nix { storeDir = getPkgConfig "nix" "storeDir" "/nix/store"; stateDir = getPkgConfig "nix" "stateDir" "/nix/var"; + sqlite = sqlite36; }); nixCustomFun = src: preConfigure: enableScripts: configureFlags: From 7236f87bede58af6f194ee029c799da471c88c6f Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Tue, 7 Dec 2010 13:16:11 +0000 Subject: [PATCH 76/86] * Bump. svn path=/nixpkgs/trunk/; revision=25025 --- pkgs/tools/package-management/nix/sqlite.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/package-management/nix/sqlite.nix b/pkgs/tools/package-management/nix/sqlite.nix index 793fc57350a..c1c051a82bb 100644 --- a/pkgs/tools/package-management/nix/sqlite.nix +++ b/pkgs/tools/package-management/nix/sqlite.nix @@ -5,11 +5,11 @@ }: stdenv.mkDerivation rec { - name = "nix-1.0pre24749"; + name = "nix-1.0pre25024"; src = fetchurl { - url = "http://hydra.nixos.org/build/757682/download/4/${name}.tar.bz2"; - sha256 = "ab2bda296eb91a600d01a22ed4096acdf9b5d613f1155f98433d87e273a58970"; + url = "http://hydra.nixos.org/build/786470/download/4/${name}.tar.bz2"; + sha256 = "35962fcca9b69db7103331a595524443d6403a9a9121bddef4421601b2473528"; }; buildInputs = [ perl curl openssl pkgconfig boehmgc ]; From d6f066c8ed6fe6ed399f9b605adfea5bde21b6fe Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Wed, 8 Dec 2010 17:58:18 +0000 Subject: [PATCH 77/86] * e2fsprogs updated to 1.41.12. svn path=/nixpkgs/trunk/; revision=25035 --- pkgs/tools/filesystems/e2fsprogs/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/tools/filesystems/e2fsprogs/default.nix b/pkgs/tools/filesystems/e2fsprogs/default.nix index d568fa75caa..903b8f10347 100644 --- a/pkgs/tools/filesystems/e2fsprogs/default.nix +++ b/pkgs/tools/filesystems/e2fsprogs/default.nix @@ -1,14 +1,14 @@ -{stdenv, fetchurl, pkgconfig, libuuid}: +{ stdenv, fetchurl, pkgconfig, libuuid }: stdenv.mkDerivation rec { - name = "e2fsprogs-1.41.9"; + name = "e2fsprogs-1.41.12"; src = fetchurl { url = "mirror://sourceforge/e2fsprogs/${name}.tar.gz"; - sha256 = "1s365fpv5w5m8n6n5fnn6q003whr1clr22xn25wkssx1c51f7wfb"; + sha256 = "084zpg4ma6g4y4plz7alfqc1q78jss8lfmpk4w7zvnmz43fd09lw"; }; - buildInputs = [pkgconfig libuuid]; + buildInputs = [ pkgconfig libuuid ]; crossAttrs = { preConfigure = '' From b555e4d8d651db15e5620a9009e3a478b71fce10 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Wed, 8 Dec 2010 19:20:01 +0000 Subject: [PATCH 78/86] * NVIDIA drivers updated to 260.19.21. svn path=/nixpkgs/trunk/; revision=25037 --- pkgs/os-specific/linux/nvidia-x11/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/os-specific/linux/nvidia-x11/default.nix b/pkgs/os-specific/linux/nvidia-x11/default.nix index d20e92f7636..ff85f8f8b97 100644 --- a/pkgs/os-specific/linux/nvidia-x11/default.nix +++ b/pkgs/os-specific/linux/nvidia-x11/default.nix @@ -7,7 +7,7 @@ with stdenv.lib; -let versionNumber = "256.44"; in +let versionNumber = "260.19.21"; in stdenv.mkDerivation { name = "nvidia-x11-${versionNumber}${optionalString (!libsOnly) "-${kernel.version}"}"; @@ -18,12 +18,12 @@ stdenv.mkDerivation { if stdenv.system == "i686-linux" then fetchurl { url = "http://us.download.nvidia.com/XFree86/Linux-x86/${versionNumber}/NVIDIA-Linux-x86-${versionNumber}.run"; - sha256 = "1kirr1bs6kricxcbk1lxz263jyzfb2il91071h0slilmpjs5ipmi"; + sha256 = "1gr11icpi1jcba39i86mvb6yvawika04hja2c2gri9mz7bbbn1kp"; } else if stdenv.system == "x86_64-linux" then fetchurl { url = "http://us.download.nvidia.com/XFree86/Linux-x86_64/${versionNumber}/NVIDIA-Linux-x86_64-${versionNumber}-no-compat32.run"; - sha256 = "004m97wp2bspykb96dj8kkd2pa2rx8pswscyyf7r9hb93vx47bbl"; + sha256 = "1pl5pwp72vdvw74449pv9h4hnygg5sasz8z3f0vbmch4c8hdmyz9"; } else throw "nvidia-x11 does not support platform ${stdenv.system}"; From 114fa21c481f0c9b52f4e7a2915bffbdfb61467e Mon Sep 17 00:00:00 2001 From: Marco Maggesi Date: Thu, 9 Dec 2010 14:03:13 +0000 Subject: [PATCH 79/86] * Add ocaml 3.12.0 svn path=/nixpkgs/trunk/; revision=25040 --- pkgs/development/compilers/ocaml/3.12.0.nix | 57 +++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 + 2 files changed, 59 insertions(+) create mode 100644 pkgs/development/compilers/ocaml/3.12.0.nix diff --git a/pkgs/development/compilers/ocaml/3.12.0.nix b/pkgs/development/compilers/ocaml/3.12.0.nix new file mode 100644 index 00000000000..bf767af5c9a --- /dev/null +++ b/pkgs/development/compilers/ocaml/3.12.0.nix @@ -0,0 +1,57 @@ +{ stdenv, fetchurl, ncurses, x11 }: + +let + useX11 = stdenv.system != "armv5tel-linux"; + useNativeCompilers = stdenv.system != "armv5tel-linux"; + inherit (stdenv.lib) optionals optionalString; +in + +stdenv.mkDerivation rec { + + name = "ocaml-3.12.0"; + + src = fetchurl { + url = "http://caml.inria.fr/pub/distrib/ocaml-3.12/${name}.tar.bz2"; + sha256 = "0fzczy1s38ihlvghngn4l4n7gnyywnwd7c172276bjcy41b1g08p"; + }; + + prefixKey = "-prefix "; + configureFlags = ["-no-tk"] ++ optionals useX11 [ "-x11lib" x11 ]; + buildFlags = "world" + optionalString useNativeCompilers " bootstrap world.opt"; + buildInputs = [ncurses] ++ optionals useX11 [ x11 ]; + installTargets = "install" + optionalString useNativeCompilers " installopt"; + patchPhase = '' + CAT=$(type -tp cat) + sed -e "s@/bin/cat@$CAT@" -i config/auto-aux/sharpbang + ''; + postBuild = '' + ensureDir $out/include + ln -sv $out/lib/ocaml/caml $out/include/caml + ''; + + meta = { + homepage = http://caml.inria.fr/ocaml; + licenses = [ "QPL" /* compiler */ "LGPLv2" /* library */ ]; + description = "Objective Caml, the most popular variant of the Caml language"; + + longDescription = + '' Objective Caml is the most popular variant of the Caml language. + From a language standpoint, it extends the core Caml language with a + fully-fledged object-oriented layer, as well as a powerful module + system, all connected by a sound, polymorphic type system featuring + type inference. + + The Objective Caml system is an industrial-strength implementation + of this language, featuring a high-performance native-code compiler + (ocamlopt) for 9 processor architectures (IA32, PowerPC, AMD64, + Alpha, Sparc, Mips, IA64, HPPA, StrongArm), as well as a bytecode + compiler (ocamlc) and an interactive read-eval-print loop (ocaml) + for quick development and portability. The Objective Caml + distribution includes a comprehensive standard library, a replay + debugger (ocamldebug), lexer (ocamllex) and parser (ocamlyacc) + generators, a pre-processor pretty-printer (camlp4) and a + documentation generator (ocamldoc). + ''; + }; + +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 34d45807b49..5e2fc471f88 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -1980,6 +1980,8 @@ let ocaml_3_11_1 = callPackage ../development/compilers/ocaml/3.11.1.nix { }; + ocaml_3_12_0 = callPackage ../development/compilers/ocaml/3.12.0.nix { }; + opencxx = callPackage ../development/compilers/opencxx { gcc = gcc33; }; From ac457478e35e56e7370e3e40167e5df75de98363 Mon Sep 17 00:00:00 2001 From: Marco Maggesi Date: Thu, 9 Dec 2010 15:40:04 +0000 Subject: [PATCH 80/86] * Add ocaml packages findlib, camlzip, ocaml-ssl, ocaml-batteries, menhir, camomile, ocaml-lwt, cryptokit, ocaml-cryptgps, ounit, ocaml-react svn path=/nixpkgs/trunk/; revision=25041 --- .../ocaml-modules/batteries/default.nix | 34 ++++++++++++ pkgs/development/ocaml-modules/camlzip/META | 23 ++++++++ .../ocaml-modules/camlzip/default.nix | 47 ++++++++++++++++ .../ocaml-modules/camlzip/makefile.patch | 32 +++++++++++ .../ocaml-modules/camomile/0.7.3.nix | 25 +++++++++ .../ocaml-modules/camomile/0.8.1.nix | 25 +++++++++ .../ocaml-modules/cryptgps/default.nix | 31 +++++++++++ pkgs/development/ocaml-modules/cryptokit/META | 8 +++ .../ocaml-modules/cryptokit/default.nix | 43 +++++++++++++++ .../ocaml-modules/cryptokit/makefile.patch | 21 ++++++++ .../development/ocaml-modules/lwt/default.nix | 25 +++++++++ .../ocaml-modules/menhir/default.nix | 47 ++++++++++++++++ .../ocaml-modules/ounit/default.nix | 31 +++++++++++ .../ocaml-modules/pcre/default.nix | 26 +++++++++ .../ocaml-modules/react/default.nix | 33 ++++++++++++ .../development/ocaml-modules/ssl/default.nix | 27 ++++++++++ .../tools/ocaml/findlib/default.nix | 54 +++++++++++++++++++ .../tools/ocaml/findlib/ldconf.patch | 8 +++ pkgs/top-level/all-packages.nix | 37 +++++++++++++ 19 files changed, 577 insertions(+) create mode 100644 pkgs/development/ocaml-modules/batteries/default.nix create mode 100644 pkgs/development/ocaml-modules/camlzip/META create mode 100644 pkgs/development/ocaml-modules/camlzip/default.nix create mode 100644 pkgs/development/ocaml-modules/camlzip/makefile.patch create mode 100644 pkgs/development/ocaml-modules/camomile/0.7.3.nix create mode 100644 pkgs/development/ocaml-modules/camomile/0.8.1.nix create mode 100644 pkgs/development/ocaml-modules/cryptgps/default.nix create mode 100644 pkgs/development/ocaml-modules/cryptokit/META create mode 100644 pkgs/development/ocaml-modules/cryptokit/default.nix create mode 100644 pkgs/development/ocaml-modules/cryptokit/makefile.patch create mode 100644 pkgs/development/ocaml-modules/lwt/default.nix create mode 100644 pkgs/development/ocaml-modules/menhir/default.nix create mode 100644 pkgs/development/ocaml-modules/ounit/default.nix create mode 100644 pkgs/development/ocaml-modules/pcre/default.nix create mode 100644 pkgs/development/ocaml-modules/react/default.nix create mode 100644 pkgs/development/ocaml-modules/ssl/default.nix create mode 100644 pkgs/development/tools/ocaml/findlib/default.nix create mode 100644 pkgs/development/tools/ocaml/findlib/ldconf.patch diff --git a/pkgs/development/ocaml-modules/batteries/default.nix b/pkgs/development/ocaml-modules/batteries/default.nix new file mode 100644 index 00000000000..9aef1f446fe --- /dev/null +++ b/pkgs/development/ocaml-modules/batteries/default.nix @@ -0,0 +1,34 @@ +{stdenv, fetchurl, ocaml, findlib, camomile, ounit}: + +let + ocaml_version = (builtins.parseDrvName ocaml.name).version; + version = "1.2.0"; +in + +stdenv.mkDerivation { + name = "ocaml-batteries-${version}"; + + src = fetchurl { + url = "http://forge.ocamlcore.org/frs/download.php/423/batteries-${version}.tar.gz"; + sha256 = "0lkkbfj51zkhhr56nx167448pvg02nrzjjkl57ycic2ikzgq6lmx"; + }; + + buildInputs = [ocaml findlib camomile ounit]; + + configurePhase = "true"; # Skip configure + + doCheck = true; + + checkTarget = "test"; + + meta = { + homepage = http://batteries.forge.ocamlcore.org/; + description = "OCaml Batteries Included"; + longDescription = '' + A community-driven effort to standardize on an consistent, documented, + and comprehensive development platform for the OCaml programming + language. + ''; + license = "LGPL"; + }; +} diff --git a/pkgs/development/ocaml-modules/camlzip/META b/pkgs/development/ocaml-modules/camlzip/META new file mode 100644 index 00000000000..85456166101 --- /dev/null +++ b/pkgs/development/ocaml-modules/camlzip/META @@ -0,0 +1,23 @@ +# Specifications for the "camlzip" library: + +name="zip" +version="1.04" +description="A library for handling ZIP and GZIP files in OCaml" +directory="@INSTALLDIR@" + +requires="unix" +requires(byte)="unix" +requires(native)="unix" +requires(toploop)="unix" + +requires(byte,mt)="unix" +requires(native,mt)="unix" +requires(toploop,mt)="unix" + +archive(byte)="zip.cma" +archive(native)="zip.cmxa" +archive(toploop)="zip.cma" + +archive(byte,mt)="zip.cma" +archive(native,mt)="zip.cmxa" +archive(toploop,mt)="zip.cma" diff --git a/pkgs/development/ocaml-modules/camlzip/default.nix b/pkgs/development/ocaml-modules/camlzip/default.nix new file mode 100644 index 00000000000..4e5df2cd75d --- /dev/null +++ b/pkgs/development/ocaml-modules/camlzip/default.nix @@ -0,0 +1,47 @@ +{stdenv, fetchurl, zlib, ocaml}: + +let + ocaml_version = (builtins.parseDrvName ocaml.name).version; + version = "1.04"; +in + +stdenv.mkDerivation { + name = "camlzip-${version}"; + + src = fetchurl { + url = "http://forge.ocamlcore.org/frs/download.php/328/" + + "camlzip-${version}.tar.gz"; + sha256 = "1zpchmp199x7f4mzmapvfywgy7f6wy9yynd9nd8yh8l78s5gixbn"; + }; + + buildInputs = [zlib ocaml]; + + patches = [ ./makefile.patch ]; + + configurePhase = '' + export INSTALLDIR="$out/lib/ocaml/${ocaml_version}/site-lib/zip" + substituteInPlace Makefile \ + --subst-var-by ZLIB_LIBDIR "${zlib}/lib" \ + --subst-var-by ZLIB_INCLUDE "${zlib}/include" \ + --subst-var INSTALLDIR + ''; + + buildFlags = "all allopt"; + + installTargets = "install installopt"; + + postInstall = '' + substitute ${./META} $INSTALLDIR/META --subst-var INSTALLDIR + ''; + + meta = { + homepage = "http://cristal.inria.fr/~xleroy/software.html#camlzip"; + description = "A library for handling ZIP and GZIP files in OCaml"; + longDescription = '' + This Objective Caml library provides easy access to compressed files in + ZIP and GZIP format, as well as to Java JAR files. It provides functions + for reading from and writing to compressed files in these formats. + ''; + license = "LGPL+linking exceptions"; + }; +} diff --git a/pkgs/development/ocaml-modules/camlzip/makefile.patch b/pkgs/development/ocaml-modules/camlzip/makefile.patch new file mode 100644 index 00000000000..10adcd6687b --- /dev/null +++ b/pkgs/development/ocaml-modules/camlzip/makefile.patch @@ -0,0 +1,32 @@ +diff -Naur camlzip-1.04/Makefile camlzip-1.04.nixos/Makefile +--- camlzip-1.04/Makefile 2002-04-22 17:28:57.000000000 +0200 ++++ camlzip-1.04.nixos/Makefile 2010-08-17 14:40:07.000000000 +0200 +@@ -4,14 +4,14 @@ + ZLIB_LIB=-lz + + # The directory containing the Zlib library (libz.a or libz.so) +-ZLIB_LIBDIR=/usr/local/lib ++ZLIB_LIBDIR=@ZLIB_LIBDIR@ + + # The directory containing the Zlib header file (zlib.h) +-ZLIB_INCLUDE=/usr/local/include ++ZLIB_INCLUDE=@ZLIB_INCLUDE@ + + # Where to install the library. By default: sub-directory 'zip' of + # OCaml's standard library directory. +-INSTALLDIR=`$(OCAMLC) -where`/zip ++INSTALLDIR=@INSTALLDIR@ + + ### End of configuration section + +@@ -59,10 +59,6 @@ + cp zip.cma zip.cmi gzip.cmi zip.mli gzip.mli libcamlzip.a $(INSTALLDIR) + if test -f dllcamlzip.so; then \ + cp dllcamlzip.so $(INSTALLDIR); \ +- ldconf=`$(OCAMLC) -where`/ld.conf; \ +- installdir=$(INSTALLDIR); \ +- if test `grep -s -c $$installdir'$$' $$ldconf || :` = 0; \ +- then echo $$installdir >> $$ldconf; fi \ + fi + + installopt: diff --git a/pkgs/development/ocaml-modules/camomile/0.7.3.nix b/pkgs/development/ocaml-modules/camomile/0.7.3.nix new file mode 100644 index 00000000000..4cc21404258 --- /dev/null +++ b/pkgs/development/ocaml-modules/camomile/0.7.3.nix @@ -0,0 +1,25 @@ +{stdenv, fetchurl, ocaml, findlib}: + +let + ocaml_version = (builtins.parseDrvName ocaml.name).version; + version = "0.7.3"; +in + +stdenv.mkDerivation { + name = "camomile-${version}"; + + src = fetchurl { + url = "mirror://sourceforge/camomile/camomile-${version}.tar.bz2"; + sha256 = "0cm3j3ppl15fp597ih3qiagxyg8kpql9apapkqaib2xccc44zb5l"; + }; + + buildInputs = [ocaml findlib]; + + #dontAddPrefix = true; + + meta = { + homepage = http://camomile.sourceforge.net/; + description = "A comprehensive Unicode library for OCaml"; + license = "LGPL"; + }; +} diff --git a/pkgs/development/ocaml-modules/camomile/0.8.1.nix b/pkgs/development/ocaml-modules/camomile/0.8.1.nix new file mode 100644 index 00000000000..1c32bca58b1 --- /dev/null +++ b/pkgs/development/ocaml-modules/camomile/0.8.1.nix @@ -0,0 +1,25 @@ +{stdenv, fetchurl, ocaml, findlib}: + +let + ocaml_version = (builtins.parseDrvName ocaml.name).version; + version = "0.8.1"; +in + +stdenv.mkDerivation { + name = "camomile-${version}"; + + src = fetchurl { + url = "mirror://sourceforge/camomile/camomile-${version}.tar.bz2"; + sha256 = "1r84y7wl10zkjmp8qqq2bcmll23qmfczlnykm74hxkig8ksm0g6a"; + }; + + buildInputs = [ocaml findlib]; + + #dontAddPrefix = true; + + meta = { + homepage = http://camomile.sourceforge.net/; + description = "A comprehensive Unicode library for OCaml"; + license = "LGPL"; + }; +} diff --git a/pkgs/development/ocaml-modules/cryptgps/default.nix b/pkgs/development/ocaml-modules/cryptgps/default.nix new file mode 100644 index 00000000000..a9116c09ee7 --- /dev/null +++ b/pkgs/development/ocaml-modules/cryptgps/default.nix @@ -0,0 +1,31 @@ +{stdenv, fetchurl, ocaml, findlib}: + +let + ocaml_version = (builtins.parseDrvName ocaml.name).version; + version = "0.2.1"; +in + +stdenv.mkDerivation { + name = "ocaml-cryptgps-${version}"; + + src = fetchurl { + url = "http://download.camlcity.org/download/cryptgps-0.2.1.tar.gz"; + sha256 = "1mp7i42cm9w9grmcsa69m3h1ycpn6a48p43y4xj8rsc12x9nav3s"; + }; + + buildInputs = [ocaml findlib]; + + configurePhase = "true"; # Skip configure phase + + meta = { + homepage = http://projects.camlcity.org/projects/cryptgps.html; + description = "Cryptographic functions for OCaml"; + longDescription = '' + This library implements the symmetric cryptographic algorithms + Blowfish, DES, and 3DES. The algorithms are written in O'Caml, + i.e. this is not a binding to some C library, but the implementation + itself. + ''; + license = "MIT/X11"; + }; +} diff --git a/pkgs/development/ocaml-modules/cryptokit/META b/pkgs/development/ocaml-modules/cryptokit/META new file mode 100644 index 00000000000..661170835fd --- /dev/null +++ b/pkgs/development/ocaml-modules/cryptokit/META @@ -0,0 +1,8 @@ +# Specifications for the "cryptokit" library: +requires = "" +description = "A library of cryptographic primitives for OCaml" +version = "1.3" +directory = "^" + +archive(byte) = "cryptokit.cma" +archive(native) = "cryptokit.cmxa" diff --git a/pkgs/development/ocaml-modules/cryptokit/default.nix b/pkgs/development/ocaml-modules/cryptokit/default.nix new file mode 100644 index 00000000000..1c7e361f3fc --- /dev/null +++ b/pkgs/development/ocaml-modules/cryptokit/default.nix @@ -0,0 +1,43 @@ +{stdenv, fetchurl, zlib, ocaml}: + +let + ocaml_version = (builtins.parseDrvName ocaml.name).version; + version = "1.3"; +in + +stdenv.mkDerivation { + name = "cryptokit-${version}"; + + src = fetchurl { + url = "http://forge.ocamlcore.org/frs/download.php/326/" + + "cryptokit-${version}.tar.gz"; + sha256 = "0kqrlxkpzrj2qpniy6mhn7gx3n29s86vk4q0im2hqpxi9knkkwwy"; + }; + + buildInputs = [zlib ocaml]; + + patches = [ ./makefile.patch ]; + + configurePhase = '' + export INSTALLDIR="$out/lib/ocaml/${ocaml_version}/site-lib/cryptokit" + substituteInPlace Makefile \ + --subst-var-by ZLIB_LIBDIR "${zlib}/lib" \ + --subst-var-by ZLIB_INCLUDE "${zlib}/include" \ + --subst-var INSTALLDIR + ''; + + buildFlags = "all allopt"; + + doCheck = true; + + checkTarget = "test"; + + preInstall = "ensureDir $INSTALLDIR"; + + postInstall = "cp -a ${./META} $INSTALLDIR/META"; + + meta = { + homepage = "http://pauillac.inria.fr/~xleroy/software.html"; + description = "A library of cryptographic primitives for OCaml"; + }; +} diff --git a/pkgs/development/ocaml-modules/cryptokit/makefile.patch b/pkgs/development/ocaml-modules/cryptokit/makefile.patch new file mode 100644 index 00000000000..b4a82c7d677 --- /dev/null +++ b/pkgs/development/ocaml-modules/cryptokit/makefile.patch @@ -0,0 +1,21 @@ +diff -Nuar cryptokit-1.3/Makefile cryptokit-1.3.nixos/Makefile +--- cryptokit-1.3/Makefile 2005-04-20 15:19:54.000000000 +0200 ++++ cryptokit-1.3.nixos/Makefile 2010-08-17 15:22:07.000000000 +0200 +@@ -9,14 +9,13 @@ + + # The directory containing the Zlib library (libz.a or libz.so) + # Leave blank if you don't have Zlib. +-ZLIB_LIBDIR=/usr/lib +-#ZLIB_LIBDIR=/usr/lib64 # for x86-64 Linux ++ZLIB_LIBDIR=@ZLIB_LIBDIR@ + + # The directory containing the Zlib header file (zlib.h) +-ZLIB_INCLUDE=/usr/include ++ZLIB_INCLUDE=@ZLIB_INCLUDE@ + + # Where to install the library. By default: OCaml's standard library directory. +-INSTALLDIR=`$(OCAMLC) -where` ++INSTALLDIR=@INSTALLDIR@ + + # Flags for the C compiler. + CFLAGS=-O -I$(ZLIB_INCLUDE) $(ZLIB) diff --git a/pkgs/development/ocaml-modules/lwt/default.nix b/pkgs/development/ocaml-modules/lwt/default.nix new file mode 100644 index 00000000000..766419aada7 --- /dev/null +++ b/pkgs/development/ocaml-modules/lwt/default.nix @@ -0,0 +1,25 @@ +{stdenv, fetchurl, which, cryptopp, ocaml, findlib, ocaml_react, ocaml_ssl}: + +let + ocaml_version = (builtins.parseDrvName ocaml.name).version; + version = "2.1.1"; +in + +stdenv.mkDerivation { + name = "ocaml-lwt-${version}"; + + src = fetchurl { + url = "http://ocsigen.org/download/lwt-${version}.tar.gz"; + sha256 = "1zjn0sgihryshancn4kna1xslhc8gifliny1qd3a85f72xxxnw0w"; + }; + + buildInputs = [which cryptopp ocaml findlib ocaml_react ocaml_ssl]; + + configurePhase = "true"; + + meta = { + homepage = http://ocsigen.org/lwt; + description = "Lightweight thread library for Objective Caml"; + license = "LGPL"; + }; +} diff --git a/pkgs/development/ocaml-modules/menhir/default.nix b/pkgs/development/ocaml-modules/menhir/default.nix new file mode 100644 index 00000000000..7c1a2bfe829 --- /dev/null +++ b/pkgs/development/ocaml-modules/menhir/default.nix @@ -0,0 +1,47 @@ +{stdenv, fetchurl, ocaml, findlib}: + +let + ocaml_version = (builtins.parseDrvName ocaml.name).version; + version = "20090505"; +in + +stdenv.mkDerivation { + name = "menhir-${version}"; + + src = fetchurl { + url = "http://pauillac.inria.fr/~fpottier/menhir/menhir-${version}.tar.gz"; + sha256 = "1dsy80wp7k9wbxc89pjzy2izdkk4b72104m9ik747xzy23mssbyx"; + }; + + buildInputs = [ocaml findlib]; + + configurePhase = "true"; # Skip configure + + preBuild = '' + #Fix makefiles. + RM=$(type -p rm) + CHMOD=$(type -p chmod) + ENV=$(type -p env) + for f in src/Makefile demos/OMakefile* demos/Makefile* demos/ocamldep.wrapper + do + substituteInPlace $f \ + --replace /bin/rm $RM \ + --replace /bin/chmod $CHMOD \ + --replace /usr/bin/env $ENV + done + + export PREFIX=$out + ''; + + meta = { + homepage = http://pauillac.inria.fr/~fpottier/menhir/; + description = "A LR(1) parser generator for OCaml"; + longDescription = '' + Menhir is a LR(1) parser generator for the Objective Caml programming + language. That is, Menhir compiles LR(1) grammar specifications down + to OCaml code. Menhir was designed and implemented by François Pottier + and Yann Régis-Gianas. + ''; + license = "QPL,LGPL+linking exceptions"; + }; +} diff --git a/pkgs/development/ocaml-modules/ounit/default.nix b/pkgs/development/ocaml-modules/ounit/default.nix new file mode 100644 index 00000000000..af208dc5651 --- /dev/null +++ b/pkgs/development/ocaml-modules/ounit/default.nix @@ -0,0 +1,31 @@ +{stdenv, fetchurl, ocaml, findlib}: + +let + ocaml_version = (builtins.parseDrvName ocaml.name).version; + version = "1.0.3"; +in + +stdenv.mkDerivation { + name = "ounit-${version}"; + + src = fetchurl { + url = "http://www.xs4all.nl/~mmzeeman/ocaml/ounit-${version}.tar.gz"; + sha256 = "1n7ylrbi2m00gn0kjg5zxnyzxki8v1dy31fcz3vh1xnwcx6hii97"; + }; + + buildInputs = [ocaml findlib]; + + configurePhase = "true"; # Skip configure + + buildFlags = "all allopt"; + + doCheck = true; + + checkTarget = "test"; + + meta = { + homepage = http://www.xs4all.nl/~mmzeeman/ocaml/; + description = "Unit test framework for OCaml"; + license = "MIT/X11"; + }; +} diff --git a/pkgs/development/ocaml-modules/pcre/default.nix b/pkgs/development/ocaml-modules/pcre/default.nix new file mode 100644 index 00000000000..d1287425625 --- /dev/null +++ b/pkgs/development/ocaml-modules/pcre/default.nix @@ -0,0 +1,26 @@ +{stdenv, fetchurl, pcre, ocaml, findlib}: + +let + ocaml_version = (builtins.parseDrvName ocaml.name).version; + version = "6.1.0"; +in + +stdenv.mkDerivation { + name = "ocaml-pcre-${version}"; + + src = fetchurl { + url = "http://hg.ocaml.info/release/pcre-ocaml/archive/" + + "release-${version}.tar.bz2"; + sha256 = "1lj9mzabi1crxwvb2ly1l10h4hlx0fw20nbnq76bbzzkzabjs4ll"; + }; + + buildInputs = [pcre ocaml findlib]; + + configurePhase = "true"; # Skip configure phase + + meta = { + homepage = "http://www.ocaml.info/home/ocaml_sources.html#pcre-ocaml"; + description = "An efficient C-library for pattern matching with Perl-style regular expressions in OCaml"; + license = "LGPL"; + }; +} diff --git a/pkgs/development/ocaml-modules/react/default.nix b/pkgs/development/ocaml-modules/react/default.nix new file mode 100644 index 00000000000..b1757d84b7b --- /dev/null +++ b/pkgs/development/ocaml-modules/react/default.nix @@ -0,0 +1,33 @@ +{stdenv, fetchurl, ocaml}: + +let + ocaml_version = (builtins.parseDrvName ocaml.name).version; + version = "0.9.2"; +in + +stdenv.mkDerivation { + name = "ocaml-react-${version}"; + + src = fetchurl { + url = "http://erratique.ch/software/react/releases/react-${version}.tbz"; + sha256 = "0fiaxzfxv8pc82d31jz85zryz06k84is0l3sn5g0di5mpc5falxr"; + }; + + buildInputs = [ocaml]; + + buildCommand = '' + export INSTALLDIR=$out/lib/ocaml/${ocaml_version}/site-lib/react + tar xjf $src + cd react-* + substituteInPlace src/META --replace '+react' $INSTALLDIR + chmod +x build + ./build + ./build install + ''; + + meta = { + homepage = http://erratique.ch/software/react; + description = "Applicative events and signals for OCaml"; + license = "BSD"; + }; +} diff --git a/pkgs/development/ocaml-modules/ssl/default.nix b/pkgs/development/ocaml-modules/ssl/default.nix new file mode 100644 index 00000000000..6d57bd3bbf5 --- /dev/null +++ b/pkgs/development/ocaml-modules/ssl/default.nix @@ -0,0 +1,27 @@ +{stdenv, fetchurl, which, openssl, ocaml, findlib}: + +let + ocaml_version = (builtins.parseDrvName ocaml.name).version; + version = "0.4.4"; +in + +stdenv.mkDerivation { + name = "ocaml-ssl-${version}"; + + src = fetchurl { + url = "mirror://debian/pool/main/o/ocaml-ssl/ocaml-ssl_${version}.orig.tar.gz"; + sha256 = "1m45d0bd4ndxswaa1symp6c1npzjmm9pz0nf7w0q15gflqhba5ch"; + }; + + buildInputs = [which openssl ocaml findlib]; + + dontAddPrefix = true; + + configureFlags = "--disable-ldconf"; + + meta = { + homepage = http://savonet.rastageeks.org/; + description = "OCaml bindings for libssl "; + license = "LGPL+link exception"; + }; +} diff --git a/pkgs/development/tools/ocaml/findlib/default.nix b/pkgs/development/tools/ocaml/findlib/default.nix new file mode 100644 index 00000000000..e1f85f74575 --- /dev/null +++ b/pkgs/development/tools/ocaml/findlib/default.nix @@ -0,0 +1,54 @@ +{stdenv, fetchurl, m4, ncurses, ocaml, writeText}: + +let + ocaml_version = (builtins.parseDrvName ocaml.name).version; + version = "1.2.6"; +in + +stdenv.mkDerivation { + name = "ocaml-findlib-${version}"; + + src = fetchurl { + url = "http://download.camlcity.org/download/findlib-${version}.tar.gz"; + sha256 = "1b6z5lylsjxxaifw2yc21cs0dc84zqi4q57sgwg4j8k3m60ivpxs"; + }; + + buildInputs = [m4 ncurses ocaml]; + + patches = [ ./ldconf.patch ]; + + dontAddPrefix=true; + + preConfigure='' + configureFlagsArray=( + -bindir $out/bin + -mandir $out/share/man + -sitelib $out/lib/ocaml/${ocaml_version}/site-lib + -config $out/etc/findlib.conf + -no-topfind + ) + ''; + + buildPhase = '' + make all + make opt + ''; + + setupHook = writeText "setupHook.sh" '' + addOCamlPath () { + if test -d "''$1/lib/ocaml/${ocaml_version}/site-lib"; then + export OCAMLPATH="''${OCAMLPATH}''${OCAMLPATH:+:}''$1/lib/ocaml/${ocaml_version}/site-lib/" + fi + export OCAMLFIND_DESTDIR="''$out/lib/ocaml/${ocaml_version}/site-lib/" + ensureDir ''$OCAMLFIND_DESTDIR + } + + envHooks=(''${envHooks[@]} addOCamlPath) + ''; + + meta = { + homepage = http://projects.camlcity.org/projects/findlib.html; + description = "O'Caml library manager"; + license = "MIT/X11"; + }; +} diff --git a/pkgs/development/tools/ocaml/findlib/ldconf.patch b/pkgs/development/tools/ocaml/findlib/ldconf.patch new file mode 100644 index 00000000000..7718cb67392 --- /dev/null +++ b/pkgs/development/tools/ocaml/findlib/ldconf.patch @@ -0,0 +1,8 @@ +Setting paths to search for dnynmic libraries isn't very useful in Nix. + +--- findlib-1.2.6/findlib.conf.in 2010-08-17 14:50:28.000000000 -0400 ++++ findlib-1.2.6/findlib.conf.in 2010-11-24 09:46:55.179648354 -0500 +@@ -1,2 +1,3 @@ + destdir="@SITELIB@" + path="@SITELIB@" ++ldconf="ignore" diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 5e2fc471f88..34a112d1978 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -1982,6 +1982,43 @@ let ocaml_3_12_0 = callPackage ../development/compilers/ocaml/3.12.0.nix { }; + mkOcamlPackages = ocaml: self: let callPackage = newScope self; in rec { + inherit ocaml; + + camlzip = callPackage ../development/ocaml-modules/camlzip { }; + + camomile = camomile_0_7_3; + camomile_0_7_3 = callPackage ../development/ocaml-modules/camomile/0.7.3.nix { }; + camomile_0_8_1 = callPackage ../development/ocaml-modules/camomile/0.8.1.nix { }; + + cryptokit = callPackage ../development/ocaml-modules/cryptokit { }; + + findlib = callPackage ../development/tools/ocaml/findlib { }; + + menhir = callPackage ../development/ocaml-modules/menhir { }; + + ocaml_batteries = callPackage ../development/ocaml-modules/batteries { }; + + ocaml_cryptgps = callPackage ../development/ocaml-modules/cryptgps { }; + + ocaml_lwt = callPackage ../development/ocaml-modules/lwt { }; + + ocaml_pcre = callPackage ../development/ocaml-modules/pcre { + inherit pcre; + }; + + ocaml_react = callPackage ../development/ocaml-modules/react { }; + + ocaml_ssl = callPackage ../development/ocaml-modules/ssl { }; + + ounit = callPackage ../development/ocaml-modules/ounit { }; + }; + + ocamlPackages = recurseIntoAttrs ocamlPackages_3_11_1; + ocamlPackages_3_10_0 = mkOcamlPackages ocaml_3_10_0 pkgs.ocamlPackages_3_10_0; + ocamlPackages_3_11_1 = mkOcamlPackages ocaml_3_11_1 pkgs.ocamlPackages_3_11_1; + ocamlPackages_3_12_0 = mkOcamlPackages ocaml_3_12_0 pkgs.ocamlPackages_3_12_0; + opencxx = callPackage ../development/compilers/opencxx { gcc = gcc33; }; From 7b49a49cbbb7ef56040d92c09bc5ba4e8aa41095 Mon Sep 17 00:00:00 2001 From: Marco Maggesi Date: Thu, 9 Dec 2010 15:41:14 +0000 Subject: [PATCH 81/86] * Enable hydra compilation for ocaml 3.11.1 svn path=/nixpkgs/trunk/; revision=25042 --- pkgs/development/compilers/ocaml/3.12.0.nix | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/pkgs/development/compilers/ocaml/3.12.0.nix b/pkgs/development/compilers/ocaml/3.12.0.nix index bf767af5c9a..cf1f234fc97 100644 --- a/pkgs/development/compilers/ocaml/3.12.0.nix +++ b/pkgs/development/compilers/ocaml/3.12.0.nix @@ -52,6 +52,11 @@ stdenv.mkDerivation rec { generators, a pre-processor pretty-printer (camlp4) and a documentation generator (ocamldoc). ''; + + platforms = stdenv.lib.platforms.all; + maintainers = [ + stdenv.lib.maintainers.z77z + ]; }; } From 9568a1bc80048069a3303a6f5c98e781af188c68 Mon Sep 17 00:00:00 2001 From: Marco Maggesi Date: Thu, 9 Dec 2010 15:44:05 +0000 Subject: [PATCH 82/86] * Enable hydra compilation for ocaml 3.11.1 (error in the previous commit) svn path=/nixpkgs/trunk/; revision=25043 --- pkgs/development/compilers/ocaml/3.11.1.nix | 5 +++++ pkgs/development/compilers/ocaml/3.12.0.nix | 5 ----- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/development/compilers/ocaml/3.11.1.nix b/pkgs/development/compilers/ocaml/3.11.1.nix index 66c8319600f..af80c31ac32 100644 --- a/pkgs/development/compilers/ocaml/3.11.1.nix +++ b/pkgs/development/compilers/ocaml/3.11.1.nix @@ -52,6 +52,11 @@ stdenv.mkDerivation rec { generators, a pre-processor pretty-printer (camlp4) and a documentation generator (ocamldoc). ''; + + platforms = stdenv.lib.platforms.all; + maintainers = [ + stdenv.lib.maintainers.z77z + ]; }; } diff --git a/pkgs/development/compilers/ocaml/3.12.0.nix b/pkgs/development/compilers/ocaml/3.12.0.nix index cf1f234fc97..bf767af5c9a 100644 --- a/pkgs/development/compilers/ocaml/3.12.0.nix +++ b/pkgs/development/compilers/ocaml/3.12.0.nix @@ -52,11 +52,6 @@ stdenv.mkDerivation rec { generators, a pre-processor pretty-printer (camlp4) and a documentation generator (ocamldoc). ''; - - platforms = stdenv.lib.platforms.all; - maintainers = [ - stdenv.lib.maintainers.z77z - ]; }; } From 4c9fe18b8a49d9a0e9a2d5117b4e51686bfdf4ac Mon Sep 17 00:00:00 2001 From: Tobias Hammerschmidt Date: Thu, 9 Dec 2010 19:05:19 +0000 Subject: [PATCH 83/86] =?UTF-8?q?broadcom=20wireless=20driver=20-=20patch?= =?UTF-8?q?=20by=20Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit svn path=/nixpkgs/trunk/; revision=25044 --- pkgs/lib/maintainers.nix | 1 + .../linux/broadcom-sta/default.nix | 45 +++++++++++++++++++ .../linux/broadcom-sta/makefile.patch | 16 +++++++ pkgs/top-level/all-packages.nix | 2 + 4 files changed, 64 insertions(+) create mode 100644 pkgs/os-specific/linux/broadcom-sta/default.nix create mode 100644 pkgs/os-specific/linux/broadcom-sta/makefile.patch diff --git a/pkgs/lib/maintainers.nix b/pkgs/lib/maintainers.nix index 9f1f04eec67..b6f5b990c4e 100644 --- a/pkgs/lib/maintainers.nix +++ b/pkgs/lib/maintainers.nix @@ -13,6 +13,7 @@ kkallio = "Karn Kallio "; ludo = "Ludovic Courtès "; marcweber = "Marc Weber "; + neznalek = "Vladimír Čunát "; phreedom = "Evgeny Egorochkin "; pierron = "Nicolas B. Pierron "; raskin = "Michael Raskin <7c6f434c@mail.ru>"; diff --git a/pkgs/os-specific/linux/broadcom-sta/default.nix b/pkgs/os-specific/linux/broadcom-sta/default.nix new file mode 100644 index 00000000000..cf8fde4751c --- /dev/null +++ b/pkgs/os-specific/linux/broadcom-sta/default.nix @@ -0,0 +1,45 @@ +{ stdenv, fetchurl, kernel }: + +let version = "5.60.246.6"; + bits = if stdenv.system == "i686-linux" then "32" else + assert stdenv.system == "x86_64-linux"; "64"; +in + +stdenv.mkDerivation { + name = "broadcom-sta-${version}"; + src = fetchurl { + url = "http://www.broadcom.com/docs/linux_sta/hybrid-portsrc_x86-${bits}_v${version}.tar.gz"; + sha256 = if bits == "32" + then "0y8ap9zhfsg1k603qf5a7n73zvsw7nkqh42dlcyxan5zdzmgcqdx" + else "0z8a57fpajiag830g1ifc9vrm7wk5bm7dwi7a9ljm3cns3an07fl"; + }; + + buildInputs = [ kernel ]; + patches = [ ./makefile.patch ]; + + makeFlags = "KDIR=${kernel}/lib/modules/${kernel.version}/build"; + + unpackPhase = + '' + sourceRoot=broadcom-sta + mkdir "$sourceRoot" + tar xvf "$src" -C "$sourceRoot" + ''; + + installPhase = + '' + binDir="$out/lib/modules/${kernel.version}/kernel/net/wireless/" + docDir="$out/share/doc/broadcom-sta/" + ensureDir "$binDir" "$docDir" + cp wl.ko "$binDir" + cp lib/LICENSE.txt "$docDir" + ''; + + meta = { + description = "Kernel module driver for some Broadcom's wireless cards"; + homepage = http://www.broadcom.com/support/802.11/linux_sta.php; + license = "unfree-redistributable"; + maintainers = [ stdenv.lib.maintainers.neznalek ]; + platforms = stdenv.lib.platforms.linux; + }; +} diff --git a/pkgs/os-specific/linux/broadcom-sta/makefile.patch b/pkgs/os-specific/linux/broadcom-sta/makefile.patch new file mode 100644 index 00000000000..6ba8527e267 --- /dev/null +++ b/pkgs/os-specific/linux/broadcom-sta/makefile.patch @@ -0,0 +1,16 @@ +--- src/Makefile 2010-10-08 00:32:59.000000000 +0200 ++++ src/Makefile 2010-11-09 11:06:28.832999850 +0100 +@@ -27,10 +27,10 @@ + EXTRA_LDFLAGS := $(src)/lib/wlc_hybrid.o_shipped + + all: +- KBUILD_NOPEDANTIC=1 make -C /lib/modules/`uname -r`/build M=`pwd` ++ KBUILD_NOPEDANTIC=1 make -C ${KDIR} M=`pwd` + + clean: +- KBUILD_NOPEDANTIC=1 make -C /lib/modules/`uname -r`/build M=`pwd` clean ++ KBUILD_NOPEDANTIC=1 make -C ${KDIR} clean + + install: +- install -D -m 755 wl.ko /lib/modules/`uname -r`/kernel/drivers/net/wireless/wl.ko ++ install -D -m 755 wl.ko $out/lib/modules/${kernelVersion}/kernel/drivers/net/wireless/wl.ko diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 34a112d1978..77a45b665f4 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -4849,6 +4849,8 @@ let atheros = callPackage ../os-specific/linux/atheros/0.9.4.nix { }; + broadcom_sta = callPackage ../os-specific/linux/broadcom-sta/default.nix { }; + nvidia_x11 = callPackage ../os-specific/linux/nvidia-x11 { }; nvidia_x11_legacy96 = callPackage ../os-specific/linux/nvidia-x11/legacy96.nix { }; From 4c83dca2b4ee11ae18c15d8a83e6dfaee8302611 Mon Sep 17 00:00:00 2001 From: Michael Raskin <7c6f434c@mail.ru> Date: Fri, 10 Dec 2010 05:40:33 +0000 Subject: [PATCH 84/86] Update X-Moto svn path=/nixpkgs/trunk/; revision=25047 --- pkgs/games/xmoto/src-for-default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/games/xmoto/src-for-default.nix b/pkgs/games/xmoto/src-for-default.nix index 4250450617a..fd538a8a9a7 100644 --- a/pkgs/games/xmoto/src-for-default.nix +++ b/pkgs/games/xmoto/src-for-default.nix @@ -1,9 +1,9 @@ rec { - version="0.5.3"; - name="xmoto-0.5.3"; - hash="1xqz1x4q75469s1m6qqy5akbh62327p30267ca5ivjff59wpcfyf"; + version="0.5.4"; + name="xmoto-0.5.4"; + hash="1r548hx7yqxql5b0d1byxbwxjhlss063vsj5xy9cc1b8dqhmkqh5"; url="http://download.tuxfamily.org/xmoto/xmoto/${version}/xmoto-${version}-src.tar.gz"; - advertisedUrl="http://download.tuxfamily.org/xmoto/xmoto/0.5.3/xmoto-0.5.3-src.tar.gz"; + advertisedUrl="http://download.tuxfamily.org/xmoto/xmoto/0.5.4/xmoto-0.5.4-src.tar.gz"; } From 5b9427a82999a0bbf0c202af90a001aba4cd1b45 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Fri, 10 Dec 2010 10:21:45 +0000 Subject: [PATCH 85/86] * SQLite 3.7.4. svn path=/nixpkgs/trunk/; revision=25049 --- pkgs/development/libraries/sqlite/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/libraries/sqlite/default.nix b/pkgs/development/libraries/sqlite/default.nix index 015c449cd03..2a53f4b09bd 100644 --- a/pkgs/development/libraries/sqlite/default.nix +++ b/pkgs/development/libraries/sqlite/default.nix @@ -3,11 +3,11 @@ assert readline != null -> ncurses != null; stdenv.mkDerivation { - name = "sqlite-3.7.2"; + name = "sqlite-3.7.4"; src = fetchurl { - url = "http://www.sqlite.org/sqlite-amalgamation-3.7.2.tar.gz"; - sha256 = "12i50bypcq7havphrilzi0hnwgv01drxsc36kyby76hpk417zsvl"; + url = http://www.sqlite.org/sqlite-autoconf-3070400.tar.gz; + sha256 = "131lwjqh1nfyrx4vjya2wdl6bnc0gzvcrg0wf06sz2iisj0h9vsl"; }; buildInputs = [ readline ncurses ]; From 97d4a54698a4dea4b57ec4124591d75a740ee44e Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Fri, 10 Dec 2010 10:22:23 +0000 Subject: [PATCH 86/86] * nixSqlite: bump. Also, go back to using SQLite 3.7 because 3.6 also gives random "database image is malformed" errors. svn path=/nixpkgs/trunk/; revision=25050 --- pkgs/tools/package-management/nix/sqlite.nix | 6 +++--- pkgs/top-level/all-packages.nix | 1 - 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/pkgs/tools/package-management/nix/sqlite.nix b/pkgs/tools/package-management/nix/sqlite.nix index c1c051a82bb..0a69564c539 100644 --- a/pkgs/tools/package-management/nix/sqlite.nix +++ b/pkgs/tools/package-management/nix/sqlite.nix @@ -5,11 +5,11 @@ }: stdenv.mkDerivation rec { - name = "nix-1.0pre25024"; + name = "nix-1.0pre25036"; src = fetchurl { - url = "http://hydra.nixos.org/build/786470/download/4/${name}.tar.bz2"; - sha256 = "35962fcca9b69db7103331a595524443d6403a9a9121bddef4421601b2473528"; + url = "http://hydra.nixos.org/build/787041/download/4/${name}.tar.bz2"; + sha256 = "ccba5f44b75801187b766d4b98a53bccf335df35cde32aeab71630bfca7882f6"; }; buildInputs = [ perl curl openssl pkgconfig boehmgc ]; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 77a45b665f4..43993e3e093 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -7205,7 +7205,6 @@ let nixSqlite = lowPrio (callPackage ../tools/package-management/nix/sqlite.nix { storeDir = getPkgConfig "nix" "storeDir" "/nix/store"; stateDir = getPkgConfig "nix" "stateDir" "/nix/var"; - sqlite = sqlite36; }); nixCustomFun = src: preConfigure: enableScripts: configureFlags: