From 4d6030f56b991055eb99a4ce43f9eb8d66b32f5f Mon Sep 17 00:00:00 2001 From: Michael Raskin <7c6f434c@mail.ru> Date: Sat, 24 Sep 2011 09:14:21 +0000 Subject: [PATCH 01/42] Adding hyenae - patch by MarcWeber svn path=/nixpkgs/trunk/; revision=29470 --- .../development/libraries/libdnet/default.nix | 31 +++++++++++++++++++ pkgs/tools/networking/hyenae/default.nix | 22 +++++++++++++ pkgs/top-level/all-packages.nix | 4 +++ 3 files changed, 57 insertions(+) create mode 100644 pkgs/development/libraries/libdnet/default.nix create mode 100644 pkgs/tools/networking/hyenae/default.nix diff --git a/pkgs/development/libraries/libdnet/default.nix b/pkgs/development/libraries/libdnet/default.nix new file mode 100644 index 00000000000..50bdaa1c4c0 --- /dev/null +++ b/pkgs/development/libraries/libdnet/default.nix @@ -0,0 +1,31 @@ +{stdenv, fetchurl, automake, autoconf, libtool}: + +stdenv.mkDerivation { + name = "libdnet-1.12"; + + enableParallelBuilding = true; + + src = fetchurl { + url = http://libdnet.googlecode.com/files/libdnet-1.12.tgz; + sha1 = "71302be302e84fc19b559e811951b5d600d976f8"; + }; + + configureFlags = [ "--enable-shared" ]; # shared libs required by hyenae + + buildInputs = [ automake autoconf libtool ]; + + # .so endings are missing (quick and dirty fix) + postInstall = '' + for i in $out/lib/*; do + ln -s $i $i.so + done + ''; + + meta = { + description = "libdnet provides a simplified, portable interface to several low-level networking routines"; + homepage = http://code.google.com/p/libdnet/; + license = "BSD"; # New BSD license + maintainers = [stdenv.lib.maintainers.marcweber]; + platforms = stdenv.lib.platforms.linux; + }; +} diff --git a/pkgs/tools/networking/hyenae/default.nix b/pkgs/tools/networking/hyenae/default.nix new file mode 100644 index 00000000000..d0821a4f588 --- /dev/null +++ b/pkgs/tools/networking/hyenae/default.nix @@ -0,0 +1,22 @@ +{stdenv, fetchurl, libdnet, pkgconfig, libpcap}: + +stdenv.mkDerivation { + name = "hyenae-0.36-1"; + + enableParallelBuilding = true; + + src = fetchurl { + url = mirror://sourceforge/hyenae/0.36-1/hyenae-0.36-1.tar.gz; + sha256 = "1f3x4yn9a9p4f4wk4l8pv7hxfjc8q7cv20xzf7ky735sq1hj0xcg"; + }; + + buildInputs = [libdnet pkgconfig libpcap]; + + meta = { + description = ""; + homepage = http://sourceforge.net/projects/hyenae/; + license = "GPLv3"; + maintainers = [stdenv.lib.maintainers.marcweber]; + platforms = stdenv.lib.platforms.linux; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 04f97b06a95..b95878f3e29 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -2860,6 +2860,8 @@ let inherit (perlPackages) LocaleGettext; }; + hyenae = callPackage ../tools/networking/hyenae { }; + iconnamingutils = callPackage ../development/tools/misc/icon-naming-utils { inherit (perlPackages) XMLSimple; }; @@ -3767,6 +3769,8 @@ let libdmtx = callPackage ../development/libraries/libdmtx { }; + libdnet = callPackage ../development/libraries/libdnet { }; + libdrm = callPackage ../development/libraries/libdrm { inherit fetchurl stdenv pkgconfig; inherit (xorg) libpthreadstubs; From 808aa6c62d9e2e456755f6e93d4f705ba4926138 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Sat, 24 Sep 2011 12:46:24 +0000 Subject: [PATCH 02/42] rtorrent: install man page manually (the upstream makefile is broken) svn path=/nixpkgs/trunk/; revision=29471 --- pkgs/tools/networking/p2p/rtorrent/default.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/tools/networking/p2p/rtorrent/default.nix b/pkgs/tools/networking/p2p/rtorrent/default.nix index b45542a6358..848f2284fd3 100644 --- a/pkgs/tools/networking/p2p/rtorrent/default.nix +++ b/pkgs/tools/networking/p2p/rtorrent/default.nix @@ -14,6 +14,8 @@ stdenv.mkDerivation { buildInputs = [ libtorrent ncurses pkgconfig libsigcxx curl zlib openssl ]; + postInstall = "install -D -m 444 doc/rtorrent.1 $out/share/man/man1/rtorrent.1"; + meta = { homepage = "http://libtorrent.rakshasa.no/"; description = "An ncurses client for libtorrent, ideal for use with screen or dtach"; From 449e03648a2b75cf03a7fb6c36224f5ac52c99a9 Mon Sep 17 00:00:00 2001 From: "Yury G. Kudryashov" Date: Sat, 24 Sep 2011 20:40:58 +0000 Subject: [PATCH 03/42] opencv-2.3.1a * pkgconfig and cmake are buildNativeInputs * drop xineLib dependency. It was not used anyway. svn path=/nixpkgs/trunk/; revision=29473 --- pkgs/development/libraries/opencv/default.nix | 17 ++++++++++------- 1 file changed, 10 insertions(+), 7 deletions(-) diff --git a/pkgs/development/libraries/opencv/default.nix b/pkgs/development/libraries/opencv/default.nix index 95a8f0d8fdb..05db48095c3 100644 --- a/pkgs/development/libraries/opencv/default.nix +++ b/pkgs/development/libraries/opencv/default.nix @@ -1,16 +1,19 @@ -{ stdenv, fetchurl, cmake, gtk, glib, libjpeg, libpng, libtiff, jasper, ffmpeg, pkgconfig, - xineLib, gstreamer }: +{ stdenv, fetchurl, cmake, gtk, libjpeg, libpng, libtiff, jasper, ffmpeg +, pkgconfig, gstreamer }: + +let v = "2.3.1a"; in stdenv.mkDerivation rec { - name = "opencv-2.3.0"; + name = "opencv-${v}"; src = fetchurl { - url = "mirror://sourceforge/opencvlibrary/OpenCV-2.3.0.tar.bz2"; - sha256 = "02wl56a87if84brrhd4wq59linyhbxx30ykh4cjwzw37yw7zzgxw"; + url = "mirror://sourceforge/opencvlibrary/OpenCV-${v}.tar.bz2"; + sha256 = "0325s7pa2npcw2gc06pr6q5ik4xdyf08rvkfc0myn10w20lzb8m9"; }; - buildInputs = [ cmake gtk glib libjpeg libpng libtiff jasper ffmpeg pkgconfig - xineLib gstreamer ]; + buildInputs = [ gtk libjpeg libpng libtiff jasper ffmpeg gstreamer ]; + + buildNativeInputs = [ cmake pkgconfig ]; enableParallelBuilding = true; From bfc84fec9bd99d0838d815d992c1d0f82c022002 Mon Sep 17 00:00:00 2001 From: "Yury G. Kudryashov" Date: Sat, 24 Sep 2011 20:44:11 +0000 Subject: [PATCH 04/42] Add a notice about libpng branch svn path=/nixpkgs/trunk/; revision=29474 --- pkgs/development/libraries/libpng/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/development/libraries/libpng/default.nix b/pkgs/development/libraries/libpng/default.nix index 16fe511f1f1..7ba9bfb54b3 100644 --- a/pkgs/development/libraries/libpng/default.nix +++ b/pkgs/development/libraries/libpng/default.nix @@ -2,6 +2,7 @@ assert zlib != null; +# If you want to upgrade libpng, look at libpng15 branch stdenv.mkDerivation rec { name = "libpng-1.2.46"; From 2b67f92ec9b875a67a4c612ef1317fe9d893a626 Mon Sep 17 00:00:00 2001 From: "Yury G. Kudryashov" Date: Sun, 25 Sep 2011 03:39:23 +0000 Subject: [PATCH 05/42] allegro-4.4.2; compiles against libpng-1.5.4 svn path=/nixpkgs/trunk/; revision=29477 --- pkgs/development/libraries/allegro/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/libraries/allegro/default.nix b/pkgs/development/libraries/allegro/default.nix index e5a976c3418..019455ae142 100644 --- a/pkgs/development/libraries/allegro/default.nix +++ b/pkgs/development/libraries/allegro/default.nix @@ -13,11 +13,11 @@ let (builtins.attrNames (builtins.removeAttrs x helperArgNames)); sourceInfo = rec { baseName="allegro"; - version="4.4.0.1"; + version="4.4.2"; name="${baseName}-${version}"; project="alleg"; - url="mirror://sourceforge/project/${project}/${baseName}/${version}/${name}.tar.gz"; - hash="0qgkmazr07lmnbj6h6yk10vmcm15gafcwy5jn7xpwy7bahzraiz0"; + url="mirror://sourceforge/project/${project}/${name}.tar.gz"; + hash="1p0ghkmpc4kwij1z9rzxfv7adnpy4ayi0ifahlns1bdzgmbyf88v"; }; in rec { From e129d97f19ca6a2f6c4be8ef5747d5ca15c3a769 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?= Date: Sun, 25 Sep 2011 09:04:24 +0000 Subject: [PATCH 06/42] Updating rtmpdump to the 2.4 (what I think it is 2.4) in their git repository. They don't use tags or branches. svn path=/nixpkgs/trunk/; revision=29479 --- pkgs/tools/video/rtmpdump/default.nix | 20 +++++++++----------- 1 file changed, 9 insertions(+), 11 deletions(-) diff --git a/pkgs/tools/video/rtmpdump/default.nix b/pkgs/tools/video/rtmpdump/default.nix index 275e81ae0ee..615f300aaf5 100644 --- a/pkgs/tools/video/rtmpdump/default.nix +++ b/pkgs/tools/video/rtmpdump/default.nix @@ -1,21 +1,19 @@ -{stdenv, fetchurl, zlib, gnutls, libgcrypt}: +{stdenv, fetchgit, zlib, gnutls, libgcrypt}: stdenv.mkDerivation { - name = "rtmpdump-2.2d"; - src = fetchurl { - url = http://rtmpdump.mplayerhq.hu/download/rtmpdump-2.2d.tgz; - sha256 = "0w2cr3mgp4dcabmr7d7pnsn8f2r1zvar553vfavnzqv61gnhyrm5"; + name = "rtmpdump-2.4"; + src = fetchgit { + url = git://git.ffmpeg.org/rtmpdump; + rev = "c28f1bab7822de97353849e7787b59e50bbb1428"; + sha256 = "927e7ea7a686adb7cbce9d0a0c710de1e0921bbb1f0c1b35d17bdb816e6c73d8"; }; buildInputs = [ zlib gnutls libgcrypt ]; - makeFlags = "CRYPTO=GNUTLS posix"; + makeFlags = "CRYPTO=GNUTLS"; - installPhase = '' - ensureDir $out/bin $out/share/man/man{1,8} - cp rtmpdump rtmpsrv rtmpsuck rtmpgw $out/bin - cp *.1 $out/share/man/man1 - cp *.8 $out/share/man/man8 + configurePhase = '' + sed -i s,/usr/local,$out, Makefile librtmp/Makefile ''; meta = { From 8a8cb045331251a611567fe3d4487c7d6fc79c0b Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Sun, 25 Sep 2011 17:11:23 +0000 Subject: [PATCH 07/42] haskell-numeric-prelude: updated to version 0.2.2.1 svn path=/nixpkgs/trunk/; revision=29480 --- .../development/libraries/haskell/numeric-prelude/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/numeric-prelude/default.nix b/pkgs/development/libraries/haskell/numeric-prelude/default.nix index c420d267770..cef5347e758 100644 --- a/pkgs/development/libraries/haskell/numeric-prelude/default.nix +++ b/pkgs/development/libraries/haskell/numeric-prelude/default.nix @@ -4,8 +4,8 @@ cabal.mkDerivation (self: { pname = "numeric-prelude"; - version = "0.2.2"; - sha256 = "bc6adb8c2f04e0e1f62e183e052974700143dc93b1a3cbafe3562aa1f7a649fd"; + version = "0.2.2.1"; + sha256 = "12b2h103f43rlrfk3zck6mzbvw6v4jf8g4kxz1k14v201lrvb2da"; isLibrary = true; isExecutable = true; buildDepends = [ From 503536703ee7a8eccd5ad24a0cc325304538d097 Mon Sep 17 00:00:00 2001 From: Michael Raskin <7c6f434c@mail.ru> Date: Sun, 25 Sep 2011 18:12:40 +0000 Subject: [PATCH 08/42] Fix Allegro URL svn path=/nixpkgs/trunk/; revision=29481 --- pkgs/development/libraries/allegro/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/libraries/allegro/default.nix b/pkgs/development/libraries/allegro/default.nix index 019455ae142..75842bee9f8 100644 --- a/pkgs/development/libraries/allegro/default.nix +++ b/pkgs/development/libraries/allegro/default.nix @@ -16,7 +16,7 @@ let version="4.4.2"; name="${baseName}-${version}"; project="alleg"; - url="mirror://sourceforge/project/${project}/${name}.tar.gz"; + url="mirror://sourceforge/project/${project}/${baseName}/${version}/${name}.tar.gz"; hash="1p0ghkmpc4kwij1z9rzxfv7adnpy4ayi0ifahlns1bdzgmbyf88v"; }; in From d65cab385254fd80eb4d97e8097bc26193ebee95 Mon Sep 17 00:00:00 2001 From: Michael Raskin <7c6f434c@mail.ru> Date: Sun, 25 Sep 2011 21:07:48 +0000 Subject: [PATCH 09/42] Adding Allegro 5 svn path=/nixpkgs/trunk/; revision=29482 --- pkgs/development/libraries/allegro/5.nix | 61 ++++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 1 + 2 files changed, 62 insertions(+) create mode 100644 pkgs/development/libraries/allegro/5.nix diff --git a/pkgs/development/libraries/allegro/5.nix b/pkgs/development/libraries/allegro/5.nix new file mode 100644 index 00000000000..2bfc57011fd --- /dev/null +++ b/pkgs/development/libraries/allegro/5.nix @@ -0,0 +1,61 @@ + +x@{builderDefsPackage + , texinfo, libXext, xextproto, libX11, xproto, libXpm, libXt, libXcursor + , alsaLib, cmake, zlib, libpng, libvorbis, libXxf86dga, libXxf86misc + , xf86dgaproto, xf86miscproto, xf86vidmodeproto, libXxf86vm, openal, mesa + , kbproto + , ...}: +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="5.0.4"; + name="${baseName}-${version}"; + project="alleg"; + url="mirror://sourceforge/project/${project}/${baseName}/${version}/${name}.tar.gz"; + hash="0vm93kqvvw4rw2zx4l64c2i86xl5giwbqbyki4b2b83z0acpmc1n"; + }; +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 b95878f3e29..36b4af0e2ad 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -3027,6 +3027,7 @@ let agg = callPackage ../development/libraries/agg { }; allegro = callPackage ../development/libraries/allegro {}; + allegro5 = callPackage ../development/libraries/allegro/5.nix {}; amrnb = callPackage ../development/libraries/amrnb { }; From fe3df64918a27d2786f5eac138d45070cfebb5b0 Mon Sep 17 00:00:00 2001 From: "Yury G. Kudryashov" Date: Sun, 25 Sep 2011 22:56:38 +0000 Subject: [PATCH 10/42] Add version info to bittornado.name svn path=/nixpkgs/trunk/; revision=29483 --- pkgs/tools/networking/p2p/bit-tornado/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/tools/networking/p2p/bit-tornado/default.nix b/pkgs/tools/networking/p2p/bit-tornado/default.nix index 640ffad9e52..52f4e0d7138 100644 --- a/pkgs/tools/networking/p2p/bit-tornado/default.nix +++ b/pkgs/tools/networking/p2p/bit-tornado/default.nix @@ -1,7 +1,7 @@ {stdenv,fetchurl,python, wxPython, makeWrapper, ssl}: stdenv.mkDerivation { - name = "bit-tornado"; + name = "bit-tornado-0.3.18"; src = fetchurl { url = http://download2.bittornado.com/download/BitTornado-0.3.18.tar.gz; From e496b865944ae746f2d74ec739ecb877d7611c00 Mon Sep 17 00:00:00 2001 From: "Yury G. Kudryashov" Date: Sun, 25 Sep 2011 22:56:48 +0000 Subject: [PATCH 11/42] Remove kde3.kcachegrind Use kde4.kcachegrind instead. svn path=/nixpkgs/trunk/; revision=29484 --- .../tools/misc/kcachegrind/default.nix | 25 ------------------- pkgs/top-level/all-packages.nix | 5 ---- pkgs/top-level/release.nix | 1 - 3 files changed, 31 deletions(-) delete mode 100644 pkgs/development/tools/misc/kcachegrind/default.nix diff --git a/pkgs/development/tools/misc/kcachegrind/default.nix b/pkgs/development/tools/misc/kcachegrind/default.nix deleted file mode 100644 index d6ceaa4eb5d..00000000000 --- a/pkgs/development/tools/misc/kcachegrind/default.nix +++ /dev/null @@ -1,25 +0,0 @@ -{stdenv, fetchurl, kdelibs, libX11, libXext, libSM, libpng, libjpeg, qt, zlib, perl, expat}: - -# !!! dot is a run-time dependencies - -stdenv.mkDerivation { - name = "kcachegrind-0.4.6"; - - src = fetchurl { - url = http://kcachegrind.sourceforge.net/kcachegrind-0.4.6.tar.gz; - md5 = "4ed60028dcefd6bf626635d5f2f50273"; - }; - - KDEDIR = kdelibs; - - configureFlags = " - --without-arts - --x-includes=${libX11}/include - --x-libraries=${libX11}/lib"; - - buildInputs = [kdelibs libX11 libXext libSM zlib perl qt expat libpng libjpeg]; - - meta = { - description = "Interactive visualisation tool for Valgrind profiling data"; - }; -} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 36b4af0e2ad..01637aac38d 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -7879,11 +7879,6 @@ let qt = qt3; }; - kcachegrind = callPackage ../development/tools/misc/kcachegrind { - inherit (kde3) kdelibs; - qt = qt3; - }; - }; kde4 = recurseIntoAttrs pkgs.kde45; diff --git a/pkgs/top-level/release.nix b/pkgs/top-level/release.nix index 490d943cf20..1e189d06242 100644 --- a/pkgs/top-level/release.nix +++ b/pkgs/top-level/release.nix @@ -440,7 +440,6 @@ with (import ./release-lib.nix); kdebase = linux; kdelibs = linux; k3b = linux; - kcachegrind = linux; kile = linux; }; From 9dd3dbe2c7e3ab20b4706b0ed1489ba4c9e9f124 Mon Sep 17 00:00:00 2001 From: "Yury G. Kudryashov" Date: Sun, 25 Sep 2011 23:16:16 +0000 Subject: [PATCH 12/42] fdm: remove -I- from GNUmakefile. Fixes build on i686 svn path=/nixpkgs/trunk/; revision=29485 --- pkgs/tools/networking/fdm/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/tools/networking/fdm/default.nix b/pkgs/tools/networking/fdm/default.nix index 0f563cb892a..052367400ef 100644 --- a/pkgs/tools/networking/fdm/default.nix +++ b/pkgs/tools/networking/fdm/default.nix @@ -33,7 +33,7 @@ rec { sed -i */Makefile -i Makefile -e 's@ -o root @ @' sed -i GNUmakefile -e 's@ -g $(BIN_OWNER) @ @' sed -i GNUmakefile -e 's@ -o $(BIN_GROUP) @ @' - sed -i */Makefile -i Makefile -e 's@-I-@@g' + sed -i */Makefile -i Makefile -i GNUmakefile -e 's@-I-@@g' '') ["minInit" "doUnpack"]; meta = { From 1d9c2ff41365c388fe04b2b206bd1057b3ce60ec Mon Sep 17 00:00:00 2001 From: "Yury G. Kudryashov" Date: Sun, 25 Sep 2011 23:36:20 +0000 Subject: [PATCH 13/42] Let hydra build SDL_image on all platforms svn path=/nixpkgs/trunk/; revision=29486 --- pkgs/development/libraries/SDL_image/default.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/development/libraries/SDL_image/default.nix b/pkgs/development/libraries/SDL_image/default.nix index 21461cc4259..d0d10ac40c9 100644 --- a/pkgs/development/libraries/SDL_image/default.nix +++ b/pkgs/development/libraries/SDL_image/default.nix @@ -25,5 +25,7 @@ stdenv.mkDerivation rec { meta = { description = "SDL image library"; + homepage = http://www.libsdl.org/projects/SDL_image/; + platforms = stdenv.lib.platforms.all; }; } From 0b9c88cba1a2d8b01df57fd6fdb314a36d7c8294 Mon Sep 17 00:00:00 2001 From: Michael Raskin <7c6f434c@mail.ru> Date: Mon, 26 Sep 2011 04:48:35 +0000 Subject: [PATCH 14/42] Taking a patch from ArchLinux to fix altermime build svn path=/nixpkgs/trunk/; revision=29489 --- .../networking/altermime/altermime.patch | 48 +++++++++++++++++++ pkgs/tools/networking/altermime/default.nix | 4 +- 2 files changed, 51 insertions(+), 1 deletion(-) create mode 100644 pkgs/tools/networking/altermime/altermime.patch diff --git a/pkgs/tools/networking/altermime/altermime.patch b/pkgs/tools/networking/altermime/altermime.patch new file mode 100644 index 00000000000..00ed513cf32 --- /dev/null +++ b/pkgs/tools/networking/altermime/altermime.patch @@ -0,0 +1,48 @@ +AUR patch for fixing build + +diff -Naur altermime-0.3.10/qpe.c altermime-0.3.10-new/qpe.c +--- altermime-0.3.10/qpe.c 2008-11-16 09:45:45.000000000 +0100 ++++ altermime-0.3.10-new/qpe.c 2010-11-24 14:28:43.153334114 +0100 +@@ -97,7 +97,7 @@ + op+= strlen(paragraph);// +3; /** jump the output + =\r\n **/ + out_remaining-= (strlen(paragraph)); // Was +3, updated to fix Outlook problems + +- QPD fprintf(stdout, "Soft break (%d + %d > 76 char) for '%s'\n", current_line_length, charout_size, paragraph); ++ QPD fprintf(stdout, "Soft break (%zd + %d > 76 char) for '%s'\n", current_line_length, charout_size, paragraph); + + /** reinitialize the paragraph **/ + paragraph[0] = '\0'; +@@ -108,7 +108,7 @@ + } + + snprintf(pp, pp_remaining, "%s", charout); +- QPD fprintf(stdout,"charout='%s', size=%d, pp_remain=%d result='%s'\n", charout, charout_size, pp_remaining, paragraph); ++ QPD fprintf(stdout,"charout='%s', size=%d, pp_remain=%zd result='%s'\n", charout, charout_size, pp_remaining, paragraph); + pp += charout_size; + pp_remaining -= charout_size; + p++; +@@ -149,13 +149,13 @@ + out_size = in_size *3; + in_buffer = malloc( sizeof(char) *in_size +1); + if (in_buffer == NULL) { +- QPD fprintf(stdout,"Error allocating %d bytes for input buffer\n", in_size); ++ QPD fprintf(stdout,"Error allocating %zd bytes for input buffer\n", in_size); + return -1; + } + + out_buffer = malloc( sizeof(char) *out_size *3 +1); + if (in_buffer == NULL) { +- QPD fprintf(stdout,"Error allocating %d bytes for output buffer\n", out_size); ++ QPD fprintf(stdout,"Error allocating %zd bytes for output buffer\n", out_size); + return -1; + } + +@@ -169,7 +169,7 @@ + ** we segfault ;) **/ + *(in_buffer +in_size) = '\0'; + +- QPD fprintf(stdout,"file %s is loaded, size = %d\n", fname, in_size); ++ QPD fprintf(stdout,"file %s is loaded, size = %zd\n", fname, in_size); + + qp_encode( out_buffer, out_size, in_buffer, in_size ); + diff --git a/pkgs/tools/networking/altermime/default.nix b/pkgs/tools/networking/altermime/default.nix index 3b0de2805be..a98f307c77d 100644 --- a/pkgs/tools/networking/altermime/default.nix +++ b/pkgs/tools/networking/altermime/default.nix @@ -26,7 +26,9 @@ rec { inherit (sourceInfo) name version; inherit buildInputs; - phaseNames = ["fixTarget" "doMakeInstall"]; + patches = [./altermime.patch]; + + phaseNames = ["doPatch" "fixTarget" "doMakeInstall"]; fixTarget = a.fullDepEntry ('' sed -i Makefile -e "s@/usr/local@$out@" ensureDir "$out/bin" From a004ca1a7d7f19a7732fc12bbb0b100fb794ad1d Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 26 Sep 2011 08:12:10 +0000 Subject: [PATCH 15/42] lxc: fixed build to include the SGML documentation svn path=/nixpkgs/trunk/; revision=29490 --- pkgs/tools/system/lxc/default.nix | 26 +- pkgs/tools/system/lxc/dont-run-ldconfig.patch | 24 ++ .../system/lxc/fix-documentation-build.patch | 40 +++ .../system/lxc/fix-sgml-documentation.patch | 252 ++++++++++++++++++ 4 files changed, 337 insertions(+), 5 deletions(-) create mode 100644 pkgs/tools/system/lxc/dont-run-ldconfig.patch create mode 100644 pkgs/tools/system/lxc/fix-documentation-build.patch create mode 100644 pkgs/tools/system/lxc/fix-sgml-documentation.patch diff --git a/pkgs/tools/system/lxc/default.nix b/pkgs/tools/system/lxc/default.nix index a4e44160a52..26180b84368 100644 --- a/pkgs/tools/system/lxc/default.nix +++ b/pkgs/tools/system/lxc/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, libcap, perl }: +{ stdenv, fetchurl, libcap, perl, docbook2x, docbook_xml_dtd_45 }: let name = "lxc-0.7.5"; @@ -11,9 +11,15 @@ stdenv.mkDerivation{ sha256 = "019ec63f250c874bf7625b1f1bf555b1a6e3a947937a4fca73100abddf829b1c"; }; - buildInputs = [ libcap perl ]; + buildInputs = [ libcap perl docbook2x ]; - patchPhase = "sed -i -e 's|/sbin/ldconfig|:|' src/lxc/Makefile.in"; + patches = [ + ./dont-run-ldconfig.patch + ./fix-documentation-build.patch + ./fix-sgml-documentation.patch + ]; + + preConfigure = "export XML_CATALOG_FILES=${docbook_xml_dtd_45}/xml/dtd/docbook/catalog.xml"; configureFlags = "--localstatedir=/var"; @@ -24,9 +30,19 @@ stdenv.mkDerivation{ ''; meta = { - homepage = http://lxc.sourceforge.net; - description = "lxc Linux Containers userland tools"; + homepage = "http://lxc.sourceforge.net"; + description = "lightweight virtual system mechanism"; license = stdenv.lib.licenses.lgpl21Plus; + + longDescription = '' + LXC is the userspace control package for Linux Containers, a + lightweight virtual system mechanism sometimes described as + "chroot on steroids". LXC builds up from chroot to implement + complete virtual systems, adding resource management and isolation + mechanisms to Linux’s existing process management infrastructure. + ''; + + platforms = stdenv.lib.platforms.linux; maintainers = [ stdenv.lib.maintainers.simons ]; }; diff --git a/pkgs/tools/system/lxc/dont-run-ldconfig.patch b/pkgs/tools/system/lxc/dont-run-ldconfig.patch new file mode 100644 index 00000000000..e72ac0250f5 --- /dev/null +++ b/pkgs/tools/system/lxc/dont-run-ldconfig.patch @@ -0,0 +1,24 @@ +diff -ubr lxc-0.7.5-orig/src/lxc/Makefile.am lxc-0.7.5/src/lxc/Makefile.am +--- lxc-0.7.5-orig/src/lxc/Makefile.am 2011-07-25 00:27:10.000000000 +0200 ++++ lxc-0.7.5/src/lxc/Makefile.am 2011-09-26 09:58:03.479916848 +0200 +@@ -115,7 +115,7 @@ + + install-exec-local: install-soPROGRAMS + mv $(DESTDIR)$(libdir)/liblxc.so $(DESTDIR)$(libdir)/liblxc.so.$(VERSION) +- /sbin/ldconfig -l $(DESTDIR)$(libdir)/liblxc.so.$(VERSION) ++ : /sbin/ldconfig -l $(DESTDIR)$(libdir)/liblxc.so.$(VERSION) + cd $(DESTDIR)$(libdir); \ + ln -sf liblxc.so.$(firstword $(subst ., ,$(VERSION))) liblxc.so + +diff -ubr lxc-0.7.5-orig/src/lxc/Makefile.in lxc-0.7.5/src/lxc/Makefile.in +--- lxc-0.7.5-orig/src/lxc/Makefile.in 2011-08-11 19:02:19.000000000 +0200 ++++ lxc-0.7.5/src/lxc/Makefile.in 2011-09-26 09:58:18.812685181 +0200 +@@ -1322,7 +1322,7 @@ + + install-exec-local: install-soPROGRAMS + mv $(DESTDIR)$(libdir)/liblxc.so $(DESTDIR)$(libdir)/liblxc.so.$(VERSION) +- /sbin/ldconfig -l $(DESTDIR)$(libdir)/liblxc.so.$(VERSION) ++ : /sbin/ldconfig -l $(DESTDIR)$(libdir)/liblxc.so.$(VERSION) + cd $(DESTDIR)$(libdir); \ + ln -sf liblxc.so.$(firstword $(subst ., ,$(VERSION))) liblxc.so + diff --git a/pkgs/tools/system/lxc/fix-documentation-build.patch b/pkgs/tools/system/lxc/fix-documentation-build.patch new file mode 100644 index 00000000000..0189b35a33e --- /dev/null +++ b/pkgs/tools/system/lxc/fix-documentation-build.patch @@ -0,0 +1,40 @@ +diff -ubr '--exclude=*sgml*' lxc-0.7.5-orig/doc/Makefile.am lxc-0.7.5/doc/Makefile.am +--- lxc-0.7.5-orig/doc/Makefile.am 2011-02-14 09:14:07.000000000 +0100 ++++ lxc-0.7.5/doc/Makefile.am 2011-09-26 09:53:02.192817940 +0200 +@@ -30,13 +30,13 @@ + + + %.1 : %.sgml +- docbook2man -w all $< ++ docbook2man $< + + %.5 : %.sgml +- docbook2man -w all $< ++ docbook2man $< + + %.7 : %.sgml +- docbook2man -w all $< ++ docbook2man $< + + lxc-%.sgml : common_options.sgml see_also.sgml + +diff -ubr '--exclude=*sgml*' lxc-0.7.5-orig/doc/Makefile.in lxc-0.7.5/doc/Makefile.in +--- lxc-0.7.5-orig/doc/Makefile.in 2011-08-11 19:02:18.000000000 +0200 ++++ lxc-0.7.5/doc/Makefile.in 2011-09-26 09:53:13.835401448 +0200 +@@ -786,13 +786,13 @@ + + + @ENABLE_DOCBOOK_TRUE@%.1 : %.sgml +-@ENABLE_DOCBOOK_TRUE@ docbook2man -w all $< ++@ENABLE_DOCBOOK_TRUE@ docbook2man $< + + @ENABLE_DOCBOOK_TRUE@%.5 : %.sgml +-@ENABLE_DOCBOOK_TRUE@ docbook2man -w all $< ++@ENABLE_DOCBOOK_TRUE@ docbook2man $< + + @ENABLE_DOCBOOK_TRUE@%.7 : %.sgml +-@ENABLE_DOCBOOK_TRUE@ docbook2man -w all $< ++@ENABLE_DOCBOOK_TRUE@ docbook2man $< + + @ENABLE_DOCBOOK_TRUE@lxc-%.sgml : common_options.sgml see_also.sgml + diff --git a/pkgs/tools/system/lxc/fix-sgml-documentation.patch b/pkgs/tools/system/lxc/fix-sgml-documentation.patch new file mode 100644 index 00000000000..4d2cce0dd62 --- /dev/null +++ b/pkgs/tools/system/lxc/fix-sgml-documentation.patch @@ -0,0 +1,252 @@ +diff -ubr '--exclude=Makefile*' lxc-0.7.5-orig/doc/lxc-cgroup.sgml.in lxc-0.7.5/doc/lxc-cgroup.sgml.in +--- lxc-0.7.5-orig/doc/lxc-cgroup.sgml.in 2010-06-07 10:51:51.000000000 +0200 ++++ lxc-0.7.5/doc/lxc-cgroup.sgml.in 2011-09-26 10:05:01.753873426 +0200 +@@ -23,7 +23,7 @@ + + --> + +- + +diff -ubr '--exclude=Makefile*' lxc-0.7.5-orig/doc/lxc-checkpoint.sgml.in lxc-0.7.5/doc/lxc-checkpoint.sgml.in +--- lxc-0.7.5-orig/doc/lxc-checkpoint.sgml.in 2011-02-17 10:07:44.000000000 +0100 ++++ lxc-0.7.5/doc/lxc-checkpoint.sgml.in 2011-09-26 10:05:01.753873426 +0200 +@@ -23,7 +23,7 @@ + + --> + +- + +diff -ubr '--exclude=Makefile*' lxc-0.7.5-orig/doc/lxc.conf.sgml.in lxc-0.7.5/doc/lxc.conf.sgml.in +--- lxc-0.7.5-orig/doc/lxc.conf.sgml.in 2011-08-09 16:51:01.000000000 +0200 ++++ lxc-0.7.5/doc/lxc.conf.sgml.in 2011-09-26 10:05:01.754873476 +0200 +@@ -23,7 +23,7 @@ + + --> + +- + ]> +diff -ubr '--exclude=Makefile*' lxc-0.7.5-orig/doc/lxc-console.sgml.in lxc-0.7.5/doc/lxc-console.sgml.in +--- lxc-0.7.5-orig/doc/lxc-console.sgml.in 2010-06-07 10:51:51.000000000 +0200 ++++ lxc-0.7.5/doc/lxc-console.sgml.in 2011-09-26 10:05:01.754873476 +0200 +@@ -23,7 +23,7 @@ + + --> + +- + +diff -ubr '--exclude=Makefile*' lxc-0.7.5-orig/doc/lxc-create.sgml.in lxc-0.7.5/doc/lxc-create.sgml.in +--- lxc-0.7.5-orig/doc/lxc-create.sgml.in 2011-07-25 00:27:10.000000000 +0200 ++++ lxc-0.7.5/doc/lxc-create.sgml.in 2011-09-26 10:05:01.755873526 +0200 +@@ -23,7 +23,7 @@ + + --> + +- + +diff -ubr '--exclude=Makefile*' lxc-0.7.5-orig/doc/lxc-destroy.sgml.in lxc-0.7.5/doc/lxc-destroy.sgml.in +--- lxc-0.7.5-orig/doc/lxc-destroy.sgml.in 2010-10-08 11:54:53.000000000 +0200 ++++ lxc-0.7.5/doc/lxc-destroy.sgml.in 2011-09-26 10:05:01.755873526 +0200 +@@ -23,7 +23,7 @@ + + --> + +- + +diff -ubr '--exclude=Makefile*' lxc-0.7.5-orig/doc/lxc-execute.sgml.in lxc-0.7.5/doc/lxc-execute.sgml.in +--- lxc-0.7.5-orig/doc/lxc-execute.sgml.in 2011-07-25 00:27:10.000000000 +0200 ++++ lxc-0.7.5/doc/lxc-execute.sgml.in 2011-09-26 10:05:01.755873526 +0200 +@@ -23,7 +23,7 @@ + + --> + +- + +diff -ubr '--exclude=Makefile*' lxc-0.7.5-orig/doc/lxc-freeze.sgml.in lxc-0.7.5/doc/lxc-freeze.sgml.in +--- lxc-0.7.5-orig/doc/lxc-freeze.sgml.in 2010-06-07 10:51:51.000000000 +0200 ++++ lxc-0.7.5/doc/lxc-freeze.sgml.in 2011-09-26 10:05:01.755873526 +0200 +@@ -23,7 +23,7 @@ + + --> + +- + +diff -ubr '--exclude=Makefile*' lxc-0.7.5-orig/doc/lxc-kill.sgml.in lxc-0.7.5/doc/lxc-kill.sgml.in +--- lxc-0.7.5-orig/doc/lxc-kill.sgml.in 2010-10-08 11:54:53.000000000 +0200 ++++ lxc-0.7.5/doc/lxc-kill.sgml.in 2011-09-26 10:05:01.756873576 +0200 +@@ -23,7 +23,7 @@ + + --> + +- + +diff -ubr '--exclude=Makefile*' lxc-0.7.5-orig/doc/lxc-ls.sgml.in lxc-0.7.5/doc/lxc-ls.sgml.in +--- lxc-0.7.5-orig/doc/lxc-ls.sgml.in 2010-06-07 10:51:51.000000000 +0200 ++++ lxc-0.7.5/doc/lxc-ls.sgml.in 2011-09-26 10:05:01.756873576 +0200 +@@ -24,7 +24,7 @@ + + --> + +- + ]> +diff -ubr '--exclude=Makefile*' lxc-0.7.5-orig/doc/lxc-monitor.sgml.in lxc-0.7.5/doc/lxc-monitor.sgml.in +--- lxc-0.7.5-orig/doc/lxc-monitor.sgml.in 2010-06-07 10:51:51.000000000 +0200 ++++ lxc-0.7.5/doc/lxc-monitor.sgml.in 2011-09-26 10:05:01.756873576 +0200 +@@ -23,7 +23,7 @@ + + --> + +- + +diff -ubr '--exclude=Makefile*' lxc-0.7.5-orig/doc/lxc-ps.sgml.in lxc-0.7.5/doc/lxc-ps.sgml.in +--- lxc-0.7.5-orig/doc/lxc-ps.sgml.in 2011-08-11 17:54:57.000000000 +0200 ++++ lxc-0.7.5/doc/lxc-ps.sgml.in 2011-09-26 10:05:01.756873576 +0200 +@@ -24,7 +24,7 @@ + + --> + +- + ]> +diff -ubr '--exclude=Makefile*' lxc-0.7.5-orig/doc/lxc-restart.sgml.in lxc-0.7.5/doc/lxc-restart.sgml.in +--- lxc-0.7.5-orig/doc/lxc-restart.sgml.in 2011-02-17 10:07:44.000000000 +0100 ++++ lxc-0.7.5/doc/lxc-restart.sgml.in 2011-09-26 10:05:01.757873626 +0200 +@@ -23,7 +23,7 @@ + + --> + +- + +diff -ubr '--exclude=Makefile*' lxc-0.7.5-orig/doc/lxc.sgml.in lxc-0.7.5/doc/lxc.sgml.in +--- lxc-0.7.5-orig/doc/lxc.sgml.in 2010-10-26 18:07:35.000000000 +0200 ++++ lxc-0.7.5/doc/lxc.sgml.in 2011-09-26 10:05:01.758873676 +0200 +@@ -23,7 +23,7 @@ + + --> + +- + ]> +@@ -280,7 +280,7 @@ + + + +- ++ + + + +@@ -570,7 +570,7 @@ + to the background. + + +- ++ + + + +diff -ubr '--exclude=Makefile*' lxc-0.7.5-orig/doc/lxc-start.sgml.in lxc-0.7.5/doc/lxc-start.sgml.in +--- lxc-0.7.5-orig/doc/lxc-start.sgml.in 2011-02-01 15:12:40.000000000 +0100 ++++ lxc-0.7.5/doc/lxc-start.sgml.in 2011-09-26 10:05:01.758873676 +0200 +@@ -23,7 +23,7 @@ + + --> + +- + +diff -ubr '--exclude=Makefile*' lxc-0.7.5-orig/doc/lxc-stop.sgml.in lxc-0.7.5/doc/lxc-stop.sgml.in +--- lxc-0.7.5-orig/doc/lxc-stop.sgml.in 2010-06-07 10:51:51.000000000 +0200 ++++ lxc-0.7.5/doc/lxc-stop.sgml.in 2011-09-26 10:05:01.758873676 +0200 +@@ -23,7 +23,7 @@ + + --> + +- + +diff -ubr '--exclude=Makefile*' lxc-0.7.5-orig/doc/lxc-unfreeze.sgml.in lxc-0.7.5/doc/lxc-unfreeze.sgml.in +--- lxc-0.7.5-orig/doc/lxc-unfreeze.sgml.in 2010-06-07 10:51:51.000000000 +0200 ++++ lxc-0.7.5/doc/lxc-unfreeze.sgml.in 2011-09-26 10:05:01.759873726 +0200 +@@ -23,7 +23,7 @@ + + --> + +- + +diff -ubr '--exclude=Makefile*' lxc-0.7.5-orig/doc/lxc-wait.sgml.in lxc-0.7.5/doc/lxc-wait.sgml.in +--- lxc-0.7.5-orig/doc/lxc-wait.sgml.in 2010-06-07 10:51:51.000000000 +0200 ++++ lxc-0.7.5/doc/lxc-wait.sgml.in 2011-09-26 10:05:01.759873726 +0200 +@@ -24,7 +24,7 @@ + + --> + +- + From 01022a1502b22b2bac3967ec026d9b4704345409 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 26 Sep 2011 08:12:14 +0000 Subject: [PATCH 16/42] lxc: moved package into the "applications/virtualization" category svn path=/nixpkgs/trunk/; revision=29491 --- .../system => applications/virtualization}/lxc/default.nix | 0 .../virtualization}/lxc/dont-run-ldconfig.patch | 0 .../virtualization}/lxc/fix-documentation-build.patch | 0 .../virtualization}/lxc/fix-sgml-documentation.patch | 0 pkgs/top-level/all-packages.nix | 2 +- 5 files changed, 1 insertion(+), 1 deletion(-) rename pkgs/{tools/system => applications/virtualization}/lxc/default.nix (100%) rename pkgs/{tools/system => applications/virtualization}/lxc/dont-run-ldconfig.patch (100%) rename pkgs/{tools/system => applications/virtualization}/lxc/fix-documentation-build.patch (100%) rename pkgs/{tools/system => applications/virtualization}/lxc/fix-sgml-documentation.patch (100%) diff --git a/pkgs/tools/system/lxc/default.nix b/pkgs/applications/virtualization/lxc/default.nix similarity index 100% rename from pkgs/tools/system/lxc/default.nix rename to pkgs/applications/virtualization/lxc/default.nix diff --git a/pkgs/tools/system/lxc/dont-run-ldconfig.patch b/pkgs/applications/virtualization/lxc/dont-run-ldconfig.patch similarity index 100% rename from pkgs/tools/system/lxc/dont-run-ldconfig.patch rename to pkgs/applications/virtualization/lxc/dont-run-ldconfig.patch diff --git a/pkgs/tools/system/lxc/fix-documentation-build.patch b/pkgs/applications/virtualization/lxc/fix-documentation-build.patch similarity index 100% rename from pkgs/tools/system/lxc/fix-documentation-build.patch rename to pkgs/applications/virtualization/lxc/fix-documentation-build.patch diff --git a/pkgs/tools/system/lxc/fix-sgml-documentation.patch b/pkgs/applications/virtualization/lxc/fix-sgml-documentation.patch similarity index 100% rename from pkgs/tools/system/lxc/fix-sgml-documentation.patch rename to pkgs/applications/virtualization/lxc/fix-sgml-documentation.patch diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 01637aac38d..85ec80c9c65 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -915,7 +915,7 @@ let lshw = callPackage ../tools/system/lshw { }; - lxc = callPackage ../tools/system/lxc { }; + lxc = callPackage ../applications/virtualization/lxc { }; lzma = xz; From 201fab68410e72cd89c7b93a600da0d147e30440 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 26 Sep 2011 08:12:18 +0000 Subject: [PATCH 17/42] all-packages.nix: strip trailing whitespace svn path=/nixpkgs/trunk/; revision=29492 --- pkgs/top-level/all-packages.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 85ec80c9c65..98d38c8d14b 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -446,7 +446,7 @@ let gui = true; }; - bittornado = callPackage ../tools/networking/p2p/bit-tornado { + bittornado = callPackage ../tools/networking/p2p/bit-tornado { inherit (pythonPackages) ssl; }; From b7d32054da2ee65e7b111284e12cfc6dfa049a9a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= Date: Mon, 26 Sep 2011 12:07:21 +0000 Subject: [PATCH 18/42] GNU Automake: Add TODO. svn path=/nixpkgs/trunk/; revision=29494 --- pkgs/development/tools/misc/automake/automake-1.11.x.nix | 3 +++ 1 file changed, 3 insertions(+) diff --git a/pkgs/development/tools/misc/automake/automake-1.11.x.nix b/pkgs/development/tools/misc/automake/automake-1.11.x.nix index ca04293e345..148d0a600eb 100644 --- a/pkgs/development/tools/misc/automake/automake-1.11.x.nix +++ b/pkgs/development/tools/misc/automake/automake-1.11.x.nix @@ -3,6 +3,9 @@ stdenv.mkDerivation rec { name = "automake-1.11.1"; + # TODO: Remove the `aclocal' wrapper when $ACLOCAL_PATH support is + # available upstream; see + # . builder = ./builder.sh; setupHook = ./setup-hook.sh; From e8a30536b6019aa4e5c72262d2ddf1a8fb0b9d98 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= Date: Mon, 26 Sep 2011 12:07:24 +0000 Subject: [PATCH 19/42] Cairo: Add dependency on Gettext on non-GNU systems; build it. svn path=/nixpkgs/trunk/; revision=29495 --- pkgs/development/libraries/cairo/default.nix | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/pkgs/development/libraries/cairo/default.nix b/pkgs/development/libraries/cairo/default.nix index 62e907264d5..ca3e53e64f4 100644 --- a/pkgs/development/libraries/cairo/default.nix +++ b/pkgs/development/libraries/cairo/default.nix @@ -5,6 +5,7 @@ , gobjectSupport ? true, glib , stdenv, fetchurl, pkgconfig, x11, fontconfig, freetype, xlibs , zlib, libpng, pixman, libxcb ? null, xcbutil ? null +, gettext }: assert postscriptSupport -> zlib != null; @@ -22,7 +23,10 @@ stdenv.mkDerivation rec { buildInputs = [ pkgconfig x11 fontconfig pixman xlibs.libXrender ] ++ stdenv.lib.optionals xcbSupport [ libxcb xcbutil ] - ++ stdenv.lib.optional gobjectSupport glib; + ++ stdenv.lib.optional gobjectSupport glib + + # On non-GNU systems we need GNU Gettext for libintl. + ++ stdenv.lib.optional (!stdenv.isLinux) gettext; propagatedBuildInputs = [ freetype ] ++ @@ -62,5 +66,7 @@ stdenv.mkDerivation rec { homepage = http://cairographics.org/; licenses = [ "LGPLv2+" "MPLv1" ]; + + platforms = stdenv.lib.platforms.all; }; } From 5da4cd69fc527e0f8355b78394d55d150b513640 Mon Sep 17 00:00:00 2001 From: "Yury G. Kudryashov" Date: Mon, 26 Sep 2011 13:13:45 +0000 Subject: [PATCH 20/42] imlib2-1.4.5 svn path=/nixpkgs/trunk/; revision=29496 --- pkgs/development/libraries/imlib2/default.nix | 16 +++++++++++----- 1 file changed, 11 insertions(+), 5 deletions(-) diff --git a/pkgs/development/libraries/imlib2/default.nix b/pkgs/development/libraries/imlib2/default.nix index d5c5424c077..83adb16bbc8 100644 --- a/pkgs/development/libraries/imlib2/default.nix +++ b/pkgs/development/libraries/imlib2/default.nix @@ -1,12 +1,18 @@ { stdenv, fetchurl, x11, libjpeg, libtiff, libungif, libpng, bzip2, pkgconfig }: -stdenv.mkDerivation { - name = "imlib2-1.4.4"; +stdenv.mkDerivation rec { + name = "imlib2-1.4.5"; src = fetchurl { - url = mirror://sourceforge/enlightenment/imlib2-1.4.4.tar.gz; - sha256 = "163162aifak8ya17brzqwjlr8ywz40s2s3573js5blcc1g4m5pm4"; + url = "mirror://sourceforge/enlightenment/${name}.tar.bz2"; + sha256 = "0nllbhf8vfwdm40z35yj27n83k2mjf5vbd62khad4f0qjf9hsw14"; }; - buildInputs = [ x11 libjpeg libtiff libungif libpng bzip2 pkgconfig ]; + buildInputs = [ x11 libjpeg libtiff libungif libpng bzip2 ]; + + buildNativeInputs = [ pkgconfig ]; + + meta = { + platforms = stdenv.lib.platforms.gnu; # random choice + }; } From 4f036cef1dffedbbefb805b5f9fbc0fe50ae2ffa Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 26 Sep 2011 16:18:04 +0000 Subject: [PATCH 21/42] haskell-web-routes: updated to version 0.25.3 svn path=/nixpkgs/trunk/; revision=29499 --- pkgs/development/libraries/haskell/web-routes/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/web-routes/default.nix b/pkgs/development/libraries/haskell/web-routes/default.nix index aa5321c7f5f..84ba6ed7fc6 100644 --- a/pkgs/development/libraries/haskell/web-routes/default.nix +++ b/pkgs/development/libraries/haskell/web-routes/default.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "web-routes"; - version = "0.25.2"; - sha256 = "0gspjvk5859zwg55q8fjyz4a0d2p6lf2qwa41b8s6kcqi38nnp08"; + version = "0.25.3"; + sha256 = "09bqz7vn2050jr67m3rrqi0krfxa9n1fxm9rgi3c837g522nb4kk"; buildDepends = [ mtl network parsec utf8String ]; meta = { description = "Library for maintaining correctness and composability of URLs within an application"; From 8f8d3f1747748da4722648d70502802e83335ce5 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 26 Sep 2011 16:18:09 +0000 Subject: [PATCH 22/42] haskell-cpphs: updated to version 1.13 svn path=/nixpkgs/trunk/; revision=29500 --- pkgs/development/tools/misc/cpphs/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/misc/cpphs/default.nix b/pkgs/development/tools/misc/cpphs/default.nix index 6d0ca9884d6..8208f17921f 100644 --- a/pkgs/development/tools/misc/cpphs/default.nix +++ b/pkgs/development/tools/misc/cpphs/default.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "cpphs"; - version = "1.12"; - sha256 = "18c8yx8y54b2q086sqlp4vhslkb7mm1gry1f13mki43x93kd1vdj"; + version = "1.13"; + sha256 = "0igk4210vsskcx3zn97rx0q4prxd2ri3yl787dn4ladn0zm676iq"; isLibrary = true; isExecutable = true; meta = { From acb52d79bf722792e2f63cd3b88ff82bd54f1ab9 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 26 Sep 2011 16:33:15 +0000 Subject: [PATCH 23/42] haskell-cpphs: revert update to version 1.13 The new version doesn't compile. I've reported the problem upstream. svn path=/nixpkgs/trunk/; revision=29501 --- pkgs/development/tools/misc/cpphs/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/misc/cpphs/default.nix b/pkgs/development/tools/misc/cpphs/default.nix index 8208f17921f..6d0ca9884d6 100644 --- a/pkgs/development/tools/misc/cpphs/default.nix +++ b/pkgs/development/tools/misc/cpphs/default.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "cpphs"; - version = "1.13"; - sha256 = "0igk4210vsskcx3zn97rx0q4prxd2ri3yl787dn4ladn0zm676iq"; + version = "1.12"; + sha256 = "18c8yx8y54b2q086sqlp4vhslkb7mm1gry1f13mki43x93kd1vdj"; isLibrary = true; isExecutable = true; meta = { From 093a0fb21f655ad53ff599716fe266bf6901e8f3 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 26 Sep 2011 17:05:27 +0000 Subject: [PATCH 24/42] haskell-blaze-html: updated to version 0.4.1.7 svn path=/nixpkgs/trunk/; revision=29502 --- pkgs/development/libraries/haskell/blaze-html/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/blaze-html/default.nix b/pkgs/development/libraries/haskell/blaze-html/default.nix index 8d1afd8c6fb..e5a49912779 100644 --- a/pkgs/development/libraries/haskell/blaze-html/default.nix +++ b/pkgs/development/libraries/haskell/blaze-html/default.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "blaze-html"; - version = "0.4.1.6"; - sha256 = "084phxxdy12vi2q084k8w693m94v0pjf29zx2fk1y0n80k05ii4z"; + version = "0.4.1.7"; + sha256 = "0hfnfwbw8gshcv15i8jb6636rh3dl4zwwp6l21yjbrblh3825k0y"; buildDepends = [ blazeBuilder text ]; meta = { homepage = "http://jaspervdj.be/blaze"; From d8b628d123e1c96bef3c76b75f9e9c09cb8db316 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 26 Sep 2011 19:30:36 +0000 Subject: [PATCH 25/42] haskell-cpphs: updated to version 1.13.1 svn path=/nixpkgs/trunk/; revision=29503 --- pkgs/development/tools/misc/cpphs/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/misc/cpphs/default.nix b/pkgs/development/tools/misc/cpphs/default.nix index 6d0ca9884d6..702c88d2ddb 100644 --- a/pkgs/development/tools/misc/cpphs/default.nix +++ b/pkgs/development/tools/misc/cpphs/default.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "cpphs"; - version = "1.12"; - sha256 = "18c8yx8y54b2q086sqlp4vhslkb7mm1gry1f13mki43x93kd1vdj"; + version = "1.13.1"; + sha256 = "0k5p9gqnalll3w1962dwydnygk25h777bic2gvdh8i8hhyz5fsx2"; isLibrary = true; isExecutable = true; meta = { From 12d42a5850eda59116936abe0459b9b9c0f4e87a Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Mon, 26 Sep 2011 22:08:44 +0000 Subject: [PATCH 26/42] * Added Statistics::Descriptive. svn path=/nixpkgs/trunk/; revision=29504 --- 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 8c8665842a3..e7ee5eadc0d 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -2809,6 +2809,14 @@ rec { ]; }; + StatisticsDescriptive = buildPerlPackage rec { + name = "Statistics-Descriptive-3.0202"; + src = fetchurl { + url = "mirror://cpan/modules/by-module/Statistics/${name}.tar.gz"; + sha256 = "0y8l3dkhfc2gqwfigrg363ac7pxcyshdna66afpdvs8r1gd53a1i"; + }; + }; + StringFormat = buildPerlPackage rec { name = "String-Format-1.16"; src = fetchurl { From 0ed57e3f64ee453057624fb249767f2deef1ec01 Mon Sep 17 00:00:00 2001 From: Alexander Tsamutali Date: Mon, 26 Sep 2011 22:24:22 +0000 Subject: [PATCH 27/42] servers/x11/xorg/overrides.nix: Added xproto to propagatedBuildInputs of libXext, because for ex. shape.h includes Xfuncproto.h. svn path=/nixpkgs/trunk/; revision=29505 --- pkgs/servers/x11/xorg/overrides.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/servers/x11/xorg/overrides.nix b/pkgs/servers/x11/xorg/overrides.nix index a624d27c2af..f260ce90cb5 100644 --- a/pkgs/servers/x11/xorg/overrides.nix +++ b/pkgs/servers/x11/xorg/overrides.nix @@ -103,6 +103,7 @@ in libXext = attrs: attrs // { buildInputs = attrs.buildInputs ++ [xorg.libXau]; + propagatedBuildInputs = [ xorg.xproto ]; preConfigure = setMalloc0ReturnsNullCrossCompiling; }; From e3ccdb4bcdcdea22397438c5b9cea750908e5753 Mon Sep 17 00:00:00 2001 From: Alexander Tsamutali Date: Mon, 26 Sep 2011 22:28:35 +0000 Subject: [PATCH 28/42] desktops/e17: Add e17. WIP. Make hangs during build of enlightenment. svn path=/nixpkgs/trunk/; revision=29506 --- pkgs/desktops/e17/default.nix | 39 +++++++++++++++++++++ pkgs/desktops/e17/e_dbus/default.nix | 28 +++++++++++++++ pkgs/desktops/e17/ecore/d.nix | 18 ++++++++++ pkgs/desktops/e17/ecore/default.nix | 30 ++++++++++++++++ pkgs/desktops/e17/edje/default.nix | 24 +++++++++++++ pkgs/desktops/e17/eet/default.nix | 29 +++++++++++++++ pkgs/desktops/e17/eeze/default.nix | 23 ++++++++++++ pkgs/desktops/e17/efreet/default.nix | 29 +++++++++++++++ pkgs/desktops/e17/eina/default.nix | 18 ++++++++++ pkgs/desktops/e17/embryo/default.nix | 21 +++++++++++ pkgs/desktops/e17/enlightenment/default.nix | 25 +++++++++++++ pkgs/desktops/e17/evas/default.nix | 22 ++++++++++++ pkgs/top-level/all-packages.nix | 5 +++ 13 files changed, 311 insertions(+) create mode 100644 pkgs/desktops/e17/default.nix create mode 100644 pkgs/desktops/e17/e_dbus/default.nix create mode 100644 pkgs/desktops/e17/ecore/d.nix create mode 100644 pkgs/desktops/e17/ecore/default.nix create mode 100644 pkgs/desktops/e17/edje/default.nix create mode 100644 pkgs/desktops/e17/eet/default.nix create mode 100644 pkgs/desktops/e17/eeze/default.nix create mode 100644 pkgs/desktops/e17/efreet/default.nix create mode 100644 pkgs/desktops/e17/eina/default.nix create mode 100644 pkgs/desktops/e17/embryo/default.nix create mode 100644 pkgs/desktops/e17/enlightenment/default.nix create mode 100644 pkgs/desktops/e17/evas/default.nix diff --git a/pkgs/desktops/e17/default.nix b/pkgs/desktops/e17/default.nix new file mode 100644 index 00000000000..6822c641913 --- /dev/null +++ b/pkgs/desktops/e17/default.nix @@ -0,0 +1,39 @@ +{ callPackage, pkgs }: +rec { + #### CORE EFL + + eina = callPackage ./eina { }; + + eet = callPackage ./eet { }; + + evas = callPackage ./evas { }; + + ecore = callPackage ./ecore { }; + + embryo = callPackage ./embryo { }; + + edje = callPackage ./edje { lua = pkgs.lua5; }; + + efreet = callPackage ./efreet { }; + + e_dbus = callPackage ./e_dbus { }; + + eeze = callPackage ./eeze { }; + + + #### WINDOW MANAGER + + enlightenment = callPackage ./enlightenment { }; + + + #### APPLICATIONS + + + + + #### ART + + + + +} diff --git a/pkgs/desktops/e17/e_dbus/default.nix b/pkgs/desktops/e17/e_dbus/default.nix new file mode 100644 index 00000000000..44be90f7af9 --- /dev/null +++ b/pkgs/desktops/e17/e_dbus/default.nix @@ -0,0 +1,28 @@ +{ stdenv, fetchurl, pkgconfig, ecore, eina, evas, dbus_libs }: +stdenv.mkDerivation rec { + name = "e_dbus-${version}"; + version = "1.0.1"; + src = fetchurl { + url = "http://download.enlightenment.org/releases/${name}.tar.gz"; + sha256 = "1ifkijy4ap2mlqw2nd1dlvzlppyi7bnp15bxiy40nhdly8vhpbdl"; + }; + buildInputs = [ pkgconfig ecore eina evas ]; + propagatedBuildInputs = [ dbus_libs ]; + configureFlags = '' + --disable-edbus-test + --disable-edbus-test-client + --disable-edbus-notify-send + --disable-edbus-notify-test + ''; + meta = { + description = "Enlightenment's D-Bus wrapping and glue layer library"; + longDescription = '' + Enlightenment's E_Dbus is a set of wrappers around DBus APIs by + third party, so they can be easily used by EFL applications, + automatically providing Ecore/main loop integration, as well as + Eina data types. + ''; + homepage = http://enlightenment.org/; + license = stdenv.lib.licenses.bsd2; # not sure + }; +} diff --git a/pkgs/desktops/e17/ecore/d.nix b/pkgs/desktops/e17/ecore/d.nix new file mode 100644 index 00000000000..73b318c4cde --- /dev/null +++ b/pkgs/desktops/e17/ecore/d.nix @@ -0,0 +1,18 @@ +{ stdenv, fetchurl, pkgconfig, eina, evas, xproto, libX11, libXext }: +stdenv.mkDerivation rec { + name = "ecore-${version}"; + version = "1.0.1"; + src = fetchurl { + url = "http://download.enlightenment.org/releases/${name}.tar.gz"; + sha256 = "1vi03zxnsdnrjv1rh5r3v0si0b20ikrfb8hf5374i2sqvi1g65j0"; + }; + buildInputs = [ pkgconfig eina evas xproto ]; + propagatedBuildInputs = [ libX11 libXext ]; + meta = { + description = ""; + longDescription = '' + ''; + homepage = http://enlightenment.org/; + license = "BSD-style???"; + }; +} diff --git a/pkgs/desktops/e17/ecore/default.nix b/pkgs/desktops/e17/ecore/default.nix new file mode 100644 index 00000000000..004d708070c --- /dev/null +++ b/pkgs/desktops/e17/ecore/default.nix @@ -0,0 +1,30 @@ +{ stdenv, fetchurl, pkgconfig, eina, evas, libX11, libXext }: +stdenv.mkDerivation rec { + name = "ecore-${version}"; + version = "1.0.1"; + src = fetchurl { + url = "http://download.enlightenment.org/releases/${name}.tar.gz"; + sha256 = "1vi03zxnsdnrjv1rh5r3v0si0b20ikrfb8hf5374i2sqvi1g65j0"; + }; + buildInputs = [ pkgconfig eina evas ]; + propagatedBuildInputs = [ libX11 libXext ]; + meta = { + description = "Enlightenment's core mainloop, display abstraction and utility library"; + longDescription = '' + Enlightenment's Ecore is a clean and tiny event loop library + with many modules to do lots of convenient things for a + programmer, to save time and effort. + + It's small and lean, designed to work on embedded systems all + the way to large and powerful multi-cpu workstations. It + serialises all system signals, events etc. into a single event + queue, that is easily processed without needing to worry about + concurrency. A properly written, event-driven program using this + kind of programming doesn't need threads, nor has to worry about + concurrency. It turns a program into a state machine, and makes + it very robust and easy to follow. + ''; + homepage = http://enlightenment.org/; + license = stdenv.lib.licenses.bsd2; # not sure + }; +} diff --git a/pkgs/desktops/e17/edje/default.nix b/pkgs/desktops/e17/edje/default.nix new file mode 100644 index 00000000000..3272963b8b6 --- /dev/null +++ b/pkgs/desktops/e17/edje/default.nix @@ -0,0 +1,24 @@ +{ stdenv, fetchurl, pkgconfig, lua, eina, eet, evas, ecore, embryo }: +stdenv.mkDerivation rec { + name = "edje-${version}"; + version = "1.0.1"; + src = fetchurl { + url = "http://download.enlightenment.org/releases/${name}.tar.gz"; + sha256 = "0z7gjj4ccjr36ba763ijmjkya58fc173vpdw1m298zwhy8n4164j"; + }; + buildInputs = [ pkgconfig lua eina eet evas ecore embryo ]; + meta = { + description = "Enlightenment's abstract GUI layout and animation object library"; + longDescription = '' + Enlightenment's Edje is a complex graphical design & layout + library based on Evas that provides an abstraction layer between + the application code and the interface, while allowing extremely + flexible dynamic layouts and animations. + + In more popular terms, Edje makes every application that uses it + "skinable". + ''; + homepage = http://enlightenment.org/; + license = stdenv.lib.licenses.bsd2; # not sure + }; +} diff --git a/pkgs/desktops/e17/eet/default.nix b/pkgs/desktops/e17/eet/default.nix new file mode 100644 index 00000000000..7f2809c0aa0 --- /dev/null +++ b/pkgs/desktops/e17/eet/default.nix @@ -0,0 +1,29 @@ +{ stdenv, fetchurl, pkgconfig, eina, zlib, libjpeg }: +stdenv.mkDerivation rec { + name = "eet-${version}"; + version = "1.4.1"; + src = fetchurl { + url = "http://download.enlightenment.org/releases/${name}.tar.gz"; + sha256 = "1hlznlmgkgzxnkmc3qgqjrc62bmwqj5af8lsh59vac2gf4jnymnc"; + }; + buildInputs = [ pkgconfig eina zlib libjpeg ]; + meta = { + description = "Enlightenment's data encode/decode and storage library"; + longDescription = '' + Enlightenment's EET is a tiny library designed to write an + arbitary set of chunks of data to a file and optionally compress + each chunk (very much like a zip file) and allow fast + random-access reading of the file later on. EET files are + perfect for storing data that is written once (or rarely) and + read many times, especially when the program does not want to + have to read all the data in at once. + + Use this library when you need to pack C structure and you want + to retrieve it quickly with as few as possible memory use. You + can also use it to serialize data quickly and exchange them + between two program over ipc or network link. + ''; + homepage = http://enlightenment.org/; + license = stdenv.lib.licenses.bsd2; # not sure + }; +} diff --git a/pkgs/desktops/e17/eeze/default.nix b/pkgs/desktops/e17/eeze/default.nix new file mode 100644 index 00000000000..3499d29dbb1 --- /dev/null +++ b/pkgs/desktops/e17/eeze/default.nix @@ -0,0 +1,23 @@ +{ stdenv, fetchurl, pkgconfig, eina, ecore, udev }: +stdenv.mkDerivation rec { + name = "eeze-${version}"; + version = "1.0.2"; + src = fetchurl { + url = "http://download.enlightenment.org/releases/${name}.tar.gz"; + sha256 = "0g6afhnl862clj1rfh0s4nzdnhdikylbalfp8zmsw56dj0zncynq"; + }; + buildInputs = [ pkgconfig eina ecore ]; + propagatedBuildInputs = [ udev ]; + meta = { + description = "Enlightenment's device abstraction library"; + longDescription = '' + Enlightenment's Eeze is a library for manipulating devices + through udev with a simple and fast api. It interfaces directly + with libudev, avoiding such middleman daemons as udisks/upower + or hal, to immediately gather device information the instant it + becomes known to the system. + ''; + homepage = http://enlightenment.org/; + license = stdenv.lib.licenses.bsd2; # not sure + }; +} diff --git a/pkgs/desktops/e17/efreet/default.nix b/pkgs/desktops/e17/efreet/default.nix new file mode 100644 index 00000000000..e1e8d34197f --- /dev/null +++ b/pkgs/desktops/e17/efreet/default.nix @@ -0,0 +1,29 @@ +{ stdenv, fetchurl, pkgconfig, eina, eet, ecore }: +stdenv.mkDerivation rec { + name = "efreet-${version}"; + version = "1.0.1"; + src = fetchurl { + url = "http://download.enlightenment.org/releases/${name}.tar.gz"; + sha256 = "0fakczsrr1idyvrp04mxw51ww017kn65xa77vq8wka4js8y0nagi"; + }; + buildInputs = [ pkgconfig eina eet ecore ]; + meta = { + description = "Enlightenment's standards handling for freedesktop.org standards"; + longDescription = '' + Enlightenment's Efreet is a library designed to help apps work + several of the Freedesktop.org standards regarding Icons, + Desktop files and Menus. To that end it implements the following + specifications: + + * XDG Base Directory Specification + * Icon Theme Specification + * Desktop Entry Specification + * Desktop Menu Specification + * FDO URI Specification + * Shared Mime Info Specification + * Trash Specification + ''; + homepage = http://enlightenment.org/; + license = stdenv.lib.licenses.bsd2; # not sure + }; +} diff --git a/pkgs/desktops/e17/eina/default.nix b/pkgs/desktops/e17/eina/default.nix new file mode 100644 index 00000000000..b4c3d0a7291 --- /dev/null +++ b/pkgs/desktops/e17/eina/default.nix @@ -0,0 +1,18 @@ +{ stdenv, fetchurl }: +stdenv.mkDerivation rec { + name = "eina-${version}"; + version = "1.0.1"; + src = fetchurl { + url = "http://download.enlightenment.org/releases/${name}.tar.gz"; + sha256 = "1v2z1l6nqr7hnp5gki3972kprlvylpalp5wq9xdppm250z91kaas"; + }; + meta = { + description = "Enlightenment's core data structure library"; + longDescription = '' + Enlightenment's Eina is a core data structure and common utility + library. + ''; + homepage = http://enlightenment.org/; + license = stdenv.lib.licenses.lgpl21; + }; +} diff --git a/pkgs/desktops/e17/embryo/default.nix b/pkgs/desktops/e17/embryo/default.nix new file mode 100644 index 00000000000..e23b3f4b0b1 --- /dev/null +++ b/pkgs/desktops/e17/embryo/default.nix @@ -0,0 +1,21 @@ +{ stdenv, fetchurl }: +stdenv.mkDerivation rec { + name = "embryo-${version}"; + version = "1.0.0"; + src = fetchurl { + url = "http://download.enlightenment.org/releases/${name}.tar.gz"; + sha256 = "0ch9vps83s892vda1ss1cf1fbgzff9p51df2fip7fqlj8y1shvvx"; + }; + meta = { + description = "Enlightenment's small Pawn based virtual machine and compiler"; + longDescription = '' + Enlightenment's Embryo is a tiny library designed to interpret + limited Small programs compiled by the included compiler, + embryo_cc. It is mostly a cleaned up and smaller version of the + original Small abstract machine. The compiler is mostly + untouched. + ''; + homepage = http://enlightenment.org/; + license = with stdenv.lib.licenses; [ bsd2 bsd3 ]; # not sure + }; +} diff --git a/pkgs/desktops/e17/enlightenment/default.nix b/pkgs/desktops/e17/enlightenment/default.nix new file mode 100644 index 00000000000..d3d74cac82a --- /dev/null +++ b/pkgs/desktops/e17/enlightenment/default.nix @@ -0,0 +1,25 @@ +{ stdenv, fetchurl, pkgconfig, eina, eet, evas, ecore, edje, efreet, e_dbus }: +stdenv.mkDerivation rec { + name = "enlightenment-0.16.999.55225"; + src = fetchurl { + url = "http://download.enlightenment.org/snapshots/2010-12-03/${name}.tar.gz"; + sha256 = "1cv701fidp9mx3g5m9klmzsp0fj149rb133v1w76rzms3a0wljl1"; + }; + buildInputs = [ pkgconfig eina eet ecore evas edje efreet e_dbus ]; + configureFlags = "--with-profile=FAST_PC"; + meta = { + description = "Enlightenment, the window manager"; + longDescription = '' + The Enlightenment Desktop shell provides an efficient yet + breathtaking window manager based on the Enlightenment + Foundation Libraries along with other essential desktop + components like a file manager, desktop icons and widgets. + + It boasts a un-precedented level of theme-ability while still + being capable of performing on older hardware or embedded + devices. + ''; + homepage = http://enlightenment.org/; + license = stdenv.lib.licenses.bsd2; # not sure + }; +} diff --git a/pkgs/desktops/e17/evas/default.nix b/pkgs/desktops/e17/evas/default.nix new file mode 100644 index 00000000000..9d7edc89c21 --- /dev/null +++ b/pkgs/desktops/e17/evas/default.nix @@ -0,0 +1,22 @@ +{ stdenv, fetchurl, pkgconfig, eina, freetype }: +stdenv.mkDerivation rec { + name = "evas-${version}"; + version = "1.0.1"; + src = fetchurl { + url = "http://download.enlightenment.org/releases/${name}.tar.gz"; + sha256 = "0xkwyvxy32dwja0i3j8r8bzlybjwlrgmrhcri1bscp3aaj75x2rx"; + }; + buildInputs = [ pkgconfig eina freetype ]; + meta = { + description = "Enlightenment's canvas and scenegraph rendering library"; + longDescription = '' + Enlightenment's Evas is a clean display canvas API that + implements a scene graph, not an immediate-mode rendering + target, is cross-platform, for several target display systems + that can draw anti-aliased text, smooth super and sub-sampled + scaled images, alpha-blend objects and much more. + ''; + homepage = http://enlightenment.org/; + license = stdenv.lib.licenses.bsd2; # not sure + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 98d38c8d14b..6c16d51f996 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -7832,6 +7832,11 @@ let enlightenment = callPackage ../desktops/enlightenment { }; + # e17 = recurseIntoAttrs ( + # let callPackage = newScope pkgs.e17; in + # import ../desktops/e17 { inherit callPackage pkgs; } + # ); + gnome28 = recurseIntoAttrs (import ../desktops/gnome-2.28 pkgs); gnome = gnome28; From a3143f0bbd09b498b271fe32f7c01855dd375039 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Tue, 27 Sep 2011 11:06:41 +0000 Subject: [PATCH 29/42] * Added Statistics::TTest. svn path=/nixpkgs/trunk/; revision=29507 --- pkgs/top-level/perl-packages.nix | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index e7ee5eadc0d..ae902dabe5d 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -2817,6 +2817,23 @@ rec { }; }; + StatisticsDistributions = buildPerlPackage rec { + name = "Statistics-Distributions-1.02"; + src = fetchurl { + url = "mirror://cpan/modules/by-module/Statistics/${name}.tar.gz"; + sha256 = "1j1kswl98f4i9dn176f9aa3y9bissx2sscga5jm3gjl4pxm3k7zr"; + }; + }; + + StatisticsTTest = buildPerlPackage rec { + name = "Statistics-TTest-1.1.0"; + src = fetchurl { + url = "mirror://cpan/modules/by-module/Statistics/${name}.tar.gz"; + sha256 = "0rkifgzm4rappiy669dyi6lyxn2sdqaf0bl6gndlfa67b395kndj"; + }; + propagatedBuildInputs = [ StatisticsDescriptive StatisticsDistributions ]; + }; + StringFormat = buildPerlPackage rec { name = "String-Format-1.16"; src = fetchurl { From 6bd8eea78870bd48d26b32a55da1e60d1027b02f Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Tue, 27 Sep 2011 14:00:31 +0000 Subject: [PATCH 30/42] python-matplotlib: move dependencies like numpy into the propagatedBuildInputs section to ensure that these libraries are being found at run-time by the python wrapper. svn path=/nixpkgs/trunk/; revision=29508 --- pkgs/top-level/python-packages.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 8ec9e1a0896..5403bc45ab4 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -765,7 +765,7 @@ let pythonPackages = python.modules // rec { doCheck = false; - buildInputs = [ dateutil numpy pkgs.freetype pkgs.libpng pkgs.pkgconfig pkgs.tcl pkgs.tk pkgs.xlibs.libX11 ]; + propagatedBuildInputs = [ dateutil numpy pkgs.freetype pkgs.libpng pkgs.pkgconfig pkgs.tcl pkgs.tk pkgs.xlibs.libX11 ]; meta = { description = "python plotting library, making publication quality plots"; From ed6328b5eede447f52c4c8b31de2575801ecdf32 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Tue, 27 Sep 2011 14:00:40 +0000 Subject: [PATCH 31/42] python-matplotlib: enable Linux builds by Hydra svn path=/nixpkgs/trunk/; revision=29509 --- pkgs/top-level/python-packages.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 5403bc45ab4..227a18444ec 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -770,6 +770,8 @@ let pythonPackages = python.modules // rec { meta = { description = "python plotting library, making publication quality plots"; homepage = "http://matplotlib.sourceforge.net/"; + platforms = stdenv.lib.platforms.linux; + maintainers = [ stdenv.lib.maintainers.simons ]; }; }); From 27e30f03fc04f01d6f7db5069e6fc36df23bdce7 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Tue, 27 Sep 2011 14:00:48 +0000 Subject: [PATCH 32/42] python-packages.nix: strip trailing whitespace svn path=/nixpkgs/trunk/; revision=29510 --- pkgs/top-level/python-packages.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 227a18444ec..b50028f47be 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -1818,7 +1818,7 @@ let pythonPackages = python.modules // rec { md5 = "42c722d48e52d4888193965dd473adb5"; }; - propagatedBuildInputs = [docutils jinja2 pygments]; + propagatedBuildInputs = [docutils jinja2 pygments]; meta = { description = "Sphinx is a tool that makes it easy to create intelligent and beautiful documentation for Python projects."; From 109b36eca9f8036d605899813b8ebecf2b37f800 Mon Sep 17 00:00:00 2001 From: "Yury G. Kudryashov" Date: Tue, 27 Sep 2011 15:40:40 +0000 Subject: [PATCH 33/42] Move soprano to top-level namespace svn path=/nixpkgs/trunk/; revision=29513 --- pkgs/desktops/kde-4.5/default.nix | 2 - .../kde-4.5/support/soprano/default.nix | 21 ----- pkgs/desktops/kde-4.7/default.nix | 1 - .../support/soprano/find-virtuoso.patch | 77 ------------------- .../libraries}/soprano/default.nix | 6 +- .../libraries/soprano/find-virtuoso.patch | 0 pkgs/top-level/all-packages.nix | 2 + 7 files changed, 6 insertions(+), 103 deletions(-) delete mode 100644 pkgs/desktops/kde-4.5/support/soprano/default.nix delete mode 100644 pkgs/desktops/kde-4.7/support/soprano/find-virtuoso.patch rename pkgs/{desktops/kde-4.7/support => development/libraries}/soprano/default.nix (85%) create mode 100644 pkgs/development/libraries/soprano/find-virtuoso.patch diff --git a/pkgs/desktops/kde-4.5/default.nix b/pkgs/desktops/kde-4.5/default.nix index 9381107ef6f..e231ef104c0 100644 --- a/pkgs/desktops/kde-4.5/default.nix +++ b/pkgs/desktops/kde-4.5/default.nix @@ -37,8 +37,6 @@ rec { polkit_qt_1 = callPackage ./support/polkit-qt-1 { }; - soprano = callPackage ./support/soprano { }; - ### LIBS kdelibs = callPackage ./libs { }; diff --git a/pkgs/desktops/kde-4.5/support/soprano/default.nix b/pkgs/desktops/kde-4.5/support/soprano/default.nix deleted file mode 100644 index 8d07f352d17..00000000000 --- a/pkgs/desktops/kde-4.5/support/soprano/default.nix +++ /dev/null @@ -1,21 +0,0 @@ -{ stdenv, fetchurl, cmake, qt4, clucene_core, redland, libiodbc }: - -stdenv.mkDerivation rec { - name = "soprano-2.7.0"; - - src = fetchurl { - url = "mirror://sourceforge/soprano/${name}.tar.bz2"; - sha256 = "1ki92wg0i9nhn1fh5mdcls5h9h3lf2k5r66snsags4x7zw0dmv2z"; - }; - - # We disable the Java backend, since we do not need them and they make the closure size much bigger - buildInputs = [ cmake qt4 clucene_core redland libiodbc ]; - - meta = { - homepage = http://soprano.sourceforge.net/; - description = "An object-oriented C++/Qt4 framework for RDF data"; - license = "LGPL"; - maintainers = with stdenv.lib.maintainers; [ sander urkud ]; - inherit (qt4.meta) platforms; - }; -} diff --git a/pkgs/desktops/kde-4.7/default.nix b/pkgs/desktops/kde-4.7/default.nix index 9d6981f1168..0e2377f2535 100644 --- a/pkgs/desktops/kde-4.7/default.nix +++ b/pkgs/desktops/kde-4.7/default.nix @@ -43,7 +43,6 @@ kde.modules // kde.individual // inherit (kde) manifest modules individual splittedModuleList; akonadi = callPackage ./support/akonadi { }; - soprano = callPackage ./support/soprano { }; qt4 = qt47; diff --git a/pkgs/desktops/kde-4.7/support/soprano/find-virtuoso.patch b/pkgs/desktops/kde-4.7/support/soprano/find-virtuoso.patch deleted file mode 100644 index 649f22a3b74..00000000000 --- a/pkgs/desktops/kde-4.7/support/soprano/find-virtuoso.patch +++ /dev/null @@ -1,77 +0,0 @@ -From: Yury G. Kudryashov -Subject: [PATCH] Find virtuoso if virtuoso-t is in PATH - ---- - backends/virtuoso/virtuosobackend.cpp | 29 ++++++++++++++++++++--------- - backends/virtuoso/virtuosobackend.h | 2 +- - 2 files changed, 21 insertions(+), 10 deletions(-) - -diff --git a/backends/virtuoso/virtuosobackend.cpp b/backends/virtuoso/virtuosobackend.cpp -index c83605d..c24854e 100644 ---- a/backends/virtuoso/virtuosobackend.cpp -+++ b/backends/virtuoso/virtuosobackend.cpp -@@ -188,19 +188,19 @@ namespace { - - bool Soprano::Virtuoso::BackendPlugin::isAvailable() const - { --#ifndef Q_OS_WIN -- if ( findVirtuosoDriver().isEmpty() ) { -- qDebug() << Q_FUNC_INFO << "could not find Virtuoso ODBC driver"; -- return false; -- } --#endif -- - QString virtuosoBin = VirtuosoController::locateVirtuosoBinary(); - if ( virtuosoBin.isEmpty() ) { - qDebug() << Q_FUNC_INFO << "could not find virtuoso-t binary"; - return false; - } - -+#ifndef Q_OS_WIN -+ if ( findVirtuosoDriver(virtuosoBin).isEmpty() ) { -+ qDebug() << Q_FUNC_INFO << "could not find Virtuoso ODBC driver"; -+ return false; -+ } -+#endif -+ - QString vs = determineVirtuosoVersion( virtuosoBin ); - if ( vs.isEmpty() ) { - qDebug() << Q_FUNC_INFO << "Failed to determine version of the Virtuoso server at" << virtuosoBin; -@@ -217,9 +217,20 @@ bool Soprano::Virtuoso::BackendPlugin::isAvailable() const - - - #ifndef Q_OS_WIN --QString Soprano::Virtuoso::BackendPlugin::findVirtuosoDriver() const -+QString Soprano::Virtuoso::BackendPlugin::findVirtuosoDriver( const QString &virtuosoBinHint ) const - { -- return Soprano::findLibraryPath( "virtodbc_r", QStringList(), QStringList() << QLatin1String( "virtuoso/plugins/" ) << QLatin1String( "odbc/" ) ); -+ QString virtuosoBin; -+ if (virtuosoBinHint.isEmpty()) -+ virtuosoBin = VirtuosoController::locateVirtuosoBinary(); -+ else -+ virtuosoBin = virtuosoBinHint; -+ -+ QDir virtuosoBinDir = QFileInfo(virtuosoBin).absoluteDir(); -+ return Soprano::findLibraryPath( "virtodbc_r", -+ QStringList() << virtuosoBinDir.absolutePath() -+ << virtuosoBinDir.absoluteFilePath("../lib"), -+ QStringList() << QLatin1String( "virtuoso/plugins/" ) << -+ QLatin1String( "odbc/" ) ); - } - #endif - -diff --git a/backends/virtuoso/virtuosobackend.h b/backends/virtuoso/virtuosobackend.h -index 3971b83..0807e5d 100644 ---- a/backends/virtuoso/virtuosobackend.h -+++ b/backends/virtuoso/virtuosobackend.h -@@ -50,7 +50,7 @@ namespace Soprano { - - #ifndef Q_OS_WIN - private: -- QString findVirtuosoDriver() const; -+ QString findVirtuosoDriver(const QString &virtuosoBinHint = QString()) const; - #endif - }; - } --- -tg: (432b73f..) t/find-virtuoso (depends on: master) diff --git a/pkgs/desktops/kde-4.7/support/soprano/default.nix b/pkgs/development/libraries/soprano/default.nix similarity index 85% rename from pkgs/desktops/kde-4.7/support/soprano/default.nix rename to pkgs/development/libraries/soprano/default.nix index 9dc6d1d1de6..49e6e6b96df 100644 --- a/pkgs/desktops/kde-4.7/support/soprano/default.nix +++ b/pkgs/development/libraries/soprano/default.nix @@ -9,7 +9,7 @@ stdenv.mkDerivation rec { }; patches = - [ (fetchurl { + [ (fetchurl { # Applied upstream, remove if upgrading url = https://git.reviewboard.kde.org/r/102466/diff/raw/; name = "soprano-virtuoso-restart.patch"; sha256 = "0jk038fp7ii6847mbxdajhhc7f6ap6lriaklxcqqxf6ddj37gf3y"; @@ -18,7 +18,9 @@ stdenv.mkDerivation rec { ]; # We disable the Java backend, since we do not need them and they make the closure size much bigger - buildInputs = [ cmake qt4 clucene_core librdf_redland libiodbc ]; + buildInputs = [ qt4 clucene_core librdf_redland libiodbc ]; + + buildNativeInputs = [ cmake ]; meta = { homepage = http://soprano.sourceforge.net/; diff --git a/pkgs/development/libraries/soprano/find-virtuoso.patch b/pkgs/development/libraries/soprano/find-virtuoso.patch new file mode 100644 index 00000000000..e69de29bb2d diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 6c16d51f996..c43215b787f 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -4442,6 +4442,8 @@ let # optional }; + soprano = callPackage ../development/libraries/soprano { }; + soqt = callPackage ../development/libraries/soqt { }; speechd = callPackage ../development/libraries/speechd { }; From 791cf785b8668c97b90e03d18f4259af2b395859 Mon Sep 17 00:00:00 2001 From: "Yury G. Kudryashov" Date: Tue, 27 Sep 2011 15:40:45 +0000 Subject: [PATCH 34/42] virtuoso: apply patch as proposed by Nepomuk developers svn path=/nixpkgs/trunk/; revision=29514 --- pkgs/servers/sql/virtuoso/default.nix | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) diff --git a/pkgs/servers/sql/virtuoso/default.nix b/pkgs/servers/sql/virtuoso/default.nix index 31dcc842a19..bb9426ad947 100644 --- a/pkgs/servers/sql/virtuoso/default.nix +++ b/pkgs/servers/sql/virtuoso/default.nix @@ -10,6 +10,16 @@ stdenv.mkDerivation rec { buildInputs = [ libxml2 openssl readline gawk ]; + patchFlags = "-p0"; + + patches = + [ (fetchurl { + url = "http://bugsfiles.kde.org/attachment.cgi?id=63510"; + name = "virtuoso-charset-fix.diff"; + sha256 = "09kxjhsy3rbys0bcxpmgga4sa6qjyy79dyl4n8b0gp1hnzjskvkz"; + }) + ]; + CPP = "${stdenv.gcc}/bin/gcc -E"; configureFlags = " @@ -19,13 +29,14 @@ stdenv.mkDerivation rec { "; postInstall='' - echo Move documentation + echo Moving documentation mkdir -pv $out/share/doc mv -v $out/share/virtuoso/doc $out/share/doc/${name} find $out -name "*.a" -delete -o -name "*.jar" -delete -o -type d -empty -delete ''; meta = with stdenv.lib; { + description = "SQL/RDF database used by, e.g., KDE-nepomuk"; homepage = http://virtuoso.openlinksw.com/dataspace/dav/wiki/Main/; platforms = platforms.all; maintainers = [ maintainers.urkud ]; From e3c935cd2cb06055b0e512c8e728e92511560d14 Mon Sep 17 00:00:00 2001 From: "Yury G. Kudryashov" Date: Tue, 27 Sep 2011 15:40:54 +0000 Subject: [PATCH 35/42] kde-4.7: akonadi-1.6.1 svn path=/nixpkgs/trunk/; revision=29515 --- pkgs/desktops/kde-4.7/support/akonadi/default.nix | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/pkgs/desktops/kde-4.7/support/akonadi/default.nix b/pkgs/desktops/kde-4.7/support/akonadi/default.nix index 486849b23aa..38ec7f85907 100644 --- a/pkgs/desktops/kde-4.7/support/akonadi/default.nix +++ b/pkgs/desktops/kde-4.7/support/akonadi/default.nix @@ -1,14 +1,16 @@ { stdenv, fetchurl, cmake, qt4, shared_mime_info, libxslt, boost, automoc4, soprano }: stdenv.mkDerivation rec { - name = "akonadi-1.6.0"; + name = "akonadi-1.6.1"; src = fetchurl { url = "mirror://kde/stable/akonadi/src/${name}.tar.bz2"; - sha256 = "0bzr6476yyinvdhrn9z8ynmi0py9zs3dfhwk3dvqxysk87svk71f"; + sha256 = "0r8sw7m1pwqc7qkaczm0r8adqi1wvlhdp32gy3q5p5plq50xhgra"; }; - - buildInputs = [ cmake qt4 soprano automoc4 shared_mime_info libxslt boost ]; + + buildInputs = [ qt4 soprano libxslt boost ]; + + buildNativeInputs = [ cmake automoc4 shared_mime_info ]; enableParallelBuilding = true; From dbb9440ef791c6fa83c54320a08ac52b78618a8b Mon Sep 17 00:00:00 2001 From: "Yury G. Kudryashov" Date: Tue, 27 Sep 2011 16:18:06 +0000 Subject: [PATCH 36/42] Fix for r29513 I've accidentially committed an empty find-virtuoso.patch svn path=/nixpkgs/trunk/; revision=29516 --- .../libraries/soprano/find-virtuoso.patch | 86 +++++++++++++++++++ 1 file changed, 86 insertions(+) diff --git a/pkgs/development/libraries/soprano/find-virtuoso.patch b/pkgs/development/libraries/soprano/find-virtuoso.patch index e69de29bb2d..7da53d6f633 100644 --- a/pkgs/development/libraries/soprano/find-virtuoso.patch +++ b/pkgs/development/libraries/soprano/find-virtuoso.patch @@ -0,0 +1,86 @@ +From: Yury G. Kudryashov +Subject: [PATCH] Find virtuoso if virtuoso-t is in PATH + +--- + backends/virtuoso/virtuosobackend.cpp | 31 ++++++++++++++++++++++--------- + backends/virtuoso/virtuosobackend.h | 2 +- + 2 files changed, 23 insertions(+), 10 deletions(-) + +diff --git a/backends/virtuoso/virtuosobackend.cpp b/backends/virtuoso/virtuosobackend.cpp +index c83605d..8c30c81 100644 +--- a/backends/virtuoso/virtuosobackend.cpp ++++ b/backends/virtuoso/virtuosobackend.cpp +@@ -27,6 +27,7 @@ + #include "odbcconnectionpool.h" + + #include "sopranodirs.h" ++#include "soprano-config.h" + + #include + #include +@@ -188,19 +189,19 @@ namespace { + + bool Soprano::Virtuoso::BackendPlugin::isAvailable() const + { +-#ifndef Q_OS_WIN +- if ( findVirtuosoDriver().isEmpty() ) { +- qDebug() << Q_FUNC_INFO << "could not find Virtuoso ODBC driver"; +- return false; +- } +-#endif +- + QString virtuosoBin = VirtuosoController::locateVirtuosoBinary(); + if ( virtuosoBin.isEmpty() ) { + qDebug() << Q_FUNC_INFO << "could not find virtuoso-t binary"; + return false; + } + ++#ifndef Q_OS_WIN ++ if ( findVirtuosoDriver(virtuosoBin).isEmpty() ) { ++ qDebug() << Q_FUNC_INFO << "could not find Virtuoso ODBC driver"; ++ return false; ++ } ++#endif ++ + QString vs = determineVirtuosoVersion( virtuosoBin ); + if ( vs.isEmpty() ) { + qDebug() << Q_FUNC_INFO << "Failed to determine version of the Virtuoso server at" << virtuosoBin; +@@ -217,9 +218,21 @@ bool Soprano::Virtuoso::BackendPlugin::isAvailable() const + + + #ifndef Q_OS_WIN +-QString Soprano::Virtuoso::BackendPlugin::findVirtuosoDriver() const ++QString Soprano::Virtuoso::BackendPlugin::findVirtuosoDriver( const QString &virtuosoBinHint ) const + { +- return Soprano::findLibraryPath( "virtodbc_r", QStringList(), QStringList() << QLatin1String( "virtuoso/plugins/" ) << QLatin1String( "odbc/" ) ); ++ QString virtuosoBin; ++ if (virtuosoBinHint.isEmpty()) ++ virtuosoBin = VirtuosoController::locateVirtuosoBinary(); ++ else ++ virtuosoBin = virtuosoBinHint; ++ ++ QDir virtuosoBinDir = QFileInfo(virtuosoBin).absoluteDir(); ++ return Soprano::findLibraryPath( "virtodbc_r", ++ QStringList() ++ << virtuosoBinDir.absoluteFilePath("../lib"SOPRANO_LIB_SUFFIX) ++ << virtuosoBinDir.absoluteFilePath("../lib"), ++ QStringList() << QLatin1String( "virtuoso/plugins/" ) << ++ QLatin1String( "odbc/" ) ); + } + #endif + +diff --git a/backends/virtuoso/virtuosobackend.h b/backends/virtuoso/virtuosobackend.h +index 3971b83..0807e5d 100644 +--- a/backends/virtuoso/virtuosobackend.h ++++ b/backends/virtuoso/virtuosobackend.h +@@ -50,7 +50,7 @@ namespace Soprano { + + #ifndef Q_OS_WIN + private: +- QString findVirtuosoDriver() const; ++ QString findVirtuosoDriver(const QString &virtuosoBinHint = QString()) const; + #endif + }; + } +-- +tg: (da390be..) t/find-virtuoso (depends on: master) From 6fd4c26fc28a385eb6239452a658ee7367e553d7 Mon Sep 17 00:00:00 2001 From: Rob Vermaas Date: Tue, 27 Sep 2011 17:24:01 +0000 Subject: [PATCH 37/42] add google perftools 1.8.3 svn path=/nixpkgs/trunk/; revision=29517 --- .../libraries/google-perftools/default.nix | 14 ++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 16 insertions(+) create mode 100644 pkgs/development/libraries/google-perftools/default.nix diff --git a/pkgs/development/libraries/google-perftools/default.nix b/pkgs/development/libraries/google-perftools/default.nix new file mode 100644 index 00000000000..7935a794a2f --- /dev/null +++ b/pkgs/development/libraries/google-perftools/default.nix @@ -0,0 +1,14 @@ +{stdenv, fetchurl, libunwind}: + +stdenv.mkDerivation rec { + name = "google-perftools-1.8.3"; + src = fetchurl { + url = "http://google-perftools.googlecode.com/files/${name}.tar.gz"; + sha256 = "0ncx3a8jl6n38q9bjnaz5sq96yb6yh99j3bl64k3295v9arl9mva"; + }; + buildInputs = [libunwind]; + meta = { + description = "Fast, multi-threaded malloc() and nifty performance analysis tools."; + platforms = stdenv.lib.platforms.linux; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index c43215b787f..42a95483914 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -3475,6 +3475,8 @@ let inherit (gnome) gtk glib; }; + google_perftools = callPackage ../development/libraries/google-perftools { }; + #GMP ex-satellite, so better keep it near gmp mpfr = callPackage ../development/libraries/mpfr { }; From 3a2423151080795580adf1bd363449e30e73a3c9 Mon Sep 17 00:00:00 2001 From: Alexander Tsamutali Date: Tue, 27 Sep 2011 23:49:28 +0000 Subject: [PATCH 38/42] pkgs/desktops/e17: Some fixes and now I can start it! \o/ svn path=/nixpkgs/trunk/; revision=29518 --- pkgs/desktops/e17/enlightenment/default.nix | 10 +++++++--- pkgs/desktops/e17/evas/default.nix | 7 +++++-- 2 files changed, 12 insertions(+), 5 deletions(-) diff --git a/pkgs/desktops/e17/enlightenment/default.nix b/pkgs/desktops/e17/enlightenment/default.nix index d3d74cac82a..b21bfc92ef2 100644 --- a/pkgs/desktops/e17/enlightenment/default.nix +++ b/pkgs/desktops/e17/enlightenment/default.nix @@ -1,12 +1,16 @@ -{ stdenv, fetchurl, pkgconfig, eina, eet, evas, ecore, edje, efreet, e_dbus }: +{ stdenv, fetchurl, pkgconfig, eina, eet, evas, ecore, edje, efreet, e_dbus, embryo }: stdenv.mkDerivation rec { name = "enlightenment-0.16.999.55225"; src = fetchurl { url = "http://download.enlightenment.org/snapshots/2010-12-03/${name}.tar.gz"; sha256 = "1cv701fidp9mx3g5m9klmzsp0fj149rb133v1w76rzms3a0wljl1"; }; - buildInputs = [ pkgconfig eina eet ecore evas edje efreet e_dbus ]; - configureFlags = "--with-profile=FAST_PC"; + buildInputs = [ pkgconfig eina eet ecore evas edje efreet e_dbus embryo ]; + configureFlags = '' + --with-profile=FAST_PC + --disable-illume + --disable-illume2 + ''; meta = { description = "Enlightenment, the window manager"; longDescription = '' diff --git a/pkgs/desktops/e17/evas/default.nix b/pkgs/desktops/e17/evas/default.nix index 9d7edc89c21..c546eb1af54 100644 --- a/pkgs/desktops/e17/evas/default.nix +++ b/pkgs/desktops/e17/evas/default.nix @@ -1,4 +1,5 @@ -{ stdenv, fetchurl, pkgconfig, eina, freetype }: +{ stdenv, fetchurl, pkgconfig, freetype, fontconfig, libpng, libjpeg +, libX11, libXext, eina, eet }: stdenv.mkDerivation rec { name = "evas-${version}"; version = "1.0.1"; @@ -6,7 +7,9 @@ stdenv.mkDerivation rec { url = "http://download.enlightenment.org/releases/${name}.tar.gz"; sha256 = "0xkwyvxy32dwja0i3j8r8bzlybjwlrgmrhcri1bscp3aaj75x2rx"; }; - buildInputs = [ pkgconfig eina freetype ]; + buildInputs = [ pkgconfig freetype fontconfig libpng libjpeg + libX11 libXext eina eet + ]; meta = { description = "Enlightenment's canvas and scenegraph rendering library"; longDescription = '' From afe142e9631c0498c9ce099aaa16cafae6890fd8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?= Date: Wed, 28 Sep 2011 07:25:59 +0000 Subject: [PATCH 39/42] Making jwhois connect fine for those without ipv6 network. svn path=/nixpkgs/trunk/; revision=29519 --- pkgs/tools/networking/jwhois/connect.patch | 60 ++++++++++++++++++++++ pkgs/tools/networking/jwhois/default.nix | 2 + 2 files changed, 62 insertions(+) create mode 100644 pkgs/tools/networking/jwhois/connect.patch diff --git a/pkgs/tools/networking/jwhois/connect.patch b/pkgs/tools/networking/jwhois/connect.patch new file mode 100644 index 00000000000..c26025a8239 --- /dev/null +++ b/pkgs/tools/networking/jwhois/connect.patch @@ -0,0 +1,60 @@ +https://bugzilla.redhat.com/attachment.cgi?id=265091 + +This fixes somewhat reversed logic of trying to connect to WHOIS server. +Tue Nov 20 2007, Lubomir Kundrak + +--- jwhois-4.0/src/utils.c.connect 2007-06-26 09:00:20.000000000 +0200 ++++ jwhois-4.0/src/utils.c 2007-11-20 17:05:33.000000000 +0100 +@@ -247,7 +247,7 @@ make_connect(const char *host, int port) + { + return -1; + } +- while (res) ++ for (; res; res = res->ai_next) + { + sa = res->ai_addr; + sockfd = socket(res->ai_family, res->ai_socktype, res->ai_protocol); +@@ -266,15 +266,15 @@ make_connect(const char *host, int port) + flags = fcntl(sockfd, F_GETFL, 0); + if (fcntl(sockfd, F_SETFL, flags|O_NONBLOCK) == -1) + { ++ close (sockfd); + return -1; + } + +- + error = connect(sockfd, res->ai_addr, res->ai_addrlen); +- + if (error < 0 && errno != EINPROGRESS) + { +- break; ++ close (sockfd); ++ continue; + } + + FD_ZERO(&fdset); +@@ -283,18 +283,20 @@ make_connect(const char *host, int port) + error = select(FD_SETSIZE, NULL, &fdset, NULL, &timeout); + if (error == 0) + { +- break; ++ close (sockfd); ++ return -1; + } + + retlen = sizeof(retval); + error = getsockopt(sockfd, SOL_SOCKET, SO_ERROR, &retval, &retlen); + if (error < 0 || retval) + { +- break; ++ close (sockfd); ++ return -1; + } +- res = res->ai_next; ++ ++ break; + } +- if (error < 0 || retval) return -1; + #endif + + return sockfd; diff --git a/pkgs/tools/networking/jwhois/default.nix b/pkgs/tools/networking/jwhois/default.nix index 40cc1605655..54d8acd3213 100644 --- a/pkgs/tools/networking/jwhois/default.nix +++ b/pkgs/tools/networking/jwhois/default.nix @@ -10,6 +10,8 @@ stdenv.mkDerivation { postInstall = "ln -s jwhois $out/bin/whois"; + patches = [ ./connect.patch ]; + meta = { description = "A client for the WHOIS protocol allowing you to query the owner of a domain name"; homepage = http://www.gnu.org/software/jwhois/; From 0f2e4160c0072d55a4d77fe19ceb94196fd650ca Mon Sep 17 00:00:00 2001 From: Shea Levy Date: Wed, 28 Sep 2011 14:18:26 +0000 Subject: [PATCH 40/42] Linux 3.0: Don't use aufs2.1, there's aufs 3.x for Linux 3.x kernels svn path=/nixpkgs/trunk/; revision=29520 --- pkgs/top-level/all-packages.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 42a95483914..f544c06b545 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -5550,7 +5550,7 @@ let kernelPatches = [ #kernelPatches.fbcondecor_2_6_38 kernelPatches.sec_perm_2_6_24 - kernelPatches.aufs2_1_3_0 + #kernelPatches.aufs2_1_3_0 #kernelPatches.mips_restart_2_6_36 ]; }; From 790d78fb6f7f68541135f7f95c815189db499162 Mon Sep 17 00:00:00 2001 From: Shea Levy Date: Wed, 28 Sep 2011 14:23:47 +0000 Subject: [PATCH 41/42] FreeRDP-unstable: Bump svn path=/nixpkgs/trunk/; revision=29522 --- .../networking/remote/freerdp/unstable.nix | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/applications/networking/remote/freerdp/unstable.nix b/pkgs/applications/networking/remote/freerdp/unstable.nix index 78e275690ac..2266f7237f6 100644 --- a/pkgs/applications/networking/remote/freerdp/unstable.nix +++ b/pkgs/applications/networking/remote/freerdp/unstable.nix @@ -17,7 +17,7 @@ assert printerSupport -> cups != null; -let rev = "42fb9f84e82268073a3838e6082783ba956ecc99"; in +let rev = "498b88a1da748a4a2b4dbd12c795ca87fee24bab"; in stdenv.mkDerivation rec { name = "freerdp-1.0pre${rev}"; @@ -25,7 +25,7 @@ stdenv.mkDerivation rec { src = fetchgit { url = git://github.com/FreeRDP/FreeRDP.git; inherit rev; - sha256 = "5e77163e2a728802fc426860b3f5ff88cb2f2f3b0bbf0912e9e44c3d8fa060e5"; + sha256 = "91ef562e96db483ada28236e524326a75b6942becce4fd2a65ace386186eccf7"; }; buildInputs = [ @@ -43,9 +43,9 @@ stdenv.mkDerivation rec { cunit ] ++ stdenv.lib.optional printerSupport cups; - postUnpack = '' - sed -i 's@xf_GetWorkArea(xfi)@///xf_GetWorkArea(xfi)@' git-export/client/X11/xf_monitor.c - ''; + doCheck = false; + + checkPhase = ''LD_LIBRARY_PATH="libfreerdp-cache:libfreerdp-chanman:libfreerdp-common:libfreerdp-core:libfreerdp-gdi:libfreerdp-kbd:libfreerdp-rail:libfreerdp-rfx:libfreerdp-utils" cunit/test_freerdp''; cmakeFlags = [ "-DWITH_DIRECTFB=ON" "-DWITH_CUNIT=ON" ]; From dc55be9e050eea7c8ebd59acb7fd8963d7a31f56 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Wed, 28 Sep 2011 14:37:03 +0000 Subject: [PATCH 42/42] pkgs/shells/bash: updated "interactive" bash to version 4.2 The non-interactive variant, which is part of stdenv, remains unchanged. svn path=/nixpkgs/trunk/; revision=29523 --- pkgs/shells/bash/{default.nix => 4.1.nix} | 2 +- pkgs/shells/bash/4.2.nix | 81 +++++++++++++++++++ ...{bash-patches.nix => bash-4.1-patches.nix} | 0 pkgs/shells/bash/bash-4.2-patches.nix | 14 ++++ pkgs/shells/bash/update-patch-set.sh | 2 +- pkgs/top-level/all-packages.nix | 4 +- 6 files changed, 99 insertions(+), 4 deletions(-) rename pkgs/shells/bash/{default.nix => 4.1.nix} (98%) create mode 100644 pkgs/shells/bash/4.2.nix rename pkgs/shells/bash/{bash-patches.nix => bash-4.1-patches.nix} (100%) create mode 100644 pkgs/shells/bash/bash-4.2-patches.nix diff --git a/pkgs/shells/bash/default.nix b/pkgs/shells/bash/4.1.nix similarity index 98% rename from pkgs/shells/bash/default.nix rename to pkgs/shells/bash/4.1.nix index 3a0515199b6..02fb29c5dab 100644 --- a/pkgs/shells/bash/default.nix +++ b/pkgs/shells/bash/4.1.nix @@ -34,7 +34,7 @@ stdenv.mkDerivation rec { inherit sha256; }; in - import ./bash-patches.nix patch; + import ./bash-4.1-patches.nix patch; crossAttrs = { configureFlags = baseConfigureFlags + diff --git a/pkgs/shells/bash/4.2.nix b/pkgs/shells/bash/4.2.nix new file mode 100644 index 00000000000..98fe43b0122 --- /dev/null +++ b/pkgs/shells/bash/4.2.nix @@ -0,0 +1,81 @@ +{ stdenv, fetchurl, readline ? null, interactive ? false, texinfo ? null, bison }: + +assert interactive -> readline != null; + +let + realName = "bash-4.2"; + baseConfigureFlags = if interactive then "--with-installed-readline" else "--disable-readline"; +in + +stdenv.mkDerivation rec { + name = "${realName}-p${toString (builtins.length patches)}"; + + src = fetchurl { + url = "mirror://gnu/bash/${realName}.tar.gz"; + sha256 = "a27a1179ec9c0830c65c6aa5d7dab60f7ce1a2a608618570f96bfa72e95ab3d8"; + }; + + NIX_CFLAGS_COMPILE = '' + -DSYS_BASHRC="/etc/bashrc" + -DSYS_BASH_LOGOUT="/etc/bash_logout" + -DDEFAULT_PATH_VALUE="/no-such-path" + -DSTANDARD_UTILS_PATH="/no-such-path" + -DNON_INTERACTIVE_LOGIN_SHELLS + -DSSH_SOURCE_BASHRC + ''; + + patchFlags = "-p0"; + + patches = + let + patch = nr: sha256: + fetchurl { + url = "mirror://gnu/bash/bash-4.2-patches/bash42-${nr}"; + inherit sha256; + }; + in + import ./bash-4.2-patches.nix patch; + + crossAttrs = { + configureFlags = baseConfigureFlags + + " bash_cv_job_control_missing=nomissing bash_cv_sys_named_pipes=nomissing"; + }; + + configureFlags = baseConfigureFlags; + + # Note: Bison is needed because the patches above modify parse.y. + buildNativeInputs = [bison] + ++ stdenv.lib.optional (texinfo != null) texinfo + ++ stdenv.lib.optional interactive readline; + + postInstall = '' + # Add an `sh' -> `bash' symlink. + ln -s bash "$out/bin/sh" + ''; + + meta = { + homepage = http://www.gnu.org/software/bash/; + description = + "GNU Bourne-Again Shell, the de facto standard shell on Linux" + + (if interactive then " (for interactive use)" else ""); + + longDescription = '' + Bash is the shell, or command language interpreter, that will + appear in the GNU operating system. Bash is an sh-compatible + shell that incorporates useful features from the Korn shell + (ksh) and C shell (csh). It is intended to conform to the IEEE + POSIX P1003.2/ISO 9945.2 Shell and Tools standard. It offers + functional improvements over sh for both programming and + interactive use. In addition, most sh scripts can be run by + Bash without modification. + ''; + + license = "GPLv3+"; + + maintainers = [ stdenv.lib.maintainers.ludo stdenv.lib.maintainers.simons ]; + }; + + passthru = { + shellPath = "/bin/bash"; + }; +} diff --git a/pkgs/shells/bash/bash-patches.nix b/pkgs/shells/bash/bash-4.1-patches.nix similarity index 100% rename from pkgs/shells/bash/bash-patches.nix rename to pkgs/shells/bash/bash-4.1-patches.nix diff --git a/pkgs/shells/bash/bash-4.2-patches.nix b/pkgs/shells/bash/bash-4.2-patches.nix new file mode 100644 index 00000000000..7f4957c500c --- /dev/null +++ b/pkgs/shells/bash/bash-4.2-patches.nix @@ -0,0 +1,14 @@ +# Automatically generated by `update-patch-set.sh'; do not edit. + +patch: [ +(patch "001" "0yml2b6yarrr0dzv7h45lz4126i228hvqbqacqzg4jkcawla0v4d") +(patch "002" "1yffzfxryvqns513yv3r46slkysa3nbqv40442xfxb4rw4kwkfpy") +(patch "003" "1kdl9hcpf1m7gz0ja3mvin3syprl2kmbxc3wm27391wc04apq2js") +(patch "004" "1ha0453cjqdgkns2xkdgpd2izj5b6xlsc9a2w5b3sn6j63wb0d2f") +(patch "005" "182r2iyk27l28b8kyppfavvzxhax6vn5n1zyy3yirf0463klj5x8") +(patch "006" "1labcciavnfmn0alncz1x92ydrsriikcimw24rwzmnidbaa4h4f9") +(patch "007" "15byzdqvavc3zg2lbzzdwpdy43kzdnvmr89nya211pa3yjn2cn20") +(patch "008" "0dr4p83m2xpxhvd61yny0gdlasq6r9mpyiz220998y0alq8hs213") +(patch "009" "086b9jkyjgf2zhwln72d7s5x759iskgg3r4hdrw6b5y1ni059vg7") +(patch "010" "1p23m9kssdmpnjfp96bjmmshzf25cdzlyjygdw8j6sayqa159z5c") +] diff --git a/pkgs/shells/bash/update-patch-set.sh b/pkgs/shells/bash/update-patch-set.sh index ded684571b0..003c7a26d20 100755 --- a/pkgs/shells/bash/update-patch-set.sh +++ b/pkgs/shells/bash/update-patch-set.sh @@ -16,7 +16,7 @@ VERSION="$2" VERSION_CONDENSED="$(echo $VERSION | sed -es/\\.//g)" GPG="$(if $(type -P gpg2 > /dev/null); then echo gpg2; else echo gpg; fi)" -PATCH_LIST="$PROJECT-patches.nix" +PATCH_LIST="$PROJECT-$VERSION-patches.nix" set -e diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index f544c06b545..e9a15a34301 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -1596,11 +1596,11 @@ let ### SHELLS - bash = lowPrio (callPackage ../shells/bash { + bash = lowPrio (callPackage ../shells/bash/4.1.nix { texinfo = null; }); - bashInteractive = appendToName "interactive" (callPackage ../shells/bash { + bashInteractive = appendToName "interactive" (callPackage ../shells/bash/4.2.nix { interactive = true; });