Update from trunk

svn path=/nixpkgs/branches/stdenv-updates/; revision=23097
This commit is contained in:
Lluís Batlle i Rossell 2010-08-10 17:20:15 +00:00
commit f9692a7f40
16 changed files with 146 additions and 22 deletions

View file

@ -0,0 +1,23 @@
{stdenv, fetchurl, perl}:
stdenv.mkDerivation rec {
name = "yacas-1.2.2";
src = fetchurl {
url = "http://yacas.sourceforge.net/backups/${name}.tar.gz";
sha256 = "1dmafm3w0lm5w211nwkfzaid1rvvmgskz7k4500pjhgdczi5sd78";
};
# Perl is only for the documentation
buildInputs = [ perl ];
patches = [ ./gcc43.patch ];
meta = {
description = "Easy to use, general purpose Computer Algebra System";
homepage = http://yacas.sourceforge.net/;
license = "GPLv2+";
maintainers = with stdenv.lib.maintainers; [viric];
platforms = with stdenv.lib.platforms; all;
};
}

View file

@ -0,0 +1,17 @@
Taken from gentoo:
http://sources.gentoo.org/viewcvs.py/gentoo-x86/sci-mathematics/yacas/files/yacas-1.2.2-gcc43.patch?rev=1.1&view=markup
Index: yacas-1.2.2-gcc43.patch
===================================================================
--- a/manmake/manripper.cpp
+++ b/manmake/manripper.cpp
@@ -1,7 +1,8 @@
-#include <stdio.h>
-#include <ctype.h>
+#include <cstdio>
+#include <cctype>
#include <string>
+#include <cstring>
#include <map>
using namespace std;

View file

@ -0,0 +1,18 @@
{ stdenv, fetchurl, libmatchbox, pkgconfig}:
stdenv.mkDerivation rec {
name = "matchbox-1.2.2";
buildInputs = [ libmatchbox pkgconfig ];
src = fetchurl {
url = http://matchbox-project.org/sources/matchbox-window-manager/1.2/matchbox-window-manager-1.2.tar.bz2;
sha256 = "1zyfq438b466ygcz78nvsmnsc5bhg4wcfnpxb43kbkwpyx53m8l1";
};
meta = {
description = "X window manager for non-desktop embedded systems";
homepage = http://matchbox-project.org/;
license = "GPLv2+";
};
}

View file

@ -1,6 +1,6 @@
{ stdenv, fetchurl }:
{ pn, v, stable ? true, sha256, subdir ? null }: args:
a@{ pn, v, stable ? true, sha256, subdir ? null, ... }:
stdenv.mkDerivation ({
name = "${pn}-${v}";
src = fetchurl {
@ -13,5 +13,5 @@ stdenv.mkDerivation ({
platforms = stdenv.lib.platforms.linux;
inherit stable;
homepage = http://www.kde.org;
} // ( if args ? meta then args.meta else { } );
} // args)
} // ( if a ? meta then a.meta else { } );
} // (removeAttrs a [ "meta" "pn" "v" "stable" "sha256" "subdir" ]))

View file

@ -9,7 +9,7 @@ kdePackage {
pn = "kdelibs";
v = "4.5.0";
sha256 = "0d3iml2v1vp1y6i5vpqv77nbdlw6qb8j6c88yi744ba4zvcirzrx";
} {
buildInputs = [
cmake perl qt4 xz flex bison bzip2 pcre fam libxml2 libxslt
shared_mime_info giflib jasper /*openexr*/ aspell avahi kerberos acl attr

View file

@ -1,13 +1,10 @@
{ stdenv, fetchurl, cmake, qt4, perl, boost, cyrus_sasl, gpgme, libical, openldap, shared_mime_info
{ kdePackage, cmake, qt4, perl, boost, cyrus_sasl, gpgme, libical, openldap, shared_mime_info
, kdelibs, automoc4, akonadi, soprano}:
stdenv.mkDerivation rec {
name = "kdepimlibs-4.4.95";
src = fetchurl {
url = "mirror://kde/unstable/4.4.95/src/${name}.tar.bz2";
sha256 = "06ap22p9x7l698skkrnsh7k3h1z0v6h3h3fwjrv4y6lv5vygccny";
};
kdePackage {
pn = "kdepimlibs";
v = "4.5.0";
sha256 = "0n3wmc2c4jcxbi81i9jmw23b5ms43gia58qpr835im874641f54m";
buildInputs = [ cmake qt4 perl boost cyrus_sasl gpgme libical openldap
shared_mime_info kdelibs automoc4 akonadi soprano ];
@ -15,7 +12,5 @@ stdenv.mkDerivation rec {
meta = {
description = "KDE PIM libraries";
license = "LGPL";
homepage = http://www.kde.org;
inherit (kdelibs.meta) maintainers;
};
}

View file

@ -4,7 +4,11 @@ kdePackage {
pn = "oxygen-icons";
v = "4.5.0";
sha256 = "11wlrxnral4q5wi46p1di1cff4vr5da35a8dv2xx3ag6lnhqvjqi";
} {
outputHashAlgo = "sha256";
outputHashMode = "recursive";
outputHash = "1fil2rbvy4j47gqpn4xcjvjwxy4yq5mvpwcd5lhp8fdzgsc0jmdn";
buildInputs = [ cmake ];
meta = {
description = "KDE Oxygen theme icons";

View file

@ -5,7 +5,7 @@ kdePackage {
v = "0.96.1";
subdir = "apps/KDE4.x/admin";
sha256 = "1ng5bi1gmr5lg49c5kyqyjzbjhs4w90c2zlnfcyviv9p3wzfgzbr";
} {
buildInputs = [ cmake qt4 automoc4 ];
propagatedBuildInputs = [ polkit glib ];
}

View file

@ -1,11 +1,11 @@
{stdenv, fetchurl, cmake, qt4, cluceneCore, redland, libiodbc}:
stdenv.mkDerivation rec {
name = "soprano-2.4.64";
name = "soprano-2.5.0";
src = fetchurl {
url = "mirror://sf/soprano/${name}.tar.bz2";
sha256 = "1jrpgp573r2q20v108a0528f92n7g892pdr44fgskcq7wf8l8mzv";
sha256 = "01g0shwxksr6mg2g1pj1pbwz6nir5rw16ysmmly85891p62j8nxn";
};
# We disable the Java backend, since we do not need them and they make the closure size much bigger

View file

@ -0,0 +1,24 @@
{ stdenv, fetchurl, pkgconfig, intltool, gtk, dbus_glib, xfconf
, libxfcegui4, libxfce4util, libnotify, xfce4panel }:
stdenv.mkDerivation rec {
name = "xfce4-power-manager-0.8.5";
src = fetchurl {
url = "http://www.xfce.org/archive/src/apps/xfce4-power-manager/0.8/${name}.tar.bz2";
sha1 = "b1ce0f120733ec1a6267d50ba5c2990bbbbccfd4";
};
buildInputs =
[ pkgconfig intltool gtk dbus_glib xfconf libxfcegui4 libxfce4util
libnotify xfce4panel
];
NIX_CFLAGS_COMPILE = "-I${libxfcegui4}/include/xfce4";
meta = {
homepage = http://goodies.xfce.org/projects/applications/xfce4-power-manager;
description = "A power manager for the Xfce Desktop Environment";
license = "GPLv2+";
};
}

View file

@ -55,6 +55,8 @@ rec {
ristretto = callPackage ./applications/ristretto.nix { };
xfce4_power_manager = callPackage ./applications/xfce4-power-manager.nix { };
#### ART
xfce4icontheme = callPackage ./art/xfce4-icon-theme.nix { };

View file

@ -0,0 +1,19 @@
{ stdenv, fetchurl, libX11, libXext, libpng, libXft, libICE, pango, libjpeg}:
stdenv.mkDerivation rec {
name = "libmatchbox-1.9";
buildInputs = [ libXft libICE pango libjpeg ];
propagatedBuildInputs = [ libX11 libXext libpng ];
src = fetchurl {
url = http://matchbox-project.org/sources/libmatchbox/1.9/libmatchbox-1.9.tar.bz2;
sha256 = "006zdrgs7rgh7dvakjmqsp1q9karq6c5cz4gki2l15fhx0cf40fv";
};
meta = {
description = "Library of the matchbox X window manager";
homepage = http://matchbox-project.org/;
license = "GPLv2+";
};
}

View file

@ -1358,11 +1358,11 @@ let
})) // {inherit inputproto randrproto xorgserver xproto ;};
xf86inputsynaptics = (stdenv.mkDerivation ((if overrides ? xf86inputsynaptics then overrides.xf86inputsynaptics else x: x) {
name = "xf86-input-synaptics-1.2.0";
name = "xf86-input-synaptics-1.2.2";
builder = ./builder.sh;
src = fetchurl {
url = mirror://xorg/X11R7.5/src/everything/xf86-input-synaptics-1.2.0.tar.bz2;
sha256 = "033232bvvy0ibr6w0fmcm3mjv212fl2bywj22d32wbxd4m6avmfx";
url = mirror://xorg/individual/driver/xf86-input-synaptics-1.2.2.tar.bz2;
sha256 = "1a1dvdc1g8fgkhr3fn3rnly1bz3f6kz1qjxyrmm22qmsair4w2yj";
};
buildInputs = [pkgconfig inputproto recordproto libX11 libXi xorgserver xproto libXtst ];
})) // {inherit inputproto recordproto libX11 libXi xorgserver xproto libXtst ;};

View file

@ -118,7 +118,7 @@ mirror://xorg/individual/driver/xf86-input-evdev-2.4.0.tar.bz2
mirror://xorg/X11R7.5/src/everything/xf86-input-joystick-1.4.99.2.tar.bz2
mirror://xorg/X11R7.5/src/everything/xf86-input-keyboard-1.4.0.tar.bz2
mirror://xorg/X11R7.5/src/everything/xf86-input-mouse-1.5.0.tar.bz2
mirror://xorg/X11R7.5/src/everything/xf86-input-synaptics-1.2.0.tar.bz2
mirror://xorg/individual/driver/xf86-input-synaptics-1.2.2.tar.bz2
mirror://xorg/X11R7.5/src/everything/xf86-input-vmmouse-12.6.5.tar.bz2
mirror://xorg/X11R7.5/src/everything/xf86-input-void-1.3.0.tar.bz2
mirror://xorg/X11R7.5/src/everything/xf86-video-apm-1.2.2.tar.bz2

View file

@ -3287,6 +3287,10 @@ let
libmad = callPackage ../development/libraries/libmad { };
libmatchbox = callPackage ../development/libraries/libmatchbox {
inherit (gtkLibs) pango;
};
libmatthew_java = callPackage ../development/libraries/java/libmatthew-java { };
libmcs = callPackage ../development/libraries/libmcs { };
@ -5745,6 +5749,8 @@ let
qt = qt4;
};
matchbox = callPackage ../applications/window-managers/matchbox { };
meld = callPackage ../applications/version-management/meld {
inherit (gnome) scrollkeeper;
pygtk = pyGtkGlade;
@ -6727,6 +6733,8 @@ let
withX = true;
};
yacas = callPackage ../applications/science/math/yacas { };
### SCIENCE / MISC
golly = callPackage ../applications/science/misc/golly { };

View file

@ -562,5 +562,19 @@ with (import ./release-lib.nix);
xsetroot = linux;
};
xfce4 = {
gtk_xfce_engine = linux;
mousepad = linux;
ristretto = linux;
terminal = linux;
thunar = linux;
xfce4_power_manager = linux;
xfce4icontheme = linux;
xfce4panel = linux;
xfce4session = linux;
xfdesktop = linux;
xfwm4 = linux;
};
} ))