svn merge ^/nixpkgs/trunk

svn path=/nixpkgs/branches/libpng15/; revision=32522
This commit is contained in:
Yury G. Kudryashov 2012-02-23 20:35:33 +00:00
commit 3652c61aed
89 changed files with 1176 additions and 519 deletions

View file

@ -7,11 +7,11 @@ stdenv.mkDerivation rec {
name = "${pname}-${version}";
pname = "amarok";
version = "2.4.3";
version = "2.5.0";
src = fetchurl {
url = "mirror://kde/stable/${pname}/${version}/src/${name}.tar.bz2";
sha256 = "0242psqci1b6wfhrrds14h4c4qin9s83cxk1259d9hqcsgn4ir3c";
sha256 = "0jc8fsrhshgfv441b2dgqk0wz3ms5bzjqchcj5ydxphg57dr3l8y";
};
QT_PLUGIN_PATH="${qtscriptgenerator}/lib/qt4/plugins";

View file

@ -1,7 +1,7 @@
{ stdenv, fetchurl, cmake, qt4, kdelibs, automoc4, phonon, qimageblitz, qca2, eigen,
lcms, jasper, libgphoto2, kdepimlibs, gettext, soprano, libjpeg, libtiff,
liblqr1, lensfun, pkgconfig, qjson, libkdcraw, opencv, libkexiv2, libkipi, boost,
shared_desktop_ontologies, marble, clapack, mysql }:
shared_desktop_ontologies, marble, mysql }:
stdenv.mkDerivation rec {
name = "digikam-2.5.0";

View file

@ -3,7 +3,7 @@
, mpich2
, python
, libxml2
, mesa
, mesa, libXt
}:
stdenv.mkDerivation rec {
@ -34,7 +34,7 @@ stdenv.mkDerivation rec {
enableParallelBuilding = true;
buildInputs = [ cmake qt4 hdf5 mpich2 python libxml2 mesa ];
buildInputs = [ cmake qt4 hdf5 mpich2 python libxml2 mesa libXt ];
meta = {
homepage = "http://www.paraview.org/";

View file

@ -1,10 +1,10 @@
{ fetchurl, stdenv, erlang, esdl }:
stdenv.mkDerivation rec {
name = "wings-1.3.0.1";
name = "wings-1.4.1";
src = fetchurl {
url = "mirror://sourceforge/wings/${name}.tar.bz2";
sha256 = "1zab1qxhgrncwqj1xg6z08m0kqbkdiqp4777p1bv2kczcf31isyp";
sha256 = "16kqy92rapmbvkc58mc50cidp1pm8nlwlwx69riyadc9w4qs9bji";
};
ERL_LIBS = "${esdl}/lib/erlang/addons";

View file

@ -6,7 +6,7 @@ stdenv.mkDerivation {
name = "xfig-${version}";
src = fetchurl {
url = "http://sourceforge/mcj/xfig.${version}.full.tar.gz";
url = "mirror://sourceforge/mcj/xfig.${version}.full.tar.gz";
sha256 = "1hl5x49sgc0vap411whhcq6qhvh4xbjg7jggv7ih9pplg5nwy0aw";
};
@ -40,5 +40,6 @@ stdenv.mkDerivation {
meta = {
description = "An interactive drawing tool for X11";
homepage = http://xfig.org;
platforms = stdenv.lib.platforms.gnu; # arbitrary choice
};
}

View file

@ -12,5 +12,6 @@ stdenv.mkDerivation rec {
license = "GPL";
homepage = http://www.krusader.org;
maintainers = with stdenv.lib.maintainers; [ sander urkud ];
inherit (kdelibs.meta) platforms;
};
}

View file

@ -0,0 +1,41 @@
From 0fbc8097f98481439e68aeb095a8d7e106924bbe Mon Sep 17 00:00:00 2001
From: Jonathan Daugherty <jtd@galois.com>
Date: Tue, 21 Feb 2012 11:06:57 -0800
Subject: [PATCH 6/8] Loosen dependencies on SHA, HUnit, and test-framework
---
mathblog.cabal | 8 ++++----
1 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/mathblog.cabal b/mathblog.cabal
index ea5498c..371dd12 100644
--- a/mathblog.cabal
+++ b/mathblog.cabal
@@ -44,7 +44,7 @@ Executable mb
process >= 1.0,
time >= 1.1,
old-locale >= 1.0,
- SHA >= 1.4 && < 1.5,
+ SHA >= 1.4 && < 1.6,
bytestring >= 0.9 && < 1.0,
HStringTemplate >= 0.6 && < 0.7,
ConfigFile >= 1.1 && < 1.2
@@ -79,12 +79,12 @@ Executable mb-tests
process >= 1.0 && < 1.1,
time >= 1.1,
old-locale >= 1.0 && < 1.1,
- SHA >= 1.4 && < 1.5,
+ SHA >= 1.4 && < 1.6,
bytestring >= 0.9 && < 1.0,
HStringTemplate >= 0.6 && < 0.7,
ConfigFile >= 1.1 && < 1.2,
- HUnit >= 1.2.2 && < 1.2.3,
- test-framework >= 0.3.3 && < 0.4,
+ HUnit >= 1.2.2 && < 1.2.5,
+ test-framework >= 0.3.3 && < 0.6,
test-framework-hunit >= 0.2.6 && < 0.3
GHC-Options: -Wall
--
1.7.8

View file

@ -0,0 +1,27 @@
{ cabal, ConfigFile, filepath, HStringTemplate, HUnit, pandoc
, pandocTypes, SHA, testFramework, testFrameworkHunit, time
}:
cabal.mkDerivation (self: {
pname = "mathblog";
version = "0.4";
sha256 = "0kpawik74hp9k56b858idnlkla3iaalys8mas6c4gf4jfw2w0r3j";
isLibrary = false;
isExecutable = true;
buildDepends = [
ConfigFile filepath HStringTemplate HUnit pandoc pandocTypes SHA
testFramework testFrameworkHunit time
];
patches = [
./0006-Loosen-dependencies-on-SHA-HUnit-and-test-framework.patch
];
meta = {
description = "A program for creating and managing a static weblog with LaTeX math and function graphs";
license = self.stdenv.lib.licenses.bsd3;
platforms = self.ghc.meta.platforms;
maintainers = [
self.stdenv.lib.maintainers.andres
self.stdenv.lib.maintainers.simons
];
};
})

View file

@ -1,16 +1,16 @@
{ stdenv, fetchurl, pkgconfig, glib, dbus, dbus_glib, browser, x11
, GConf, gnome_mplayer, MPlayer
, GConf, gnome_mplayer, MPlayer, gmtk
}:
stdenv.mkDerivation rec {
name = "gecko-mediaplayer-1.0.4";
name = "gecko-mediaplayer-1.0.5";
src = fetchurl {
url = "http://gecko-mediaplayer.googlecode.com/files/${name}.tar.gz";
sha256 = "18asxxsqng303cxcww75k4r6syqjs7lylibv997kq0869kz4spsp";
sha256 = "913fd39e70c564cb210c2544a88869f9d1a448184421f000b14b2bc5ba718b49";
};
buildInputs = [pkgconfig glib dbus dbus_glib browser x11 GConf browser.xulrunner];
buildInputs = [ pkgconfig glib dbus dbus_glib browser x11 GConf browser.xulrunner gmtk ];
# !!! fix this
preBuild =

View file

@ -0,0 +1,13 @@
{ stdenv, fetchurl, intltool, pkgconfig, gtk, GConf, alsaLib }:
stdenv.mkDerivation rec {
name = "gmtk-1.0.5";
src = fetchurl {
url = "http://gmtk.googlecode.com/files/${name}.tar.gz";
sha256 = "a07130d62719e8c1244f8405dd97445798df5204fc0f3f2f2b669b125114b468";
};
buildInputs = [ intltool pkgconfig gtk GConf alsaLib ];
}

View file

@ -10,6 +10,8 @@ stdenv.mkDerivation {
configureFlags = "--disable-nls";
meta = {
description = "IRC client using GTK";
homepage = http://www.xchat.org;
platforms = with stdenv.lib.platforms; linux;
};
}

View file

@ -1,12 +1,12 @@
{ stdenv, fetchgit, ruby, makeWrapper, git }:
stdenv.mkDerivation rec {
name = "svn2git-2.2.0";
name = "svn2git-2.1.0-20111206";
src = fetchgit {
url = https://github.com/nirvdrum/svn2git;
rev = "db0769835e9d1d3ff324091a3bb7756200a09932";
sha256 = "6d2f2acb9900e2aa8e608d3239b42f890f2334b622adb5ea33b2b4815a52efa2";
rev = "5cd8d4b509affb66eb2dad50d7298c52b3b0d848";
sha256 = "26aa17f68f605e958b623d803b4bd405e12d6c5d51056635873a2c59e4c7b9ca";
};
buildInputs = [ ruby makeWrapper ];

View file

@ -1,10 +1,10 @@
{ stdenv, fetchurl, lib, cmake, qt4, perl, gettext, apr, aprutil, subversion, db4
, kdelibs, automoc4, phonon, kde_baseapps }:
{ stdenv, fetchurl, gettext, apr, aprutil, subversion, db4, kdelibs }:
stdenv.mkDerivation {
stdenv.mkDerivation rec {
name = "kdesvn-1.5.5";
src = fetchurl {
url = http://kdesvn.alwins-world.de/downloads/kdesvn-1.5.5.tar.bz2;
url = "${meta.homepage}/downloads/${name}.tar.bz2";
sha256 = "02sb34p04dyd88ksxvpiffhxqwmhs3yv1wif9m8w0fly9hvy1zk7";
};
@ -12,15 +12,18 @@ stdenv.mkDerivation {
sed -i -e "s|/usr|${subversion}|g" src/svnqt/cmakemodules/FindSubversion.cmake
'';
patches = [ ./docbook.patch ];
patches = [ ./docbook.patch ./virtual_inheritance.patch ];
buildInputs = [ cmake qt4 perl gettext apr aprutil subversion db4 kdelibs automoc4 phonon ];
buildInputs = [ apr aprutil subversion db4 kdelibs ];
buildNativeInputs = [ gettext ];
meta = {
description = "KDE SVN front-end";
license = "GPL";
homepage = http://kdesvn.alwins-world.de;
maintainers = [ lib.maintainers.sander ];
maintainers = [ stdenv.lib.maintainers.sander ];
inherit (kdelibs.meta) platforms;
};
}

View file

@ -0,0 +1,11 @@
--- kdesvn-1.5.5.orig/src/svnfrontend/graphtree/revgraphview.h
+++ kdesvn-1.5.5/src/svnfrontend/graphtree/revgraphview.h
@@ -49,7 +49,7 @@ typedef svn::SharedPointer<KTemporaryFil
/**
@author Rajko Albrecht <ral@alwins-world.de>
*/
-class RevGraphView : virtual public QGraphicsView
+class RevGraphView : public QGraphicsView
{
Q_OBJECT
public:

View file

@ -1,4 +1,4 @@
{ stdenv, fetchurl, perl, xlibs, libdvdnav
{ stdenv, fetchurl, xz, bzip2, perl, xlibs, libdvdnav, libbluray
, zlib, a52dec, libmad, faad2, ffmpeg, alsaLib
, pkgconfig, dbus, fribidi, qt4, freefont_ttf
, libvorbis, libtheora, speex, lua5, libgcrypt, libupnp
@ -10,18 +10,18 @@
stdenv.mkDerivation rec {
name = "vlc-${version}";
version = "1.1.13";
version = "2.0.0";
patchPhase = ''sed -e "s@/bin/echo@echo@g" -i configure'';
src = fetchurl {
url = "http://download.videolan.org/pub/videolan/vlc/${version}/${name}.tar.bz2";
sha256 = "1h93jdx89dfgxlnw66lfcdk9kisadm689zanvgkzbfb3si2frv83";
url = "http://download.videolan.org/pub/videolan/vlc/${version}/${name}.tar.xz";
sha256 = "455fc04b5f7ce3d7294ed71a9dd172ff4eb97875cfc30b554ef4ce55ec6f5106";
};
buildInputs =
[ perl zlib a52dec libmad faad2 ffmpeg alsaLib libdvdnav libdvdnav.libdvdread
dbus fribidi qt4 libvorbis libtheora speex lua5 libgcrypt
[ xz bzip2 perl zlib a52dec libmad faad2 ffmpeg alsaLib libdvdnav libdvdnav.libdvdread
libbluray dbus fribidi qt4 libvorbis libtheora speex lua5 libgcrypt
libupnp libcaca pulseaudio flac schroedinger libxml2 librsvg mpeg2dec
udev gnutls avahi libcddb jackaudio SDL SDL_image libmtp unzip taglib
libkate libtiger libv4l samba liboggz libass libdvbpsi libva
@ -38,7 +38,7 @@ stdenv.mkDerivation rec {
enableParallelBuilding = true;
preBuild = ''
substituteInPlace modules/misc/freetype.c --replace \
substituteInPlace modules/text_renderer/freetype.c --replace \
/usr/share/fonts/truetype/freefont/FreeSerifBold.ttf \
${freefont_ttf}/share/fonts/truetype/FreeSerifBold.ttf
'';

View file

@ -1,16 +1,17 @@
{stdenv, fetchurl, yacc, flex, pkgconfig, glib}:
{stdenv, fetchurl, yacc, flex, pkgconfig, glib, xz}:
stdenv.mkDerivation rec {
baseName = "vala";
baseVersion = "0.11";
revision = "2";
version = "${baseVersion}.${revision}";
name = "${baseName}-${version}";
name = "vala-0.14.2";
src = fetchurl {
url = "mirror://gnome/sources/${baseName}/${baseVersion}/${name}.tar.bz2";
sha256 = "489b60a49a03c8915b513a722ca08986c18ae0dc6489cce6bbb8415670612046";
url = mirror://gnome/sources/vala/0.14/vala-0.14.2.tar.xz;
sha256 = "1l5kllw9vpwv24lzv9fp64l3sad46wpxgvsgryrwlrjg91w6jzl0";
};
buildInputs = [ yacc flex glib pkgconfig ];
buildNativeInputs = [ yacc flex pkgconfig xz ];
buildInputs = [ glib ];
meta = {
description = "Compiler for the GObject type system";
homepage = "http://live.gnome.org/Vala";

View file

@ -1,13 +1,27 @@
{stdenv, fetchurl, gfortran, readline, ncurses, perl, flex, texinfo, qhull,
libX11, graphicsmagick}:
libX11, graphicsmagick, pcre, liblapack, texLive, pkgconfig, mesa, fltk,
fftw, fftwSinglePrec, zlib, curl, qrupdate }:
stdenv.mkDerivation {
name = "octave-3.2.4";
stdenv.mkDerivation rec {
name = "octave-3.4.3";
src = fetchurl {
url = ftp://ftp.octave.org/pub/octave/octave-3.2.4.tar.bz2;
sha256 = "0iyivx7qz7cvwz7qczqrl4ysqivlhn5ax92z9md0m77dqw2isis8";
url = "mirror://gnu/octave/${name}.tar.bz2";
sha256 = "0j61kpfbv8l8rw3r9cwcmskvvav3q2f6plqdq3lnb153jg61klcl";
};
buildInputs = [gfortran readline ncurses perl flex texinfo qhull libX11
graphicsmagick ];
configureFlags = "--enable-readline --enable-dl";
buildInputs = [ gfortran readline ncurses perl flex texinfo qhull libX11
graphicsmagick pcre liblapack texLive pkgconfig mesa fltk zlib curl
fftw fftwSinglePrec qrupdate ];
doCheck = true;
enableParallelBuilding = true;
configureFlags = [ "--enable-readline" "--enable-dl" ];
# Keep a copy of the octave tests detailed results in the output
# derivation, because someone may care
postInstall = ''
cp test/fntests.log $out/share/octave/${name}-fntests.log
'';
}

View file

@ -0,0 +1,45 @@
{stdenv, fetchurl, openssl, jdk, premake}:
# Info on how to use / obtain aacs keys:
# http://vlc-bluray.whoknowsmy.name/
# https://wiki.archlinux.org/index.php/BluRay
let baseName = "aacskeys";
version = "0.4.0c";
in
stdenv.mkDerivation {
name = "${baseName}-${version}";
patchPhase = ''
substituteInPlace "premake.lua" \
--replace "/usr/lib/jvm/java-6-sun/include" "${jdk}/include"
'';
src = fetchurl {
url = "http://debian-multimedia.org/pool/main/a/${baseName}/${baseName}_${version}.orig.tar.gz";
sha256 = "54ea78898917f4acaf78101dda254de56bc7696bad12cbf22ee6f09d4ee88a43";
};
buildInputs = [openssl jdk premake];
installPhase = ''
ensureDir $out/{bin,lib,share/${baseName}}
# Install lib
install -Dm444 lib/linux/libaacskeys.so $out/lib
# Install program
install -Dm555 bin/linux/aacskeys $out/bin
# Install resources
install -Dm444 HostKeyCertificate.txt $out/share/${baseName}
install -Dm444 ProcessingDeviceKeysSimple.txt $out/share/${baseName}
'';
meta = {
homepage = http://forum.doom9.org/showthread.php?t=123311;
description = "A library and program to retrieve decryption keys for HD discs";
};
}

View file

@ -1,27 +0,0 @@
{stdenv, fetchurl, cmake}:
stdenv.mkDerivation rec {
name = "clapack-3.2.1";
src = fetchurl {
url = http://www.netlib.org/clapack/clapack-3.2.1-CMAKE.tgz;
sha256 = "0nnap9q1mv14g57dl3vkvxrdr10k5w7zzyxs6rgxhia8q8mphgqb";
};
buildNativeInputs = [ cmake ];
installPhase = ''
ensureDir $out/include $out/lib
cp SRC/*.a F2CLIBS/libf2c/*.a BLAS/SRC/*.a $out/lib
cp ../INCLUDE/* $out/include
'';
doCheck = true;
checkPhase = "ctest";
meta = {
homepage = http://www.netlib.org/clapack/;
description = "f2c'ed version of LAPACK";
license = "BSD";
};
}

View file

@ -12,7 +12,7 @@ cross :
let
# For GNU/Hurd, see below.
version = if hurdHeaders != null then "20111025" else "2.12.2";
version = if hurdHeaders != null then "20120221" else "2.12.2";
needsPortsNative = stdenv.isMips || stdenv.isArm;
needsPortsCross = cross.arch == "mips" || cross.arch == "arm";
@ -75,7 +75,8 @@ stdenv.mkDerivation ({
/* Allow nixos and nix handle the locale-archive. */
./nix-locale-archive.patch
];
]
++ (stdenv.lib.optional (hurdHeaders != null) ./hurd-sigstate-functions.patch);
postPatch = ''
# Needed for glibc to build with the gnumake 3.82
@ -143,8 +144,8 @@ stdenv.mkDerivation ({
# maintained by the Hurd folks, `tschwinge/Roger_Whittaker' branch.
# See <http://www.gnu.org/software/hurd/source_repositories/glibc.html>.
url = "git://git.sv.gnu.org/hurd/glibc.git";
sha256 = "3fb3dd7030a4b6d3e144fa94c32a0c4f46f17f94e2dfbc6bef41cfc3198725ca";
rev = "d740cf9d201dc9ecb0335b0a585828dea9cce793";
sha256 = "fbc053f23167059af414ae1ba9a65931a9d9afaf7d2efb9eba3e258757d12f7d";
rev = "b29b3d0ae35be390cab59e4798cbaf9b45fb06e3";
}
else fetchurl {
url = "mirror://gnu/glibc/glibc-${version}.tar.bz2";

View file

@ -0,0 +1,20 @@
This patch adds a GNU ld version script entry for the `_hurd_sigstate_*'
functions that were introduced to support SA_SIGINFO. A similar patch
should be applied upstream soon.
diff --git a/hurd/Versions b/hurd/Versions
index 83c8ab1..295cfda 100644
--- a/hurd/Versions
+++ b/hurd/Versions
@@ -156,6 +156,11 @@ libc {
# functions used in macros & inline functions
__errno_location;
}
+ GLIBC_2.13 {
+ # functions introduced for SA_SIGINFO support and referenced from
+ # <hurd/signal.h>
+ _hurd_sigstate_*;
+ }
%if !SHLIB_COMPAT (libc, GLIBC_2_0, GLIBC_2_2)
HURD_CTHREADS_0.3 {

View file

@ -2,8 +2,8 @@
cabal.mkDerivation (self: {
pname = "SDL";
version = "0.6.2";
sha256 = "1fqj3sw709q28rmjzcffa3k1mcp7r9cvdrrqmcppaz5yv63ychly";
version = "0.6.3";
sha256 = "0m3ick3rw8623ja42yfj4pa57naa6yb20ym8lv252gwb18ghp4sp";
extraLibraries = [ SDL ];
meta = {
description = "Binding to libSDL";

View file

@ -1,10 +1,10 @@
{ cabal }:
{ cabal, Cabal }:
cabal.mkDerivation (self: {
pname = "cabal-file-th";
version = "0.2.1";
sha256 = "0nczwicgf6kx3lk5m7wqf1wj6ghn8jfx112dzh7jh4f4xs66nsd1";
patchPhase = "sed -i cabal-file-th.cabal -e 's|Cabal >= 1.10 && < 1.13|Cabal|'";
version = "0.2.2";
sha256 = "1ql2gmg3mdfkmnk1m3966npr6l1in15fzlkbn7dr1cp4s90igqhy";
buildDepends = [ Cabal ];
meta = {
homepage = "http://github.com/nkpart/cabal-file-th";
description = "Template Haskell expressions for reading fields from a project's cabal file";

View file

@ -4,8 +4,8 @@
cabal.mkDerivation (self: {
pname = "conduit";
version = "0.2.1";
sha256 = "1350n6nylvn62pdnm1cpm75yli9x3adf9m9jjz04z0gmzd3mvhd9";
version = "0.2.2";
sha256 = "1iwmf0zdrrxh8q3xja742j17nanj6va5zj9bs9a5m78whf8cc80j";
buildDepends = [
liftedBase monadControl text transformers transformersBase
];

View file

@ -2,8 +2,8 @@
cabal.mkDerivation (self: {
pname = "dimensional";
version = "0.10.1.2";
sha256 = "0hdiwyzr4zzwz5h8m7nrcdf85n00byjchr6ghbasnsg3vg9p17wn";
version = "0.10.2";
sha256 = "14idyacd38a2kc97hp773j8iiim2lxh9czr8gp12m66w4n603znn";
buildDepends = [ numtype time ];
meta = {
homepage = "http://dimensional.googlecode.com/";

View file

@ -2,8 +2,8 @@
cabal.mkDerivation (self: {
pname = "fclabels";
version = "1.1.0.2";
sha256 = "19p3ghjmc6jrgzifm5vrsd3cp5xmccw811zczcmsk1xjr4ady95r";
version = "1.1.1.0";
sha256 = "1xkgqib7ya3l6m9bz5ly6x9k0n71jiydk8ss38rvn9j5gryv3las";
buildDepends = [ mtl transformers ];
meta = {
description = "First class accessor labels";

View file

@ -2,8 +2,8 @@
cabal.mkDerivation (self: {
pname = "funcmp";
version = "1.5";
sha256 = "f68807833f39178c99877321f0f335cfde12a5c4b38e6c51f33f8cab94b9e12e";
version = "1.6";
sha256 = "1l317gnav6adbdi849zdcgcvrlcs4mz4p0s67wg323prq713fkz0";
buildDepends = [ filepath ];
meta = {
homepage = "http://savannah.nongnu.org/projects/funcmp/";

View file

@ -1,18 +1,19 @@
{ cabal, blazeHtml, extensibleExceptions, filepath, happstackData
, happstackUtil, hslogger, html, MaybeT, mtl, network, parsec
, sendfile, syb, text, time, utf8String, xhtml, zlib
{ cabal, base64Bytestring, blazeHtml, extensibleExceptions
, filepath, hslogger, html, monadControl, mtl, network, parsec
, sendfile, syb, text, time, transformers, transformersBase
, utf8String, xhtml, zlib
}:
cabal.mkDerivation (self: {
pname = "happstack-server";
version = "6.2.5";
sha256 = "196s8i3v55i10nkapkvzyw048flshw8mlm604548f0qjciynfjmg";
version = "6.6.3";
sha256 = "0l1cv1syx1j8xvy5sjl6cj7l4zyizkmv6z8g038n8fwgsw130hm9";
isLibrary = true;
isExecutable = true;
buildDepends = [
blazeHtml extensibleExceptions filepath happstackData happstackUtil
hslogger html MaybeT mtl network parsec sendfile syb text time
utf8String xhtml zlib
base64Bytestring blazeHtml extensibleExceptions filepath hslogger
html monadControl mtl network parsec sendfile syb text time
transformers transformersBase utf8String xhtml zlib
];
meta = {
homepage = "http://happstack.com";

View file

@ -4,8 +4,8 @@
cabal.mkDerivation (self: {
pname = "hxt";
version = "9.2.0";
sha256 = "182yl4ksh4hg332b0lnk4s9cfqxsnnan7p5vqas5lbxvibmg68zc";
version = "9.2.1";
sha256 = "0172icb36wx4fb6q3xq7pcs85d2hnn4bznq3wjwhval10mayri8y";
buildDepends = [
binary deepseq filepath HUnit hxtCharproperties hxtRegexXmlschema
hxtUnicode mtl network parsec

View file

@ -2,8 +2,8 @@
cabal.mkDerivation (self: {
pname = "shakespeare-css";
version = "0.10.7";
sha256 = "0cla600s5715glimlf58gndpp7njhm26j78bfm16cxia5psp5zav";
version = "0.10.7.1";
sha256 = "0yi04ap2pl916ycs1wzaxrhjyx81lpmdad5in3qf1s4flfmi1h2k";
buildDepends = [ parsec shakespeare text ];
meta = {
homepage = "http://www.yesodweb.com/book/templates";

View file

@ -2,8 +2,8 @@
cabal.mkDerivation (self: {
pname = "shakespeare-js";
version = "0.11.0.1";
sha256 = "01gmsk1q5iq23m93n8mcmm02jqv3i7ksf1jw4qnla1gssdkx8ggk";
version = "0.11.1";
sha256 = "1sqkfl6pwwmn72xz5qf1bh58jr95w59ry6zmy939x73g9jgpzn6x";
buildDepends = [ shakespeare text ];
meta = {
homepage = "http://www.yesodweb.com/book/templates";

View file

@ -2,8 +2,8 @@
cabal.mkDerivation (self: {
pname = "smallcheck";
version = "0.6";
sha256 = "19b2dyjbryx2a5bq70pn2mbzlcvjjwhii78fwwx6q57r13zljb9v";
version = "0.6.1";
sha256 = "1p2bsc08lcyzmqdjc5qsr60dr03kvc8xw7kk4lbi9cnn9s9w90vb";
buildDepends = [ dlist ];
meta = {
homepage = "https://github.com/feuerbach/smallcheck";

View file

@ -4,8 +4,8 @@
cabal.mkDerivation (self: {
pname = "web-routes";
version = "0.26.3";
sha256 = "1ldi4gjraga57qj9drknwp19vmy30fhcp6vw3y7xqcrarvp5n2mx";
version = "0.27.1";
sha256 = "0rbl57qnn908hwfhj14m8z11pscrv44rlg7c9y9rm6jvwy4v58qz";
buildDepends = [
blazeBuilder httpTypes mtl network parsec text utf8String
];

View file

@ -5,8 +5,8 @@
cabal.mkDerivation (self: {
pname = "xml-conduit";
version = "0.5.2";
sha256 = "0wr9xbx2dwv0kmnx9jwlm1734a22mc79ydg4sh61335fdjvchfnd";
version = "0.5.3";
sha256 = "09jphn19g6v9z1b75iyqcdyn75n7inbhib8g9fgfzwd7q8rdd3yc";
buildDepends = [
attoparsec attoparsecConduit blazeBuilder blazeBuilderConduit
conduit dataDefault failure systemFilepath text transformers

View file

@ -8,8 +8,8 @@
cabal.mkDerivation (self: {
pname = "yesod-core";
version = "0.10.1";
sha256 = "011bxz0wjd349jhwxh0cs1lhqpjgwq57ia8wzxf21bcwy8c08nj0";
version = "0.10.2.1";
sha256 = "00cw31k6fkffryiqji33x56hqxivwg2c3rgaqmplph9zjpndvgb2";
buildDepends = [
aeson blazeBuilder blazeHtml caseInsensitive cereal clientsession
conduit cookie failure fastLogger hamlet httpTypes liftedBase
@ -17,6 +17,7 @@ cabal.mkDerivation (self: {
shakespeareI18n shakespeareJs text time transformers
transformersBase vector wai waiExtra waiLogger yesodRoutes
];
noHaddock = true;
meta = {
homepage = "http://www.yesodweb.com/";
description = "Creation of type-safe, RESTful web applications";

View file

@ -5,8 +5,8 @@
cabal.mkDerivation (self: {
pname = "yesod-form";
version = "0.4.1";
sha256 = "0l55n7zml3sf8f2qmmii5cq53awajc4vfr5msrm8kvi3ivzjld0s";
version = "0.4.2";
sha256 = "0vl938ngf8lbpylra9wmywgcdffi9prhbz45d6cl1hra9hlsavj6";
buildDepends = [
blazeBuilder blazeHtml dataDefault emailValidate hamlet network
persistent shakespeareCss shakespeareJs text time transformers wai

View file

@ -0,0 +1,39 @@
{ fetchsvn, stdenv, mesa, unzip, libXrandr, libX11, libXxf86vm }:
stdenv.mkDerivation rec {
# Version 3843 is required for supertuxkart
name = "irrlicht-1.8-svn-3843";
src = fetchsvn {
url = https://irrlicht.svn.sourceforge.net/svnroot/irrlicht/trunk;
rev = 3843;
sha256 = "0v31l3k0fzy7isdsx2sh0baaixzlml1m7vgz6cd0015d9f5n99vl";
};
preConfigure = ''
cd source/Irrlicht
'';
buildPhase = ''
make sharedlib NDEBUG=1
'';
preInstall = ''
sed -i s,/usr/local/lib,$out/lib, Makefile
mkdir -p $out/lib
'';
postInstall = ''
ln -s libIrrlicht.so.1.8.0-SVN $out/lib/libIrrlicht.so.1.8
ln -s libIrrlicht.so.1.8.0-SVN $out/lib/libIrrlicht.so
'';
buildInputs = [ unzip mesa libXrandr libX11 libXxf86vm ];
meta = {
homepage = http://irrlicht.sourceforge.net/;
license = "zlib";
description = "Open source high performance realtime 3D engine written in C++";
};
}

View file

@ -0,0 +1,30 @@
{stdenv, fetchurl, libgcrypt}:
# library that allows libbluray to play AACS protected bluray disks
# libaacs does not infringe DRM's right or copyright. See the legal page of the website for more info.
# Info on how to use / obtain aacs keys:
# http://vlc-bluray.whoknowsmy.name/
# https://wiki.archlinux.org/index.php/BluRay
let baseName = "libaacs";
version = "0.3.0";
in
stdenv.mkDerivation {
name = "${baseName}-${version}";
src = fetchurl {
url = "http://download.videolan.org/pub/videolan/${baseName}/${version}/${baseName}-${version}.tar.bz2";
sha256 = "bf92dab1a6a8ee08a55e8cf347c2cda49e6535b52e85bb1e92e1cfcc8ecec22c";
};
buildInputs = [libgcrypt];
meta = {
homepage = http://www.videolan.org/developers/libbluray.html;
description = "Library to access Blu-Ray disks for video playback";
license = stdenv.lib.licenses.lgpl21;
};
}

View file

@ -0,0 +1,33 @@
{stdenv, fetchgit, autoconf, automake, libtool, libaacs ? null, jdk ? null, ant ? null, withAACS ? false}:
assert withAACS -> jdk != null && ant != null && libaacs != null;
# Info on how to use:
# https://wiki.archlinux.org/index.php/BluRay
let baseName = "libbluray";
version = "0.2.1";
in
stdenv.mkDerivation {
name = "${baseName}-${version}";
src = fetchgit {
url = git://git.videolan.org/libbluray.git;
rev = "3b9a9f044644a6abe9cb09377f714ded9fdd6c87";
sha256 = "551b623e76c2dba44b5490fb42ccdc491b28cd42841de28237b8edbed0f0711c";
};
buildInputs = [autoconf automake libtool] ++ stdenv.lib.optionals withAACS [jdk ant libaacs];
NIX_LDFLAGS = stdenv.lib.optionalString withAACS "-laacs";
preConfigure = "./bootstrap";
configureFlags = ["--disable-static"] ++ stdenv.lib.optionals withAACS ["--enable-bdjava" "--with-jdk=${jdk}"];
meta = {
homepage = http://www.videolan.org/developers/libbluray.html;
description = "Library to access Blu-Ray disks for video playback";
license = stdenv.lib.licenses.lgpl21;
};
}

View file

@ -1,19 +1,21 @@
{ stdenv, fetchurl, cmake, automoc4, qt4, pkgconfig, phonon, gst_all }:
{ stdenv, fetchurl, cmake, automoc4, qt4, pkgconfig, phonon, gst_all, xz }:
let version = "4.5.1"; in
let
version = "4.6.0";
pname = "phonon-backend-gstreamer";
in
stdenv.mkDerivation rec {
name = "phonon-backend-gstreamer-${version}";
name = "${pname}-${version}";
src = fetchurl {
url = "mirror://kde/stable/phonon/phonon-backend-gstreamer/${version}/src/${name}.tar.bz2";
sha256 = "13m3kd0iy28nsn532xl97c50vq8ci3qs2i92yk4fw428qvknqck2";
url = "mirror://kde/stable/phonon/${pname}/${version}/src/${name}.tar.xz";
sha256 = "0bwkd1dmj8p4m5xindh6ixfvifq36qmvfn246vx22syqfl6f1m2v";
};
buildInputs =
[ cmake pkgconfig phonon qt4 automoc4
gst_all.gstreamer gst_all.gstPluginsBase
];
buildInputs = [ phonon qt4 gst_all.gstreamer gst_all.gstPluginsBase ];
buildNativeInputs = [ cmake automoc4 xz pkgconfig ];
meta = {
homepage = http://phonon.kde.org/;

View file

@ -1,20 +1,22 @@
a@{ stdenv, fetchurl, qt4, vlc, automoc4, cmake, phonon }:
{ stdenv, fetchurl, xz, qt4, vlc, automoc4, cmake, phonon }:
let
pn = "phonon-backend-vlc";
v = "0.2.0";
vlc = a.vlc.override { inherit qt4; }; #Force using the same qt version
pname = "phonon-backend-vlc";
v = "0.5.0";
vlc_ = vlc.override { inherit qt4; }; #Force using the same qt version
in
stdenv.mkDerivation {
name = "${pn}-${v}";
name = "${pname}-${v}";
src = fetchurl {
url = "mirror://kde/stable/${pn}/${v}/src/${pn}-${v}.tar.gz";
sha256 = "1sac7770vk0ppwbzl9nag387ks7sqmdnm7722kpzafhx1c2r7wsv";
url = "mirror://kde/stable/phonon/${pname}/${v}/src/${pname}-${v}.tar.xz";
sha256 = "1233szd05ahaxyk1sjis374n90m40svfks2aq9jx3g3lxygzwmi2";
};
buildInputs = [ qt4 vlc cmake automoc4 phonon ];
buildNativeInputs = [ cmake automoc4 xz ];
buildInputs = [ qt4 vlc_ phonon ];
meta = {
description = "VideoLAN backend for Phonon multimedia framework";

View file

@ -1,7 +1,7 @@
{ stdenv, fetchurl, cmake, automoc4, qt4, xz }:
{ stdenv, fetchurl, cmake, automoc4, qt4, xz, pulseaudio }:
let
v = "4.5.1";
v = "4.6.0";
in
stdenv.mkDerivation rec {
@ -9,20 +9,13 @@ stdenv.mkDerivation rec {
src = fetchurl {
url = "mirror://kde/stable/phonon/${v}/src/${name}.tar.xz";
sha256 = "1j7lw8w7h2z415vhbp2jlgv3mqwvrspf8xnzb8l0gsfanqfg1001";
sha256 = "2915e7a37c92a0a8237b9e6d2ef67ba8b005ee3529d03991cd3d137f039ba3c4";
};
buildInputs = [ qt4 ];
buildInputs = [ qt4 pulseaudio ];
buildNativeInputs = [ cmake automoc4 xz ];
cmakeFlags = "-DPHONON_MKSPECS_DIR=mkspecs";
preConfigure =
''
substituteInPlace designer/CMakeLists.txt \
--replace '{QT_PLUGINS_DIR}' '{CMAKE_INSTALL_PREFIX}/lib/qt4/plugins'
'';
meta = {
homepage = http://phonon.kde.org/;
description = "Multimedia API for Qt";

View file

@ -1,19 +1,29 @@
{ stdenv
, fetchurl
, gfortran
, blas
, liblapack
}:
stdenv.mkDerivation {
name = "qrupdate-1.1.1";
name = "qrupdate-1.1.2";
src = fetchurl {
url = mirror://sourceforge/qrupdate/1.1/qrupdate-1.1.1.tar.gz ;
sha256 = "0ak68qd15zccr2d2qahxcxsrcdgxy7drg362jj9swv7rb39h00cz";
url = mirror://sourceforge/qrupdate/qrupdate-1.1.2.tar.gz ;
sha256 = "024f601685phcm1pg8lhif3lpy5j9j0k6n0r46743g4fvh8wg8g2";
};
preConfigure = ''
configurePhase = ''
export PREFIX=$out
sed -i -e 's,^BLAS=.*,BLAS=-L${liblapack}/lib -L${liblapack.blas} -lcblas -lf77blas -latlas,' \
-e 's,^LAPACK=.*,LAPACK=-L${liblapack}/lib -llapack -lcblas -lf77blas -latlas,' \
Makeconf
'';
doCheck = true;
checkTarget = "test";
buildTarget = "lib";
installTarget = "install-staticlib";
buildInputs = [gfortran blas liblapack] ;
buildInputs = [ gfortran liblapack ];
}

View file

@ -8,7 +8,7 @@ stdenv.mkDerivation {
};
buildInputs = [ qt4 ];
patches = [./qtscriptgenerator.gcc-4.4.patch];
patches = [ ./qtscriptgenerator.gcc-4.4.patch ./qt-4.8.patch ];
# Why isn't the author providing proper Makefile or a CMakeLists.txt ?
buildPhase = ''

View file

@ -0,0 +1,23 @@
Origin: http://pkgs.fedoraproject.org/gitweb/?p=qtscriptgenerator.git;a=blob_plain;f=qtscriptgenerator-src-0.1.0-no_QFileOpenEvent.patch;h=f397b5ab13bcfc268e6d7b7ba4c6bc66ae38b5c0;hb=HEAD
diff -up qtscriptgenerator-src-0.1.0/generator/typesystem_gui-common.xml.no_QFileOpenEvent qtscriptgenerator-src-0.1.0/generator/typesystem_gui-common.xml
--- qtscriptgenerator-src-0.1.0/generator/typesystem_gui-common.xml.no_QFileOpenEvent 2011-12-22 11:34:52.615149619 -0600
+++ qtscriptgenerator-src-0.1.0/generator/typesystem_gui-common.xml 2011-12-22 11:35:31.808659632 -0600
@@ -2233,7 +2233,6 @@
</object-type>
- <object-type name="QFileOpenEvent" polymorphic-id-expression="%1-&gt;type() == QEvent::FileOpen"/>
<object-type name="QFocusEvent" polymorphic-id-expression="%1-&gt;type() == QEvent::FocusIn || %1-&gt;type() == QEvent::FocusOut">
<modify-function signature="reason()const">
<remove/>
diff -up qtscriptgenerator-src-0.1.0/generator/typesystem_gui.xml.no_QFileOpenEvent qtscriptgenerator-src-0.1.0/generator/typesystem_gui.xml
--- qtscriptgenerator-src-0.1.0/generator/typesystem_gui.xml.no_QFileOpenEvent 2009-02-20 05:42:24.000000000 -0600
+++ qtscriptgenerator-src-0.1.0/generator/typesystem_gui.xml 2011-12-22 11:33:43.058019203 -0600
@@ -2555,7 +2555,6 @@
</object-type>
- <object-type name="QFileOpenEvent" polymorphic-id-expression="%1-&gt;type() == QEvent::FileOpen"/>
<object-type name="QFocusEvent" polymorphic-id-expression="%1-&gt;type() == QEvent::FocusIn || %1-&gt;type() == QEvent::FocusOut">
<modify-function signature="reason()const">
<remove/>

View file

@ -1,24 +1,46 @@
{ stdenv, fetchurl, gfortran }:
{ stdenv, fetchurl, gfortran, tolerateCpuTimingInaccuracy ? true }:
let
optionalString = stdenv.lib.optionalString;
in
stdenv.mkDerivation {
name = "atlas-3.9.11";
name = "atlas-3.9.67";
src = fetchurl {
url = mirror://sf/math-atlas/atlas3.9.11.tar.bz2;
sha256 = "d91e593a772cf540ff693f7d8c43d10c3037eb334c5c77572ea1b6a64a0b9677";
url = mirror://sf/math-atlas/atlas3.9.67.tar.bz2;
sha256 = "06xxlv440z8a3qmfrh17p28girv71c6awvpw5vhpspr0pcsgk1pa";
};
# configure outside of the source directory
# Configure outside of the source directory.
preConfigure = '' mkdir build; cd build; configureScript=../configure; '';
# the manual says you should pass -fPIC as configure arg .. It works
configureFlags = "-Fa alg -fPIC";
# * The manual says you should pass -fPIC as configure arg. Not sure why, but
# it works.
#
# * Atlas aborts the build if it detects that some kind of CPU frequency
# scaling is active on the build machine because that feature offsets the
# performance timings. We ignore that check, however, because with binaries
# being pre-built on Hydra those timings aren't accurate for the local
# machine in the first place.
configureFlags = "-Fa alg -fPIC"
+ optionalString stdenv.isi686 " -b 32"
+ optionalString tolerateCpuTimingInaccuracy " -Si cputhrchk 0";
buildInputs = [ gfortran ];
doCheck = true;
meta = {
description = "Atlas library";
homepage = "http://math-atlas.sourceforge.net/";
description = "Automatically Tuned Linear Algebra Software (ATLAS)";
license = "GPL";
homepage = http://math-atlas.sourceforge.net/;
longDescription = ''
The ATLAS (Automatically Tuned Linear Algebra Software) project is an ongoing
research effort focusing on applying empirical techniques in order to provide
portable performance. At present, it provides C and Fortran77 interfaces to a
portably efficient BLAS implementation, as well as a few routines from LAPACK.
'';
};
}

View file

@ -1,24 +0,0 @@
diff -Naur lapack-3.2.old/SRC/Makefile lapack-3.2/SRC/Makefile
--- lapack-3.2.old/SRC/Makefile 2009-02-04 11:33:35.006839507 +0100
+++ lapack-3.2/SRC/Makefile 2009-02-04 11:33:51.987551506 +0100
@@ -367,7 +367,7 @@
$(ALLAUX)
../$(LAPACKLIB): $(ALLOBJ) $(ALLXOBJ)
- $(ARCH) $(ARCHFLAGS) $@ $(ALLOBJ) $(ALLXOBJ)
+ $(ARCH) $(ARCHFLAGS) $@ $(ALLOBJ) $(ALLXOBJ) ${BLASLIB}
$(RANLIB) $@
single: $(SLASRC) $(ALLAUX) $(SCLAUX)
diff -Naur lapack-3.2.old/TESTING/MATGEN/Makefile lapack-3.2/TESTING/MATGEN/Makefile
--- lapack-3.2.old/TESTING/MATGEN/Makefile 2009-02-04 11:35:10.426806473 +0100
+++ lapack-3.2/TESTING/MATGEN/Makefile 2009-02-04 11:34:42.850565181 +0100
@@ -60,7 +60,7 @@
../../$(TMGLIB): $(SMATGEN) $(CMATGEN) $(SCATGEN) $(DMATGEN) \
$(ZMATGEN) $(DZATGEN)
- $(ARCH) $(ARCHFLAGS) $@ $(ALLOBJ)
+ $(ARCH) $(ARCHFLAGS) $@ $(ALLOBJ) ${BLASLIB}
$(RANLIB) $@
single: $(SMATGEN) $(SCATGEN)

View file

@ -1,66 +1,35 @@
{ stdenv, fetchurl, gfortran, blas }:
{ stdenv, fetchurl, gfortran, atlas, cmake, python }:
stdenv.mkDerivation {
name = "liblapack-3.2.1";
name = "liblapack-3.4.0";
src = fetchurl {
url = "http://www.netlib.org/lapack/lapack-3.2.1.tgz";
sha256 = "5825f83971157001fd4235514afe8ff5fc16e1c06b2e872e442c242efd6c166d";
url = "http://www.netlib.org/lapack/lapack-3.4.0.tgz";
sha256 = "1sf30v1ps5icg67dvw5sbx5yhypx13am470gqg2f7l04f3wrw4x7";
};
buildInputs = [gfortran blas];
patches = [ ./blas-link.patch ];
propagatedBuildInputs = [ atlas ];
buildInputs = [ gfortran cmake ];
buildNativeInputs = [ python ];
configurePhase = ''
echo >make.inc "SHELL = ${stdenv.shell}"
echo >>make.inc "PLAT ="
echo >>make.inc "FORTRAN = gfortran"
echo >>make.inc "OPTS = -O2 -fPIC"
echo >>make.inc "DRVOPTS = \$(OPTS)"
echo >>make.inc "NOOPT = -O0 -fPIC"
echo >>make.inc "LOADER = gfortran"
echo >>make.inc "LOADOPTS ="
echo >>make.inc "TIMER = INT_ETIME"
echo >>make.inc "ARCH = gfortran"
echo >>make.inc "ARCHFLAGS = -shared -o"
echo >>make.inc "RANLIB = echo"
echo >>make.inc "BLASLIB = -lblas"
echo >>make.inc "LAPACKLIB = liblapack.so.3"
echo >>make.inc "TMGLIB = libtmglib.so.3"
echo >>make.inc "EIGSRCLIB = libeigsrc.so.3"
echo >>make.inc "LINSRCLIB = liblinsrc.so.3"
'';
cmakeFlags = [
"-DUSE_OPTIMIZED_BLAS=ON"
"-DBLAS_ATLAS_f77blas_LIBRARY=${atlas}/lib/libf77blas.a"
"-DBLAS_ATLAS_atlas_LIBRARY=${atlas}/lib/libatlas.a"
"-DCMAKE_Fortran_FLAGS=-fPIC"
];
buildPhase = ''
make clean
make lib
echo >make.inc "SHELL = ${stdenv.shell}"
echo >>make.inc "PLAT ="
echo >>make.inc "FORTRAN = gfortran"
echo >>make.inc "OPTS = -O2 -fPIC"
echo >>make.inc "DRVOPTS = \$(OPTS)"
echo >>make.inc "NOOPT = -O0 -fPIC"
echo >>make.inc "LOADER = gfortran"
echo >>make.inc "LOADOPTS = "
echo >>make.inc "TIMER = INT_ETIME"
echo >>make.inc "ARCH = ar rcs"
echo >>make.inc "RANLIB = ranlib"
echo >>make.inc "BLASLIB = "
echo >>make.inc "ARCHFLAGS ="
echo >>make.inc "LAPACKLIB = liblapack.a"
echo >>make.inc "TMGLIB = tmglib.a"
echo >>make.inc "EIGSRCLIB = eigsrc.a"
echo >>make.inc "LINSRCLIB = linsrc.a"
make clean
make lib
'';
doCheck = true;
installPhase = ''
ensureDir "$out/lib"
install -m755 *.a* "$out/lib"
install -m755 *.so* "$out/lib"
ln -sf liblapack.so.3 "$out/lib/liblapack.so"
ln -sf libtmglib.so.3 "$out/lib/libtmglib.so"
'';
checkPhase = "
sed -i 's,^#!.*,#!${python}/bin/python,' lapack_testing.py
ctest
";
enableParallelBuilding = true;
passthru = {
blas = atlas;
};
meta = {
description = "Linear Algebra PACKage";

View file

@ -1,4 +1,4 @@
{ fetchurl, stdenv, coin3d, qt4 }:
{ fetchurl, stdenv, coin3d, qt4, pkgconfig }:
stdenv.mkDerivation rec {
name = "soqt-${version}";
@ -11,6 +11,8 @@ stdenv.mkDerivation rec {
buildInputs = [ coin3d qt4 ];
buildNativeInputs = [ pkgconfig ];
meta = {
homepage = http://www.coin3d.org/;
license = "GPLv2+";

View file

@ -0,0 +1,16 @@
{ stdenv, fetchsvn, curl }:
let rev = "2262"; in
stdenv.mkDerivation {
name = "xmlrpc-c-r${rev}";
buildInputs = [ curl ];
preInstall = "export datarootdir=$out/share";
src = fetchsvn {
url = http://xmlrpc-c.svn.sourceforge.net/svnroot/xmlrpc-c/advanced;
rev = "2262";
sha256 = "1grwnczp5dq3w20rbz8bgpwl6jmw0w7cm7nbinlasf3ap5sc5ahb";
};
}

View file

@ -0,0 +1,60 @@
{ fetchurl, stdenv, replace, curl, expat, zlib, bzip2, libarchive
, useNcurses ? false, ncurses, useQt4 ? false, qt4, xmlrpc_c
, darwinInstallNameToolUtility }:
with stdenv.lib;
let
os = stdenv.lib.optionalString;
majorVersion = "2.6";
minorVersion = "4";
version = "${majorVersion}.${minorVersion}";
in
stdenv.mkDerivation rec {
name = "cmake-${os useNcurses "cursesUI-"}${os useQt4 "qt4UI-"}${version}";
inherit majorVersion;
src = fetchurl {
url = "${meta.homepage}files/v${majorVersion}/cmake-${version}.tar.gz";
sha256 = "1wpxr5x4aggaqrqzjq3kg4hh09f0vyr1njik1pad01bvwd923pcw";
};
patches =
# Don't search in non-Nix locations such as /usr, but do search in
# Nixpkgs' Glibc.
optional (stdenv ? glibc) ./search-path-264.patch;
buildInputs = [ curl expat zlib bzip2 libarchive xmlrpc_c ]
++ optional stdenv.isDarwin darwinInstallNameToolUtility
++ optional useNcurses ncurses
++ optional useQt4 qt4;
CMAKE_PREFIX_PATH = stdenv.lib.concatStringsSep ":" buildInputs;
configureFlags =
"--docdir=/share/doc/${name} --mandir=/share/man --system-libs"
+ stdenv.lib.optionalString useQt4 " --qt-gui";
setupHook = ./setup-hook.sh;
postUnpack =
''
dontUseCmakeConfigure=1
source $setupHook
fixCmakeFiles $sourceRoot
'';
preConfigure = optionalString (stdenv ? glibc)
''
substituteInPlace Modules/Platform/UnixPaths.cmake --subst-var-by glibc ${stdenv.glibc}
'';
meta = {
homepage = http://www.cmake.org/;
description = "Cross-Platform Makefile Generator";
platforms = if useQt4 then qt4.meta.platforms else stdenv.lib.platforms.all;
maintainers = [ stdenv.lib.maintainers.urkud ];
};
}

View file

@ -0,0 +1,93 @@
diff --git a/Modules/Platform/Linux.cmake b/Modules/Platform/Linux.cmake
index 4e4c2cb..9784655 100644
--- a/Modules/Platform/Linux.cmake
+++ b/Modules/Platform/Linux.cmake
@@ -43,21 +43,10 @@ ELSE(DEFINED CMAKE_INSTALL_SO_NO_EXE)
# checking the platform every time. This option is advanced enough
# that only package maintainers should need to adjust it. They are
# capable of providing a setting on the command line.
- IF(EXISTS "/etc/debian_version")
- SET(CMAKE_INSTALL_SO_NO_EXE 1 CACHE INTERNAL
- "Install .so files without execute permission.")
- ELSE(EXISTS "/etc/debian_version")
- SET(CMAKE_INSTALL_SO_NO_EXE 0 CACHE INTERNAL
- "Install .so files without execute permission.")
- ENDIF(EXISTS "/etc/debian_version")
+ SET(CMAKE_INSTALL_SO_NO_EXE 0 CACHE INTERNAL
+ "Install .so files without execute permission.")
ENDIF(DEFINED CMAKE_INSTALL_SO_NO_EXE)
INCLUDE(Platform/UnixPaths)
-# Debian has lib64 paths only for compatibility so they should not be
-# searched.
-IF(EXISTS "/etc/debian_version")
- SET_PROPERTY(GLOBAL PROPERTY FIND_LIBRARY_USE_LIB64_PATHS FALSE)
-ENDIF(EXISTS "/etc/debian_version")
-# always include the gcc compiler information
INCLUDE(Platform/gcc)
diff --git a/Modules/Platform/UnixPaths.cmake b/Modules/Platform/UnixPaths.cmake
index 584d334..4fcf951 100755
--- a/Modules/Platform/UnixPaths.cmake
+++ b/Modules/Platform/UnixPaths.cmake
@@ -8,56 +8,18 @@ GET_FILENAME_COMPONENT(_CMAKE_INSTALL_DIR "${_CMAKE_INSTALL_DIR}" PATH)
# List common installation prefixes. These will be used for all
# search types.
LIST(APPEND CMAKE_SYSTEM_PREFIX_PATH
- # Standard
- / /usr /usr/local
-
- # CMake install location
- "${_CMAKE_INSTALL_DIR}"
-
- # Project install destination.
- "${CMAKE_INSTALL_PREFIX}"
- )
-
-# List common include file locations not under the common prefixes.
-LIST(APPEND CMAKE_SYSTEM_INCLUDE_PATH
- # Windows API on Cygwin
- /usr/include/w32api
-
- # X11
- /usr/X11R6/include /usr/include/X11
-
- # Other
- /opt/local/include /usr/pkg/include
- /opt/csw/include /opt/include
- /usr/openwin/include
- )
-
-LIST(APPEND CMAKE_SYSTEM_LIBRARY_PATH
- # Windows API on Cygwin
- /usr/lib/w32api
-
- # X11
- /usr/X11R6/lib /usr/lib/X11
-
- # Other
- /opt/local/lib /usr/pkg/lib
- /opt/csw/lib /opt/lib
- /usr/openwin/lib
- )
-
-LIST(APPEND CMAKE_SYSTEM_PROGRAM_PATH
- /usr/pkg/bin
+ "@glibc@"
)
LIST(APPEND CMAKE_PLATFORM_IMPLICIT_LINK_DIRECTORIES
- /lib /usr/lib /usr/lib32 /usr/lib64
+ "@glibc@/lib"
)
LIST(APPEND CMAKE_C_IMPLICIT_INCLUDE_DIRECTORIES
- /usr/include
+ "@glibc@/include"
)
LIST(APPEND CMAKE_CXX_IMPLICIT_INCLUDE_DIRECTORIES
- /usr/include
+ "@glibc@/include"
)
# Enable use of lib64 search path variants by default.

View file

@ -4,8 +4,8 @@
cabal.mkDerivation (self: {
pname = "hlint";
version = "1.8.23";
sha256 = "0cbjnzs9ddk4z7kxh935x1kvr566afcvk98z3174f3xp5sbz79wr";
version = "1.8.24";
sha256 = "1crxhpgy49xg3j225cyfxflnc8zgck2xa8hb04chd0yh9n03h6kx";
isLibrary = true;
isExecutable = true;
buildDepends = [

View file

@ -0,0 +1,26 @@
{stdenv, fetchurl, unzip}:
let baseName = "premake";
version = "3.7";
in
stdenv.mkDerivation {
name = "${baseName}-${version}";
src = fetchurl {
url = "http://downloads.sourceforge.net/sourceforge/premake/${baseName}-src-${version}.zip";
sha256 = "b59841a519e75d5b6566848a2c5be2f91455bf0cc6ae4d688fcbd4c40db934d5";
};
buildInputs = [unzip];
installPhase = ''
install -Dm755 bin/premake $out/bin/premake
'';
meta = {
homepage = http://industriousone.com/premake;
description = "A simple build configuration and project generation tool using lua";
license = stdenv.lib.licenses.bsd3;
};
}

View file

@ -0,0 +1,75 @@
{ stdenv, fetchurl, libvorbis, libogg, libtheora, SDL, libXft, SDL_image, zlib, libX11, libpng, openal, requireFile, commercialVersion ? false }:
let plainName = "andyetitmoves";
version = "1.2.2";
in
stdenv.mkDerivation rec {
name = "${plainName}-${version}";
src = if stdenv.system == "i686-linux" || stdenv.system == "x86_64-linux"
then
let postfix = if stdenv.system == "i686-linux" then "i386" else "x86_64";
commercialName = "${plainName}-${version}_${postfix}.tar.gz";
demoUrl = "http://www.andyetitmoves.net/demo/${plainName}Demo-${version}_${postfix}.tar.gz";
in
if commercialVersion
then requireFile {
message = ''
We cannot download the commercial version automatically, as you require a license.
Once you bought a license, you need to add your downloaded version to the nix store.
You can do this by using "nix-prefetch-url file:///\$PWD/${commercialName}" in the
directory where yousaved it.
'';
name = commercialName;
sha256 = if stdenv.system == "i686-linux"
then "15wvzmmidvykwjrbnq70h5jrvnjx1hcrm0357qj85q4aqbzavh01"
else "1v8z16qa9ka8sf7qq45knsxj87s6sipvv3a7xq11pb5xk08fb2ql";
}
else fetchurl {
url = demoUrl;
sha256 = if stdenv.system == "i686-linux"
then "0f14vrrbq05hsbdajrb5y9za65fpng1lc8f0adb4aaz27x7sh525"
else "0mg41ya0b27blq3b5498kwl4rj46dj21rcd7qd0rw1kyvr7sx4v4";
}
else
throw "And Yet It Moves nix package only supports linux and intel cpu's.";
phases = "unpackPhase installPhase";
installPhase = ''
ensureDir $out/{opt/andyetitmoves,bin}
cp -r * $out/opt/andyetitmoves/
fullPath=${stdenv.gcc.gcc}/lib64
for i in $buildNativeInputs; do
fullPath=$fullPath''${fullPath:+:}$i/lib
done
binName=${if commercialVersion then "AndYetItMoves" else "AndYetItMovesDemo"}
patchelf --set-interpreter $(cat $NIX_GCC/nix-support/dynamic-linker) --set-rpath $fullPath $out/opt/andyetitmoves/lib/$binName
cat > $out/bin/$binName << EOF
#!/bin/sh
cd $out/opt/andyetitmoves
exec ./lib/$binName
EOF
chmod +x $out/bin/$binName
'';
buildInputs = [libvorbis libogg libtheora SDL libXft SDL_image zlib libX11 libpng openal];
meta = {
description = "Physics/Gravity Platform game";
longDescription = ''
And Yet It Moves is an award-winning physics-based platform game in which players rotate the game world at will to solve challenging puzzles. Tilting the world turns walls into floors, slides into platforms, and stacks of rocks into dangerous hazards.
'';
homepage = http://www.andyetitmoves.net/;
license = "unfree";
maintainers = with stdenv.lib.maintainers; [bluescreen303];
};
}

View file

@ -1,18 +1,22 @@
{ fetchurl, stdenv, plib, SDL, openal, freealut, mesa
, libvorbis, libogg, gettext }:
, libvorbis, libogg, gettext, irrlicht3843, libXxf86vm, curl, pkgconfig
, fribidi }:
stdenv.mkDerivation rec {
name = "supertuxkart-0.6.2a";
name = "supertuxkart-0.7.3";
src = fetchurl {
url = "mirror://sourceforge/supertuxkart/${name}-src.tar.bz2";
sha256 = "0bdn12kg85bgcgj9shfc40k56228hysiixfaxkycgb688nhldngr";
sha256 = "0njrs2qyhbiqdbsqk9jx0sl8nhdwmipf1i91k23rv1biwrim9yq7";
};
buildInputs = [
plib SDL openal freealut mesa libvorbis libogg gettext
plib SDL openal freealut mesa libvorbis libogg gettext irrlicht3843
libXxf86vm curl pkgconfig fribidi
];
configureFlags = [ "--with-irrlicht=${irrlicht3843}" ];
postInstall = ''
mv $out/games $out/bin
'';

View file

@ -1,5 +1,5 @@
x@{builderDefsPackage
, qt4, box2d
, qt4, box2d, which
,fetchsvn
, ...}:
builderDefsPackage

View file

@ -1,16 +1,16 @@
{ fetchurl, stdenv, mesa, SDL, scons, freeglut, SDL_image, glew, libvorbis,
asio, boost, SDL_gfx }:
asio, boost, SDL_gfx, pkgconfig, bullet, curl, libarchive }:
stdenv.mkDerivation rec {
name = "vdrift-2010-06-30";
name = "vdrift-2011-10-22";
src = fetchurl {
url = "mirror://sourceforge/vdrift/${name}.tar.bz2";
sha256 = "1zbh62363gx4ayyx4wcsp5di4f16qqfg2ajwkgw71kss6j7lk71j";
sha256 = "0vg1v1590jbln6k236kxn2sfgclvc6g34kykhh4nq9q3l1xgy38s";
};
buildInputs = [ scons mesa SDL freeglut SDL_image glew libvorbis asio boost
SDL_gfx ];
SDL_gfx pkgconfig bullet curl libarchive ];
buildPhase = ''
sed -i -e s,/usr/local,$out, SConstruct

View file

@ -1,7 +1,7 @@
# Packages that make up the GNU/Hurd operating system (aka. GNU).
args@{ fetchgit, stdenv, autoconf, automake, automake111x, libtool
, texinfo, glibcCross, hurdPartedCross, libuuid
, texinfo, glibcCross, hurdPartedCross, libuuid, samba_light
, gccCrossStageStatic, gccCrossStageFinal
, forceBuildDrv, callPackage, platform, config, crossSystem }:
@ -86,4 +86,9 @@ rec {
}).stdenv;
}
else { });
smbfs = callPackage ./smbfs {
samba = samba_light;
hurd = hurdCross;
};
}

View file

@ -0,0 +1,41 @@
{ fetchcvs, stdenv, hurd, machHeaders, samba }:
let
date = "2011-11-14";
in
stdenv.mkDerivation rec {
name = "smbfs-${date}";
src = fetchcvs {
cvsRoot = ":pserver:anonymous@cvs.savannah.nongnu.org:/sources/hurdextras";
module = "smbfs";
sha256 = "b36765fde77c6cafb04ab1ff44b19bb00b490064b5a02b9ced7828170ab47a70";
inherit date;
};
patchPhase =
'' sed -i "Makefile" \
-e 's|gcc|i586-pc-gnu-gcc|g ;
s|^LDFLAGS=\(.*\)$|LDFLAGS=\1 -pthread|g'
'';
buildInputs = [ hurd machHeaders samba ];
installPhase =
'' mkdir -p "$out/hurd"
cp -v smbfs "$out/hurd"
mkdir -p "$out/share/doc/${name}"
cp -v README "$out/share/doc/${name}"
'';
meta = {
description = "SMB/CIFS file system translator for GNU/Hurd";
homepage = http://www.nongnu.org/hurdextras/;
license = "GPLv3+";
maintainers = [ stdenv.lib.maintainers.ludo ];
};
}

View file

@ -1,9 +1,8 @@
{ stdenv, fetchurl, kernel }:
let
version = "0.4.1";
name = "bbswitch-${version}-${kernel.version}";
baseName = "bbswitch-0.4.1";
name = "${baseName}-${kernel.version}";
in
@ -11,7 +10,7 @@ stdenv.mkDerivation {
inherit name;
src = fetchurl {
url = "http://github.com/downloads/Bumblebee-Project/bbswitch/${name}.tar.gz";
url = "http://github.com/downloads/Bumblebee-Project/bbswitch/${baseName}.tar.gz";
sha256 = "d579c6efc5f6482f0cf0b2c1b1f1a127413218cdffdc8f2d5a946c11909bda23";
};

View file

@ -1,10 +1,13 @@
{ stdenv, fetchurl, kernel }:
let baseName = "frandom-1.1";
in
stdenv.mkDerivation rec {
name = "frandom-1.1-${kernel.version}";
name = "${baseName}-${kernel.version}";
src = fetchurl {
url = "http://sourceforge.net/projects/frandom/files/${name}.tar.gz";
url = "http://sourceforge.net/projects/frandom/files/${baseName}.tar.gz";
sha256 = "15rgyk4hfawqg7z1spk2xlk1nn6rcdls8gdhc70f91shrc9pvlls";
};

View file

@ -5,8 +5,20 @@ args @ { stdenv, fetchurl, userModeLinux ? false, extraConfig ? ""
let
configWithPlatform = kernelPlatform :
''
# Don't include any debug features.
DEBUG_KERNEL n
# powermanagement and debugging for powertop
DEBUG_KERNEL y
PM_ADVANCED_DEBUG y
PM_RUNTIME y
TIMER_STATS y
USB_SUSPEND y
BACKTRACE_SELF_TEST n
CPU_NOTIFIER_ERROR_INJECT n
DEBUG_DEVRES n
DEBUG_NX_TEST n
DEBUG_STACK_USAGE n
DEBUG_STACKOVERFLOW n
RCU_TORTURE_TEST n
SCHEDSTATS n
# Support drivers that need external firmware.
STANDALONE n

View file

@ -5,8 +5,20 @@ args @ { stdenv, fetchurl, userModeLinux ? false, extraConfig ? ""
let
configWithPlatform = kernelPlatform :
''
# Don't include any debug features.
DEBUG_KERNEL n
# powermanagement and debugging for powertop
DEBUG_KERNEL y
PM_ADVANCED_DEBUG y
PM_RUNTIME y
TIMER_STATS y
USB_SUSPEND y
BACKTRACE_SELF_TEST n
CPU_NOTIFIER_ERROR_INJECT n
DEBUG_DEVRES n
DEBUG_NX_TEST n
DEBUG_STACK_USAGE n
DEBUG_STACKOVERFLOW n
RCU_TORTURE_TEST n
SCHEDSTATS n
# Support drivers that need external firmware.
STANDALONE n

View file

@ -5,8 +5,20 @@ args @ { stdenv, fetchurl, userModeLinux ? false, extraConfig ? ""
let
configWithPlatform = kernelPlatform :
''
# Don't include any debug features.
DEBUG_KERNEL n
# powermanagement and debugging for powertop
DEBUG_KERNEL y
PM_ADVANCED_DEBUG y
PM_RUNTIME y
TIMER_STATS y
USB_SUSPEND y
BACKTRACE_SELF_TEST n
CPU_NOTIFIER_ERROR_INJECT n
DEBUG_DEVRES n
DEBUG_NX_TEST n
DEBUG_STACK_USAGE n
DEBUG_STACKOVERFLOW n
RCU_TORTURE_TEST n
SCHEDSTATS n
# Support drivers that need external firmware.
STANDALONE n

View file

@ -5,8 +5,20 @@ args @ { stdenv, fetchurl, userModeLinux ? false, extraConfig ? ""
let
configWithPlatform = kernelPlatform :
''
# Don't include any debug features.
DEBUG_KERNEL n
# powermanagement and debugging for powertop
DEBUG_KERNEL y
PM_ADVANCED_DEBUG y
PM_RUNTIME y
TIMER_STATS y
USB_SUSPEND y
BACKTRACE_SELF_TEST n
CPU_NOTIFIER_ERROR_INJECT n
DEBUG_DEVRES n
DEBUG_NX_TEST n
DEBUG_STACK_USAGE n
DEBUG_STACKOVERFLOW n
RCU_TORTURE_TEST n
SCHEDSTATS n
# Support drivers that need external firmware.
STANDALONE n
@ -214,7 +226,7 @@ in
import ./generic.nix (
rec {
version = "3.2.4";
version = "3.2.7";
testing = false;
modDirVersion = version;
@ -222,10 +234,10 @@ import ./generic.nix (
preConfigure = ''
substituteInPlace scripts/depmod.sh --replace '-b "$INSTALL_MOD_PATH"' ""
'';
src = fetchurl {
url = "mirror://kernel/linux/kernel/v3.0/${if testing then "testing/" else ""}linux-${version}.tar.bz2";
sha256 = "1c648a7041e65a167d3fd8beda484a3d55c35cad9d6d189b9949d3c621887da7";
sha256 = "e80009e097e137b9a1f1efacabc482c1d4b3651b238bf733a41595d0b387ae12";
};
config = configWithPlatform stdenv.platform;

View file

@ -322,6 +322,20 @@ rec {
features.aufs3 = true;
};
aufs3_2 = rec {
name = "aufs3.2";
version = "3.2";
utilRev = "a953b0218667e06b722f4c41df29edacd8dc8e1f";
utilHash = "28ac4c1a07b2c30fb61a6facc9cedcf67b14f303baedf1b121aeb6293ea49eb4";
patch = makeAufs3StandalonePatch {
inherit version;
rev = "9c4bbeb58f0ecc235ea820ae320efa2c0006e033";
sha256 = "5363a7f5fbadaef9457e743a5781f2525332c4bbb91693ca2596ab2d8f7860ea";
};
features.aufsBase = true;
features.aufs3 = true;
};
# Increase the timeout on CIFS requests from 15 to 120 seconds to
# make CIFS more resilient to high load on the CIFS server.
cifs_timeout_2_6_15 =

View file

@ -1,17 +1,15 @@
{stdenv, fetchurl, openssl, qt4, inkscape, dbus_libs, pkgconfig, libnl1}:
{ stdenv, fetchurl, openssl, dbus_libs, pkgconfig, libnl1 }:
let
stdenv.mkDerivation rec {
version = "0.7.3";
name = "wpa_supplicant-${version}";
src = fetchurl {
url = "http://hostap.epitest.fi/releases/wpa_supplicant-${version}.tar.gz";
sha256 = "0hwlsn512q2ps8wxxjmkjfdg3vjqqb9mxnnwfv1wqijkm3551kfh";
};
in
(stdenv.mkDerivation rec {
name = "wpa_supplicant-${version}";
inherit src;
preBuild = ''
cd wpa_supplicant
cp -v defconfig .config
@ -23,24 +21,25 @@ in
substituteInPlace Makefile --replace /usr/local $out
'';
buildInputs = [openssl dbus_libs libnl1];
buildInputs = [ openssl dbus_libs libnl1 ];
buildNativeInputs = [ pkgconfig ];
# Upstream patch required for NetworkManager-0.9
patches = [ (fetchurl {
url = "http://w1.fi/gitweb/gitweb.cgi?p=hostap-07.git;a=commitdiff_plain;h=b80b5639935d37b95d00f86b57f2844a9c775f57";
name = "wpa_supplicant-nm-0.9.patch";
sha256 = "1pqba0l4rfhba5qafvvbywi9x1qmphs944p704bh1flnx7cz6ya8";
})
# wpa_supplicant crashes when controlled through dbus (wicd/nm)
# see: https://bugzilla.redhat.com/show_bug.cgi?id=678625
(fetchurl {
url = "https://bugzilla.redhat.com/attachment.cgi?id=491018";
name = "dbus-assertion-fix.patch";
sha256 = "6206d79bcd800d56cae73e2a01a27ac2bee961512f77e5d62a59256a9919077a";
})
];
patches =
[ # Upstream patch required for NetworkManager-0.9
(fetchurl {
url = "http://w1.fi/gitweb/gitweb.cgi?p=hostap-07.git;a=commitdiff_plain;h=b80b5639935d37b95d00f86b57f2844a9c775f57";
name = "wpa_supplicant-nm-0.9.patch";
sha256 = "1pqba0l4rfhba5qafvvbywi9x1qmphs944p704bh1flnx7cz6ya8";
})
# wpa_supplicant crashes when controlled through dbus (wicd/nm)
# see: https://bugzilla.redhat.com/show_bug.cgi?id=678625
(fetchurl {
url = "https://bugzilla.redhat.com/attachment.cgi?id=491018";
name = "dbus-assertion-fix.patch";
sha256 = "6206d79bcd800d56cae73e2a01a27ac2bee961512f77e5d62a59256a9919077a";
})
];
postInstall = ''
ensureDir $out/share/man/man5 $out/share/man/man8
@ -50,7 +49,7 @@ in
cp -v dbus/*service $out/share/dbus-1/system-services
sed -e "s@/sbin/wpa_supplicant@$out&@" -i $out/share/dbus-1/system-services/*
cp -v dbus/dbus-wpa_supplicant.conf $out/etc/dbus-1/system.d
'';
''; # */
meta = {
homepage = http://hostap.epitest.fi/wpa_supplicant/;
@ -58,41 +57,4 @@ in
maintainers = with stdenv.lib.maintainers; [marcweber urkud];
platforms = stdenv.lib.platforms.linux;
};
}) // {
gui = stdenv.mkDerivation {
name = "wpa_gui-${version}";
inherit src;
buildInputs = [ qt4 ];
buildNativeInputs = [ inkscape ];
prePatch = "cd wpa_supplicant/wpa_gui-qt4";
configurePhase = ''
lrelease wpa_gui.pro
qmake'';
# We do not install .xpm icons. First of all, I don't know where they should
# be install. Second, this allows us to drop imagemagick build-time dependency.
postBuild = ''
sed -e '/ICONS.*xpm/d' -i icons/Makefile
make -C icons
'';
installPhase = ''
mkdir -pv $out/bin
cp -v wpa_gui $out/bin
mkdir -pv $out/share/applications
cp -v wpa_gui.desktop $out/share/applications
mkdir -pv $out/share/icons
cp -av icons/hicolor $out/share/icons
'';
meta = {
description = "Qt4 wpa_supplicant client";
inherit (qt4.meta) platforms;
};
};
}

View file

@ -1,15 +0,0 @@
{stdenv, fetchurl, qt4, imagemagick, inkscape}:
stdenv.mkDerivation rec {
pkgname = "wpa_supplicant";
version = "0.6.9";
name = "${pkgname}-gui-qt4-${version}";
src = fetchurl {
url = "http://hostap.epitest.fi/releases/${pkgname}-${version}.tar.gz";
sha256 = "0w7mf3nyilkjsn5v7p15v5fxnh0klgm8c979z80y0mkw7zx88lkf";
};
buildInputs = [qt4 imagemagick inkscape];
builder = ./builder-gui-qt4.sh;
}

View file

@ -0,0 +1,42 @@
{ stdenv, fetchurl, qt4, inkscape, wpa_supplicant }:
stdenv.mkDerivation {
name = "wpa_gui-${wpa_supplicant.version}";
inherit (wpa_supplicant) src;
buildInputs = [ qt4 ];
buildNativeInputs = [ inkscape ];
prePatch = "cd wpa_supplicant/wpa_gui-qt4";
configurePhase =
''
lrelease wpa_gui.pro
qmake
'';
# We do not install .xpm icons. First of all, I don't know where they should
# be install. Second, this allows us to drop imagemagick build-time dependency.
postBuild =
''
sed -e '/ICONS.*xpm/d' -i icons/Makefile
make -C icons
'';
installPhase =
''
mkdir -pv $out/bin
cp -v wpa_gui $out/bin
mkdir -pv $out/share/applications
cp -v wpa_gui.desktop $out/share/applications
mkdir -pv $out/share/icons
cp -av icons/hicolor $out/share/icons
'';
meta = {
description = "Qt-based GUI for wpa_supplicant";
inherit (qt4.meta) platforms;
};
}

View file

@ -22,6 +22,10 @@ stdenv.mkDerivation rec {
export NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE -I${libxml2}/include/libxml2"
'';
postInstall = ''
mv $out/sbin $out/bin
'';
meta = {
description = "nginx - 'engine x' - reverse proxy and lightweight webserver";
maintainers = [

View file

@ -2,11 +2,11 @@
let
version = "1.8.7";
version = "1.8.10";
src = fetchurl {
url = "mirror://sourceforge/zabbix/zabbix-${version}.tar.gz";
sha256 = "1727y9yphff7ad9n843yls7rp9lh86m83jmrj6xr0ah45f02ja9d";
sha256 = "0jx5i1ps1zr908g8gh1zisajiblg40x8cchmgbpdviz85hzx4rfr";
};
preConfigure =

View file

@ -28,6 +28,9 @@ stdenv.mkDerivation rec {
patches =
[ # Fix for https://bugzilla.samba.org/show_bug.cgi?id=8541.
./readlink.patch
# Allow cross-builds for GNU/Hurd.
./libnss-wins-pthread.patch
];
buildInputs = [ readline pam openldap popt iniparser libunwind fam acl cups ]
@ -39,7 +42,7 @@ stdenv.mkDerivation rec {
# XXX: Awful hack to allow cross-compilation.
'' sed -i source3/configure \
-e 's/^as_fn_error \("cannot run test program while cross compiling\)/$as_echo \1/g'
'';
''; # "
preConfigure =
'' cd source3

View file

@ -0,0 +1,15 @@
`libnss_wins' uses pthreads but is built without `-pthread'. This is
not a problem when building natively on GNU/Linux, but causes troubles
when cross-building for GNU/Hurd (undefined references to libpthread
functions.)
--- samba-3.6.1/source3/Makefile.in 2012-02-22 15:25:15.000000000 +0100
+++ samba-3.6.1/source3/Makefile.in 2012-02-22 15:25:47.000000000 +0100
@@ -2760,6 +2760,7 @@ bin/vlp@EXEEXT@: $(BINARY_PREREQS) $(VLP
@echo "Linking $@"
@$(SHLD) $(LDSHFLAGS) -o $@ $(WINBIND_WINS_NSS_OBJ) \
$(LDAP_LIBS) $(KRB5LIBS) $(LIBS) $(LIBTALLOC_LIBS) $(LIBTDB_LIBS) $(ZLIB_LIBS) \
+ $(PTHREAD_LDFLAGS) \
@SONAMEFLAG@`basename $@`@NSSSONAMEVERSIONSUFFIX@
bin/winbind_krb5_locator.@SHLIBEXT@: $(BINARY_PREREQS) $(WINBIND_KRB5_LOCATOR_OBJ) $(LIBWBCLIENT)

View file

@ -1,13 +1,13 @@
{ stdenv, fetchurl, zlib, ncurses, readline }:
let version = "8.3.16"; in
let version = "8.3.17"; in
stdenv.mkDerivation rec {
name = "postgresql-${version}";
src = fetchurl {
url = "mirror://postgresql/source/v${version}/${name}.tar.bz2";
sha256 = "0i17da3jz44y2xikp99qs0dac9j84hghr8rg5n7hr86ippi90180";
sha256 = "0xq8yg8qwd4qvjk6764argaxl6fribyf1xnxmdsk4xfcmgmfw5gv";
};
buildInputs = [ zlib ncurses readline ];

View file

@ -1,13 +1,13 @@
{ stdenv, fetchurl, zlib, ncurses, readline }:
let version = "8.4.9"; in
let version = "8.4.10"; in
stdenv.mkDerivation rec {
name = "postgresql-${version}";
src = fetchurl {
url = "mirror://postgresql/source/v${version}/${name}.tar.bz2";
sha256 = "12n3x2q444hfhy9nbl14yfhd58im86jmlb9b0ihqzbmq1j6wnn0x";
sha256 = "1yvwn2qpn2dpgfi496r1zl8b8xy52lb2pprg076pvc37sklq77vl";
};
buildInputs = [ zlib ncurses readline ];

View file

@ -0,0 +1,35 @@
{ stdenv, fetchurl, zlib, readline }:
let version = "9.1.2"; in
stdenv.mkDerivation rec {
name = "postgresql-${version}";
src = fetchurl {
url = "mirror://postgresql/source/v${version}/${name}.tar.bz2";
sha256 = "0c6vwlfxppjvrikqfq6s87sxmxxvsx1qq03bwgk589sv9x8zym4d";
};
buildInputs = [ zlib readline ];
enableParallelBuilding = true;
LC_ALL = "C";
postInstall =
''
mkdir -p $out/share/man
cp -rvd doc/src/sgml/man1 $out/share/man
'';
passthru = {
inherit readline;
psqlSchema = "9.1";
};
meta = {
homepage = http://www.postgresql.org/;
description = "A powerful, open source object-relational database system";
license = "bsd";
};
}

View file

@ -1,32 +0,0 @@
{ stdenv, fetchurl, pkgconfig, x11, libpng, libjpeg, expat, libXaw
, yacc, libtool, fontconfig, pango, gd
}:
assert libpng != null && libjpeg != null && expat != null;
stdenv.mkDerivation rec {
name = "graphviz-2.24.0";
src = fetchurl {
url = "http://www.graphviz.org/pub/graphviz/ARCHIVE/${name}.tar.gz";
sha256 = "01182be7851ef6d292a916b19ac25a33bce5dccbd4661bf3101abbd3dfb1ae00";
};
buildInputs = [pkgconfig x11 libpng libjpeg expat libXaw yacc libtool fontconfig pango gd];
configureFlags =
[ "--with-pngincludedir=${libpng}/include"
"--with-pnglibdir=${libpng}/lib"
"--with-jpegincludedir=${libjpeg}/include"
"--with-jpeglibdir=${libjpeg}/lib"
"--with-expatincludedir=${expat}/include"
"--with-expatlibdir=${expat}/lib"
"--with-codegens"
]
++ stdenv.lib.optional (x11 == null) "--without-x";
meta = {
description = "A program for visualising graphs";
homepage = http://www.graphviz.org/;
};
}

View file

@ -5,8 +5,8 @@ stdenv.mkDerivation {
src = fetchsvn {
url = https://netpbm.svn.sourceforge.net/svnroot/netpbm/advanced;
rev = 1177;
sha256 = "d8893599fcb7839025e7fbe24120928b4bbcd70f0e1034a21d91885c40a5c39f";
rev = 1656;
sha256 = "0mbrvd8nc52yrg8wgxcvxsajxc9qrnjqhlcks6dpdzq7qmwjy6g9";
};
NIX_CFLAGS_COMPILE = if stdenv.system == "x86_64-linux" then "-fPIC" else "";

View file

@ -1,18 +1,20 @@
{stdenv, fetchurl}:
{ stdenv, fetchurl }:
stdenv.mkDerivation rec {
name = "dhcpcd-5.0.6";
name = "dhcpcd-5.5.4";
src = fetchurl {
url = "http://roy.marples.name/downloads/dhcpcd/${name}.tar.bz2";
sha256 = "0q8yz1kg9x031lnsvws010wawg0z85xv34575x1iavh3lrd90705";
sha256 = "1zhpm89s6bk29lx7hq5f6fqm7i6dq2wq9vv5m25rv5wv6747v0m6";
};
configureFlags = "--sysconfdir=/etc";
makeFlags = "PREFIX=\${out}";
# Hack to make installation succeed. dhcpcd will still use /var/db
# at runtime.
installFlags = "DBDIR=\${TMPDIR}/db";
installFlags = "DBDIR=\${TMPDIR}/db SYSCONFDIR=$(out)/etc";
meta = {
description = "A client for the Dynamic Host Configuration Protocol (DHCP)";

View file

@ -1,25 +0,0 @@
From 42d3c4e7e95ea0e0dda9b502b2de2c4ed9ed9467 Mon Sep 17 00:00:00 2001
From: "T.M. Abraham" <tabraham@novell.com>
Date: Fri, 6 Jan 2012 21:58:55 -0500
Subject: [PATCH] properly check for HAVE_FALLOC_PH in both occurrences
---
nbd-server.c | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/nbd-server.c b/nbd-server.c
index 0ecf0e8..2cd066d 100644
--- a/nbd-server.c
+++ b/nbd-server.c
@@ -1461,7 +1461,7 @@ int expflush(CLIENT *client) {
* file to resparsify stuff that isn't needed anymore (see NBD_CMD_TRIM)
*/
int exptrim(struct nbd_request* req, CLIENT* client) {
-#ifdef HAVE_FALLOC_PH
+#if HAVE_FALLOC_PH
FILE_INFO prev = g_array_index(client->export, FILE_INFO, 0);
FILE_INFO cur = prev;
int i = 1;
--
1.7.8

View file

@ -1,21 +1,22 @@
{ stdenv, fetchurl, pkgconfig, glib }:
let
name = "nbd-2.9.25";
name = "nbd-3.0";
in
stdenv.mkDerivation {
inherit name;
src = fetchurl {
url = "mirror://sourceforge/nbd/${name}.tar.bz2";
sha256 = "179548406aa2bcb0c6bff3aa0484dbb04136ec055aa385c84fefbe3c9ea96ba4";
sha256 = "f7210edfa858f5ae69bdbf76f5467ac9dcaa97074d945e55e2a683e7aa228b93";
};
patches = [ ./0001-properly-check-for-HAVE_FALLOC_PH-in-both-occurrence.patch ];
buildInputs = [ pkgconfig glib ] ++ stdenv.lib.optional (stdenv ? glibc) stdenv.glibc.kernelHeaders;
postInstall = ''install -D -m 444 README "$out/share/doc/nbd/README"'';
postInstall = ''
mkdir -p "$out/share/doc/${name}"
cp README "$out/share/doc/${name}/README"
'';
# The test suite doesn't succeed on Hydra.
doCheck = false;

View file

@ -90,11 +90,13 @@ stdenv.mkDerivation rec {
echo '#!/bin/sh
initctl emit -n wicd-preconnect ITYPE="$1" ESSID="$2" BSSID="$3"' > $out/etc/scripts/preconnect/upstart-emit
echo '#!/bin/sh
initctl emit -n wicd-postconnect ITYPE="$1" ESSID="$2" BSSID="$3"' > $out/etc/scripts/postconnect/upstart-emit
initctl emit -n wicd-postconnect ITYPE="$1" ESSID="$2" BSSID="$3"
initctl emit -n ip-up' > $out/etc/scripts/postconnect/upstart-emit
echo '#!/bin/sh
initctl emit -n wicd-predisconnect ITYPE="$1" ESSID="$2" BSSID="$3"' > $out/etc/scripts/predisconnect/upstart-emit
echo '#!/bin/sh
initctl emit -n wicd-postdisconnect ITYPE="$1" ESSID="$2" BSSID="$3"' > $out/etc/scripts/postdisconnect/upstart-emit
initctl emit -n wicd-postdisconnect ITYPE="$1" ESSID="$2" BSSID="$3"
initctl emit -n ip-down' > $out/etc/scripts/postdisconnect/upstart-emit
chmod a+x $out/etc/scripts/*/upstart-emit
'';

View file

@ -3,7 +3,7 @@ rec {
name = "moderncv-2012.01.16";
src = fetchurl {
url = "http://mirror.ctan.org/macros/latex/contrib/moderncv.zip";
sha256 = "1sfpj76p0z128rvxw0svh7dfrvf3zhmi3v7bkzfkll4byij34ni0";
sha256 = "5cd2117cd2a3572dbc055033ca81ca744ee65918c42d23687e133bb1e6ddd644";
};
buildInputs = [texLive unzip];

View file

@ -784,11 +784,6 @@ let
inherit (gtkLibs) pango;
};
/* Last version to export to dia */
graphviz_2_24 = callPackage ../tools/graphics/graphviz/2.0.nix {
inherit (gtkLibs) pango;
};
/* Readded by Michael Raskin. There are programs in the wild
* that do want 2.0 but not 2.22. Please give a day's notice for
* objections before removal.
@ -2670,10 +2665,7 @@ let
maude = callPackage ../development/interpreters/maude { };
octave = callPackage ../development/interpreters/octave {
# Needed because later gm versions require an initialization the actual octave is not
# doing.
# http://www-old.cae.wisc.edu/pipermail/octave-maintainers/2010-February/015295.html
graphicsmagick = graphicsmagick137;
fltk = fltk13;
};
# mercurial (hg) bleeding edge version
@ -2966,6 +2958,8 @@ let
cmake = callPackage ../development/tools/build-managers/cmake { };
cmake264 = callPackage ../development/tools/build-managers/cmake/264.nix { };
cmakeCurses = cmake.override { useNcurses = true; };
cmakeWithGui = cmakeCurses.override { useQt4 = true; };
@ -3127,6 +3121,8 @@ let
*/
pkgconfig = forceBuildDrv (callPackage ../development/tools/misc/pkgconfig { });
premake = callPackage ../development/tools/misc/premake { };
radare = callPackage ../development/tools/analysis/radare {
inherit (gnome) vte;
lua = lua5;
@ -3200,6 +3196,8 @@ let
a52dec = callPackage ../development/libraries/a52dec { };
aacskeys = callPackage ../development/libraries/aacskeys { };
aalib = callPackage ../development/libraries/aalib { };
acl = callPackage ../development/libraries/acl { };
@ -3307,8 +3305,6 @@ let
clanlib = callPackage ../development/libraries/clanlib { };
clapack = callPackage ../development/libraries/clapack { };
classads = callPackage ../development/libraries/classads { };
classpath = callPackage ../development/libraries/java/classpath {
@ -3826,6 +3822,8 @@ let
intltool = gnome.intltool;
irrlicht3843 = callPackage ../development/libraries/irrlicht { };
isocodes = callPackage ../development/libraries/iso-codes { };
itk = callPackage ../development/libraries/itk { };
@ -3874,6 +3872,8 @@ let
lib3ds = callPackage ../development/libraries/lib3ds { };
libaacs = callPackage ../development/libraries/libaacs { };
libaal = callPackage ../development/libraries/libaal { };
libao = callPackage ../development/libraries/libao {
@ -3894,6 +3894,8 @@ let
libbluedevil = callPackage ../development/libraries/libbluedevil { };
libbluray = callPackage ../development/libraries/libbluray { };
libcaca = callPackage ../development/libraries/libcaca { };
libcanberra = callPackage ../development/libraries/libcanberra {
@ -4826,6 +4828,8 @@ let
];
};
xmlrpc_c = callPackage ../development/libraries/xmlrpc-c { };
xvidcore = callPackage ../development/libraries/xvidcore { };
yajl = callPackage ../development/libraries/yajl { };
@ -5169,6 +5173,8 @@ let
postgresql90 = callPackage ../servers/sql/postgresql/9.0.x.nix { };
postgresql91 = callPackage ../servers/sql/postgresql/9.1.x.nix { };
postgresql_jdbc = callPackage ../servers/sql/postgresql/jdbc { };
pyIRCt = builderDefsPackage (import ../servers/xmpp/pyIRCt) {
@ -5722,24 +5728,6 @@ let
];
};
linux_2_6_39_powertop = linux_2_6_39.override {
extraConfig = ''
DEBUG_KERNEL y
PM_ADVANCED_DEBUG y
PM_RUNTIME y
TIMER_STATS y
USB_SUSPEND y
BACKTRACE_SELF_TEST n
CPU_NOTIFIER_ERROR_INJECT n
DEBUG_DEVRES n
DEBUG_NX_TEST n
DEBUG_STACK_USAGE n
DEBUG_STACKOVERFLOW n
RCU_TORTURE_TEST n
SCHEDSTATS n
'';
};
linux_3_0 = makeOverridable (import ../os-specific/linux/kernel/linux-3.0.nix) {
inherit fetchurl stdenv perl mktemp module_init_tools ubootChooser;
kernelPatches =
@ -5751,24 +5739,6 @@ let
];
};
linux_3_0_powertop = linux_3_0.override {
extraConfig = ''
DEBUG_KERNEL y
PM_ADVANCED_DEBUG y
PM_RUNTIME y
TIMER_STATS y
USB_SUSPEND y
BACKTRACE_SELF_TEST n
CPU_NOTIFIER_ERROR_INJECT n
DEBUG_DEVRES n
DEBUG_NX_TEST n
DEBUG_STACK_USAGE n
DEBUG_STACKOVERFLOW n
RCU_TORTURE_TEST n
SCHEDSTATS n
'';
};
linux_3_1 = makeOverridable (import ../os-specific/linux/kernel/linux-3.1.nix) {
inherit fetchurl stdenv perl mktemp module_init_tools ubootChooser;
kernelPatches =
@ -5779,52 +5749,16 @@ let
];
};
linux_3_1_powertop = linux_3_1.override {
extraConfig = ''
DEBUG_KERNEL y
PM_ADVANCED_DEBUG y
PM_RUNTIME y
TIMER_STATS y
USB_SUSPEND y
BACKTRACE_SELF_TEST n
CPU_NOTIFIER_ERROR_INJECT n
DEBUG_DEVRES n
DEBUG_NX_TEST n
DEBUG_STACK_USAGE n
DEBUG_STACKOVERFLOW n
RCU_TORTURE_TEST n
SCHEDSTATS n
'';
};
linux_3_2 = makeOverridable (import ../os-specific/linux/kernel/linux-3.2.nix) {
inherit fetchurl stdenv perl mktemp module_init_tools ubootChooser;
kernelPatches =
[ #kernelPatches.fbcondecor_2_6_38
kernelPatches.sec_perm_2_6_24
#kernelPatches.aufs3_1
kernelPatches.aufs3_2
#kernelPatches.mips_restart_2_6_36
];
};
linux_3_2_powertop = linux_3_2.override {
extraConfig = ''
DEBUG_KERNEL y
PM_ADVANCED_DEBUG y
PM_RUNTIME y
TIMER_STATS y
USB_SUSPEND y
BACKTRACE_SELF_TEST n
CPU_NOTIFIER_ERROR_INJECT n
DEBUG_DEVRES n
DEBUG_NX_TEST n
DEBUG_STACK_USAGE n
DEBUG_STACKOVERFLOW n
RCU_TORTURE_TEST n
SCHEDSTATS n
'';
};
/* Linux kernel modules are inherently tied to a specific kernel. So
rather than provide specific instances of those packages for a
specific kernel, we have a function that builds those packages
@ -5954,16 +5888,12 @@ let
linuxPackages_2_6_38 = recurseIntoAttrs (linuxPackagesFor linux_2_6_38 pkgs.linuxPackages_2_6_38);
linuxPackages_2_6_38_ati = recurseIntoAttrs (linuxPackagesFor linux_2_6_38_ati pkgs.linuxPackages_2_6_38);
linuxPackages_2_6_39 = recurseIntoAttrs (linuxPackagesFor linux_2_6_39 pkgs.linuxPackages_2_6_39);
linuxPackages_2_6_39_powertop = recurseIntoAttrs (linuxPackagesFor linux_2_6_39_powertop pkgs.linuxPackages_2_6_39_powertop);
linuxPackages_3_0 = recurseIntoAttrs (linuxPackagesFor linux_3_0 pkgs.linuxPackages_3_0);
linuxPackages_3_0_powertop = recurseIntoAttrs (linuxPackagesFor linux_3_0_powertop pkgs.linuxPackages_3_0_powertop);
linuxPackages_3_1 = recurseIntoAttrs (linuxPackagesFor linux_3_1 pkgs.linuxPackages_3_1);
linuxPackages_3_1_powertop = recurseIntoAttrs (linuxPackagesFor linux_3_1_powertop pkgs.linuxPackages_3_1_powertop);
linuxPackages_nanonote_jz_2_6_34 = recurseIntoAttrs (linuxPackagesFor linux_nanonote_jz_2_6_34 pkgs.linuxPackages_nanonote_jz_2_6_34);
linuxPackages_nanonote_jz_2_6_35 = recurseIntoAttrs (linuxPackagesFor linux_nanonote_jz_2_6_35 pkgs.linuxPackages_nanonote_jz_2_6_35);
linuxPackages_nanonote_jz_2_6_36 = recurseIntoAttrs (linuxPackagesFor linux_nanonote_jz_2_6_36 pkgs.linuxPackages_nanonote_jz_2_6_36);
linuxPackages_3_2 = recurseIntoAttrs (linuxPackagesFor pkgs.linux_3_2 pkgs.linuxPackages_3_2);
linuxPackages_3_2_powertop = recurseIntoAttrs (linuxPackagesFor linux_3_2_powertop pkgs.linuxPackages_3_2_powertop);
# The current default kernel / kernel modules.
linux = linuxPackages.kernel;
@ -6280,7 +6210,7 @@ let
wpa_supplicant = callPackage ../os-specific/linux/wpa_supplicant { };
wpa_supplicant_gui = pkgs.wpa_supplicant.gui;
wpa_supplicant_gui = callPackage ../os-specific/linux/wpa_supplicant/gui.nix { };
xf86_input_multitouch =
callPackage ../os-specific/linux/xf86-input-multitouch { };
@ -7006,6 +6936,11 @@ let
gqview = callPackage ../applications/graphics/gqview { };
gmtk = callPackage ../applications/networking/browsers/mozilla-plugins/gmtk {
inherit (gnome) GConf;
inherit (gtkLibs) gtk;
};
googleearth = callPackage_i686 ../applications/misc/googleearth { };
google_talk_plugin = callPackage ../applications/networking/browsers/mozilla-plugins/google-talk-plugin {
@ -7202,7 +7137,7 @@ let
merkaartor = callPackage ../applications/misc/merkaartor { };
meshlab = callPackage ../applications/graphics/meshlab {
qt = qt4;
qt = qt47;
};
midori = builderDefsPackage (import ../applications/networking/browsers/midori) {
@ -7359,8 +7294,7 @@ let
inherit (gnome) libglademm;
};
paraview = callPackage ../applications/graphics/paraview {
};
paraview = callPackage ../applications/graphics/paraview { };
pdftk = callPackage ../tools/typesetting/pdftk { };
@ -7862,6 +7796,8 @@ let
alienarena = callPackage ../games/alienarena { };
andyetitmoves = if stdenv.isLinux then callPackage ../games/andyetitmoves {} else null;
asc = callPackage ../games/asc {
lua = lua5;
libsigcxx = libsigcxx12;
@ -8375,7 +8311,13 @@ let
### SCIENCE/MATH
atlas = callPackage ../development/libraries/science/math/atlas { };
atlas = callPackage ../development/libraries/science/math/atlas {
# The build process measures CPU capabilities and optimizes the
# library to perform best on that particular machine. That is a
# great feature, but it's of limited use with pre-built binaries
# coming from a central build farm.
tolerateCpuTimingInaccuracy = true;
};
blas = callPackage ../development/libraries/science/math/blas { };

View file

@ -121,7 +121,7 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y);
# This is the Cabal builder, the function we use to build most Haskell
# packages. It isn't the Cabal library, which is spelled "Cabal".
cabal = callPackage ../development/libraries/haskell/cabal/cabal.nix {
cabal = callPackage ../build-support/cabal {
enableLibraryProfiling = enableLibraryProfiling;
};
@ -139,7 +139,7 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y);
GLUT = self.GLUT_2_3_0_0; # 7.4.1 ok
haskellSrc = self.haskellSrc_1_0_1_5; # 7.4.1 ok
html = self.html_1_0_1_2; # 7.4.1 ok
HUnit = self.HUnit_1_2_2_3; # 7.4.1 ok
HUnit = self.HUnit_1_2_4_2; # 7.4.1 ok
network = self.network_2_3_0_11; # 7.4.1 ok
OpenGL = self.OpenGL_2_5_0_0; # 7.4.1 ok
parallel = self.parallel_3_2_0_2; # 7.4.1 ok
@ -907,7 +907,7 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y);
HUnit_1_2_2_1 = callPackage ../development/libraries/haskell/HUnit/1.2.2.1.nix {};
HUnit_1_2_2_3 = callPackage ../development/libraries/haskell/HUnit/1.2.2.3.nix {};
HUnit_1_2_4_2 = callPackage ../development/libraries/haskell/HUnit/1.2.4.2.nix {};
HUnit = self.HUnit_1_2_0_3;
HUnit = self.HUnit_1_2_4_2;
hxt = callPackage ../development/libraries/haskell/hxt {};
@ -1622,6 +1622,8 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y);
leksah = callPackage ../applications/editors/leksah {};
mathblog = callPackage ../applications/misc/mathblog {};
xmobar = callPackage ../applications/misc/xmobar {
parsec = self.parsec3;
};

View file

@ -1822,6 +1822,35 @@ let pythonPackages = python.modules // rec {
};
});
skype4py = buildPythonPackage (rec {
name = "Skype4Py-1.0.32.0";
src = fetchurl {
url = mirror://sourceforge/skype4py/Skype4Py-1.0.32.0.tar.gz;
sha256 = "0cmkrv450wa8v50bng5dflpwkl5c1p9pzysjkb2956w5kvwh6f5b";
};
unpackPhase = ''
tar xf $src
find . -type d -exec chmod +rx {} \;
sourceRoot=`pwd`/`ls -d S*`
'';
doCheck = false;
propagatedBuildInputs = [ pkgs.xlibs.libX11 pkgs.pythonDBus pkgs.pygobject ];
meta = {
description = "High-level, platform independent Skype API wrapper for Python";
# The advertisement says https://developer.skype.com/wiki/Skype4Py
# but that url does not work. This following web page points to the
# download link and has some information about the package.
homepage = http://pypi.python.org/pypi/Skype4Py/1.0.32.0;
license = "BSD";
};
});
sphinx = buildPythonPackage (rec {
name = "Sphinx-1.0.7";
@ -1888,6 +1917,32 @@ let pythonPackages = python.modules // rec {
};
};
taskcoach = buildPythonPackage rec {
name = "TaskCoach-1.3.7";
src = fetchurl {
url = "mirror://sourceforge/taskcoach/${name}.tar.gz";
sha256 = "069hyxc8ypn51a8imfkfqdalp1l4pv09swj2v3bi4hjscq9af6i8";
};
propagatedBuildInputs = [ wxPython ];
# I don't know why I need to add these libraries. Shouldn't they
# be part of wxPython?
postInstall = ''
libspaths=${pkgs.xlibs.libSM}/lib:${pkgs.xlibs.libXScrnSaver}/lib
wrapProgram $out/bin/taskcoach.py \
--prefix LD_LIBRARY_PATH : $libspaths
'';
doCheck = false;
meta = {
homepage = http://taskcoach.org/;
description = "Todo manager to keep track of personal tasks and todo lists";
license = "GPLv3+";
};
};
tempita = buildPythonPackage rec {
version = "0.4";
@ -2059,6 +2114,28 @@ let pythonPackages = python.modules // rec {
wxGTK = pkgs.wxGTK28;
};
xlib = buildPythonPackage (rec {
name = "xlib-0.15rc1";
src = fetchurl {
url = "mirror://sourceforge/python-xlib/python-${name}.tar.bz2";
sha256 = "0mvzz605pxzj7lfp2w6z4qglmr4rjza9xrb7sl8yn12cklzfky0m";
};
# Tests require `pyutil' so disable them to avoid circular references.
doCheck = false;
propagatedBuildInputs = [ pkgs.xlibs.libX11 ];
meta = {
description = "Fully functional X client library for Python programs";
homepage = http://python-xlib.sourceforge.net/;
license = "GPLv2+";
};
});
zbase32 = buildPythonPackage (rec {
name = "zbase32-1.1.2";

View file

@ -182,6 +182,7 @@ in {
gnu.hurdCross = nativePlatforms;
gnu.mach.hostDrv = nativePlatforms;
gnu.mig = nativePlatforms;
gnu.smbfs = nativePlatforms;
coreutils.hostDrv = nativePlatforms;
ed.hostDrv = nativePlatforms;
@ -205,6 +206,7 @@ in {
nixUnstable.hostDrv = nativePlatforms;
openssl.hostDrv = nativePlatforms; # dependency of Nix
patch.hostDrv = nativePlatforms;
samba_light.hostDrv = nativePlatforms; # needed for `runInGenericVM'
zile.hostDrv = nativePlatforms;
};
}) // (