b12f/nixpkgs
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

Updated from trunk.

Browse source 
svn path=/nixpkgs/branches/stdenv-updates/; revision=23275
This commit is contained in:
Lluís Batlle i Rossell 2010-08-20 13:41:12 +00:00
parent f7d0fcdaac 7dea1a0f4f
commit f16353b6f2
142 changed files with 2022 additions and 808 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
maintainers/scripts/eval-release.nix
View file

@ -6,9 +6,13 @@ let
lib = (import ../.. {}).lib;
rel = removeAttrs (import ../../pkgs/top-level/release.nix) ["tarball"];
rel = removeAttrs (import ../../pkgs/top-level/release.nix) [ "tarball" "xbursttools" ];
maybe = x: let y = builtins.tryEval x; in if y.success then y.value else null;
seqList = xs: res: lib.fold (x: xs: lib.seq x xs) res xs;
strictAttrs = as: seqList (lib.attrValues as) as;
maybe = as: let y = builtins.tryEval (strictAttrs as); in if y.success then y.value else builtins.trace "FAIL" null;
call = attrs: lib.flip lib.mapAttrs attrs
(n: v: builtins.trace n (

14
maintainers/scripts/gnu/gnupdate
View file

@ -623,19 +623,9 @@ exec ${GUILE-guile} -L "$PWD" -l "$0" \
(let ((strverscmp
(let ((sym (or (dynamic-func "strverscmp" (dynamic-link))
(error "could not find `strverscmp' (from GNU libc)"))))
(make-foreign-function int sym (list '* '*))))
(string->null-terminated-utf8
(lambda (s)
(let* ((utf8 (string->utf8 s))
(len (bytevector-length utf8))
(nts (make-bytevector (+ len 1))))
(bytevector-copy! utf8 0 nts 0 len)
(bytevector-u8-set! nts len 0)
nts))))
(make-foreign-function int sym (list '* '*)))))
(lambda (a b)
(let ((a (bytevector->foreign (string->null-terminated-utf8 a)))
(b (bytevector->foreign (string->null-terminated-utf8 b))))
(> (strverscmp a b) 0)))))
(> (strverscmp (string->pointer a) (string->pointer b)) 0))))
(define (latest-release project)
;; Return "FOO-X.Y" or #f.

3
maintainers/scripts/test-eval-release.sh Executable file
View file

@ -0,0 +1,3 @@
#! /bin/sh
nix-instantiate --strict --eval-only --xml --show-trace "$(dirname "$0")"/eval-release.nix 2>&1 > /dev/null

4
pkgs/applications/editors/zile/default.nix
View file

@ -1,11 +1,11 @@
{ fetchurl, stdenv, ncurses, help2man }:
stdenv.mkDerivation rec {
name = "zile-2.3.17";
name = "zile-2.3.19";
src = fetchurl {
url = "mirror://gnu/zile/${name}.tar.gz";
sha256 = "1wrg53qz0s4336nq8z2v7pi18vpz5ifxvlwq4jv0w4rwmbksgvi0";
sha256 = "1c2by5d5d1nmap3wc55giscsj47xx16viv7b07c6c4nssnlniszs";
};
buildInputs = [ ncurses ];

46
pkgs/applications/graphics/xscreensaver/default.nix
View file

@ -1,41 +1,43 @@
x@{ pkgconfig, bc, perl, xlibs, libjpeg, mesa, gtk
, libxml2, libglade, builderDefsPackage, ... }:
{ stdenv, fetchurl, pkgconfig, bc, perl, pam
, libXext, libXScrnSaver, libX11, libXrandr, libXmu, libXxf86vm, libXrender
, libXxf86misc
, libjpeg, mesa, gtk , libxml2, libglade}:
builderDefsPackage
(a: rec {
stdenv.mkDerivation rec {
version = "5.11";
name = "xscreensaver-${version}";
url = "http://www.jwz.org/xscreensaver/${name}.tar.gz";
src = a.fetchurl {
inherit url;
src = fetchurl {
url = "http://www.jwz.org/xscreensaver/${name}.tar.gz";
sha256="0w47s0qd8ab6ywhhhkqjx0grb2b28bh2flnkdpj3yaind202l0s7";
};
buildInputs = with a;
[ pkgconfig bc perl libjpeg mesa gtk libxml2 libglade
xlibs.xlibs xlibs.libXmu
];
buildInputs =
[ pkgconfig bc perl libjpeg mesa gtk libxml2 libglade pam
libXext libXScrnSaver libX11 libXrandr libXmu libXxf86vm libXrender
libXxf86misc ];
configureFlags =
[ "--with-gl"
"--with-dpms"
"--with-pixbuf"
[
"--with-gl" "--with-pam" "--with-pixbuf" "--with-proc-interrupts"
"--with-dpms-ext" "--with-randr-ext" "--with-xinerama-ext"
"--with-xf86vmode-ext" "--with-xf86gamma-ext" "--with-randr-ext"
"--with-xshm-ext" "--with-xdbe-ext" "--without-readdisplay"
"--with-x-app-defaults=\${out}/share/xscreensaver/app-defaults"
"--with-hackdir=\${out}/share/xscreensaver-hacks"
];
preConfigure = a.fullDepEntry
preConfigure =
''
sed -e 's%@GTK_DATADIR@%@datadir@% ; s%@PO_DATADIR@%@datadir@%' \
-i driver/Makefile.in po/Makefile.in.in
'' ["minInit" "doUnpack"];
phaseNames = ["preConfigure" "doConfigure" "doMakeInstall"];
'';
meta = {
homepage = http://www.jwz.org/xscreensaver/;
description = "A set of screensavers";
maintainers = [ a.lib.maintainers.raskin ];
platforms = a.lib.platforms.allBut "i686-cygwin";
maintainers = with stdenv.lib.maintainers; [ raskin urkud ];
platforms = stdenv.lib.platforms.allBut "i686-cygwin";
};
}) x
}

4
pkgs/applications/misc/calibre/default.nix
View file

@ -4,11 +4,11 @@
}:
stdenv.mkDerivation rec {
name = "calibre-0.7.0";
name = "calibre-0.7.14";
src = fetchurl {
url = "mirror://sourceforge/calibre/${name}.tar.gz";
sha256 = "0aij3gqkfvhzrsfk0ms9mlawrdj46r3634cglbwsapv17g2wv6mg";
sha256 = "07vnmxxpg77pmd7fhcrlnark02bn6zj62hbsybdqz8fp1yp99wkn";
};
inherit python;

6
pkgs/applications/networking/browsers/chromium/default.nix
View file

@ -35,17 +35,17 @@ assert stdenv.system == "i686-linux" || stdenv.system == "x86_64-linux" ;
stdenv.mkDerivation rec {
name = "chrome-${version}";
version = "51653";
version = "55366";
src =
if stdenv.system == "x86_64-linux" then
fetchurl {
url = "http://build.chromium.org/buildbot/snapshots/chromium-rel-linux-64/${version}/chrome-linux.zip";
sha256 = "1d8q4ac8s3b1bncli537phzxshfr50j69y49409g5p64v7iya9kw";
sha256 = "1dazdfpnl278wwh03hs0x184ql5zh0yhpfiaw75j437dp3668hnj";
}
else if stdenv.system == "i686-linux" then
fetchurl {
url = "http://build.chromium.org/buildbot/snapshots/chromium-rel-linux/${version}/chrome-linux.zip";
sha256 = "1kdhwkl7xxssmkrkkgrdwrwvbah97va7rxbwrfhlcnjgw60ppf9v";
sha256 = "1x5ykvp2hxc56p4bb1lykahkk1nzkqi2kkm474spplqcfnmd6j2b";
}
else null;

4
pkgs/applications/networking/browsers/mozilla-plugins/flashplayer-10/default.nix
View file

@ -51,9 +51,9 @@ let
url = http://download.macromedia.com/pub/labs/flashplayer10/flashplayer10_1_p2_debug_linux_121709.tar.gz;
sha256 = "162cnzn8sfdvr8mwyggsxi2bcl7zzi1nrl61bw481hhhpwnrjdx4";
} else {
version = "10.1.53.64";
version = "10.1.82.76";
url = http://fpdownload.macromedia.com/get/flashplayer/current/install_flash_player_10_linux.tar.gz;
sha256 = "1598vn4dd96cp1nv225vvjpna70ydkd8lcyfm88gnpzkwx2scz1b";
sha256 = "c6f8831ce648e7fa8e037f1fa8362d2d998cae0e06490e792bcd5871f3eb936a";
}
else throw "flashplayer is not supported on this platform";

6
pkgs/applications/networking/instant-messengers/pidgin/default.nix
View file

@ -21,10 +21,10 @@
} :
stdenv.mkDerivation {
name = "pidgin-2.7.2";
name = "pidgin-2.7.3";
src = fetchurl {
url = mirror://sourceforge/pidgin/pidgin-2.7.2.tar.bz2;
sha256 = "1h3112548rjkz4gycm2yq9wjfp1jcdk30qcgvckpf6c4yckg3dca";
url = mirror://sourceforge/pidgin/pidgin-2.7.3.tar.bz2;
sha256 = "1wi3wckn3gkbrgx0kk1b690nxj1i4xcp3xn5wrra6gwcgfm8hmwb";
};
inherit nss ncurses;

4
pkgs/applications/networking/skype/default.nix
View file

@ -1,5 +1,5 @@
{stdenv, fetchurl, alsaLib, libXv, libXi, libXrender, libXrandr, zlib, glib
, libXext, libX11, libXScrnSaver, libSM, qt, libICE, freetype, fontconfig}:
, libXext, libX11, libXScrnSaver, libSM, qt4, libICE, freetype, fontconfig}:
assert stdenv.system == "i686-linux";
@ -18,7 +18,7 @@ stdenv.mkDerivation rec {
libXv
libXext
libX11
qt
qt4
libXScrnSaver
libSM
libICE

21
pkgs/applications/science/geometry/tetgen/default.nix Normal file
View file

@ -0,0 +1,21 @@
{stdenv, fetchurl}:
stdenv.mkDerivation rec {
name = "tetgen-1.4.3";
src = fetchurl {
url = http://tetgen.berlios.de/files/tetgen1.4.3.tar.gz;
sha256 = "159i0vdjz7abb8bycz47ax4fqlzc82kv19sygqnrkr86qm4g43wy";
};
installPhase = ''
ensureDir $out/bin
cp tetgen $out/bin
'';
meta = {
description = "Quality Tetrahedral Mesh Generator and 3D Delaunay Triangulator";
homepage = "http://tetgen.berlios.de/";
license = "MIT";
};
}

10
pkgs/applications/version-management/bazaar/default.nix
View file

@ -1,11 +1,13 @@
{stdenv, fetchurl, python, makeWrapper}:
stdenv.mkDerivation {
name = "bazaar-1.10rc1";
stdenv.mkDerivation rec {
version = "2.2";
release = ".0";
name = "bazaar-${version}${release}";
src = fetchurl {
url = http://launchpad.net/bzr/1.10/1.10rc1/+download/bzr-1.10rc1.tar.gz;
sha256 = "dc3669e15ced93e0956c13b724f604075e0323ce07fb08f6463946c85e69bec0";
url = "http://launchpad.net/bzr/${version}/${version}${release}/+download/bzr-${version}${release}.tar.gz";
sha256 = "64cd6c23097884e40686adc7f0ad4a8200e2292bdc5e0caba3563b6f5c32bacf";
};
buildInputs = [python makeWrapper];

7
pkgs/applications/version-management/bazaar/tools.nix
View file

@ -5,9 +5,10 @@ if ! bazaar.python.readlineSupport then
else
rec {
version = "2.2.0";
src = fetchurl {
url = http://launchpad.net/bzrtools/stable/1.5.0/+download/bzrtools-1.5.0.tar.gz;
sha256 = "0lm4qhsjy3k8zp9hcahlf37v69w6lhhz2x3hjskgm3rk6b0bngjz";
url = "http://launchpad.net/bzrtools/stable/${version}/+download/bzrtools-${version}.tar.gz";
sha256 = "835e0dc2b3b798d3c88b960bf719fe3b4cec7ae241908aafeb6aafe4c83f591b";
};
buildInputs = [];
@ -16,7 +17,7 @@ rec {
/* doConfigure should be specified separately */
phaseNames = [(simplyShare "bzrtools")];
name = "bzr-tools-1.5";
name = "bzr-tools-${version}";
meta = {
description = "Bazaar plugins.";
};

31
pkgs/build-support/builder-defs/builder-defs.nix
View file

@ -34,6 +34,9 @@ let inherit (builtins) head tail trace; in
else if (hasSuffixHack ".bz2" s) then "plain-bz2"
else if (hasSuffixHack ".gz" s) then "plain-gz"
# For bootstrap calls
else if (s ==("" + (substring 0 0 s))) then "empty"
else (abort "unknown archive type : ${s}"));
# changing this ? see [1]
@ -241,6 +244,8 @@ let inherit (builtins) head tail trace; in
NAME=\$(basename ${s} .gz)
gzip -d <${s} > \$PWD/\$(basename ${s} .gz)/\${NAME#*-}
cd \$(basename ${s} .gz)
" else if (archiveType s) == "empty" then "
echo No source to unpack - doing nothing ..
" else (abort "unknown archive type : ${s}"))+
# goSrcDir is typically something like "cd mysubdir" .. but can be anything else
(if args ? goSrcDir then args.goSrcDir else "")
@ -429,7 +434,7 @@ let inherit (builtins) head tail trace; in
realPhaseNames =
(optional ([] != attrByPath ["neededDirs"] [] args) "createDirs")
++
args.phaseNames
(attrByPath ["phaseNames"] [] args)
++
["doForceShare" "doPropagate" "doForceCopy"]
++
@ -495,18 +500,20 @@ let inherit (builtins) head tail trace; in
done
'') ["minInit" "addInputs" "doUnpack"];
installFonts = fullDepEntry (''
ensureDir $out/share/fonts/truetype/public/${args.name}
ensureDir $out/share/fonts/opentype/public/${args.name}
ensureDir $out/share/fonts/type1/public/${args.name}
ensureDir $out/share/texmf/fonts/enc/${args.name}
ensureDir $out/share/texmf/fonts/map/${args.name}
installFonts =
let retrievedName = (if args ? name then args.name else ""); in
fullDepEntry (''
ensureDir $out/share/fonts/truetype/public/${retrievedName}
ensureDir $out/share/fonts/opentype/public/${retrievedName}
ensureDir $out/share/fonts/type1/public/${retrievedName}
ensureDir $out/share/texmf/fonts/enc/${retrievedName}
ensureDir $out/share/texmf/fonts/map/${retrievedName}
cp *.ttf $out/share/fonts/truetype/public/${args.name} || echo No TrueType fonts
cp *.otf $out/share/fonts/opentype/public/${args.name} || echo No OpenType fonts
cp *.{pfm,afm,pfb} $out/share/fonts/type1/public/${args.name} || echo No Type1 Fonts
cp *.enc $out/share/texmf/fonts/enc/${args.name} || echo No fontenc data
cp *.map $out/share/texmf/fonts/map/${args.name} || echo No fontmap data
cp *.ttf $out/share/fonts/truetype/public/${retrievedName} || echo No TrueType fonts
cp *.otf $out/share/fonts/opentype/public/${retrievedName} || echo No OpenType fonts
cp *.{pfm,afm,pfb} $out/share/fonts/type1/public/${retrievedName} || echo No Type1 Fonts
cp *.enc $out/share/texmf/fonts/enc/${retrievedName} || echo No fontenc data
cp *.map $out/share/texmf/fonts/map/${retrievedName} || echo No fontmap data
'') ["minInit" "defEnsureDir"];
simplyShare = shareName: fullDepEntry (''

22
pkgs/build-support/release/maven-build.nix
View file

@ -17,7 +17,7 @@ in
stdenv.mkDerivation ( rec {
inherit name src;
phases = "setupPhase unpackPhase patchPhase mvnCompile ${if doTestCompile then "mvnTestCompile mvnTestJar" else ""} ${if doTest then "mvnTest mvnCobertura" else ""} ${if doJavadoc then "mvnJavadoc" else ""} ${if doCheckstyle then "mvnCheckstyle" else ""} mvnJar mvnAssembly mvnRelease finalPhase";
phases = "setupPhase unpackPhase patchPhase mvnCompile ${if doTestCompile then "mvnTestCompile mvnTestJar" else ""} ${if doTest then "mvnTest" else ""} ${if doJavadoc then "mvnJavadoc" else ""} ${if doCheckstyle then "mvnCheckstyle" else ""} mvnJar mvnAssembly mvnRelease finalPhase";
setupPhase = ''
runHook preSetupPhase
@ -44,6 +44,18 @@ stdenv.mkDerivation ( rec {
mvnTest = ''
mvn test ${mvnFlags}
if [ -d target/site/cobertura ] ; then
cp -R target/site/cobertura $out/cobertura
echo "report coverage $out/cobertura" >> $out/nix-support/hydra-build-products
fi
if [ -d target/surefire-reports ] ; then
mvn surefire-report:report-only
cp -vR target/surefire-reports $out/surefire
cp -v target/site/surefire-report.html $out/surefire/index.html
echo "report coverage $out/surefire/index.html" >> $out/nix-support/hydra-build-products
fi
'';
mvnJavadoc = ''
@ -52,12 +64,6 @@ stdenv.mkDerivation ( rec {
echo "report javadoc $out/apidocs" >> $out/nix-support/hydra-build-products
'';
mvnCobertura = ''
mvn cobertura:cobertura ${mvnFlags}
cp -R target/site/cobertura $out/cobertura
echo "report cobertura $out/cobertura" >> $out/nix-support/hydra-build-products
'';
mvnCheckstyle = ''
mvn checkstyle:checkstyle ${mvnFlags}
ensureDir $out/checkstyle
@ -71,7 +77,7 @@ stdenv.mkDerivation ( rec {
'';
mvnAssembly = ''
mvn assembly:assembly ${mvnFlags}
mvn assembly:single ${mvnFlags}
'';
mvnRelease = ''

5
pkgs/build-support/vm/default.nix
View file

@ -139,7 +139,7 @@ rec {
mount -o bind /dev /fs/dev
echo "mounting host filesystem..."
mount -t cifs //10.0.2.4/qemu /fs/hostfs -o guest,username=nobody
mount -t cifs //10.0.2.4/qemu /fs/hostfs -o guest,sec=none
mkdir -p /fs/nix/store
mount -o bind /fs/hostfs/nix/store /fs/nix/store
@ -227,6 +227,8 @@ rec {
startSamba =
''
export WHO=`whoami`
cat > $TMPDIR/smb.conf <<SMB
[global]
private dir = $TMPDIR
@ -238,6 +240,7 @@ rec {
smb passwd file = $TMPDIR/smbpasswd
security = share
[qemu]
force user = $WHO
path = /
read only = no
guest ok = yes

6
pkgs/data/fonts/terminus-font/default.nix
View file

@ -2,8 +2,10 @@
stdenv.mkDerivation rec {
name = "terminus-font-4.30";
src = fetchurl {
url = "http://www.is-vn.bg/hamster/${name}.tar.gz";
sha256 = "ca15718f715f1ca7af827a8ab5543b0c0339b2515f39f8c15f241b2bc1a15a9a";
# urls = "http://www.is-vn.bg/hamster/${name}.tar.gz"
# sha256 = "ca15718f715f1ca7af827a8ab5543b0c0339b2515f39f8c15f241b2bc1a15a9a";
url = "http://ftp.de.debian.org/debian/pool/main/x/xfonts-terminus/xfonts-terminus_4.30.orig.tar.gz";
sha256 = "d7f1253d75f0aa278b0bbf457d15927ed3bbf2565b9f6b829c2b2560fedc1712";
};
buildInputs = [ perl bdftopcf mkfontdir mkfontscale ];
patchPhase = ''

4
pkgs/desktops/kde-4.4/default.nix
View file

@ -32,11 +32,11 @@ pkgs.recurseIntoAttrs (rec {
};
qca2 = import ./support/qca2 {
inherit (pkgs) stdenv fetchurl lib which qt4;
inherit (pkgs) stdenv fetchurl which qt4;
};
qca2_ossl = import ./support/qca2/ossl.nix {
inherit (pkgs) stdenv fetchurl lib qt4 openssl;
inherit (pkgs) stdenv fetchurl fetchsvn qt4 openssl;
inherit qca2;
};

1
pkgs/desktops/kde-4.4/pim/default.nix
View file

@ -9,6 +9,7 @@ stdenv.mkDerivation {
sha256 = "0n95wjk1ly7zfn9wv589a9hrc0r7wvik7jrvsgimnxr0rapxk3bp";
};
builder = ./builder.sh;
cmakeFlags = "-DBUILD_kleopatra=OFF"; # doesn't build with new boost
buildInputs = [ cmake qt4 perl boost gpgme stdenv.gcc.libc libassuan libgpgerror libxslt
shared_mime_info libXScrnSaver
kdelibs kdepimlibs automoc4 phonon akonadi strigi soprano qca2 ];

1
pkgs/desktops/kde-4.4/support/akonadi/default.nix
View file

@ -6,6 +6,7 @@ stdenv.mkDerivation rec {
url = "http://download.akonadi-project.org/${name}.tar.bz2";
sha256 = "1d2ancspavp4qg717hj56j1likb0ifdr65q1awbc2ghqqgd9znck";
};
patches = [ ./fix-broken-datadir-parameter.patch ];
buildInputs = [ cmake qt4 shared_mime_info libxslt boost mysql automoc4 soprano ];
meta = with stdenv.lib; {
description = "KDE PIM Storage Service";

17
pkgs/desktops/kde-4.4/support/akonadi/fix-broken-datadir-parameter.patch Normal file
View file

@ -0,0 +1,17 @@
Fix broken datadir parameter.
--- akonadi-1.3.85/server/src/storage/dbconfigmysql.cpp 2010-06-09 03:41:30.000000000 -0430
+++ akonadi-local-1.3.85/server/src/storage/dbconfigmysql.cpp 2010-08-11 00:21:20.547181479 -0430
@@ -250,11 +250,10 @@
// synthesize the mysqld command
QStringList arguments;
arguments << QString::fromLatin1( "--defaults-file=%1/mysql.conf" ).arg( akDir );
+ arguments << QString::fromLatin1( "--datadir=%1/" ).arg( dataDir );
#ifndef Q_WS_WIN
- arguments << QString::fromLatin1( "--datadir" ) << QString::fromLatin1( "%1/" ).arg( dataDir );
arguments << QString::fromLatin1( "--socket=%1/mysql.socket" ).arg( miscDir );
#else
- arguments << QString::fromLatin1( "--datadir=%1/" ).arg( dataDir );
arguments << QString::fromLatin1( "--shared-memory" );
#endif

13
pkgs/desktops/kde-4.4/support/qca2/default.nix
View file

@ -1,4 +1,4 @@
{stdenv, fetchurl, lib, which, qt4}:
{stdenv, fetchurl, which, qt4}:
stdenv.mkDerivation {
name = "qca-2.0.2";
@ -7,10 +7,17 @@ stdenv.mkDerivation {
sha256 = "49b5474450104a2298747c243de1451ab7a6aeed4bf7df43ffa4b7128a2837b8";
};
buildInputs = [ which qt4 ];
meta = {
preBuild = ''
sed -i include/QtCrypto/qca_publickey.h -e '/EMSA3_Raw/a,\
EMSA3_SHA224, ///< SHA224, with EMSA3 (ie PKCS#1 Version 1.5) encoding\
EMSA3_SHA256, ///< SHA256, with EMSA3 (ie PKCS#1 Version 1.5) encoding\
EMSA3_SHA384, ///< SHA384, with EMSA3 (ie PKCS#1 Version 1.5) encoding\
EMSA3_SHA512 ///< SHA512, with EMSA3 (ie PKCS#1 Version 1.5) encoding'
'';
meta = with stdenv.lib; {
description = "Qt Cryptographic Architecture";
license = "LGPL";
homepage = http://delta.affinix.com/qca;
maintainers = [ lib.maintainers.sander ];
maintainers = [ maintainers.sander maintainers.urkud ];
};
}

19
pkgs/desktops/kde-4.4/support/qca2/ossl.nix
View file

@ -1,23 +1,32 @@
{stdenv, fetchurl, lib, qt4, qca2, openssl}:
{stdenv, fetchurl, fetchsvn, qt4, qca2, openssl}:
stdenv.mkDerivation rec {
name = "qca-ossl-2.0.0-beta3";
version = "2.0.0-beta3";
name = "qca-ossl-${version}";
src = fetchurl {
url = "http://delta.affinix.com/download/qca/2.0/plugins/${name}.tar.bz2";
sha256 = "0yy68racvx3clybry2i1bw5bz9yhxr40p3xqagxxb15ihvsrzq08";
};
# SVN version has stabilized and has a lot of fixes for fresh OpenSSL
# Take the main source from there
svn_src = fetchsvn {
url = svn://anonsvn.kde.org/home/kde/trunk/kdesupport/qca/plugins/qca-ossl ;
rev = 1115936;
sha256 = "ef2c0307e8834e1e7cb23b6fea1cc22486328a37186301a6c11161b1c93d834b";
};
buildInputs = [ qt4 qca2 openssl ];
dontAddPrefix = true;
configureFlags="--no-separate-debug-info --with-qca=${qca2}
--with-openssl-inc=${openssl}/include --with-openssl-lib=${openssl}/lib";
preConfigure=''
cp ${svn_src}/qca-ossl.cpp .
configureFlags="$configureFlags --plugins-path=$out/lib/qt4/plugins"
'';
patches = [ ./ossl-remove-whirlpool.patch ];
meta = {
meta = with stdenv.lib; {
description = "Qt Cryptographic Architecture OpenSSL plugin";
license = "LGPL";
homepage = http://delta.affinix.com/qca;
maintainers = [ lib.maintainers.urkud ];
maintainers = [ maintainers.urkud ];
};
}

14
pkgs/desktops/kde-4.5/accessibility/default.nix Normal file
View file

@ -0,0 +1,14 @@
{kdePackage, cmake, qt4, perl, alsaLib, libXi, libXtst, kdelibs, automoc4 }:
kdePackage {
pn = "kdeaccessibility";
v = "4.5.0";
# TODO: speech dispatcher and/or freetts
buildInputs = [ cmake qt4 perl alsaLib libXi libXtst kdelibs automoc4 ];
meta = {
description = "KDE accessibility tools";
license = "GPL";
};
}

13
pkgs/desktops/kde-4.5/admin/builder.sh Normal file
View file

@ -0,0 +1,13 @@
source $stdenv/setup
myPatchPhase()
{
for i in system-config-printer-kde/cmake-modules/FindSystemConfigPrinter.py system-config-printer-kde/system-config-printer-kde.py
do
sed -i -e "s|/usr/share/system-config-printer|$system_config_printer/share/system-config-printer|" $i
done
sed -i -e "s|import cupshelpers.ppds, cupshelpers.cupshelpers|import ppds, cupshelpers|" system-config-printer-kde/cmake-modules/FindSystemConfigPrinter.py
}
patchPhase=myPatchPhase
genericBuild

22
pkgs/desktops/kde-4.5/admin/default.nix Normal file
View file

@ -0,0 +1,22 @@
{ kdePackage, cmake, qt4, pkgconfig, perl, python
, sip, pyqt4, pycups, rhpl, system_config_printer
, kdelibs, kdepimlibs, kdebindings, automoc4}:
kdePackage {
pn = "kdeadmin";
v = "4.5.0";
builder = ./builder.sh;
inherit system_config_printer;
PYTHONPATH = "${pycups}/lib/python${python.majorVersion}/site-packages";
buildInputs = [ cmake qt4 pkgconfig perl python sip pyqt4 pycups rhpl system_config_printer
kdelibs kdepimlibs kdebindings automoc4 ];
meta = {
description = "KDE Administration Utilities";
license = "GPL";
};
}

85
pkgs/desktops/kde-4.5/artwork/FindXscreensaver.cmake Normal file
View file

@ -0,0 +1,85 @@
#Macro to find xscreensaver directory
# Copyright (c) 2006, Laurent Montel, <montel@kde.org>
#
# Redistribution and use is allowed according to the terms of the BSD license.
# For details see the accompanying COPYING-CMAKE-SCRIPTS file.
if (NOT XSCREENSAVER_FOUND)
FIND_PATH(XSCREENSAVER_DIR deco
HINTS
${KDE4_INCLUDE_DIR}
PATHS
/usr
/usr/local
/opt/local
/usr/X11R6
/opt/kde
/opt/kde3
/usr/kde
/usr/local/kde
/usr/local/xscreensaver
/usr/openwin/lib/xscreensaver
/etc
PATH_SUFFIXES
lib${LIB_SUFFIX}/xscreensaver
lib/xscreensaver
lib${LIB_SUFFIX}/misc/xscreensaver
lib/misc/xscreensaver
libexec/xscreensaver
bin/xscreensaver-hacks
hacks)
message(XSCREENSAVER_DIR ${XSCREENSAVER_DIR})
set(XSCREENSAVER_CONFIG_DIR)
FIND_PATH(XSCREENSAVER_CONFIG_DECO config/deco.xml
PATHS
${KDE4_INCLUDE_DIR}
/usr/
/usr/local/
/opt/local/
/usr/X11R6/
/opt/kde/
/opt/kde3/
/usr/kde/
/usr/local/kde/
/usr/openwin/lib/xscreensaver/
/etc/
PATH_SUFFIXES xscreensaver share/xscreensaver
)
#MESSAGE(STATUS "XSCREENSAVER_CONFIG_DIR :<${XSCREENSAVER_CONFIG_DIR}>")
if(XSCREENSAVER_CONFIG_DECO)
set(XSCREENSAVER_CONFIG_DIR "${XSCREENSAVER_CONFIG_DECO}/config/")
#MESSAGE(STATUS "XSCREENSAVER_CONFIG_DIR <${XSCREENSAVER_CONFIG_DIR}>")
endif(XSCREENSAVER_CONFIG_DECO)
# Try and locate XScreenSaver config when path doesn't include config
if(NOT XSCREENSAVER_CONFIG_DIR)
FIND_PATH(XSCREENSAVER_CONFIG_DIR deco.xml
/etc/xscreensaver
)
endif(NOT XSCREENSAVER_CONFIG_DIR)
endif(NOT XSCREENSAVER_FOUND)
#MESSAGE(STATUS "XSCREENSAVER_CONFIG_DIR :<${XSCREENSAVER_CONFIG_DIR}>")
#MESSAGE(STATUS "XSCREENSAVER_DIR :<${XSCREENSAVER_DIR}>")
# Need to fix hack
if(XSCREENSAVER_DIR AND XSCREENSAVER_CONFIG_DIR)
set(XSCREENSAVER_FOUND TRUE)
endif(XSCREENSAVER_DIR AND XSCREENSAVER_CONFIG_DIR)
if (XSCREENSAVER_FOUND)
if (NOT Xscreensaver_FIND_QUIETLY)
message(STATUS "Found XSCREENSAVER_CONFIG_DIR <${XSCREENSAVER_CONFIG_DIR}>")
endif (NOT Xscreensaver_FIND_QUIETLY)
else (XSCREENSAVER_FOUND)
if (Xscreensaver_FIND_REQUIRED)
message(FATAL_ERROR "XScreenSaver not found")
endif (Xscreensaver_FIND_REQUIRED)
endif (XSCREENSAVER_FOUND)
MARK_AS_ADVANCED(XSCREENSAVER_DIR XSCREENSAVER_CONFIG_DIR)

25
pkgs/desktops/kde-4.5/artwork/default.nix
View file

@ -1,19 +1,20 @@
{ stdenv, fetchurl, lib, cmake, qt4, perl, xscreensaver
, kdelibs, kdebase_workspace, automoc4, phonon, strigi, eigen}:
{ kdePackage, cmake, qt4, perl, xscreensaver
, kdelibs, kdebase_workspace, automoc4, strigi, eigen}:
kdePackage {
pn = "kdeartwork";
v = "4.5.0";
buildInputs = [ cmake qt4 perl xscreensaver kdelibs kdebase_workspace automoc4
strigi eigen ];
preConfigure = ''
cp -v ${./FindXscreensaver.cmake} cmake/modules/FindXscreensaver.cmake
'';
stdenv.mkDerivation {
name = "kdeartwork-4.4.92";
src = fetchurl {
url = "mirror://kde/unstable/4.4.92/src/${name}.tar.bz2";
sha256 = "17c481za2jfrmhd946jbhgwpcyzjkgjkk2jw84wbj8v694ry3xym";
};
buildInputs = [ cmake qt4 perl xscreensaver
kdelibs kdebase_workspace automoc4 phonon strigi eigen ];
meta = {
description = "KDE artwork";
longDescription = "Contains various artwork for KDE such as backgrounds, icons and screensavers";
license = "LGPL";
homepage = http://www.kde.org;
maintainers = [ lib.maintainers.sander ];
};
}

27
pkgs/desktops/kde-4.5/base-runtime/default.nix Normal file
View file

@ -0,0 +1,27 @@
{ kdePackage, cmake, perl, bzip2, xz, qt4, alsaLib, xineLib, samba,
shared_mime_info, exiv2, libssh , kdelibs, automoc4, strigi, soprano,
cluceneCore, attica, virtuoso, makeWrapper, oxygen_icons }:
kdePackage {
pn = "kdebase-runtime";
v = "4.5.0";
buildInputs = [ cmake perl bzip2 xz qt4 alsaLib xineLib samba shared_mime_info
exiv2 libssh kdelibs automoc4 strigi soprano cluceneCore attica
makeWrapper];
patches = [ ./freeze.diff ];
postInstall = ''
rm -v $out/share/icons/default.kde4
ln -s ${oxygen_icons}/share/icons/oxygen $out/share/icons/default.kde4
wrapProgram "$out/bin/nepomukservicestub" --prefix LD_LIBRARY_PATH : "${virtuoso}/lib" \
--prefix PATH : "${virtuoso}/bin"
'';
meta = {
description = "KDE runtime";
longDescription = "Libraries and tools which supports running KDE desktop applications";
license = "LGPL";
};
}

37
pkgs/desktops/kde-4.5/base-runtime/freeze.diff Normal file
View file

@ -0,0 +1,37 @@
Index: kioslave/network/network/builder/upnp/upnpnetworkbuilder.cpp
===================================================================
--- a/kioslave/network/network/builder/upnp/upnpnetworkbuilder.cpp (revision 1160390)
+++ b/kioslave/network/network/builder/upnp/upnpnetworkbuilder.cpp (revision 1160391)
@@ -36,6 +36,7 @@
#include <QtDBus/QDBusConnection>
#include <QtDBus/QDBusInterface>
#include <QtDBus/QDBusPendingCallWatcher>
+#include <QtCore/QTimer>
#include <QtCore/QStringList>
#include <KDebug>
@@ -60,6 +61,11 @@
void UpnpNetworkBuilder::start()
{
+ QTimer::singleShot(0, this, SLOT(startBrowse()));
+}
+
+void UpnpNetworkBuilder::startBrowse()
+{
qDBusRegisterMetaType<DeviceTypeMap>();
qDBusRegisterMetaType<Cagibi::Device>();
Index: kioslave/network/network/builder/upnp/upnpnetworkbuilder.h
===================================================================
--- a/kioslave/network/network/builder/upnp/upnpnetworkbuilder.h (revision 1160390)
+++ b/kioslave/network/network/builder/upnp/upnpnetworkbuilder.h (revision 1160391)
@@ -63,6 +63,8 @@
void removeUPnPDevices( const QList<Cagibi::Device>& devices );
private Q_SLOTS:
+ void startBrowse();
+
void onDevicesAdded( const DeviceTypeMap& deviceTypeMap );
void onDevicesRemoved( const DeviceTypeMap& deviceTypeMap );
void onAddedDeviceDetails( const Cagibi::Device& device );

23
pkgs/desktops/kde-4.5/base-workspace/default.nix Normal file
View file

@ -0,0 +1,23 @@
{ kdePackage, cmake, perl, python, pam, consolekit
, qt4, sip, pyqt4, kdelibs, kdepimlibs, kdebindings
, libXi, libXau, libXdmcp, libXtst, libXcomposite, libXdamage, libXScrnSaver
, lm_sensors, libxklavier, libusb, libpthreadstubs, boost
, automoc4, strigi, soprano, qimageblitz, akonadi
, libdbusmenu_qt
}:
kdePackage {
pn = "kdebase-workspace";
v = "4.5.0";
buildInputs = [ cmake perl python qt4 pam consolekit sip pyqt4 kdelibs libXtst
kdepimlibs kdebindings boost libusb libXi libXau libXdmcp
libXcomposite libXdamage libXScrnSaver lm_sensors libxklavier automoc4
strigi soprano qimageblitz akonadi libpthreadstubs libdbusmenu_qt ];
meta = {
description = "KDE Workspace";
longDescription = "KDE base components that are only required to work with X11 such KDM and KWin";
license = "GPL";
};
}

18
pkgs/desktops/kde-4.5/base/default.nix Normal file
View file

@ -0,0 +1,18 @@
{ kdePackage, cmake, perl, qt4, kdelibs, pciutils, libraw1394
, automoc4, strigi, qimageblitz, soprano}:
kdePackage {
pn = "kdebase";
v = "4.5.0";
preConfigure = "cd apps";
buildInputs = [ cmake perl qt4 kdelibs pciutils libraw1394 automoc4
strigi qimageblitz soprano ];
meta = {
description = "KDE Base components";
longDescription = "Applications that form the KDE desktop, like Plasma, System Settings, Konqueror, Dolphin, Kate, and Konsole";
license = "GPL";
};
}

26
pkgs/desktops/kde-4.5/bindings/default.nix
View file

@ -1,42 +1,36 @@
{ stdenv, fetchurl, lib, cmake, perl, python, sip, pyqt4, zlib, libpng, freetype, fontconfig, qt4, boost
{ kdePackage, lib, cmake, perl, python, sip, pyqt4, zlib, libpng, freetype, fontconfig, qt4, boost
, kdelibs, kdepimlibs, automoc4, soprano, akonadi, attica, polkit_qt_1, ruby
}:
# This function will only build the pykde4 module. I don't need the other bindings and
# some bindings are even broken.
stdenv.mkDerivation rec {
name = "kdebindings-4.4.95";
src = fetchurl {
url = "mirror://kde/unstable/4.4.95/src/${name}.tar.bz2";
sha256 = "115xl1jcpnyr71573if0nvb3hy8z5hxqy5qlvc71pdprzrp78xbc";
};
kdePackage rec {
pn = "kdebindings";
v = "4.5.0";
patches = [ ./python-site-packages-install-dir.diff ];
preConfigure = ''
CUSTOM_RUBY_SITE_ARCH_DIR=$(ruby -r rbconfig -e "print Config::CONFIG['sitearchdir']" | sed -e "s@${ruby}@$out@")
CUSTOM_RUBY_SITE_LIB_DIR=$(ruby -r rbconfig -e "print Config::CONFIG['sitelibdir']" | sed -e "s@${ruby}@$out@")
CUSTOM_PERL_SITE_ARCH_DIR=$(perl -MConfig -e 'print $Config{sitearch}' | sed -e "s@${perl}@$out@")
CUSTOM_PERL_SITE_ARCH_DIR=$(perl -MConfig -e 'print $Config{sitearch}' | sed -e "s@${perl}@$out@")
cmakeFlagsArray=(
-DSIP_DEFAULT_SIP_DIR=$out/share/sip
-DSIP_DEFAULT_SIP_DIR=$out/share/sip
-DCUSTOM_RUBY_SITE_ARCH_DIR=$CUSTOM_RUBY_SITE_ARCH_DIR
-DCUSTOM_RUBY_SITE_LIB_DIR=$CUSTOM_RUBY_SITE_LIB_DIR
-DCUSTOM_PERL_SITE_ARCH_DIR=$CUSTOM_PERL_SITE_ARCH_DIR
)
-DCUSTOM_RUBY_SITE_LIB_DIR=$CUSTOM_RUBY_SITE_LIB_DIR
-DCUSTOM_PERL_SITE_ARCH_DIR=$CUSTOM_PERL_SITE_ARCH_DIR
)
'';
# Okular seems also an optional depenedency which I left out
buildInputs = [ cmake perl python sip pyqt4 zlib libpng freetype fontconfig qt4 boost
kdelibs kdepimlibs automoc4 soprano akonadi attica polkit_qt_1 ruby ];
kdelibs kdepimlibs automoc4 soprano akonadi attica polkit_qt_1 ruby ];
meta = {
description = "KDE bindings";
longDescription = "Provides KDE bindings for several languages such as Java, Smoke and Python";
license = "LGPL";
homepage = http://www.kde.org;
inherit (kdelibs.meta) maintainers;
};
}

8
pkgs/desktops/kde-4.5/bindings/python-site-packages-install-dir.diff
View file

@ -39,7 +39,7 @@ diff --git a/python/pykde4/tools/pykdeuic4/CMakeLists.txt b/python/pykde4/tools/
index ea711ba..115c777 100644
--- a/python/pykde4/tools/pykdeuic4/CMakeLists.txt
+++ b/python/pykde4/tools/pykdeuic4/CMakeLists.txt
@@ -1,5 +1,5 @@
@@ -1,5 +1,9 @@
-PYTHON_INSTALL(kde4.py ${PYTHON_SITE_PACKAGES_DIR}/PyQt4/uic/widget-plugins/)
-PYTHON_INSTALL(pykdeuic4.py ${PYTHON_SITE_PACKAGES_DIR}/PyQt4/uic/)
@ -47,4 +47,8 @@ index ea711ba..115c777 100644
+PYTHON_INSTALL(pykdeuic4.py ${PYTHON_SITE_PACKAGES_INSTALL_DIR}/PyQt4/uic/)
find_path(cmake_module_dir create_exe_symlink.cmake ${CMAKE_MODULE_PATH})
-INSTALL(CODE "EXECUTE_PROCESS(COMMAND ${CMAKE_COMMAND} -DTARGET=${PYTHON_SITE_PACKAGES_DIR}/PyQt4/uic/pykdeuic4.py -DLINK_NAME=${BIN_INSTALL_DIR}/pykdeuic4 -P ${cmake_module_dir}/create_exe_symlink.cmake)" )
+INSTALL(CODE "EXECUTE_PROCESS(COMMAND ${CMAKE_COMMAND} -DTARGET=${PYTHON_SITE_PACKAGES_INSTALL_DIR}/PyQt4/uic/pykdeuic4.py -DLINK_NAME=${BIN_INSTALL_DIR}/pykdeuic4 -P ${cmake_module_dir}/create_exe_symlink.cmake)" )
+IF(IS_ABSOLUTE ${PYTHON_SITE_PACKAGES_INSTALL_DIR})
+ INSTALL(CODE "EXECUTE_PROCESS(COMMAND ${CMAKE_COMMAND} -DTARGET=${PYTHON_SITE_PACKAGES_INSTALL_DIR}/PyQt4/uic/pykdeuic4.py -DLINK_NAME=${BIN_INSTALL_DIR}/pykdeuic4 -P ${cmake_module_dir}/create_exe_symlink.cmake)" )
+ELSE(IS_ABSOLUTE ${PYTHON_SITE_PACKAGES_INSTALL_DIR})
+ INSTALL(CODE "EXECUTE_PROCESS(COMMAND ${CMAKE_COMMAND} -DTARGET=${CMAKE_INSTALL_PREFIX}/${PYTHON_SITE_PACKAGES_INSTALL_DIR}/PyQt4/uic/pykdeuic4.py -DLINK_NAME=${BIN_INSTALL_DIR}/pykdeuic4 -P ${cmake_module_dir}/create_exe_symlink.cmake)" )
+ENDIF(IS_ABSOLUTE ${PYTHON_SITE_PACKAGES_INSTALL_DIR})

36
pkgs/desktops/kde-4.5/default.nix
View file

@ -1,8 +1,12 @@
{ callPackage, stdenv, fetchurl } :
{ callPackage, stdenv, fetchurl, qt47 } :
{
recurseForRelease = true;
qt4 = qt47;
phonon = null;
kdePackage = import ./kde-package {
inherit stdenv fetchurl;
};
@ -14,6 +18,8 @@
automoc4 = callPackage ./support/automoc4 { };
eigen = callPackage ./support/eigen { };
oxygen_icons = callPackage ./support/oxygen-icons { };
polkit_qt_1 = callPackage ./support/polkit-qt-1 { };
@ -26,13 +32,39 @@
qca2_ossl = callPackage ./support/qca2/ossl.nix { };
qimageblitz = callPackage ./support/qimageblitz { };
### LIBS
kdelibs = callPackage ./libs { };
kdepimlibs = callPackage ./pimlibs { };
### BASE
kdebase = callPackage ./base { };
kdebase_workspace = callPackage ./base-workspace { };
kdebase_runtime = callPackage ./base-runtime { };
### OTHER MODULES
kdeaccessibility = callPackage ./accessibility { };
kdeadmin = callPackage ./admin { };
kdeartwork = callPackage ./artwork { };
kdeedu = callPackage ./edu { };
kdegames = callPackage ./games { };
kdegraphics = callPackage ./graphics { };
kdemultimedia = callPackage ./multimedia { };
kdenetwork = callPackage ./network { };
kdeplasma_addons = callPackage ./plasma-addons { };
kdesdk = callPackage ./sdk { };
kdetoys = callPackage ./toys { };
kdeutils = callPackage ./utils { };
kdewebdev = callPackage ./webdev { };
#kdepim_runtime = callPackage ../kde-4.4/pim-runtime { };
kdepim_runtime = callPackage ./pim-runtime { };
kdepim = callPackage ../kde-4.4/pim { };
### DEVELOPMENT
kdebindings = callPackage ./bindings { };
}

27
pkgs/desktops/kde-4.5/edu/default.nix Normal file
View file

@ -0,0 +1,27 @@
{ kdePackage, cmake, qt4, perl, libxml2, libxslt, openbabel, boost, readline, gmm, gsl
, xplanet, libspectre, pkgconfig, libqalculate
, kdelibs, automoc4, eigen, attica}:
kdePackage {
pn = "kdeedu";
v = "4.5.0";
#TODO:
#* Boost.Python (1.31 or higher) <http://www.boost.org/> - fails to find
# * libcfitsio0 (3.09 or higher) <http://indi.sf.net>
# * libindi (0.6.1 or higher) <http://indi.sf.net>
# * R <http://www.r-project.org/>
# * OCaml <http://caml.inria.fr/>
# * LibFacile <http://www.recherche.enac.fr/log/facile/>
# * Avogadro (1.0 or higher) <http://avogadro.openmolecules.net>
# * libgps
buildInputs = [ cmake qt4 perl libxml2 libxslt openbabel boost readline gmm
gsl xplanet kdelibs automoc4 eigen attica libspectre pkgconfig
libqalculate ];
meta = {
description = "KDE Educative software";
license = "GPL";
};
}

20
pkgs/desktops/kde-4.5/games/default.nix Normal file
View file

@ -0,0 +1,20 @@
{kdePackage, cmake, qt4, perl, shared_mime_info, kdelibs, automoc4, qca2
, kdebindings, twisted, python, pyqt4, sip, makeWrapper }:
kdePackage {
pn = "kdegames";
v = "4.5.0";
# TODO: ggz
buildInputs = [ cmake qt4 perl shared_mime_info kdelibs automoc4 qca2
kdebindings twisted python pyqt4 sip makeWrapper ];
postInstall = ''
wrapProgram $out/bin/kajongg --set PYTHONPATH $PYTHONPATH
wrapProgram $out/bin/kajonggserver --set PYTHONPATH $PYTHONPATH'';
meta = {
description = "KDE Games";
license = "GPL";
};
}

21
pkgs/desktops/kde-4.5/graphics/default.nix Normal file
View file

@ -0,0 +1,21 @@
{ kdePackage, cmake, lib, perl, qt4, exiv2, lcms, saneBackends, libgphoto2
, libspectre, popplerQt4, djvulibre, chmlib, shared_mime_info, libXxf86vm
, kdelibs, automoc4, strigi, qimageblitz, soprano, qca2, ebook_tools }:
kdePackage {
pn = "kdegraphics";
v = "4.5.0";
buildInputs = [ cmake perl qt4 exiv2 lcms saneBackends libgphoto2 libspectre
(popplerQt4.override { inherit qt4; }) chmlib shared_mime_info libXxf86vm
kdelibs automoc4 strigi qimageblitz soprano qca2 djvulibre ebook_tools ];
meta = {
description = "KDE graphics utilities";
longDescription = ''
Contains various graphics utilities such as Gwenview image viewer and
Okular document reader.
'';
license = "GPL";
};
}

10
pkgs/desktops/kde-4.5/kde-package/default.nix
View file

@ -1,12 +1,16 @@
{ stdenv, fetchurl }:
a@{ pn, v, stable ? true, sha256, subdir ? null, ... }:
let
manifest = import ./manifest.nix;
in
a@{ pn, v, stable ? true, subdir ? null, ... }:
stdenv.mkDerivation ({
name = "${pn}-${v}";
src = fetchurl {
url = "mirror://kde/" + (if stable then "" else "un") + "stable/" +
(if subdir == null then "${v}/src" else subdir) + "/${pn}-${v}.tar.bz2";
inherit sha256;
sha256 = builtins.getAttr "${pn}-${v}.tar.bz2" manifest;
};
meta = {
maintainers = with stdenv.lib.maintainers; [ sander urkud ];
@ -14,4 +18,4 @@ stdenv.mkDerivation ({
inherit stable;
homepage = http://www.kde.org;
} // ( if a ? meta then a.meta else { } );
} // (removeAttrs a [ "meta" "pn" "v" "stable" "sha256" "subdir" ]))
} // (removeAttrs a [ "meta" "pn" "v" "stable" "subdir" ]))

95
pkgs/desktops/kde-4.5/kde-package/manifest.nix Normal file
View file

@ -0,0 +1,95 @@
builtins.listToAttrs
[
{
name = "kdepim-runtime-4.4.92.tar.bz2";
value = "1gshcnra3fcbj6ww7rfaw6ny1x9mf4l7pxwlrppv2slgwg141msy";
}
{
name = "kdepim-4.4.92.tar.bz2";
value = "0mhpifynnypg81nhwfvr28hbpr7c6w488afasprqhxbs4q57lin6";
}
{
name = "kdegraphics-4.5.0.tar.bz2";
value = "13ms1z26sb2pfadhagkykgnw0p7inrn36p4s9qr04qisy2b2vd6l";
}
{
name = "kdebase-workspace-4.5.0.tar.bz2";
value = "0wwg2rcwgkwi0k1a7v6h0ibvzk64mb2fvr02zbdkc94rh4pc25zw";
}
{
name = "oxygen-icons-4.5.0.tar.bz2";
value = "11wlrxnral4q5wi46p1di1cff4vr5da35a8dv2xx3ag6lnhqvjqi";
}
{
name = "kdeplasma-addons-4.5.0.tar.bz2";
value = "1v0zcl65sqlz6ggin3mb6pr3gf2v15z8lyh0p4b95rslrzw6iih6";
}
{
name = "kdepimlibs-4.5.0.tar.bz2";
value = "0n3wmc2c4jcxbi81i9jmw23b5ms43gia58qpr835im874641f54m";
}
{
name = "kdegames-4.5.0.tar.bz2";
value = "1ax2qwmkpnc01prlkw5yx5hiqcv725b7yf6czr5gkjysjsqi3aqk";
}
{
name = "kdewebdev-4.5.0.tar.bz2";
value = "0frl9kfw549lfxrjbslxny12r4cg67ggnyclhb0rqma7i07g8gd8";
}
{
name = "kdelibs-4.5.0.tar.bz2";
value = "0d3iml2v1vp1y6i5vpqv77nbdlw6qb8j6c88yi744ba4zvcirzrx";
}
{
name = "kdebase-4.5.0.tar.bz2";
value = "1znmmx84hx3a31lhr55j3h91p9r6fv1c4q9hbgv4xwaijlkxk6dw";
}
{
name = "kdeadmin-4.5.0.tar.bz2";
value = "1zwc8x1r7wg1qddw01b5zr3npmzibag17csiv4a1w6fsnvnny8k1";
}
{
name = "kdebase-runtime-4.5.0.tar.bz2";
value = "0cis9as2szqaxi0bhhw63sy6s8b994j8ffx5wsc84w4a8y3ld1s0";
}
{
name = "kdeedu-4.5.0.tar.bz2";
value = "15c6k1274ckhs4liqyxna5xka2gn4h9qfdvbh9ys85x08srb3051";
}
{
name = "kdebindings-4.5.0.tar.bz2";
value = "0x8c98gbp2rm3dckzw3l0jh2ch5g9sb2prmilwzl8d5psyhx39n6";
}
{
name = "kdemultimedia-4.5.0.tar.bz2";
value = "0b00d9kgy7jcfrxivw4gjvqzp5gd145cd4zbhbnjjdg5l9pvc721";
}
{
name = "kdetoys-4.5.0.tar.bz2";
value = "0lg12cjpk2x2qsk998jbsn0p7a26ans9zgf5966k4wmjcgx1zhqq";
}
{
name = "kdenetwork-4.5.0.tar.bz2";
value = "0xc8309z5c7k3hg38waavrs2hlpv8mf20paj9nadr8q3zs0q6nyp";
}
{
name = "kdesdk-4.5.0.tar.bz2";
value = "09w0n1v9qhxf7ijickw48s19rkaim36vnrxv28lrhj2x3s3s6n1s";
}
{
name = "kdeartwork-4.5.0.tar.bz2";
value = "15sdhrq6hx4i0wywilvvl3h8j5wfa7lgvr8siqxlipy94pfwrbwr";
}
{
name = "kdeutils-4.5.0.tar.bz2";
value = "1x4dwc193gsfcnryhkv2v3xafjr1a87ls0zfi56i1w2aj38b36l7";
}
{
name = "kdeaccessibility-4.5.0.tar.bz2";
value = "0p08xn3rdqf4a9mj4wrvnjj64mbxas3pns772a1sdmpxkyjlwwcx";
}
{
name = "polkit-qt-1-0.96.1.tar.bz2";
value = "1ng5bi1gmr5lg49c5kyqyjzbjhs4w90c2zlnfcyviv9p3wzfgzbr";
}
]

3
pkgs/desktops/kde-4.5/libs/default.nix
View file

@ -8,7 +8,6 @@
kdePackage {
pn = "kdelibs";
v = "4.5.0";
sha256 = "0d3iml2v1vp1y6i5vpqv77nbdlw6qb8j6c88yi744ba4zvcirzrx";
buildInputs = [
cmake perl qt4 xz flex bison bzip2 pcre fam libxml2 libxslt
@ -19,6 +18,8 @@ kdePackage {
propagatedBuildInputs = [ shared_desktop_ontologies gcc.libc ];
patches = [ ./polkit-install.patch ];
# cmake fails to find acl.h because of C++-style comment
cmakeFlags = [
"-DHAVE_ACL_LIBACL_H=ON" "-DHAVE_SYS_ACL_H=ON"

11
pkgs/desktops/kde-4.5/libs/polkit-install.patch Normal file
View file

@ -0,0 +1,11 @@
Author: Yury Kudryashov
Reason: other KDE modules try to install polkit action files into
$kdelibs/share/polkit-1/actions
--- a/cmake/modules/FindPolkitQt-1.cmake.old 2010-08-12 16:13:45.000000000 +0400
+++ b/cmake/modules/FindPolkitQt-1.cmake 2010-08-12 16:13:56.000000000 +0400
@@ -101,4 +101,4 @@
endif (NOT PC_POLKITQT-1_PREFIX STREQUAL CMAKE_INSTALL_PREFIX)
endif (POLKITQT-1_FOUND)
-set(POLKITQT-1_POLICY_FILES_INSTALL_DIR ${CMAKE_INSTALL_PREFIX}/share/polkit-1/actions)
+set(POLKITQT-1_POLICY_FILES_INSTALL_DIR share/polkit-1/actions)

13
pkgs/desktops/kde-4.5/libs/python-site-packages-install-dir.diff
View file

@ -1,13 +0,0 @@
Source: upstream r1153602
Index: a/cmake/modules/SIPMacros.cmake
===================================================================
--- a/cmake/modules/SIPMacros.cmake (revision 1153601)
+++ b/cmake/modules/SIPMacros.cmake (revision 1153602)
@@ -119,6 +119,6 @@
TARGET_LINK_LIBRARIES(${_logical_name} ${EXTRA_LINK_LIBRARIES})
SET_TARGET_PROPERTIES(${_logical_name} PROPERTIES PREFIX "" OUTPUT_NAME ${_child_module_name})
- INSTALL(TARGETS ${_logical_name} DESTINATION "${PYTHON_SITE_PACKAGES_DIR}/${_parent_module_path}")
+ INSTALL(TARGETS ${_logical_name} DESTINATION "${PYTHON_SITE_PACKAGES_INSTALL_DIR}/${_parent_module_path}")
ENDMACRO(ADD_SIP_PYTHON_MODULE)

18
pkgs/desktops/kde-4.5/multimedia/default.nix Normal file
View file

@ -0,0 +1,18 @@
{ kdePackage, cmake, perl, qt4, alsaLib, libvorbis, xineLib, taglib, flac,
cdparanoia, lame , kdelibs, automoc4, ffmpeg}:
kdePackage {
pn = "kdemultimedia";
v = "4.5.0";
buildInputs = [ cmake perl qt4 alsaLib libvorbis xineLib flac taglib
cdparanoia lame kdelibs automoc4 ffmpeg ];
meta = {
description = "KDE Multimedia";
longDescription = ''
Contains various Multimedia utilties for KDE such as a movie player and sound volume mixer.
'';
license = "GPL";
};
}

34
pkgs/desktops/kde-4.5/network/default.nix Normal file
View file

@ -0,0 +1,34 @@
{ kdePackage, cmake, qt4, perl, speex, gmp, libxml2, libxslt, sqlite, alsaLib, libidn
, libvncserver, libmsn, giflib, gpgme, boost, libv4l, libotr
, libXi, libXtst, libXdamage, libXxf86vm, libktorrent, kdebase
, kdebase_workspace
, kdelibs, kdepimlibs, automoc4, qca2, soprano, qimageblitz, strigi}:
kdePackage {
pn = "kdenetwork";
v = "4.5.0";
buildInputs = [ cmake qt4 perl speex gmp libxml2 libxslt sqlite alsaLib libidn
libvncserver libmsn giflib gpgme boost libv4l libotr libXi libXtst
libXdamage libXxf86vm kdelibs kdepimlibs automoc4 qca2 soprano
qimageblitz strigi libktorrent kdebase kdebase_workspace ];
patches = [ ./log-feature.diff ];
#TODO
# * telepathy-qt4 (0.18 or higher) <http://telepathy.freedesktop.org>
# * KWebKitPart <https://svn.kde.org/home/kde/trunk/extragear/base/kwebkitpart>
# * libortp (0.13 or higher) <http://www.linphone.org/index.php/eng/code_review/ortp>
# * XMMS <http://www.xmms.org>
# * mediastreamer (2.3.0 or higher) <http://www.linphone.org/index.php/eng/code_review/mediastreamer2>
# * libmeanwhile <http://meanwhile.sf.net>
# * libgadu (1.8.0 or higher) <http://toxygen.net/libgadu/>
# Let cmake find libktorrent. Waiting for upstream fix in 4.5.1
KDEDIRS="${libktorrent}";
meta = {
description = "KDE network utilities";
longDescription = "Various network utilities for KDE such as a messenger client and network configuration interface";
license = "GPL";
};
}

60
pkgs/desktops/kde-4.5/network/log-feature.diff Normal file
View file

@ -0,0 +1,60 @@
--- a/kget/CMakeLists.txt 2010-08-16 19:08:36.000000000 +0400
+++ b/kget/CMakeLists.txt 2010-08-16 22:04:24.000000000 +0400
@@ -53,21 +53,20 @@
add_subdirectory(desktop)
add_subdirectory(plasma)
-# find kworkspace library to allow the shutdown after downloads completed option
-find_library(KDE4_KWORKSPACE_LIBRARY NAMES kworkspace PATHS ${KDE4_LIB_INSTALL_DIR} NO_DEFAULT_PATH )
-if(KDE4_KWORKSPACE_LIBRARY)
- set(KDE4_KWORKSPACE_LIBS ${kworkspace_LIB_DEPENDS} ${KDE4_KWORKSPACE_LIBRARY})
+macro_optional_find_package(KDE4Workspace)
+macro_log_feature(KDE4WORKSPACE_FOUND "KDE4Workspace" "KDE4 workspace libraries, part of kdebase-workspace" "http://www.kde.org" FALSE "" "Allows 'shutdown after downloads completed' in kget")
+if(KDE4WORKSPACE_FOUND)
add_definitions(-DHAVE_KWORKSPACE)
- set(KWORKSPACE_FOUND true)
-endif(KDE4_KWORKSPACE_LIBRARY)
+ include_directories(${KDE4WORKSPACE_INCLUDE_DIR})
+endif(KDE4WORKSPACE_FOUND)
# find libkonq to allow actions and open with options in the context menu of a transfer
-find_library(KDE4_KONQUEROR_LIBRARY NAMES konq PATHS ${KDE4_LIB_INSTALL_DIR} NO_DEFAULT_PATH )
-if(KDE4_KONQUEROR_LIBRARY)
- set(KDE4_KONQUEROR_LIBS ${konq_LIB_DEPENDS} ${KDE4_KONQUEROR_LIBRARY})
+macro_optional_find_package(LibKonq)
+macro_log_feature(LIBKONQ_FOUND "libkonq" "KDE4 Konqueror library" "http://www.kde.org" FALSE "" "Needed to build actions and open with options in the context menu of a transfer")
+if(LIBKONQ_FOUND)
add_definitions(-DHAVE_KONQUEROR)
- set(KONQUEROR_FOUND true)
-endif(KDE4_KONQUEROR_LIBRARY)
+ include_directories(${LIBKONQ_INCLUDE_DIR})
+endif(LIBKONQ_FOUND)
include_directories(
@@ -142,9 +141,9 @@
target_link_libraries(kgetcore ${KDE4_KIO_LIBS})
-if (KWORKSPACE_FOUND)
- target_link_libraries(kgetcore ${KDE4_KWORKSPACE_LIBS})
-endif (KWORKSPACE_FOUND)
+if (KDE4WORKSPACE_FOUND)
+ target_link_libraries(kgetcore ${KDE4WORKSPACE_KWORKSPACE_LIBS})
+endif (KDE4WORKSPACE_FOUND)
if (HAVE_NEPOMUK)
target_link_libraries(kgetcore ${SOPRANO_LIBRARIES} ${NEPOMUK_LIBRARIES})
@@ -294,9 +293,9 @@
target_link_libraries(kget ${SOPRANO_LIBRARIES} ${NEPOMUK_LIBRARIES})
endif (HAVE_NEPOMUK)
-if (KONQUEROR_FOUND)
- target_link_libraries(kget ${KDE4_KONQUEROR_LIBS})
-endif (KONQUEROR_FOUND)
+if (LIBKONQ_FOUND)
+ target_link_libraries(kget ${LIBKONQ_LIBRARY})
+endif (LIBKONQ_FOUND)
if (QGPGME_FOUND)
target_link_libraries(kget ${QGPGME_LIBRARIES})

14
pkgs/desktops/kde-4.5/pim-runtime/default.nix Normal file
View file

@ -0,0 +1,14 @@
{ kdePackage, cmake, kdelibs, qt4, kdepimlibs, akonadi, pkgconfig, boost, shared_mime_info, libxml2, shared_desktop_ontologies, soprano, strigi, automoc4, libxslt }:
kdePackage rec {
pn = "kdepim-runtime";
v = "4.4.92";
stable = false;
subdir = "kdepim/${v}/src";
buildInputs = [ automoc4 cmake kdelibs qt4 kdepimlibs akonadi pkgconfig boost shared_mime_info shared_desktop_ontologies libxml2 soprano strigi libxslt ];
meta = {
description = "Runtime files for KDE PIM: akonadi agents etc.";
};
}

1
pkgs/desktops/kde-4.5/pimlibs/default.nix
View file

@ -4,7 +4,6 @@
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 ];

18
pkgs/desktops/kde-4.5/plasma-addons/default.nix Normal file
View file

@ -0,0 +1,18 @@
{ kdePackage, cmake, qt4, perl, automoc4, kdelibs, soprano, kdeedu
, boost, eigen, kdebase_workspace, attica, python, qca2, qimageblitz
, shared_mime_info, kdepimlibs, kdegraphics, libqalculate, libXtst }:
# , qwt, scim, kdeedu
kdePackage {
pn = "kdeplasma-addons";
v = "4.5.0";
buildInputs = [ cmake qt4 perl automoc4 kdelibs boost eigen kdebase_workspace
attica python qca2 qimageblitz shared_mime_info kdepimlibs kdegraphics
libqalculate soprano libXtst kdeedu ];
meta = {
description = "KDE Plasma Addons";
license = "GPL";
};
}

21
pkgs/desktops/kde-4.5/sdk/default.nix Normal file
View file

@ -0,0 +1,21 @@
{ kdePackage, binutils, cmake, qt4, perl, libxml2, libxslt, boost, subversion, apr,
aprutil , shared_mime_info, hunspell , kdelibs, kdepimlibs, automoc4,
kdebindings, strigi, kdebase, libtool, antlr}:
kdePackage {
pn = "kdesdk";
v = "4.5.0";
buildInputs = [ cmake qt4 perl libxml2 libxslt boost subversion aprutil apr
shared_mime_info kdelibs kdepimlibs automoc4 strigi hunspell kdebindings
kdebase libtool binutils antlr ];
patches = [ ./find-svn.patch ];
#cmakeFlags = "-DDISABLE_ALL_OPTIONAL_SUBDIRECTORIES=ON -DBUILD_kioslave=ON";
meta = {
description = "KDE SDK";
longDescription = "Contains various development utilities such as the Umbrello UML modeler and Cerivisia CVS front-end";
license = "GPL";
};
}

59
pkgs/desktops/kde-4.5/sdk/find-svn.patch Normal file
View file

@ -0,0 +1,59 @@
diff --git a/cmake/modules/FindSVN.cmake b/cmake/modules/FindSVN.cmake
index 59bcb96..2eac05d 100644
--- a/cmake/modules/FindSVN.cmake
+++ b/cmake/modules/FindSVN.cmake
@@ -17,6 +17,9 @@ FIND_PROGRAM(SVNCONFIG_EXECUTABLE NAMES svn-config PATHS
FIND_PROGRAM(APRCONFIG_EXECUTABLE NAMES apr-1-config apr-config PATHS
/usr/local/apr/bin
)
+find_program(APUCONFIG_EXECUTABLE NAMES apu-1-config apu-config PATHS
+ /usr/local/apr/bin
+)
if(SVNCONFIG_EXECUTABLE)
@@ -56,15 +59,9 @@ else(SVNCONFIG_EXECUTABLE)
set(SVN_INCLUDES ${SVN_INCLUDES} ${_INCLUDES})
else(APRCONFIG_EXECUTABLE)
FIND_PATH(_INCLUDES apr_pools.h
- ${SVN_INCLUDES}/apr-0/
- ${SVN_INCLUDES}/apr-1/
- ${SVN_INCLUDES}/apr-1.0/
- /usr/include/apr-0/
- /usr/include/apr-1/
- /usr/include/apr-1.0/
- /usr/local/include/apr-0/
- /usr/local/include/apr-1/
- /usr/local/include/apr-1.0/
+ HINTS ${SVN_INCLUDES}
+ PATHS /usr /usr/local
+ SUFFIXES apr-0 apr-1 apr-1.0
)
if(_INCLUDES)
set(SVN_INCLUDES ${SVN_INCLUDES} ${_INCLUDES})
@@ -72,6 +69,25 @@ else(SVNCONFIG_EXECUTABLE)
set(SVN_FOUND FALSE) # no apr == can't compile!
endif(_INCLUDES)
endif(APRCONFIG_EXECUTABLE)
+
+ # Use apu-config if it exists
+ if(APUCONFIG_EXECUTABLE)
+ EXEC_PROGRAM(${APUCONFIG_EXECUTABLE} ARGS --includes RETURN_VALUE _return_VALUE OUTPUT_VARIABLE _INCLUDES)
+ string(REPLACE "-I" "" _INCLUDES ${_INCLUDES})
+ string(REPLACE " " ";" _INCLUDES ${_INCLUDES})
+ set(SVN_INCLUDES ${SVN_INCLUDES} ${_INCLUDES})
+ else(APUCONFIG_EXECUTABLE)
+ FIND_PATH(_INCLUDES apu.h
+ HINTS ${SVN_INCLUDES}
+ PATHS /usr /usr/local
+ SUFFIXES apr-0 apr-1 apr-1.0
+ )
+ if(_INCLUDES)
+ set(SVN_INCLUDES ${SVN_INCLUDES} ${_INCLUDES})
+ else(_INCLUDES)
+ set(SVN_FOUND FALSE) # no apr == can't compile!
+ endif(_INCLUDES)
+ endif(APUCONFIG_EXECUTABLE)
FIND_LIBRARY(SVN_LIBRARIES NAMES svn_client-1)
if(SVN_LIBRARIES)
FIND_LIBRARY(_LIBRARIES NAMES svn_subr-1)

1
pkgs/desktops/kde-4.5/support/akonadi/default.nix
View file

@ -7,6 +7,7 @@ stdenv.mkDerivation rec {
sha256 = "199fh5yqygr0xdwcnjqqms8vskigbzvwb3071r979606rrsnpnl5";
};
buildInputs = [ cmake qt4 shared_mime_info libxslt boost mysql automoc4 soprano ];
patches = [ ./fix-broken-datadir-parameter.patch ];
meta = with stdenv.lib; {
description = "KDE PIM Storage Service";
license = "LGPL";

17
pkgs/desktops/kde-4.5/support/akonadi/fix-broken-datadir-parameter.patch Normal file
View file

@ -0,0 +1,17 @@
Fix broken datadir parameter.
--- akonadi-1.3.85/server/src/storage/dbconfigmysql.cpp 2010-06-09 03:41:30.000000000 -0430
+++ akonadi-local-1.3.85/server/src/storage/dbconfigmysql.cpp 2010-08-11 00:21:20.547181479 -0430
@@ -250,11 +250,10 @@
// synthesize the mysqld command
QStringList arguments;
arguments << QString::fromLatin1( "--defaults-file=%1/mysql.conf" ).arg( akDir );
+ arguments << QString::fromLatin1( "--datadir=%1/" ).arg( dataDir );
#ifndef Q_WS_WIN
- arguments << QString::fromLatin1( "--datadir" ) << QString::fromLatin1( "%1/" ).arg( dataDir );
arguments << QString::fromLatin1( "--socket=%1/mysql.socket" ).arg( miscDir );
#else
- arguments << QString::fromLatin1( "--datadir=%1/" ).arg( dataDir );
arguments << QString::fromLatin1( "--shared-memory" );
#endif

8
pkgs/desktops/kde-4.5/support/eigen/default.nix
View file

@ -1,20 +1,20 @@
{stdenv, fetchurl, lib, cmake}:
{stdenv, fetchurl, cmake}:
let
v = "2.0.14";
v = "2.0.15";
in
stdenv.mkDerivation {
name = "eigen-${v}";
src = fetchurl {
url = "http://bitbucket.org/eigen/eigen/get/${v}.tar.bz2";
name = "eigen-${v}.tar.bz2";
sha256 = "01xkdqs6hqkwcq5yzpdz79da0i512s818pbg8fl9w3m2vvndzs6p";
sha256 = "1a00hqyig4rc7nkz97xv23q7k0vdkzvgd0jkayk61fn9aqcrky79";
};
buildInputs = [ cmake ];
meta = {
description = "C++ template library for linear algebra: vectors, matrices, and related algorithms";
license = "LGPL";
homepage = http://eigen.tuxfamily.org ;
maintainers = [ lib.maintainers.sander ];
maintainers = with stdenv.lib.maintainers; [ sander urkud ];
};
}

1
pkgs/desktops/kde-4.5/support/oxygen-icons/default.nix
View file

@ -3,7 +3,6 @@
kdePackage {
pn = "oxygen-icons";
v = "4.5.0";
sha256 = "11wlrxnral4q5wi46p1di1cff4vr5da35a8dv2xx3ag6lnhqvjqi";
outputHashAlgo = "sha256";
outputHashMode = "recursive";

1
pkgs/desktops/kde-4.5/support/polkit-qt-1/default.nix
View file

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

21
pkgs/desktops/kde-4.5/support/qimageblitz/default.nix Normal file
View file

@ -0,0 +1,21 @@
{stdenv, fetchurl, lib, cmake, qt4}:
let
pn = "qimageblitz";
v = "0.0.4";
in
stdenv.mkDerivation {
name = "${pn}-${v}";
src = fetchurl {
url = "mirror://sf/${pn}/${pn}-${v}.tar.bz2";
sha256 = "0pnaf3qi7rgkxzs2mssmslb3f9ya4cyx09wzwlis3ppyvf72j0p9";
};
buildInputs = [ cmake qt4 ];
meta = {
description = "Graphical effect and filter library for KDE4";
license = "BSD";
homepage = "http://${pn}.sourceforge.net";
};
}

5
pkgs/desktops/kde-4.5/support/strigi/default.nix
View file

@ -1,4 +1,4 @@
{ stdenv, fetchurl, lib, cmake, qt4, perl, bzip2, libxml2, expat, exiv2
{ stdenv, fetchurl, cmake, qt4, perl, bzip2, libxml2, expat, exiv2
, cluceneCore
}:
@ -22,6 +22,7 @@ stdenv.mkDerivation rec {
homepage = http://strigi.sourceforge.net;
description = "A very fast and efficient crawler to index data on your harddrive";
license = "LGPL";
maintainers = [ lib.maintainers.sander ];
maintainers = with stdenv.lib.maintainers; [ sander urkud ];
inherit (qt4.meta) platforms;
};
}

12
pkgs/desktops/kde-4.5/toys/default.nix Normal file
View file

@ -0,0 +1,12 @@
{kdePackage, cmake, qt4, perl, kdelibs, kdebase_workspace, automoc4}:
kdePackage {
pn = "kdetoys";
v = "4.5.0";
buildInputs = [ cmake qt4 perl kdelibs kdebase_workspace automoc4 ];
meta = {
description = "KDE Toys";
license = "GPL";
};
}

10
pkgs/desktops/kde-4.5/utils/cmake-module-path.diff Normal file
View file

@ -0,0 +1,10 @@
--- a/CMakeLists.txt 2010-04-15 12:58:25.000000000 +0400
+++ b/CMakeLists.txt.new 2010-08-14 03:30:16.000000000 +0400
@@ -1,6 +1,6 @@
project( kdeutils )
-set( CMAKE_MODULE_PATH ${CMAKE_SOURCE_DIR}/cmake/modules )
+set( CMAKE_MODULE_PATH ${CMAKE_SOURCE_DIR}/cmake/modules ${CMAKE_MODULE_PATH} )
# search packages used by KDE
find_package( KDE4 REQUIRED )

28
pkgs/desktops/kde-4.5/utils/default.nix Normal file
View file

@ -0,0 +1,28 @@
{ kdePackage, cmake, qt4, perl, gmp, python, libzip, libarchive, xz
, sip, pyqt4, pycups, rhpl, system_config_printer, qjson, shared_mime_info
, kdebase_workspace
, kdelibs, kdepimlibs, kdebase, kdebindings, automoc4, qimageblitz, qca2}:
kdePackage {
pn = "kdeutils";
v = "4.5.0";
postPatch = ''
cp -vn ${qjson}/share/apps/cmake/modules/FindQJSON.cmake cmake/modules
sed -e "s@/usr\(/share/system-config-printer\)@${system_config_printer}\1@" -i \
printer-applet/cmake-modules/FindSystemConfigPrinter.py \
printer-applet/printer-applet.py
sed -i -e "s|import cupshelpers.ppds, cupshelpers.cupshelpers|import ppds, cupshelpers|" printer-applet/cmake-modules/FindSystemConfigPrinter.py
'';
buildInputs = [ cmake qt4 perl gmp python libzip libarchive xz sip pyqt4
pycups rhpl system_config_printer kdelibs kdepimlibs kdebase kdebindings
automoc4 qimageblitz qca2 qjson shared_mime_info kdebase_workspace ];
patches = [ ./log-feature.diff ];
meta = {
description = "KDE Utilities";
license = "GPL";
};
}

10
pkgs/desktops/kde-4.5/utils/log-feature.diff Normal file
View file

@ -0,0 +1,10 @@
--- kdeutils-4.5.0.orig/CMakeLists.txt.orig 2010-08-16 18:21:33.000000000 +0400
+++ kdeutils-4.5.0/CMakeLists.txt 2010-08-16 18:27:05.000000000 +0400
@@ -36,6 +36,7 @@
endif( GMP_FOUND )
if( UNIX )
find_package( KDE4Workspace )
+ macro_log_feature( KDE4Workspace_FOUND "KDE4Workspace" "KDE workscpace library, part of kdebase-workspace" "http://www.kde.org" FALSE "" "Required to build kremotecontrol." )
if( KDE4Workspace_FOUND AND QT_QTXMLPATTERNS_FOUND )
macro_optional_add_subdirectory( kremotecontrol )
endif( KDE4Workspace_FOUND AND QT_QTXMLPATTERNS_FOUND )

14
pkgs/desktops/kde-4.5/webdev/default.nix Normal file
View file

@ -0,0 +1,14 @@
{ kdePackage, cmake, qt4, perl, libxml2, libxslt, boost
, kdelibs, kdepimlibs, automoc4, ruby, htmlTidy, zlib }:
kdePackage {
pn = "kdewebdev";
v = "4.5.0";
buildInputs = [ cmake qt4 perl libxml2 libxslt boost kdelibs kdepimlibs
automoc4 htmlTidy ruby zlib ];
meta = {
description = "KDE Web development utilities";
license = "GPL";
};
}

16
pkgs/development/interpreters/python/2.4/default.nix
View file

@ -8,14 +8,16 @@ let
buildInputs =
optional (stdenv ? gcc && stdenv.gcc.libc != null) stdenv.gcc.libc ++
[bzip2] ++
[bzip2] ++
optional zlibSupport zlib;
in
stdenv.mkDerivation {
name = "python-2.4.6";
majorVersion = "2.4";
version = "2.4.6";
src = fetchurl {
url = http://www.python.org/ftp/python/2.4.6/Python-2.4.6.tar.bz2;
sha256 = "021y88a4ki07dgq19yhg6zfvmncfiz7h5b2255438i9zmlwl246s";
@ -25,22 +27,22 @@ stdenv.mkDerivation {
# Look in C_INCLUDE_PATH and LIBRARY_PATH for stuff.
./search-path.patch
];
inherit buildInputs;
C_INCLUDE_PATH = concatStringsSep ":" (map (p: "${p}/include") buildInputs);
LIBRARY_PATH = concatStringsSep ":" (map (p: "${p}/lib") buildInputs);
configureFlags = "--enable-shared";
preConfigure = ''
# Purity.
for i in /usr /sw /opt /pkg; do
for i in /usr /sw /opt /pkg; do
substituteInPlace ./setup.py --replace $i /no-such-path
done
'';
setupHook = ./setup-hook.sh;
postInstall = ''
rm -rf $out/lib/python2.4/test
'';

12
pkgs/development/interpreters/python/2.5/default.nix
View file

@ -39,7 +39,9 @@ in
stdenv.mkDerivation ( {
name = "python-2.5.4";
majorVersion = "2.5";
version = "2.5.4";
src = fetchurl {
url = http://www.python.org/ftp/python/2.5.4/Python-2.5.4.tar.bz2;
sha256 = "0401g346ixng1im6gp11rgkfhx3v05qrpn5qjfx26mgy5dm8k3dw";
@ -49,15 +51,15 @@ stdenv.mkDerivation ( {
# Look in C_INCLUDE_PATH and LIBRARY_PATH for stuff.
./search-path.patch
];
inherit buildInputs;
C_INCLUDE_PATH = concatStringsSep ":" (map (p: "${p}/include") buildInputs);
LIBRARY_PATH = concatStringsSep ":" (map (p: "${p}/lib") buildInputs);
configureFlags = "--enable-shared --with-wctype-functions";
preConfigure = ''
# Purity.
for i in /usr /sw /opt /pkg; do
for i in /usr /sw /opt /pkg; do
substituteInPlace ./setup.py --replace $i /no-such-path
done
'' + (if readline != null then ''
@ -65,7 +67,7 @@ stdenv.mkDerivation ( {
'' else "");
setupHook = ./setup-hook.sh;
postInstall = ''
rm -rf $out/lib/python2.5/test
'';

1
pkgs/development/interpreters/python/2.6/default.nix
View file

@ -47,6 +47,7 @@ in
stdenv.mkDerivation ( {
name = "python-${version}";
inherit majorVersion version;
src = fetchurl {
url = "http://www.python.org/ftp/python/${version}/Python-${version}.tar.bz2";

110
pkgs/development/interpreters/python/2.7/default.nix Normal file
View file

@ -0,0 +1,110 @@
{ stdenv, fetchurl, zlib ? null, zlibSupport ? true, bzip2
, gdbmSupport ? true, gdbm ? null
, sqlite ? null
, db4 ? null
, readline ? null
, openssl ? null
, tk ? null
, tcl ? null
, libX11 ? null
, xproto ? null
, arch ? null
, sw_vers ? null
, ncurses ? null
}:
assert zlibSupport -> zlib != null;
assert gdbmSupport -> gdbm != null;
assert stdenv.isDarwin -> arch != null;
assert stdenv.isDarwin -> sw_vers != null;
with stdenv.lib;
let
majorVersion = "2.7";
version = "${majorVersion}";
buildInputs =
optional (stdenv ? gcc && stdenv.gcc.libc != null) stdenv.gcc.libc ++
[bzip2]
++ optional zlibSupport zlib
++ optional gdbmSupport gdbm
++ optional (sqlite != null) sqlite
++ optional (db4 != null) db4
++ optional (readline != null) readline
++ optional (openssl != null) openssl
++ optional (tk != null) tk
++ optional (tcl != null) tcl
++ optional (libX11 != null) libX11
++ optional (xproto != null) xproto
++ optional (arch != null) arch
++ optional (sw_vers != null) sw_vers
++ optional (ncurses != null) ncurses
;
in
stdenv.mkDerivation ( {
name = "python-${version}";
inherit majorVersion version;
src = fetchurl {
url = "http://www.python.org/ftp/python/${version}/Python-${version}.tar.bz2";
sha256 = "935d3316edfec5eb98c2f6930756b47b00dc27192541e62d6fd0077ffa008af8";
};
patches = [
# Look in C_INCLUDE_PATH and LIBRARY_PATH for stuff.
./search-path.patch
];
inherit buildInputs;
C_INCLUDE_PATH = concatStringsSep ":" (map (p: "${p}/include") buildInputs);
LIBRARY_PATH = concatStringsSep ":" (map (p: "${p}/lib") buildInputs);
configureFlags = "--enable-shared --with-threads --enable-unicode --with-wctype-functions";
preConfigure = ''
# Purity.
for i in /usr /sw /opt /pkg; do
substituteInPlace ./setup.py --replace $i /no-such-path
done
'' + (if readline != null then ''
export NIX_LDFLAGS="$NIX_LDFLAGS -lncurses"
'' else "");
setupHook = ./setup-hook.sh;
postInstall = ''
rm -rf "$out/lib/python${majorVersion}/test"
'';
passthru = {
inherit zlibSupport;
sqliteSupport = sqlite != null;
db4Support = db4 != null;
readlineSupport = readline != null;
opensslSupport = openssl != null;
tkSupport = (tk != null) && (tcl != null);
libPrefix = "python${majorVersion}";
};
enableParallelBuilding = true;
meta = {
homepage = "http://python.org";
description = "Python -- a high-level dynamically-typed programming language";
longDescription = ''
Python is a remarkably powerful dynamic programming language that
is used in a wide variety of application domains. Some of its key
distinguishing features include: clear, readable syntax; strong
introspection capabilities; intuitive object orientation; natural
expression of procedural code; full modularity, supporting
hierarchical packages; exception-based error handling; and very
high level dynamic data types.
'';
license = "GPLv2";
platforms = stdenv.lib.platforms.all;
maintainers = [ stdenv.lib.maintainers.simons ];
};
} // (if stdenv.isDarwin then { NIX_CFLAGS_COMPILE = "-msse2" ; patches = [./search-path.patch]; } else {} ) )

27
pkgs/development/interpreters/python/2.7/search-path.patch Normal file
View file

@ -0,0 +1,27 @@
diff -rc Python-2.4.4-orig/setup.py Python-2.4.4/setup.py
*** Python-2.4.4-orig/setup.py 2006-10-08 19:41:25.000000000 +0200
--- Python-2.4.4/setup.py 2007-05-27 16:04:54.000000000 +0200
***************
*** 279,288 ****
# Check for AtheOS which has libraries in non-standard locations
if platform == 'atheos':
lib_dirs += ['/system/libs', '/atheos/autolnk/lib']
- lib_dirs += os.getenv('LIBRARY_PATH', '').split(os.pathsep)
inc_dirs += ['/system/include', '/atheos/autolnk/include']
- inc_dirs += os.getenv('C_INCLUDE_PATH', '').split(os.pathsep)
# OSF/1 and Unixware have some stuff in /usr/ccs/lib (like -ldb)
if platform in ['osf1', 'unixware7', 'openunix8']:
lib_dirs += ['/usr/ccs/lib']
--- 279,289 ----
# Check for AtheOS which has libraries in non-standard locations
if platform == 'atheos':
lib_dirs += ['/system/libs', '/atheos/autolnk/lib']
inc_dirs += ['/system/include', '/atheos/autolnk/include']
+ lib_dirs += os.getenv('LIBRARY_PATH', '').split(os.pathsep)
+ inc_dirs += os.getenv('C_INCLUDE_PATH', '').split(os.pathsep)
+
# OSF/1 and Unixware have some stuff in /usr/ccs/lib (like -ldb)
if platform in ['osf1', 'unixware7', 'openunix8']:
lib_dirs += ['/usr/ccs/lib']

15
pkgs/development/interpreters/python/2.7/setup-hook.sh Normal file
View file

@ -0,0 +1,15 @@
addPythonPath() {
addToSearchPathWithCustomDelimiter : PYTHONPATH $1/lib/python2.7/site-packages
}
toPythonPath() {
local paths="$1"
local result=
for i in $paths; do
p="$i/lib/python2.7/site-packages"
result="${result}${result:+:}$p"
done
echo $result
}
envHooks=(${envHooks[@]} addPythonPath)

1
pkgs/development/interpreters/python/3.1/default.nix
View file

@ -49,6 +49,7 @@ in
stdenv.mkDerivation ( {
name = "python3-${version}";
inherit majorVersion version;
src = fetchurl {
url = "http://www.python.org/ftp/python/${version}/Python-${version}.tar.bz2";

18
pkgs/development/interpreters/python/wrapper.nix Normal file
View file

@ -0,0 +1,18 @@
{stdenv, python, makeWrapper, extraLibs ? []}:
stdenv.mkDerivation {
name = "python-${python.version}-wrapper";
propagatedBuildInputs = [python makeWrapper] ++ extraLibs;
unpackPhase = "true";
installPhase = ''
ensureDir "$out/bin"
for prg in 2to3 idle pydoc python python-config python${python.majorVersion} python${python.majorVersion}-config smtpd.py; do
makeWrapper "$python/bin/$prg" "$out/bin/$prg" --suffix PYTHONPATH : "$PYTHONPATH"
done
'';
inherit python;
inherit (python) meta;
}

8
pkgs/development/libraries/boost/default.nix
View file

@ -33,7 +33,7 @@ let
in
stdenv.mkDerivation {
name = "boost-1.43.0";
name = "boost-1.44.0";
meta = {
homepage = "http://boost.org/";
@ -44,8 +44,8 @@ stdenv.mkDerivation {
};
src = fetchurl {
url = "mirror://sourceforge/boost/boost_1_43_0.tar.bz2";
sha256 = "0831h19ph65r2rai6ipk5c2bx04af8q423mzr89fh454385i0krl";
url = "mirror://sourceforge/boost/boost_1_44_0.tar.bz2";
sha256 = "1nvq36mvzr1fr85q0jh86rk3bk65s1y55jgqgzfg3lcpkl12ihs5";
};
buildInputs = [icu expat zlib bzip2 python];
@ -53,7 +53,7 @@ stdenv.mkDerivation {
configureScript = "./bootstrap.sh";
configureFlags = "--with-icu=${icu} --with-python=${python}/bin/python";
buildPhase = "./bjam -sEXPAT_INCLUDE=${expat}/include -sEXPAT_LIBPATH=${expat}/lib --layout=${finalLayout} variant=${variant} threading=${threading} link=${link} ${cflags} install";
buildPhase = "./bjam -j$NIX_BUILD_CORES -sEXPAT_INCLUDE=${expat}/include -sEXPAT_LIBPATH=${expat}/lib --layout=${finalLayout} variant=${variant} threading=${threading} link=${link} ${cflags} install";
installPhase = ":";
}

19
pkgs/development/libraries/cln/default.nix Normal file
View file

@ -0,0 +1,19 @@
{ stdenv, fetchurl, gmp }:
stdenv.mkDerivation rec {
name = "cln-1.3.1";
src = fetchurl {
url = "${meta.homepage}${name}.tar.bz2";
sha256 = "1sd8jy5vnmww537zq6g6i586ffslm7fjliz04krv6scapgklq6ca";
};
buildInputs = [ gmp ];
meta = {
description = "C/C++ library for numbers, a part of GiNaC";
homepage = http://www.ginac.de/CLN/;
maintainers = [ stdenv.lib.maintainers.urkud ];
platforms = stdenv.lib.platforms.all;
};
}

8
pkgs/development/libraries/directfb/src-for-default.nix
View file

@ -1,9 +1,9 @@
rec {
version="1.4.2";
name="directfb-1.4.2";
hash="1invmmccscv44v2pa83050cv5n028q0j12cgwwpc7ac83vi4f605";
version="1.4.3";
name="directfb-1.4.3";
hash="0y79lwzq7srlbgrva7b5y8klbp6gmr8hxrayq8njaw7by3jald8l";
url="http://directfb.org/downloads/Core/DirectFB-1.4/DirectFB-${version}.tar.gz";
advertisedUrl="http://directfb.org/downloads/Core/DirectFB-1.4/DirectFB-1.4.2.tar.gz";
advertisedUrl="http://directfb.org/downloads/Core/DirectFB-1.4/DirectFB-1.4.3.tar.gz";
}

4
pkgs/development/libraries/gnutls/default.nix
View file

@ -5,11 +5,11 @@ assert guileBindings -> guile != null;
stdenv.mkDerivation rec {
name = "gnutls-2.10.0";
name = "gnutls-2.10.1";
src = fetchurl {
url = "mirror://gnu/gnutls/${name}.tar.bz2";
sha256 = "124cysx5rxpgi9sxw7yx9hlb8900l4nx2kar6gcnvgs3w4y695l5";
sha256 = "1vh2qc2pk6srlqk4ag0v7ba41jmy9816a2mj8yx1253626y7h43k";
};
configurePhase = ''

4
pkgs/development/libraries/haskell/haskell-src-exts/default.nix
View file

@ -2,8 +2,8 @@
cabal.mkDerivation (self : {
pname = "haskell-src-exts";
version = "1.1.4";
sha256 = "83c98d8bc16622039b14220190c571ed7f8459f129803b593373df5c15e3f2f1";
version = "1.9.0";
sha256 = "dedb529217dfe393f75f26b735f7dd09eea50006481f60d06e169de6f328d1da";
extraBuildInputs = [happy];
propagatedBuildInputs = [cpphs];
meta = {

6
pkgs/development/libraries/haskell/hscolour/default.nix
View file

@ -2,10 +2,10 @@
cabal.mkDerivation (self : {
pname = "hscolour";
version = "1.15";
sha256 = "762f07977d971939360e2a418dfad2a8e5f908b9a88f3a861fa13937cbcfef1e";
version = "1.17";
sha256 = "b645cdde1b7827dae1519a4423031b4c6bed82a8edb52aa295bea86478ce24b0";
meta = {
description = "Colourise Haskell code";
};
})
})

4
pkgs/development/libraries/haskell/uniplate/default.nix
View file

@ -2,8 +2,8 @@
cabal.mkDerivation (self : {
pname = "uniplate";
version = "1.2.0.3";
sha256 = "77cf07c96ae62799d790284c0c84beca9ee17c9c2416d4de6641f3fddd644b58";
version = "1.5.1";
sha256 = "cfeaaaabbbe318992df0c51a0c04729b22dac244f415b80a3b388708ed9cfc33";
propagatedBuildInputs = [mtl];
meta = {
description = "Uniform type generic traversals";

4
pkgs/development/libraries/haskell/uu-parsinglib/default.nix
View file

@ -2,8 +2,8 @@
cabal.mkDerivation (self : {
pname = "uu-parsinglib";
version = "2.3.4";
sha256 = "c5faeade06f363c2e7b95a2b7eeba752bf2dd1f4ff0cebbe09aaef9b79f8fdb2";
version = "2.5.4.2";
sha256 = "94f8f3f7e64dd87a4930190f922a07014e21e3cc320ba1ffefdae7db4401bfcd";
meta = {
description = "New version of the Utrecht University parser combinator library";
};

5
pkgs/development/libraries/lensfun/default.nix
View file

@ -12,11 +12,12 @@ stdenv.mkDerivation rec {
buildInputs = [ pkgconfig glib zlib libpng ];
configureFlags = "-v";
meta = with stdenv.lib; {
platforms = platforms.all;
maintainers = [ maintainers.urkud ];
license = "LGPL3";
description = "An opensource database of photographic lenses and their
characteristics";
description = "An opensource database of photographic lenses and their characteristics";
};
}

2
pkgs/development/libraries/libcanberra/default.nix
View file

@ -1,4 +1,4 @@
{ stdenv, fetchurl, pkgconfig, libtool, gtk, gthread
{ stdenv, fetchurl, pkgconfig, libtool, gtk
, alsaLib, pulseaudio, gstreamer, libvorbis, libcap }:
stdenv.mkDerivation rec {

19
pkgs/development/libraries/libktorrent/default.nix Normal file
View file

@ -0,0 +1,19 @@
{ stdenv, fetchurl, kdelibs, cmake, gmp, qca2, boost, gettext, qt47, automoc4,
perl }:
stdenv.mkDerivation rec {
name = "libktorrent-1.0.2";
src = fetchurl {
url = "${meta.homepage}/downloads/4.0.2/${name}.tar.bz2";
sha256 = "11kh1mcijwzr2kf7hpxadggh346kdb5jy8rnmawhi9nc0i7wyjlw";
};
# TODO: xfs.h
buildInputs = [ cmake kdelibs gmp qca2 boost gettext qt47 automoc4 perl ];
meta = {
description = "A bittorrent library used in ktorrent";
homepage = http://ktorrent.org;
};
}

20
pkgs/development/libraries/libqalculate/default.nix Normal file
View file

@ -0,0 +1,20 @@
{ stdenv, fetchurl, cln, libxml2, glib, intltool, pkgconfig }:
stdenv.mkDerivation rec {
name = "libqalculate-0.9.7";
src = fetchurl {
url = "mirror://sf/qalculate/${name}.tar.gz";
sha256 = "0mbrc021dk0ayyglk4qyf9328cayrlz2q94lh8sh9l9r6g79fvcs";
};
buildInputs = [ intltool pkgconfig ];
propagatedBuildInputs = [ cln libxml2 glib ];
meta = {
description = "An advanced calculator library";
homepage = http://qalculate.sourceforge.net;
maintainers = [ stdenv.lib.maintainers.urkud ];
platforms = stdenv.lib.platforms.all;
};
}

11
pkgs/development/libraries/libvirt/default.nix
View file

@ -1,19 +1,16 @@
{ stdenv, fetchurl, libxml2, gnutls, devicemapper, perl }:
{ stdenv, fetchurl, libxml2, gnutls, devicemapper, perl, python }:
let version = "0.7.5"; in
let version = "0.8.3"; in
stdenv.mkDerivation {
name = "libvirt-${version}";
src = fetchurl {
url = "http://libvirt.org/sources/libvirt-${version}.tar.gz";
sha256 = "922481aadf72a74cf14012fe3967c60d01e70f7e88908410d57428943ab4eb8b";
sha256 = "07vsk4g1nxvxc8yr6cdvwp9kvwgm2g7lh6aaggfkxb2775n87q9m";
};
buildInputs = [ libxml2 gnutls devicemapper perl ];
# fix for redhat bz 531496
patches = [ ./non-absolute-ld.patch ];
buildInputs = [ libxml2 gnutls devicemapper perl python ];
# xen currently disabled in nixpkgs
configureFlags = ''

12
pkgs/development/libraries/libvirt/non-absolute-ld.patch
View file

@ -1,12 +0,0 @@
diff -Naur libvirt-0.7.5.orig/configure libvirt-0.7.5/configure
--- libvirt-0.7.5.orig/configure 2009-12-23 09:17:34.000000000 -0600
+++ libvirt-0.7.5/configure 2010-01-13 21:16:02.000000000 -0600
@@ -41051,7 +41051,7 @@
VERSION_SCRIPT_FLAGS=-Wl,--version-script=
-`/usr/bin/ld --help 2>&1 | grep -- --version-script >/dev/null` || \
+`ld --help 2>&1 | grep -- --version-script >/dev/null` || \
VERSION_SCRIPT_FLAGS="-Wl,-M -Wl,"

4
pkgs/development/libraries/nspr/default.nix
View file

@ -1,13 +1,13 @@
{ stdenv, fetchurl }:
let version = "4.8.4"; in
let version = "4.8.6"; in
stdenv.mkDerivation {
name = "nspr-${version}";
src = fetchurl {
url = "http://ftp.mozilla.org/pub/mozilla.org/nspr/releases/v${version}/src/nspr-${version}.tar.gz";
sha256 = "0ik73yimgfpj3lkqjnpf76b942j76i5yi1z8bn75dxxc08brl4cc";
sha256 = "0vcz39784bw42kv9f81dnfb9ciga66l4yg223j467yin2nq0n16r";
};
preConfigure = "cd mozilla/nsprpub";

12
pkgs/development/libraries/nss/default.nix
View file

@ -1,4 +1,4 @@
{ stdenv, fetchurl, nspr, perl, zlib }:
{ stdenv, fetchurl, nspr, perl, zlib, includeTools ? false}:
let
@ -10,11 +10,11 @@ let
in
stdenv.mkDerivation {
name = "nss-3.12.6";
name = "nss-3.12.7";
src = fetchurl {
url = http://ftp.mozilla.org/pub/mozilla.org/security/nss/releases/NSS_3_12_6_RTM/src/nss-3.12.6.tar.gz;
sha1 = "461e81adbdef6c3f848fcfee0dc5ad8c2dbebd46";
url = http://ftp.mozilla.org/pub/mozilla.org/security/nss/releases/NSS_3_12_7_RTM/src/nss-3.12.7.tar.gz;
sha256 = "0x5h0r5hn4qzafxakhvqyw1r8r0zy09b7b0kmdh3ff6v29v4bnzx";
};
buildInputs = [nspr perl zlib];
@ -52,7 +52,7 @@ stdenv.mkDerivation {
mv $out/public $out/include
mv $out/*.OBJ/* $out/
rmdir $out/*.OBJ
rm -rf $out/bin
${if includeTools then "" else "rm -rf $out/bin"}
# Borrowed from Gentoo. Firefox expects an nss-config script,
# but NSS doesn't provide it.
@ -61,7 +61,7 @@ stdenv.mkDerivation {
NSS_VMINOR=`cat lib/nss/nss.h | grep "#define.*NSS_VMINOR" | awk '{print $3}'`
NSS_VPATCH=`cat lib/nss/nss.h | grep "#define.*NSS_VPATCH" | awk '{print $3}'`
mkdir $out/bin
${if includeTools then "" else "mkdir $out/bin"}
cp ${nssConfig} $out/bin/nss-config
chmod u+x $out/bin/nss-config
substituteInPlace $out/bin/nss-config \

2
pkgs/development/libraries/qhull/default.nix
View file

@ -20,7 +20,7 @@ stdenv.mkDerivation {
ensureDir $out/bin
ensureDir $out/include/qhull
ensureDir $out/lib
ensureDir $out/share/man/man1
cp qconvex qdelaunay qhalf qhull rbox qvoronoi $out/bin
cp *.h $out/include/qhull
cp libqhull.a $out/lib
'';

4
pkgs/development/libraries/qt-4.x/4.7/default.nix
View file

@ -97,7 +97,9 @@ stdenv.mkDerivation rec {
sed -e 's@/usr@/FOO@' -i config.tests/*/*.test -i mkspecs/*/*.conf
'';
postInstall = if useDocs then "rm -rf $out/share/doc/${name}/{html,src}" else "";
postInstall = ''
${if useDocs then "rm -rfv $out/share/doc/${name}/{html,src}" else ""}
ln -sv phonon $out/include/Phonon'';
enableParallelBuilding = true;

28
pkgs/development/libraries/webkit/default.nix
View file

@ -24,22 +24,28 @@ rec {
configureFlags = [
"--enable-3D-transforms"
"--enable-web-sockets"
"--enable-indexeddb"
"--enable-web-timing"
"--enable-image-resizer"
# https://bugs.webkit.org/show_bug.cgi?id=41859
# "--enable-mathml"
"--enable-mathml"
# "--enable-blob-slice"
# Seem incomplete as of now
# "--enable-file-reader"
# "--enable-file-writer"
# https://bugs.webkit.org/show_bug.cgi?id=40765
# https://bugs.webkit.org/show_bug.cgi?id=42943
# "--enable-wml"
# https://bugs.webkit.org/show_bug.cgi?id=43863
# "--enable-indexed-database"
# "--enable-xhtmlmp"
"--enable-xhtmlmp"
# "--enable-input-speech"
# https://bugs.webkit.org/show_bug.cgi?id=43878
# "--enable-file-writer"
# "--enable-blob"
# May be or not be triggering https://bugs.webkit.org/show_bug.cgi?id=43878
"--enable-file-system"
"--enable-directory-upload"
];
/* doConfigure should be specified separately */

10
pkgs/development/libraries/webkit/src-for-default.nix
View file

@ -1,9 +1,9 @@
rec {
version="r62632";
name="webkit-r62632";
hash="138b1iyp97v2sy8cqqkbgr9gpj954as0ndb13s738raj3yn5bc5g";
url="http://builds.nightly.webkit.org/files/trunk/src/WebKit-r62632.tar.bz2";
advertisedUrl="http://builds.nightly.webkit.org/files/trunk/src/WebKit-r62632.tar.bz2";
version="r65398";
name="webkit-r65398";
hash="0y9pfhff1nyc818li8lqdkq906yi1r9n9zzmgymx8zpqxg8kcmk8";
url="http://builds.nightly.webkit.org/files/trunk/src/WebKit-r65398.tar.bz2";
advertisedUrl="http://builds.nightly.webkit.org/files/trunk/src/WebKit-r65398.tar.bz2";
}

12
pkgs/development/python-modules/pygtk/default.nix
View file

@ -8,7 +8,7 @@ stdenv.mkDerivation {
url = http://ftp.gnome.org/pub/GNOME/sources/pygtk/2.16/pygtk-2.16.0.tar.bz2;
sha256 = "1a24fkxslir8zb800hs4ix9iyvgqsy5c6hdfirrh2yi1mw0mxbkz";
};
buildInputs = [python pkgconfig glib gtk]
++ (if libglade != null then [libglade] else [])
;
@ -18,5 +18,15 @@ stdenv.mkDerivation {
postInstall = ''
rm $out/bin/pygtk-codegen-2.0
ln -s ${pygobject}/bin/pygobject-codegen-2.0 $out/bin/pygtk-codegen-2.0
# All python code is installed into a "gtk-2.0" sub-directory. That
# sub-directory may be useful on systems which share several library
# versions in the same prefix, i.e. /usr/local, but on Nix that directory
# is useless. Furthermore, its existence makes it very hard to guess a
# proper $PYTHONPATH that allows "import gtk" to succeed.
cd $(toPythonPath $out)/gtk-2.0
for n in *; do
ln -s "gtk-2.0/$n" "../$n"
done
'';
}

6
pkgs/development/python-modules/zope/default.nix
View file

@ -1,11 +1,11 @@
{stdenv, fetchurl, python}:
stdenv.mkDerivation rec {
version = "3.2.1";
version = "3.4.0";
name = "zope-${version}";
src = fetchurl {
url = "http://www.zope.org/Products/Zope3/${version}/Zope-${version}.tgz";
sha256 = "8431984af75054e4ddfe45bf708924240f8b6b02220cd84d090138413ac82341";
url = "http://www.zope.org/Products/Zope3/${version}/Zope-${version}.tgz";
sha256 = "3e834e8749945d8fc0a67bb724f2cf0c671f04f477e24fb8edb74828e331901d";
};
patches = [
./zope_python-2.4.4.patch

4
pkgs/development/tools/haskell/hlint/default.nix
View file

@ -2,9 +2,9 @@
cabal.mkDerivation (self : {
pname = "hlint";
version = "1.6.11";
version = "1.7.3";
name = self.fname;
sha256 = "20210c72826be92ae34247d4e02e64187c3c99f70f8a099c747c46415e010af5";
sha256 = "afd4aa623fedf5257464bf18f38376a951d130f3004664803763e67cc55d9e83";
extraBuildInputs = [haskellSrcExts mtl uniplate hscolour parallel];
meta = {
description = "Source code suggestions";

4
pkgs/development/tools/misc/autoconf/default.nix
View file

@ -1,11 +1,11 @@
{ stdenv, fetchurl, m4, perl }:
stdenv.mkDerivation rec {
name = "autoconf-2.65";
name = "autoconf-2.67";
src = fetchurl {
url = "mirror://gnu/autoconf/${name}.tar.bz2";
sha256 = "0sqkh2xirg3yq7774aqmbi2nbx8rv3yf6v2xzwlz5ypkax0984fv";
sha256 = "1vwalyqzgk1liyinblbc78isxa5qa4fvs5bx2fkjd7crfhhdkph0";
};
buildInputs = [ m4 perl ];

2
pkgs/development/tools/misc/elfutils/default.nix
View file

@ -5,7 +5,7 @@ stdenv.mkDerivation rec {
src = fetchurl {
urls = [
"https://fedorahosted.org/releases/e/l/elfutils/${name}.tar.bz2"
"https://fedorahosted.org/releases/e/l/elfutils/0.143/${name}.tar.bz2"
"mirror://gentoo/distfiles/${name}.tar.bz2"
];
sha256 = "1nl7x2gidd2i048yjlvyzhpbca9793z435cw8bsircjxfi5gmswa";

26
pkgs/development/tools/parsing/antlr/2.7.7-fixes.patch Normal file
View file

@ -0,0 +1,26 @@
diff --git a/lib/cpp/antlr/CharScanner.hpp b/lib/cpp/antlr/CharScanner.hpp
index 8a97e97..1835a3e 100644
--- a/lib/cpp/antlr/CharScanner.hpp
+++ b/lib/cpp/antlr/CharScanner.hpp
@@ -11,6 +11,8 @@
#include <antlr/config.hpp>
#include <map>
+#include <cstdio>
+#include <cstring>
#ifdef HAS_NOT_CCTYPE_H
#include <ctype.h>
diff --git a/scripts/config.make.in b/scripts/config.make.in
index c23dd5c..6057309 100644
--- a/scripts/config.make.in
+++ b/scripts/config.make.in
@@ -38,7 +38,7 @@ MAKEOVERRIDES := $(patsubst SUBDIRS=%,,$(MAKEOVERRIDES))
all clean distclean test install force-target clean-target ::
@dirs="$(SUBDIRS)" ; \
test -z "$${dirs}" && { \
- dirs=`/bin/ls` ; \
+ dirs=`ls` ; \
} ; \
for d in . $${dirs} ; do \
case $${d} in \

1
pkgs/development/tools/parsing/antlr/2.7.7.nix
View file

@ -6,5 +6,6 @@ stdenv.mkDerivation {
url = "http://www.antlr2.org/download/antlr-2.7.7.tar.gz";
sha256 = "1ffvcwdw73id0dk6pj2mlxjvbg0662qacx4ylayqcxgg381fnfl5";
};
patches = [ ./2.7.7-fixes.patch ];
buildInputs = [jdk python];
}

6
pkgs/development/tools/parsing/bison/bison-2.4.nix
View file

@ -1,11 +1,11 @@
{stdenv, fetchurl, m4}:
stdenv.mkDerivation rec {
name = "bison-2.4.2";
name = "bison-2.4.3";
src = fetchurl {
url = "mirror://gnu/bison/${name}.tar.bz2";
sha256 = "1f2gmy9bhajrypyz25rqjbz5j024yikr2kaggjjsc15gm4x29ysp";
sha256 = "019s3pdzggb71g7p7dgajhh53gh0h6nfl4yrzrs0jzsc37ph4lwk";
};
buildInputs = [m4];
@ -32,6 +32,8 @@ stdenv.mkDerivation rec {
homepage = http://www.gnu.org/software/bison/;
license = "GPLv3+";
maintainers = [ stdenv.lib.maintainers.ludo ];
};
passthru = { glrSupport = true; };

61
pkgs/games/castle-combat/default.nix
View file

@ -1,54 +1,53 @@
{ fetchurl, stdenv, python, pygame, twisted, numeric, lib, makeWrapper }:
{ fetchurl, stdenv, buildPythonPackage, pygame, twisted, numeric, makeWrapper }:
stdenv.mkDerivation rec {
buildPythonPackage rec {
name = "castle-combat-0.8.1";
namePrefix = "";
src = fetchurl {
url = "mirror://sourceforge/castle-combat/${name}.tar.gz";
sha256 = "1hp4y5dgj88j9g44h4dqiakrgj8lip1krlrdl2qpffin08agrvik";
};
buildInputs = [ python pygame twisted makeWrapper ];
buildInputs = [ makeWrapper ];
propagatedBuildInputs =
[ pygame twisted
# XXX: `Numeric.pth' should be found by Python but it's not.
# Gobolinux has the same problem:
# http://bugs.python.org/issue1431 .
numeric
];
patchPhase = ''
sed -i "src/common.py" \
-e "s|^data_path *=.*$|data_path = \"$out/share/${name}\"|g"
'';
buildPhase = ''python setup.py build --build-base "$out"'';
installPhase = ''
python setup.py install --prefix "$out"
ensureDir "$out/share/${name}"
cp -rv data/* "$out/share/${name}"
${postInstall}
mv -v "src/"*.py .
sed -i "setup.py" -e's/"src"/""/g'
'';
postInstall = ''
mv "$out/bin/castle-combat.py" "$out/bin/castle-combat"
wrapProgram "$out/bin/castle-combat" \
--prefix PYTHONPATH ":" \
${lib.concatStringsSep ":"
([ "$out/lib/python2.5/site-packages/src"
ensureDir "$out/share/${name}"
cp -rv "data/"* "$out/share/${name}"
# XXX: `Numeric.pth' should be found by Python but it's not.
# Gobolinux has the same problem:
# http://bugs.python.org/issue1431 .
"${numeric}/lib/python2.5/site-packages/Numeric" ] ++
(map (path: path + "/lib/python2.5/site-packages")
([ "${pygame}" "${twisted}" ]
++ twisted.propagatedBuildInputs)))} \
\
--prefix LD_LIBRARY_PATH ":" \
"$(cat ${stdenv.gcc}/nix-support/orig-gcc)/lib"
mv -v "$out/bin/castle-combat.py" "$out/bin/castle-combat"
'';
postPhases = "fixLoaderPath";
fixLoaderPath =
let dollar = "\$"; in
'' sed -i "$out/bin/castle-combat" \
-e "/^exec/ iexport LD_LIBRARY_PATH=\"$(cat ${stdenv.gcc}/nix-support/orig-gcc)/lib\:"'${dollar}'"LD_LIBRARY_PATH\"\\
export LD_LIBRARY_PATH=\"$(cat ${stdenv.gcc}/nix-support/orig-gcc)/lib64\:"'${dollar}'"LD_LIBRARY_PATH\""
'';
# ^
# `--- The run-time says: "libgcc_s.so.1 must be installed for
# pthread_cancel to work", which means it need help to find it.
# pthread_cancel to work", which means it needs help to find it.
rm -rf "$out/lib/src"
'';
# No test suite.
doCheck = false;
meta = {
description = "Castle-Combat, a clone of the old arcade game Rampart";
@ -64,5 +63,7 @@ stdenv.mkDerivation rec {
homepage = http://www.linux-games.com/castle-combat/;
license = "unknown";
maintainers = [ stdenv.lib.maintainers.ludo ];
};
}

Some files were not shown because too many files have changed in this diff Show more