public
/
nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merging from trunk. I resolved some conflicts; I hope that well. 

svn path=/nixpkgs/branches/stdenv-updates/; revision=24429
This commit is contained in:
Lluís Batlle i Rossell 2010-10-23 14:52:21 +00:00
parent 4309788df0 327a2eae30
commit 6dc839d344
221 changed files with 3452 additions and 1129 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
maintainers/scripts/hydra_eval_check Executable file
View File

@ -0,0 +1,13 @@
#! /bin/sh
# give absolute path of release.nix as argument
hydra_eval_jobs \
--argstr system x86_64-linux \
--argstr system i686-linux \
--argstr system x86_64-darwin \
--argstr system i686-darwin \
--argstr system i686-cygwin \
--argstr system i686-freebsd \
--arg officialRelease false \
--arg nixpkgs "{ outPath = builtins.storePath ./. ; rev = 1234; }" \
$@

42
pkgs/applications/audio/mp3info/default.nix Normal file
View File

@ -0,0 +1,42 @@
{ fetchurl, stdenv, ncurses, pkgconfig, gtk }:
stdenv.mkDerivation rec {
name = "mp3info-0.8.5a";
src = fetchurl {
url = "ftp://ftp.ibiblio.org/pub/linux/apps/sound/mp3-utils/mp3info/${name}.tgz";
sha256 = "042f1czcs9n2sbqvg4rsvfwlqib2gk976mfa2kxlfjghx5laqf04";
};
buildInputs = [ ncurses pkgconfig gtk ];
configurePhase =
'' sed -i Makefile \
-e "s|^prefix=.*$|prefix=$out|g ;
s|/bin/rm|rm|g ;
s|/usr/bin/install|install|g"
'';
preInstall =
'' ensureDir "$out/bin"
ensureDir "$out/man/man1"
'';
meta = {
description = "MP3Info, an MP3 technical info viewer and ID3 1.x tag editor";
longDescription =
'' MP3Info is a little utility used to read and modify the ID3 tags of
MP3 files. MP3Info can also display various techincal aspects of an
MP3 file including playing time, bit-rate, sampling frequency and
other attributes in a pre-defined or user-specifiable output format.
'';
homepage = http://www.ibiblio.org/mp3info/;
license = "GPLv2+";
maintainers = [ stdenv.lib.maintainers.ludo ];
platforms = stdenv.lib.platforms.unix;
};
}

14
pkgs/applications/editors/emacs-modes/emms/default.nix
View File

@ -1,5 +1,5 @@
{ stdenv, fetchurl, emacs, texinfo
, mpg321, vorbisTools, taglib, alsaUtils }:
, mpg321, vorbisTools, taglib, mp3info, alsaUtils }:
# XXX: EMMS also supports Xine, MPlayer, Jack, etc.
@ -36,12 +36,18 @@ stdenv.mkDerivation rec {
# Use the libtag info back-end for MP3s since we're building it.
sed -i "emms-setup.el" \
-e 's|emms-info-mp3info|emms-info-libtag|g'
# But use mp3info for the tag editor.
sed -i "emms-info-mp3info.el" \
-e 's|emms-info-mp3info-program-name[[:blank:]]\+"mp3info"|emms-info-mp3info-program-name "${mp3info}/bin/mp3info"|g'
sed -i "emms-tag-editor.el" \
-e 's|"mp3info"|"${mp3info}/bin/mp3info"|g'
'';
postInstall = ''
ensureDir "$out/bin" && cp emms-print-metadata "$out/bin"
'';
meta = {
description = "GNU EMMS, The Emacs Multimedia System";
@ -57,6 +63,10 @@ stdenv.mkDerivation rec {
'';
homepage = http://www.gnu.org/software/emms/;
license = "GPLv3+";
maintainers = [ stdenv.lib.maintainers.ludo ];
platforms = stdenv.lib.platforms.gnu;
};
}

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

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

8
pkgs/applications/graphics/digikam/default.nix
View File

@ -3,17 +3,21 @@ kdegraphics, lcms, jasper, libgphoto2, kdepimlibs, gettext, soprano, kdeedu,
liblqr1, lensfun, pkgconfig }:
stdenv.mkDerivation rec {
name = "digikam-1.4.0";
name = "digikam-1.5.0";
src = fetchurl {
url = "mirror://sourceforge/digikam/${name}.tar.bz2";
sha256 = "1fky4jkji9fkhzzvw7wic6xy7vkj9g39hx1xm76qxxq8i2nzlynk";
sha256 = "1vvzw132aw2c1z2v1zc3aqa99kvg501krr2law35ri12zkqjsvaz";
};
buildInputs = [ cmake qt4 kdelibs kdegraphics automoc4 phonon qimageblitz qca2 eigen
lcms jasper libgphoto2 kdepimlibs gettext soprano kdeedu liblqr1 lensfun
pkgconfig ];
KDEDIRS=kdeedu;
patches = [ ./include.diff ];
meta = {
description = "Photo Management Program";
license = "GPL";

12
pkgs/applications/graphics/digikam/include.diff Normal file
View File

@ -0,0 +1,12 @@
diff --git a/libs/imageproperties/markerclusterholderplugin/CMakeLists.txt b/libs/imageproperties/markerclusterholderplugin/CMakeLists.txt
index 9ee36cc..c6e5c00 100644
--- a/libs/imageproperties/markerclusterholderplugin/CMakeLists.txt
+++ b/libs/imageproperties/markerclusterholderplugin/CMakeLists.txt
@@ -18,6 +18,7 @@ IF(MARBLEWIDGET_SUPPORTS_PLUGINS)
INCLUDE_DIRECTORIES( ${CMAKE_CURRENT_SOURCE_DIR}/libs/imageproperties/markerclusterholderplugin/
${CMAKE_BINARY_DIR}/libs/imageproperties/markerclusterholderplugin/
+ ${LIBMARBLEWIDGET_INCLUDE_DIR}/..
${QT_INCLUDE_DIR}
)

4
pkgs/applications/graphics/kipi-plugins/default.nix
View File

@ -2,11 +2,11 @@
kdegraphics, kdepimlibs, libxml2, libxslt, gettext, opencv, libgpod, gtk }:
stdenv.mkDerivation rec {
name = "kipi-plugins-1.4.0";
name = "kipi-plugins-1.5.0";
src = fetchurl {
url = "mirror://sourceforge/kipi/${name}.tar.bz2";
sha256 = "1ybxhp4rs6c5xlrs0q765vrx4mvw4k0kq6n42dyk3kxvmcb9iq34";
sha256 = "1wsqh0lbsqyzdfmb9f53bmmypw00n80p62ym4pnxb8w0zwlhbkbw";
};
buildInputs = [ cmake qt4 kdelibs kdegraphics automoc4 phonon qimageblitz qca2 kdepimlibs

7
pkgs/applications/misc/googleearth/default.nix
View File

@ -1,16 +1,16 @@
{ stdenv, fetchurl, glibc, mesa, freetype, glib, libSM, libICE, libXi, libXv,
libXrender, libXrandr, libXfixes, libXcursor, libXinerama, libXext, libX11,
libXrender, libXrandr, libXfixes, libXcursor, libXinerama, libXext, libX11, qt4,
zlib }:
/* I haven't found any x86_64 package from them */
assert stdenv.system == "i686-linux";
stdenv.mkDerivation {
name = "googleearth-5.1.3535.3218";
name = "googleearth-5.2.0001";
src = fetchurl {
url = http://dl.google.com/earth/client/current/GoogleEarthLinux.bin;
sha256 = "f721e4e8db3a7351c77a8aea425ec334ff01e163481cbcf6cdda9dbb0ad422ac";
sha256 = "2e6fcbd2384446e2a6eed8ca23173e32c5f3f9ae4d1168e2e348c3924fd2bf30";
};
buildNativeInputs = [
@ -30,6 +30,7 @@ stdenv.mkDerivation {
freetype
libXext
libX11
qt4
zlib
];

19
pkgs/applications/misc/k3b/1.0.nix Normal file
View File

@ -0,0 +1,19 @@
{stdenv, fetchurl, kdelibs, x11, zlib, libpng, libjpeg, perl, qt3}:
stdenv.mkDerivation {
name = "k3b-1.0.5";
src = fetchurl {
url = mirror://sourceforge/k3b/k3b-1.0.5.tar.bz2;
sha256 = "1pshv8na1sr9xcmkr0byjgyl8jmxwcylkl8pwjvripja4fgpkyfl";
};
buildInputs = [kdelibs x11 zlib libpng libjpeg perl qt3];
configureFlags = "--without-arts";
meta = {
description = "A CD and DVD authoring application for KDE";
homepage = http://www.k3b.org/;
};
}

34
pkgs/applications/misc/k3b/default.nix
View File

@ -1,19 +1,29 @@
{stdenv, fetchurl, kdelibs, x11, zlib, libpng, libjpeg, perl, qt3}:
{ stdenv, fetchurl, cmake, qt4, perl, shared_mime_info, libvorbis, taglib
, ffmpeg, flac, libsamplerate, libdvdread, lame, libsndfile, libmad, gettext
, kdelibs, kdemultimedia, cdrdao, cdrtools, dvdplusrwtools
, automoc4, phonon, makeWrapper
}:
stdenv.mkDerivation {
name = "k3b-1.0.5";
stdenv.mkDerivation rec {
name = "k3b-2.0.1";
src = fetchurl {
url = mirror://sourceforge/k3b/k3b-1.0.5.tar.bz2;
sha256 = "1pshv8na1sr9xcmkr0byjgyl8jmxwcylkl8pwjvripja4fgpkyfl";
url = "mirror://sourceforge/k3b/${name}.tar.bz2";
sha256 = "1dyd3i2hqd5xs9rz4f8k74zca91j9sp72lhl0zws2cvqc474ccc6";
};
buildInputs = [kdelibs x11 zlib libpng libjpeg perl qt3];
configureFlags = "--without-arts";
buildInputs = [ cmake qt4 perl shared_mime_info libvorbis taglib
ffmpeg flac libsamplerate libdvdread lame libsndfile
libmad gettext stdenv.gcc.libc cdrdao cdrtools
kdelibs kdemultimedia automoc4 phonon dvdplusrwtools
makeWrapper ];
meta = {
description = "A CD and DVD authoring application for KDE";
homepage = http://www.k3b.org/;
postInstall = ''
wrapProgram $out/bin/k3b --suffix PATH : "${cdrdao}/bin:${dvdplusrwtools}/bin:${cdrtools}/bin"
'';
meta = with stdenv.lib; {
description = "CD/DVD Burning Application for KDE";
license = licenses.gpl2Plus;
maintainers = [ maintainers.sander maintainers.urkud ];
};
}

15
pkgs/applications/misc/krusader/default.nix
View File

@ -1,17 +1,16 @@
{stdenv, fetchurl, lib, cmake, qt4, perl, gettext, kdelibs, automoc4, phonon}:
{stdenv, fetchurl, cmake, qt4, perl, gettext, kdelibs, kdebase, automoc4, phonon}:
stdenv.mkDerivation {
name = "krusader-2.0.0";
stdenv.mkDerivation rec {
name = "krusader-2.2.0-beta1";
src = fetchurl {
url = mirror://sourceforge/krusader/krusader-2.0.0.tar.gz;
sha256 = "dc74c47d6eaf1c28165a74750e5a1b0341fa1c0d436658d0d5f85a6149f4852c";
url = "mirror://sourceforge/krusader/${name}.tar.bz2";
sha256 = "0rbk0hw8p1bb03w74gspljbzhvpbs3dcr6ckp38gh5r80mcmqfbs";
};
buildInputs = [ cmake qt4 perl gettext kdelibs automoc4 phonon ];
patches = [./krusader-gcc44.patch];
buildInputs = [ cmake qt4 perl gettext kdelibs automoc4 phonon kdebase ];
meta = {
description = "Norton/Total Commander clone for KDE";
license = "GPL";
homepage = http://www.krusader.org;
maintainers = [ lib.maintainers.sander ];
maintainers = with stdenv.lib.maintainers; [ sander urkud ];
};
}

6
pkgs/applications/misc/xneur/default.nix
View File

@ -18,9 +18,9 @@ stdenv.mkDerivation rec {
preConfigure = ''
sed -e 's/-Werror//' -i configure
sed -e 's/for aspell_dir in/for aspell_dir in ${aspell} /' -i configure
sed -e 's/for imlib2_dir in/for imlib2_dir in ${imlib2} /' -i configure
sed -e 's/for xosd_dir in/for xosd_dir in ${xosd} /' -i configure
sed -e 's@for aspell_dir in@for aspell_dir in ${aspell} @' -i configure
sed -e 's@for imlib2_dir in@for imlib2_dir in ${imlib2} @' -i configure
sed -e 's@for xosd_dir in@for xosd_dir in ${xosd} @' -i configure
export NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE -I${gtk}/include/gtk-2.0"
export NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE -I${gtk}/lib/gtk-2.0/include"

8
pkgs/applications/misc/xneur/src-for-default.nix
View File

@ -1,9 +1,9 @@
rec {
version="0.9.9";
name="xneur-0.9.9";
hash="07ircm7ngc84h6fpy8q01444vy9cm08q4mbl3q3ya0dg00cq64z4";
version="0.10.0";
name="xneur-0.10.0";
hash="1jh40awnc5bvdj07jv99ymiln8nzr5ac5ahz9v4w0m560b7qq48f";
url="http://dists.xneur.ru/release-${version}/tgz/xneur-${version}.tar.bz2";
advertisedUrl="http://dists.xneur.ru/release-0.9.9/tgz/xneur-0.9.9.tar.bz2";
advertisedUrl="http://dists.xneur.ru/release-0.10.0/tgz/xneur-0.10.0.tar.bz2";
}

4
pkgs/applications/networking/browsers/arora/default.nix
View File

@ -2,11 +2,11 @@
stdenv.mkDerivation rec {
name = "arora-${version}";
version = "0.10.2";
version = "0.11.0";
src = fetchurl {
url = "http://arora.googlecode.com/files/${name}.tar.gz";
sha256 = "1np9xiy7vkpz4dar6ka90wxw4nkwapjafyjzqrv7ghnc3nqdnnvv";
sha256 = "1ffkranxi93lrg5r7a90pix9j8xqmf0z1mb1m8579v9m34cyypvg";
};
buildInputs = [ qt4 ];

10
pkgs/applications/networking/browsers/chromium/default.nix
View File

@ -34,20 +34,18 @@
assert stdenv.system == "i686-linux" || stdenv.system == "x86_64-linux" ;
stdenv.mkDerivation rec {
name = "chrome-${version}"; # !!! Shouldn't this be "chromium"?
version = "61624";
# TODO: Use a stable release that doesn't disappear every few days.
name = "chrome-${version}";
version = "62263";
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 = "16kv1zbs3ypb2b00dpg2s4nn8zqdnv8jdvgxknp3s0xcq02w2asl";
sha256 = "0yn52bqxadwnzi04gfg0ginrvwz18wchqgcl701s7n4i5xzdnmv8";
}
else if stdenv.system == "i686-linux" then
fetchurl {
url = "http://build.chromium.org/buildbot/snapshots/chromium-rel-linux/${version}/chrome-linux.zip";
sha256 = "081pvwzpys98m3arj3qagyhrrphz7rjwn7yy4mk6bcrds6mwdxiz";
sha256 = "1cbzd4k9m1hf08462him8jqxw13k0wy0q1rpq84niifsqnq4z8nx";
}
else throw "Chromium is not supported on this platform.";

6
pkgs/applications/networking/browsers/firefox/3.6.nix
View File

@ -12,14 +12,14 @@
rec {
firefoxVersion = "3.6.10";
firefoxVersion = "3.6.11";
xulVersion = "1.9.2.10"; # this attribute is used by other packages
xulVersion = "1.9.2.11"; # this attribute is used by other packages
src = fetchurl {
url = "http://releases.mozilla.org/pub/mozilla.org/firefox/releases/${firefoxVersion}/source/firefox-${firefoxVersion}.source.tar.bz2";
sha1 = "0fa17f4ebd4bafe18c789961bdfe064d1b521ac6";
sha1 = "d5443a07243a771fb4c69c08cd6a0f5320a888c4";
};

6
pkgs/applications/networking/browsers/firefox/4.0.nix
View File

@ -1,7 +1,7 @@
{ stdenv, fetchurl, pkgconfig, gtk, pango, perl, python, zip, libIDL
, libjpeg, libpng, zlib, cairo, dbus, dbus_glib, bzip2, xlibs
, freetype, fontconfig, file, alsaLib, nspr, nss, libnotify
, libvpx, yasm, mesa
, libvpx, yasm, mesa, wirelesstools
, # If you want the resulting program to call itself "Firefox" instead
# of "Shiretoko" or whatever, enable this option. However, those
@ -52,6 +52,8 @@ rec {
python dbus dbus_glib pango freetype fontconfig xlibs.libXi
xlibs.libX11 xlibs.libXrender xlibs.libXft xlibs.libXt file
alsaLib nspr /* nss */ libnotify xlibs.pixman libvpx yasm mesa
wirelesstools xlibs.libXscrnsaver xlibs.scrnsaverproto
xlibs.libXext xlibs.xextproto
];
configureFlags =
@ -105,7 +107,7 @@ rec {
buildInputs =
[ pkgconfig gtk perl zip libIDL libjpeg zlib cairo bzip2 python
dbus dbus_glib pango freetype fontconfig alsaLib nspr libnotify
xlibs.pixman libvpx yasm mesa
xlibs.pixman libvpx yasm mesa wirelesstools
];
propagatedBuildInputs = [xulrunner];

2
pkgs/applications/networking/browsers/konq-plugins/default.nix
View File

@ -11,6 +11,8 @@ stdenv.mkDerivation rec {
buildInputs = [ cmake kdelibs qt4 automoc4 phonon kdebase gettext ];
patches = [ ./qt47.patch ];
meta = with stdenv.lib; {
description = "Various plugins for Konqueror";
license = "GPL";

11
pkgs/applications/networking/browsers/konq-plugins/qt47.patch Normal file
View File

@ -0,0 +1,11 @@
--- konq-plugins/adblock/adblock.cpp 2010-02-11 22:12:41.000000000 +0000
+++ konq-plugins/adblock/adblock.cpp 2010-07-26 17:12:20.639786002 +0100
@@ -300,7 +300,7 @@
// ----------------------------------------------------------------------------
AdElement::AdElement() :
- m_url(0), m_category(0), m_type(0), m_blocked(false) {}
+ m_url(QString()), m_category(QString()), m_type(QString()), m_blocked(false) {}
AdElement::AdElement(const QString &url, const QString &category,
const QString &type, bool blocked, const DOM::Node&node) :

9
pkgs/applications/networking/browsers/rekonq/default.nix
View File

@ -1,15 +1,16 @@
{ stdenv, fetchurl, cmake, qt4, kdelibs, automoc4, phonon, perl
, gtk, gettext, pixman}:
, gettext}:
stdenv.mkDerivation rec {
name = "rekonq-0.5.0";
name = "rekonq-0.6.1";
passthru = { inherit stdenv; };
src = fetchurl {
url = "mirror://sf/rekonq/${name}.tar.bz2";
sha256 = "0qm16ivxlh3pj7v39z3ajf90sgm5q5xq6a8s2x1a0ipsh7fgkp58";
sha256 = "1hgy8ph4k4ngdy1kr4w3qwkfdylapsj7rjpk8wxn97yc4qnk57by";
};
buildInputs = [ cmake qt4 kdelibs automoc4 phonon perl gtk gettext pixman ];
buildInputs = [ cmake qt4 kdelibs automoc4 phonon perl gettext ];
meta = with stdenv.lib; {
platforms = platforms.linux;

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

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

7
pkgs/applications/networking/instant-messengers/vacuum/default.nix
View File

@ -28,7 +28,12 @@ rec {
inherit buildInputs;
/* doConfigure should be removed if not needed */
phaseNames = ["doQMake" "doMakeInstall"];
phaseNames = ["preBuild" "doQMake" "doMakeInstall"];
preBuild = a.fullDepEntry (''
echo "Fixing a name collision with a function added in Qt 4.7"
sed -re 's/qHash[(][a-z ]*QUrl/vacuum_obsolete_&/' -i src/plugins/dataforms/dataforms.cpp
'') ["minInit" "doUnpack"];
goSrcDir = ''cd vacuum-*/'';

4
pkgs/applications/version-management/subversion/default.nix
View File

@ -49,7 +49,7 @@ stdenv.mkDerivation rec {
postInstall = ''
ensureDir $out/share/emacs/site-lisp
cp contrib/client-side/emacs/*.el $out/share/emacs/site-lisp/
cp contrib/client-side/emacs/[dp]svn*.el $out/share/emacs/site-lisp/
if test -n "$pythonBindings"; then
make swig-py swig_pydir=$(toPythonPath $out)/libsvn swig_pydir_extra=$(toPythonPath $out)/svn
@ -64,7 +64,7 @@ stdenv.mkDerivation rec {
make install
cd -
fi
''; # */
'';
inherit perlBindings pythonBindings;

8
pkgs/applications/version-management/veracity/src-for-default.nix
View File

@ -1,9 +1,9 @@
rec {
version="0.3.1.10304";
name="veracity-0.3.1.10304";
hash="0izbs3v7incy9799sh6idfy7r2mchq2v152k8qc1k5l2r1jq4vik";
version="0.5.0.10311";
name="veracity-0.5.0.10311";
hash="0ad30x8dbxrqz6d9jmq40rzkhx4z4mgbqb37zszh8bcf9v69kv6z";
url="http://download-us.sourcegear.com/Veracity/nightly/veracity-source-${version}.tar.gz";
advertisedUrl="http://download-us.sourcegear.com/Veracity/nightly/veracity-source-0.3.1.10304.tar.gz";
advertisedUrl="http://download-us.sourcegear.com/Veracity/nightly/veracity-source-0.5.0.10311.tar.gz";
}

7
pkgs/applications/video/xawtv/default.nix
View File

@ -1,4 +1,4 @@
{stdenv, fetchurl, ncurses, libjpeg, libX11, libXt, libXft, xproto, libFS, fontsproto, libXaw, libXpm, libXext, libSM, libICE, perl, xextproto}:
{stdenv, fetchurl, ncurses, libjpeg, libX11, libXt, libXft, xproto, libFS, fontsproto, libXaw, libXpm, libXext, libSM, libICE, perl, xextproto, linux}:
stdenv.mkDerivation {
name = "xawtv-3.95";
@ -6,7 +6,10 @@ stdenv.mkDerivation {
url = http://dl.bytesex.org/releases/xawtv/xawtv-3.95.tar.gz;
md5 = "ad25e03f7e128b318e392cb09f52207d";
};
preConfigure = ''
export NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE -I$(echo ${linux}/lib/modules/*/build/include)"
'';
buildInputs = [ncurses libjpeg libX11 libXt libXft xproto libFS fontsproto libXaw libXpm libXext libSM libICE perl xextproto];
patches = [./xawtv-3.95-libfs.patch ./xawtv-3.95-makefile.patch];
patches = [./xawtv-3.95-libfs.patch ./xawtv-3.95-makefile.patch ./xawtv-3.95-page-mask.patch ];
}

44
pkgs/applications/video/xawtv/xawtv-3.95-page-mask.patch Normal file
View File

@ -0,0 +1,44 @@
Fix problems with fbtv and kernel headers
diff -urN ../tmp-orig/xawtv-3.95/console/fbtools.c ./console/fbtools.c
--- xawtv-3.95/console/fbtools.c 2003-02-14 14:14:04.000000000 +0000
+++ xawtv-3.95/console/fbtools.c 2006-08-23 10:57:40.000000000 +0000
@@ -21,8 +21,6 @@
#include <linux/vt.h>
#include <linux/fb.h>
-#include <asm/page.h>
-
#include "fbtools.h"
/* -------------------------------------------------------------------- */
@@ -424,7 +422,7 @@
goto err;
}
#endif
- fb_mem_offset = (unsigned long)(fb_fix.smem_start) & (~PAGE_MASK);
+ fb_mem_offset = (unsigned long)(fb_fix.smem_start) & ~(sysconf(_SC_PAGE_SIZE)-1);
fb_mem = mmap(NULL,fb_fix.smem_len+fb_mem_offset,
PROT_READ|PROT_WRITE,MAP_SHARED,fb,0);
if (-1L == (long)fb_mem) {
diff -urN ../tmp-orig/xawtv-3.95/console/matrox.c ./console/matrox.c
--- xawtv-3.95/console/matrox.c 2005-02-03 10:40:41.000000000 +0000
+++ xawtv-3.95/console/matrox.c 2006-08-23 11:09:51.000000000 +0000
@@ -9,7 +9,6 @@
#include <sys/ioctl.h>
#include <sys/mman.h>
-#include <asm/page.h> /* PAGE_SIZE */
#include <linux/fb.h>
#include "byteswap.h"
@@ -226,7 +225,7 @@
return -1;
}
off = (unsigned long)fb_fix.mmio_start -
- ((unsigned long)fb_fix.mmio_start & ~(PAGE_SIZE-1));
+ ((unsigned long)fb_fix.mmio_start & ~(sysconf(_SC_PAGE_SIZE)-1));
bmmio += off;
mmio = (uint32_t*)bmmio;
return 0;

34
pkgs/applications/window-managers/compiz-fusion/bcop/0.7.8.nix
View File

@ -1,34 +0,0 @@
args : with args;
let localDefs = builderDefs.passthru.function {
src = /* put a fetchurl here */
fetchurl {
url = http://releases.compiz-fusion.org/0.7.8/compiz-bcop-0.7.8.tar.bz2;
sha256 ="1rs5r5b6rl39vlw68i8bwm5izs5dm666kygmg1c8dy2dab0xsnkq";
};
buildInputs = (import ../general-dependencies.nix args);
propagatedBuildInputs = [getopt libxslt];
configureFlags = [];
} ;
in with localDefs;
let
fixPkgconfig = fullDepEntry ("
ensureDir \$out/lib
ln -fs \$out/share/pkgconfig \$out/lib/pkgconfig
") [minInit doMakeInstall defEnsureDir];
fixInterpreter = fullDepEntry ("
sed -e 's@^#!/bin/bash@#! ${stdenv.bash}/bin/bash@' -i \$out/bin/bcop
") [minInit doMakeInstall];
in
stdenv.mkDerivation rec {
name = "compiz-bcop-"+version;
builder = writeScript (name + "-builder")
(textClosure localDefs [doAutotools doConfigure doMakeInstall fixPkgconfig fixInterpreter doForceShare
doPropagate]);
inherit propagatedBuildInputs;
meta = {
description = "
Compiz BCOP.
";
inherit src;
};
}

29
pkgs/applications/window-managers/compiz-fusion/ccsm-simple/0.7.8.nix
View File

@ -1,29 +0,0 @@
args : with args;
let localDefs = builderDefs.passthru.function {
src = /* put a fetchurl here */
fetchurl {
url = http://releases.compiz-fusion.org/0.7.8/simple-ccsm-0.7.8.tar.bz2;
sha256 ="0djdzz1m9nvwzxfaywdm90bi816nig2ybfynf48394a5hpsng3l9";
};
buildInputs = (import ../general-dependencies.nix args) ++
[libcompizconfig bcop compizConfigPython python gettext pygtk
pycairo configBackendGConf];
configureFlags = [];
wrappedEnv = [
"PYTHONPATH" "$(toPythonPath \$out)"
"PYTHONPATH" "\$PYTHONPATH"
"PYTHONPATH" "$(toPythonPath ${pygtk})/gtk-2.0"
];
} ;
in with localDefs;
stdenv.mkDerivation rec {
name = "compizconfig-settings-"+args.version;
builder = writeScript (name + "-builder")
(textClosure localDefs [installPythonPackage (doWrap "\$out/bin/simple-ccsm")]);
meta = {
description = "
Compiz Settings Manager (simplified)
";
inherit src;
};
}

29
pkgs/applications/window-managers/compiz-fusion/ccsm/0.7.8.nix
View File

@ -1,29 +0,0 @@
args : with args;
let localDefs = builderDefs.passthru.function {
src = /* put a fetchurl here */
fetchurl {
url = http://releases.compiz-fusion.org/0.7.8/ccsm-0.7.8.tar.bz2;
sha256 ="0s8difywj0ghc8c5xjxihfp8qhlhv5kyh00c2br1jh2ap5rrdfgc";
};
buildInputs = (import ../general-dependencies.nix args) ++
[libcompizconfig bcop compizConfigPython python gettext pygtk
pycairo configBackendGConf];
configureFlags = [];
wrappedEnv = [
"PYTHONPATH" "$(toPythonPath \$out)"
"PYTHONPATH" "\$PYTHONPATH"
"PYTHONPATH" "$(toPythonPath ${pygtk})/gtk-2.0"
];
} ;
in with localDefs;
stdenv.mkDerivation rec {
name = "compizconfig-settings-"+args.version;
builder = writeScript (name + "-builder")
(textClosure localDefs [installPythonPackage (doWrap "\$out/bin/ccsm")]);
meta = {
description = "
Compiz Settings Manager
";
inherit src;
};
}

23
pkgs/applications/window-managers/compiz-fusion/compizconfig-python/0.7.8.nix
View File

@ -1,23 +0,0 @@
args : with args;
let localDefs = builderDefs.passthru.function {
src = /* put a fetchurl here */
fetchurl {
url = http://releases.compiz-fusion.org/0.7.8/compizconfig-python-0.7.8.tar.bz2;
sha256 ="13g8vpgkimrbp19pd475ijiwbqx3zin0nzq8636l71yaqb0kjfjn";
};
buildInputs = (import ../general-dependencies.nix args) ++
[libcompizconfig bcop python pyrex configBackendGConf];
configureFlags = [];
} ;
in with localDefs;
stdenv.mkDerivation rec {
name = "compizconfig-python-"+args.version;
builder = writeScript (name + "-builder")
(textClosure localDefs [doAutotools doConfigure doMakeInstall doForceShare]);
meta = {
description = "
Compiz configuration - Python part.
";
inherit src;
};
}

24
pkgs/applications/window-managers/compiz-fusion/config-backend/0.7.8.nix
View File

@ -1,24 +0,0 @@
args : with args;
let localDefs = builderDefs.passthru.function {
src = /* put a fetchurl here */
fetchurl {
url = http://releases.compiz-fusion.org/0.7.8/compizconfig-backend-gconf-0.7.8.tar.bz2;
sha256 ="18bcfx3c2ipj3spfr8dg07h98pw77jh28w91w6n2fd5ffr6ja9q5";
};
buildInputs = (import ../general-dependencies.nix args) ++
[bcop libcompizconfig];
configureFlags = [];
forceShare = ["man" "doc" "info" "lib/compizconfig"];
} ;
in with localDefs;
stdenv.mkDerivation rec {
name = "compizconfig-backend-GConf-"+version;
builder = writeScript (name + "-builder")
(textClosure localDefs [doAutotools doConfigure doMakeInstall doForceShare doPropagate]);
meta = {
description = "
Compiz configuration backend (GConf).
";
inherit src;
};
}

15
pkgs/applications/window-managers/compiz-fusion/default.nix
View File

@ -1,15 +0,0 @@
args : with args;
rec
{
selectVersion = dir: import (dir + "/${args.version}.nix");
bcop = selectVersion ./bcop args;
libcompizconfig = selectVersion ./libcompizconfig (args // {inherit bcop;});
configBackendGConf = selectVersion ./config-backend (args // {inherit bcop libcompizconfig;});
compizConfigPython = selectVersion ./compizconfig-python (args // {inherit libcompizconfig
bcop pyrex configBackendGConf;});
ccsm = selectVersion ./ccsm (args // {inherit libcompizconfig bcop compizConfigPython configBackendGConf;});
pluginsMain = selectVersion ./main (args //{inherit bcop ;});
pluginsExtra = selectVersion ./extra (args //{inherit bcop pluginsMain;});
compizManager = (import ./compiz-manager/0.6.0.nix) (args // {inherit bcop ccsm;});
ccsmSimple = selectVersion ./ccsm-simple (args // {inherit libcompizconfig bcop compizConfigPython configBackendGConf;});
}

32
pkgs/applications/window-managers/compiz-fusion/extra/0.7.8.nix
View File

@ -1,32 +0,0 @@
args : with args;
let localDefs = builderDefs.passthru.function {
src = /* put a fetchurl here */
fetchurl {
url = http://releases.compiz-fusion.org/0.7.8/compiz-fusion-plugins-extra-0.7.8.tar.bz2;
sha256 ="0hdnabq1bxln5cf6k9532iszj5qbhwkyl3b5d1gwfr80i01qxzy9";
};
buildInputs = (import ../general-dependencies.nix args)++
[bcop libjpeg gettext pluginsMain];
configureFlags = [];
} ;
in with localDefs;
let
sharePlugins = fullDepEntry ("
ensureDir \$out/share/compiz-plugins
ln -vsf \$out/lib/compiz \$out/share/compiz-plugins
") [minInit doMakeInstall defEnsureDir];
fixIncludes = fullDepEntry (''
export NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE -I${pluginsMain}/include/compiz"
'') [minInit doUnpack];
in
stdenv.mkDerivation rec {
name = "compiz-fusion-plugins-extra-"+version;
builder = writeScript (name + "-builder")
(textClosure localDefs [fixIncludes doConfigure doMakeInstall sharePlugins doForceShare]);
meta = {
description = "
Extra Compiz Fusion plugins.
";
inherit src;
};
}

10
pkgs/applications/window-managers/compiz-fusion/general-dependencies.nix
View File

@ -1,10 +0,0 @@
/* Ubuntu dependencies
build-essential libxcomposite-dev libpng12-dev libsm-dev libxrandr-dev libxdamage-dev libxinerama-dev libstartup-notification0-dev libgconf2-dev libgl1-mesa-dev libglu1-mesa-dev libmetacity-dev librsvg2-dev libdbus-1-dev libdbus-glib-1-dev libgnome-desktop-dev libgnome-window-settings-dev gitweb curl autoconf automake automake1.9 libtool intltool libxslt1-dev xsltproc libwnck-dev
*/
args: with args;
[
libpng
GConf mesa metacity librsvg dbus.libs dbus_glib gnomedesktop git autoconf automake
libtool libxslt libwnck intltool perl perlXMLParser compiz pkgconfig libxml2
gettext
]

23
pkgs/applications/window-managers/compiz-fusion/libcompizconfig/0.7.8.nix
View File

@ -1,23 +0,0 @@
args : with args;
let localDefs = builderDefs.passthru.function {
src = /* put a fetchurl here */
fetchurl {
url = http://releases.compiz-fusion.org/0.7.8/libcompizconfig-0.7.8.tar.bz2;
sha256 ="1026icgzyjxnn68gbkd85n9p8pxlwbc3h0dqqvpqmr93q1nhdmjr";
};
buildInputs = (import ../general-dependencies.nix args)++
[bcop];
configureFlags = [];
} ;
in with localDefs;
stdenv.mkDerivation rec {
name = "libcompizconfig-"+version;
builder = writeScript (name + "-builder")
(textClosure localDefs [doIntltool doAutotools doConfigure doMakeInstall doForceShare]);
meta = {
description = "
Compiz configuration backend library.
";
inherit src;
};
}

29
pkgs/applications/window-managers/compiz-fusion/main/0.7.8.nix
View File

@ -1,29 +0,0 @@
args : with args;
let localDefs = builderDefs.passthru.function {
src = /* put a fetchurl here */
fetchurl {
url = http://releases.compiz-fusion.org/0.7.8/compiz-fusion-plugins-main-0.7.8.tar.bz2;
sha256 ="0lrvqi8kc8m6yap8pqbdg0wksckd3v3rp3k48q82pyvcwhaaf817";
};
buildInputs = (import ../general-dependencies.nix args)++
[bcop libjpeg gettext];
configureFlags = [];
} ;
in with localDefs;
let
sharePlugins = fullDepEntry ("
ensureDir \$out/share/compiz-plugins
ln -vsf \$out/lib/compiz \$out/share/compiz-plugins
") [minInit doMakeInstall defEnsureDir];
in
stdenv.mkDerivation rec {
name = "compiz-fusion-plugins-main-"+version;
builder = writeScript (name + "-builder")
(textClosure localDefs [doConfigure doMakeInstall sharePlugins doForceShare]);
meta = {
description = "
Main Compiz Fusion plugins.
";
inherit src;
};
}

44
pkgs/applications/window-managers/compiz/0.8.0.nix
View File

@ -1,44 +0,0 @@
args : with args;
rec {
src = fetchurl {
url = "http://releases.compiz-fusion.org/core/compiz-0.8.0.tar.gz";
sha256 = "0xhyilfz2cfbdwni774b54171addjqw7hda6j6snzxb1igny7iry";
};
buildInputs = [
pkgconfig gtk libwnck GConf libgnome
libgnomeui metacity gnomegtk glib pango libglade libgtkhtml
gtkhtml libgnomecanvas libgnomeprint libgnomeprintui gnomepanel
librsvg fuse gettext intltool binutils
];
propagatedBuildInputs = [
libpng libXcomposite libXfixes libXdamage libXrandr libXinerama
libICE libSM startupnotification mesa GConf perl perlXMLParser libxslt
dbus.libs dbus_glib compositeproto fixesproto damageproto randrproto
xineramaproto renderproto kbproto xextproto libXrender xproto libX11
libxcb
];
postAll = fullDepEntry ("
for i in $out/bin/*; do
patchelf --set-rpath /var/run/opengl-driver/lib:$(patchelf --print-rpath $i) $i
done
ensureDir \$out/share/compiz-plugins/
ln -sfv \$out/lib/compiz \$out/share/compiz-plugins/
") ["minInit" "doMakeInstall" "defEnsureDir"];
configureFlags = ["--enable-gtk" "--enable-fuse"
"--enable-annotate" "--enable-librsvg"] ++
(if args ? extraConfigureFlags then args.extraConfigureFlags else []);
/* doConfigure should be specified separately */
phaseNames = [ "doPatch" "doConfigure" "doMakeInstall" "doPropagate"
"doForceShare" "postAll" ];
name = "compiz-0.8.0";
meta = {
description = "Compiz window manager";
inherit src;
};
}

17
pkgs/applications/window-managers/compiz/bcop.nix Normal file
View File

@ -0,0 +1,17 @@
{ stdenv, fetchurl, pkgconfig, libxslt }:
stdenv.mkDerivation rec {
name = "compiz-bcop-0.8.4";
src = fetchurl {
url = "http://releases.compiz.org/components/compiz-bcop/${name}.tar.bz2";
sha256 = "0kwcvalmx2aab7j3x7s0xqm102i3kr5gh1z8mfws9q4qkqdclnfk";
};
buildInputs = [ pkgconfig libxslt ];
meta = {
homepage = http://www.compiz.org/;
description = "Code generator for Compiz plugins";
};
}

31
pkgs/applications/window-managers/compiz/ccsm.nix Normal file
View File

@ -0,0 +1,31 @@
{ stdenv, fetchurl, makeWrapper, intltool, gtk
, python, pygtk, pygobject, pycairo, compizconfig_python }:
stdenv.mkDerivation rec {
name = "ccsm-0.8.4";
src = fetchurl {
url = "http://releases.compiz.org/components/ccsm/${name}.tar.bz2";
sha256 = "0vf16a2nmb0qwwxymvgl86nkfscj3n39jdw2q2p737pj5h1xmfa6";
};
buildInputs = [ makeWrapper python intltool gtk ];
buildPhase = "python setup.py build --prefix=$out";
pythonDeps = [ pygtk pygobject pycairo compizconfig_python ];
installPhase =
''
python setup.py install --prefix=$out
wrapProgram $out/bin/ccsm --prefix PYTHONPATH ":" \
"$(toPythonPath "$pythonDeps $out")"
'';
meta = {
homepage = http://www.compiz.org/;
description = "Compiz settings manager";
platforms = stdenv.lib.platforms.linux;
};
}

20
pkgs/applications/window-managers/compiz/config-python.nix Normal file
View File

@ -0,0 +1,20 @@
{ stdenv, fetchurl, pkgconfig, xlibs, libcompizconfig, glib
, python, pyrex }:
stdenv.mkDerivation rec {
name = "compizconfig-python-0.8.4";
src = fetchurl {
url = "http://releases.compiz.org/components/compizconfig-python/${name}.tar.bz2";
sha256 = "0nkgqxddjw324aymzcy5nx6ilhfbpk9rra4qbzrq3l39xqsswd37";
};
buildInputs = [ pkgconfig libcompizconfig glib python pyrex xlibs.xlibs ];
NIX_LDFLAGS = "-lcompizconfig";
meta = {
homepage = http://www.compiz.org/;
description = "Python interface to the Compiz configuration";
};
}

37
pkgs/applications/window-managers/compiz/core.nix Normal file
View File

@ -0,0 +1,37 @@
{ stdenv, fetchurl, intltool, pkgconfig, xlibs, mesa, libxml2, libxslt
, libstartup_notification, libpng, glib, gtk, gnome, dbus_glib, librsvg, bzip2 }:
let version = "0.8.6"; in
stdenv.mkDerivation {
name = "compiz-${version}";
src = fetchurl {
url = "http://releases.compiz.org/${version}/compiz-${version}.tar.bz2";
sha256 = "132gmdawjmrmvazm31h3r3wwq97h58hz17yyc9sa6q2nkfsnkpy4";
};
patches =
[ # Allow the path to the Compiz plugin library and metadata
# directories to be overriden through $COMPIZ_PLUGINDIR and
# $COMPIZ_METADATADIR, respectively.
./plugindir-core.patch
];
buildInputs =
[ intltool pkgconfig libpng glib
gtk gnome.libwnck gnome.GConf dbus_glib librsvg bzip2
];
propagatedBuildInputs =
[ xlibs.xlibs xlibs.libXfixes xlibs.libXrandr xlibs.libXrender
xlibs.libXdamage xlibs.libXcomposite xlibs.libXinerama
libstartup_notification mesa libxml2 libxslt
];
meta = {
homepage = http://www.compiz.org/;
description = "A compositing window manager";
platforms = stdenv.lib.platforms.linux;
};
}

17
pkgs/applications/window-managers/compiz/extra.nix
View File

@ -1,17 +0,0 @@
{ stdenv, fetchurl, pkgconfig, compiz, perl, perlXMLParser, GConf, dbus, gtk
}:
stdenv.mkDerivation {
name = "compiz-extra-20070305";
src = fetchurl {
url = http://gandalfn.club.fr/ubuntu/compiz-extra/compiz-extra-latest.tar.bz2;
sha256 = "7fc7faafccfdf22dea7ac1de6629dcb55ec63d84fcb57a14559309cf284fa94f";
};
buildInputs = [
pkgconfig compiz perl perlXMLParser GConf dbus.libs gtk
];
preBuild = "
makeFlagsArray=(moduledir=$out/lib/compiz)
";
preConfigure = "touch m4/Makefile.in";
}

22
pkgs/applications/window-managers/compiz/libcompizconfig.nix Normal file
View File

@ -0,0 +1,22 @@
{ stdenv, fetchurl,intltool, pkgconfig, xlibs, libxml2, libxslt, compiz }:
stdenv.mkDerivation rec {
name = "libcompizconfig-0.8.4";
src = fetchurl {
url = "http://releases.compiz.org/components/libcompizconfig/${name}.tar.bz2";
sha256 = "0adhl2nc2zrswl5n4a8ipymffq6yjwnxgpkv6rsk7sqvby9kwca1";
};
patches =
[ # See ./core.nix.
./plugindir-libcompizconfig.patch
];
buildInputs = [ pkgconfig intltool xlibs.libX11 compiz libxml2 libxslt ];
meta = {
homepage = http://www.compiz.org/;
description = "Compiz configuration library";
};
}

39
pkgs/applications/window-managers/compiz/plugindir-core.patch Normal file
View File

@ -0,0 +1,39 @@
diff -ru -x '*~' compiz-0.8.6-orig/src/metadata.c compiz-0.8.6/src/metadata.c
--- compiz-0.8.6-orig/src/metadata.c 2010-03-28 14:15:35.000000000 +0200
+++ compiz-0.8.6/src/metadata.c 2010-10-20 00:22:47.000000000 +0200
@@ -146,7 +146,7 @@
compAddMetadataFromFile (CompMetadata *metadata,
const char *file)
{
- char *home;
+ char *home, *metadatadir;
Bool status = FALSE;
home = getenv ("HOME");
@@ -163,7 +163,10 @@
}
}
- status |= addMetadataFromFilename (metadata, METADATADIR, file);
+ metadatadir = getenv("COMPIZ_METADATADIR");
+ if (!metadatadir) metadatadir = METADATADIR;
+
+ status |= addMetadataFromFilename (metadata, metadatadir, file);
if (!status)
{
compLogMessage ("core", CompLogLevelWarn,
diff -ru -x '*~' compiz-0.8.6-orig/src/plugin.c compiz-0.8.6/src/plugin.c
--- compiz-0.8.6-orig/src/plugin.c 2010-03-28 14:15:35.000000000 +0200
+++ compiz-0.8.6/src/plugin.c 2010-10-20 00:25:16.000000000 +0200
@@ -579,7 +579,10 @@
}
}
- status = (*loaderLoadPlugin) (p, PLUGINDIR, name);
+ plugindir = getenv("COMPIZ_PLUGINDIR");
+ if (!plugindir) plugindir = PLUGINDIR;
+
+ status = (*loaderLoadPlugin) (p, plugindir, name);
if (status)
return p;

39
pkgs/applications/window-managers/compiz/plugindir-libcompizconfig.patch Normal file
View File

@ -0,0 +1,39 @@
diff -ru -x '*~' libcompizconfig-0.8.4-orig/src/compiz.cpp libcompizconfig-0.8.4/src/compiz.cpp
--- libcompizconfig-0.8.4-orig/src/compiz.cpp 2009-10-14 02:36:04.000000000 +0200
+++ libcompizconfig-0.8.4/src/compiz.cpp 2010-10-20 00:35:28.000000000 +0200
@@ -3004,7 +3004,10 @@
}
}
- loadPluginFromXMLFile (context, xmlName, (char *) METADATADIR);
+ char *metadatadir = getenv("COMPIZ_METADATADIR");
+ if (!metadatadir) metadatadir = METADATADIR;
+
+ loadPluginFromXMLFile (context, xmlName, metadatadir);
free (xmlName);
}
@@ -3031,7 +3034,10 @@
free (homeplugins);
}
}
- loadPluginsFromXMLFiles (context, (char *)METADATADIR);
+
+ char *metadatadir = getenv("COMPIZ_METADATADIR");
+ if (!metadatadir) metadatadir = METADATADIR;
+ loadPluginsFromXMLFiles (context, metadatadir);
if (home && strlen (home))
{
@@ -3043,7 +3049,10 @@
free (homeplugins);
}
}
- loadPluginsFromName (context, (char *)PLUGINDIR);
+
+ char *plugindir = getenv("COMPIZ_PLUGINDIR");
+ if (!plugindir) plugindir = PLUGINDIR;
+ loadPluginsFromName (context, plugindir);
}
static void

30
pkgs/applications/window-managers/compiz/plugins-extra.nix Normal file
View File

@ -0,0 +1,30 @@
{ stdenv, fetchurl, intltool, pkgconfig, compiz, compiz_bcop
, compiz_plugins_main, getopt, libjpeg, cairo, pango, gnome }:
let version = "0.8.6"; in
stdenv.mkDerivation rec {
name = "compiz-plugins-extra-${version}";
src = fetchurl {
url = "http://releases.compiz.org/${version}/${name}.tar.bz2";
sha256 = "1qbxfi332bbadm0ah48frnrl9dkczl111s5a91a0cqz5v7nbw4g1";
};
patches =
[ # Support scaling wallpapers to the maximum size while still
# respecting the aspect ratio.
./wallpaper-maxpect.patch
];
NIX_CFLAGS_COMPILE = "-I${compiz_plugins_main}/include/compiz";
buildInputs =
[ intltool pkgconfig compiz compiz_bcop compiz_plugins_main getopt gnome.GConf ];
meta = {
homepage = http://www.compiz.org/;
description = "Extra plugins for Compiz";
platforms = stdenv.lib.platforms.linux;
};
}

22
pkgs/applications/window-managers/compiz/plugins-main.nix Normal file
View File

@ -0,0 +1,22 @@
{ stdenv, fetchurl, intltool, pkgconfig, compiz, compiz_bcop
, getopt, libjpeg, cairo, pango, gnome }:
let version = "0.8.6"; in
stdenv.mkDerivation rec {
name = "compiz-plugins-main-${version}";
src = fetchurl {
url = "http://releases.compiz.org/${version}/${name}.tar.bz2";
sha256 = "1nfn3r4q7wvzfkdh9hrm5zc816xa8cs2s7cliz0fmnqikcs4zp36";
};
buildInputs =
[ intltool pkgconfig compiz compiz_bcop getopt libjpeg cairo pango gnome.GConf ];
meta = {
homepage = http://www.compiz.org/;
description = "Main plugins for Compiz";
platforms = stdenv.lib.platforms.linux;
};
}

58
pkgs/applications/window-managers/compiz/wallpaper-maxpect.patch Normal file
View File

@ -0,0 +1,58 @@
diff -x '*~' -ru compiz-plugins-extra-0.8.6-orig/metadata/wallpaper.xml.in compiz-plugins-extra-0.8.6/metadata/wallpaper.xml.in
--- compiz-plugins-extra-0.8.6-orig/metadata/wallpaper.xml.in 2010-03-29 16:09:17.000000000 +0200
+++ compiz-plugins-extra-0.8.6/metadata/wallpaper.xml.in 2010-10-21 00:23:18.000000000 +0200
@@ -24,7 +24,7 @@
<_long>Image position.</_long>
<type>int</type>
<min>0</min>
- <max>4</max>
+ <max>5</max>
<desc>
<value>0</value>
<_name>Scale and Crop</_name>
@@ -45,6 +45,10 @@
<value>4</value>
<_name>Center Tiled</_name>
</desc>
+ <desc>
+ <value>5</value>
+ <_name>Centered Maxpect</_name>
+ </desc>
</option>
<option name="bg_fill_type" type="list">
<_short>Fill type</_short>
diff -x '*~' -ru compiz-plugins-extra-0.8.6-orig/src/wallpaper/wallpaper.c compiz-plugins-extra-0.8.6/src/wallpaper/wallpaper.c
--- compiz-plugins-extra-0.8.6-orig/src/wallpaper/wallpaper.c 2010-03-29 16:09:18.000000000 +0200
+++ compiz-plugins-extra-0.8.6/src/wallpaper/wallpaper.c 2010-10-21 01:09:10.000000000 +0200
@@ -697,12 +697,12 @@
tmpMatrix = back->imgTex.matrix;
- if (back->imagePos == BgImagePosScaleAndCrop)
+ if ((back->imagePos == BgImagePosScaleAndCrop) || (back->imagePos == BgImagePosCenteredMaxpect))
{
s1 = (float) s->width / back->width;
s2 = (float) s->height / back->height;
- s1 = MAX (s1, s2);
+ s1 = back->imagePos == BgImagePosScaleAndCrop ? MAX (s1, s2) : MIN (s1, s2);
tmpMatrix.xx /= s1;
tmpMatrix.yy /= s1;
@@ -711,6 +711,16 @@
tmpMatrix.x0 -= x * tmpMatrix.xx;
y = (s->height - ((int)back->height * s1)) / 2.0;
tmpMatrix.y0 -= y * tmpMatrix.yy;
+
+ if (back->imagePos == BgImagePosCenteredMaxpect)
+ {
+ reg = &tmpRegion;
+
+ tmpRegion.extents.x1 = MAX (0, x);
+ tmpRegion.extents.y1 = MAX (0, y);
+ tmpRegion.extents.x2 = MIN (s->width, x + ((int) back->width * s1));
+ tmpRegion.extents.y2 = MIN (s->height, y + ((int) back->height * s1));
+ }
}
else if (back->imagePos == BgImagePosScaled)
{

22
pkgs/build-support/release/ant-build.nix
View File

@ -1,5 +1,6 @@
{ src
, stdenv
, pkgs
, stdenv ? pkgs.stdenv
, name
, antTargets ? []
, jars ? []
@ -7,14 +8,19 @@
, antProperties ? []
, antBuildInputs ? []
, buildfile ? "build.xml"
, ant ? pkgs.ant
, jre ? pkgs.jre
, hydraAntLogger ? pkgs.hydraAntLogger
, ... } @ args:
let
antFlags = "-f ${buildfile} " + stdenv.lib.concatMapStrings ({name, value}: "-D${name}=${value}" ) antProperties ;
antFlags = "-f ${buildfile} " + stdenv.lib.concatMapStrings ({name, value}: "-D${name}=${value} " ) antProperties ;
lib = stdenv.lib;
in
stdenv.mkDerivation (
{
inherit jre ant;
showBuildStats = true;
postPhases =
@ -44,14 +50,18 @@ stdenv.mkDerivation (
done
'';
generateWrappersPhase = ''
generateWrappersPhase =
let
cp = w: "-cp ${lib.optionalString (w ? classPath) w.classPath}${lib.optionalString (w ? mainClass) ":$out/lib/java/${w.jar}"}";
in
''
header "Generating jar wrappers"
'' + (stdenv.lib.concatMapStrings (w: ''
cat >> $out/bin/${w.name} <<EOF
#! /bin/sh
export JAVA_HOME=$jre
$jre/bin/java ${if w ? mainClass then "-cp $out/lib/java/${w.jar} ${w.mainClass}" else "-jar $out/lib/java/${w.jar}"} \$@
$jre/bin/java ${cp w} ${if w ? mainClass then w.mainClass else "-jar ${w.jar}"} \$@
EOF
chmod a+x $out/bin/${w.name} || exit 1
@ -79,11 +89,13 @@ stdenv.mkDerivation (
'';
}
// removeAttrs args ["antProperties"] //
// removeAttrs args ["antProperties" "buildInputs" "pkgs" "jarWrappers"] //
{
name = name + (if src ? version then "-" + src.version else "");
buildInputs = [ant jre] ++ stdenv.lib.optional (args ? buildInputs) args.buildInputs ;
postHook = ''
ensureDir $out/nix-support
echo "$system" > $out/nix-support/system

2
pkgs/build-support/release/default.nix
View File

@ -15,7 +15,7 @@ rec {
} // args);
antBuild = args: import ./ant-build.nix (
{ inherit stdenv;
{ inherit pkgs;
} // args);
mvnBuild = args: import ./maven-build.nix (

2
pkgs/desktops/kde-4.5/accessibility/color-schemes.nix
View File

@ -8,7 +8,7 @@ kde.package {
kde = {
name = "ColorSchemes";
module = "kdeaccessibility";
version = "4.5.1";
version = "4.5.2";
};
};
}

2
pkgs/desktops/kde-4.5/accessibility/icon-themes.nix
View File

@ -8,7 +8,7 @@ kde.package {
kde = {
name = "IconThemes";
module = "kdeaccessibility";
version = "4.5.1";
version = "4.5.2";
};
};
}

3
pkgs/desktops/kde-4.5/accessibility/jovie.nix
View File

@ -10,7 +10,8 @@ kde.package {
name = "jovie";
module = "kdeaccessibility";
version = "0.6.0";
release = "4.5.1";
release = "4.5.2";
versionFile = "jovie/jovie/main.cpp";
};
};
}

3
pkgs/desktops/kde-4.5/accessibility/kmag.nix
View File

@ -9,7 +9,8 @@ kde.package {
name = "kmag";
module = "kdeaccessibility";
version = "1.0";
release = "4.5.1";
release = "4.5.2";
versionFile = "kmag/version.h";
};
};
}

3
pkgs/desktops/kde-4.5/accessibility/kmousetool.nix
View File

@ -9,7 +9,8 @@ kde.package {
name = "kmousetool";
module = "kdeaccessibility";
version = "1.12";
release = "4.5.1";
release = "4.5.2";
versionFile = "kmousetool/kmousetool/version.h";
};
};
}

3
pkgs/desktops/kde-4.5/accessibility/kmouth.nix
View File

@ -9,7 +9,8 @@ kde.package {
name = "kmouth";
module = "kdeaccessibility";
version = "1.1.1";
release = "4.5.1";
release = "4.5.2";
versionFile = "kmouth/version.h";
};
};
}

2
pkgs/desktops/kde-4.5/admin/default.nix
View File

@ -20,7 +20,7 @@ kde.package {
license = "GPL";
kde = {
name = "kdeadmin";
version = "4.5.1";
version = "4.5.2";
};
};
}

2
pkgs/desktops/kde-4.5/artwork/aurorae.nix
View File

@ -8,7 +8,7 @@ kde.package rec {
kde = {
name = "aurorae";
module = "kdeartwork";
version = "4.5.1";
version = "4.5.2";
};
};
}

2
pkgs/desktops/kde-4.5/artwork/color-schemes.nix
View File

@ -9,7 +9,7 @@ kde.package rec {
kde = {
name = "ColorSchemes";
module = "kdeartwork";
version = "4.5.1";
version = "4.5.2";
};
};
}

2
pkgs/desktops/kde-4.5/artwork/desktop-themes.nix
View File

@ -9,7 +9,7 @@ kde.package rec {
kde = {
name = "desktopthemes";
module = "kdeartwork";
version = "4.5.1";
version = "4.5.2";
};
};
}

2
pkgs/desktops/kde-4.5/artwork/emoticons.nix
View File

@ -9,7 +9,7 @@ kde.package rec {
kde = {
name = "emoticons";
module = "kdeartwork";
version = "4.5.1";
version = "4.5.2";
};
};
}

2
pkgs/desktops/kde-4.5/artwork/high-resolution-wallpapers.nix
View File

@ -9,7 +9,7 @@ kde.package rec {
kde = {
name = "HighResolutionWallpapers";
module = "kdeartwork";
version = "4.5.1";
version = "4.5.2";
};
};
}

3
pkgs/desktops/kde-4.5/artwork/kscreensaver.nix
View File

@ -9,7 +9,8 @@ kde.package rec {
name = "kscreensaver";
module = "kdeartwork";
version = "1.0";
release = "4.5.1";
release = "4.5.2";
versionFile = "kscreensaver/kpartsaver/kpartsaver.cpp";
};
};
}

2
pkgs/desktops/kde-4.5/artwork/nuvola-icon-theme.nix
View File

@ -10,7 +10,7 @@ kde.package rec {
kde = {
name = "IconThemes";
module = "kdeartwork";
version = "4.5.1";
version = "4.5.2";
};
};
}

2
pkgs/desktops/kde-4.5/artwork/phase-style.nix
View File

@ -9,7 +9,7 @@ kde.package rec {
kde = {
name = "styles";
module = "kdeartwork";
version = "4.5.1";
version = "4.5.2";
};
};
}

2
pkgs/desktops/kde-4.5/artwork/sounds.nix
View File

@ -9,7 +9,7 @@ kde.package rec {
kde = {
name = "sounds";
module = "kdeartwork";
version = "4.5.1";
version = "4.5.2";
};
};
}

2
pkgs/desktops/kde-4.5/artwork/wallpapers.nix
View File

@ -9,7 +9,7 @@ kde.package rec {
kde = {
name = "wallpapers";
module = "kdeartwork";
version = "4.5.1";
version = "4.5.2";
};
};
}

2
pkgs/desktops/kde-4.5/artwork/weather-wallpapers.nix
View File

@ -9,7 +9,7 @@ kde.package rec {
kde = {
name = "WeatherWallpapers";
module = "kdeartwork";
version = "4.5.1";
version = "4.5.2";
};
};
}

2
pkgs/desktops/kde-4.5/base-runtime/default.nix
View File

@ -21,7 +21,7 @@ kde.package {
license = "LGPL";
kde = {
name = "kdebase-runtime";
version = "4.5.1";
version = "4.5.2";
};
};
}

2
pkgs/desktops/kde-4.5/base-workspace/default.nix
View File

@ -21,7 +21,7 @@ kde.package {
license = "GPL";
kde = {
name = "kdebase-workspace";
version = "4.5.1";
version = "4.5.2";
};
};
}

2
pkgs/desktops/kde-4.5/base/default.nix
View File

@ -13,7 +13,7 @@ kde.package {
license = "GPL";
kde = {
name = "kdebase";
version = "4.5.1";
version = "4.5.2";
};
};
}

2
pkgs/desktops/kde-4.5/bindings/default.nix
View File

@ -30,7 +30,7 @@ kde.package rec {
license = "LGPL";
kde = {
name = "kdebindings";
version = "4.5.1";
version = "4.5.2";
};
};
}

50
pkgs/desktops/kde-4.5/default.nix
View File

@ -1,6 +1,23 @@
{ callPackage, stdenv, fetchurl, qt47 } :
{ callPackage, recurseIntoAttrs, runCommand, stdenv, fetchurl, qt47 } :
{
let
version = "4.5.2";
# Various packages (e.g. kdesdk) have been split up into many
# smaller packages. Some people may want to install the entire
# package, so provide a wrapper package that recombines them.
combinePkgs = name: pkgs:
let pkgs' = stdenv.lib.attrValues pkgs; in
runCommand "${name}-${version}" ({ passthru = pkgs // { inherit pkgs; }; })
''
mkdir -p $out/nix-support
echo ${toString pkgs'} > $out/nix-support/propagated-user-env-packages
'';
in
recurseIntoAttrs rec {
recurseForRelease = true;
inherit callPackage stdenv;
@ -47,8 +64,8 @@
kdebase_runtime = callPackage ./base-runtime { };
### OTHER MODULES
kdeaccessibility = {
recurseForDerivations = true;
kdeaccessibility = combinePkgs "kdeaccessibility" {
colorSchemes = callPackage ./accessibility/color-schemes.nix { };
iconThemes = callPackage ./accessibility/icon-themes.nix { };
jovie = callPackage ./accessibility/jovie.nix { };
@ -58,8 +75,8 @@
};
kdeadmin = callPackage ./admin { };
kdeartwork = {
recurseForDerivations = true;
kdeartwork = combinePkgs "kdeartwork" {
aurorae = callPackage ./artwork/aurorae.nix { };
colorSchemes = callPackage ./artwork/color-schemes.nix { };
desktop_themes = callPackage ./artwork/desktop-themes.nix { };
@ -72,14 +89,15 @@
phase_style = callPackage ./artwork/phase-style.nix { };
kscreensaver = callPackage ./artwork/kscreensaver.nix { };
};
kdeedu = callPackage ./edu { };
kdegames = callPackage ./games { };
kdegraphics = callPackage ./graphics { };
kdemultimedia = callPackage ./multimedia { };
kdenetwork = callPackage ./network { };
kdeplasma_addons = callPackage ./plasma-addons { };
kdesdk = {
recurseForDerivations = true;
kdesdk = combinePkgs "kdesdk" {
cervisia = callPackage ./sdk/cervisia.nix { };
kapptemplate = callPackage ./sdk/kapptemplate.nix { };
kate = callPackage ./sdk/kate.nix { };
@ -101,14 +119,14 @@
scripts = callPackage ./sdk/scripts.nix { };
umbrello = callPackage ./sdk/umbrello.nix { };
};
kdetoys = {
recurseForDerivations = true;
kdetoys = combinePkgs "kdetoys" {
amor = callPackage ./toys/amor.nix { };
kteatime = callPackage ./toys/kteatime.nix { };
ktux = callPackage ./toys/ktux.nix { };
};
kdeutils = {
kdeutils = combinePkgs "kdeutils" {
ark = callPackage ./utils/ark.nix { };
kcalc = callPackage ./utils/kcalc.nix { };
kcharselect = callPackage ./utils/kcharselect.nix { };
@ -122,11 +140,9 @@
printer_applet = callPackage ./utils/printer-applet.nix { };
superkaramba = callPackage ./utils/superkaramba.nix { };
sweeper = callPackage ./utils/sweeper.nix { };
recurseForRelease = true;
};
kdewebdev = {
recurseForDerivations = true;
kdewebdev = combinePkgs "kdewebdev" {
klinkstatus = callPackage ./webdev/klinkstatus.nix { };
kommander = callPackage ./webdev/kommander.nix { };
kfilereplace = callPackage ./webdev/kfilereplace.nix { };
@ -139,9 +155,15 @@
# Experimental 4.5 versions
kdepim_runtime45 = callPackage ./pim-runtime45 { };
kdepim45 = callPackage ./pim45 { };
### DEVELOPMENT
kdebindings = callPackage ./bindings { };
l10n = callPackage ./l10n { };
# Make the split packages visible to `nix-env -q'.
misc = recurseIntoAttrs
(kdeaccessibility.pkgs // kdeartwork.pkgs // kdesdk.pkgs // kdetoys.pkgs // kdeutils.pkgs // kdewebdev.pkgs);
}

2
pkgs/desktops/kde-4.5/edu/default.nix
View File

@ -23,7 +23,7 @@ kde.package {
license = "GPL";
kde = {
name = "kdeedu";
version = "4.5.1";
version = "4.5.2";
};
};
}

2
pkgs/desktops/kde-4.5/games/default.nix
View File

@ -16,7 +16,7 @@ kde.package {
license = "GPL";
kde = {
name = "kdegames";
version = "4.5.1";
version = "4.5.2";
};
};
}

2
pkgs/desktops/kde-4.5/graphics/default.nix
View File

@ -17,7 +17,7 @@ kde.package {
license = "GPL";
kde = {
name = "kdegraphics";
version = "4.5.1";
version = "4.5.2";
};
};
}

83
pkgs/desktops/kde-4.5/kde-package/manifest.nix
View File

@ -99,4 +99,85 @@ builtins.listToAttrs
{
name = "kdepim-runtime-4.4.6.tar.bz2";
value = "1y0xxwsq9wlwbkd661i4f1iqvpzg3sbi3lq9dir45fjx406chgmd";
}]
}
{
name = "kdeaccessibility-4.5.2.tar.bz2";
value = "1iv94vvngxs94vl3ssjq1y2sd50wcc7s7gvngwqj534qjd1fj3a2";
}
{
name = "kdeadmin-4.5.2.tar.bz2";
value = "1gy0p9vfx8k1ni92n6p8fhq32i7dazs2vls7f5na8hc6s5wsn861";
}
{
name = "kdeartwork-4.5.2.tar.bz2";
value = "0y7rj70x861a07r80skldzkkbqhh41gsv2vh8cg1n4hqq4l5nj5y";
}
{
name = "kdebase-4.5.2.tar.bz2";
value = "1hwcd3k25bhi73hps4rqc3rh87sdf8syvv0jx4prc6qd2cpjxvp6";
}
{
name = "kdebase-runtime-4.5.2.tar.bz2";
value = "04dbjhkl1zfys6rhjrk3dmqqwzw4hh0hyrm6rn8f1gbiqfcgrkfy";
}
{
name = "kdebase-workspace-4.5.2.tar.bz2";
value = "17jd2ixvsk9f0z30ksmjaasdfza39c80d0ylzkpdjf9nkiiv1pn8";
}
{
name = "kdebindings-4.5.2.tar.bz2";
value = "077n2g4mmfkg7xvz7v8f0m79sp2f72f56ari14j4x073vgf51hfs";
}
{
name = "kdeedu-4.5.2.tar.bz2";
value = "1ljp5jm5iml2s1jdi1n5h8hzqsl7pq98vcdj9bi1pjq3l87gh4i5";
}
{
name = "kdegames-4.5.2.tar.bz2";
value = "0vld69dz2src7ya92a5nqi0739whldxvgphyxm9bavk69x6g129c";
}
{
name = "kdegraphics-4.5.2.tar.bz2";
value = "0zl1df2srnf7xsivyws3zicrj6bginjn6rgi0iq6hx3q9l5lah2d";
}
{
name = "kdelibs-4.5.2.tar.bz2";
value = "1hxlqvcwys1snhahrv1lryv95sh042jikscqmm6vind03pcqrq09";
}
{
name = "kdemultimedia-4.5.2.tar.bz2";
value = "1gxmal28m83r9imasv3nw4c091kllpkivfws8aal63r0dg5n5fy2";
}
{
name = "kdenetwork-4.5.2.tar.bz2";
value = "0k59zf8m34b7xp4h9mj328gjnr73l2d7vf4b4aikv0m2damryp7a";
}
{
name = "kdepimlibs-4.5.2.tar.bz2";
value = "0bag9jhr1azadcz01rfdhdl8nfk6w4cjw3w2zxardar5ri129v2b";
}
{
name = "kdeplasma-addons-4.5.2.tar.bz2";
value = "1pdlwbadk3qyh9rxj4j2b2wjfn7dmi9jcargahc7p7pb8mf0pizw";
}
{
name = "kdesdk-4.5.2.tar.bz2";
value = "0ii7gmshw4207i0hlzz3fl5kc21i4vx2v29jw10ri1vz7pmv9v9q";
}
{
name = "kdetoys-4.5.2.tar.bz2";
value = "01kn14lh00ig33r98xjly37ad7w1cwvc4l02hswbqr99smksxn33";
}
{
name = "kdeutils-4.5.2.tar.bz2";
value = "1rh4s60wx253adw7z1j0sp29l43y7xvd2516bwxq0sn8bmp3w7nr";
}
{
name = "kdewebdev-4.5.2.tar.bz2";
value = "02baf8h4v688x03hxr8kliglia1chlarnmzc0gbpnpry9zhwpp5p";
}
{
name = "oxygen-icons-4.5.2.tar.bz2";
value = "0c8hy3vsqpm6n52v6w3igj78s0qy6cb3m6fm8qh795rpw495d5yj";
}
]

51
pkgs/desktops/kde-4.5/l10n/default.nix
View File

@ -3,18 +3,24 @@
let
overrides = { };
defaultVersion = "4.5.1";
defaultRelease = "4.5.2";
releases = [ "4.5.1" "4.5.2" ];
getOverride = name: stdenv.lib.attrByPath [name] {} overrides;
sanitizeString = replaceChars [ "@" "." ] [ "_" "_" ];
getOverride = name: attrByPath [name] {} overrides;
kdeL10nDerivation = {lang, sha256, version} :
inherit (stdenv.lib) replaceChars attrByPath singleton;
kdeL10nDerivation = {lang, sha256, release} :
let
name = "kde-l10n-${lang}-${version}";
name = "kde-l10n-${lang}-${release}";
saneName = "kde-l10n-${sanitizeString lang}-${release}";
in
stdenv.mkDerivation ({
inherit name;
name = saneName;
src = fetchurl {
url = "mirror://kde/stable/${version}/src/kde-l10n/${name}.tar.bz2";
url = "mirror://kde/stable/${release}/src/kde-l10n/${name}.tar.bz2";
name = "${saneName}.tar.bz2";
inherit sha256;
};
@ -28,24 +34,25 @@ let
}
// (getOverride lang) // (getOverride name)
);
kdeL10nRelease = release:
let
releaseStr = sanitizeString release;
in
builtins.listToAttrs (
map ({lang, sha256}:
{
name = "${sanitizeString lang}";
value = kdeL10nDerivation { inherit lang release sha256;};
}
) (import (./manifest + "-${release}.nix"))
);
in
{
inherit kdeL10nDerivation;
recurseForDerivations = true;
}
// (builtins.listToAttrs (
map (a@{lang, version, sha256} :
{
name = stdenv.lib.replaceChars ["." "@"] ["_" "_"] "${lang}_${version}";
value = kdeL10nDerivation a;
}
) (import ./manifest.nix)
))
// (builtins.listToAttrs (
map (a@{lang, version, sha256} :
{
name = stdenv.lib.replaceChars ["." "@"] ["_" "_"] "${lang}";
value = kdeL10nDerivation a;
}
) (stdenv.lib.filter (x : x.version == defaultVersion) (import ./manifest.nix))
))
// builtins.listToAttrs (map (r : { name = sanitizeString r; value =
kdeL10nRelease r; }) releases)
// (kdeL10nRelease defaultRelease)

34
pkgs/desktops/kde-4.5/l10n/l10n-manifest.sh Executable file
View File

@ -0,0 +1,34 @@
#!/bin/sh
# Usage: download kde-l10n to $dir, then run
# $0 $dir
dir=$1
if [[ ! -d "${dir}" ]]; then
echo "${dir} is not a directory (or doesn't exist)!" >&2
exit 1
fi
release=$(ls "${dir}"/kde-l10n-en_GB-*.tar.bz2 | \
sed -e 's/.*en_GB-//' -e 's/\.tar\.bz2//')
echo "Detected release ${release}" >&2
exec > "manifest-${release}.nix"
echo "["
for i in `cd "${dir}"; ls kde-l10n-*-${release}.tar.bz2`; do
lang=${i%-${release}.tar.bz2}
lang=${lang#kde-l10n-}
echo -n "${lang}.. " >&2
hash=$(nix-hash --type sha256 --flat --base32 "${dir}/${i}")
echo "{"
echo " lang = \"${lang}\";"
if [[ "${lang}" =~ "@" ]]; then
echo " langStripped = \"${lang/@/_}\";"
fi
echo " sha256 = \"${hash}\";"
echo "}"
echo $hash >&2
done
echo "]"

54
pkgs/desktops/kde-4.5/l10n/manifest.nix → pkgs/desktops/kde-4.5/l10n/manifest-4.5.1.nix
View File

@ -1,272 +1,218 @@
[
{
lang = "ar";
version = "4.5.1";
sha256 = "0xgmrwlza3p2fvj66y4vc4r81r5y2n2igjaj2xmgvb2pvh4zx0ws";
}
{
lang = "bg";
version = "4.5.1";
sha256 = "1npa9y8i7j68c8sa9cd96gy4n65bkl474agibax8rdk2mniyqrn9";
}
{
lang = "ca";
version = "4.5.1";
sha256 = "0097sk50cf1cq6wnah3kiab8vkh68snzahcng2blk63gw908yfvx";
}
{
lang = "cs";
version = "4.5.1";
sha256 = "077424cbqn68rf9wb026ip1n0rq5lz1iwp4k7ih15j87ymbrd03f";
}
{
lang = "da";
version = "4.5.1";
sha256 = "0p80a2pn9hgih2y5s27z8ir8jkyz68i87sdw439c8z3pjww5dy2h";
}
{
lang = "de";
version = "4.5.1";
sha256 = "007r6wf0in22y2jc1nr1msazv6bd48136kc4q0633gn1igdhb03h";
}
{
lang = "el";
version = "4.5.1";
sha256 = "1ffgqjxgdfsjx0nwhj5yl2pn2kmc92s01wfxzdvb6kss9r53v95k";
}
{
lang = "en_GB";
version = "4.5.1";
sha256 = "1bmg1aygaarnpka9dfvxgnzwqphqaly8rfps63g03ncls7ml8ilb";
}
{
lang = "eo";
version = "4.5.1";
sha256 = "0bqrarah2pc6kjcfla117rwc0k1m23ndp4nm4ac2sygmanz1j6bk";
}
{
lang = "es";
version = "4.5.1";
sha256 = "0hr3halsjjdzlmx2rfxycacm26pxs1f3m8awahmr1dp5ngid42wn";
}
{
lang = "et";
version = "4.5.1";
sha256 = "1pj1wjnjjj052csn0ajql2i3ynpd4fc9l53zj4j3vsd177gypdjw";
}
{
lang = "eu";
version = "4.5.1";
sha256 = "0zhrqy8b7wn8vdq75dlafc91mhvqpn3cw7hn90jj99c1aazdhjpd";
}
{
lang = "fi";
version = "4.5.1";
sha256 = "0x0dhy1c7wn5wxqx2v7jyv10rc6gi6klmw0q80vp3xpfma9l16yg";
}
{
lang = "fr";
version = "4.5.1";
sha256 = "1yvzpvxdzznrj61hdbi9jgpxdb9l0i8g24q1xkswpnp87jrncpaq";
}
{
lang = "fy";
version = "4.5.1";
sha256 = "14c740yfw5v043rmqmwnb3ic0s7l2kcjy57qdqhfpmr75m4rjrvl";
}
{
lang = "ga";
version = "4.5.1";
sha256 = "0w5cj0bgyy2pna8hqcpx82n3pwzr9vzshzknz86azb8c0pwkcjdw";
}
{
lang = "gl";
version = "4.5.1";
sha256 = "00kwqzypkw0bi8nhz75a367h2filwkmc1kiiv66l2s3d4vrkdgjz";
}
{
lang = "gu";
version = "4.5.1";
sha256 = "0as072rz4k4h8b0ix8jipn6bfck8van024sz1gd6xj1bhs83wk0m";
}
{
lang = "he";
version = "4.5.1";
sha256 = "1f5j1qgkmzjagmyjxa00xmfxk5zgfms77gidg88hycrvgrxm6g59";
}
{
lang = "hi";
version = "4.5.1";
sha256 = "0sy6cis0hkddmq4jw43a7rpxjadmzrgbgyhnnhyp9m6n225rh54g";
}
{
lang = "hr";
version = "4.5.1";
sha256 = "016h7iqfkarl6p20gqcajknw3bsbqvby824fsdyrrhan82vsqd0k";
}
{
lang = "hu";
version = "4.5.1";
sha256 = "1ck6vrrvvwlcxlgmmjq4hk5dh38clqvf3fwc7ndgr4wrxlr4c94m";
}
{
lang = "ia";
version = "4.5.1";
sha256 = "13mnd7ndkfdq591da3cwj64wchq86qk265i6r7xir87gxn5m86xr";
}
{
lang = "id";
version = "4.5.1";
sha256 = "0a1rw0mx1fdmps5vfx7m8mrmsqvqkpdbpbwys9sxbxy1zcbinasr";
}
{
lang = "is";
version = "4.5.1";
sha256 = "0hinhxsq4nm4g97gcdfyx8fzx6d0syg9llww9spwpqp26myad69r";
}
{
lang = "it";
version = "4.5.1";
sha256 = "0z4kdlmyliqa6qgdxbimifp535p6nvvydpa504i9klxcywc382y5";
}
{
lang = "ja";
version = "4.5.1";
sha256 = "1vsyjgwh69wwadn27ncxmr85d1qn91xvrbfxxl8x9gqa44dzrs7k";
}
{
lang = "kk";
version = "4.5.1";
sha256 = "1nzx2djxav6hga6ha473xkqiqgv8ikh3iq3b7i20zqcsjp3lhynq";
}
{
lang = "km";
version = "4.5.1";
sha256 = "0rd36apjlgq3qvhbdq0a289hbn1hff1qbnphaisy1p1dsh3bbnw9";
}
{
lang = "kn";
version = "4.5.1";
sha256 = "0al7whnmcpiq50b56xhzxpd6zmwv79s5j62m6z537kl3ldq9is5l";
}
{
lang = "ko";
version = "4.5.1";
sha256 = "0s5y6h8nx4xp5vd39qpby303zsvi67yrbdzsgvig98gbw61szkd7";
}
{
lang = "lt";
version = "4.5.1";
sha256 = "0wmwfn7w6z1lvjgn283rcpxv8j6lh8yzkvgjmhdg2r4ys948gzz0";
}
{
lang = "lv";
version = "4.5.1";
sha256 = "1w4k7rr06m0ynl52gdikqw45754pj7z9n65pxyv88gxj5sjkzlw8";
}
{
lang = "ml";
version = "4.5.1";
sha256 = "1qgs6xwyx1sc496ybq1m1mm0wyl9fz6317p4m5jvwiicldrcx3hq";
}
{
lang = "nb";
version = "4.5.1";
sha256 = "0frnnxang8k491cnmn9lc2kbqkqr5m40c53d75l07j97jndv98y1";
}
{
lang = "nds";
version = "4.5.1";
sha256 = "1p3h86qzrrhxrvl4qryizm3j6lnq3lm1vpnnapkk04y7msz0fdpr";
}
{
lang = "nl";
version = "4.5.1";
sha256 = "0lphl2j0faalaj3mkkqv5806bg2fd6s1478cprrrkw788hvvlmzl";
}
{
lang = "nn";
version = "4.5.1";
sha256 = "06pj24zfsgbkk1jxjjs5by8czv0llfz90iq6rq4lxnc0s195isjg";
}
{
lang = "pa";
version = "4.5.1";
sha256 = "1sqqanvxzw63bdlkgvi6jlngvrshqrfl8d0jac103wvy4y4f6l5r";
}
{
lang = "pl";
version = "4.5.1";
sha256 = "13n278n3p32bphch54x7qgba268m95kmql3qgxsx8ziy8riir9mm";
}
{
lang = "pt";
version = "4.5.1";
sha256 = "12mkprpk9imda0iyi65mg4rs3w2qnyq8iszg0k7yqf7537zpv4x1";
}
{
lang = "pt_BR";
version = "4.5.1";
sha256 = "1ipn6kvc3nq84fvpb9xrpwkqjaj2sya3y1cr2ai51909yfjk5r35";
}
{
lang = "ro";
version = "4.5.1";
sha256 = "1kfyjlpkjnmv7fryr1w2a9d1dijkmhs3mqpqg0hi7316qy2z10jy";
}
{
lang = "ru";
version = "4.5.1";
sha256 = "0m62rszff2k4rffmy3h9hxhs8bf523cfinlyay663zq3bh35i6h9";
}
{
lang = "sk";
version = "4.5.1";
sha256 = "07pzslmln8yh0s8ik0bj86rhyy4w21w13pvf9z6ifapqigklw33c";
}
{
lang = "sl";
version = "4.5.1";
sha256 = "1vrdzbl5ii6paaick88dkr5fabjpi36gjwwz67kqy6d9nm44jjp1";
}
{
lang = "sr";
version = "4.5.1";
sha256 = "186ncq0hr0lrn1l6xhqwjwqrmd9xw9qa0kf9cqvj0x3j6qk4mjqf";
}
{
lang = "sv";
version = "4.5.1";
sha256 = "0r62fs75a1kfr2dsfg1zrzh0c2wgbv6jq4c1w05wcbmqvpq16ks6";
}
{
lang = "th";
version = "4.5.1";
sha256 = "1apvlcmbwhnjc3dlfjzah1ckwwhjn2rcrvgmv1rwvn9py7yfzhf5";
}
{
lang = "tr";
version = "4.5.1";
sha256 = "0zci2fqcnlj9y23sy7v8yb1nc37dfqbpj1xrfs7sfvhj12048sb0";
}
{
lang = "uk";
version = "4.5.1";
sha256 = "0p9jdz8w8xiiqhbsj90gkshcpijh2l8hfbvvqy12d1nx5wb1glp3";
}
{
lang = "wa";
version = "4.5.1";
sha256 = "06hybn2l2jlibxr6lg91p0p7nnc6lyisx0w64zar52h958mqa9p8";
}
{
lang = "zh_CN";
version = "4.5.1";
sha256 = "1f786n41yqfi02gd0n9lf30xn9djgbm26c8kqx8p7fm2b5vw28jh";
}
{
lang = "zh_TW";
version = "4.5.1";
sha256 = "065d2ggahphsffk7p8xb9p5xzm12azz84s9jll447sawwks0jgsg";
}
]

222
pkgs/desktops/kde-4.5/l10n/manifest-4.5.2.nix Normal file
View File

@ -0,0 +1,222 @@
[
{
lang = "ar";
sha256 = "1wlg38gfv77d4rfzr6ba8mcrbq1lsgvqpd1zgcfgv9m6c5i32rh0";
}
{
lang = "bg";
sha256 = "0dy2zirfs2aan445862srfrxkvmv9l6dk1qzk2mis8lmq7qnvv4x";
}
{
lang = "ca";
sha256 = "0ay15k75d44ggr6s5qxip7cwyddl91zlqgwnp71iw720iq49d4c1";
}
{
lang = "ca@valencia";
sha256 = "0fmcmpm3wi1qfd0lvd10d0crn7jfzf9n184x45fvqw4dkn62phdc";
}
{
lang = "cs";
sha256 = "0r06qh0i3il2n07bbp70gsr5p7y5gb9gd1gzy5m5g33mmnhgf2af";
}
{
lang = "da";
sha256 = "1dz2ixm42ndyqwjs6h3900ycq9j50l0nzahxmjfm76b9r2cbph6g";
}
{
lang = "de";
sha256 = "1729hhfwszairx08x0s5rbidrbxqqvlh1m6rww2j1bqv5krgadns";
}
{
lang = "el";
sha256 = "1is7vy7m0y3x6n5llcg4fz8qd6ddjvfxriyggw9kx1g661z25gny";
}
{
lang = "en_GB";
sha256 = "0nwgj99y13h3fc6ljmnmrxaj3aiwg031p4nrb49ngmh66r1c3n2r";
}
{
lang = "eo";
sha256 = "0w78f6n2nhalgj7i997hrkka9i252mrny8mgnq8bfwsr03lfjs9h";
}
{
lang = "es";
sha256 = "18cqvjw7f9kj0inhhw00b6jxgsikamr0iik7pbblra2shimpr9hh";
}
{
lang = "et";
sha256 = "1zrdywhc34kj09141ybr5g98bf1zqrxzazsdi51ln07pcmbrn7fd";
}
{
lang = "eu";
sha256 = "03ff2narllyjyl7ddqq80i88m10ma1g9l0k970vpakw2bk3qd90c";
}
{
lang = "fi";
sha256 = "0kpzsngspxgfgy2fdghb7syksrs4h3392xngl7g1ndr6m9wfrl33";
}
{
lang = "fr";
sha256 = "042jbsr7agkikyj4f3wz6vbwgalmkq75sxm9mr0hspaxqw0rdww5";
}
{
lang = "fy";
sha256 = "0yvqi4z98aql596pa77blrj34mxhv3q04nbp4mdiss9i6wkqxa56";
}
{
lang = "ga";
sha256 = "14s90f9nlk2knkf8lsxklkval39gb77ca70hcs4n571hl3hdvpd7";
}
{
lang = "gl";
sha256 = "0xh409ydzqzsbwq7727i5yj6irb2y75maa7kkvm9bmhpb5whn0k6";
}
{
lang = "gu";
sha256 = "1agly26l4z5lc0s1b4j5rdpdk9sf0ffw9zp8j4mvaz501aifq777";
}
{
lang = "he";
sha256 = "0z2czis29bqga9jzgrdzqf85f6k14gr1rcyawhc6ddffmb5is8pj";
}
{
lang = "hi";
sha256 = "0f1j6682pfajg7dlf2rqqif5s8w00wpjr688kchqdsld7byax4wf";
}
{
lang = "hr";
sha256 = "126f04zgnha153yzmq5263chwiz2lv910sgrh23a07k6piip20wi";
}
{
lang = "hu";
sha256 = "10cwzpsq42vkyb4x7sc406pjf3ryr5api0cr9vwhnnqprwr82yw3";
}
{
lang = "ia";
sha256 = "0gd6li2iy1l0bg9kvs19hsxlrqzfa92if7j9g90l8qml1xg0d916";
}
{
lang = "id";
sha256 = "1rz8h2yna7hyvv2bynf0q5zz42qs74y6z4y2ca92b0qfc4a1ai1d";
}
{
lang = "is";
sha256 = "1lkr67dlpskj141y7wihxdgnmkag1dalb8s0r1xixf051ax2wd2y";
}
{
lang = "it";
sha256 = "1pz0mlg1p9mrqb79m7dsm6lk8iicyc8jwbrvrhlsji6ahr81pybk";
}
{
lang = "ja";
sha256 = "12333ilhd67y8gkddpx7jzdvs10h66qi8qi4nrqb6ici6spxmb3i";
}
{
lang = "kk";
sha256 = "0q845ix7kadfsphvfdkz7fawh3zqmainsw321mn90n6izf8y893j";
}
{
lang = "km";
sha256 = "0ahmw632kqclplq5d65inglhvn5jzxdjhhpkqx32rq7sxk3qhhrf";
}
{
lang = "kn";
sha256 = "12lp3rbcxbqm27clm71vli2pdwyp8r2bk3a2mmvnv016pjn0vphn";
}
{
lang = "ko";
sha256 = "12fb0wqms571xp9mnyiv61khby71cwsf9sg05w0gjci7avwxv6w0";
}
{
lang = "lt";
sha256 = "1p2rg1w3b6qgzjhsmi8dsj3mh7n8wbkgp9hrwbsl8dj7l6yz9799";
}
{
lang = "lv";
sha256 = "0zm48nl504dwwsrn8b44ldh0dzj7j42v6r54bsfsqajzq7f857yi";
}
{
lang = "ml";
sha256 = "0wxsfykvsg1iz0az1jngdl26sgs73pv0si30n0835xzclcv4dflx";
}
{
lang = "nb";
sha256 = "1040i62nh9ldv2v5ps483r6ccp2jy6w94kijv5h01k2p82iv8f85";
}
{
lang = "nds";
sha256 = "1ljgdlrqwb966xpxg2fpjcqzmplhdbmd566q7k69x5fmmyxw7vn9";
}
{
lang = "nl";
sha256 = "08vwq4xy392bqln31lvbdgzhx50sj44mrnw920j6k2a0f1qmkar7";
}
{
lang = "nn";
sha256 = "1da0xrbx8p72lp6r4nrhh6q5sgfm08vak6dk9g3kssjgnjarg785";
}
{
lang = "pa";
sha256 = "05jkc60csj16gxxh6z5n15g65yqf2nd77sa8f00vjhx58iisvvb2";
}
{
lang = "pl";
sha256 = "0hi7dsrg7dln9nkfc1wichmn334303qxdkihv13fybw43xp3gznv";
}
{
lang = "pt";
sha256 = "17j0angzvv2mxj12jb7vv3dlmljrfhyki5clmj040z64siam0w4k";
}
{
lang = "pt_BR";
sha256 = "1c6i79bslyzz0skfh05152jxn5hqlbas2l9fgzh58amn5bgy6afg";
}
{
lang = "ro";
sha256 = "1yljfz3b7lnnlnwvqf71b22ss99an759hg3xky1nzq11kpp9a5y0";
}
{
lang = "ru";
sha256 = "0p1zp2bgz3afxq4r6cbr1sv56ymq0xvn249vi048knsa2sclq8bk";
}
{
lang = "sk";
sha256 = "1v6lx4jb78k44xgfdxih1mf1817piw1igmvkc39l7r8ci0drvdjx";
}
{
lang = "sl";
sha256 = "1xqyafbzas460p7vxvydw8k8gzsgaxsidy19hzanvdb5ns4j8fs2";
}
{
lang = "sr";
sha256 = "1yznci299164l89dq9k5wfahk5aw3y61i4bf08qn6zi5hmzsfv66";
}
{
lang = "sv";
sha256 = "1k5b9f9i5zn8j5nkafw4cl42rvigssz5fqmy0nv1awj87r9vd3x6";
}
{
lang = "th";
sha256 = "0l25jags9kfhnr0v8k5id2pl85rlxly5a74i94wzvnf0abkmy6hi";
}
{
lang = "tr";
sha256 = "166rw0znk906zikdxg573xykfxmwdnld2ps9c0y758n6mvl107xz";
}
{
lang = "uk";
sha256 = "1hlx3dnf3avcnfs55v0vq9knmf001hs00fd4rqigx8y09i8947jc";
}
{
lang = "wa";
sha256 = "17i73mmc1vwvjwrvz9sq45q0ax43xq3agi2d95s772kpbrf4l8qj";
}
{
lang = "zh_CN";
sha256 = "1xqi0rn36dm7f4j5x9gdk6ml8y3vzzm009qp8algqrzy46j864cz";
}
{
lang = "zh_TW";
sha256 = "1qh3vnpk6ickdqa8n9h1na16s6q7kr61f44b0qymxz2lw79ihhgz";
}
]

11
pkgs/desktops/kde-4.5/libs/default.nix
View File

@ -2,7 +2,7 @@
, qt4, bzip2, pcre, fam, libxml2, libxslt, shared_mime_info, giflib, jasper
, xz, flex, bison, openexr, aspell, avahi, kerberos, acl, attr, shared_desktop_ontologies, libXScrnSaver
, automoc4, strigi, soprano, qca2, attica, enchant, libdbusmenu_qt
, docbook_xml_dtd_42, docbook_xsl, polkit_qt_1
, docbook_xml_dtd_42, docbook_xsl, polkit_qt_1, hspell
}:
kde.package {
@ -10,9 +10,14 @@ kde.package {
buildInputs = [
cmake perl xz flex bison bzip2 pcre fam libxml2 libxslt shared_mime_info
giflib jasper /*openexr*/ aspell avahi kerberos acl attr libXScrnSaver
enchant libdbusmenu_qt polkit_qt_1 automoc4
enchant libdbusmenu_qt polkit_qt_1 automoc4 hspell
];
# TODO: make sonnet plugins (dictionaries) really work.
# There are a few hardcoded paths.
# Let kdelibs find openexr
# Split plugins from libs?
propagatedBuildInputs = [ qt4 gcc.libc strigi soprano attica qca2
shared_desktop_ontologies ];
@ -31,7 +36,7 @@ kde.package {
license = "LGPL";
kde = {
name = "kdelibs";
version = "4.5.1";
version = "4.5.2";
};
};
}

1
pkgs/desktops/kde-4.5/libs/polkit-install.patch
View File

@ -1,6 +1,7 @@
Author: Yury Kudryashov
Reason: other KDE modules try to install polkit action files into
$kdelibs/share/polkit-1/actions
Upstream: rejected, they propose to set install dir in each package
--- 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 @@

2
pkgs/desktops/kde-4.5/multimedia/default.nix
View File

@ -14,7 +14,7 @@ kde.package {
license = "GPL";
kde = {
name = "kdemultimedia";
version = "4.5.1";
version = "4.5.2";
};
};
}

4
pkgs/desktops/kde-4.5/network/default.nix
View File

@ -21,7 +21,7 @@ kde.package {
# * 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
# Let cmake find libktorrent. Waiting for upstream fix
KDEDIRS="${libktorrent}";
meta = {
@ -30,7 +30,7 @@ kde.package {
license = "GPL";
kde = {
name = "kdenetwork";
version = "4.5.1";
version = "4.5.2";
};
};
}

2
pkgs/desktops/kde-4.5/pimlibs/default.nix
View File

@ -12,7 +12,7 @@ kde.package {
license = "LGPL";
kde = {
name = "kdepimlibs";
version = "4.5.1";
version = "4.5.2";
};
};
}

2
pkgs/desktops/kde-4.5/plasma-addons/default.nix
View File

@ -17,7 +17,7 @@ kde.package {
license = "GPL";
kde = {
name = "kdeplasma-addons";
version = "4.5.1";
version = "4.5.2";
};
};
}

5
pkgs/desktops/kde-4.5/sdk/cervisia.nix
View File

@ -3,15 +3,14 @@
kde.package {
buildInputs = [ cmake kdelibs automoc4 ];
patches = [ ./optional-docs.diff ];
meta = {
description = "A KDE CVS frontend";
kde = {
name = "cervisia";
module = "kdesdk";
version = "3.5.0";
release = "4.5.1";
release = "4.5.2";
versionFile = "cervisia/version.h";
};
};
}

4
pkgs/desktops/kde-4.5/sdk/dolphin-plugins.nix
View File

@ -4,15 +4,13 @@ kde.package {
# Needs kdebase for libkonq
buildInputs = [ cmake kdelibs automoc4 kdebase ];
patches = [ ./optional-docs.diff ];
meta = {
description = "Git and Svn plugins for dolphin";
kde = {
name = "dolphin-plugins";
module = "kdesdk";
version = "3.5.0";
release = "4.5.1";
version = "4.5.2";
};
};
}

4
pkgs/desktops/kde-4.5/sdk/kapptemplate.nix
View File

@ -3,7 +3,6 @@
kde.package {
buildInputs = [ cmake kdelibs automoc4 ];
patches = [ ./optional-docs.diff ];
meta = {
description = "A KDE 4 project template generator";
@ -11,7 +10,8 @@ kde.package {
name = "kapptemplate";
module = "kdesdk";
version = "0.1";
release = "4.5.1";
release = "4.5.2";
versionFile = "kapptemplate/main.cpp";
};
};
}

5
pkgs/desktops/kde-4.5/sdk/kate.nix
View File

@ -3,15 +3,14 @@
kde.package {
buildInputs = [ cmake kdelibs automoc4 shared_mime_info ];
patches = [ ./optional-docs.diff ];
meta = {
description = "Kate - Advanced Text Editor";
kde = {
name = "kate";
module = "kdesdk";
version = "3.5.1";
release = "4.5.1";
version = "3.5.2"; # (release.major-1).(release.minor).(release.patch)
release = "4.5.2";
};
};
}

4
pkgs/desktops/kde-4.5/sdk/kbugbuster.nix
View File

@ -3,7 +3,6 @@
kde.package {
buildInputs = [ cmake kdelibs automoc4 kdepimlibs ];
patches = [ ./optional-docs.diff ];
meta = {
description = "KDE bugzilla client";
@ -11,7 +10,8 @@ kde.package {
name = "kbugbuster";
module = "kdesdk";
version = "3.80.3";
release = "4.5.1";
release = "4.5.2";
versionFile = "version.h";
};
};
}

4
pkgs/desktops/kde-4.5/sdk/kcachegrind.nix
View File

@ -3,7 +3,6 @@
kde.package {
buildInputs = [ cmake kdelibs automoc4 ];
patches = [ ./optional-docs.diff ];
meta = {
description = "KDE Frontend for Callgrind/Cachegrind";
@ -11,7 +10,8 @@ kde.package {
name = "kcachegrind";
module = "kdesdk";
version = "0.6";
release = "4.5.1";
release = "4.5.2";
versionFile = "CMakeLists.txt";
};
};
}

3
pkgs/desktops/kde-4.5/sdk/kdeaccounts-plugin.nix
View File

@ -3,14 +3,13 @@
kde.package {
buildInputs = [ cmake kdelibs automoc4 kdepimlibs ];
patches = [ ./optional-docs.diff ];
meta = {
description = "KDE accounts akonadi agent";
kde = {
name = "kdeaccounts-plugin";
module = "kdesdk";
version = "4.5.1";
version = "4.5.2";
};
};
}

4
pkgs/desktops/kde-4.5/sdk/kioslave-perldoc.nix
View File

@ -3,7 +3,6 @@
kde.package {
buildInputs = [ cmake kdelibs automoc4 perl ];
patches = [ ./optional-docs.diff ];
cmakeFlags = "-DBUILD_kioslave=ON -DBUILD_perldoc=ON";
meta = {
@ -12,7 +11,8 @@ kde.package {
name = "kioslave-perldoc";
module = "kdesdk";
version = "0.9.1";
release = "4.5.1";
release = "4.5.2";
versionFile = "kioslave/perldoc/perldoc.cpp";
};
};
}

4
pkgs/desktops/kde-4.5/sdk/kioslave-svn.nix
View File

@ -3,7 +3,7 @@
kde.package {
buildInputs = [ cmake kdelibs automoc4 subversion apr aprutil ];
patches = [ ./optional-docs.diff ./find-svn.patch ];
patches = [ ./find-svn.patch ];
cmakeFlags = "-DBUILD_kioslave=ON";
meta = {
@ -11,7 +11,7 @@ kde.package {
kde = {
name = "kioslave-svn";
module = "kdesdk";
version = "4.5.1";
version = "4.5.2";
};
};
}

3
pkgs/desktops/kde-4.5/sdk/kmtrace.nix
View File

@ -4,14 +4,13 @@ kde.package {
buildInputs = [ cmake kdelibs automoc4 ];
preConfigure="export CMAKE_PREFIX_PATH=$CMAKE_PREFIX_PATH:${gcc}:${gcc.gcc}";
patches = [ ./optional-docs.diff ];
meta = {
description = "KDE mtrace-based malloc debuger";
kde = {
name = "kmtrace";
module = "kdesdk";
version = "4.5.1";
version = "4.5.2";
};
};
}

4
pkgs/desktops/kde-4.5/sdk/kompare.nix
View File

@ -3,7 +3,6 @@
kde.package {
buildInputs = [ cmake kdelibs automoc4 ];
patches = [ ./optional-docs.diff ];
meta = {
description = "A program to view the differences between files and optionally generate a diff";
@ -11,7 +10,8 @@ kde.package {
name = "kompare";
module = "kdesdk";
version = "4.0.0";
release = "4.5.1";
release = "4.5.2";
versionFile = "main.cpp";
};
};
}

4
pkgs/desktops/kde-4.5/sdk/kpartloader.nix
View File

@ -3,7 +3,6 @@
kde.package {
buildInputs = [ cmake kdelibs automoc4 ];
patches = [ ./optional-docs.diff ];
meta = {
description = "A test application for KParts";
@ -11,7 +10,8 @@ kde.package {
name = "kpartloader";
module = "kdesdk";
version = "1.0";
release = "4.5.1";
release = "4.5.2";
versionFile = "kpartloader.cpp";
};
};
}

3
pkgs/desktops/kde-4.5/sdk/kprofilemethod.nix
View File

@ -3,7 +3,6 @@
kde.package {
buildInputs = [ cmake kdelibs automoc4 ];
patches = [ ./optional-docs.diff ];
meta = {
description = "A macros for profiling using QTime";
@ -11,7 +10,7 @@ kde.package {
kde = {
name = "kprofilemethod";
module = "kdesdk";
version = "4.5.1";
version = "4.5.2";
};
};
}

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