Updating from trunk.
svn path=/nixpkgs/branches/stdenv-updates/; revision=23840
This commit is contained in:
commit
2c5de61327
maintainers/scripts/gnu
pkgs
applications
audio
editors/emacs-modes
misc
networking
browsers
ekiga
instant-messengers/gajim
ktorrent
mailreaders/mutt
msmtp
sniffers/wireshark
science
electronics/kicad
logic
version-management
git-and-tools
monotone
veracity
video/gnome-mplayer
virtualization
window-managers
build-support
data/documentation/man-pages
desktops
gnome-2.28
kde-4.4
kde-4.5
accessibility
admin
artwork
FindXscreensaver.cmakeaurorae.nixcolor-schemes.nixdefault.nixdesktop-themes.nixemoticons.nixhigh-resolution-wallpapers.nixkscreensaver.nixnuvola-icon-theme.nixphase-style.nixsounds.nixwallpapers.nixweather-wallpapers.nix
base-runtime
base-workspace
base
bindings
default.nixedu
games
graphics
kde-package
libs
multimedia
network
pim-runtime
pim
pimlibs
plasma-addons
sdk
@ -620,11 +620,17 @@ exec ${GUILE-guile} -L "$PWD" -l "$0" \
|
|||||||
project message args)
|
project message args)
|
||||||
'())))
|
'())))
|
||||||
|
|
||||||
|
(define pointer->procedure
|
||||||
|
;; Compatibility hack for Guile up to 1.9.12 included.
|
||||||
|
(if (defined? 'pointer->procedure)
|
||||||
|
pointer->procedure
|
||||||
|
make-foreign-function))
|
||||||
|
|
||||||
(define version-string>?
|
(define version-string>?
|
||||||
(let ((strverscmp
|
(let ((strverscmp
|
||||||
(let ((sym (or (dynamic-func "strverscmp" (dynamic-link))
|
(let ((sym (or (dynamic-func "strverscmp" (dynamic-link))
|
||||||
(error "could not find `strverscmp' (from GNU libc)"))))
|
(error "could not find `strverscmp' (from GNU libc)"))))
|
||||||
(make-foreign-function int sym (list '* '*)))))
|
(pointer->procedure int sym (list '* '*)))))
|
||||||
(lambda (a b)
|
(lambda (a b)
|
||||||
(> (strverscmp (string->pointer a) (string->pointer b)) 0))))
|
(> (strverscmp (string->pointer a) (string->pointer b)) 0))))
|
||||||
|
|
||||||
|
@ -1,4 +1,4 @@
|
|||||||
{ stdenv, fetchurl, libcdio, cddiscid, wget, bash, vorbisTools
|
{ stdenv, fetchurl, libcdio, cddiscid, wget, bash, vorbisTools, id3v2, lame
|
||||||
, makeWrapper }:
|
, makeWrapper }:
|
||||||
|
|
||||||
let version = "2.3.99.6";
|
let version = "2.3.99.6";
|
||||||
@ -40,7 +40,7 @@ in
|
|||||||
--replace '#!/bin/bash' '#!${bash}/bin/bash'
|
--replace '#!/bin/bash' '#!${bash}/bin/bash'
|
||||||
|
|
||||||
wrapProgram "$out/bin/abcde" --prefix PATH ":" \
|
wrapProgram "$out/bin/abcde" --prefix PATH ":" \
|
||||||
"$out/bin:${libcdio}/bin:${cddiscid}/bin:${wget}/bin:${vorbisTools}/bin"
|
"$out/bin:${libcdio}/bin:${cddiscid}/bin:${wget}/bin:${vorbisTools}/bin:${id3v2}/bin:${lame}/bin"
|
||||||
|
|
||||||
wrapProgram "$out/bin/cddb-tool" --prefix PATH ":" \
|
wrapProgram "$out/bin/cddb-tool" --prefix PATH ":" \
|
||||||
"${wget}/bin"
|
"${wget}/bin"
|
||||||
@ -58,4 +58,4 @@ in
|
|||||||
format, and tags them, all in one go.
|
format, and tags them, all in one go.
|
||||||
'';
|
'';
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
@ -4,16 +4,16 @@
|
|||||||
}:
|
}:
|
||||||
|
|
||||||
stdenv.mkDerivation rec {
|
stdenv.mkDerivation rec {
|
||||||
name = "audacious-2.3";
|
name = "audacious-2.4.0";
|
||||||
|
|
||||||
src = fetchurl {
|
src = fetchurl {
|
||||||
url = "http://distfiles.atheme.org/${name}.tgz";
|
url = "http://distfiles.atheme.org/${name}.tgz";
|
||||||
sha256 = "0vs16y1vrlkzcbaw8imc36b9lncva69zkdkp38ikbidssiskm6xi";
|
sha256 = "1n6mfy2j7lqv5d9r92n1frbs7acplfip5vssqp0j9z5qkidx98pj";
|
||||||
};
|
};
|
||||||
|
|
||||||
pluginsSrc = fetchurl {
|
pluginsSrc = fetchurl {
|
||||||
url = "http://distfiles.atheme.org/audacious-plugins-2.3.tgz";
|
url = "http://distfiles.atheme.org/audacious-plugins-2.4.0.tgz";
|
||||||
sha256 = "0hdami52qpiyim3nz3qnml85wgjzpmx6g2wahfnsdvncmhm4v93x";
|
sha256 = "04rsfh7c54ffz6qavl3li5haa7jnaa42m4p1w0s4qpiiw3pvbaf5";
|
||||||
};
|
};
|
||||||
|
|
||||||
# `--enable-amidiplug' is to prevent configure from looking in /proc/asound.
|
# `--enable-amidiplug' is to prevent configure from looking in /proc/asound.
|
||||||
|
28
pkgs/applications/audio/id3v2/default.nix
Normal file
28
pkgs/applications/audio/id3v2/default.nix
Normal file
@ -0,0 +1,28 @@
|
|||||||
|
{stdenv, fetchurl, id3lib, groff}:
|
||||||
|
|
||||||
|
stdenv.mkDerivation rec {
|
||||||
|
name = "id3v2-0.1.11";
|
||||||
|
src = fetchurl {
|
||||||
|
url = "mirror://sourceforge/id3v2/${name}.tar.gz";
|
||||||
|
sha256 = "00r6f9yzmkrqa62dnkm8njg5cjzhmy0l17nj1ba15nrrm0mnand4";
|
||||||
|
};
|
||||||
|
|
||||||
|
patches = [ ./id3v2-0.1.11-track-bad-free.patch ];
|
||||||
|
|
||||||
|
buildNativeInputs = [ groff ];
|
||||||
|
buildInputs = [ id3lib ];
|
||||||
|
|
||||||
|
configurePhase = ''
|
||||||
|
export makeFlags=PREFIX=$out
|
||||||
|
'';
|
||||||
|
|
||||||
|
preInstall = ''
|
||||||
|
ensureDir $out/bin $out/man/man1
|
||||||
|
'';
|
||||||
|
|
||||||
|
meta = {
|
||||||
|
description = "A command line editor for id3v2 tags";
|
||||||
|
homepage = http://id3v2.sourceforge.net/;
|
||||||
|
license = "GPLv2+";
|
||||||
|
};
|
||||||
|
}
|
@ -0,0 +1,14 @@
|
|||||||
|
http://sourceforge.net/tracker/index.php?func=detail&aid=1252035&group_id=4193&atid=304193
|
||||||
|
|
||||||
|
diff -up id3v2-0.1.11/id3v2.cpp~ id3v2-0.1.11/id3v2.cpp
|
||||||
|
--- id3v2-0.1.11/id3v2.cpp~ 2004-05-04 21:30:15.000000000 +0300
|
||||||
|
+++ id3v2-0.1.11/id3v2.cpp 2008-01-03 21:22:02.000000000 +0200
|
||||||
|
@@ -423,7 +423,7 @@ int main( int argc, char *argv[])
|
||||||
|
{
|
||||||
|
// check if there is a total track number and if we only have
|
||||||
|
// the track number for this file. In this case combine them.
|
||||||
|
- char *currentTrackNum, *newTrackNum;
|
||||||
|
+ char *currentTrackNum, *newTrackNum = NULL;
|
||||||
|
|
||||||
|
if (pFrame != NULL)
|
||||||
|
{
|
@ -1,14 +1,14 @@
|
|||||||
{ stdenv, fetchurl, emacs, texinfo }:
|
{ stdenv, fetchurl, emacs, texinfo }:
|
||||||
|
|
||||||
let
|
let
|
||||||
version = "0.8";
|
version = "0.8.2";
|
||||||
in
|
in
|
||||||
stdenv.mkDerivation {
|
stdenv.mkDerivation {
|
||||||
name = "magit-${version}";
|
name = "magit-${version}";
|
||||||
|
|
||||||
src = fetchurl {
|
src = fetchurl {
|
||||||
url = "http://github.com/downloads/philjackson/magit/magit-${version}.tar.gz";
|
url = "http://github.com/downloads/philjackson/magit/magit-${version}.tar.gz";
|
||||||
sha256 = "4d1b55dcb118e506c6b8838acd4a50dbdd5348b1d12edd9789a3109a582e2954";
|
sha256 = "fc02c23e3e8994e9c3e3299d560d0cbfed888dcc66088f06b8cea3bc89cd6ae8";
|
||||||
};
|
};
|
||||||
|
|
||||||
buildInputs = [emacs texinfo];
|
buildInputs = [emacs texinfo];
|
||||||
|
@ -1,4 +1,4 @@
|
|||||||
{ fetchurl, stdenv, emacs, texinfo }:
|
{ fetchurl, stdenv, emacs, texinfo, which }:
|
||||||
|
|
||||||
stdenv.mkDerivation rec {
|
stdenv.mkDerivation rec {
|
||||||
name = "org-7.01f";
|
name = "org-7.01f";
|
||||||
@ -10,6 +10,10 @@ stdenv.mkDerivation rec {
|
|||||||
|
|
||||||
buildInputs = [ emacs texinfo ];
|
buildInputs = [ emacs texinfo ];
|
||||||
|
|
||||||
|
patchPhase =
|
||||||
|
'' sed -i "lisp/org-clock.el" -e's|"which"|"${which}/bin/which"|g'
|
||||||
|
'';
|
||||||
|
|
||||||
configurePhase =
|
configurePhase =
|
||||||
'' sed -i Makefile \
|
'' sed -i Makefile \
|
||||||
-e "s|^prefix=.*$|prefix=$out|g"
|
-e "s|^prefix=.*$|prefix=$out|g"
|
||||||
|
19
pkgs/applications/misc/krename/default.nix
Normal file
19
pkgs/applications/misc/krename/default.nix
Normal file
@ -0,0 +1,19 @@
|
|||||||
|
{ stdenv, fetchurl, cmake, automoc4, kdelibs, taglib, exiv2, podofo, gettext}:
|
||||||
|
|
||||||
|
stdenv.mkDerivation rec {
|
||||||
|
name = "krename-4.0.4";
|
||||||
|
|
||||||
|
src = fetchurl {
|
||||||
|
url = "mirror://sourceforge/krename/${name}.tar.bz2";
|
||||||
|
sha256 = "12qhclw1vbg5bv6619qd4408y8d1w26499gcr8gwhgfzk0v83hic";
|
||||||
|
};
|
||||||
|
|
||||||
|
buildInputs = [ cmake automoc4 kdelibs taglib exiv2 podofo gettext ];
|
||||||
|
|
||||||
|
meta = {
|
||||||
|
homepage = http://www.krename.net;
|
||||||
|
description = "KRename is a powerful batch renamer for KDE";
|
||||||
|
inherit (kdelibs.meta) platforms;
|
||||||
|
maintainers = [ stdenv.lib.maintainers.urkud ];
|
||||||
|
};
|
||||||
|
}
|
@ -1,11 +1,11 @@
|
|||||||
{cabal, X11, mtl, parsec, stm, utf8String, X11_xft}:
|
{cabal, X11, mtl, parsec, stm, utf8String, X11Xft}:
|
||||||
|
|
||||||
cabal.mkDerivation (self : {
|
cabal.mkDerivation (self : {
|
||||||
pname = "xmobar";
|
pname = "xmobar";
|
||||||
name = "${self.fname}";
|
name = "${self.fname}";
|
||||||
version = "0.9.2";
|
version = "0.9.2";
|
||||||
sha256 = "361295f5dc912512a2eb644ecd331562a271243192be6215cb071e44f50c7c66";
|
sha256 = "361295f5dc912512a2eb644ecd331562a271243192be6215cb071e44f50c7c66";
|
||||||
extraBuildInputs = [X11 mtl parsec stm utf8String X11_xft];
|
extraBuildInputs = [X11 mtl parsec stm utf8String X11Xft];
|
||||||
meta = {
|
meta = {
|
||||||
description = "xmobar is a minimalistic text based status bar";
|
description = "xmobar is a minimalistic text based status bar";
|
||||||
};
|
};
|
||||||
|
@ -34,22 +34,24 @@
|
|||||||
assert stdenv.system == "i686-linux" || stdenv.system == "x86_64-linux" ;
|
assert stdenv.system == "i686-linux" || stdenv.system == "x86_64-linux" ;
|
||||||
|
|
||||||
stdenv.mkDerivation rec {
|
stdenv.mkDerivation rec {
|
||||||
name = "chrome-${version}";
|
name = "chrome-${version}"; # !!! Shouldn't this be "chromium"?
|
||||||
version = "55366";
|
version = "59187";
|
||||||
|
|
||||||
|
# TODO: Use a stable release that doesn't disappear every few days.
|
||||||
src =
|
src =
|
||||||
if stdenv.system == "x86_64-linux" then
|
if stdenv.system == "x86_64-linux" then
|
||||||
fetchurl {
|
fetchurl {
|
||||||
url = "http://build.chromium.org/buildbot/snapshots/chromium-rel-linux-64/${version}/chrome-linux.zip";
|
url = "http://build.chromium.org/buildbot/snapshots/chromium-rel-linux-64/${version}/chrome-linux.zip";
|
||||||
sha256 = "1dazdfpnl278wwh03hs0x184ql5zh0yhpfiaw75j437dp3668hnj";
|
sha256 = "14dk0c5fgh1q2iy4srfvc6nr8grpk5k5zgnx13464bkadr9s32gx";
|
||||||
}
|
}
|
||||||
else if stdenv.system == "i686-linux" then
|
else if stdenv.system == "i686-linux" then
|
||||||
fetchurl {
|
fetchurl {
|
||||||
url = "http://build.chromium.org/buildbot/snapshots/chromium-rel-linux/${version}/chrome-linux.zip";
|
url = "http://build.chromium.org/buildbot/snapshots/chromium-rel-linux/${version}/chrome-linux.zip";
|
||||||
sha256 = "1x5ykvp2hxc56p4bb1lykahkk1nzkqi2kkm474spplqcfnmd6j2b";
|
sha256 = "0ls2vl01psp25rhy0bjhfzjayw00rrnqmvcki8sl5kv9m581bn8s";
|
||||||
}
|
}
|
||||||
else null;
|
else throw "Chromium is not supported on this platform.";
|
||||||
|
|
||||||
phases="unpackPhase installPhase";
|
phases = "unpackPhase installPhase";
|
||||||
|
|
||||||
buildInputs = [makeWrapper unzip];
|
buildInputs = [makeWrapper unzip];
|
||||||
|
|
||||||
@ -77,6 +79,6 @@ stdenv.mkDerivation rec {
|
|||||||
'';
|
'';
|
||||||
|
|
||||||
meta = {
|
meta = {
|
||||||
description = "";
|
description = "Chromium, an open source web browser";
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
@ -12,14 +12,14 @@
|
|||||||
|
|
||||||
rec {
|
rec {
|
||||||
|
|
||||||
firefoxVersion = "3.6.8";
|
firefoxVersion = "3.6.10";
|
||||||
|
|
||||||
xulVersion = "1.9.2.8"; # this attribute is used by other packages
|
xulVersion = "1.9.2.10"; # this attribute is used by other packages
|
||||||
|
|
||||||
|
|
||||||
src = fetchurl {
|
src = fetchurl {
|
||||||
url = "http://releases.mozilla.org/pub/mozilla.org/firefox/releases/${firefoxVersion}/source/firefox-${firefoxVersion}.source.tar.bz2";
|
url = "http://releases.mozilla.org/pub/mozilla.org/firefox/releases/${firefoxVersion}/source/firefox-${firefoxVersion}.source.tar.bz2";
|
||||||
sha1 = "4936e543f6c7492c5954cbd5b30ddda6b20e3797";
|
sha1 = "0fa17f4ebd4bafe18c789961bdfe064d1b521ac6";
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|
||||||
|
@ -9,13 +9,13 @@
|
|||||||
# http://thread.gmane.org/gmane.comp.gnu.gnuzilla/1376 .
|
# http://thread.gmane.org/gmane.comp.gnu.gnuzilla/1376 .
|
||||||
#assert stdenv.isLinux -> (wirelesstools != null);
|
#assert stdenv.isLinux -> (wirelesstools != null);
|
||||||
|
|
||||||
let version = "3.6.7"; in
|
let version = "3.6.9"; in
|
||||||
stdenv.mkDerivation {
|
stdenv.mkDerivation {
|
||||||
name = "icecat-${version}";
|
name = "icecat-${version}";
|
||||||
|
|
||||||
src = fetchurl {
|
src = fetchurl {
|
||||||
url = "mirror://gnu/gnuzilla/${version}/icecat-${version}.tar.xz";
|
url = "mirror://gnu/gnuzilla/${version}/icecat-${version}.tar.xz";
|
||||||
sha256 = "0nm0py3kd55pgyx1yv44v1acq5d1rgka3p6msfbgqx60yd38rwsm";
|
sha256 = "041rdhhcaak0w0lg0wd1fdl9vlk9a466sh6y17dfz389nswyy8wr";
|
||||||
};
|
};
|
||||||
|
|
||||||
buildInputs =
|
buildInputs =
|
||||||
@ -88,6 +88,8 @@ stdenv.mkDerivation {
|
|||||||
ln -s ../../../icons/default.xpm "$out/lib/$libDir/chrome/icons/default/"
|
ln -s ../../../icons/default.xpm "$out/lib/$libDir/chrome/icons/default/"
|
||||||
'';
|
'';
|
||||||
|
|
||||||
|
enableParallelBuilding = true;
|
||||||
|
|
||||||
meta = {
|
meta = {
|
||||||
description = "GNU IceCat, a free web browser based on Mozilla Firefox";
|
description = "GNU IceCat, a free web browser based on Mozilla Firefox";
|
||||||
|
|
||||||
|
@ -3,19 +3,19 @@
|
|||||||
}:
|
}:
|
||||||
|
|
||||||
stdenv.mkDerivation rec {
|
stdenv.mkDerivation rec {
|
||||||
name = "gecko-mediaplayer-0.9.6";
|
name = "gecko-mediaplayer-0.9.99.rc1";
|
||||||
|
|
||||||
src = fetchurl {
|
src = fetchurl {
|
||||||
url = "http://gecko-mediaplayer.googlecode.com/files/${name}.tar.gz";
|
url = "http://gecko-mediaplayer.googlecode.com/files/${name}.tar.gz";
|
||||||
sha256 = "1847jv1v9r4xzmvksvjvl2fmp8j5s22hx922hywdflzzq7jsgyr7";
|
sha256 = "1ddp8z2a40wxdj7v20wqph9l4z4a47bjqzac7wlmmzjq7a9pbij2";
|
||||||
};
|
};
|
||||||
|
|
||||||
buildInputs = [pkgconfig glib dbus dbus_glib browser x11 GConf];
|
buildInputs = [pkgconfig glib dbus dbus_glib browser x11 GConf browser.xulrunner];
|
||||||
|
|
||||||
# !!! fix this
|
# !!! fix this
|
||||||
preBuild =
|
preBuild =
|
||||||
''
|
''
|
||||||
export NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE -I$(echo ${browser.xulrunner}/include/xulrunner-*/stable) -I${browser.nspr}/include/nspr"
|
export NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE -I$(echo ${browser.xulrunner}/include/xulrunner-*) -I${browser.nspr}/include/nspr"
|
||||||
echo $NIX_CFLAGS_COMPILE
|
echo $NIX_CFLAGS_COMPILE
|
||||||
'';
|
'';
|
||||||
|
|
||||||
@ -26,9 +26,7 @@ stdenv.mkDerivation rec {
|
|||||||
echo "${gnome_mplayer}/bin:${MPlayer}/bin" > $out/${passthru.mozillaPlugin}/extra-bin-path
|
echo "${gnome_mplayer}/bin:${MPlayer}/bin" > $out/${passthru.mozillaPlugin}/extra-bin-path
|
||||||
'';
|
'';
|
||||||
|
|
||||||
passthru = {
|
passthru.mozillaPlugin = "/lib/mozilla/plugins";
|
||||||
mozillaPlugin = "/lib/mozilla/plugins";
|
|
||||||
};
|
|
||||||
|
|
||||||
meta = {
|
meta = {
|
||||||
description = "A browser plugin that uses GNOME MPlayer to play media in a browser";
|
description = "A browser plugin that uses GNOME MPlayer to play media in a browser";
|
||||||
|
71
pkgs/applications/networking/ekiga/default.nix
Normal file
71
pkgs/applications/networking/ekiga/default.nix
Normal file
@ -0,0 +1,71 @@
|
|||||||
|
x@{builderDefsPackage
|
||||||
|
, cyrus_sasl, gettext, openldap, ptlib, opal, GConf, libXv, rarian, intltool
|
||||||
|
, perl, perlXMLParser, evolution_data_server, gnome_doc_utils, avahi
|
||||||
|
, libsigcxx, gtk, dbus_glib, libnotify, libXext, xextproto, automake
|
||||||
|
, autoconf, pkgconfig, libxml2, videoproto, unixODBC, db4, nspr, nss, zlib
|
||||||
|
, libXrandr, randrproto, which, libxslt
|
||||||
|
, ...}:
|
||||||
|
builderDefsPackage
|
||||||
|
(a :
|
||||||
|
let
|
||||||
|
helperArgNames = ["stdenv" "fetchurl" "builderDefsPackage"] ++
|
||||||
|
[];
|
||||||
|
|
||||||
|
buildInputs = map (n: builtins.getAttr n x)
|
||||||
|
(builtins.attrNames (builtins.removeAttrs x helperArgNames));
|
||||||
|
sourceInfo = rec {
|
||||||
|
baseName="ekiga";
|
||||||
|
baseVersion="3.2";
|
||||||
|
patchlevel="7";
|
||||||
|
version="${baseVersion}.${patchlevel}";
|
||||||
|
name="${baseName}-${version}";
|
||||||
|
url="mirror://gnome/sources/${baseName}/${baseVersion}/${name}.tar.bz2";
|
||||||
|
hash="13zxwfqhp7pisadx0hq50qwnj6d8r4dldvbs1ngydbwfnq4i6npj";
|
||||||
|
};
|
||||||
|
in
|
||||||
|
rec {
|
||||||
|
src = a.fetchurl {
|
||||||
|
url = sourceInfo.url;
|
||||||
|
sha256 = sourceInfo.hash;
|
||||||
|
};
|
||||||
|
|
||||||
|
inherit (sourceInfo) name version;
|
||||||
|
inherit buildInputs;
|
||||||
|
|
||||||
|
/* doConfigure should be removed if not needed */
|
||||||
|
phaseNames = ["setVars" "doConfigure" "doMakeInstall"];
|
||||||
|
configureFlags = [
|
||||||
|
"--with-ldap-dir=${openldap}"
|
||||||
|
"--with-libsasl2-dir=${cyrus_sasl}"
|
||||||
|
];
|
||||||
|
|
||||||
|
setVars = a.noDepEntry (''
|
||||||
|
export NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE -I${opal}/include/opal"
|
||||||
|
export NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE -I$(echo ${evolution_data_server}/include/evolution-*)"
|
||||||
|
export NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE -I${libxml2}/include/libxml2"
|
||||||
|
export NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE -I${GConf}/include/gconf/2"
|
||||||
|
|
||||||
|
export NIX_LDFLAGS="$NIX_LDFLAGS -lopal"
|
||||||
|
for i in ${evolution_data_server}/lib/lib*.so; do
|
||||||
|
file="$(basename "$i" .so)"
|
||||||
|
bn="''${file#lib}"
|
||||||
|
export NIX_LDFLAGS="$NIX_LDFLAGS -l$bn"
|
||||||
|
done
|
||||||
|
'');
|
||||||
|
|
||||||
|
meta = {
|
||||||
|
description = "Ekiga SIP client";
|
||||||
|
maintainers = with a.lib.maintainers;
|
||||||
|
[
|
||||||
|
raskin
|
||||||
|
];
|
||||||
|
platforms = with a.lib.platforms;
|
||||||
|
linux;
|
||||||
|
};
|
||||||
|
passthru = {
|
||||||
|
updateInfo = {
|
||||||
|
downloadPage = "mirror://gnome/sources/ekiga";
|
||||||
|
};
|
||||||
|
};
|
||||||
|
}) x
|
||||||
|
|
@ -2,7 +2,7 @@ a :
|
|||||||
let
|
let
|
||||||
fetchurl = a.fetchurl;
|
fetchurl = a.fetchurl;
|
||||||
|
|
||||||
version = a.lib.attrByPath ["version"] "0.13.4" a;
|
version = a.lib.attrByPath ["version"] "0.14" a;
|
||||||
buildInputs = with a; [
|
buildInputs = with a; [
|
||||||
python pyGtkGlade gtk perl intltool dbus gettext
|
python pyGtkGlade gtk perl intltool dbus gettext
|
||||||
pkgconfig makeWrapper libglade pyopenssl libXScrnSaver
|
pkgconfig makeWrapper libglade pyopenssl libXScrnSaver
|
||||||
@ -13,8 +13,8 @@ let
|
|||||||
in
|
in
|
||||||
rec {
|
rec {
|
||||||
src = fetchurl {
|
src = fetchurl {
|
||||||
url = "http://www.gajim.org/downloads/0.13/gajim-${version}.tar.gz";
|
url = "http://www.gajim.org/downloads/0.14/gajim-${version}.tar.gz";
|
||||||
sha256 = "0w7ddimwbapz51k76agqac5lwaqrsacl01zgq3jngrkgpfjlvxym";
|
sha256 = "3dc31b76f5e019515947b81685ec0e62ca20318b13cb80df4f4d7a045242d5bd";
|
||||||
};
|
};
|
||||||
|
|
||||||
inherit buildInputs;
|
inherit buildInputs;
|
||||||
|
27
pkgs/applications/networking/ktorrent/default.nix
Normal file
27
pkgs/applications/networking/ktorrent/default.nix
Normal file
@ -0,0 +1,27 @@
|
|||||||
|
{ stdenv, fetchurl, cmake, automoc4, libktorrent, taglib, kdepimlibs, boost,
|
||||||
|
gettext, kdebase_workspace }:
|
||||||
|
|
||||||
|
stdenv.mkDerivation rec {
|
||||||
|
name = pname + "-" + version;
|
||||||
|
|
||||||
|
pname = "ktorrent";
|
||||||
|
version = "4.0.3";
|
||||||
|
|
||||||
|
src = fetchurl {
|
||||||
|
url = "${meta.homepage}/downloads/${version}/${name}.tar.bz2";
|
||||||
|
sha256 = "02hp52333w75mdywgsln28samf9ybr9yldg1jsw0b93lj44pfxli";
|
||||||
|
};
|
||||||
|
|
||||||
|
patches = [ ./find-workspace.diff ];
|
||||||
|
|
||||||
|
KDEDIRS = libktorrent;
|
||||||
|
|
||||||
|
buildInputs = [ automoc4 cmake libktorrent taglib kdepimlibs boost gettext
|
||||||
|
kdebase_workspace ];
|
||||||
|
|
||||||
|
meta = {
|
||||||
|
description = "KDE integrated BtTorrent client";
|
||||||
|
homepage = http://ktorrent.org;
|
||||||
|
maintainers = with stdenv.lib.maintainers; [ sander urkud ];
|
||||||
|
};
|
||||||
|
}
|
44
pkgs/applications/networking/ktorrent/find-workspace.diff
Normal file
44
pkgs/applications/networking/ktorrent/find-workspace.diff
Normal file
@ -0,0 +1,44 @@
|
|||||||
|
Fix finding taskmanager.h and kworkspace.h
|
||||||
|
diff --git a/plasma/applet/CMakeLists.txt b/plasma/applet/CMakeLists.txt
|
||||||
|
index 3a72241..69b1205 100644
|
||||||
|
--- a/plasma/applet/CMakeLists.txt
|
||||||
|
+++ b/plasma/applet/CMakeLists.txt
|
||||||
|
@@ -6,7 +6,9 @@ if(NOT QT_VERSION_OK)
|
||||||
|
else(NOT QT_VERSION_OK)
|
||||||
|
|
||||||
|
set(TASKMANAGER_FOUND FALSE)
|
||||||
|
- FIND_PATH(TASKMANAGER_INCLUDE_DIR NAMES taskmanager.h PATHS ${KDE4_INCLUDE_DIR}/taskmanager ${INCLUDE_INSTALL_DIR}/taskmanager.h)
|
||||||
|
+ FIND_PATH(TASKMANAGER_INCLUDE_DIR
|
||||||
|
+ NAMES taskmanager/taskmanager.h
|
||||||
|
+ HINTS ${KDE4_INCLUDE_DIR} ${INCLUDE_INSTALL_DIR})
|
||||||
|
FIND_LIBRARY(TASKMANAGER_LIBRARY NAMES taskmanager PATHS ${KDE4_LIB_DIR} ${LIB_INSTALL_DIR})
|
||||||
|
|
||||||
|
if(TASKMANAGER_INCLUDE_DIR AND TASKMANAGER_LIBRARY)
|
||||||
|
diff --git a/plugins/shutdown/CMakeLists.txt b/plugins/shutdown/CMakeLists.txt
|
||||||
|
index 59e5470..5b932ff 100644
|
||||||
|
--- a/plugins/shutdown/CMakeLists.txt
|
||||||
|
+++ b/plugins/shutdown/CMakeLists.txt
|
||||||
|
@@ -1,6 +1,8 @@
|
||||||
|
set(KWORKSPACE_FOUND FALSE)
|
||||||
|
-FIND_PATH(KWORKSPACE_INCLUDE_DIR NAMES kworkspace.h PATHS ${KDE4_INCLUDE_DIR}/kworkspace ${INCLUDE_INSTALL_DIR}/kworkspace.h)
|
||||||
|
-FIND_LIBRARY(KWORKSPACE_LIBRARY NAMES kworkspace PATHS ${KDE4_LIB_DIR} ${LIB_INSTALL_DIR})
|
||||||
|
+FIND_PATH(KWORKSPACE_INCLUDE_DIR
|
||||||
|
+ NAMES kworkspace/kworkspace.h
|
||||||
|
+ HINTS ${KDE4_INCLUDE_DIR} ${INCLUDE_INSTALL_DIR})
|
||||||
|
+FIND_LIBRARY(KWORKSPACE_LIBRARY NAMES kworkspace HINTS ${KDE4_LIB_DIR} ${LIB_INSTALL_DIR})
|
||||||
|
|
||||||
|
if(KWORKSPACE_INCLUDE_DIR AND KWORKSPACE_LIBRARY)
|
||||||
|
set(KWORKSPACE_FOUND TRUE)
|
||||||
|
diff --git a/plugins/shutdown/shutdownplugin.cpp b/plugins/shutdown/shutdownplugin.cpp
|
||||||
|
index e233353..1efc20b 100644
|
||||||
|
--- a/plugins/shutdown/shutdownplugin.cpp
|
||||||
|
+++ b/plugins/shutdown/shutdownplugin.cpp
|
||||||
|
@@ -19,7 +19,7 @@
|
||||||
|
***************************************************************************/
|
||||||
|
#include <kjob.h>
|
||||||
|
#include <kgenericfactory.h>
|
||||||
|
-#include <kworkspace.h>
|
||||||
|
+#include <kworkspace/kworkspace.h>
|
||||||
|
#include <ktoggleaction.h>
|
||||||
|
#include <kactioncollection.h>
|
||||||
|
#include <kmessagebox.h>
|
@ -31,6 +31,10 @@ stdenv.mkDerivation {
|
|||||||
|
|
||||||
configureFlags = [
|
configureFlags = [
|
||||||
"--with-mailpath=" "--enable-smtp"
|
"--with-mailpath=" "--enable-smtp"
|
||||||
|
|
||||||
|
# This allows calls with "-d N", that output debug info into ~/.muttdebug*
|
||||||
|
"--enable-debug"
|
||||||
|
|
||||||
# The next allows building mutt without having anything setgid
|
# The next allows building mutt without having anything setgid
|
||||||
# set by the installer, and removing the need for the group 'mail'
|
# set by the installer, and removing the need for the group 'mail'
|
||||||
# I set the value 'mailbox' because it is a default in the configure script
|
# I set the value 'mailbox' because it is a default in the configure script
|
||||||
@ -38,7 +42,7 @@ stdenv.mkDerivation {
|
|||||||
(if headerCache then "--enable-hcache" else "--disable-hcache")
|
(if headerCache then "--enable-hcache" else "--disable-hcache")
|
||||||
(if sslSupport then "--with-ssl" else "--without-ssl")
|
(if sslSupport then "--with-ssl" else "--without-ssl")
|
||||||
(if imapSupport then "--enable-imap" else "--disable-imap")
|
(if imapSupport then "--enable-imap" else "--disable-imap")
|
||||||
(if saslSupport then "--with-sasl" else "--without-imap")
|
(if saslSupport then "--with-sasl" else "--without-sasl")
|
||||||
];
|
];
|
||||||
|
|
||||||
meta = {
|
meta = {
|
||||||
|
@ -1,10 +1,10 @@
|
|||||||
{stdenv, fetchurl, openssl}:
|
{stdenv, fetchurl, openssl}:
|
||||||
stdenv.mkDerivation {
|
stdenv.mkDerivation {
|
||||||
name = "msmtp-1.4.13";
|
name = "msmtp-1.4.21";
|
||||||
|
|
||||||
src = fetchurl {
|
src = fetchurl {
|
||||||
url = http://dfn.dl.sourceforge.net/sourceforge/msmtp/msmtp-1.4.13.tar.bz2;
|
url = mirror://sourceforge/msmtp/msmtp-1.4.21.tar.bz2;
|
||||||
sha256 = "1x8q8dhcpnjym3icz6070l13hz98fvdvgc5j5psj4pmxbswx0r4p";
|
sha256 = "1yjgy56n02qs25728psg296amhbdkxq2pv1q3l484f3r9pjrpcrg";
|
||||||
};
|
};
|
||||||
|
|
||||||
buildInputs = [ openssl ];
|
buildInputs = [ openssl ];
|
||||||
|
@ -1,10 +1,10 @@
|
|||||||
{stdenv, fetchurl, perl, pkgconfig, gtk, libpcap, flex, bison}:
|
{stdenv, fetchurl, perl, pkgconfig, gtk, libpcap, flex, bison}:
|
||||||
|
|
||||||
stdenv.mkDerivation {
|
stdenv.mkDerivation {
|
||||||
name = "wireshark-1.3.4";
|
name = "wireshark-1.4.0rc2";
|
||||||
src = fetchurl {
|
src = fetchurl {
|
||||||
url = http://media-2.cacetech.com/wireshark/src/wireshark-1.3.4.tar.bz2;
|
url = "http://www.wireshark.org/download/src/wireshark-1.4.0rc2.tar.bz2";
|
||||||
sha256 = "00pyr3izg5dg8kr4sayp0fq8q360syfhs2nvj6b4ff1mdal7ra3x";
|
sha256 = "16fd00e1e120c7f57a8c5c8532f26d77a14ca254c2cb2c4816ec9a0499744f79";
|
||||||
};
|
};
|
||||||
configureFlags = "--with-pcap=${libpcap}";
|
configureFlags = "--with-pcap=${libpcap}";
|
||||||
buildInputs = [perl pkgconfig gtk libpcap flex bison];
|
buildInputs = [perl pkgconfig gtk libpcap flex bison];
|
||||||
|
@ -1,14 +1,40 @@
|
|||||||
{stdenv, fetchurl, unzip, cmake, mesa, wxGTK, zlib, libX11}:
|
{stdenv, fetchsvn, unzip, cmake, mesa, wxGTK, zlib, libX11, gettext}:
|
||||||
|
|
||||||
stdenv.mkDerivation rec {
|
stdenv.mkDerivation rec {
|
||||||
name = "kicad-2010-05-05";
|
name = "kicad-svn-2518";
|
||||||
|
|
||||||
src = fetchurl {
|
src = fetchsvn {
|
||||||
url = http://iut-tice.ujf-grenoble.fr/cao/sources/kicad-sources-2010-05-05-BZR2356-stable.zip;
|
url = https://kicad.svn.sourceforge.net/svnroot/kicad/trunk/kicad;
|
||||||
sha256 = "05w2d7gpafs5xz532agyym5wnf5lw3lawpgncar7clgk1czcha7m";
|
rev = 2518;
|
||||||
|
sha256 = "05z4fnkvvy91d0krf72q8xyislwh3zg8k0gy9w18caizbla5sih5";
|
||||||
};
|
};
|
||||||
|
|
||||||
buildInputs = [ unzip cmake mesa wxGTK zlib libX11];
|
srcLibrary = fetchsvn {
|
||||||
|
url = https://kicad.svn.sourceforge.net/svnroot/kicad/trunk/kicad-library;
|
||||||
|
rev = 2518;
|
||||||
|
sha256 = "05sfmbp1z3hjxzcspj4vpprww5bxc6hq4alcjlc1vg6cvx2qgb9s";
|
||||||
|
};
|
||||||
|
|
||||||
|
# They say they only support installs to /usr or /usr/local,
|
||||||
|
# so we have to handle this.
|
||||||
|
patchPhase = ''
|
||||||
|
sed -i -e 's,/usr/local/kicad,'$out,g common/gestfich.cpp
|
||||||
|
pushd internat/ca
|
||||||
|
sed -i -e s/iso-8859-1/utf-8/ kicad.po
|
||||||
|
msgfmt -o kicad.mo kicad.po
|
||||||
|
popd
|
||||||
|
'';
|
||||||
|
|
||||||
|
enableParallelBuilding = true;
|
||||||
|
|
||||||
|
buildInputs = [ unzip cmake mesa wxGTK zlib libX11 gettext ];
|
||||||
|
|
||||||
|
postInstall = ''
|
||||||
|
mkdir library
|
||||||
|
cd library
|
||||||
|
cmake -DCMAKE_INSTALL_PREFIX=$out $srcLibrary
|
||||||
|
make install
|
||||||
|
'';
|
||||||
|
|
||||||
meta = {
|
meta = {
|
||||||
description = "Free Software EDA Suite";
|
description = "Free Software EDA Suite";
|
||||||
|
@ -5,15 +5,23 @@
|
|||||||
{stdenv, fetchurl, ocaml, camlp5, lablgtk, ncurses}:
|
{stdenv, fetchurl, ocaml, camlp5, lablgtk, ncurses}:
|
||||||
|
|
||||||
stdenv.mkDerivation {
|
stdenv.mkDerivation {
|
||||||
name = "coq-8.3-beta0-1";
|
name = "coq-devel-8.3pre1";
|
||||||
|
|
||||||
src = fetchurl {
|
src = fetchurl {
|
||||||
url = http://coq.inria.fr/distrib/V8.3-beta0/files/coq-8.3-beta0-1.tar.gz;
|
url = http://coq.inria.fr/distrib/V8.3-rc1/files/coq-8.3-rc1.tar.gz;
|
||||||
sha256 = "01m1x0gpzfsiybyqanm82ls8q63q0g2d9vvfs99zf4z1nny7vlf1";
|
sha256 = "0r43dqr7nzjfkxlz4963sj18gvjni6x3lhrlgh4l8k0cjspi62sj";
|
||||||
};
|
};
|
||||||
|
|
||||||
buildInputs = [ ocaml camlp5 ncurses lablgtk ];
|
buildInputs = [ ocaml camlp5 ncurses lablgtk ];
|
||||||
|
|
||||||
|
patches = [ ./coq-8.3-rc1_configure.patch ];
|
||||||
|
|
||||||
|
postPatch = ''
|
||||||
|
substituteInPlace scripts/coqmktop.ml --replace \
|
||||||
|
"\"-I\"; \"+lablgtk2\"" \
|
||||||
|
"\"-I\"; \"${lablgtk}/lib/ocaml/lablgtk2\"; \"-I\"; \"${lablgtk}/lib/ocaml/stublibs\""
|
||||||
|
'';
|
||||||
|
|
||||||
prefixKey = "-prefix ";
|
prefixKey = "-prefix ";
|
||||||
|
|
||||||
preConfigure = ''
|
preConfigure = ''
|
||||||
@ -31,16 +39,8 @@ stdenv.mkDerivation {
|
|||||||
|
|
||||||
buildFlags = "world"; # Debug with "world VERBOSE=1";
|
buildFlags = "world"; # Debug with "world VERBOSE=1";
|
||||||
|
|
||||||
patches = [ ./coq-8.3-beta0-1.patch ];
|
|
||||||
|
|
||||||
postPatch = ''
|
|
||||||
substituteInPlace scripts/coqmktop.ml --replace \
|
|
||||||
"\"-I\"; \"+lablgtk2\"" \
|
|
||||||
"\"-I\"; \"${lablgtk}/lib/ocaml/lablgtk2\"; \"-I\"; \"${lablgtk}/lib/ocaml/stublibs\""
|
|
||||||
'';
|
|
||||||
|
|
||||||
meta = {
|
meta = {
|
||||||
description = "Coq proof assistant";
|
description = "Coq proof assistant (development version)";
|
||||||
longDescription = ''
|
longDescription = ''
|
||||||
Coq is a formal proof management system. It provides a formal language
|
Coq is a formal proof management system. It provides a formal language
|
||||||
to write mathematical definitions, executable algorithms and theorems
|
to write mathematical definitions, executable algorithms and theorems
|
@ -1,7 +1,7 @@
|
|||||||
diff -Nurp coq-8.3-beta0-1/configure coq-8.3-beta0-1-nix/configure
|
diff -Nuar coq-8.3-rc1/configure coq-8.3-rc1.nixos/configure
|
||||||
--- coq-8.3-beta0-1/configure 2010-02-16 12:37:58.000000000 +0100
|
--- coq-8.3-rc1/configure 2010-08-06 10:36:16.000000000 +0200
|
||||||
+++ coq-8.3-beta0-1-nix/configure 2010-05-11 17:47:44.000000000 +0200
|
+++ coq-8.3-rc1.nixos/configure 2010-09-14 20:30:02.000000000 +0200
|
||||||
@@ -394,7 +394,6 @@ case $camldir_spec in
|
@@ -399,7 +399,6 @@
|
||||||
ocamlyaccexec=$CAMLBIN/ocamlyacc
|
ocamlyaccexec=$CAMLBIN/ocamlyacc
|
||||||
ocamlmktopexec=$CAMLBIN/ocamlmktop
|
ocamlmktopexec=$CAMLBIN/ocamlmktop
|
||||||
ocamlmklibexec=$CAMLBIN/ocamlmklib
|
ocamlmklibexec=$CAMLBIN/ocamlmklib
|
||||||
@ -9,7 +9,7 @@ diff -Nurp coq-8.3-beta0-1/configure coq-8.3-beta0-1-nix/configure
|
|||||||
esac
|
esac
|
||||||
|
|
||||||
if test ! -f "$CAMLC" ; then
|
if test ! -f "$CAMLC" ; then
|
||||||
@@ -626,7 +625,7 @@ case $COQIDE in
|
@@ -647,7 +646,7 @@
|
||||||
no) LABLGTKLIB=+lablgtk2 # Pour le message
|
no) LABLGTKLIB=+lablgtk2 # Pour le message
|
||||||
LABLGTKINCLUDES="-I $LABLGTKLIB";; # Pour le makefile
|
LABLGTKINCLUDES="-I $LABLGTKLIB";; # Pour le makefile
|
||||||
yes) LABLGTKLIB="$lablgtkdir" # Pour le message
|
yes) LABLGTKLIB="$lablgtkdir" # Pour le message
|
@ -1,55 +0,0 @@
|
|||||||
{stdenv, ocaml_with_sources, hol_light, dmtcp, nettools, openssh}:
|
|
||||||
# nettools and openssh needed for dmtcp restarting script.
|
|
||||||
|
|
||||||
let
|
|
||||||
selfcheckpoint_core_ml = ./selfcheckpoint_core.ml;
|
|
||||||
selfcheckpoint_multivariate_ml = ./selfcheckpoint_multivariate.ml;
|
|
||||||
selfcheckpoint_complex_ml = ./selfcheckpoint_complex.ml;
|
|
||||||
in
|
|
||||||
|
|
||||||
stdenv.mkDerivation {
|
|
||||||
name = "hol_light_binaries-${hol_light.version}";
|
|
||||||
|
|
||||||
buildInputs = [ dmtcp ocaml_with_sources nettools openssh];
|
|
||||||
|
|
||||||
buildCommand = ''
|
|
||||||
HOL_DIR=${hol_light}/src/hol_light
|
|
||||||
BIN_DIR=$out/bin
|
|
||||||
ensureDir $BIN_DIR
|
|
||||||
|
|
||||||
# HOL Light Core
|
|
||||||
dmtcp_coordinator --background
|
|
||||||
echo 'Unix.system "dmtcp_command -k";;\n' |
|
|
||||||
dmtcp_checkpoint -q -c "$BIN_DIR" \
|
|
||||||
ocaml -I "$HOL_DIR" -init ${selfcheckpoint_core_ml}
|
|
||||||
substituteInPlace dmtcp_restart_script.sh \
|
|
||||||
--replace dmtcp_restart "dmtcp_restart --quiet"
|
|
||||||
mv dmtcp_restart_script.sh $BIN_DIR/hol_light
|
|
||||||
dmtcp_command -q
|
|
||||||
|
|
||||||
# HOL Light Multivariate
|
|
||||||
dmtcp_coordinator --background
|
|
||||||
echo 'Unix.system "dmtcp_command -k";;\n' |
|
|
||||||
dmtcp_checkpoint -q -c "$BIN_DIR" \
|
|
||||||
ocaml -I "$HOL_DIR" -init ${selfcheckpoint_multivariate_ml}
|
|
||||||
substituteInPlace dmtcp_restart_script.sh \
|
|
||||||
--replace dmtcp_restart "dmtcp_restart --quiet"
|
|
||||||
mv dmtcp_restart_script.sh $BIN_DIR/hol_light_multivariate
|
|
||||||
dmtcp_command -q
|
|
||||||
|
|
||||||
# HOL Light Complex
|
|
||||||
dmtcp_coordinator --background
|
|
||||||
echo 'Unix.system "dmtcp_command -k";;\n' |
|
|
||||||
dmtcp_checkpoint -q -c "$BIN_DIR" \
|
|
||||||
ocaml -I "$HOL_DIR" -init ${selfcheckpoint_complex_ml}
|
|
||||||
substituteInPlace dmtcp_restart_script.sh \
|
|
||||||
--replace dmtcp_restart "dmtcp_restart --quiet"
|
|
||||||
mv dmtcp_restart_script.sh $BIN_DIR/hol_light_complex
|
|
||||||
dmtcp_command -q
|
|
||||||
'';
|
|
||||||
|
|
||||||
meta = {
|
|
||||||
description = "Preload binaries for HOL Light.";
|
|
||||||
license = "BSD";
|
|
||||||
};
|
|
||||||
}
|
|
File diff suppressed because it is too large
Load Diff
@ -1,60 +1,43 @@
|
|||||||
{stdenv, fetchurl, ocaml_with_sources}:
|
{stdenv, writeText, writeTextFile, ocaml, camlp5_transitional, hol_light_sources}:
|
||||||
|
|
||||||
let
|
let
|
||||||
pname = "hol_light";
|
version = hol_light_sources.version;
|
||||||
version = "100110";
|
|
||||||
webpage = http://www.cl.cam.ac.uk/~jrh13/hol-light/;
|
|
||||||
|
|
||||||
dmtcp_checkpoint = ''
|
camlp5 = camlp5_transitional;
|
||||||
|
|
||||||
(* ------------------------------------------------------------------------- *)
|
hol_light_src_dir = "${hol_light_sources}/lib/hol_light/src";
|
||||||
(* Non-destructive checkpoint using DMTCP. *)
|
|
||||||
(* ------------------------------------------------------------------------- *)
|
|
||||||
|
|
||||||
let dmtcp_checkpoint bannerstring =
|
pa_j_cmo = stdenv.mkDerivation {
|
||||||
let longer_banner = startup_banner ^ " with DMTCP" in
|
name = "pa_j.cmo";
|
||||||
let complete_banner =
|
inherit ocaml camlp5;
|
||||||
if bannerstring = "" then longer_banner
|
buildInputs = [ ocaml camlp5 ];
|
||||||
else longer_banner^"\n "^bannerstring in
|
buildCommand = ''
|
||||||
(Gc.compact(); Unix.sleep 1;
|
ocamlc -c \
|
||||||
try ignore(Unix.system ("dmtcp_command -bc")) with _ -> ();
|
-pp "camlp5r pa_lexer.cmo pa_extend.cmo q_MLast.cmo" \
|
||||||
Format.print_string complete_banner;
|
-I "${camlp5}/lib/ocaml/camlp5" \
|
||||||
Format.print_newline(); Format.print_newline());;
|
-o $out \
|
||||||
|
"${hol_light_src_dir}/pa_j_`ocamlc -version | cut -c1-4`.ml"
|
||||||
|
'';
|
||||||
|
};
|
||||||
|
|
||||||
|
start_ml = writeText "start.ml" ''
|
||||||
|
Topdirs.dir_directory "${hol_light_src_dir}";;
|
||||||
|
Topdirs.dir_directory "${camlp5}/lib/ocaml/camlp5";;
|
||||||
|
Topdirs.dir_load Format.std_formatter "camlp5o.cma";;
|
||||||
|
Topdirs.dir_load Format.std_formatter "${pa_j_cmo}";;
|
||||||
|
#use "${hol_light_src_dir}/make.ml";;
|
||||||
'';
|
'';
|
||||||
|
|
||||||
in
|
in
|
||||||
|
writeTextFile {
|
||||||
stdenv.mkDerivation {
|
name = "hol_light-${version}";
|
||||||
name = "${pname}-${version}";
|
destination = "/bin/start_hol_light";
|
||||||
inherit version;
|
executable = true;
|
||||||
|
text = ''
|
||||||
src = fetchurl {
|
#!/bin/sh
|
||||||
url = "${webpage}${pname}_${version}.tgz";
|
exec ${ocaml}/bin/ocaml -init ${start_ml}
|
||||||
sha256 = "1jkn9vpl3n9dgb96zwmly32h1p3f9mcf34pg6vm0fyvqp9kbx3ac";
|
'';
|
||||||
};
|
} // {
|
||||||
|
inherit (hol_light_sources) version src;
|
||||||
buildInputs = [ ocaml_with_sources ];
|
|
||||||
|
|
||||||
buildCommand = ''
|
|
||||||
ensureDir "$out/src"
|
|
||||||
cd "$out/src"
|
|
||||||
|
|
||||||
tar -xzf "$src"
|
|
||||||
cd hol_light
|
|
||||||
|
|
||||||
substituteInPlace hol.ml --replace \
|
|
||||||
"(try Sys.getenv \"HOLLIGHT_DIR\" with Not_found -> Sys.getcwd())" \
|
|
||||||
"\"$out/src/hol_light\""
|
|
||||||
|
|
||||||
substituteInPlace Examples/update_database.ml --replace \
|
|
||||||
"Filename.concat ocaml_source_dir" \
|
|
||||||
"Filename.concat \"${ocaml_with_sources}/src/ocaml\""
|
|
||||||
|
|
||||||
echo '${dmtcp_checkpoint}' >> make.ml
|
|
||||||
|
|
||||||
make
|
|
||||||
'';
|
|
||||||
|
|
||||||
meta = {
|
meta = {
|
||||||
description = "An interactive theorem prover based on Higher-Order Logic.";
|
description = "An interactive theorem prover based on Higher-Order Logic.";
|
||||||
longDescription = ''
|
longDescription = ''
|
||||||
@ -66,7 +49,7 @@ real analysis) to save the user work. It is also fully programmable, so users
|
|||||||
can extend it with new theorems and inference rules without compromising its
|
can extend it with new theorems and inference rules without compromising its
|
||||||
soundness.
|
soundness.
|
||||||
'';
|
'';
|
||||||
homepage = webpage;
|
homepage = http://www.cl.cam.ac.uk/~jrh13/hol-light/;
|
||||||
license = "BSD";
|
license = "BSD";
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
@ -0,0 +1,99 @@
|
|||||||
|
{stdenv, writeTextFile, hol_light, dmtcp}:
|
||||||
|
let
|
||||||
|
mkRestartScript = checkpointFile:
|
||||||
|
let filename = "hol_light_${checkpointFile.variant}_dmtcp"; in
|
||||||
|
writeTextFile {
|
||||||
|
name = "${filename}-${hol_light.version}";
|
||||||
|
destination = "/bin/${filename}";
|
||||||
|
executable = true;
|
||||||
|
text = ''
|
||||||
|
#!/bin/sh
|
||||||
|
exec ${dmtcp}/bin/dmtcp_restart --quiet ${checkpointFile}
|
||||||
|
'';
|
||||||
|
};
|
||||||
|
|
||||||
|
mkCkptFile =
|
||||||
|
{ variant
|
||||||
|
, banner
|
||||||
|
, loads
|
||||||
|
, startCkpt ? null
|
||||||
|
, buildCommand ? ''
|
||||||
|
cp ${startCkpt} hol_light_restart.ckpt
|
||||||
|
(echo "$loadScript" | dmtcp_restart --quiet hol_light_restart.ckpt) || exit 0
|
||||||
|
cp hol_light_restart.ckpt $out
|
||||||
|
''
|
||||||
|
}:
|
||||||
|
stdenv.mkDerivation rec {
|
||||||
|
name = "hol_light_${variant}_dmtcp.checkpoint-${hol_light.version}";
|
||||||
|
inherit variant banner buildCommand;
|
||||||
|
buildInputs = [ dmtcp hol_light ];
|
||||||
|
loadScript = ''
|
||||||
|
${loads}
|
||||||
|
dmtcp_checkpoint "${banner}";;
|
||||||
|
'';
|
||||||
|
};
|
||||||
|
in
|
||||||
|
rec {
|
||||||
|
hol_light_core_dmtcp = mkRestartScript hol_light_core_dmtcp_ckpt;
|
||||||
|
hol_light_sosa_dmtcp = mkRestartScript hol_light_sosa_dmtcp_ckpt;
|
||||||
|
hol_light_card_dmtcp = mkRestartScript hol_light_card_dmtcp_ckpt;
|
||||||
|
hol_light_multivariate_dmtcp = mkRestartScript hol_light_multivariate_dmtcp_ckpt;
|
||||||
|
hol_light_complex_dmtcp = mkRestartScript hol_light_complex_dmtcp_ckpt;
|
||||||
|
|
||||||
|
hol_light_core_dmtcp_ckpt = mkCkptFile rec {
|
||||||
|
variant = "core";
|
||||||
|
banner = "";
|
||||||
|
loads = ''
|
||||||
|
#use "${./dmtcp_selfdestruct.ml}";;
|
||||||
|
'';
|
||||||
|
buildCommand = ''
|
||||||
|
(echo "$loadScript" | dmtcp_checkpoint --quiet ${hol_light}/bin/start_hol_light) || exit 0
|
||||||
|
mv ckpt* $out
|
||||||
|
'';
|
||||||
|
};
|
||||||
|
|
||||||
|
hol_light_multivariate_dmtcp_ckpt = mkCkptFile {
|
||||||
|
variant = "multivariate";
|
||||||
|
banner = "Preloaded with multivariate analysis";
|
||||||
|
loads = ''
|
||||||
|
loadt "Multivariate/make.ml";;
|
||||||
|
'';
|
||||||
|
startCkpt = hol_light_core_dmtcp_ckpt;
|
||||||
|
};
|
||||||
|
|
||||||
|
hol_light_sosa_dmtcp_ckpt = mkCkptFile {
|
||||||
|
variant = "sosa";
|
||||||
|
banner = "Preloaded with analysis and SOS";
|
||||||
|
loads = ''
|
||||||
|
loadt "Library/analysis.ml";;
|
||||||
|
loadt "Library/transc.ml";;
|
||||||
|
loadt "Examples/sos.ml";;
|
||||||
|
loadt "update_database.ml";;
|
||||||
|
'';
|
||||||
|
startCkpt = hol_light_core_dmtcp_ckpt;
|
||||||
|
};
|
||||||
|
|
||||||
|
hol_light_card_dmtcp_ckpt = mkCkptFile {
|
||||||
|
variant = "card";
|
||||||
|
banner = "Preloaded with cardinal arithmetic";
|
||||||
|
loads = ''
|
||||||
|
loadt "Library/card.ml";;
|
||||||
|
loadt "update_database.ml";;
|
||||||
|
'';
|
||||||
|
startCkpt = hol_light_core_dmtcp_ckpt;
|
||||||
|
};
|
||||||
|
|
||||||
|
hol_light_complex_dmtcp_ckpt = mkCkptFile {
|
||||||
|
variant = "complex";
|
||||||
|
banner = "Preloaded with multivariate-based complex analysis";
|
||||||
|
loads = ''
|
||||||
|
loadt "Multivariate/complexes.ml";;
|
||||||
|
loadt "Multivariate/canal.ml";;
|
||||||
|
loadt "Multivariate/transcendentals.ml";;
|
||||||
|
loadt "Multivariate/realanalysis.ml";;
|
||||||
|
loadt "Multivariate/cauchy.ml";;
|
||||||
|
loadt "Multivariate/complex_database.ml";;
|
||||||
|
'';
|
||||||
|
startCkpt = hol_light_multivariate_dmtcp_ckpt;
|
||||||
|
};
|
||||||
|
}
|
@ -0,0 +1,19 @@
|
|||||||
|
(* ------------------------------------------------------------------------- *)
|
||||||
|
(* Create a standalone HOL image. Assumes that we are running under Linux *)
|
||||||
|
(* and have the program "dmtcp" available to create checkpoints. *)
|
||||||
|
(* ------------------------------------------------------------------------- *)
|
||||||
|
|
||||||
|
let dmtcp_checkpoint, dmtcp_selfdestruct =
|
||||||
|
let call_dmtcp opts bannerstring =
|
||||||
|
let longer_banner = startup_banner ^ " with DMTCP" in
|
||||||
|
let complete_banner =
|
||||||
|
if bannerstring = "" then longer_banner
|
||||||
|
else longer_banner^"\n "^bannerstring in
|
||||||
|
(Gc.compact(); Unix.sleep 1;
|
||||||
|
Format.print_string "Checkpointing..."; Format.print_newline();
|
||||||
|
try ignore(Unix.system ("dmtcp_command -bc " ^ opts))
|
||||||
|
with Unix.Unix_error _ -> ();
|
||||||
|
Format.print_string complete_banner;
|
||||||
|
Format.print_newline(); Format.print_newline())
|
||||||
|
in
|
||||||
|
call_dmtcp "", call_dmtcp "-q";;
|
@ -1,33 +0,0 @@
|
|||||||
{stdenv, fetchurl}:
|
|
||||||
|
|
||||||
stdenv.mkDerivation {
|
|
||||||
name = "ocaml-with-sources-3.09.3";
|
|
||||||
src = fetchurl {
|
|
||||||
url = http://caml.inria.fr/pub/distrib/ocaml-3.09/ocaml-3.09.3.tar.bz2;
|
|
||||||
sha256 = "607842b4f4917a759f19541a421370a834f5b948855ca54cef40d22b19a0934f";
|
|
||||||
};
|
|
||||||
|
|
||||||
configureScript = ./configure-3.09.3;
|
|
||||||
|
|
||||||
builder = builtins.toFile "builder.sh" ''
|
|
||||||
source $stdenv/setup
|
|
||||||
ensureDir $out/src; cd $out/src
|
|
||||||
tar -xjf $src
|
|
||||||
mv ocaml-* ocaml
|
|
||||||
cd ocaml
|
|
||||||
CAT=$(type -tp cat)
|
|
||||||
sed -e "s@/bin/cat@$CAT@" -i config/auto-aux/sharpbang
|
|
||||||
$configureScript -no-tk -no-curses -prefix $out
|
|
||||||
make opt.opt
|
|
||||||
make install
|
|
||||||
'';
|
|
||||||
|
|
||||||
meta = {
|
|
||||||
description = "ocaml compiler with compiled sources retained.";
|
|
||||||
longDescription = ''
|
|
||||||
TODO
|
|
||||||
'';
|
|
||||||
homepage = http://caml.inria.fr/;
|
|
||||||
license = "LGP with linking exceptions";
|
|
||||||
};
|
|
||||||
}
|
|
35
pkgs/applications/science/logic/hol_light/parser_setup.patch
Normal file
35
pkgs/applications/science/logic/hol_light/parser_setup.patch
Normal file
@ -0,0 +1,35 @@
|
|||||||
|
diff -Nuar hol_light/hol.ml hol_light.nixos/hol.ml
|
||||||
|
--- hol_light/hol.ml 2010-09-12 18:57:28.000000000 +0200
|
||||||
|
+++ hol_light.nixos/hol.ml 2010-09-12 19:09:09.000000000 +0200
|
||||||
|
@@ -11,8 +11,8 @@
|
||||||
|
|
||||||
|
let hol_version = "2.20++";;
|
||||||
|
|
||||||
|
-let hol_dir = ref
|
||||||
|
- (try Sys.getenv "HOLLIGHT_DIR" with Not_found -> Sys.getcwd());;
|
||||||
|
+let hol_dir = ref "@HOL_LIGHT_SRC_DIR@";;
|
||||||
|
+Topdirs.dir_directory "@HOL_LIGHT_SRC_DIR@";;
|
||||||
|
|
||||||
|
(* ------------------------------------------------------------------------- *)
|
||||||
|
(* Should eventually change to "ref(Filename.temp_dir_name)". *)
|
||||||
|
@@ -23,20 +23,6 @@
|
||||||
|
let temp_path = ref "/tmp";;
|
||||||
|
|
||||||
|
(* ------------------------------------------------------------------------- *)
|
||||||
|
-(* Load in parsing extensions. *)
|
||||||
|
-(* For Ocaml < 3.10, use the built-in camlp4 *)
|
||||||
|
-(* and for Ocaml >= 3.10, use camlp5 instead. *)
|
||||||
|
-(* ------------------------------------------------------------------------- *)
|
||||||
|
-
|
||||||
|
-if let v = String.sub Sys.ocaml_version 0 4 in
|
||||||
|
- v = "3.10" or v = "3.11"
|
||||||
|
-then (Topdirs.dir_directory "+camlp5";
|
||||||
|
- Topdirs.dir_load Format.std_formatter "camlp5o.cma")
|
||||||
|
-else (Topdirs.dir_load Format.std_formatter "camlp4o.cma");;
|
||||||
|
-
|
||||||
|
-Topdirs.dir_load Format.std_formatter (Filename.concat (!hol_dir) "pa_j.cmo");;
|
||||||
|
-
|
||||||
|
-(* ------------------------------------------------------------------------- *)
|
||||||
|
(* Load files from system and/or user-settable directories. *)
|
||||||
|
(* Paths map initial "$/" to !hol_dir dynamically; use $$ to get the actual *)
|
||||||
|
(* $ character at the start of a directory. *)
|
@ -1,29 +0,0 @@
|
|||||||
(* ========================================================================= *)
|
|
||||||
(* Create a standalone HOL image. Assumes that we are running under Linux *)
|
|
||||||
(* and have the program "dmtcp" available to create checkpoints. *)
|
|
||||||
(* *)
|
|
||||||
(* (c) Copyright, John Harrison 1998-2007 *)
|
|
||||||
(* (c) Copyright, Marco Maggesi 2010 *)
|
|
||||||
(* ========================================================================= *)
|
|
||||||
|
|
||||||
#use "make.ml";;
|
|
||||||
|
|
||||||
(* ------------------------------------------------------------------------- *)
|
|
||||||
(* Non-destructive checkpoint using DMTCP. *)
|
|
||||||
(* ------------------------------------------------------------------------- *)
|
|
||||||
|
|
||||||
let checkpoint bannerstring =
|
|
||||||
let longer_banner = startup_banner ^ " with DMTCP" in
|
|
||||||
let complete_banner =
|
|
||||||
if bannerstring = "" then longer_banner
|
|
||||||
else longer_banner^"\n "^bannerstring in
|
|
||||||
(Gc.compact();
|
|
||||||
loadt "Examples/update_database.ml";
|
|
||||||
print_newline ();
|
|
||||||
Unix.sleep 1;
|
|
||||||
try ignore(Unix.system ("dmtcp_command -bc")) with _ -> ();
|
|
||||||
Format.print_string complete_banner;
|
|
||||||
Format.print_newline(); Format.print_newline());;
|
|
||||||
|
|
||||||
loadt "Multivariate/make_complex.ml";;
|
|
||||||
dmtcp_checkpoint "Preloaded with multivariate-based complex analysis";;
|
|
@ -1,28 +0,0 @@
|
|||||||
(* ========================================================================= *)
|
|
||||||
(* Create a standalone HOL image. Assumes that we are running under Linux *)
|
|
||||||
(* and have the program "dmtcp" available to create checkpoints. *)
|
|
||||||
(* *)
|
|
||||||
(* (c) Copyright, John Harrison 1998-2007 *)
|
|
||||||
(* (c) Copyright, Marco Maggesi 2010 *)
|
|
||||||
(* ========================================================================= *)
|
|
||||||
|
|
||||||
#use "make.ml";;
|
|
||||||
|
|
||||||
(* ------------------------------------------------------------------------- *)
|
|
||||||
(* Non-destructive checkpoint using DMTCP. *)
|
|
||||||
(* ------------------------------------------------------------------------- *)
|
|
||||||
|
|
||||||
let checkpoint bannerstring =
|
|
||||||
let longer_banner = startup_banner ^ " with DMTCP" in
|
|
||||||
let complete_banner =
|
|
||||||
if bannerstring = "" then longer_banner
|
|
||||||
else longer_banner^"\n "^bannerstring in
|
|
||||||
(Gc.compact();
|
|
||||||
loadt "Examples/update_database.ml";
|
|
||||||
print_newline ();
|
|
||||||
Unix.sleep 1;
|
|
||||||
try ignore(Unix.system ("dmtcp_command -bc")) with _ -> ();
|
|
||||||
Format.print_string complete_banner;
|
|
||||||
Format.print_newline(); Format.print_newline());;
|
|
||||||
|
|
||||||
dmtcp_checkpoint "";;
|
|
@ -1,29 +0,0 @@
|
|||||||
(* ========================================================================= *)
|
|
||||||
(* Create a standalone HOL image. Assumes that we are running under Linux *)
|
|
||||||
(* and have the program "dmtcp" available to create checkpoints. *)
|
|
||||||
(* *)
|
|
||||||
(* (c) Copyright, John Harrison 1998-2007 *)
|
|
||||||
(* (c) Copyright, Marco Maggesi 2010 *)
|
|
||||||
(* ========================================================================= *)
|
|
||||||
|
|
||||||
#use "make.ml";;
|
|
||||||
|
|
||||||
(* ------------------------------------------------------------------------- *)
|
|
||||||
(* Non-destructive checkpoint using DMTCP. *)
|
|
||||||
(* ------------------------------------------------------------------------- *)
|
|
||||||
|
|
||||||
let checkpoint bannerstring =
|
|
||||||
let longer_banner = startup_banner ^ " with DMTCP" in
|
|
||||||
let complete_banner =
|
|
||||||
if bannerstring = "" then longer_banner
|
|
||||||
else longer_banner^"\n "^bannerstring in
|
|
||||||
(Gc.compact();
|
|
||||||
loadt "Examples/update_database.ml";
|
|
||||||
print_newline ();
|
|
||||||
Unix.sleep 1;
|
|
||||||
try ignore(Unix.system ("dmtcp_command -bc")) with _ -> ();
|
|
||||||
Format.print_string complete_banner;
|
|
||||||
Format.print_newline(); Format.print_newline());;
|
|
||||||
|
|
||||||
loadt "Multivariate/make.ml";;
|
|
||||||
dmtcp_checkpoint "Preloaded with multivariate analysis";;
|
|
28
pkgs/applications/science/logic/hol_light/sources.nix
Normal file
28
pkgs/applications/science/logic/hol_light/sources.nix
Normal file
@ -0,0 +1,28 @@
|
|||||||
|
{stdenv, fetchsvn}:
|
||||||
|
|
||||||
|
stdenv.mkDerivation rec {
|
||||||
|
name = "hol_light_sources-${version}";
|
||||||
|
version = "20100820";
|
||||||
|
|
||||||
|
src = fetchsvn {
|
||||||
|
url = http://hol-light.googlecode.com/svn/trunk;
|
||||||
|
rev = "57";
|
||||||
|
sha256 = "d1372744abca6c9978673850977d3e1577fd8cfd8298826eb713b3681c10cccd";
|
||||||
|
};
|
||||||
|
|
||||||
|
buildCommand = ''
|
||||||
|
export HOL_DIR="$out/lib/hol_light"
|
||||||
|
ensureDir "$HOL_DIR"
|
||||||
|
cp -a "${src}" "$HOL_DIR/src"
|
||||||
|
cd "$HOL_DIR/src"
|
||||||
|
chmod +wX -R .
|
||||||
|
patch -p1 < ${./parser_setup.patch}
|
||||||
|
substituteInPlace hol.ml --subst-var-by HOL_LIGHT_SRC_DIR "$HOL_DIR/src"
|
||||||
|
'';
|
||||||
|
|
||||||
|
meta = {
|
||||||
|
description = "Sources for the HOL Light theorem prover";
|
||||||
|
homepage = http://www.cl.cam.ac.uk/~jrh13/hol-light/;
|
||||||
|
license = "BSD";
|
||||||
|
};
|
||||||
|
}
|
@ -12,11 +12,11 @@ let
|
|||||||
in
|
in
|
||||||
|
|
||||||
stdenv.mkDerivation rec {
|
stdenv.mkDerivation rec {
|
||||||
name = "git-1.7.2.1";
|
name = "git-1.7.2.3";
|
||||||
|
|
||||||
src = fetchurl {
|
src = fetchurl {
|
||||||
url = "mirror://kernel/software/scm/git/${name}.tar.bz2";
|
url = "mirror://kernel/software/scm/git/${name}.tar.bz2";
|
||||||
sha256 = "5446b4ece3b8d81b1fcbcd6c4b91f1961b6f4047a3f6173e3200bee368724921";
|
sha256 = "6139ec31d0a79cae04f469e73cc1f912162bb8f84ef7621ecc8630989fc81ba1";
|
||||||
};
|
};
|
||||||
|
|
||||||
patches = [ ./docbook2texi.patch ];
|
patches = [ ./docbook2texi.patch ];
|
||||||
|
@ -7,6 +7,7 @@ stdenv.mkDerivation rec {
|
|||||||
license = "GPLv2";
|
license = "GPLv2";
|
||||||
homepage = "http://digilander.libero.it/mcostalba/";
|
homepage = "http://digilander.libero.it/mcostalba/";
|
||||||
description = "Graphical front-end to Git";
|
description = "Graphical front-end to Git";
|
||||||
|
inherit (qt.meta) platforms;
|
||||||
};
|
};
|
||||||
src = fetchurl
|
src = fetchurl
|
||||||
{
|
{
|
||||||
|
@ -1,5 +1,5 @@
|
|||||||
{stdenv, fetchurl, boost, zlib, botan, libidn,
|
{stdenv, fetchurl, boost, zlib, botan, libidn,
|
||||||
lua, pcre, sqlite, perl, lib}:
|
lua, pcre, sqlite, perl, pkgconfig}:
|
||||||
|
|
||||||
let
|
let
|
||||||
version = "0.48";
|
version = "0.48";
|
||||||
@ -10,18 +10,14 @@ in stdenv.mkDerivation rec {
|
|||||||
url = "http://monotone.ca/downloads/${version}/monotone-${version}.tar.gz";
|
url = "http://monotone.ca/downloads/${version}/monotone-${version}.tar.gz";
|
||||||
sha256 = "3149abf0e4433a0e14c5da805a04dbbc45b16086bc267d473b17e933407d839d";
|
sha256 = "3149abf0e4433a0e14c5da805a04dbbc45b16086bc267d473b17e933407d839d";
|
||||||
};
|
};
|
||||||
buildInputs = [boost zlib botan libidn lua pcre sqlite];
|
buildInputs = [boost zlib botan libidn lua pcre sqlite pkgconfig];
|
||||||
preConfigure = ''
|
|
||||||
export sqlite_LIBS=-lsqlite3
|
|
||||||
export NIX_LDFLAGS="$NIX_LDFLAGS -ldl"
|
|
||||||
'';
|
|
||||||
postInstall = ''
|
postInstall = ''
|
||||||
ensureDir $out/share/${name}
|
ensureDir $out/share/${name}
|
||||||
cp -r contrib/ $out/share/${name}/contrib
|
cp -rv contrib/ $out/share/${name}/contrib
|
||||||
ensureDir $out/lib/perl5/site_perl/''${perl##*-perl-}
|
ensureDir $out/lib/perl5/site_perl/''${perl##*-perl-}
|
||||||
cp contrib/Monotone.pm $out/lib/perl5/site_perl/''${perl##*-perl-}
|
cp -v contrib/Monotone.pm $out/lib/perl5/site_perl/''${perl##*-perl-}
|
||||||
'';
|
'';
|
||||||
meta = {
|
meta = {
|
||||||
maintainers = [lib.maintainers.raskin];
|
maintainers = [stdenv.lib.maintainers.raskin];
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
@ -18,15 +18,36 @@ rec {
|
|||||||
inherit (s) name;
|
inherit (s) name;
|
||||||
inherit buildInputs;
|
inherit buildInputs;
|
||||||
|
|
||||||
phaseNames = ["prepareMakefiles" "doMake" "doDeploy"];
|
phaseNames = ["prepare_sgneeds" "dump0" "prepareMakefiles" "doMake" "doDeploy"];
|
||||||
|
|
||||||
|
dump0 = (a.doDump "0");
|
||||||
|
|
||||||
|
prepare_sgneeds = a.fullDepEntry (''
|
||||||
|
for d in bin include lib; do
|
||||||
|
ensureDir "$out/sgneeds/$d"
|
||||||
|
for p in "${spidermonkey_1_8_0rc1}"; do
|
||||||
|
for f in "$p"/"$d"/*; do
|
||||||
|
ln -sf "$f" "$out"/sgneeds/"$d"
|
||||||
|
done
|
||||||
|
done
|
||||||
|
done
|
||||||
|
|
||||||
|
ensureDir "$out/sgneeds/include/sgbrings"
|
||||||
|
ln -s "$out/sgneeds/include/js" "$out/sgneeds/include/sgbrings/js"
|
||||||
|
for f in "$out/sgneeds/lib/"libjs*; do
|
||||||
|
bn="$(basename "$f")"
|
||||||
|
ln -s "$f" "$out/sgneeds/lib/''${bn/libjs/libsgbrings_js}"
|
||||||
|
done
|
||||||
|
|
||||||
|
export SGNEEDS_DIR="$out"/sgneeds/
|
||||||
|
'') ["minInit" "defEnsureDir"];
|
||||||
|
|
||||||
prepareMakefiles = a.fullDepEntry ''
|
prepareMakefiles = a.fullDepEntry ''
|
||||||
find src -type f -exec sed -e 's@#include \([<"]\)sgbrings/js/js@#include \1js/js@g' -i '{}' ';'
|
|
||||||
cd ..
|
cd ..
|
||||||
mkdir build
|
mkdir build
|
||||||
cd build
|
cd build
|
||||||
export NIX_LDFLAGS="$NIX_LDFLAGS -lssl"
|
export NIX_LDFLAGS="$NIX_LDFLAGS -lssl"
|
||||||
cmake -G "Unix Makefiles" -D SGBRINGS_JS_INCDIR="${spidermonkey_1_8_0rc1}/include" -D SGBRINGS_JS_LIB="${spidermonkey_1_8_0rc1}/lib/libjs.a" ../veracity*
|
cmake -G "Unix Makefiles" -D SGNEEDS_DIR="$SGNEEDS_DIR" ../veracity*
|
||||||
'' ["minInit" "addInputs" "doUnpack"];
|
'' ["minInit" "addInputs" "doUnpack"];
|
||||||
|
|
||||||
doDeploy = a.fullDepEntry ''
|
doDeploy = a.fullDepEntry ''
|
||||||
|
@ -1,8 +1,9 @@
|
|||||||
rec {
|
rec {
|
||||||
version="0.3.0.10246";
|
version="0.3.1.10286";
|
||||||
name="veracity-0.3.0.10246";
|
name="veracity-0.3.1.10286";
|
||||||
hash="03wn6dzbjv5p50xmiznynza5c1nk38v95mzv6rk6km1ykqprnlw0";
|
hash="0cihzf2m4bxwf8z1va550q8yqpjwc2rs013rx0q8azl0idx0akah";
|
||||||
url="http://download-us.sourcegear.com/Veracity/0.3.0.10246/veracity-source-${version}.tar.gz";
|
url="http://download-us.sourcegear.com/Veracity/nightly/veracity-source-${version}.tar.gz";
|
||||||
advertisedUrl="http://download-us.sourcegear.com/Veracity/0.3.0.10246/veracity-source-0.3.0.10246.tar.gz";
|
advertisedUrl="http://download-us.sourcegear.com/Veracity/nightly/veracity-source-0.3.1.10286.tar.gz";
|
||||||
|
|
||||||
|
|
||||||
}
|
}
|
||||||
|
@ -1,4 +1,5 @@
|
|||||||
{
|
{
|
||||||
downloadPage = "http://sourcegear.com/veracity/downloads.html";
|
#downloadPage = "http://sourcegear.com/veracity/downloads.html";
|
||||||
|
downloadPage = "http://download-us.sourcegear.com/Veracity/nightly/index.html";
|
||||||
baseName = "veracity";
|
baseName = "veracity";
|
||||||
}
|
}
|
||||||
|
@ -1,11 +1,11 @@
|
|||||||
{stdenv, fetchurl, pkgconfig, glib, gtk, dbus, dbus_glib, GConf}:
|
{stdenv, fetchurl, pkgconfig, glib, gtk, dbus, dbus_glib, GConf}:
|
||||||
|
|
||||||
stdenv.mkDerivation rec {
|
stdenv.mkDerivation rec {
|
||||||
name = "gnome-mplayer-0.9.6";
|
name = "gnome-mplayer-0.9.99.rc1";
|
||||||
|
|
||||||
src = fetchurl {
|
src = fetchurl {
|
||||||
url = "http://gnome-mplayer.googlecode.com/files/${name}.tar.gz";
|
url = "http://gnome-mplayer.googlecode.com/files/${name}.tar.gz";
|
||||||
sha256 = "0gvciiy50y4vc9r6nlmw1q2fgwkywk0cq8rviswd6wbrxvz2gv2x";
|
sha256 = "00fbcjpashrld8bpvm63q9ms17kjnj3rrn1ghsfyqi2swpwzk2k1";
|
||||||
};
|
};
|
||||||
|
|
||||||
buildInputs = [pkgconfig glib gtk dbus dbus_glib GConf];
|
buildInputs = [pkgconfig glib gtk dbus dbus_glib GConf];
|
||||||
|
@ -1,11 +1,11 @@
|
|||||||
{ stdenv, fetchurl, lib, patchelf, cdrkit, kernel
|
{ stdenv, fetchurl, lib, patchelf, cdrkit, kernel
|
||||||
, libX11, libXt, libXext, libXmu, libXcomposite, libXfixes}:
|
, libX11, libXt, libXext, libXmu, libXcomposite, libXfixes, libXrandr, libXcursor}:
|
||||||
|
|
||||||
stdenv.mkDerivation {
|
stdenv.mkDerivation {
|
||||||
name = "VirtualBox-GuestAdditions-3.1.8";
|
name = "VirtualBox-GuestAdditions-3.2.8";
|
||||||
src = fetchurl {
|
src = fetchurl {
|
||||||
url = http://download.virtualbox.org/virtualbox/3.1.8/VBoxGuestAdditions_3.1.8.iso;
|
url = http://download.virtualbox.org/virtualbox/3.2.8/VBoxGuestAdditions_3.2.8.iso;
|
||||||
sha256 = "11fn49zxmd7nxmqn9pcakmzj6j9f8kfb38czpl8fhbnl2k4ggj5q";
|
sha256 = "1pyfgrcdmw6zf3yxgzcd8c5qzqqn62bz4085ka453gfmi9d65lys";
|
||||||
};
|
};
|
||||||
KERN_DIR = "${kernel}/lib/modules/*/build";
|
KERN_DIR = "${kernel}/lib/modules/*/build";
|
||||||
buildInputs = [ patchelf cdrkit ];
|
buildInputs = [ patchelf cdrkit ];
|
||||||
@ -53,7 +53,7 @@ stdenv.mkDerivation {
|
|||||||
done
|
done
|
||||||
|
|
||||||
# Change rpath for various binaries and libraries
|
# Change rpath for various binaries and libraries
|
||||||
patchelf --set-rpath ${stdenv.gcc.gcc}/lib:${libX11}/lib:${libXt}/lib:${libXext}/lib:${libXmu}/lib:${libXfixes}/lib bin/VBoxClient
|
patchelf --set-rpath ${stdenv.gcc.gcc}/lib:${libX11}/lib:${libXt}/lib:${libXext}/lib:${libXmu}/lib:${libXfixes}/lib:${libXrandr}/lib:${libXcursor}/lib bin/VBoxClient
|
||||||
|
|
||||||
for i in lib/VBoxOGL*.so
|
for i in lib/VBoxOGL*.so
|
||||||
do
|
do
|
||||||
@ -89,8 +89,8 @@ stdenv.mkDerivation {
|
|||||||
|
|
||||||
# Install Xorg drivers
|
# Install Xorg drivers
|
||||||
ensureDir $out/lib/xorg/modules/{drivers,input}
|
ensureDir $out/lib/xorg/modules/{drivers,input}
|
||||||
install -m 644 lib/VBoxGuestAdditions/vboxvideo_drv_17.so $out/lib/xorg/modules/drivers/vboxvideo_drv.so
|
install -m 644 lib/VBoxGuestAdditions/vboxvideo_drv_18.so $out/lib/xorg/modules/drivers/vboxvideo_drv.so
|
||||||
install -m 644 lib/VBoxGuestAdditions/vboxmouse_drv_17.so $out/lib/xorg/modules/input/vboxmouse_drv.so
|
install -m 644 lib/VBoxGuestAdditions/vboxmouse_drv_18.so $out/lib/xorg/modules/input/vboxmouse_drv.so
|
||||||
|
|
||||||
# Install kernel modules
|
# Install kernel modules
|
||||||
cd src
|
cd src
|
||||||
|
@ -1,36 +1,84 @@
|
|||||||
args :
|
{ stdenv, fetchurl, which, zlib, pkgconfig, SDL, openssl, python
|
||||||
let
|
, libuuid, gettext, ncurses, dev86, iasl, pciutils, bzip2, xz
|
||||||
lib = args.lib;
|
, lvm2, utillinux, procps }:
|
||||||
fetchurl = args.fetchurl;
|
|
||||||
fullDepEntry = args.fullDepEntry;
|
let version = "4.0.1"; in
|
||||||
|
|
||||||
|
stdenv.mkDerivation {
|
||||||
|
name = "xen-${version}";
|
||||||
|
|
||||||
version = lib.attrByPath ["version"] "3.3.0" args;
|
|
||||||
_buildInputs = with args; [
|
|
||||||
python e2fsprogs gnutls pkgconfig libjpeg
|
|
||||||
ncurses SDL libvncserver zlib graphviz ghostscript
|
|
||||||
texLive
|
|
||||||
];
|
|
||||||
in
|
|
||||||
rec {
|
|
||||||
src = fetchurl {
|
src = fetchurl {
|
||||||
url = "http://bits.xensource.com/oss-xen/release/${version}/xen-${version}.tar.gz";
|
url = "http://bits.xensource.com/oss-xen/release/${version}/xen-${version}.tar.gz";
|
||||||
sha256 = "0vghm31pqq8sc6x81jass2h5s22jlvv582xb8aq4j4cbcc5qixc9";
|
sha256 = "0ww8j5fa2jxg0zyx7d7z9jyv2j47m8w420sy16w3rf8d80lisvbf";
|
||||||
};
|
};
|
||||||
|
|
||||||
buildInputs = lib.filter (x: x != null) _buildInputs;
|
patches =
|
||||||
configureFlags = [];
|
[ # Xen looks for headers in /usr/include and for libraries using
|
||||||
|
# ldconfig. Don't do that.
|
||||||
|
./has-header.patch
|
||||||
|
];
|
||||||
|
|
||||||
/* doConfigure should be specified separately */
|
buildInputs =
|
||||||
phaseNames = ["makeTools" "makeXen"];
|
[ which zlib pkgconfig SDL openssl python libuuid gettext ncurses
|
||||||
|
dev86 iasl pciutils bzip2 xz
|
||||||
|
];
|
||||||
|
|
||||||
|
makeFlags = "PREFIX=$(out) CONFIG_DIR=/etc";
|
||||||
|
|
||||||
|
buildFlags = "xen tools";
|
||||||
|
|
||||||
|
preBuild =
|
||||||
|
''
|
||||||
|
substituteInPlace tools/libfsimage/common/fsimage_plugin.c \
|
||||||
|
--replace /usr $out
|
||||||
|
|
||||||
|
substituteInPlace tools/blktap2/lvm/lvm-util.c \
|
||||||
|
--replace /usr/sbin/vgs ${lvm2}/sbin/vgs \
|
||||||
|
--replace /usr/sbin/lvs ${lvm2}/sbin/lvs
|
||||||
|
|
||||||
|
substituteInPlace tools/hotplug/Linux/network-bridge \
|
||||||
|
--replace /usr/bin/logger ${utillinux}/bin/logger
|
||||||
|
|
||||||
|
substituteInPlace tools/xenmon/xenmon.py \
|
||||||
|
--replace /usr/bin/pkill ${procps}/bin/pkill
|
||||||
|
|
||||||
|
substituteInPlace tools/xenstat/Makefile \
|
||||||
|
--replace /usr/include/curses.h ${ncurses}/include/curses.h
|
||||||
|
|
||||||
|
# Work around a bug in our GCC wrapper: `gcc -MF foo -v' doesn't
|
||||||
|
# print the GCC version number properly.
|
||||||
|
substituteInPlace xen/Makefile \
|
||||||
|
--replace '$(CC) $(CFLAGS) -v' '$(CC) -v'
|
||||||
|
|
||||||
|
substituteInPlace tools/python/xen/xend/server/BlktapController.py \
|
||||||
|
--replace /usr/sbin/tapdisk2 $out/sbin/tapdisk2
|
||||||
|
|
||||||
|
substituteInPlace tools/python/xen/xend/XendQCoWStorageRepo.py \
|
||||||
|
--replace /usr/sbin/qcow-create $out/sbin/qcow-create
|
||||||
|
'';
|
||||||
|
|
||||||
|
installPhase =
|
||||||
|
''
|
||||||
|
cp -prvd dist/install/nix/store/* $out
|
||||||
|
cp -prvd dist/install/boot $out/boot
|
||||||
|
cp -prvd dist/install/etc $out/etc
|
||||||
|
''; # */
|
||||||
|
|
||||||
|
postFixup =
|
||||||
|
''
|
||||||
|
# Set the Python search path in all Python scripts.
|
||||||
|
for fn in $(grep -l '#!.*python' $out/bin/* $out/sbin/*); do
|
||||||
|
sed -i "$fn" -e "1 a import sys\nsys.path = ['$out/lib/python2.6/site-packages'] + sys.path"
|
||||||
|
done
|
||||||
|
|
||||||
|
# Remove calls to `env'.
|
||||||
|
for fn in $(grep -l '#!.*/env.*python' $out/bin/* $out/sbin/*); do
|
||||||
|
sed -i "$fn" -e "1 s^/nix/store/.*/env.*python^${python}/bin/python^"
|
||||||
|
done
|
||||||
|
''; # */
|
||||||
|
|
||||||
makeTools = fullDepEntry (''make -C tools install PREFIX=$out '')
|
|
||||||
["minInit" "addInputs" "doUnpack"];
|
|
||||||
|
|
||||||
makeXen = fullDepEntry (''make -C xen install PREFIX=$out '')
|
|
||||||
["minInit" "addInputs" "doUnpack"];
|
|
||||||
|
|
||||||
name = "xen-" + version;
|
|
||||||
meta = {
|
meta = {
|
||||||
description = "Xen paravirtualization tools";
|
homepage = http://www.xen.org/;
|
||||||
|
description = "Xen hypervisor and management tools for Dom0";
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
40
pkgs/applications/virtualization/xen/has-header.patch
Normal file
40
pkgs/applications/virtualization/xen/has-header.patch
Normal file
@ -0,0 +1,40 @@
|
|||||||
|
diff -ru --exclude '*~' xen-4.0.1-orig/tools/check/funcs.sh xen-4.0.1/tools/check/funcs.sh
|
||||||
|
--- xen-4.0.1-orig/tools/check/funcs.sh 2010-08-25 12:22:07.000000000 +0200
|
||||||
|
+++ xen-4.0.1/tools/check/funcs.sh 2010-09-09 17:47:20.000000000 +0200
|
||||||
|
@@ -25,33 +25,13 @@
|
||||||
|
}
|
||||||
|
|
||||||
|
has_header() {
|
||||||
|
- case $1 in
|
||||||
|
- /*) ;;
|
||||||
|
- *) set -- "/usr/include/$1" ;;
|
||||||
|
- esac
|
||||||
|
-
|
||||||
|
- check_sys_root || return 1
|
||||||
|
-
|
||||||
|
- test -r "$CROSS_SYS_ROOT$1"
|
||||||
|
- return $?
|
||||||
|
+ echo "#include <$1>" | gcc -E - > /dev/null && return 0
|
||||||
|
+ return 1
|
||||||
|
}
|
||||||
|
|
||||||
|
has_lib() {
|
||||||
|
check_sys_root || return 1
|
||||||
|
-
|
||||||
|
- # subshell to prevent pollution of caller's environment
|
||||||
|
- (
|
||||||
|
- PATH=/sbin:$PATH # for ldconfig
|
||||||
|
-
|
||||||
|
- # This relatively common in a sys-root; libs are installed but
|
||||||
|
- # ldconfig hasn't run there, so ldconfig -p won't work.
|
||||||
|
- if [ "$OS" = Linux -a ! -f "$CROSS_SYS_ROOT/etc/ld.so.cache" ]; then
|
||||||
|
- echo "Please run ldconfig -r \"$CROSS_SYS_ROOT\" to generate ld.so.cache"
|
||||||
|
- # fall through; ldconfig test below should fail
|
||||||
|
- fi
|
||||||
|
- ldconfig -p ${CROSS_SYS_ROOT+-r "$CROSS_SYS_ROOT"} | grep -Fq "$1"
|
||||||
|
- return $?
|
||||||
|
- )
|
||||||
|
+ return 0
|
||||||
|
}
|
||||||
|
|
||||||
|
test_link() {
|
@ -4,11 +4,11 @@
|
|||||||
, docbook_xml_dtd_45, libxslt, coreutils}:
|
, docbook_xml_dtd_45, libxslt, coreutils}:
|
||||||
|
|
||||||
stdenv.mkDerivation rec {
|
stdenv.mkDerivation rec {
|
||||||
name = "awesome-3.4.6";
|
name = "awesome-3.4.7";
|
||||||
|
|
||||||
src = fetchurl {
|
src = fetchurl {
|
||||||
url = http://awesome.naquadah.org/download/awesome-3.4.6.tar.xz;
|
url = http://awesome.naquadah.org/download/awesome-3.4.7.tar.xz;
|
||||||
sha256 = "1bxym326pl32q5jsaqa7p785k8yviinzj0q1l42pdhiiq717zbwi";
|
sha256 = "1l5c730y17wxqm6p9fybjg84nk01jpg30wg14qjpc7xs5pd11993";
|
||||||
};
|
};
|
||||||
|
|
||||||
buildInputs = [ xz cmake gperf imagemagick pkgconfig lua glib cairo pango
|
buildInputs = [ xz cmake gperf imagemagick pkgconfig lua glib cairo pango
|
||||||
|
@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
|
|||||||
patches =
|
patches =
|
||||||
[ (fetchurl {
|
[ (fetchurl {
|
||||||
url = "http://git.savannah.gnu.org/cgit/ratpoison.git/patch/?id=4ad0b38fb53506d613c4b4f7268dadfcedae9b8e";
|
url = "http://git.savannah.gnu.org/cgit/ratpoison.git/patch/?id=4ad0b38fb53506d613c4b4f7268dadfcedae9b8e";
|
||||||
sha256 = "09aa5l7qicld1prfsql6znlz3z8j67rlznw1vj7aja435rxm4lq9";
|
sha256 = "118c5b481fa22b8fefbe34e3dbb157f621a3bf5de0c7beb540001c99ff403a5f";
|
||||||
})
|
})
|
||||||
];
|
];
|
||||||
|
|
||||||
|
@ -46,30 +46,23 @@ stdenv.mkDerivation ( rec {
|
|||||||
mvn test ${mvnFlags}
|
mvn test ${mvnFlags}
|
||||||
|
|
||||||
if [ -d target/site/cobertura ] ; then
|
if [ -d target/site/cobertura ] ; then
|
||||||
cp -R target/site/cobertura $out/cobertura
|
echo "report coverage $out/site/cobertura" >> $out/nix-support/hydra-build-products
|
||||||
echo "report coverage $out/cobertura" >> $out/nix-support/hydra-build-products
|
|
||||||
fi
|
fi
|
||||||
|
|
||||||
if [ -d target/surefire-reports ] ; then
|
if [ -d target/surefire-reports ] ; then
|
||||||
mvn surefire-report:report-only
|
mvn surefire-report:report-only
|
||||||
cp -vR target/surefire-reports $out/surefire
|
echo "report coverage $out/site/surefire-report.html" >> $out/nix-support/hydra-build-products
|
||||||
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
|
fi
|
||||||
'';
|
'';
|
||||||
|
|
||||||
mvnJavadoc = ''
|
mvnJavadoc = ''
|
||||||
mvn javadoc:javadoc ${mvnFlags}
|
mvn javadoc:javadoc ${mvnFlags}
|
||||||
cp -R target/site/apidocs $out/apidocs
|
echo "report javadoc $out/site/apidocs" >> $out/nix-support/hydra-build-products
|
||||||
echo "report javadoc $out/apidocs" >> $out/nix-support/hydra-build-products
|
|
||||||
'';
|
'';
|
||||||
|
|
||||||
mvnCheckstyle = ''
|
mvnCheckstyle = ''
|
||||||
mvn checkstyle:checkstyle ${mvnFlags}
|
mvn checkstyle:checkstyle ${mvnFlags}
|
||||||
ensureDir $out/checkstyle
|
echo "report checkstyle $out/site/checkstyle.html" >> $out/nix-support/hydra-build-products
|
||||||
cp -R target/site/checkstyle.* $out/checkstyle/
|
|
||||||
cp -R target/site/images $out/checkstyle/images
|
|
||||||
echo "report checkstyle $out/checkstyle/checkstyle.html" >> $out/nix-support/hydra-build-products
|
|
||||||
'';
|
'';
|
||||||
|
|
||||||
mvnJar = ''
|
mvnJar = ''
|
||||||
@ -77,12 +70,12 @@ stdenv.mkDerivation ( rec {
|
|||||||
'';
|
'';
|
||||||
|
|
||||||
mvnAssembly = ''
|
mvnAssembly = ''
|
||||||
mvn assembly:single ${mvnFlags}
|
mvn assembly:assembly -Dmaven.test.skip.exec=true ${mvnFlags}
|
||||||
'';
|
'';
|
||||||
|
|
||||||
mvnRelease = ''
|
mvnRelease = ''
|
||||||
ensureDir $out/release
|
ensureDir $out/release
|
||||||
ls -l target/
|
|
||||||
zip=$(ls target/*.zip| head -1)
|
zip=$(ls target/*.zip| head -1)
|
||||||
releaseName=$(basename $zip .zip)
|
releaseName=$(basename $zip .zip)
|
||||||
releaseName="$releaseName-r${toString src.rev}"
|
releaseName="$releaseName-r${toString src.rev}"
|
||||||
@ -96,8 +89,10 @@ ls -l target/
|
|||||||
'';
|
'';
|
||||||
|
|
||||||
finalPhase = ''
|
finalPhase = ''
|
||||||
ensureDir $out/site
|
if [ -d target/site ] ; then
|
||||||
cp -R src/test/site/* $out/site
|
cp -R target/site $out/
|
||||||
|
echo "report site $out/site" >> $out/nix-support/hydra-build-products
|
||||||
|
fi
|
||||||
'';
|
'';
|
||||||
} // args
|
} // args
|
||||||
)
|
)
|
||||||
|
@ -5,7 +5,9 @@
|
|||||||
# it turns on GCC's coverage analysis feature. It then runs `make
|
# it turns on GCC's coverage analysis feature. It then runs `make
|
||||||
# check' and produces a coverage analysis report using `lcov'.
|
# check' and produces a coverage analysis report using `lcov'.
|
||||||
|
|
||||||
{ doCoverageAnalysis ? false
|
{ buildOutOfSourceTree ? false
|
||||||
|
, preConfigure ? null
|
||||||
|
, doCoverageAnalysis ? false
|
||||||
, lcovFilter ? []
|
, lcovFilter ? []
|
||||||
, lcovExtraTraceFiles ? []
|
, lcovExtraTraceFiles ? []
|
||||||
, src, stdenv
|
, src, stdenv
|
||||||
@ -94,4 +96,24 @@ stdenv.mkDerivation (
|
|||||||
};
|
};
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
//
|
||||||
|
|
||||||
|
(if buildOutOfSourceTree
|
||||||
|
then {
|
||||||
|
preConfigure =
|
||||||
|
# Build out of source tree and make the source tree read-only. This
|
||||||
|
# helps catch violations of the GNU Coding Standards (info
|
||||||
|
# "(standards) Configuration"), like `make distcheck' does.
|
||||||
|
'' mkdir "../build"
|
||||||
|
cd "../build"
|
||||||
|
configureScript="../$sourceRoot/configure"
|
||||||
|
chmod -R a-w "../$sourceRoot"
|
||||||
|
|
||||||
|
echo "building out of source tree, from \`$PWD'..."
|
||||||
|
|
||||||
|
${if preConfigure != null then preConfigure else ""}
|
||||||
|
'';
|
||||||
|
}
|
||||||
|
else {})
|
||||||
)
|
)
|
||||||
|
@ -334,6 +334,7 @@ rec {
|
|||||||
that allows you to boot into the VM and debug it interactively. */
|
that allows you to boot into the VM and debug it interactively. */
|
||||||
|
|
||||||
runInLinuxVM = drv: lib.overrideDerivation drv (attrs: {
|
runInLinuxVM = drv: lib.overrideDerivation drv (attrs: {
|
||||||
|
requiredSystemFeatures = [ "kvm" ];
|
||||||
builder = "${bash}/bin/sh";
|
builder = "${bash}/bin/sh";
|
||||||
args = ["-e" (vmRunCommand qemuCommandLinux)];
|
args = ["-e" (vmRunCommand qemuCommandLinux)];
|
||||||
origArgs = attrs.args;
|
origArgs = attrs.args;
|
||||||
@ -369,6 +370,7 @@ rec {
|
|||||||
*/
|
*/
|
||||||
runInGenericVM = drv: lib.overrideDerivation drv (attrs: {
|
runInGenericVM = drv: lib.overrideDerivation drv (attrs: {
|
||||||
system = "i686-linux";
|
system = "i686-linux";
|
||||||
|
requiredSystemFeatures = [ "kvm" ];
|
||||||
builder = "${bash}/bin/sh";
|
builder = "${bash}/bin/sh";
|
||||||
args = ["-e" (vmRunCommand qemuCommandGeneric)];
|
args = ["-e" (vmRunCommand qemuCommandGeneric)];
|
||||||
QEMU_OPTS = "-m ${toString (if attrs ? memSize then attrs.memSize else 256)}";
|
QEMU_OPTS = "-m ${toString (if attrs ? memSize then attrs.memSize else 256)}";
|
||||||
@ -1115,7 +1117,7 @@ rec {
|
|||||||
fullName = "Debian 5.0.5 Lenny (i386)";
|
fullName = "Debian 5.0.5 Lenny (i386)";
|
||||||
packagesList = fetchurl {
|
packagesList = fetchurl {
|
||||||
url = mirror://debian/dists/lenny/main/binary-i386/Packages.bz2;
|
url = mirror://debian/dists/lenny/main/binary-i386/Packages.bz2;
|
||||||
sha256 = "cd8158a16c1d3990d35116dfe88005fe685102f591268f8588d3222a02a11339";
|
sha256 = "df450198f1597b526281e507e858f614ceafbd1b4f047c8ed994648f3e2ece19";
|
||||||
};
|
};
|
||||||
urlPrefix = mirror://debian;
|
urlPrefix = mirror://debian;
|
||||||
packages = commonDebianPackages;
|
packages = commonDebianPackages;
|
||||||
@ -1126,7 +1128,7 @@ rec {
|
|||||||
fullName = "Debian 5.0.5 Lenny (amd64)";
|
fullName = "Debian 5.0.5 Lenny (amd64)";
|
||||||
packagesList = fetchurl {
|
packagesList = fetchurl {
|
||||||
url = mirror://debian/dists/lenny/main/binary-amd64/Packages.bz2;
|
url = mirror://debian/dists/lenny/main/binary-amd64/Packages.bz2;
|
||||||
sha256 = "aceb161a534a641c205fca7eabb27d60180c0616104be49562a0997a44571c42";
|
sha256 = "1817h2ag6fmrlifh1b9kv3zjr5ghknf53f38s1rqwfq6vh0avsig";
|
||||||
};
|
};
|
||||||
urlPrefix = mirror://debian;
|
urlPrefix = mirror://debian;
|
||||||
packages = commonDebianPackages;
|
packages = commonDebianPackages;
|
||||||
|
@ -1,11 +1,11 @@
|
|||||||
{stdenv, fetchurl}:
|
{stdenv, fetchurl}:
|
||||||
|
|
||||||
stdenv.mkDerivation rec {
|
stdenv.mkDerivation rec {
|
||||||
name = "man-pages-3.24";
|
name = "man-pages-3.25";
|
||||||
|
|
||||||
src = fetchurl {
|
src = fetchurl {
|
||||||
url = "mirror://kernel/linux/docs/man-pages/Archive/${name}.tar.bz2";
|
url = "mirror://kernel/linux/docs/man-pages/Archive/${name}.tar.bz2";
|
||||||
sha256 = "0038v3ddg0mpg2iakdhgd5bg69xw4625si91nf1b0vrh9791fiz4";
|
sha256 = "1cq3zijmbsnjshkm78kffgqrdsxgg7ypvcf2digdyy0s9himnvwc";
|
||||||
};
|
};
|
||||||
|
|
||||||
preBuild =
|
preBuild =
|
||||||
|
@ -1,6 +1,7 @@
|
|||||||
pkgs:
|
pkgs:
|
||||||
|
pkgs.makeOverridable
|
||||||
rec {
|
(__overrides: rec {
|
||||||
|
inherit __overrides;
|
||||||
|
|
||||||
inherit (pkgs.gtkLibs) glib pango atk gtk gtkmm;
|
inherit (pkgs.gtkLibs) glib pango atk gtk gtkmm;
|
||||||
|
|
||||||
@ -230,6 +231,11 @@ rec {
|
|||||||
inherit (pkgs) stdenv fetchurl pkgconfig perl perlXMLParser libxml2 libxslt docbook_xml_dtd_42 automake;
|
inherit (pkgs) stdenv fetchurl pkgconfig perl perlXMLParser libxml2 libxslt docbook_xml_dtd_42 automake;
|
||||||
};
|
};
|
||||||
|
|
||||||
|
# scrollkeeper replacement
|
||||||
|
rarian = import ./desktop/rarian {
|
||||||
|
inherit (pkgs) stdenv fetchurl pkgconfig perl perlXMLParser libxml2 libxslt docbook_xml_dtd_42;
|
||||||
|
};
|
||||||
|
|
||||||
gnome_doc_utils = import ./desktop/gnome-doc-utils {
|
gnome_doc_utils = import ./desktop/gnome-doc-utils {
|
||||||
inherit (pkgs) stdenv fetchurl python pkgconfig libxslt
|
inherit (pkgs) stdenv fetchurl python pkgconfig libxslt
|
||||||
makeWrapper;
|
makeWrapper;
|
||||||
@ -326,4 +332,4 @@ rec {
|
|||||||
inherit gtkmm libglade;
|
inherit gtkmm libglade;
|
||||||
};
|
};
|
||||||
|
|
||||||
}
|
}) {}
|
||||||
|
11
pkgs/desktops/gnome-2.28/desktop/rarian/default.nix
Normal file
11
pkgs/desktops/gnome-2.28/desktop/rarian/default.nix
Normal file
@ -0,0 +1,11 @@
|
|||||||
|
{stdenv, fetchurl, pkgconfig, perl, perlXMLParser, libxml2, libxslt, docbook_xml_dtd_42}:
|
||||||
|
|
||||||
|
stdenv.mkDerivation rec {
|
||||||
|
name = "rarian-0.8.1";
|
||||||
|
src = fetchurl {
|
||||||
|
url = "mirror://gnome/sources/rarian/0.8/${name}.tar.bz2";
|
||||||
|
sha256 = "aafe886d46e467eb3414e91fa9e42955bd4b618c3e19c42c773026b205a84577";
|
||||||
|
};
|
||||||
|
buildInputs = [pkgconfig perl perlXMLParser libxml2 libxslt];
|
||||||
|
configureFlags = "--with-xml-catalog=${docbook_xml_dtd_42}/xml/dtd/docbook/docbook.cat";
|
||||||
|
}
|
@ -290,13 +290,7 @@ pkgs.recurseIntoAttrs (rec {
|
|||||||
poppler = pkgs.popplerQt4;
|
poppler = pkgs.popplerQt4;
|
||||||
};
|
};
|
||||||
|
|
||||||
ktorrent = import ./extragear/ktorrent {
|
inherit (pkgs) konversation yakuake ktorrent;
|
||||||
inherit (pkgs) stdenv fetchurl lib cmake qt4 perl gmp taglib boost gettext;
|
|
||||||
inherit kdelibs kdepimlibs kdebase_workspace;
|
|
||||||
inherit automoc4 phonon qca2;
|
|
||||||
};
|
|
||||||
|
|
||||||
inherit (pkgs) konversation yakuake;
|
|
||||||
|
|
||||||
gtk_qt_engine = import ./extragear/gtk-qt-engine {
|
gtk_qt_engine = import ./extragear/gtk-qt-engine {
|
||||||
inherit (pkgs) stdenv fetchurl cmake qt4 perl gettext;
|
inherit (pkgs) stdenv fetchurl cmake qt4 perl gettext;
|
||||||
|
@ -1,19 +0,0 @@
|
|||||||
{stdenv, fetchurl, lib, cmake, qt4, perl, gmp, taglib, boost, gettext,
|
|
||||||
kdelibs, kdepimlibs, kdebase_workspace, automoc4, phonon, qca2}:
|
|
||||||
|
|
||||||
stdenv.mkDerivation {
|
|
||||||
name = "ktorrent-3.3.4";
|
|
||||||
src = fetchurl {
|
|
||||||
url = http://ktorrent.org/downloads/3.3.4/ktorrent-3.3.4.tar.bz2;
|
|
||||||
sha256 = "09lq5140135v9919k4wfmqww5jm17yvyqny8hlk10zyzd42vh7zk";
|
|
||||||
};
|
|
||||||
cmakeFlags = "-DTASKMANAGER_INCLUDE_DIR=${kdebase_workspace}/include";
|
|
||||||
buildInputs = [ cmake qt4 perl gmp taglib boost gettext stdenv.gcc.libc
|
|
||||||
kdelibs kdepimlibs kdebase_workspace automoc4 phonon qca2 ];
|
|
||||||
meta = {
|
|
||||||
description = "KDE integrated BitTorrent client";
|
|
||||||
license = "GPL";
|
|
||||||
homepage = http://ktorrent.org;
|
|
||||||
maintainers = [ lib.maintainers.sander ];
|
|
||||||
};
|
|
||||||
}
|
|
14
pkgs/desktops/kde-4.5/accessibility/color-schemes.nix
Normal file
14
pkgs/desktops/kde-4.5/accessibility/color-schemes.nix
Normal file
@ -0,0 +1,14 @@
|
|||||||
|
{ kde, cmake, qt4, perl, automoc4, kdelibs }:
|
||||||
|
|
||||||
|
kde.package {
|
||||||
|
buildInputs = [ cmake qt4 perl kdelibs automoc4 ];
|
||||||
|
|
||||||
|
meta = {
|
||||||
|
description = "KDE Accessibility color schemes";
|
||||||
|
kde = {
|
||||||
|
name = "ColorSchemes";
|
||||||
|
module = "kdeaccessibility";
|
||||||
|
version = "4.5.1";
|
||||||
|
};
|
||||||
|
};
|
||||||
|
}
|
@ -1,14 +0,0 @@
|
|||||||
{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";
|
|
||||||
};
|
|
||||||
}
|
|
15
pkgs/desktops/kde-4.5/accessibility/icon-themes.nix
Normal file
15
pkgs/desktops/kde-4.5/accessibility/icon-themes.nix
Normal file
@ -0,0 +1,15 @@
|
|||||||
|
{ kde, cmake, qt4, perl, automoc4, kdelibs }:
|
||||||
|
|
||||||
|
kde.package {
|
||||||
|
buildInputs = [ cmake qt4 perl kdelibs automoc4 ];
|
||||||
|
|
||||||
|
meta = {
|
||||||
|
description = "KDE mono icon theme";
|
||||||
|
kde = {
|
||||||
|
name = "IconThemes";
|
||||||
|
module = "kdeaccessibility";
|
||||||
|
version = "4.5.1";
|
||||||
|
};
|
||||||
|
};
|
||||||
|
}
|
||||||
|
|
17
pkgs/desktops/kde-4.5/accessibility/jovie.nix
Normal file
17
pkgs/desktops/kde-4.5/accessibility/jovie.nix
Normal file
@ -0,0 +1,17 @@
|
|||||||
|
{ kde, cmake, qt4, perl, automoc4, kdelibs }:
|
||||||
|
|
||||||
|
kde.package {
|
||||||
|
buildInputs = [ cmake qt4 perl kdelibs automoc4 ];
|
||||||
|
|
||||||
|
#TODO: working backend: speechd or opentts
|
||||||
|
meta = {
|
||||||
|
description = "Text-to-speech synthesis daemon";
|
||||||
|
kde = {
|
||||||
|
name = "jovie";
|
||||||
|
module = "kdeaccessibility";
|
||||||
|
version = "0.6.0";
|
||||||
|
release = "4.5.1";
|
||||||
|
};
|
||||||
|
};
|
||||||
|
}
|
||||||
|
|
16
pkgs/desktops/kde-4.5/accessibility/kmag.nix
Normal file
16
pkgs/desktops/kde-4.5/accessibility/kmag.nix
Normal file
@ -0,0 +1,16 @@
|
|||||||
|
{ kde, cmake, qt4, perl, automoc4, kdelibs }:
|
||||||
|
|
||||||
|
kde.package {
|
||||||
|
buildInputs = [ cmake qt4 perl kdelibs automoc4 ];
|
||||||
|
|
||||||
|
meta = {
|
||||||
|
description = "Screen magnifier for KDE";
|
||||||
|
kde = {
|
||||||
|
name = "kmag";
|
||||||
|
module = "kdeaccessibility";
|
||||||
|
version = "1.0";
|
||||||
|
release = "4.5.1";
|
||||||
|
};
|
||||||
|
};
|
||||||
|
}
|
||||||
|
|
16
pkgs/desktops/kde-4.5/accessibility/kmousetool.nix
Normal file
16
pkgs/desktops/kde-4.5/accessibility/kmousetool.nix
Normal file
@ -0,0 +1,16 @@
|
|||||||
|
{ kde, cmake, qt4, perl, automoc4, kdelibs, libXtst }:
|
||||||
|
|
||||||
|
kde.package {
|
||||||
|
buildInputs = [ cmake qt4 perl kdelibs automoc4 libXtst ];
|
||||||
|
|
||||||
|
meta = {
|
||||||
|
description = "A program that clicks the mouse for you";
|
||||||
|
kde = {
|
||||||
|
name = "kmousetool";
|
||||||
|
module = "kdeaccessibility";
|
||||||
|
version = "1.12";
|
||||||
|
release = "4.5.1";
|
||||||
|
};
|
||||||
|
};
|
||||||
|
}
|
||||||
|
|
16
pkgs/desktops/kde-4.5/accessibility/kmouth.nix
Normal file
16
pkgs/desktops/kde-4.5/accessibility/kmouth.nix
Normal file
@ -0,0 +1,16 @@
|
|||||||
|
{ kde, cmake, qt4, perl, automoc4, kdelibs }:
|
||||||
|
|
||||||
|
kde.package {
|
||||||
|
buildInputs = [ cmake qt4 perl kdelibs automoc4 ];
|
||||||
|
|
||||||
|
meta = {
|
||||||
|
description = "A type-and-say front end for speech synthesizers";
|
||||||
|
kde = {
|
||||||
|
name = "kmouth";
|
||||||
|
module = "kdeaccessibility";
|
||||||
|
version = "1.1.1";
|
||||||
|
release = "4.5.1";
|
||||||
|
};
|
||||||
|
};
|
||||||
|
}
|
||||||
|
|
@ -1,15 +1,15 @@
|
|||||||
{ kdePackage, cmake, qt4, pkgconfig, perl, python
|
{ kde, cmake, qt4, pkgconfig, perl, python
|
||||||
, sip, pyqt4, pycups, rhpl, system_config_printer
|
, sip, pyqt4, pycups, rhpl, system_config_printer
|
||||||
, kdelibs, kdepimlibs, kdebindings, automoc4}:
|
, kdelibs, kdepimlibs, kdebindings, automoc4}:
|
||||||
|
|
||||||
kdePackage {
|
kde.package {
|
||||||
pn = "kdeadmin";
|
|
||||||
v = "4.5.0";
|
|
||||||
|
|
||||||
builder = ./builder.sh;
|
builder = ./builder.sh;
|
||||||
|
|
||||||
inherit system_config_printer;
|
inherit system_config_printer;
|
||||||
|
|
||||||
|
# TODO: split, check which packages work on nixos
|
||||||
|
|
||||||
PYTHONPATH = "${pycups}/lib/python${python.majorVersion}/site-packages";
|
PYTHONPATH = "${pycups}/lib/python${python.majorVersion}/site-packages";
|
||||||
|
|
||||||
buildInputs = [ cmake qt4 pkgconfig perl python sip pyqt4 pycups rhpl system_config_printer
|
buildInputs = [ cmake qt4 pkgconfig perl python sip pyqt4 pycups rhpl system_config_printer
|
||||||
@ -18,5 +18,9 @@ kdePackage {
|
|||||||
meta = {
|
meta = {
|
||||||
description = "KDE Administration Utilities";
|
description = "KDE Administration Utilities";
|
||||||
license = "GPL";
|
license = "GPL";
|
||||||
|
kde = {
|
||||||
|
name = "kdeadmin";
|
||||||
|
version = "4.5.1";
|
||||||
|
};
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
@ -9,7 +9,7 @@ if (NOT XSCREENSAVER_FOUND)
|
|||||||
FIND_PATH(XSCREENSAVER_DIR deco
|
FIND_PATH(XSCREENSAVER_DIR deco
|
||||||
HINTS
|
HINTS
|
||||||
${KDE4_INCLUDE_DIR}
|
${KDE4_INCLUDE_DIR}
|
||||||
PATHS
|
PATHS
|
||||||
/usr
|
/usr
|
||||||
/usr/local
|
/usr/local
|
||||||
/opt/local
|
/opt/local
|
||||||
@ -21,18 +21,18 @@ if (NOT XSCREENSAVER_FOUND)
|
|||||||
/usr/local/xscreensaver
|
/usr/local/xscreensaver
|
||||||
/usr/openwin/lib/xscreensaver
|
/usr/openwin/lib/xscreensaver
|
||||||
/etc
|
/etc
|
||||||
PATH_SUFFIXES
|
PATH_SUFFIXES
|
||||||
lib${LIB_SUFFIX}/xscreensaver
|
lib${LIB_SUFFIX}/xscreensaver
|
||||||
|
lib${LIB_SUFFIX}/misc/xscreensaver
|
||||||
lib/xscreensaver
|
lib/xscreensaver
|
||||||
lib${LIB_SUFFIX}/misc/xscreensaver
|
lib64/xscreensaver
|
||||||
lib/misc/xscreensaver
|
lib/misc/xscreensaver
|
||||||
libexec/xscreensaver
|
libexec/xscreensaver
|
||||||
bin/xscreensaver-hacks
|
bin/xscreensaver-hacks
|
||||||
hacks)
|
hacks)
|
||||||
message(XSCREENSAVER_DIR ${XSCREENSAVER_DIR})
|
message(STATUS "XSCREENSAVER_DIR <${XSCREENSAVER_DIR}>")
|
||||||
|
|
||||||
set(XSCREENSAVER_CONFIG_DIR)
|
FIND_PATH(XSCREENSAVER_CONFIG_DIR deco.xml
|
||||||
FIND_PATH(XSCREENSAVER_CONFIG_DECO config/deco.xml
|
|
||||||
PATHS
|
PATHS
|
||||||
${KDE4_INCLUDE_DIR}
|
${KDE4_INCLUDE_DIR}
|
||||||
/usr/
|
/usr/
|
||||||
@ -45,22 +45,10 @@ if (NOT XSCREENSAVER_FOUND)
|
|||||||
/usr/local/kde/
|
/usr/local/kde/
|
||||||
/usr/openwin/lib/xscreensaver/
|
/usr/openwin/lib/xscreensaver/
|
||||||
/etc/
|
/etc/
|
||||||
PATH_SUFFIXES xscreensaver share/xscreensaver
|
PATH_SUFFIXES xscreensaver xscreensaver/config share/xscreensaver/config
|
||||||
)
|
)
|
||||||
#MESSAGE(STATUS "XSCREENSAVER_CONFIG_DIR :<${XSCREENSAVER_CONFIG_DIR}>")
|
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)
|
endif(NOT XSCREENSAVER_FOUND)
|
||||||
|
|
||||||
#MESSAGE(STATUS "XSCREENSAVER_CONFIG_DIR :<${XSCREENSAVER_CONFIG_DIR}>")
|
#MESSAGE(STATUS "XSCREENSAVER_CONFIG_DIR :<${XSCREENSAVER_CONFIG_DIR}>")
|
||||||
@ -68,7 +56,7 @@ endif(NOT XSCREENSAVER_FOUND)
|
|||||||
|
|
||||||
# Need to fix hack
|
# Need to fix hack
|
||||||
if(XSCREENSAVER_DIR AND XSCREENSAVER_CONFIG_DIR)
|
if(XSCREENSAVER_DIR AND XSCREENSAVER_CONFIG_DIR)
|
||||||
set(XSCREENSAVER_FOUND TRUE)
|
set(XSCREENSAVER_FOUND TRUE)
|
||||||
endif(XSCREENSAVER_DIR AND XSCREENSAVER_CONFIG_DIR)
|
endif(XSCREENSAVER_DIR AND XSCREENSAVER_CONFIG_DIR)
|
||||||
|
|
||||||
if (XSCREENSAVER_FOUND)
|
if (XSCREENSAVER_FOUND)
|
||||||
|
14
pkgs/desktops/kde-4.5/artwork/aurorae.nix
Normal file
14
pkgs/desktops/kde-4.5/artwork/aurorae.nix
Normal file
@ -0,0 +1,14 @@
|
|||||||
|
{ cmake, kde, automoc4, kdelibs }:
|
||||||
|
|
||||||
|
kde.package rec {
|
||||||
|
name = "aurorae-themes-${meta.kde.version}";
|
||||||
|
|
||||||
|
buildInputs = [ cmake automoc4 kdelibs ];
|
||||||
|
meta = {
|
||||||
|
kde = {
|
||||||
|
name = "aurorae";
|
||||||
|
module = "kdeartwork";
|
||||||
|
version = "4.5.1";
|
||||||
|
};
|
||||||
|
};
|
||||||
|
}
|
15
pkgs/desktops/kde-4.5/artwork/color-schemes.nix
Normal file
15
pkgs/desktops/kde-4.5/artwork/color-schemes.nix
Normal file
@ -0,0 +1,15 @@
|
|||||||
|
{ cmake, kde, automoc4, kdelibs }:
|
||||||
|
|
||||||
|
kde.package rec {
|
||||||
|
name = "kde-color-schemes-${meta.kde.version}";
|
||||||
|
|
||||||
|
buildInputs = [ cmake automoc4 kdelibs ];
|
||||||
|
meta = {
|
||||||
|
description = "Additional KDE color schemes";
|
||||||
|
kde = {
|
||||||
|
name = "ColorSchemes";
|
||||||
|
module = "kdeartwork";
|
||||||
|
version = "4.5.1";
|
||||||
|
};
|
||||||
|
};
|
||||||
|
}
|
@ -1,20 +0,0 @@
|
|||||||
{ 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
|
|
||||||
'';
|
|
||||||
|
|
||||||
meta = {
|
|
||||||
description = "KDE artwork";
|
|
||||||
longDescription = "Contains various artwork for KDE such as backgrounds, icons and screensavers";
|
|
||||||
license = "LGPL";
|
|
||||||
};
|
|
||||||
}
|
|
15
pkgs/desktops/kde-4.5/artwork/desktop-themes.nix
Normal file
15
pkgs/desktops/kde-4.5/artwork/desktop-themes.nix
Normal file
@ -0,0 +1,15 @@
|
|||||||
|
{ cmake, kde, automoc4, kdelibs }:
|
||||||
|
|
||||||
|
kde.package rec {
|
||||||
|
name = "kde-desktop-themes-${meta.kde.version}";
|
||||||
|
|
||||||
|
buildInputs = [ cmake automoc4 kdelibs ];
|
||||||
|
meta = {
|
||||||
|
description = "Additional KDE desktop themes";
|
||||||
|
kde = {
|
||||||
|
name = "desktopthemes";
|
||||||
|
module = "kdeartwork";
|
||||||
|
version = "4.5.1";
|
||||||
|
};
|
||||||
|
};
|
||||||
|
}
|
15
pkgs/desktops/kde-4.5/artwork/emoticons.nix
Normal file
15
pkgs/desktops/kde-4.5/artwork/emoticons.nix
Normal file
@ -0,0 +1,15 @@
|
|||||||
|
{ cmake, kde, automoc4, kdelibs }:
|
||||||
|
|
||||||
|
kde.package rec {
|
||||||
|
name = "kde-emotion-icons-${meta.kde.version}";
|
||||||
|
|
||||||
|
buildInputs = [ cmake automoc4 kdelibs ];
|
||||||
|
meta = {
|
||||||
|
description = "Additional KDE emotion icons (smiles)";
|
||||||
|
kde = {
|
||||||
|
name = "emoticons";
|
||||||
|
module = "kdeartwork";
|
||||||
|
version = "4.5.1";
|
||||||
|
};
|
||||||
|
};
|
||||||
|
}
|
15
pkgs/desktops/kde-4.5/artwork/high-resolution-wallpapers.nix
Normal file
15
pkgs/desktops/kde-4.5/artwork/high-resolution-wallpapers.nix
Normal file
@ -0,0 +1,15 @@
|
|||||||
|
{ cmake, kde, automoc4, kdelibs }:
|
||||||
|
|
||||||
|
kde.package rec {
|
||||||
|
name = "kde-wallpapers-high-resolution-${meta.kde.version}";
|
||||||
|
|
||||||
|
buildInputs = [ cmake automoc4 kdelibs ];
|
||||||
|
meta = {
|
||||||
|
description = "KDE wallpapers in high resolution";
|
||||||
|
kde = {
|
||||||
|
name = "HighResolutionWallpapers";
|
||||||
|
module = "kdeartwork";
|
||||||
|
version = "4.5.1";
|
||||||
|
};
|
||||||
|
};
|
||||||
|
}
|
15
pkgs/desktops/kde-4.5/artwork/kscreensaver.nix
Normal file
15
pkgs/desktops/kde-4.5/artwork/kscreensaver.nix
Normal file
@ -0,0 +1,15 @@
|
|||||||
|
{ cmake, kde, automoc4, kdelibs, xscreensaver, kdebase_workspace, eigen }:
|
||||||
|
|
||||||
|
kde.package rec {
|
||||||
|
buildInputs = [ cmake automoc4 kdelibs xscreensaver kdebase_workspace eigen ];
|
||||||
|
preConfigure = "cp -v ${./FindXscreensaver.cmake} cmake/modules/FindXscreensaver.cmake";
|
||||||
|
meta = {
|
||||||
|
description = "KDE screen saver and savers";
|
||||||
|
kde = {
|
||||||
|
name = "kscreensaver";
|
||||||
|
module = "kdeartwork";
|
||||||
|
version = "1.0";
|
||||||
|
release = "4.5.1";
|
||||||
|
};
|
||||||
|
};
|
||||||
|
}
|
16
pkgs/desktops/kde-4.5/artwork/nuvola-icon-theme.nix
Normal file
16
pkgs/desktops/kde-4.5/artwork/nuvola-icon-theme.nix
Normal file
@ -0,0 +1,16 @@
|
|||||||
|
{ cmake, kde, automoc4, kdelibs }:
|
||||||
|
|
||||||
|
kde.package rec {
|
||||||
|
name = "nuvola-icon-theme-${meta.kde.version}";
|
||||||
|
# Sources contain primary and kdeclassic as well but they're not installed
|
||||||
|
|
||||||
|
buildInputs = [ cmake automoc4 kdelibs ];
|
||||||
|
meta = {
|
||||||
|
description = "KDE nuvola icon theme";
|
||||||
|
kde = {
|
||||||
|
name = "IconThemes";
|
||||||
|
module = "kdeartwork";
|
||||||
|
version = "4.5.1";
|
||||||
|
};
|
||||||
|
};
|
||||||
|
}
|
15
pkgs/desktops/kde-4.5/artwork/phase-style.nix
Normal file
15
pkgs/desktops/kde-4.5/artwork/phase-style.nix
Normal file
@ -0,0 +1,15 @@
|
|||||||
|
{ cmake, kde, automoc4, kdelibs }:
|
||||||
|
|
||||||
|
kde.package rec {
|
||||||
|
name = "kde-style-phase-${meta.kde.version}";
|
||||||
|
|
||||||
|
buildInputs = [ cmake automoc4 kdelibs ];
|
||||||
|
meta = {
|
||||||
|
description = "KDE phase style. Clean classical look";
|
||||||
|
kde = {
|
||||||
|
name = "styles";
|
||||||
|
module = "kdeartwork";
|
||||||
|
version = "4.5.1";
|
||||||
|
};
|
||||||
|
};
|
||||||
|
}
|
15
pkgs/desktops/kde-4.5/artwork/sounds.nix
Normal file
15
pkgs/desktops/kde-4.5/artwork/sounds.nix
Normal file
@ -0,0 +1,15 @@
|
|||||||
|
{ cmake, kde, automoc4, kdelibs }:
|
||||||
|
|
||||||
|
kde.package rec {
|
||||||
|
name = "kde-sounds-${meta.kde.version}";
|
||||||
|
|
||||||
|
buildInputs = [ cmake automoc4 kdelibs ];
|
||||||
|
meta = {
|
||||||
|
description = "New login/logout sounds";
|
||||||
|
kde = {
|
||||||
|
name = "sounds";
|
||||||
|
module = "kdeartwork";
|
||||||
|
version = "4.5.1";
|
||||||
|
};
|
||||||
|
};
|
||||||
|
}
|
15
pkgs/desktops/kde-4.5/artwork/wallpapers.nix
Normal file
15
pkgs/desktops/kde-4.5/artwork/wallpapers.nix
Normal file
@ -0,0 +1,15 @@
|
|||||||
|
{ cmake, kde, automoc4, kdelibs }:
|
||||||
|
|
||||||
|
kde.package rec {
|
||||||
|
name = "kde-wallpapers-${meta.kde.version}";
|
||||||
|
|
||||||
|
buildInputs = [ cmake automoc4 kdelibs ];
|
||||||
|
meta = {
|
||||||
|
description = "Additional KDE wallpapers";
|
||||||
|
kde = {
|
||||||
|
name = "wallpapers";
|
||||||
|
module = "kdeartwork";
|
||||||
|
version = "4.5.1";
|
||||||
|
};
|
||||||
|
};
|
||||||
|
}
|
15
pkgs/desktops/kde-4.5/artwork/weather-wallpapers.nix
Normal file
15
pkgs/desktops/kde-4.5/artwork/weather-wallpapers.nix
Normal file
@ -0,0 +1,15 @@
|
|||||||
|
{ cmake, kde, automoc4, kdelibs }:
|
||||||
|
|
||||||
|
kde.package rec {
|
||||||
|
name = "kde-weather-wallpapers-${meta.kde.version}";
|
||||||
|
|
||||||
|
buildInputs = [ cmake automoc4 kdelibs ];
|
||||||
|
meta = {
|
||||||
|
description = "Additional KDE wallpapers (weather)";
|
||||||
|
kde = {
|
||||||
|
name = "WeatherWallpapers";
|
||||||
|
module = "kdeartwork";
|
||||||
|
version = "4.5.1";
|
||||||
|
};
|
||||||
|
};
|
||||||
|
}
|
@ -1,21 +1,16 @@
|
|||||||
{ kdePackage, cmake, perl, bzip2, xz, qt4, alsaLib, xineLib, samba,
|
{ kde, cmake, perl, bzip2, xz, qt4, alsaLib, xineLib, samba,
|
||||||
shared_mime_info, exiv2, libssh , kdelibs, automoc4, strigi, soprano,
|
shared_mime_info, exiv2, libssh , kdelibs, automoc4, strigi, soprano,
|
||||||
cluceneCore, attica, virtuoso, makeWrapper, oxygen_icons }:
|
cluceneCore, attica, virtuoso, makeWrapper, oxygen_icons }:
|
||||||
|
|
||||||
kdePackage {
|
kde.package {
|
||||||
pn = "kdebase-runtime";
|
|
||||||
v = "4.5.0";
|
|
||||||
|
|
||||||
buildInputs = [ cmake perl bzip2 xz qt4 alsaLib xineLib samba shared_mime_info
|
buildInputs = [ cmake perl bzip2 xz qt4 alsaLib xineLib samba shared_mime_info
|
||||||
exiv2 libssh kdelibs automoc4 strigi soprano cluceneCore attica
|
exiv2 libssh kdelibs automoc4 strigi soprano cluceneCore attica
|
||||||
makeWrapper];
|
makeWrapper];
|
||||||
|
|
||||||
patches = [ ./freeze.diff ];
|
|
||||||
|
|
||||||
# TODO: OpenSLP, OpenEXR
|
# TODO: OpenSLP, OpenEXR
|
||||||
postInstall = ''
|
postInstall = ''
|
||||||
rm -v $out/share/icons/default.kde4
|
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" \
|
wrapProgram "$out/bin/nepomukservicestub" --prefix LD_LIBRARY_PATH : "${virtuoso}/lib" \
|
||||||
--prefix PATH : "${virtuoso}/bin"
|
--prefix PATH : "${virtuoso}/bin"
|
||||||
'';
|
'';
|
||||||
@ -24,5 +19,9 @@ kdePackage {
|
|||||||
description = "KDE runtime";
|
description = "KDE runtime";
|
||||||
longDescription = "Libraries and tools which supports running KDE desktop applications";
|
longDescription = "Libraries and tools which supports running KDE desktop applications";
|
||||||
license = "LGPL";
|
license = "LGPL";
|
||||||
|
kde = {
|
||||||
|
name = "kdebase-runtime";
|
||||||
|
version = "4.5.1";
|
||||||
|
};
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
@ -1,37 +0,0 @@
|
|||||||
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 );
|
|
@ -1,4 +1,4 @@
|
|||||||
{ kdePackage, cmake, perl, python, pam, consolekit
|
{ kde, cmake, perl, python, pam, consolekit
|
||||||
, qt4, sip, pyqt4, kdelibs, kdepimlibs, kdebindings
|
, qt4, sip, pyqt4, kdelibs, kdepimlibs, kdebindings
|
||||||
, libXi, libXau, libXdmcp, libXtst, libXcomposite, libXdamage, libXScrnSaver
|
, libXi, libXau, libXdmcp, libXtst, libXcomposite, libXdamage, libXScrnSaver
|
||||||
, lm_sensors, libxklavier, libusb, libpthreadstubs, boost
|
, lm_sensors, libxklavier, libusb, libpthreadstubs, boost
|
||||||
@ -6,9 +6,7 @@
|
|||||||
, libdbusmenu_qt, libqalculate, pciutils, libraw1394, bluez
|
, libdbusmenu_qt, libqalculate, pciutils, libraw1394, bluez
|
||||||
}:
|
}:
|
||||||
|
|
||||||
kdePackage {
|
kde.package {
|
||||||
pn = "kdebase-workspace";
|
|
||||||
v = "4.5.0";
|
|
||||||
|
|
||||||
# TODO: qedje, qzion, ggadgets, libgps
|
# TODO: qedje, qzion, ggadgets, libgps
|
||||||
buildInputs = [ cmake perl python qt4 pam consolekit sip pyqt4 kdelibs libXtst
|
buildInputs = [ cmake perl python qt4 pam consolekit sip pyqt4 kdelibs libXtst
|
||||||
@ -18,8 +16,12 @@ kdePackage {
|
|||||||
pciutils bluez ];
|
pciutils bluez ];
|
||||||
|
|
||||||
meta = {
|
meta = {
|
||||||
description = "KDE Workspace";
|
description = "KDE base platform-specific components";
|
||||||
longDescription = "KDE base components that are only required to work with X11 such KDM and KWin";
|
longDescription = "KDE base components that are only required to work with X11 such KDM and KWin";
|
||||||
license = "GPL";
|
license = "GPL";
|
||||||
|
kde = {
|
||||||
|
name = "kdebase-workspace";
|
||||||
|
version = "4.5.1";
|
||||||
|
};
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
@ -1,18 +1,19 @@
|
|||||||
{ kdePackage, cmake, perl, qt4, kdelibs, pciutils, libraw1394
|
{ kde, cmake, perl, qt4, kdelibs, pciutils, libraw1394 , automoc4, strigi
|
||||||
, automoc4, strigi, qimageblitz, soprano}:
|
, qimageblitz, soprano}:
|
||||||
|
|
||||||
kdePackage {
|
|
||||||
pn = "kdebase";
|
|
||||||
v = "4.5.0";
|
|
||||||
|
|
||||||
|
kde.package {
|
||||||
preConfigure = "cd apps";
|
preConfigure = "cd apps";
|
||||||
|
|
||||||
buildInputs = [ cmake perl qt4 kdelibs pciutils libraw1394 automoc4
|
buildInputs = [ cmake perl qt4 kdelibs pciutils libraw1394 automoc4
|
||||||
strigi qimageblitz soprano ];
|
strigi qimageblitz ];
|
||||||
|
|
||||||
meta = {
|
meta = {
|
||||||
description = "KDE Base components";
|
description = "KDE Base components";
|
||||||
longDescription = "Applications that form the KDE desktop, like Plasma, System Settings, Konqueror, Dolphin, Kate, and Konsole";
|
longDescription = "Applications that form the KDE desktop, like Plasma, System Settings, Konqueror, Dolphin, Kate, and Konsole";
|
||||||
license = "GPL";
|
license = "GPL";
|
||||||
|
kde = {
|
||||||
|
name = "kdebase";
|
||||||
|
version = "4.5.1";
|
||||||
|
};
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
@ -1,21 +1,18 @@
|
|||||||
{ kdePackage, lib, cmake, perl, python, sip, pyqt4, zlib, libpng, freetype, fontconfig, qt4, boost
|
{ kde, lib, 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
|
||||||
}:
|
}:
|
||||||
|
|
||||||
# This function will only build the pykde4 module. I don't need the other bindings and
|
# This function will only build the pykde4 module. I don't need the other bindings and
|
||||||
# some bindings are even broken.
|
# some bindings are even broken.
|
||||||
|
|
||||||
kdePackage rec {
|
kde.package rec {
|
||||||
pn = "kdebindings";
|
|
||||||
v = "4.5.0";
|
|
||||||
|
|
||||||
patches = [ ./python-site-packages-install-dir.diff ];
|
patches = [ ./python-site-packages-install-dir.diff ];
|
||||||
|
|
||||||
preConfigure = ''
|
preConfigure = ''
|
||||||
CUSTOM_RUBY_SITE_ARCH_DIR=$(ruby -r rbconfig -e "print Config::CONFIG['sitearchdir']" | sed -e "s@${ruby}@$out@")
|
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_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=(
|
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_ARCH_DIR=$CUSTOM_RUBY_SITE_ARCH_DIR
|
||||||
-DCUSTOM_RUBY_SITE_LIB_DIR=$CUSTOM_RUBY_SITE_LIB_DIR
|
-DCUSTOM_RUBY_SITE_LIB_DIR=$CUSTOM_RUBY_SITE_LIB_DIR
|
||||||
@ -31,6 +28,10 @@ kdePackage rec {
|
|||||||
description = "KDE bindings";
|
description = "KDE bindings";
|
||||||
longDescription = "Provides KDE bindings for several languages such as Java, Smoke and Python";
|
longDescription = "Provides KDE bindings for several languages such as Java, Smoke and Python";
|
||||||
license = "LGPL";
|
license = "LGPL";
|
||||||
|
kde = {
|
||||||
|
name = "kdebindings";
|
||||||
|
version = "4.5.1";
|
||||||
|
};
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -3,11 +3,13 @@
|
|||||||
{
|
{
|
||||||
recurseForRelease = true;
|
recurseForRelease = true;
|
||||||
|
|
||||||
|
inherit callPackage;
|
||||||
|
|
||||||
qt4 = qt47;
|
qt4 = qt47;
|
||||||
|
|
||||||
phonon = null;
|
phonon = null;
|
||||||
|
|
||||||
kdePackage = import ./kde-package {
|
kde = import ./kde-package {
|
||||||
inherit stdenv fetchurl;
|
inherit stdenv fetchurl;
|
||||||
};
|
};
|
||||||
|
|
||||||
@ -47,23 +49,95 @@
|
|||||||
kdebase_runtime = callPackage ./base-runtime { };
|
kdebase_runtime = callPackage ./base-runtime { };
|
||||||
|
|
||||||
### OTHER MODULES
|
### OTHER MODULES
|
||||||
kdeaccessibility = callPackage ./accessibility { };
|
kdeaccessibility = {
|
||||||
|
recurseForDerivations = true;
|
||||||
|
colorSchemes = callPackage ./accessibility/color-schemes.nix { };
|
||||||
|
iconThemes = callPackage ./accessibility/icon-themes.nix { };
|
||||||
|
jovie = callPackage ./accessibility/jovie.nix { };
|
||||||
|
kmag = callPackage ./accessibility/kmag.nix { };
|
||||||
|
kmousetool = callPackage ./accessibility/kmousetool.nix { };
|
||||||
|
kmouth = callPackage ./accessibility/kmouth.nix { };
|
||||||
|
};
|
||||||
|
|
||||||
kdeadmin = callPackage ./admin { };
|
kdeadmin = callPackage ./admin { };
|
||||||
kdeartwork = callPackage ./artwork { };
|
kdeartwork = {
|
||||||
|
recurseForDerivations = true;
|
||||||
|
aurorae = callPackage ./artwork/aurorae.nix { };
|
||||||
|
colorSchemes = callPackage ./artwork/color-schemes.nix { };
|
||||||
|
desktop_themes = callPackage ./artwork/desktop-themes.nix { };
|
||||||
|
emoticons = callPackage ./artwork/emoticons.nix { };
|
||||||
|
high_resolution_wallpapers = callPackage ./artwork/high-resolution-wallpapers.nix { };
|
||||||
|
wallpapers = callPackage ./artwork/wallpapers.nix { };
|
||||||
|
nuvola_icon_theme = callPackage ./artwork/nuvola-icon-theme.nix { };
|
||||||
|
sounds = callPackage ./artwork/sounds.nix { };
|
||||||
|
weather_wallpapers = callPackage ./artwork/weather-wallpapers.nix { };
|
||||||
|
phase_style = callPackage ./artwork/phase-style.nix { };
|
||||||
|
kscreensaver = callPackage ./artwork/kscreensaver.nix { };
|
||||||
|
};
|
||||||
kdeedu = callPackage ./edu { };
|
kdeedu = callPackage ./edu { };
|
||||||
kdegames = callPackage ./games { };
|
kdegames = callPackage ./games { };
|
||||||
kdegraphics = callPackage ./graphics { };
|
kdegraphics = callPackage ./graphics { };
|
||||||
kdemultimedia = callPackage ./multimedia { };
|
kdemultimedia = callPackage ./multimedia { };
|
||||||
kdenetwork = callPackage ./network { };
|
kdenetwork = callPackage ./network { };
|
||||||
kdeplasma_addons = callPackage ./plasma-addons { };
|
kdeplasma_addons = callPackage ./plasma-addons { };
|
||||||
kdesdk = callPackage ./sdk { };
|
kdesdk = {
|
||||||
kdetoys = callPackage ./toys { };
|
recurseForDerivations = true;
|
||||||
kdeutils = callPackage ./utils { };
|
cervisia = callPackage ./sdk/cervisia.nix { };
|
||||||
kdewebdev = callPackage ./webdev { };
|
kapptemplate = callPackage ./sdk/kapptemplate.nix { };
|
||||||
|
kate = callPackage ./sdk/kate.nix { };
|
||||||
|
kcachegrind = callPackage ./sdk/kcachegrind.nix { };
|
||||||
|
kdeaccounts_plugin = callPackage ./sdk/kdeaccounts-plugin.nix { };
|
||||||
|
dolphin_plugins = callPackage ./sdk/dolphin-plugins.nix { };
|
||||||
|
kioslave_perldoc = callPackage ./sdk/kioslave-perldoc.nix { };
|
||||||
|
kioslave_svn = callPackage ./sdk/kioslave-svn.nix { };
|
||||||
|
strigi_analyzer = callPackage ./sdk/strigi-analyzer.nix { };
|
||||||
|
kbugbuster = callPackage ./sdk/kbugbuster.nix { };
|
||||||
|
kmtrace = callPackage ./sdk/kmtrace.nix { };
|
||||||
|
kompare = callPackage ./sdk/kompare.nix { };
|
||||||
|
kpartloader = callPackage ./sdk/kpartloader.nix { };
|
||||||
|
kprofilemethod = callPackage ./sdk/kprofilemethod.nix { };
|
||||||
|
kstartperf = callPackage ./sdk/kstartperf.nix { };
|
||||||
|
kuiviewer = callPackage ./sdk/kuiviewer.nix { };
|
||||||
|
lokalize = callPackage ./sdk/lokalize.nix { };
|
||||||
|
poxml = callPackage ./sdk/poxml.nix { };
|
||||||
|
scripts = callPackage ./sdk/scripts.nix { };
|
||||||
|
umbrello = callPackage ./sdk/umbrello.nix { };
|
||||||
|
};
|
||||||
|
kdetoys = {
|
||||||
|
recurseForDerivations = true;
|
||||||
|
amor = callPackage ./toys/amor.nix { };
|
||||||
|
kteatime = callPackage ./toys/kteatime.nix { };
|
||||||
|
ktux = callPackage ./toys/ktux.nix { };
|
||||||
|
};
|
||||||
|
|
||||||
|
kdeutils = {
|
||||||
|
ark = callPackage ./utils/ark.nix { };
|
||||||
|
kcalc = callPackage ./utils/kcalc.nix { };
|
||||||
|
kcharselect = callPackage ./utils/kcharselect.nix { };
|
||||||
|
kdf = callPackage ./utils/kdf.nix { };
|
||||||
|
kfloppy = callPackage ./utils/kfloppy.nix { };
|
||||||
|
kgpg = callPackage ./utils/kgpg.nix { };
|
||||||
|
kremotecontrol = callPackage ./utils/kremotecontrol.nix { };
|
||||||
|
ktimer = callPackage ./utils/ktimer.nix { };
|
||||||
|
kwallet = callPackage ./utils/kwallet.nix { };
|
||||||
|
okteta = callPackage ./utils/okteta.nix { };
|
||||||
|
printer_applet = callPackage ./utils/printer-applet.nix { };
|
||||||
|
superkaramba = callPackage ./utils/superkaramba.nix { };
|
||||||
|
sweeper = callPackage ./utils/sweeper.nix { };
|
||||||
|
recurseForRelease = true;
|
||||||
|
};
|
||||||
|
|
||||||
|
kdewebdev = {
|
||||||
|
recurseForDerivations = true;
|
||||||
|
klinkstatus = callPackage ./webdev/klinkstatus.nix { };
|
||||||
|
kommander = callPackage ./webdev/kommander.nix { };
|
||||||
|
kfilereplace = callPackage ./webdev/kfilereplace.nix { };
|
||||||
|
kimagemapeditor = callPackage ./webdev/kimagemapeditor.nix { };
|
||||||
|
};
|
||||||
|
|
||||||
#kdepim_runtime = callPackage ../kde-4.4/pim-runtime { };
|
#kdepim_runtime = callPackage ../kde-4.4/pim-runtime { };
|
||||||
kdepim_runtime = callPackage ./pim-runtime { };
|
kdepim_runtime = callPackage ./pim-runtime { };
|
||||||
kdepim = callPackage ../kde-4.4/pim { };
|
kdepim = callPackage ./pim { };
|
||||||
### DEVELOPMENT
|
### DEVELOPMENT
|
||||||
|
|
||||||
kdebindings = callPackage ./bindings { };
|
kdebindings = callPackage ./bindings { };
|
||||||
|
@ -1,10 +1,8 @@
|
|||||||
{ kdePackage, cmake, qt4, perl, libxml2, libxslt, openbabel, boost, readline, gmm, gsl
|
{ kde, cmake, qt4, perl, libxml2, libxslt, openbabel, boost, readline, gmm, gsl
|
||||||
, xplanet, libspectre, pkgconfig, libqalculate
|
, xplanet, libspectre, pkgconfig, libqalculate
|
||||||
, kdelibs, automoc4, eigen, attica}:
|
, kdelibs, automoc4, eigen, attica}:
|
||||||
|
|
||||||
kdePackage {
|
kde.package {
|
||||||
pn = "kdeedu";
|
|
||||||
v = "4.5.0";
|
|
||||||
|
|
||||||
#TODO:
|
#TODO:
|
||||||
#* Boost.Python (1.31 or higher) <http://www.boost.org/> - fails to find
|
#* Boost.Python (1.31 or higher) <http://www.boost.org/> - fails to find
|
||||||
@ -23,5 +21,9 @@ kdePackage {
|
|||||||
meta = {
|
meta = {
|
||||||
description = "KDE Educative software";
|
description = "KDE Educative software";
|
||||||
license = "GPL";
|
license = "GPL";
|
||||||
|
kde = {
|
||||||
|
name = "kdeedu";
|
||||||
|
version = "4.5.1";
|
||||||
|
};
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
@ -1,9 +1,7 @@
|
|||||||
{kdePackage, cmake, qt4, perl, shared_mime_info, kdelibs, automoc4, qca2
|
{kde, cmake, qt4, perl, shared_mime_info, kdelibs, automoc4, qca2
|
||||||
, kdebindings, twisted, python, pyqt4, sip, makeWrapper }:
|
, kdebindings, twisted, python, pyqt4, sip, makeWrapper }:
|
||||||
|
|
||||||
kdePackage {
|
kde.package {
|
||||||
pn = "kdegames";
|
|
||||||
v = "4.5.0";
|
|
||||||
|
|
||||||
# TODO: ggz
|
# TODO: ggz
|
||||||
buildInputs = [ cmake qt4 perl shared_mime_info kdelibs automoc4 qca2
|
buildInputs = [ cmake qt4 perl shared_mime_info kdelibs automoc4 qca2
|
||||||
@ -16,5 +14,9 @@ kdePackage {
|
|||||||
meta = {
|
meta = {
|
||||||
description = "KDE Games";
|
description = "KDE Games";
|
||||||
license = "GPL";
|
license = "GPL";
|
||||||
|
kde = {
|
||||||
|
name = "kdegames";
|
||||||
|
version = "4.5.1";
|
||||||
|
};
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
@ -1,10 +1,8 @@
|
|||||||
{ kdePackage, cmake, lib, perl, qt4, exiv2, lcms, saneBackends, libgphoto2
|
{ kde, cmake, lib, perl, qt4, exiv2, lcms, saneBackends, libgphoto2
|
||||||
, libspectre, popplerQt4, djvulibre, chmlib, shared_mime_info, libXxf86vm
|
, libspectre, popplerQt4, djvulibre, chmlib, shared_mime_info, libXxf86vm
|
||||||
, kdelibs, automoc4, strigi, qimageblitz, soprano, qca2, ebook_tools }:
|
, kdelibs, automoc4, strigi, qimageblitz, soprano, qca2, ebook_tools }:
|
||||||
|
|
||||||
kdePackage {
|
kde.package {
|
||||||
pn = "kdegraphics";
|
|
||||||
v = "4.5.0";
|
|
||||||
|
|
||||||
buildInputs = [ cmake perl qt4 exiv2 lcms saneBackends libgphoto2 libspectre
|
buildInputs = [ cmake perl qt4 exiv2 lcms saneBackends libgphoto2 libspectre
|
||||||
(popplerQt4.override { inherit qt4; }) chmlib shared_mime_info libXxf86vm
|
(popplerQt4.override { inherit qt4; }) chmlib shared_mime_info libXxf86vm
|
||||||
@ -17,5 +15,9 @@ kdePackage {
|
|||||||
Okular document reader.
|
Okular document reader.
|
||||||
'';
|
'';
|
||||||
license = "GPL";
|
license = "GPL";
|
||||||
|
kde = {
|
||||||
|
name = "kdegraphics";
|
||||||
|
version = "4.5.1";
|
||||||
|
};
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
@ -1,21 +1,64 @@
|
|||||||
{ stdenv, fetchurl }:
|
{ stdenv, fetchurl }:
|
||||||
|
|
||||||
let
|
rec {
|
||||||
manifest = import ./manifest.nix;
|
manifest = import ./manifest.nix;
|
||||||
in
|
|
||||||
|
|
||||||
a@{ pn, v, stable ? true, subdir ? null, ... }:
|
kdeSrc = { stable ? true, subdir ? null, module, release, sha256 ? null } :
|
||||||
stdenv.mkDerivation ({
|
fetchurl {
|
||||||
name = "${pn}-${v}";
|
url = "mirror://kde/" + (if stable then "" else "un") + "stable/"
|
||||||
src = fetchurl {
|
+ (if subdir == null then "${release}/src" else subdir)
|
||||||
url = "mirror://kde/" + (if stable then "" else "un") + "stable/" +
|
+ "/${module}-${release}.tar.bz2";
|
||||||
(if subdir == null then "${v}/src" else subdir) + "/${pn}-${v}.tar.bz2";
|
sha256 =
|
||||||
sha256 = builtins.getAttr "${pn}-${v}.tar.bz2" manifest;
|
if sha256 != null then sha256
|
||||||
};
|
else builtins.getAttr "${module}-${release}.tar.bz2" manifest;
|
||||||
meta = {
|
};
|
||||||
maintainers = with stdenv.lib.maintainers; [ sander urkud ];
|
|
||||||
platforms = stdenv.lib.platforms.linux;
|
defaultArgs = {name, stable ? true, subdir ? null, version,
|
||||||
inherit stable;
|
module ? name, release ? version, ... }:
|
||||||
homepage = http://www.kde.org;
|
|
||||||
} // ( if a ? meta then a.meta else { } );
|
assert (name == module) -> (release == version);
|
||||||
} // (removeAttrs a [ "meta" "pn" "v" "stable" "subdir" ]))
|
|
||||||
|
(
|
||||||
|
{
|
||||||
|
name = "${name}-${version}";
|
||||||
|
|
||||||
|
src = kdeSrc { inherit stable subdir module release; };
|
||||||
|
|
||||||
|
meta = {
|
||||||
|
maintainers = with stdenv.lib.maintainers; [ sander urkud ];
|
||||||
|
platforms = stdenv.lib.platforms.linux;
|
||||||
|
homepage = if name == module
|
||||||
|
then http://www.kde.org
|
||||||
|
else assert builtins.substring 0 3 module == "kde";
|
||||||
|
"http://"
|
||||||
|
+ builtins.substring 3
|
||||||
|
(builtins.sub (builtins.stringLength module) 3) module
|
||||||
|
+ ".kde.org/projects/${name}";
|
||||||
|
};
|
||||||
|
} // (if module == name then { } else {
|
||||||
|
cmakeFlags = ''
|
||||||
|
-DDISABLE_ALL_OPTIONAL_SUBDIRECTORIES=TRUE
|
||||||
|
-DBUILD_doc=TRUE -DBUILD_${name}=TRUE'';
|
||||||
|
})
|
||||||
|
);
|
||||||
|
|
||||||
|
package = a@{meta, ...}:
|
||||||
|
assert a.meta ? kde;
|
||||||
|
let
|
||||||
|
default = defaultArgs a.meta.kde;
|
||||||
|
in
|
||||||
|
# hand-written merge
|
||||||
|
stdenv.mkDerivation (
|
||||||
|
default
|
||||||
|
// removeAttrs a [ "meta" "cmakeFlags" ]
|
||||||
|
// {
|
||||||
|
meta = default.meta // a.meta;
|
||||||
|
}
|
||||||
|
// (if default ? cmakeFlags || a ? cmakeFlags then {
|
||||||
|
cmakeFlags =
|
||||||
|
(if default ? cmakeFlags then "${default.cmakeFlags}" else "")
|
||||||
|
+ (if default ? cmakeFlags && a ? cmakeFlags then " " else "")
|
||||||
|
+ (if a ? cmakeFlags then a.cmakeFlags else "");
|
||||||
|
} else { }
|
||||||
|
));
|
||||||
|
}
|
||||||
|
@ -1,13 +1,5 @@
|
|||||||
builtins.listToAttrs
|
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";
|
name = "kdegraphics-4.5.0.tar.bz2";
|
||||||
value = "13ms1z26sb2pfadhagkykgnw0p7inrn36p4s9qr04qisy2b2vd6l";
|
value = "13ms1z26sb2pfadhagkykgnw0p7inrn36p4s9qr04qisy2b2vd6l";
|
||||||
@ -92,4 +84,92 @@ builtins.listToAttrs
|
|||||||
name = "polkit-qt-1-0.96.1.tar.bz2";
|
name = "polkit-qt-1-0.96.1.tar.bz2";
|
||||||
value = "1ng5bi1gmr5lg49c5kyqyjzbjhs4w90c2zlnfcyviv9p3wzfgzbr";
|
value = "1ng5bi1gmr5lg49c5kyqyjzbjhs4w90c2zlnfcyviv9p3wzfgzbr";
|
||||||
}
|
}
|
||||||
|
{
|
||||||
|
name = "oxygen-icons-4.5.1.tar.bz2";
|
||||||
|
value = "1gnz8jrdccw91p2n52my0609h7g9ws55gal3jan2jylz6b0zq6dm";
|
||||||
|
}
|
||||||
|
{
|
||||||
|
name = "kdelibs-4.5.1.tar.bz2";
|
||||||
|
value = "1xqvrrbwz5i4m6lipg1j97l2yq3kmxsl5j62jkhvp56q7dh85i0d";
|
||||||
|
}
|
||||||
|
{
|
||||||
|
name = "kdeaccessibility-4.5.1.tar.bz2";
|
||||||
|
value = "0jdd3n61lhabzs2dv6rfv6ksp7cqn5wpj6f2d8z33c354y9lqw24";
|
||||||
|
}
|
||||||
|
{
|
||||||
|
name = "kdepimlibs-4.5.1.tar.bz2";
|
||||||
|
value = "1dlxnxxay6wbwgcfbkq0xak9z0h1bkh6rvysjx3djmawmwi5aw6b";
|
||||||
|
}
|
||||||
|
{
|
||||||
|
name = "kdepim-4.4.93.tar.bz2";
|
||||||
|
value = "1xrqmsgbgqpa8qzqadp1hikhn8c1snh5k323kc6a5yqdpnsf2qa0";
|
||||||
|
}
|
||||||
|
{
|
||||||
|
name = "kdepim-runtime-4.4.93.tar.bz2";
|
||||||
|
value = "18g8dz57pflmri7v013lsn2g4552c35lawcr7jxgig2x05zrwgf7";
|
||||||
|
}
|
||||||
|
{
|
||||||
|
name = "kdebase-4.5.1.tar.bz2";
|
||||||
|
value = "06g8s3r153hdmxh24s2x98a0fb4lr6d00d4307ibgp7r29w6dklb";
|
||||||
|
}
|
||||||
|
{
|
||||||
|
name = "kdebase-runtime-4.5.1.tar.bz2";
|
||||||
|
value = "1fjpyxzffl0ravyicgb56sqaw5zkwky98lj9ad6z4rdiysq5v5rz";
|
||||||
|
}
|
||||||
|
{
|
||||||
|
name = "kdebase-workspace-4.5.1.tar.bz2";
|
||||||
|
value = "0mrx03bsb9qj78k0l04q28gc8l7ky0y0rqdshv4spbmrjfsa03fd";
|
||||||
|
}
|
||||||
|
{
|
||||||
|
name = "kdebindings-4.5.1.tar.bz2";
|
||||||
|
value = "1j8bf7lwb70jc0m8d2hh6c1z6vgpxbqf47w5pkq58kgan8y3zcsw";
|
||||||
|
}
|
||||||
|
{
|
||||||
|
name = "kdeartwork-4.5.1.tar.bz2";
|
||||||
|
value = "0fjcx6wwgzxl64s62wv2sf15plx49fck86nwzfbgbmdha1ra2gmi";
|
||||||
|
}
|
||||||
|
{
|
||||||
|
name = "kdenetwork-4.5.1.tar.bz2";
|
||||||
|
value = "0wzbrhj4bzd4d432qqf5jwfagvxsv3flzdq7jzc449w6ybdgqw6n";
|
||||||
|
}
|
||||||
|
{
|
||||||
|
name = "kdeedu-4.5.1.tar.bz2";
|
||||||
|
value = "026gdb6q06l9d8v3a0dcynxkdnv9cal1gnnxwdawvc5rky2vp07j";
|
||||||
|
}
|
||||||
|
{
|
||||||
|
name = "kdesdk-4.5.1.tar.bz2";
|
||||||
|
value = "0kwgd3hxc6jwk7qk67z1jaks9jg04hgh5aywyfs2dc8w2ns1xyhp";
|
||||||
|
}
|
||||||
|
{
|
||||||
|
name = "kdetoys-4.5.1.tar.bz2";
|
||||||
|
value = "194a6ylxi5jrfh3w3cy6jhdissshswdrv9pnir72z67ca13dvd9s";
|
||||||
|
}
|
||||||
|
{
|
||||||
|
name = "kdewebdev-4.5.1.tar.bz2";
|
||||||
|
value = "0kgk3wwskvxw0hmzpify5by3mbnyprmy1c0nx44iw85xrk6riss0";
|
||||||
|
}
|
||||||
|
{
|
||||||
|
name = "kdeutils-4.5.1.tar.bz2";
|
||||||
|
value = "13i13pga3dlhg6bwz6p3wrr8qa0vzhwqg809a0r5yn0kz4icaasq";
|
||||||
|
}
|
||||||
|
{
|
||||||
|
name = "kdegraphics-4.5.1.tar.bz2";
|
||||||
|
value = "0z0fqqb868ywvdxvd94vp15drkizh59m4arblsx9cj19d157nbwd";
|
||||||
|
}
|
||||||
|
{
|
||||||
|
name = "kdemultimedia-4.5.1.tar.bz2";
|
||||||
|
value = "1a5rgvznvykislif7igsb3b6xwps2g8s5ifkfj8dbkdvsmavlmjf";
|
||||||
|
}
|
||||||
|
{
|
||||||
|
name = "kdegames-4.5.1.tar.bz2";
|
||||||
|
value = "1d158z2hqc7i7mh43ajhmsqixdazhjm7pxs6rjala0fcgmqk1lj1";
|
||||||
|
}
|
||||||
|
{
|
||||||
|
name = "kdeplasma-addons-4.5.1.tar.bz2";
|
||||||
|
value = "17mjk2qdfgcz2l9f00q08dzxkqib8li5bjxawsb7fwzj93jc7lp5";
|
||||||
|
}
|
||||||
|
{
|
||||||
|
name = "kdeadmin-4.5.1.tar.bz2";
|
||||||
|
value = "011ajsma8s9ay0dsjx383jn8yynkyshlzx6gjw68caxzjhpc0ib2";
|
||||||
|
}
|
||||||
]
|
]
|
||||||
|
@ -1,35 +1,37 @@
|
|||||||
{ kdePackage, gcc, cmake, perl
|
{ kde, gcc, cmake, perl
|
||||||
, qt4, bzip2, pcre, fam, libxml2, libxslt, shared_mime_info, giflib, jasper
|
, qt4, bzip2, pcre, fam, libxml2, libxslt, shared_mime_info, giflib, jasper
|
||||||
, xz, flex, bison, openexr, aspell, avahi, kerberos, acl, attr, shared_desktop_ontologies, libXScrnSaver
|
, xz, flex, bison, openexr, aspell, avahi, kerberos, acl, attr, shared_desktop_ontologies, libXScrnSaver
|
||||||
, automoc4, strigi, soprano, qca2, attica, enchant, libdbusmenu_qt
|
, 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
|
||||||
}:
|
}:
|
||||||
|
|
||||||
kdePackage {
|
kde.package {
|
||||||
pn = "kdelibs";
|
|
||||||
v = "4.5.0";
|
|
||||||
|
|
||||||
buildInputs = [
|
buildInputs = [
|
||||||
cmake perl qt4 xz flex bison bzip2 pcre fam libxml2 libxslt
|
cmake perl xz flex bison bzip2 pcre fam libxml2 libxslt shared_mime_info
|
||||||
shared_mime_info giflib jasper /*openexr*/ aspell avahi kerberos acl attr
|
giflib jasper /*openexr*/ aspell avahi kerberos acl attr libXScrnSaver
|
||||||
libXScrnSaver enchant libdbusmenu_qt polkit_qt_1
|
enchant libdbusmenu_qt polkit_qt_1 automoc4
|
||||||
automoc4 strigi soprano qca2 attica
|
|
||||||
];
|
];
|
||||||
|
|
||||||
propagatedBuildInputs = [ shared_desktop_ontologies gcc.libc ];
|
propagatedBuildInputs = [ qt4 gcc.libc strigi soprano attica qca2
|
||||||
|
shared_desktop_ontologies ];
|
||||||
|
|
||||||
patches = [ ./polkit-install.patch ];
|
patches = [ ./polkit-install.patch ];
|
||||||
|
|
||||||
# cmake fails to find acl.h because of C++-style comment
|
# cmake fails to find acl.h because of C++-style comment
|
||||||
# TODO: OpenEXR, hspell
|
# TODO: OpenEXR, hspell
|
||||||
cmakeFlags = [
|
cmakeFlags = ''
|
||||||
"-DHAVE_ACL_LIBACL_H=ON" "-DHAVE_SYS_ACL_H=ON"
|
-DHAVE_ACL_LIBACL_H=ON -DHAVE_SYS_ACL_H=ON
|
||||||
"-DDOCBOOKXML_CURRENTDTD_DIR=${docbook_xml_dtd_42}/xml/dtd/docbook"
|
-DDOCBOOKXML_CURRENTDTD_DIR=${docbook_xml_dtd_42}/xml/dtd/docbook
|
||||||
"-DDOCBOOKXSL_DIR=${docbook_xsl}/xml/xsl/docbook"
|
-DDOCBOOKXSL_DIR=${docbook_xsl}/xml/xsl/docbook
|
||||||
];
|
'';
|
||||||
|
|
||||||
meta = {
|
meta = {
|
||||||
description = "KDE libraries";
|
description = "KDE libraries";
|
||||||
license = "LGPL";
|
license = "LGPL";
|
||||||
|
kde = {
|
||||||
|
name = "kdelibs";
|
||||||
|
version = "4.5.1";
|
||||||
|
};
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
@ -1,12 +1,10 @@
|
|||||||
{ kdePackage, cmake, perl, qt4, alsaLib, libvorbis, xineLib, taglib, flac,
|
{ kde, cmake, perl, qt4, alsaLib, libvorbis, xineLib, taglib, flac,
|
||||||
cdparanoia, lame , kdelibs, automoc4, ffmpeg}:
|
cdparanoia, lame , kdelibs, automoc4, ffmpeg, libmusicbrainz2, libtunepimp }:
|
||||||
|
|
||||||
kdePackage {
|
kde.package {
|
||||||
pn = "kdemultimedia";
|
|
||||||
v = "4.5.0";
|
|
||||||
|
|
||||||
buildInputs = [ cmake perl qt4 alsaLib libvorbis xineLib flac taglib
|
buildInputs = [ cmake perl qt4 alsaLib libvorbis xineLib flac taglib
|
||||||
cdparanoia lame kdelibs automoc4 ffmpeg ];
|
cdparanoia lame kdelibs automoc4 ffmpeg libmusicbrainz2 libtunepimp ];
|
||||||
|
|
||||||
meta = {
|
meta = {
|
||||||
description = "KDE Multimedia";
|
description = "KDE Multimedia";
|
||||||
@ -14,5 +12,9 @@ kdePackage {
|
|||||||
Contains various Multimedia utilties for KDE such as a movie player and sound volume mixer.
|
Contains various Multimedia utilties for KDE such as a movie player and sound volume mixer.
|
||||||
'';
|
'';
|
||||||
license = "GPL";
|
license = "GPL";
|
||||||
|
kde = {
|
||||||
|
name = "kdemultimedia";
|
||||||
|
version = "4.5.1";
|
||||||
|
};
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
@ -1,12 +1,10 @@
|
|||||||
{ kdePackage, cmake, qt4, perl, speex, gmp, libxml2, libxslt, sqlite, alsaLib, libidn
|
{ kde, cmake, qt4, perl, speex, gmp, libxml2, libxslt, sqlite, alsaLib, libidn
|
||||||
, libvncserver, libmsn, giflib, gpgme, boost, libv4l, libotr
|
, libvncserver, libmsn, giflib, gpgme, boost, libv4l, libotr
|
||||||
, libXi, libXtst, libXdamage, libXxf86vm, libktorrent, kdebase
|
, libXi, libXtst, libXdamage, libXxf86vm, libktorrent, kdebase
|
||||||
, kdebase_workspace
|
, kdebase_workspace
|
||||||
, kdelibs, kdepimlibs, automoc4, qca2, soprano, qimageblitz, strigi}:
|
, kdelibs, kdepimlibs, automoc4, qca2, soprano, qimageblitz, strigi}:
|
||||||
|
|
||||||
kdePackage {
|
kde.package {
|
||||||
pn = "kdenetwork";
|
|
||||||
v = "4.5.0";
|
|
||||||
|
|
||||||
buildInputs = [ cmake qt4 perl speex gmp libxml2 libxslt sqlite alsaLib libidn
|
buildInputs = [ cmake qt4 perl speex gmp libxml2 libxslt sqlite alsaLib libidn
|
||||||
libvncserver libmsn giflib gpgme boost libv4l libotr libXi libXtst
|
libvncserver libmsn giflib gpgme boost libv4l libotr libXi libXtst
|
||||||
@ -30,5 +28,9 @@ kdePackage {
|
|||||||
description = "KDE network utilities";
|
description = "KDE network utilities";
|
||||||
longDescription = "Various network utilities for KDE such as a messenger client and network configuration interface";
|
longDescription = "Various network utilities for KDE such as a messenger client and network configuration interface";
|
||||||
license = "GPL";
|
license = "GPL";
|
||||||
|
kde = {
|
||||||
|
name = "kdenetwork";
|
||||||
|
version = "4.5.1";
|
||||||
|
};
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
@ -1,14 +1,15 @@
|
|||||||
{ kdePackage, cmake, kdelibs, qt4, kdepimlibs, akonadi, pkgconfig, boost, shared_mime_info, libxml2, shared_desktop_ontologies, soprano, strigi, automoc4, libxslt }:
|
{ kde, 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";
|
|
||||||
|
|
||||||
|
kde.package rec {
|
||||||
buildInputs = [ automoc4 cmake kdelibs qt4 kdepimlibs akonadi pkgconfig boost shared_mime_info shared_desktop_ontologies libxml2 soprano strigi libxslt ];
|
buildInputs = [ automoc4 cmake kdelibs qt4 kdepimlibs akonadi pkgconfig boost shared_mime_info shared_desktop_ontologies libxml2 soprano strigi libxslt ];
|
||||||
|
|
||||||
meta = {
|
meta = {
|
||||||
description = "Runtime files for KDE PIM: akonadi agents etc.";
|
description = "Runtime files for KDE PIM: akonadi agents etc.";
|
||||||
|
kde = rec {
|
||||||
|
name = "kdepim-runtime";
|
||||||
|
version = "4.4.93";
|
||||||
|
subdir = "kdepim/${version}/src/src";
|
||||||
|
stable = false;
|
||||||
|
};
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
12
pkgs/desktops/kde-4.5/pim/boost-1.44.diff
Normal file
12
pkgs/desktops/kde-4.5/pim/boost-1.44.diff
Normal file
@ -0,0 +1,12 @@
|
|||||||
|
diff --git a/kleopatra/crypto/gui/newresultpage.cpp b/kleopatra/crypto/gui/newresultpage.cpp
|
||||||
|
index 96d1cb2..5c7281a 100644
|
||||||
|
--- a/kleopatra/crypto/gui/newresultpage.cpp
|
||||||
|
+++ b/kleopatra/crypto/gui/newresultpage.cpp
|
||||||
|
@@ -40,6 +40,7 @@
|
||||||
|
#include <crypto/taskcollection.h>
|
||||||
|
|
||||||
|
#include <utils/stl_util.h>
|
||||||
|
+#include <boost/mem_fn.hpp>
|
||||||
|
|
||||||
|
#include <KLocalizedString>
|
||||||
|
|
18
pkgs/desktops/kde-4.5/pim/default.nix
Normal file
18
pkgs/desktops/kde-4.5/pim/default.nix
Normal file
@ -0,0 +1,18 @@
|
|||||||
|
{ kde, automoc4, cmake, kdelibs, akonadi, kdepimlibs, boost, zlib, strigi,
|
||||||
|
shared_desktop_ontologies, soprano, grantlee, libassuan, perl, libxslt }:
|
||||||
|
|
||||||
|
kde.package {
|
||||||
|
buildInputs = [ automoc4 cmake kdelibs akonadi kdepimlibs boost zlib strigi
|
||||||
|
shared_desktop_ontologies soprano grantlee libassuan perl libxslt ];
|
||||||
|
|
||||||
|
patches = [ ./boost-1.44.diff ];
|
||||||
|
|
||||||
|
meta = {
|
||||||
|
kde = rec {
|
||||||
|
name = "kdepim";
|
||||||
|
version = "4.4.93";
|
||||||
|
subdir = "kdepim/${version}/src/src";
|
||||||
|
stable = false;
|
||||||
|
};
|
||||||
|
};
|
||||||
|
}
|
@ -1,15 +1,18 @@
|
|||||||
{ kdePackage, cmake, qt4, perl, boost, cyrus_sasl, gpgme, libical, openldap, shared_mime_info
|
{ kde, cmake, qt4, perl, boost, cyrus_sasl, gpgme, libical, openldap, shared_mime_info
|
||||||
, kdelibs, automoc4, akonadi, soprano}:
|
, kdelibs, automoc4, akonadi, soprano}:
|
||||||
|
|
||||||
kdePackage {
|
kde.package {
|
||||||
pn = "kdepimlibs";
|
|
||||||
v = "4.5.0";
|
|
||||||
|
|
||||||
buildInputs = [ cmake qt4 perl boost cyrus_sasl gpgme libical openldap
|
buildInputs = [ cmake automoc4 perl shared_mime_info ];
|
||||||
shared_mime_info kdelibs automoc4 akonadi soprano ];
|
propagatedBuildInputs = [ qt4 boost cyrus_sasl gpgme libical openldap kdelibs
|
||||||
|
akonadi soprano ];
|
||||||
|
|
||||||
meta = {
|
meta = {
|
||||||
description = "KDE PIM libraries";
|
description = "KDE PIM libraries";
|
||||||
license = "LGPL";
|
license = "LGPL";
|
||||||
|
kde = {
|
||||||
|
name = "kdepimlibs";
|
||||||
|
version = "4.5.1";
|
||||||
|
};
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
@ -1,11 +1,12 @@
|
|||||||
{ kdePackage, cmake, qt4, perl, automoc4, kdelibs, soprano, kdeedu
|
{ kde, cmake, qt4, perl, automoc4, kdelibs, soprano, kdeedu
|
||||||
, boost, eigen, kdebase_workspace, attica, python, qca2, qimageblitz
|
, boost, eigen, kdebase_workspace, attica, python, qca2, qimageblitz
|
||||||
, shared_mime_info, kdepimlibs, kdegraphics, libqalculate, libXtst }:
|
, shared_mime_info, kdepimlibs, kdegraphics, libqalculate, libXtst }:
|
||||||
# TODO: qwt, scim, MARBLE!!
|
# TODO: qwt, scim, MARBLE!!
|
||||||
|
|
||||||
kdePackage {
|
kde.package {
|
||||||
pn = "kdeplasma-addons";
|
|
||||||
v = "4.5.0";
|
preConfigure =
|
||||||
|
"cp -v ${kdeedu}/share/apps/cmake/modules/FindMarble.cmake cmake";
|
||||||
|
|
||||||
buildInputs = [ cmake qt4 perl automoc4 kdelibs boost eigen kdebase_workspace
|
buildInputs = [ cmake qt4 perl automoc4 kdelibs boost eigen kdebase_workspace
|
||||||
attica python qca2 qimageblitz shared_mime_info kdepimlibs kdegraphics
|
attica python qca2 qimageblitz shared_mime_info kdepimlibs kdegraphics
|
||||||
@ -14,5 +15,9 @@ kdePackage {
|
|||||||
meta = {
|
meta = {
|
||||||
description = "KDE Plasma Addons";
|
description = "KDE Plasma Addons";
|
||||||
license = "GPL";
|
license = "GPL";
|
||||||
|
kde = {
|
||||||
|
name = "kdeplasma-addons";
|
||||||
|
version = "4.5.1";
|
||||||
|
};
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
17
pkgs/desktops/kde-4.5/sdk/cervisia.nix
Normal file
17
pkgs/desktops/kde-4.5/sdk/cervisia.nix
Normal file
@ -0,0 +1,17 @@
|
|||||||
|
{ kde, cmake, kdelibs, automoc4 }:
|
||||||
|
|
||||||
|
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";
|
||||||
|
};
|
||||||
|
};
|
||||||
|
}
|
@ -1,21 +0,0 @@
|
|||||||
{ 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";
|
|
||||||
};
|
|
||||||
}
|
|
18
pkgs/desktops/kde-4.5/sdk/dolphin-plugins.nix
Normal file
18
pkgs/desktops/kde-4.5/sdk/dolphin-plugins.nix
Normal file
@ -0,0 +1,18 @@
|
|||||||
|
{ kde, cmake, kdelibs, automoc4, kdebase }:
|
||||||
|
|
||||||
|
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";
|
||||||
|
};
|
||||||
|
};
|
||||||
|
}
|
17
pkgs/desktops/kde-4.5/sdk/kapptemplate.nix
Normal file
17
pkgs/desktops/kde-4.5/sdk/kapptemplate.nix
Normal file
@ -0,0 +1,17 @@
|
|||||||
|
{ kde, cmake, kdelibs, automoc4 }:
|
||||||
|
|
||||||
|
kde.package {
|
||||||
|
buildInputs = [ cmake kdelibs automoc4 ];
|
||||||
|
|
||||||
|
patches = [ ./optional-docs.diff ];
|
||||||
|
|
||||||
|
meta = {
|
||||||
|
description = "A KDE 4 project template generator";
|
||||||
|
kde = {
|
||||||
|
name = "cervisia";
|
||||||
|
module = "kdesdk";
|
||||||
|
version = "0.1";
|
||||||
|
release = "4.5.1";
|
||||||
|
};
|
||||||
|
};
|
||||||
|
}
|
17
pkgs/desktops/kde-4.5/sdk/kate.nix
Normal file
17
pkgs/desktops/kde-4.5/sdk/kate.nix
Normal file
@ -0,0 +1,17 @@
|
|||||||
|
{ kde, cmake, kdelibs, automoc4, shared_mime_info }:
|
||||||
|
|
||||||
|
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";
|
||||||
|
};
|
||||||
|
};
|
||||||
|
}
|
17
pkgs/desktops/kde-4.5/sdk/kbugbuster.nix
Normal file
17
pkgs/desktops/kde-4.5/sdk/kbugbuster.nix
Normal file
@ -0,0 +1,17 @@
|
|||||||
|
{ kde, cmake, kdelibs, automoc4, kdepimlibs }:
|
||||||
|
|
||||||
|
kde.package {
|
||||||
|
buildInputs = [ cmake kdelibs automoc4 kdepimlibs ];
|
||||||
|
|
||||||
|
patches = [ ./optional-docs.diff ];
|
||||||
|
|
||||||
|
meta = {
|
||||||
|
description = "KDE bugzilla client";
|
||||||
|
kde = {
|
||||||
|
name = "kbugbuster";
|
||||||
|
module = "kdesdk";
|
||||||
|
version = "3.80.3";
|
||||||
|
release = "4.5.1";
|
||||||
|
};
|
||||||
|
};
|
||||||
|
}
|
Some files were not shown because too many files have changed in this diff Show More
Loading…
Reference in New Issue
Block a user