Author: eelco
Date: Thu Jul 22 13:18:07 2010
New Revision: 22707
URL: https://svn.nixos.org/websvn/nix/?rev=22707&sc=1
Log:
* Sync with the trunk.
Added:
nixpkgs/branches/x-updates/pkgs/applications/editors/emacs-modes/org/
- copied from r22706,
nixpkgs/trunk/pkgs/applications/editors/emacs-modes/org/
nixpkgs/branches/x-updates/pkgs/applications/science/misc/vite/larger-line-buffer.patch
- copied unchanged from r22706,
nixpkgs/trunk/pkgs/applications/science/misc/vite/larger-line-buffer.patch
nixpkgs/branches/x-updates/pkgs/development/libraries/clutter/
- copied from r22706, nixpkgs/trunk/pkgs/development/libraries/clutter/
nixpkgs/branches/x-updates/pkgs/development/libraries/clutter-gtk/
- copied from r22706,
nixpkgs/trunk/pkgs/development/libraries/clutter-gtk/
nixpkgs/branches/x-updates/pkgs/development/libraries/haskell/MonadCatchIO-transformers/
- copied from r22706,
nixpkgs/trunk/pkgs/development/libraries/haskell/MonadCatchIO-transformers/
nixpkgs/branches/x-updates/pkgs/development/libraries/haskell/blaze-html/
- copied from r22706,
nixpkgs/trunk/pkgs/development/libraries/haskell/blaze-html/
nixpkgs/branches/x-updates/pkgs/development/libraries/haskell/cereal/
- copied from r22706,
nixpkgs/trunk/pkgs/development/libraries/haskell/cereal/
nixpkgs/branches/x-updates/pkgs/development/libraries/haskell/hamlet/
- copied from r22706,
nixpkgs/trunk/pkgs/development/libraries/haskell/hamlet/
nixpkgs/branches/x-updates/pkgs/development/libraries/haskell/persistent/
- copied from r22706,
nixpkgs/trunk/pkgs/development/libraries/haskell/persistent/
nixpkgs/branches/x-updates/pkgs/development/libraries/haskell/web-routes/
- copied from r22706,
nixpkgs/trunk/pkgs/development/libraries/haskell/web-routes/
nixpkgs/branches/x-updates/pkgs/development/libraries/haskell/web-routes-quasi/
- copied from r22706,
nixpkgs/trunk/pkgs/development/libraries/haskell/web-routes-quasi/
nixpkgs/branches/x-updates/pkgs/development/libraries/libchamplain/
- copied from r22706,
nixpkgs/trunk/pkgs/development/libraries/libchamplain/
nixpkgs/branches/x-updates/pkgs/tools/archivers/cpio/darwin-fix.patch
- copied unchanged from r22706,
nixpkgs/trunk/pkgs/tools/archivers/cpio/darwin-fix.patch
nixpkgs/branches/x-updates/pkgs/tools/networking/p2p/seeks/
- copied from r22706, nixpkgs/trunk/pkgs/tools/networking/p2p/seeks/
Replaced:
nixpkgs/branches/x-updates/pkgs/applications/editors/emacs-modes/org/default.nix
- copied unchanged from r22706,
nixpkgs/trunk/pkgs/applications/editors/emacs-modes/org/default.nix
nixpkgs/branches/x-updates/pkgs/development/libraries/clutter-gtk/default.nix
- copied unchanged from r22706,
nixpkgs/trunk/pkgs/development/libraries/clutter-gtk/default.nix
nixpkgs/branches/x-updates/pkgs/development/libraries/clutter/default.nix
- copied unchanged from r22706,
nixpkgs/trunk/pkgs/development/libraries/clutter/default.nix
nixpkgs/branches/x-updates/pkgs/development/libraries/haskell/MonadCatchIO-transformers/default.nix
- copied unchanged from r22706,
nixpkgs/trunk/pkgs/development/libraries/haskell/MonadCatchIO-transformers/default.nix
nixpkgs/branches/x-updates/pkgs/development/libraries/haskell/blaze-html/default.nix
- copied unchanged from r22706,
nixpkgs/trunk/pkgs/development/libraries/haskell/blaze-html/default.nix
nixpkgs/branches/x-updates/pkgs/development/libraries/haskell/cereal/default.nix
- copied unchanged from r22706,
nixpkgs/trunk/pkgs/development/libraries/haskell/cereal/default.nix
nixpkgs/branches/x-updates/pkgs/development/libraries/haskell/hamlet/default.nix
- copied unchanged from r22706,
nixpkgs/trunk/pkgs/development/libraries/haskell/hamlet/default.nix
nixpkgs/branches/x-updates/pkgs/development/libraries/haskell/persistent/default.nix
- copied unchanged from r22706,
nixpkgs/trunk/pkgs/development/libraries/haskell/persistent/default.nix
nixpkgs/branches/x-updates/pkgs/development/libraries/haskell/web-routes-quasi/default.nix
- copied unchanged from r22706,
nixpkgs/trunk/pkgs/development/libraries/haskell/web-routes-quasi/default.nix
nixpkgs/branches/x-updates/pkgs/development/libraries/haskell/web-routes/default.nix
- copied unchanged from r22706,
nixpkgs/trunk/pkgs/development/libraries/haskell/web-routes/default.nix
nixpkgs/branches/x-updates/pkgs/development/libraries/libchamplain/default.nix
- copied unchanged from r22706,
nixpkgs/trunk/pkgs/development/libraries/libchamplain/default.nix
nixpkgs/branches/x-updates/pkgs/tools/networking/p2p/seeks/default.nix
- copied unchanged from r22706,
nixpkgs/trunk/pkgs/tools/networking/p2p/seeks/default.nix
Modified:
nixpkgs/branches/x-updates/ (props changed)
nixpkgs/branches/x-updates/pkgs/applications/editors/emacs-modes/haskell/default.nix
nixpkgs/branches/x-updates/pkgs/applications/graphics/geeqie/default.nix
nixpkgs/branches/x-updates/pkgs/applications/graphics/xscreensaver/default.nix
(props changed)
nixpkgs/branches/x-updates/pkgs/applications/misc/xneur/0.8.nix (props
changed)
nixpkgs/branches/x-updates/pkgs/applications/networking/browsers/firefox/3.6.nix
nixpkgs/branches/x-updates/pkgs/applications/networking/browsers/mozilla-plugins/flashplayer-10/
(props changed)
nixpkgs/branches/x-updates/pkgs/applications/networking/mailreaders/thunderbird/3.x.nix
nixpkgs/branches/x-updates/pkgs/applications/science/misc/vite/default.nix
nixpkgs/branches/x-updates/pkgs/applications/window-managers/compiz-fusion/bcop/0.7.8.nix
(props changed)
nixpkgs/branches/x-updates/pkgs/applications/window-managers/compiz-fusion/ccsm-simple/0.7.8.nix
(props changed)
nixpkgs/branches/x-updates/pkgs/applications/window-managers/compiz-fusion/ccsm/0.7.8.nix
(props changed)
nixpkgs/branches/x-updates/pkgs/applications/window-managers/compiz-fusion/compizconfig-python/0.7.8.nix
(props changed)
nixpkgs/branches/x-updates/pkgs/applications/window-managers/compiz-fusion/config-backend/0.7.8.nix
(props changed)
nixpkgs/branches/x-updates/pkgs/applications/window-managers/compiz-fusion/extra/0.7.8.nix
(props changed)
nixpkgs/branches/x-updates/pkgs/applications/window-managers/compiz-fusion/libcompizconfig/0.7.8.nix
(props changed)
nixpkgs/branches/x-updates/pkgs/applications/window-managers/compiz-fusion/main/0.7.8.nix
(props changed)
nixpkgs/branches/x-updates/pkgs/build-support/gcc-wrapper/ (props changed)
nixpkgs/branches/x-updates/pkgs/build-support/release/debian-build.nix
(props changed)
nixpkgs/branches/x-updates/pkgs/build-support/release/nix-build.nix (props
changed)
nixpkgs/branches/x-updates/pkgs/build-support/release/rpm-build.nix (props
changed)
nixpkgs/branches/x-updates/pkgs/build-support/release/source-tarball.nix
(props changed)
nixpkgs/branches/x-updates/pkgs/build-support/vm/default.nix
nixpkgs/branches/x-updates/pkgs/development/compilers/ghc/6.10.1.nix
(props changed)
nixpkgs/branches/x-updates/pkgs/development/compilers/ghc/6.10.2.nix
(props changed)
nixpkgs/branches/x-updates/pkgs/development/compilers/ghc/6.8.2.nix (props
changed)
nixpkgs/branches/x-updates/pkgs/development/compilers/ghc/6.8.3.nix (props
changed)
nixpkgs/branches/x-updates/pkgs/development/libraries/aterm/2.8.nix (props
changed)
nixpkgs/branches/x-updates/pkgs/development/libraries/fltk/fltk11.nix
(props changed)
nixpkgs/branches/x-updates/pkgs/development/libraries/glibc-2.9/ (props
changed)
nixpkgs/branches/x-updates/pkgs/development/libraries/goocanvas/ (props
changed)
nixpkgs/branches/x-updates/pkgs/development/libraries/haskell/transformers/default.nix
nixpkgs/branches/x-updates/pkgs/development/libraries/libevent/default.nix
nixpkgs/branches/x-updates/pkgs/development/libraries/pcre/default.nix
(props changed)
nixpkgs/branches/x-updates/pkgs/development/libraries/readline/readline6.nix
(props changed)
nixpkgs/branches/x-updates/pkgs/development/tools/documentation/haddock/haddock-2.1.0.nix
(props changed)
nixpkgs/branches/x-updates/pkgs/development/tools/misc/autoconf/2.13.nix
(props changed)
nixpkgs/branches/x-updates/pkgs/development/tools/misc/gnum4/default.nix
(props changed)
nixpkgs/branches/x-updates/pkgs/lib/meta.nix
nixpkgs/branches/x-updates/pkgs/misc/tex/pgf/1.x.nix (props changed)
nixpkgs/branches/x-updates/pkgs/misc/tex/pgf/2.x.nix (props changed)
nixpkgs/branches/x-updates/pkgs/os-specific/linux/atheros/r3837.nix (props
changed)
nixpkgs/branches/x-updates/pkgs/os-specific/linux/atheros/r3867.nix (props
changed)
nixpkgs/branches/x-updates/pkgs/os-specific/linux/kernel-headers/2.6.28.nix
(props changed)
nixpkgs/branches/x-updates/pkgs/os-specific/linux/kernel-headers/2.6.32.nix
(props changed)
nixpkgs/branches/x-updates/pkgs/os-specific/linux/kernel/generic.nix
(props changed)
nixpkgs/branches/x-updates/pkgs/os-specific/linux/kernel/linux-2.6.25.nix
(props changed)
nixpkgs/branches/x-updates/pkgs/os-specific/linux/kernel/linux-2.6.27.nix
(props changed)
nixpkgs/branches/x-updates/pkgs/os-specific/linux/kernel/linux-2.6.28.nix
(props changed)
nixpkgs/branches/x-updates/pkgs/os-specific/linux/kernel/linux-2.6.29.nix
(props changed)
nixpkgs/branches/x-updates/pkgs/os-specific/linux/kernel/linux-2.6.32.nix
(props changed)
nixpkgs/branches/x-updates/pkgs/os-specific/linux/kernel/linux-2.6.33.nix
(props changed)
nixpkgs/branches/x-updates/pkgs/os-specific/linux/kqemu/1.4.0pre1.nix
(props changed)
nixpkgs/branches/x-updates/pkgs/os-specific/linux/kvm/76.nix (props
changed)
nixpkgs/branches/x-updates/pkgs/os-specific/linux/kvm/86.nix (props
changed)
nixpkgs/branches/x-updates/pkgs/os-specific/linux/qemu-kvm/default.nix
(props changed)
nixpkgs/branches/x-updates/pkgs/os-specific/linux/util-linux-ng/ (props
changed)
nixpkgs/branches/x-updates/pkgs/servers/dico/default.nix
nixpkgs/branches/x-updates/pkgs/servers/mail/dovecot/1.1.1.nix (props
changed)
nixpkgs/branches/x-updates/pkgs/servers/sql/mysql/jdbc/default.nix
nixpkgs/branches/x-updates/pkgs/shells/bash/default.nix (props changed)
nixpkgs/branches/x-updates/pkgs/stdenv/generic/setup.sh (props changed)
nixpkgs/branches/x-updates/pkgs/stdenv/linux/make-bootstrap-tools.nix
(props changed)
nixpkgs/branches/x-updates/pkgs/tools/archivers/cpio/default.nix
nixpkgs/branches/x-updates/pkgs/tools/networking/wget/default.nix (props
changed)
nixpkgs/branches/x-updates/pkgs/top-level/all-packages.nix
nixpkgs/branches/x-updates/pkgs/top-level/haskell-packages.nix
Modified:
nixpkgs/branches/x-updates/pkgs/applications/editors/emacs-modes/haskell/default.nix
==============================================================================
---
nixpkgs/branches/x-updates/pkgs/applications/editors/emacs-modes/haskell/default.nix
Thu Jul 22 12:59:12 2010 (r22706)
+++
nixpkgs/branches/x-updates/pkgs/applications/editors/emacs-modes/haskell/default.nix
Thu Jul 22 13:18:07 2010 (r22707)
@@ -1,11 +1,11 @@
{stdenv, fetchurl, emacs}:
stdenv.mkDerivation rec {
- name = "haskell-mode-2.6.1";
+ name = "haskell-mode-2.7.0";
src = fetchurl {
url = "http://projects.haskell.org/haskellmode-emacs/${name}.tar.gz";;
- sha256 =
"cc33fd0d4692667a6eb56fea3dc549de3897d8dbb7b71818489760f45d564a76";
+ sha256 =
"8b45c55ed5f2b498529a6d7e01b77fea899c1de93e24653cab188cb3a4f495bc";
};
buildInputs = [emacs];
Copied:
nixpkgs/branches/x-updates/pkgs/applications/editors/emacs-modes/org/default.nix
(from r22706,
nixpkgs/trunk/pkgs/applications/editors/emacs-modes/org/default.nix)
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++
nixpkgs/branches/x-updates/pkgs/applications/editors/emacs-modes/org/default.nix
Thu Jul 22 13:18:07 2010 (r22707, copy of r22706,
nixpkgs/trunk/pkgs/applications/editors/emacs-modes/org/default.nix)
@@ -0,0 +1,41 @@
+{ fetchurl, stdenv, emacs, texinfo }:
+
+stdenv.mkDerivation rec {
+ name = "org-7.01f";
+
+ src = fetchurl {
+ url = "http://orgmode.org/${name}.tar.gz";;
+ sha256 = "1db7s57g8gh8w0464n18lxpcz270x9ns63b2blhkz8wrdnk57fia";
+ };
+
+ buildInputs = [ emacs texinfo ];
+
+ configurePhase =
+ '' sed -i Makefile \
+ -e "s|^prefix=.*$|prefix=$out|g"
+ '';
+
+ installPhase =
+ '' make install install-info
+
+ ensureDir "$out/share/doc/${name}"
+ cp -v doc/orgcard*.{pdf,txt} "$out/share/doc/${name}"
+ '';
+
+ meta = {
+ description = "Org-Mode, an Emacs mode for notes, project planning, and
authoring";
+
+ longDescription =
+ '' Org-mode is for keeping notes, maintaining ToDo lists, doing project
+ planning, and authoring with a fast and effective plain-text system.
+
+ This package contains a version of Org-mode typically more recent
+ than that found in GNU Emacs.
+ '';
+
+ license = "GPLv3+";
+
+ maintainers = [ stdenv.lib.maintainers.ludo ];
+ platforms = stdenv.lib.platforms.gnu; # arbitrary choice
+ };
+}
Modified:
nixpkgs/branches/x-updates/pkgs/applications/graphics/geeqie/default.nix
==============================================================================
--- nixpkgs/branches/x-updates/pkgs/applications/graphics/geeqie/default.nix
Thu Jul 22 12:59:12 2010 (r22706)
+++ nixpkgs/branches/x-updates/pkgs/applications/graphics/geeqie/default.nix
Thu Jul 22 13:18:07 2010 (r22707)
@@ -1,5 +1,5 @@
{ stdenv, fetchurl, pkgconfig, gtk, libpng, exiv2, lcms
-, intltool, gettext }:
+, intltool, gettext, libchamplain }:
stdenv.mkDerivation rec {
name = "geeqie-1.0";
@@ -9,7 +9,19 @@
sha256 = "1p8z47cqdqqkn8b0fr5bqsfinz4dgqk4353s8f8d9ha6cik69bfi";
};
- buildInputs = [ pkgconfig gtk libpng exiv2 lcms intltool gettext ];
+ preConfigure =
+ # XXX: Trick to have Geeqie use the version we have.
+ '' sed -i "configure" \
+ -e 's/champlain-0.4/champlain-0.6/g ;
+ s/champlain-gtk-0.4/champlain-gtk-0.6/g'
+ '';
+
+ configureFlags = [ "--enable-gps" ];
+
+ buildInputs =
+ [ pkgconfig gtk libpng exiv2 lcms intltool gettext
+ libchamplain
+ ];
meta = {
description = "Geeqie, a lightweight GTK+ based image viewer";
Modified:
nixpkgs/branches/x-updates/pkgs/applications/networking/browsers/firefox/3.6.nix
==============================================================================
---
nixpkgs/branches/x-updates/pkgs/applications/networking/browsers/firefox/3.6.nix
Thu Jul 22 12:59:12 2010 (r22706)
+++
nixpkgs/branches/x-updates/pkgs/applications/networking/browsers/firefox/3.6.nix
Thu Jul 22 13:18:07 2010 (r22707)
@@ -12,14 +12,14 @@
rec {
- firefoxVersion = "3.6.6";
+ firefoxVersion = "3.6.7";
- xulVersion = "1.9.2.6"; # this attribute is used by other packages
+ xulVersion = "1.9.2.7"; # this attribute is used by other packages
src = fetchurl {
url =
"http://releases.mozilla.org/pub/mozilla.org/firefox/releases/${firefoxVersion}/source/firefox-${firefoxVersion}.source.tar.bz2";;
- sha256 = "1cq6mg4p8x6hxxya12wlh1c5m6prvb7wpgnnrm8lys20z5qp5f2r";
+ sha1 = "12c584a63ea6ddbb9253094ad500bc6b046903a6";
};
Modified:
nixpkgs/branches/x-updates/pkgs/applications/networking/mailreaders/thunderbird/3.x.nix
==============================================================================
---
nixpkgs/branches/x-updates/pkgs/applications/networking/mailreaders/thunderbird/3.x.nix
Thu Jul 22 12:59:12 2010 (r22706)
+++
nixpkgs/branches/x-updates/pkgs/applications/networking/mailreaders/thunderbird/3.x.nix
Thu Jul 22 13:18:07 2010 (r22707)
@@ -11,14 +11,14 @@
}:
-let version = "3.1"; in
+let version = "3.1.1"; in
stdenv.mkDerivation {
name = "thunderbird-${version}";
src = fetchurl {
url =
"http://releases.mozilla.org/pub/mozilla.org/thunderbird/releases/${version}/source/thunderbird-${version}.source.tar.bz2";;
- sha1 = "89e9d8099a5437ce401577fc4d526eb0dd9e51da";
+ sha1 = "8e25fd786fbe094c3f4d9bc4e18285701bd42279";
};
buildInputs =
Modified:
nixpkgs/branches/x-updates/pkgs/applications/science/misc/vite/default.nix
==============================================================================
--- nixpkgs/branches/x-updates/pkgs/applications/science/misc/vite/default.nix
Thu Jul 22 12:59:12 2010 (r22706)
+++ nixpkgs/branches/x-updates/pkgs/applications/science/misc/vite/default.nix
Thu Jul 22 13:18:07 2010 (r22707)
@@ -1,13 +1,30 @@
-{ fetchurl, stdenv, cmake, qt, mesa }:
+{ fetchsvn, stdenv, cmake, qt, mesa }:
+# ViTE 1.1 has several bugs, so use the SVN version.
+let
+ rev = "1143";
+ externals = fetchsvn {
+ url = "svn://scm.gforge.inria.fr/svn/vite/externals";
+ sha256 = "0wg3yh5q8gx7189rvkd8achld7bzp0i7qqn6c77pg767b4b8dh1a";
+ inherit rev;
+ };
+in
stdenv.mkDerivation {
- name = "vite-1.1";
+ name = "vite-1.2pre${rev}";
- src = fetchurl {
- url = "https://gforge.inria.fr/frs/download.php/26321/vite_1005.tar.gz";;
- sha256 = "11l39809i1hjizw89x23d6m246w7a64z11bhrx7q5h0scvwd1imr";
+ src = fetchsvn {
+ url = "svn://scm.gforge.inria.fr/svn/vite/trunk";
+ sha256 = "0cy9b6isiwqwnv9gk0cg97x370fpwyccljadds4a118k5gh58zw4";
+ inherit rev;
};
+ preConfigure =
+ '' rm -v externals
+ ln -sv "${externals}" externals
+ '';
+
+ patches = [ ./larger-line-buffer.patch ];
+
buildInputs = [ cmake qt mesa ];
NIX_LDFLAGS = "-lGLU";
Copied:
nixpkgs/branches/x-updates/pkgs/applications/science/misc/vite/larger-line-buffer.patch
(from r22706,
nixpkgs/trunk/pkgs/applications/science/misc/vite/larger-line-buffer.patch)
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++
nixpkgs/branches/x-updates/pkgs/applications/science/misc/vite/larger-line-buffer.patch
Thu Jul 22 13:18:07 2010 (r22707, copy of r22706,
nixpkgs/trunk/pkgs/applications/science/misc/vite/larger-line-buffer.patch)
@@ -0,0 +1,14 @@
+ViTE has an arbitrary restriction on the length of lines read by the parser.
+Make it larger.
+
+--- a/src/parser/PajeFileManager.hpp
++++ b/src/parser/PajeFileManager.hpp
+@@ -67,7 +67,7 @@
+
+ #include <string.h>
+
+-#define _PAJE_BUFSIZE 256
++#define _PAJE_BUFSIZE 16384
+ #define _PAJE_NBMAXTKS 16
+
+ /**
Modified: nixpkgs/branches/x-updates/pkgs/build-support/vm/default.nix
==============================================================================
--- nixpkgs/branches/x-updates/pkgs/build-support/vm/default.nix Thu Jul
22 12:59:12 2010 (r22706)
+++ nixpkgs/branches/x-updates/pkgs/build-support/vm/default.nix Thu Jul
22 13:18:07 2010 (r22707)
@@ -1108,22 +1108,22 @@
};
debian50i386 = {
- name = "debian-5.0.4-lenny-i386";
- fullName = "Debian 5.0.4 Lenny (i386)";
+ name = "debian-5.0.5-lenny-i386";
+ fullName = "Debian 5.0.5 Lenny (i386)";
packagesList = fetchurl {
url = mirror://debian/dists/lenny/main/binary-i386/Packages.bz2;
- sha256 =
"6c5ca67fb401a5d29f02557c290bbaee35c457172d548583b510d49eadd0f9ff";
+ sha256 =
"cd8158a16c1d3990d35116dfe88005fe685102f591268f8588d3222a02a11339";
};
urlPrefix = mirror://debian;
packages = commonDebianPackages;
};
debian50x86_64 = {
- name = "debian-5.0.4-lenny-amd64";
- fullName = "Debian 5.0.4 Lenny (amd64)";
+ name = "debian-5.0.5-lenny-amd64";
+ fullName = "Debian 5.0.5 Lenny (amd64)";
packagesList = fetchurl {
url = mirror://debian/dists/lenny/main/binary-amd64/Packages.bz2;
- sha256 =
"c3b660b861ed257e82293a350ab868c2ce566bc084d35cc66b7388a881eaf3c5";
+ sha256 =
"aceb161a534a641c205fca7eabb27d60180c0616104be49562a0997a44571c42";
};
urlPrefix = mirror://debian;
packages = commonDebianPackages;
Copied:
nixpkgs/branches/x-updates/pkgs/development/libraries/clutter-gtk/default.nix
(from r22706, nixpkgs/trunk/pkgs/development/libraries/clutter-gtk/default.nix)
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++
nixpkgs/branches/x-updates/pkgs/development/libraries/clutter-gtk/default.nix
Thu Jul 22 13:18:07 2010 (r22707, copy of r22706,
nixpkgs/trunk/pkgs/development/libraries/clutter-gtk/default.nix)
@@ -0,0 +1,25 @@
+{ fetchurl, stdenv, pkgconfig, clutter, gtk }:
+
+stdenv.mkDerivation rec {
+ name = "clutter-gtk-0.10.2";
+
+ src = fetchurl {
+ url =
"http://source.clutter-project.org/sources/clutter-gtk/0.10/${name}.tar.bz2";;
+ sha256 = "1jdhhqin4wi8gk6i1m701vrhm6lrvywq3q3yy88ph8yj8h6z4any";
+ };
+
+ buildInputs = [ pkgconfig clutter gtk ];
+
+ preConfigure = "export V=1";
+
+ meta = {
+ description = "Clutter-GTK";
+
+ homepage = http://www.clutter-project.org/;
+
+ license = "LGPLv2+";
+
+ maintainers = [ stdenv.lib.maintainers.ludo ];
+ platforms = stdenv.lib.platforms.gnu; # arbitrary choice
+ };
+}
Copied:
nixpkgs/branches/x-updates/pkgs/development/libraries/clutter/default.nix (from
r22706, nixpkgs/trunk/pkgs/development/libraries/clutter/default.nix)
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ nixpkgs/branches/x-updates/pkgs/development/libraries/clutter/default.nix
Thu Jul 22 13:18:07 2010 (r22707, copy of r22706,
nixpkgs/trunk/pkgs/development/libraries/clutter/default.nix)
@@ -0,0 +1,44 @@
+{ fetchurl, stdenv, pkgconfig, mesa, libXi, libXfixes, libXdamage
+, libXcomposite, cairo, glib, pango, gtk }:
+
+stdenv.mkDerivation rec {
+ name = "clutter-1.2.10";
+
+ src = fetchurl {
+ url =
"http://source.clutter-project.org/sources/clutter/1.2/${name}.tar.gz";;
+ sha256 = "0bdnj026lqmwpgml73q4r0v90gsksjz0nv2fgjda9619bzx47igi";
+ };
+
+ buildInputs = [ pkgconfig ];
+
+ # There are all listed in the `Requires' field of `clutter-x11-1.0.pc'.
+ propagatedBuildInputs =
+ [ mesa cairo glib pango gtk
+ libXi libXfixes libXdamage libXcomposite
+ ];
+
+
+ meta = {
+ description = "Clutter, a library for creating fast, dynamic graphical
user interfaces";
+
+ longDescription =
+ '' Clutter is free software library for creating fast, compelling,
+ portable, and dynamic graphical user interfaces. It is a core part
+ of MeeGo, and is supported by the open source community. Its
+ development is sponsored by Intel.
+
+ Clutter uses OpenGL for rendering (and optionally OpenGL|ES for use
+ on mobile and embedded platforms), but wraps an easy to use,
+ efficient, flexible API around GL's complexity.
+
+ Clutter enforces no particular user interface style, but provides a
+ rich, generic foundation for higher-level toolkits tailored to
+ specific needs.
+ '';
+
+ license = "LGPLv2+";
+
+ maintainers = [ stdenv.lib.maintainers.ludo ];
+ platforms = stdenv.lib.platforms.gnu; # arbitrary choice
+ };
+}
Copied:
nixpkgs/branches/x-updates/pkgs/development/libraries/haskell/MonadCatchIO-transformers/default.nix
(from r22706,
nixpkgs/trunk/pkgs/development/libraries/haskell/MonadCatchIO-transformers/default.nix)
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++
nixpkgs/branches/x-updates/pkgs/development/libraries/haskell/MonadCatchIO-transformers/default.nix
Thu Jul 22 13:18:07 2010 (r22707, copy of r22706,
nixpkgs/trunk/pkgs/development/libraries/haskell/MonadCatchIO-transformers/default.nix)
@@ -0,0 +1,12 @@
+{cabal, transformers, extensibleExceptions} :
+
+cabal.mkDerivation (self : {
+ pname = "MonadCatchIO-transformers";
+ version = "0.2.2.0";
+ sha256 = "7f3b45ac01ac98476d1305333435005a6876e5c04c562e94ad2426ee7ab6936d";
+ propagatedBuildInputs = [transformers extensibleExceptions];
+ meta = {
+ description = "Monad-transformer compatible version of the
Control.Exception module";
+ };
+})
+
Copied:
nixpkgs/branches/x-updates/pkgs/development/libraries/haskell/blaze-html/default.nix
(from r22706,
nixpkgs/trunk/pkgs/development/libraries/haskell/blaze-html/default.nix)
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++
nixpkgs/branches/x-updates/pkgs/development/libraries/haskell/blaze-html/default.nix
Thu Jul 22 13:18:07 2010 (r22707, copy of r22706,
nixpkgs/trunk/pkgs/development/libraries/haskell/blaze-html/default.nix)
@@ -0,0 +1,13 @@
+{cabal, text}:
+
+cabal.mkDerivation (self : {
+ pname = "blaze-html";
+ version = "0.1.2";
+ sha256 = "c1e65e3d23e90a3830ceee69ecfac65c7a8a045da06443fb7690609a59480f5f";
+ propagatedBuildInputs = [text];
+ meta = {
+ description = "A blazingly fast HTML combinator library";
+ license = "BSD";
+ maintainers = [self.stdenv.lib.maintainers.andres];
+ };
+})
Copied:
nixpkgs/branches/x-updates/pkgs/development/libraries/haskell/cereal/default.nix
(from r22706,
nixpkgs/trunk/pkgs/development/libraries/haskell/cereal/default.nix)
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++
nixpkgs/branches/x-updates/pkgs/development/libraries/haskell/cereal/default.nix
Thu Jul 22 13:18:07 2010 (r22707, copy of r22706,
nixpkgs/trunk/pkgs/development/libraries/haskell/cereal/default.nix)
@@ -0,0 +1,12 @@
+{cabal}:
+
+cabal.mkDerivation (self : {
+ pname = "cereal";
+ version = "0.2";
+ sha256 = "aa00eb88cea5616a0eb9e4b6604cb164b8bef6e86b111cbb67d51d4d3441332b";
+ meta = {
+ description = "A binary serialization library";
+ license = "BSD";
+ maintainers = [self.stdenv.lib.maintainers.andres];
+ };
+})
Copied:
nixpkgs/branches/x-updates/pkgs/development/libraries/haskell/hamlet/default.nix
(from r22706,
nixpkgs/trunk/pkgs/development/libraries/haskell/hamlet/default.nix)
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++
nixpkgs/branches/x-updates/pkgs/development/libraries/haskell/hamlet/default.nix
Thu Jul 22 13:18:07 2010 (r22707, copy of r22706,
nixpkgs/trunk/pkgs/development/libraries/haskell/hamlet/default.nix)
@@ -0,0 +1,13 @@
+{cabal, blazeHtml, parsec, utf8String}:
+
+cabal.mkDerivation (self : {
+ pname = "hamlet";
+ version = "0.4.0";
+ sha256 = "5e05879e734fc193acc48eda48dadbf53659e937543068bcc77dc7c394f6adcd";
+ propagatedBuildInputs = [blazeHtml parsec utf8String];
+ meta = {
+ description = "Haml-like template files that are compile-time checked";
+ license = "BSD";
+ maintainers = [self.stdenv.lib.maintainers.andres];
+ };
+})
Copied:
nixpkgs/branches/x-updates/pkgs/development/libraries/haskell/persistent/default.nix
(from r22706,
nixpkgs/trunk/pkgs/development/libraries/haskell/persistent/default.nix)
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++
nixpkgs/branches/x-updates/pkgs/development/libraries/haskell/persistent/default.nix
Thu Jul 22 13:18:07 2010 (r22707, copy of r22706,
nixpkgs/trunk/pkgs/development/libraries/haskell/persistent/default.nix)
@@ -0,0 +1,17 @@
+{cabal, blazeHtml, MonadCatchIOTransformers, parsec, text, transformers,
+ utf8String, webRoutesQuasi}:
+
+cabal.mkDerivation (self : {
+ pname = "persistent";
+ version = "0.1.0";
+ sha256 = "32379f5ef937da1bf910cfaf9b6cce6326b8fba7554ef81159e6684c7ce2ca45";
+ propagatedBuildInputs = [
+ blazeHtml MonadCatchIOTransformers parsec text transformers
+ utf8String webRoutesQuasi
+ ];
+ meta = {
+ description = "Type-safe, non-relational, multi-backend persistence";
+ license = "BSD";
+ maintainers = [self.stdenv.lib.maintainers.andres];
+ };
+})
Modified:
nixpkgs/branches/x-updates/pkgs/development/libraries/haskell/transformers/default.nix
==============================================================================
---
nixpkgs/branches/x-updates/pkgs/development/libraries/haskell/transformers/default.nix
Thu Jul 22 12:59:12 2010 (r22706)
+++
nixpkgs/branches/x-updates/pkgs/development/libraries/haskell/transformers/default.nix
Thu Jul 22 13:18:07 2010 (r22707)
@@ -2,10 +2,10 @@
cabal.mkDerivation (self : {
pname = "transformers";
- version = "0.1.4.0";
- sha256 = "6d222d1cbed75063753a7c828d7f429f24974d261872c7b70fe90a003c93646d";
+ version = "0.2.1.0";
+ sha256 = "1ff9768e60130810e888452b6052d64998d0651fe2835902f032d8f8182a2c6d";
meta = {
- description = "Concrete monad transformers";
+ description = "Concrete functor and monad transformers";
};
})
Copied:
nixpkgs/branches/x-updates/pkgs/development/libraries/haskell/web-routes-quasi/default.nix
(from r22706,
nixpkgs/trunk/pkgs/development/libraries/haskell/web-routes-quasi/default.nix)
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++
nixpkgs/branches/x-updates/pkgs/development/libraries/haskell/web-routes-quasi/default.nix
Thu Jul 22 13:18:07 2010 (r22707, copy of r22706,
nixpkgs/trunk/pkgs/development/libraries/haskell/web-routes-quasi/default.nix)
@@ -0,0 +1,13 @@
+{cabal, webRoutes}:
+
+cabal.mkDerivation (self : {
+ pname = "web-routes-quasi";
+ version = "0.5.0";
+ sha256 = "07ef2717b44f92bccee9af4b4d9a173c12ec3b3b1d49a8495811dad0af240673";
+ propagatedBuildInputs = [webRoutes];
+ meta = {
+ description = "Define data types and parse/build functions for web-routes
via a quasi-quoted DSL";
+ license = "BSD";
+ maintainers = [self.stdenv.lib.maintainers.andres];
+ };
+})
Copied:
nixpkgs/branches/x-updates/pkgs/development/libraries/haskell/web-routes/default.nix
(from r22706,
nixpkgs/trunk/pkgs/development/libraries/haskell/web-routes/default.nix)
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++
nixpkgs/branches/x-updates/pkgs/development/libraries/haskell/web-routes/default.nix
Thu Jul 22 13:18:07 2010 (r22707, copy of r22706,
nixpkgs/trunk/pkgs/development/libraries/haskell/web-routes/default.nix)
@@ -0,0 +1,13 @@
+{cabal, network, parsec, utf8String}:
+
+cabal.mkDerivation (self : {
+ pname = "web-routes";
+ version = "0.22.0";
+ sha256 = "6482ecba585cf7b1f32c29bfd5cb6f5e06dba72231e38ae5baa15b6b95f7c6c8";
+ propagatedBuildInputs = [network parsec utf8String];
+ meta = {
+ description = "Library for maintaining correctness and composability of
URLs within an application";
+ license = "BSD";
+ maintainers = [self.stdenv.lib.maintainers.andres];
+ };
+})
Copied:
nixpkgs/branches/x-updates/pkgs/development/libraries/libchamplain/default.nix
(from r22706, nixpkgs/trunk/pkgs/development/libraries/libchamplain/default.nix)
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++
nixpkgs/branches/x-updates/pkgs/development/libraries/libchamplain/default.nix
Thu Jul 22 13:18:07 2010 (r22707, copy of r22706,
nixpkgs/trunk/pkgs/development/libraries/libchamplain/default.nix)
@@ -0,0 +1,35 @@
+{ fetchurl, stdenv, pkgconfig, glib, gtk, cairo, clutter, sqlite
+, clutter_gtk, libsoup /*, libmenphis */ }:
+
+stdenv.mkDerivation rec {
+ name = "libchamplain-0.6.1";
+
+ src = fetchurl {
+ url = "http://download.gnome.org/sources/libchamplain/0.6/${name}.tar.gz";;
+ sha256 = "1l1in4khnral157j46aq2d26nviz23icnm353587vcwjhdbw86sg";
+ };
+
+ buildInputs = [ pkgconfig ];
+
+ # These all appear in `champlain{,-gtk}-0.6.pc'.
+ propagatedBuildInputs =
+ [ glib gtk cairo clutter clutter_gtk sqlite libsoup ];
+
+ meta = {
+ homepage = http://projects.gnome.org/libchamplain/;
+ license = "LGPLv2+";
+
+ description = "libchamplain, a C library providing a ClutterActor to
display maps";
+
+ longDescription =
+ '' libchamplain is a C library providing a ClutterActor to display
+ maps. It also provides a Gtk+ widget to display maps in Gtk+
+ applications. Python and Perl bindings are also available. It
+ supports numerous free map sources such as OpenStreetMap,
+ OpenCycleMap, OpenAerialMap, and Maps for free.
+ '';
+
+ maintainers = [ stdenv.lib.maintainers.ludo ];
+ platforms = stdenv.lib.platforms.gnu; # arbitrary choice
+ };
+}
Modified:
nixpkgs/branches/x-updates/pkgs/development/libraries/libevent/default.nix
==============================================================================
--- nixpkgs/branches/x-updates/pkgs/development/libraries/libevent/default.nix
Thu Jul 22 12:59:12 2010 (r22706)
+++ nixpkgs/branches/x-updates/pkgs/development/libraries/libevent/default.nix
Thu Jul 22 13:18:07 2010 (r22707)
@@ -1,10 +1,29 @@
{stdenv, fetchurl}:
+let version = "1.4.14b"; in
stdenv.mkDerivation {
- name = "libevent-1.1b";
+ name = "libevent-${version}";
src = fetchurl {
- url = http://monkey.org/~provos/libevent-1.1b.tar.gz;
- md5 = "ec8dac612aa43ed172f300f396fcec49";
+ url = "http://monkey.org/~provos/libevent-${version}-stable.tar.gz";;
+ sha256 = "00b3wih3qpcik6v0qh1406abs2xb954d58ncqwzs8ar2d93ip9mg";
+ };
+
+ meta = {
+ description = "libevent, an event notification library";
+
+ longDescription =
+ '' The libevent API provides a mechanism to execute a callback function
+ when a specific event occurs on a file descriptor or after a timeout
+ has been reached. Furthermore, libevent also support callbacks due
+ to signals or regular timeouts.
+
+ libevent is meant to replace the event loop found in event driven
+ network servers. An application just needs to call event_dispatch()
+ and then add or remove events dynamically without having to change
+ the event loop.
+ '';
+
+ license = "mBSD";
};
}
Modified: nixpkgs/branches/x-updates/pkgs/lib/meta.nix
==============================================================================
--- nixpkgs/branches/x-updates/pkgs/lib/meta.nix Thu Jul 22 12:59:12
2010 (r22706)
+++ nixpkgs/branches/x-updates/pkgs/lib/meta.nix Thu Jul 22 13:18:07
2010 (r22707)
@@ -40,5 +40,9 @@
*/
lowPrio = drv: addMetaAttrs { priority = "10"; } drv;
+ /* Increase the nix-env priority of the package, i.e., this
+ version/variant of the package will be preferred.
+ */
+ hiPrio = drv: addMetaAttrs { priority = "110"; } drv;
}
Modified: nixpkgs/branches/x-updates/pkgs/servers/dico/default.nix
==============================================================================
--- nixpkgs/branches/x-updates/pkgs/servers/dico/default.nix Thu Jul 22
12:59:12 2010 (r22706)
+++ nixpkgs/branches/x-updates/pkgs/servers/dico/default.nix Thu Jul 22
13:18:07 2010 (r22707)
@@ -1,15 +1,16 @@
-{ fetchurl, stdenv, libtool, gettext, zlib, readline, guile, python }:
+{ fetchurl, stdenv, libtool, gettext, zlib, readline, gsasl
+, guile, python }:
stdenv.mkDerivation rec {
- name = "dico-2.0";
+ name = "dico-2.1";
src = fetchurl {
url = "mirror://gnu/dico/${name}.tar.gz";
- sha256 = "03cpg16jbsv5xh9mvyjj7myvpdpb82354a1yjrhcy0k5w8faa9kv";
+ sha256 = "0cs4jxnz6g5xqrhkbnycn7jl9fs8jfjh33vza7i68m8qmjwx2vza";
};
# XXX: Add support for GNU SASL.
- buildInputs = [ libtool gettext zlib readline guile python ];
+ buildInputs = [ libtool gettext zlib readline gsasl guile python ];
doCheck = true;
Modified: nixpkgs/branches/x-updates/pkgs/servers/sql/mysql/jdbc/default.nix
==============================================================================
--- nixpkgs/branches/x-updates/pkgs/servers/sql/mysql/jdbc/default.nix Thu Jul
22 12:59:12 2010 (r22706)
+++ nixpkgs/branches/x-updates/pkgs/servers/sql/mysql/jdbc/default.nix Thu Jul
22 13:18:07 2010 (r22707)
@@ -1,12 +1,12 @@
{stdenv, fetchurl, ant}:
stdenv.mkDerivation {
- name = "mysql-connector-java-5.1.6";
+ name = "mysql-connector-java-5.1.13";
builder = ./builder.sh;
src = fetchurl {
- url =
http://mirror.hostfuss.com/mysql/Downloads/Connector-J/mysql-connector-java-5.1.6.tar.gz;
- md5 = "84641aa4ddc138fc400366021f05cec5";
+ url =
http://mirror.hostfuss.com/mysql/Downloads/Connector-J/mysql-connector-java-5.1.13.tar.gz;
+ sha256 = "1y0x9a7d0qfn9bb2114v65407wnjwhz1ylxk0fn997gvwy43schi";
};
buildInputs = [ant];
Copied: nixpkgs/branches/x-updates/pkgs/tools/archivers/cpio/darwin-fix.patch
(from r22706, nixpkgs/trunk/pkgs/tools/archivers/cpio/darwin-fix.patch)
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ nixpkgs/branches/x-updates/pkgs/tools/archivers/cpio/darwin-fix.patch
Thu Jul 22 13:18:07 2010 (r22707, copy of r22706,
nixpkgs/trunk/pkgs/tools/archivers/cpio/darwin-fix.patch)
@@ -0,0 +1,15 @@
+Fix Darwin builds.
+
+From
<http://git.savannah.gnu.org/cgit/cpio.git/commit/?id=3a7a1820d4cecbd77c7b74c785af5942510bf080>.
+See also <http://lists.gnu.org/archive/html/bug-cpio/2010-07/msg00001.html>.
+
+diff --git a/src/filetypes.h b/src/filetypes.h
+index f80faab..81f0c32 100644
+--- a/src/filetypes.h
++++ b/src/filetypes.h
+@@ -81,5 +81,3 @@
+ #ifndef S_ISLNK
+ #define lstat stat
+ #endif
+-int lstat ();
+-int stat ();
Modified: nixpkgs/branches/x-updates/pkgs/tools/archivers/cpio/default.nix
==============================================================================
--- nixpkgs/branches/x-updates/pkgs/tools/archivers/cpio/default.nix Thu Jul
22 12:59:12 2010 (r22706)
+++ nixpkgs/branches/x-updates/pkgs/tools/archivers/cpio/default.nix Thu Jul
22 13:18:07 2010 (r22707)
@@ -1,6 +1,6 @@
{stdenv, fetchurl}:
-stdenv.mkDerivation {
+stdenv.mkDerivation ({
name = "cpio-2.11";
src = fetchurl {
@@ -34,3 +34,9 @@
platforms = stdenv.lib.platforms.all;
};
}
+
+//
+
+(if stdenv.isLinux
+ then {}
+ else { patches = [ ./darwin-fix.patch ]; }))
Copied: nixpkgs/branches/x-updates/pkgs/tools/networking/p2p/seeks/default.nix
(from r22706, nixpkgs/trunk/pkgs/tools/networking/p2p/seeks/default.nix)
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ nixpkgs/branches/x-updates/pkgs/tools/networking/p2p/seeks/default.nix
Thu Jul 22 13:18:07 2010 (r22707, copy of r22706,
nixpkgs/trunk/pkgs/tools/networking/p2p/seeks/default.nix)
@@ -0,0 +1,49 @@
+{ fetchurl, stdenv, zlib, docbook2x, pcre, curl, libxml2, libevent, perl
+, autoconf, automake, libtool }:
+
+let version = "0.2.3a"; in
+stdenv.mkDerivation {
+ name = "seeks-${version}";
+
+ src = fetchurl {
+ url =
"mirror://sourceforge/seeks/solo/seeks_solo_stable-${version}.src.tar.gz";
+ sha256 = "0hjaqwcaa19qbq28y5gq0415fz10vx034aghqa01hrhhl9yrjvc4";
+ };
+
+ buildInputs =
+ [ zlib docbook2x pcre curl libxml2 libevent perl
+ autoconf automake libtool
+ ];
+
+ # The tarball doesn't contain `configure' & co. Sigh...
+ preConfigure = "autoreconf -vfi";
+
+ configureFlags =
+ [ # Enable the built-in web server providing a web search interface.
+ # See <http://www.seeks-project.info/wiki/index.php/Seeks_On_Web>.
+ "--enable-httpserv-plugin=yes"
+ "--with-libevent=${libevent}"
+ ];
+
+ meta = {
+ description = "Seeks, a social web search engine";
+
+ longDescription =
+ '' Seeks is a free and open technical design and application for
+ enabling social websearch. Its specific purpose is to regroup users
+ whose queries are similar so they can share both the query results
+ and their experience on these results. On this basis, Seeks allows
+ for true real-time, decentralized, websearch to emerge.
+
+ In the long term, there is no need for web crawlers and third-party
+ web indexes as users can push content directly to search groups.
+ '';
+
+ license = "AGPLv3+";
+
+ homepage = http://www.seeks-project.info/;
+
+ maintainers = [ stdenv.lib.maintainers.ludo ];
+ platforms = stdenv.lib.platforms.gnu; # arbitrary choice
+ };
+}
Modified: nixpkgs/branches/x-updates/pkgs/top-level/all-packages.nix
==============================================================================
--- nixpkgs/branches/x-updates/pkgs/top-level/all-packages.nix Thu Jul 22
12:59:12 2010 (r22706)
+++ nixpkgs/branches/x-updates/pkgs/top-level/all-packages.nix Thu Jul 22
13:18:07 2010 (r22707)
@@ -139,7 +139,7 @@
inherit lib config getConfig stdenvAdapters;
- inherit (lib) lowPrio appendToName makeOverridable;
+ inherit (lib) lowPrio hiPrio appendToName makeOverridable;
# Applying this to an attribute set will cause nix-env to look
# inside the set for derivations.
@@ -3728,6 +3728,17 @@
inherit fetchurl stdenv;
};
+ clutter = import ../development/libraries/clutter {
+ inherit fetchurl stdenv pkgconfig mesa cairo;
+ inherit (gnome) glib pango gtk;
+ inherit (xorg) libXi libXfixes libXdamage libXcomposite;
+ };
+
+ clutter_gtk = import ../development/libraries/clutter-gtk {
+ inherit fetchurl stdenv pkgconfig clutter;
+ inherit (gnome) gtk;
+ };
+
commoncpp2 = import ../development/libraries/commoncpp2 {
inherit stdenv fetchurl;
};
@@ -4527,6 +4538,11 @@
inherit fetchurl stdenv libcddb pkgconfig ncurses help2man;
};
+ libchamplain = import ../development/libraries/libchamplain {
+ inherit fetchurl stdenv pkgconfig cairo clutter clutter_gtk sqlite;
+ inherit (gnome) gtk glib libsoup;
+ };
+
libcm = import ../development/libraries/libcm {
inherit fetchurl stdenv pkgconfig xlibs mesa glib;
};
@@ -5901,7 +5917,8 @@
};
dico = import ../servers/dico {
- inherit fetchurl stdenv libtool gettext zlib readline guile python;
+ inherit fetchurl stdenv libtool gettext zlib readline guile python
+ gsasl;
};
dict = makeOverridable (import ../servers/dict) {
@@ -7859,6 +7876,12 @@
inherit fetchurl stdenv;
};
+ # This is usually a newer version of Org-Mode than that found in GNU
Emacs, so
+ # we want it to have higher precedence.
+ org = hiPrio (import ../applications/editors/emacs-modes/org {
+ inherit fetchurl stdenv emacs texinfo;
+ });
+
prologMode = import ../applications/editors/emacs-modes/prolog {
inherit fetchurl stdenv;
};
@@ -8149,7 +8172,7 @@
geeqie = import ../applications/graphics/geeqie {
inherit fetchurl stdenv pkgconfig libpng lcms exiv2
- intltool gettext;
+ intltool gettext libchamplain;
inherit (gtkLibs) gtk;
};
@@ -8766,6 +8789,11 @@
qt = qt3;
};
+ seeks = import ../tools/networking/p2p/seeks {
+ inherit fetchurl stdenv zlib docbook2x pcre curl libxml2 libevent perl
+ autoconf automake libtool;
+ };
+
seg3d = import ../applications/graphics/seg3d {
inherit fetchurl stdenv cmake itk mesa zlib libuuid;
inherit (xlibs) libXft libXext libXi libXmu;
@@ -9795,7 +9823,7 @@
};
vite = import ../applications/science/misc/vite {
- inherit fetchurl cmake mesa;
+ inherit fetchsvn cmake mesa;
qt = qt4;
stdenv = stdenv2;
};
Modified: nixpkgs/branches/x-updates/pkgs/top-level/haskell-packages.nix
==============================================================================
--- nixpkgs/branches/x-updates/pkgs/top-level/haskell-packages.nix Thu Jul
22 12:59:12 2010 (r22706)
+++ nixpkgs/branches/x-updates/pkgs/top-level/haskell-packages.nix Thu Jul
22 13:18:07 2010 (r22707)
@@ -61,6 +61,10 @@
inherit cabal;
};
+ blazeHtml = import ../development/libraries/haskell/blaze-html {
+ inherit cabal text;
+ };
+
bytestring = import ../development/libraries/haskell/bytestring {
inherit cabal;
};
@@ -73,6 +77,10 @@
inherit cabal;
};
+ cereal = import ../development/libraries/haskell/cereal {
+ inherit cabal;
+ };
+
cgi3001172 = import ../development/libraries/haskell/cgi/3001.1.7.2.nix {
inherit cabal mtl parsec xhtml;
network = network2217;
@@ -251,6 +259,10 @@
inherit (pkgs) stdenv fetchurl pkgconfig gnome cairo;
};
+ hamlet = import ../development/libraries/haskell/hamlet {
+ inherit cabal blazeHtml parsec utf8String;
+ };
+
HAppSData = import ../development/libraries/haskell/HAppS/HAppS-Data.nix {
inherit cabal mtl sybWithClass HaXml HAppSUtil bytestring binary;
};
@@ -518,6 +530,10 @@
inherit cabal mtl extensibleExceptions;
};
+ MonadCatchIOTransformers = import
../development/libraries/haskell/MonadCatchIO-transformers {
+ inherit cabal transformers extensibleExceptions;
+ };
+
monadlab = import ../development/libraries/haskell/monadlab {
inherit cabal parsec;
};
@@ -615,6 +631,11 @@
inherit (pkgs) pcre;
};
+ persistent = import ../development/libraries/haskell/persistent {
+ inherit cabal blazeHtml MonadCatchIOTransformers parsec text
+ transformers utf8String webRoutesQuasi;
+ };
+
polyparse = import ../development/libraries/haskell/polyparse {
inherit cabal;
};
@@ -890,6 +911,15 @@
inherit cabal utf8String terminfo;
};
+ webRoutes = import ../development/libraries/haskell/web-routes {
+ inherit cabal utf8String parsec;
+ network = network2217;
+ };
+
+ webRoutesQuasi = import ../development/libraries/haskell/web-routes-quasi {
+ inherit cabal webRoutes;
+ };
+
WebServer = import ../development/libraries/haskell/WebServer {
inherit cabal network mtl parsec;
inherit (pkgs) fetchgit;
_______________________________________________
nix-commits mailing list
[email protected]
http://mail.cs.uu.nl/mailman/listinfo/nix-commits
