diff --git a/doc/language-support.xml b/doc/language-support.xml
index 69361e3be6c..f5e89df57fc 100644
--- a/doc/language-support.xml
+++ b/doc/language-support.xml
@@ -108,7 +108,7 @@ a preConfigure hook to generate a configuration
file used by Makefile.PL:
-{buildPerlPackage, fetchurl, db4}:
+{buildPerlPackage, fetchurl, db}:
buildPerlPackage rec {
name = "BerkeleyDB-0.36";
@@ -119,8 +119,8 @@ buildPerlPackage rec {
};
preConfigure = ''
- echo "LIB = ${db4}/lib" > config.in
- echo "INCLUDE = ${db4}/include" >> config.in
+ echo "LIB = ${db}/lib" > config.in
+ echo "INCLUDE = ${db}/include" >> config.in
'';
}
diff --git a/lib/maintainers.nix b/lib/maintainers.nix
index fa0d1d81e61..fa004c859b4 100644
--- a/lib/maintainers.nix
+++ b/lib/maintainers.nix
@@ -34,6 +34,7 @@
jcumming = "Jack Cummings ";
kkallio = "Karn Kallio ";
ktosiek = "Tomasz Kontusz ";
+ lethalman = "Luca Bruno ";
linquize = "Linquize ";
lovek323 = "Jason O'Conal ";
ludo = "Ludovic Courtès ";
@@ -56,6 +57,7 @@
rob = "Rob Vermaas ";
roconnor = "Russell O'Connor ";
roelof = "Roelof Wobben ";
+ rszibele = "Richard Szibele ";
sander = "Sander van der Burg ";
shlevy = "Shea Levy ";
simons = "Peter Simons ";
diff --git a/lib/modules.nix b/lib/modules.nix
index fa31ce6399c..6d9dc0e3ad3 100644
--- a/lib/modules.nix
+++ b/lib/modules.nix
@@ -12,7 +12,7 @@ rec {
and ‘config’: the nested set of all option values. */
evalModules = { modules, prefix ? [], args ? {}, check ? true }:
let
- args' = args // result;
+ args' = args // { lib = import ./.; } // result;
closed = closeModules modules args';
# Note: the list of modules is reversed to maintain backward
# compatibility with the old module system. Not sure if this is
diff --git a/nixos/maintainers/scripts/ec2/create-ebs-amis.py b/nixos/maintainers/scripts/ec2/create-ebs-amis.py
index 541eadd7b8c..eab111a2665 100755
--- a/nixos/maintainers/scripts/ec2/create-ebs-amis.py
+++ b/nixos/maintainers/scripts/ec2/create-ebs-amis.py
@@ -203,7 +203,7 @@ f = open("{0}.{1}.ami-id".format(args.region, image_type), "w")
f.write("{0}".format(ami_id))
f.close()
-for dest in [ 'us-east-1', 'us-west-1', 'us-west-2', 'eu-west-1']:
+for dest in [ 'us-east-1', 'us-west-1', 'us-west-2', 'eu-west-1', 'ap-southeast-1', 'ap-southeast-2', 'ap-northeast-1', 'sa-east-1']:
if args.region != dest:
print >> sys.stderr, "copying image from region {0} to {1}".format(args.region, dest)
conn = boto.ec2.connect_to_region(dest)
diff --git a/nixos/modules/misc/ids.nix b/nixos/modules/misc/ids.nix
index 51da1a2cfce..6d833551604 100644
--- a/nixos/modules/misc/ids.nix
+++ b/nixos/modules/misc/ids.nix
@@ -111,6 +111,7 @@
memcached = 100;
cgminer = 101;
munin = 102;
+ logcheck = 103;
# When adding a uid, make sure it doesn't match an existing gid.
@@ -201,6 +202,7 @@
openldap = 93;
connman = 94;
munin = 95;
+ keys = 96;
# When adding a gid, make sure it doesn't match an existing uid.
diff --git a/nixos/modules/security/ca.nix b/nixos/modules/security/ca.nix
index 2e93fb36b45..05cd1c3ecc1 100644
--- a/nixos/modules/security/ca.nix
+++ b/nixos/modules/security/ca.nix
@@ -10,11 +10,6 @@ with pkgs.lib;
[ { source = "${pkgs.cacert}/etc/ca-bundle.crt";
target = "ssl/certs/ca-bundle.crt";
}
-
- # Backward compatibility; may remove at some point.
- { source = "${pkgs.cacert}/etc/ca-bundle.crt";
- target = "ca-bundle.crt";
- }
];
environment.variables.OPENSSL_X509_CERT_FILE = "/etc/ssl/certs/ca-bundle.crt";
diff --git a/nixos/modules/services/logging/logcheck.nix b/nixos/modules/services/logging/logcheck.nix
index 2a6a6516f48..ef147f95358 100644
--- a/nixos/modules/services/logging/logcheck.nix
+++ b/nixos/modules/services/logging/logcheck.nix
@@ -208,12 +208,13 @@ in
mapAttrsToList writeIgnoreRule cfg.ignore
++ mapAttrsToList writeIgnoreCronRule cfg.ignoreCron;
- users.extraUsers = singleton
- { name = cfg.user;
+ users.extraUsers = optionalAttrs (cfg.user == "logcheck") (singleton
+ { name = "logcheck";
+ uid = config.ids.uids.logcheck;
shell = "/bin/sh";
description = "Logcheck user account";
extraGroups = cfg.extraGroups;
- };
+ });
system.activationScripts.logcheck = ''
mkdir -m 700 -p /var/{lib,lock}/logcheck
diff --git a/nixos/modules/services/networking/networkmanager.nix b/nixos/modules/services/networking/networkmanager.nix
index 2db96d9cd31..fd5ff5e4498 100644
--- a/nixos/modules/services/networking/networkmanager.nix
+++ b/nixos/modules/services/networking/networkmanager.nix
@@ -89,7 +89,7 @@ in {
to change network settings to this group.
'';
};
-
+
packages = mkOption {
type = types.listOf types.path;
default = [ ];
@@ -177,16 +177,13 @@ in {
systemd.services."networkmanager-init" = {
description = "NetworkManager initialisation";
wantedBy = [ "network.target" ];
- partOf = [ "NetworkManager.service" ];
- wants = [ "ModemManager.service" ];
+ wants = [ "NetworkManager.service" ];
before = [ "NetworkManager.service" ];
script = ''
mkdir -m 700 -p /etc/NetworkManager/system-connections
mkdir -m 755 -p ${stateDirs}
'';
- serviceConfig = {
- Type = "oneshot";
- };
+ serviceConfig.Type = "oneshot";
};
# Turn off NixOS' network management
diff --git a/nixos/modules/services/networking/vsftpd.nix b/nixos/modules/services/networking/vsftpd.nix
index 1c77cc6df4e..763fa8dc3c4 100644
--- a/nixos/modules/services/networking/vsftpd.nix
+++ b/nixos/modules/services/networking/vsftpd.nix
@@ -91,6 +91,7 @@ let
${optionalString (pkgs.stdenv.system == "x86_64-linux") ''
seccomp_sandbox=NO
''}
+ anon_umask=${cfg.anonymousUmask}
'';
in
@@ -139,6 +140,13 @@ in
description = "RSA certificate file.";
};
+ anonymousUmask = mkOption {
+ type = types.string;
+ default = "077";
+ example = "002";
+ description = "Anonymous write umask.";
+ };
+
} // (listToAttrs (catAttrs "nixosOption" optionDescription));
};
diff --git a/nixos/modules/services/printing/cupsd.nix b/nixos/modules/services/printing/cupsd.nix
index 1be3587c3bb..fb8923e107a 100644
--- a/nixos/modules/services/printing/cupsd.nix
+++ b/nixos/modules/services/printing/cupsd.nix
@@ -143,7 +143,9 @@ in
};
services.printing.drivers =
- [ pkgs.cups pkgs.cups_pdf_filter pkgs.ghostscript additionalBackends pkgs.perl pkgs.coreutils pkgs.gnused ];
+ [ pkgs.cups pkgs.cups_pdf_filter pkgs.ghostscript additionalBackends
+ pkgs.perl pkgs.coreutils pkgs.gnused pkgs.bc pkgs.gawk pkgs.gnugrep
+ ];
services.printing.cupsdConf =
''
diff --git a/nixos/modules/services/ttys/agetty.nix b/nixos/modules/services/ttys/agetty.nix
index ae4fa87d4b7..211008fa7e4 100644
--- a/nixos/modules/services/ttys/agetty.nix
+++ b/nixos/modules/services/ttys/agetty.nix
@@ -28,6 +28,17 @@ with pkgs.lib;
'';
};
+ serialSpeed = mkOption {
+ type = types.listOf types.int;
+ default = [ 115200 57600 38400 9600 ];
+ example = [ 38400 9600 ];
+ description = ''
+ Bitrates to allow for agetty's listening on serial ports. Listing more
+ bitrates gives more interoperability but at the cost of long delays
+ for getting a sync on the line.
+ '';
+ };
+
};
};
@@ -78,8 +89,9 @@ with pkgs.lib;
X-RestartIfChanged=false
'';
- systemd.units."serial-getty@.service".text =
- ''
+ systemd.units."serial-getty@.service".text = let
+ speeds = with pkgs.lib; concatStringsSep "," (map toString config.services.mingetty.serialSpeed);
+ in ''
[Unit]
Description=Serial Getty on %I
Documentation=man:agetty(8) man:systemd-getty-generator(8)
@@ -95,7 +107,7 @@ with pkgs.lib;
[Service]
Environment=TERM=linux
Environment=LOCALE_ARCHIVE=/run/current-system/sw/lib/locale/locale-archive
- ExecStart=@${pkgs.utillinux}/sbin/agetty agetty --login-program ${pkgs.shadow}/bin/login %I 115200,57600,38400,9600
+ ExecStart=@${pkgs.utillinux}/sbin/agetty agetty --login-program ${pkgs.shadow}/bin/login %I ${speeds}
Type=idle
Restart=always
RestartSec=0
diff --git a/nixos/modules/services/web-servers/nginx/default.nix b/nixos/modules/services/web-servers/nginx/default.nix
index 4a1b6de2873..512da831aa3 100644
--- a/nixos/modules/services/web-servers/nginx/default.nix
+++ b/nixos/modules/services/web-servers/nginx/default.nix
@@ -9,6 +9,7 @@ let
user ${cfg.user} ${cfg.group};
daemon off;
${cfg.config}
+ ${cfg.appendConfig}
'';
in
@@ -36,6 +37,19 @@ in
";
};
+ appendConfig = mkOption {
+ type = types.lines;
+ default = "";
+ description = ''
+ Configuration lines appended to the generated Nginx
+ configuration file. Commonly used by different modules
+ providing http snippets.
+ can be specified more than once and it's value will be
+ concatenated (contrary to which
+ can be set only once).
+ '';
+ };
+
stateDir = mkOption {
default = "/var/spool/nginx";
description = "
diff --git a/nixos/modules/services/x11/redshift.nix b/nixos/modules/services/x11/redshift.nix
index b9ad962d8e4..332d742a141 100644
--- a/nixos/modules/services/x11/redshift.nix
+++ b/nixos/modules/services/x11/redshift.nix
@@ -14,24 +14,37 @@ in {
services.redshift.latitude = mkOption {
description = "Your current latitude";
- type = types.string;
+ type = types.uniq types.string;
};
services.redshift.longitude = mkOption {
description = "Your current longitude";
- type = types.string;
+ type = types.uniq types.string;
};
services.redshift.temperature = {
day = mkOption {
description = "Colour temperature to use during day time";
default = 5500;
- type = types.int;
+ type = types.uniq types.int;
};
night = mkOption {
description = "Colour temperature to use during night time";
default = 3700;
- type = types.int;
+ type = types.uniq types.int;
+ };
+ };
+
+ services.redshift.brightness = {
+ day = mkOption {
+ description = "Screen brightness to apply during the day (between 0.1 and 1.0)";
+ default = 1;
+ type = types.uniq types.string;
+ };
+ night = mkOption {
+ description = "Screen brightness to apply during the night (between 0.1 and 1.0)";
+ default = 1;
+ type = types.uniq types.string;
};
};
};
@@ -41,10 +54,12 @@ in {
description = "Redshift colour temperature adjuster";
requires = [ "display-manager.service" ];
after = [ "display-manager.service" ];
- script = ''
+ wantedBy = [ "graphical.target" ];
+ serviceConfig.ExecStart = ''
${pkgs.redshift}/bin/redshift \
-l ${cfg.latitude}:${cfg.longitude} \
- -t ${toString cfg.temperature.day}:${toString cfg.temperature.night}
+ -t ${toString cfg.temperature.day}:${toString cfg.temperature.night} \
+ -b ${toString cfg.brightness.day}:${toString cfg.brightness.night}
'';
environment = { DISPLAY = ":0"; };
serviceConfig.Restart = "always";
diff --git a/nixos/modules/system/boot/stage-1-init.sh b/nixos/modules/system/boot/stage-1-init.sh
index 1f65026b5de..97c688ce590 100644
--- a/nixos/modules/system/boot/stage-1-init.sh
+++ b/nixos/modules/system/boot/stage-1-init.sh
@@ -320,6 +320,10 @@ while read -u 3 mountPoint; do
echo -n "waiting for device $device to appear..."
for try in $(seq 1 20); do
sleep 1
+ # also re-try lvm activation now that new block devices might have appeared
+ lvm vgchange -ay
+ # and tell udev to create nodes for the new LVs
+ udevadm trigger --action=add
if test -e $device; then break; fi
echo -n "."
done
diff --git a/nixos/modules/system/boot/stage-2-init.sh b/nixos/modules/system/boot/stage-2-init.sh
index e0ff258c0ee..b749172a3ff 100644
--- a/nixos/modules/system/boot/stage-2-init.sh
+++ b/nixos/modules/system/boot/stage-2-init.sh
@@ -136,7 +136,8 @@ fi
# elsehwere)
if ! mountpoint -q /run/keys; then
rm -rf /run/keys
- mkdir -m 0700 /run/keys
+ mkdir -m 0750 /run/keys
+ chown root:keys /run/keys
mount -t ramfs none /run/keys
fi
diff --git a/nixos/modules/system/boot/systemd.nix b/nixos/modules/system/boot/systemd.nix
index b575deb24b7..e0773c1fab4 100644
--- a/nixos/modules/system/boot/systemd.nix
+++ b/nixos/modules/system/boot/systemd.nix
@@ -645,6 +645,8 @@ in
'';
# Target for ‘charon send-keys’ to hook into.
+ users.extraGroups.keys.gid = config.ids.gids.keys;
+
systemd.targets.keys =
{ description = "Security Keys";
};
diff --git a/nixos/modules/virtualisation/virtualbox-image.nix b/nixos/modules/virtualisation/virtualbox-image.nix
index 71bdf31a98d..06bea2d8acf 100644
--- a/nixos/modules/virtualisation/virtualbox-image.nix
+++ b/nixos/modules/virtualisation/virtualbox-image.nix
@@ -111,5 +111,5 @@ with pkgs.lib;
# Prevent logging in as root without a password. For NixOps, we
# don't need this because the user can login via SSH, and for the
# demo images, there is a demo user account that can sudo to root.
- security.initialRootPassword = "!";
+ security.initialRootPassword = mkDefault "!";
}
diff --git a/nixos/release-combined.nix b/nixos/release-combined.nix
index ed5c4769d0a..419f71bc259 100644
--- a/nixos/release-combined.nix
+++ b/nixos/release-combined.nix
@@ -44,7 +44,7 @@ in rec {
(all nixos.iso_graphical)
(all nixos.ova)
- #(all nixos.tests.efi-installer.simple)
+ (all nixos.tests.efi-installer.simple)
(all nixos.tests.firefox)
(all nixos.tests.firewall)
(all nixos.tests.installer.grub1)
diff --git a/pkgs/applications/audio/amarok/default.nix b/pkgs/applications/audio/amarok/default.nix
index 1dac3f6b853..b1bcfe869f7 100644
--- a/pkgs/applications/audio/amarok/default.nix
+++ b/pkgs/applications/audio/amarok/default.nix
@@ -22,12 +22,10 @@ stdenv.mkDerivation rec {
cmakeFlags = "-DKDE4_BUILD_TESTS=OFF";
- postInstall = ''
- mkdir -p $out/nix-support
- echo ${qtscriptgenerator} > $out/nix-support/propagated-user-env-packages
- '';
+ propagatedUserEnvPkgs = [ qtscriptgenerator ];
meta = {
+ repositories.git = git://anongit.kde.org/amarok.git;
description = "Popular music player for KDE";
license = "GPL";
homepage = http://amarok.kde.org;
diff --git a/pkgs/applications/audio/moc/default.nix b/pkgs/applications/audio/moc/default.nix
index 74ae3dcf22b..5356d4ce298 100644
--- a/pkgs/applications/audio/moc/default.nix
+++ b/pkgs/applications/audio/moc/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, ncurses, pkgconfig, alsaLib, flac, libmad, speex, ffmpeg_0_10, libvorbis, mpc, libsndfile, jackaudio, db4, libmodplug, timidity, libid3tag, libtool }:
+{ stdenv, fetchurl, ncurses, pkgconfig, alsaLib, flac, libmad, speex, ffmpeg_0_10, libvorbis, mpc, libsndfile, jackaudio, db, libmodplug, timidity, libid3tag, libtool }:
stdenv.mkDerivation rec {
name = "moc-${version}";
@@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
configurePhase = "./configure prefix=$out";
- buildInputs = [ ncurses pkgconfig alsaLib flac libmad speex ffmpeg_0_10 libvorbis mpc libsndfile jackaudio db4 libmodplug timidity libid3tag libtool ];
+ buildInputs = [ ncurses pkgconfig alsaLib flac libmad speex ffmpeg_0_10 libvorbis mpc libsndfile jackaudio db libmodplug timidity libid3tag libtool ];
meta = {
description = "MOC (music on console) is a console audio player for LINUX/UNIX designed to be powerful and easy to use.";
diff --git a/pkgs/applications/audio/qmmp/default.nix b/pkgs/applications/audio/qmmp/default.nix
index 255c63a5d6d..122b7ed7867 100644
--- a/pkgs/applications/audio/qmmp/default.nix
+++ b/pkgs/applications/audio/qmmp/default.nix
@@ -28,11 +28,11 @@
# handle that.
stdenv.mkDerivation rec {
- name = "qmmp-0.7.3";
+ name = "qmmp-0.7.5";
src = fetchurl {
url = "http://qmmp.ylsoftware.com/files/${name}.tar.bz2";
- sha256 = "0qjmnyq3qmrm510g3lsa6vd80nmbz0859pwhnaaa19ah0jhf3r2p";
+ sha256 = "0ryg4hns5zi9swn2q4vxjya3i4drdqfzycngwzd6fdl176lswrk0";
};
buildInputs =
diff --git a/pkgs/applications/editors/emacs-modes/writegood/default.nix b/pkgs/applications/editors/emacs-modes/writegood/default.nix
new file mode 100644
index 00000000000..353215a5d48
--- /dev/null
+++ b/pkgs/applications/editors/emacs-modes/writegood/default.nix
@@ -0,0 +1,30 @@
+{stdenv, fetchurl, emacs}:
+
+let version = "1.3";
+
+in stdenv.mkDerivation {
+ name = "writegood-mode-${version}";
+ src = fetchurl {
+ url = "https://github.com/bnbeckwith/writegood-mode/archive/v${version}.tar.gz";
+ sha256 = "0p34rgawnqg94vk4lcw14x99rrvsd23dmbwkxz2vax5kq6l8y5yf";
+ };
+
+ buildInputs = [ emacs ];
+
+ buildPhase = ''
+ emacs -L . --batch -f batch-byte-compile *.el
+ '';
+
+ installPhase = ''
+ install -d $out/share/emacs/site-lisp
+ install *.el *.elc $out/share/emacs/site-lisp
+ '';
+
+ meta = {
+ description = "Emacs minor mode that aids in finding common writing problems";
+ homepage = https://github.com/bnbeckwith/writegood-mode;
+ platforms = stdenv.lib.platforms.all;
+ maintainers = [ stdenv.lib.maintainers.pSub ];
+ license = "GPL3";
+ };
+}
diff --git a/pkgs/applications/editors/scite/default.nix b/pkgs/applications/editors/scite/default.nix
new file mode 100644
index 00000000000..234ee1f065e
--- /dev/null
+++ b/pkgs/applications/editors/scite/default.nix
@@ -0,0 +1,35 @@
+{ stdenv, fetchurl, pkgconfig, gtk }:
+
+let
+ version = "3.3.7";
+
+ version_short = stdenv.lib.replaceChars [ "." ] [ "" ] "${version}";
+in stdenv.mkDerivation {
+ name = "scite-${version}";
+
+ src = fetchurl {
+ url = "mirror://sourceforge/project/scintilla/SciTE/${version}/scite${version_short}.tgz";
+ sha256 = "0x7i6yxq50frsjkrp3lc5zy0d1ssq2n91igjn0dmqajpg7kls2dd";
+ };
+
+ buildInputs = [ pkgconfig gtk ];
+ sourceRoot = "scintilla/gtk";
+
+ buildPhase = ''
+ make
+ cd ../../scite/gtk
+ make prefix=$out/
+ '';
+
+ installPhase = ''
+ make install prefix=$out/
+ '';
+
+ meta = {
+ homepage = "http://www.scintilla.org/SciTE.html";
+ description = "SCIntilla based Text Editor";
+ license = stdenv.lib.licenses.mit;
+ platforms = stdenv.lib.platforms.linux;
+ maintainers = stdenv.lib.maintainers.rszibele;
+ };
+}
diff --git a/pkgs/applications/editors/vim/ft-nix-support.patch b/pkgs/applications/editors/vim/ft-nix-support.patch
index b2ac423092e..ed508784813 100644
--- a/pkgs/applications/editors/vim/ft-nix-support.patch
+++ b/pkgs/applications/editors/vim/ft-nix-support.patch
@@ -23,7 +23,7 @@ new file mode 100644
index 0000000..a2f9918
--- /dev/null
+++ b/runtime/syntax/nix.vim
-@@ -0,0 +1,42 @@
+@@ -0,0 +1,47 @@
+" Vim syntax file
+" Language: nix
+" Maintainer: Marc Weber
@@ -68,3 +68,8 @@ index 0000000..a2f9918
+hi def link nixFuncArg Identifier
+
+let b:current_syntax = "nix"
++
++" scan backwards to find begining of multiline statements
++syn sync ccomment nixMultiLineComment minlines=10 maxlines=500
++syn sync ccomment nixStringIndented minlines=10 maxlines=500
++syn sync ccomment nixString maxlines=10
diff --git a/pkgs/applications/graphics/darktable/default.nix b/pkgs/applications/graphics/darktable/default.nix
index 76669626581..d4983ca04d8 100644
--- a/pkgs/applications/graphics/darktable/default.nix
+++ b/pkgs/applications/graphics/darktable/default.nix
@@ -9,12 +9,12 @@
assert stdenv ? glibc;
stdenv.mkDerivation rec {
- version = "1.2.3";
+ version = "1.4.1";
name = "darktable-${version}";
src = fetchurl {
url = "mirror://sourceforge/darktable/darktable/1.2/darktable-${version}.tar.xz";
- sha256 = "05kkkz13a5rhb246rq1nxv7h91pcvm15filvik8n8gn143h64sv8";
+ sha256 = "1pkixhiyyjx5wx4dlkvabga9glcx374f1ic2kxmzzdprfm6kkqfd";
};
buildInputs =
diff --git a/pkgs/applications/graphics/freecad/cmake.patch b/pkgs/applications/graphics/freecad/cmake.patch
new file mode 100644
index 00000000000..e54e16da977
--- /dev/null
+++ b/pkgs/applications/graphics/freecad/cmake.patch
@@ -0,0 +1,12 @@
+diff -ru freecad-0.13.1830.orig/CMakeLists.txt freecad-0.13.1830/CMakeLists.txt
+--- freecad-0.13.1830.orig/CMakeLists.txt 2013-02-02 18:09:17.000000000 +0100
++++ freecad-0.13.1830/CMakeLists.txt 2014-02-15 10:16:00.939725500 +0100
+@@ -321,7 +321,7 @@
+ foreach(it ${moc_files})
+ get_filename_component(it ${it} ABSOLUTE)
+ QT4_MAKE_OUTPUT_FILE(${it} moc_ cpp outfile)
+- QT4_CREATE_MOC_COMMAND(${it} ${outfile} "${moc_flags}" "${moc_options}")
++ QT4_CREATE_MOC_COMMAND(${it} ${outfile} "${moc_flags}" "${moc_options}" "")
+ set(${outfiles} ${${outfiles}} ${outfile})
+ add_file_dependencies(${it} ${outfile})
+ endforeach(it)
diff --git a/pkgs/applications/graphics/freecad/default.nix b/pkgs/applications/graphics/freecad/default.nix
index 37265c954e8..770a7ee8212 100644
--- a/pkgs/applications/graphics/freecad/default.nix
+++ b/pkgs/applications/graphics/freecad/default.nix
@@ -28,7 +28,7 @@ stdenv.mkDerivation rec {
--set COIN_GL_NO_CURRENT_CONTEXT_CHECK 1
'';
- patches = [ ./pythonpath.patch ];
+ patches = [ ./pythonpath.patch ./cmake.patch ];
meta = {
homepage = http://free-cad.sourceforge.net/;
diff --git a/pkgs/applications/misc/bitcoin/default.nix b/pkgs/applications/misc/bitcoin/default.nix
index 9e20be0dcbc..1785526d14a 100644
--- a/pkgs/applications/misc/bitcoin/default.nix
+++ b/pkgs/applications/misc/bitcoin/default.nix
@@ -1,4 +1,4 @@
-{ fetchurl, stdenv, openssl, db4, boost, zlib, miniupnpc, qt4 }:
+{ fetchurl, stdenv, openssl, db, boost, zlib, miniupnpc, qt4 }:
stdenv.mkDerivation rec {
version = "0.8.6";
@@ -9,7 +9,7 @@ stdenv.mkDerivation rec {
sha256 = "036xx06gyrfh65rpdapff3viz1f38vzkj7lnhil6fc0s7pjmsjbk";
};
- buildInputs = [ openssl db4 boost zlib miniupnpc qt4 ];
+ buildInputs = [ openssl db boost zlib miniupnpc qt4 ];
configurePhase = ''
cd src
diff --git a/pkgs/applications/misc/calibre/default.nix b/pkgs/applications/misc/calibre/default.nix
index 686e327e2f7..c2672393bc5 100644
--- a/pkgs/applications/misc/calibre/default.nix
+++ b/pkgs/applications/misc/calibre/default.nix
@@ -4,11 +4,11 @@
}:
stdenv.mkDerivation rec {
- name = "calibre-1.21.0";
+ name = "calibre-1.23.0";
src = fetchurl {
url = "mirror://sourceforge/calibre/${name}.tar.xz";
- sha256 = "05hwny9zi32gkk3hadvigrqrnbgzw53vhjkjp60dq0lb545pscih";
+ sha256 = "1sm6v53c12nkqnpv7n4g1mzkwmzbn74a8v83bzvvjiz0i9c7cl59";
};
inherit python;
diff --git a/pkgs/applications/misc/freicoin/default.nix b/pkgs/applications/misc/freicoin/default.nix
index d5ed057f56b..33d8585bb2d 100644
--- a/pkgs/applications/misc/freicoin/default.nix
+++ b/pkgs/applications/misc/freicoin/default.nix
@@ -1,4 +1,4 @@
-{ fetchurl, stdenv, db4, boost, gmp, mpfr, miniupnpc, qt4, unzip }:
+{ fetchurl, stdenv, db, boost, gmp, mpfr, miniupnpc, qt4, unzip }:
stdenv.mkDerivation rec {
version = "0.8.3-1";
@@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
# I think that openssl and zlib are required, but come through other
# packages
- buildInputs = [ db4 boost gmp mpfr miniupnpc qt4 unzip ];
+ buildInputs = [ db boost gmp mpfr miniupnpc qt4 unzip ];
configurePhase = "qmake";
diff --git a/pkgs/applications/misc/ikiwiki/default.nix b/pkgs/applications/misc/ikiwiki/default.nix
index 6e5eece5d34..c0dce81c803 100644
--- a/pkgs/applications/misc/ikiwiki/default.nix
+++ b/pkgs/applications/misc/ikiwiki/default.nix
@@ -23,7 +23,7 @@ assert mercurialSupport -> (mercurial != null);
let
name = "ikiwiki";
- version = "3.20140102";
+ version = "3.20140125";
lib = stdenv.lib;
in
@@ -32,7 +32,7 @@ stdenv.mkDerivation {
src = fetchurl {
url = "http://ftp.de.debian.org/debian/pool/main/i/ikiwiki/${name}_${version}.tar.gz";
- sha256 = "0nsyfq7j03cg4qq73kw7cxnc7wgbr2m75fqmmll77wyl9cb661lj";
+ sha256 = "06r95xhm8pnvswgmkf3j7h4n6b1nmk0v0znmnzblkdx7xh12m0hd";
};
buildInputs = [ perl TextMarkdown URI HTMLParser HTMLScrubber HTMLTemplate
diff --git a/pkgs/applications/misc/jigdo/default.nix b/pkgs/applications/misc/jigdo/default.nix
index 24edc0e128a..fe4c0287fdd 100644
--- a/pkgs/applications/misc/jigdo/default.nix
+++ b/pkgs/applications/misc/jigdo/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, db4, gtk, bzip2 }:
+{ stdenv, fetchurl, db, gtk, bzip2 }:
stdenv.mkDerivation {
name = "jigdo-0.7.3";
@@ -14,7 +14,7 @@ stdenv.mkDerivation {
sha256 = "0jnlzm9m2hjlnw0zs2fv456ml5r2jj2q1lncqbrgg52lq18f6fa3";
};
- buildInputs = [ db4 gtk bzip2 ];
+ buildInputs = [ db gtk bzip2 ];
configureFlags = "--without-libdb";
diff --git a/pkgs/applications/misc/librecad/2.0.nix b/pkgs/applications/misc/librecad/2.0.nix
index 2394d116314..2f140db9397 100644
--- a/pkgs/applications/misc/librecad/2.0.nix
+++ b/pkgs/applications/misc/librecad/2.0.nix
@@ -1,12 +1,12 @@
-{ stdenv, fetchurl, qt4, muparser, which, boost}:
+{ stdenv, fetchurl, qt4, muparser, which, boost, pkgconfig }:
stdenv.mkDerivation {
- name = "librecad-2.0.0beta1";
+ name = "librecad-2.0.2";
src = fetchurl {
- url = https://github.com/LibreCAD/LibreCAD/tarball/2.0.0beta1;
- name = "librecad-2.0.0beta1.tar.gz";
- sha256 = "8bf969b79be115f3b3ff72cc030a4c21fe93164dd0cb19ddfb78a7d66b8bc770";
+ url = https://github.com/LibreCAD/LibreCAD/tarball/2.0.2;
+ name = "librecad-2.0.2.tar.gz";
+ sha256 = "0a5rs1h4n74d4bnrj91ij6y6wzc8d6nbrg9lfwjx8icjjl6hqikm";
};
patchPhase = ''
@@ -25,12 +25,14 @@ stdenv.mkDerivation {
'';
buildInputs = [ qt4 muparser which boost ];
+ nativeBuildInputs = [ pkgconfig ];
enableParallelBuilding = true;
meta = {
description = "A 2D CAD package based upon Qt";
homepage = http://librecad.org;
+ repositories.git = git://github.com/LibreCAD/LibreCAD.git;
license = "GPLv2";
maintainers = with stdenv.lib.maintainers; [viric];
platforms = with stdenv.lib.platforms; linux;
diff --git a/pkgs/applications/misc/librecad/default.nix b/pkgs/applications/misc/librecad/default.nix
index 59bd4888e4a..b225519f486 100644
--- a/pkgs/applications/misc/librecad/default.nix
+++ b/pkgs/applications/misc/librecad/default.nix
@@ -1,12 +1,12 @@
{ stdenv, fetchurl, qt4, muparser, which}:
stdenv.mkDerivation {
- name = "librecad-1.0.2";
+ name = "librecad-1.0.4";
src = fetchurl {
- url = https://github.com/LibreCAD/LibreCAD/tarball/v1.0.2;
- name = "librecad-1.0.2.tar.gz";
- sha256 = "13ee7e401e4f5fbc68c2e017b7189bec788038f4f6e77f559861ceb8cfb1907d";
+ url = https://github.com/LibreCAD/LibreCAD/tarball/v1.0.4;
+ name = "librecad-1.0.4.tar.gz";
+ sha256 = "00nzbijw7pn1zkj4256da501xcm6rkcvycpa79y6dr2p6c43yc6m";
};
patchPhase = ''
diff --git a/pkgs/applications/misc/zathura/default.nix b/pkgs/applications/misc/zathura/default.nix
index 74288657fb3..2ee32f77c1e 100644
--- a/pkgs/applications/misc/zathura/default.nix
+++ b/pkgs/applications/misc/zathura/default.nix
@@ -33,6 +33,8 @@ rec {
builder = ./builder.sh;
+ preferLocalBuild = true;
+
meta = {
homepage = http://pwmt.org/projects/zathura/;
description = "A highly customizable and functional PDF viewer";
diff --git a/pkgs/applications/networking/browsers/firefox/wrapper.nix b/pkgs/applications/networking/browsers/firefox/wrapper.nix
index bf4c7f3e7d2..3a73afe48c5 100644
--- a/pkgs/applications/networking/browsers/firefox/wrapper.nix
+++ b/pkgs/applications/networking/browsers/firefox/wrapper.nix
@@ -40,6 +40,8 @@ stdenv.mkDerivation {
echo ${browser} > $out/nix-support/propagated-user-env-packages
'';
+ preferLocalBuild = true;
+
# Let each plugin tell us (through its `mozillaPlugin') attribute
# where to find the plugin in its tree.
plugins = map (x: x + x.mozillaPlugin) plugins;
diff --git a/pkgs/applications/networking/browsers/mozilla-plugins/nspluginwrapper/default.nix b/pkgs/applications/networking/browsers/mozilla-plugins/nspluginwrapper/default.nix
index 7cb1abf3153..51511621dce 100644
--- a/pkgs/applications/networking/browsers/mozilla-plugins/nspluginwrapper/default.nix
+++ b/pkgs/applications/networking/browsers/mozilla-plugins/nspluginwrapper/default.nix
@@ -26,6 +26,8 @@ stdenv.mkDerivation rec {
buildInputs = [which pkgconfig file glib gtk2 gtk3 curl];
+ preferLocalBuild = true;
+
meta = {
description = ''A wrapper to run browser plugins out-of-process'';
homepage = "http://nspluginwrapper.org/";
diff --git a/pkgs/applications/networking/browsers/vimb/default.nix b/pkgs/applications/networking/browsers/vimb/default.nix
new file mode 100644
index 00000000000..10bca4848dd
--- /dev/null
+++ b/pkgs/applications/networking/browsers/vimb/default.nix
@@ -0,0 +1,42 @@
+{ stdenv, fetchurl, pkgconfig, libsoup, webkit, gtk, glib_networking
+, gsettings_desktop_schemas, makeWrapper
+}:
+
+stdenv.mkDerivation rec {
+ name = "vimb-${version}";
+ version = "2.2";
+
+ src = fetchurl {
+ url = "https://github.com/fanglingsu/vimb/archive/${version}.tar.gz";
+ sha256 = "18gig6rcxv0i4a8mz3jv29zpj0323zw45jsg1ycx61a08rzag60m";
+ };
+
+ # Nixos default ca bundle
+ patchPhase = ''
+ sed -i s,/etc/ssl/certs/ca-certificates.crt,/etc/ssl/certs/ca-bundle.crt, src/default.h
+ '';
+
+ buildInputs = [ makeWrapper gtk libsoup pkgconfig webkit ];
+
+ makeFlags = [ "PREFIX=$(out)" ];
+
+ postInstall = ''
+ wrapProgram "$out/bin/vimb" \
+ --prefix GIO_EXTRA_MODULES : "${glib_networking}/lib/gio/modules" \
+ --prefix XDG_DATA_DIRS : "${gsettings_desktop_schemas}/share"
+ '';
+
+ meta = {
+ description = "A Vim-like browser";
+ longDescription = ''
+ A fast and lightweight vim like web browser based on the webkit web
+ browser engine and the GTK toolkit. Vimb is modal like the great vim
+ editor and also easily configurable during runtime. Vimb is mostly
+ keyboard driven and does not detract you from your daily work.
+ '';
+ homepage = "http://fanglingsu.github.io/vimb/";
+ license = stdenv.lib.licenses.gpl3;
+ maintainers = [ stdenv.lib.maintainers.rickynils ];
+ platforms = with stdenv.lib.platforms; linux;
+ };
+}
diff --git a/pkgs/applications/networking/browsers/vimprobable2/default.nix b/pkgs/applications/networking/browsers/vimprobable2/default.nix
index ee8e4b8434a..2a44449c750 100644
--- a/pkgs/applications/networking/browsers/vimprobable2/default.nix
+++ b/pkgs/applications/networking/browsers/vimprobable2/default.nix
@@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
# Nixos default ca bundle
patchPhase = ''
- sed -i s,/etc/ssl/certs/ca-certificates.crt,/etc/ca-bundle.crt, config.h
+ sed -i s,/etc/ssl/certs/ca-certificates.crt,/etc/ssl/certs/ca-bundle.crt, config.h
'';
buildInputs = [ makeWrapper gtk libsoup libX11 perl pkgconfig webkit ];
diff --git a/pkgs/applications/networking/instant-messengers/ekiga/default.nix b/pkgs/applications/networking/instant-messengers/ekiga/default.nix
index 276df1ae7a1..9de14cae6f0 100644
--- a/pkgs/applications/networking/instant-messengers/ekiga/default.nix
+++ b/pkgs/applications/networking/instant-messengers/ekiga/default.nix
@@ -2,7 +2,7 @@ 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
+ , autoconf, pkgconfig, libxml2, videoproto, unixODBC, db, nspr, nss, zlib
, libXrandr, randrproto, which, libxslt, libtasn1, gmp, nettle
, ...}:
builderDefsPackage
diff --git a/pkgs/applications/networking/instant-messengers/kadu/cmake.patch b/pkgs/applications/networking/instant-messengers/kadu/cmake.patch
new file mode 100644
index 00000000000..bb2d2d39d25
--- /dev/null
+++ b/pkgs/applications/networking/instant-messengers/kadu/cmake.patch
@@ -0,0 +1,13 @@
+diff -ru kadu-0.12.2.orig/plugins/jabber_protocol/3rdparty/CMakeLists.txt kadu-0.12.2/plugins/jabber_protocol/3rdparty/CMakeLists.txt
+--- kadu-0.12.2.orig/plugins/jabber_protocol/3rdparty/CMakeLists.txt 2012-08-30 16:13:17.000000000 +0200
++++ kadu-0.12.2/plugins/jabber_protocol/3rdparty/CMakeLists.txt 2014-02-15 10:20:33.368716013 +0100
+@@ -26,7 +26,7 @@
+ get_filename_component (_basename ${_current_MOC} NAME_WE)
+ set (_header ${_abs_FILE})
+ set (_moc ${_abs_PATH}/${_current_MOC})
+- QT4_CREATE_MOC_COMMAND (${_header} ${_moc} "${_moc_INCS}" "")
++ QT4_CREATE_MOC_COMMAND (${_header} ${_moc} "${_moc_INCS}" "" "")
+ MACRO_ADD_FILE_DEPENDENCIES (${_abs_FILE} ${_moc})
+ endforeach (_current_MOC_INC)
+ endif (_match)
+Only in kadu-0.12.2/plugins/jabber_protocol/3rdparty: CMakeLists.txt~
diff --git a/pkgs/applications/networking/instant-messengers/kadu/default.nix b/pkgs/applications/networking/instant-messengers/kadu/default.nix
index 03cbb1ce073..4e176ec56dc 100644
--- a/pkgs/applications/networking/instant-messengers/kadu/default.nix
+++ b/pkgs/applications/networking/instant-messengers/kadu/default.nix
@@ -26,6 +26,7 @@ stdenv.mkDerivation {
sed -i -e '/mpd_mediaplayer/d' \
-e '/encryption_ng/d' \
-e '/encryption_ng_simlite/d' Plugins.cmake
+ patch -p1 < ${./cmake.patch}
'';
NIX_LDFLAGS="-lX11";
diff --git a/pkgs/applications/networking/instant-messengers/telepathy/gabble/default.nix b/pkgs/applications/networking/instant-messengers/telepathy/gabble/default.nix
index 8863af25984..b3036037f7f 100644
--- a/pkgs/applications/networking/instant-messengers/telepathy/gabble/default.nix
+++ b/pkgs/applications/networking/instant-messengers/telepathy/gabble/default.nix
@@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
nativeBuildInputs = [pkgconfig libxslt];
buildInputs = [ libxml2 dbus_glib sqlite libsoup libnice telepathy_glib gnutls ];
- configureFlags = "--with-ca-certificates=/etc/ca-bundle.crt";
+ configureFlags = "--with-ca-certificates=/etc/ssl/certs/ca-bundle.crt";
meta = {
homepage = http://telepathy.freedesktop.org;
diff --git a/pkgs/applications/networking/irc/irssi/otr/default.nix b/pkgs/applications/networking/irc/irssi/otr/default.nix
index 00a9aa1fc68..988320dd61f 100644
--- a/pkgs/applications/networking/irc/irssi/otr/default.nix
+++ b/pkgs/applications/networking/irc/irssi/otr/default.nix
@@ -1,16 +1,16 @@
{ stdenv, fetchurl, libotr, automake, autoconf, libtool, glib, pkgconfig, irssi }:
let
- rev = "cab3fc915c";
+ rev = "640e98c74b";
in
with stdenv.lib;
stdenv.mkDerivation rec {
- name = "irssi-otr-20130601-${rev}";
+ name = "irssi-otr-20131007-${rev}";
src = fetchurl {
url = "https://github.com/cryptodotis/irssi-otr/tarball/${rev}";
name = "${name}.tar.gz";
- sha256 = "0kn9c562zfh36gpcrbpslwjjr78baagdwphczz2d608ndczm1vrk";
+ sha256 = "0d08ianzhy20w0ld8xx7hgrp9psg54l37619pcdpqyrnlzkkdalz";
};
patchPhase = ''
diff --git a/pkgs/applications/networking/znc/default.nix b/pkgs/applications/networking/znc/default.nix
index a43d8fa9d11..dbf886de978 100644
--- a/pkgs/applications/networking/znc/default.nix
+++ b/pkgs/applications/networking/znc/default.nix
@@ -1,4 +1,4 @@
-{stdenv, fetchurl, openssl, pkgconfig
+{ stdenv, fetchurl, openssl, pkgconfig
, withPerl ? false, perl
, withPython ? false, python3
, withTcl ? false, tcl
@@ -7,10 +7,11 @@
with stdenv.lib;
stdenv.mkDerivation rec {
- name = "znc-1.0";
+ name = "znc-1.2";
+
src = fetchurl {
url = "http://znc.in/releases/${name}.tar.gz";
- sha256 = "0ah6890ngvj97kah3x7fd8yzi6dpdgrxw1b2skj2cyv98bd3jmd8";
+ sha256 = "07bh306wl5494sqsgz4a526wvyrylkc8vpnbr5pkxwjg90mcv8nr";
};
buildInputs = [ openssl pkgconfig ]
@@ -24,11 +25,11 @@ stdenv.mkDerivation rec {
+ optionalString withTcl "--enable-tcl --with-tcl=${tcl}/lib "
+ optionalString withCyrus "--enable-cyrus ";
- meta = {
+ meta = with stdenv.lib; {
description = "Advanced IRC bouncer";
homepage = http://wiki.znc.in/ZNC;
- maintainers = [ stdenv.lib.maintainers.viric ];
- license = "ASL2.0";
- platforms = stdenv.lib.platforms.unix;
+ maintainers = with maintainers; [ viric ];
+ license = licenses.asl20;
+ platforms = platforms.unix;
};
}
diff --git a/pkgs/applications/office/kmymoney/default.nix b/pkgs/applications/office/kmymoney/default.nix
index d55c66a2624..87e3bfd5312 100644
--- a/pkgs/applications/office/kmymoney/default.nix
+++ b/pkgs/applications/office/kmymoney/default.nix
@@ -1,20 +1,22 @@
{ stdenv, fetchurl, cmake, kdelibs, automoc4, kdepimlibs, gettext, pkgconfig
-, shared_mime_info, perl, boost, gpgme, gmpxx, libalkimia, libofx, libical }:
+, shared_mime_info, perl, boost, gpgme, gmpxx, libalkimia, libofx, libical
+, doxygen }:
stdenv.mkDerivation rec {
- name = "kmymoney-4.6.2";
+ name = "kmymoney-4.6.4";
src = fetchurl {
- url = "mirror://sourceforge/kmymoney2/${name}.tar.bz2";
- sha256 = "0x9bl4h2mk8dv49nnn7drv528fnl5ynvvyy7q4m22k0d5yxarn5d";
+ url = "mirror://sourceforge/kmymoney2/${name}.tar.xz";
+ sha256 = "04n0lgi2yrx67bgjzbdbcm10pxs7l53srmp240znzw59njnjyll9";
};
- buildInputs = [ kdepimlibs perl boost gpgme gmpxx libalkimia libofx libical ];
+ buildInputs = [ kdepimlibs perl boost gpgme gmpxx libalkimia libofx libical
+ doxygen ];
nativeBuildInputs = [ cmake automoc4 gettext shared_mime_info pkgconfig ];
KDEDIRS = libalkimia;
- patches = [ ./qgpgme.patch ./qt-4.8.patch ];
+ patches = [ ./qgpgme.patch ];
meta = {
homepage = http://kmymoney2.sourceforge.net/;
diff --git a/pkgs/applications/office/kmymoney/qt-4.8.patch b/pkgs/applications/office/kmymoney/qt-4.8.patch
deleted file mode 100644
index 7e9a44337cd..00000000000
--- a/pkgs/applications/office/kmymoney/qt-4.8.patch
+++ /dev/null
@@ -1,32 +0,0 @@
-From: Christoph Feck
-Date: Thu, 10 Nov 2011 11:34:20 +0000
-Subject: Fix compile with Qt 4.8
-X-Git-Url: http://quickgit.kde.org/?p=kmymoney.git&a=commitdiff&h=8324cfb9657d8c03f83691402386e8c5bfb29981
----
-Fix compile with Qt 4.8
-
-Sideported commits f42a0a3d878afebb298609c9886851858c56cc15 and
-fe74b25bf3b78c42e95569fe467a397876bc9c04 from massif-visualizer
----
-
-
---- a/libkdchart/src/KDChartBackgroundAttributes.cpp
-+++ b/libkdchart/src/KDChartBackgroundAttributes.cpp
-@@ -22,6 +22,7 @@
-
- #include "KDChartBackgroundAttributes.h"
- #include
-+#include
-
- #include
-
-@@ -150,7 +151,7 @@ QDebug operator<<(QDebug dbg, const KDCh
- << "visible="< \['gzip'|'compressor' => ['${gzip}/bin/gzip'|" \
$out/share/gitweb/gitweb.cgi
diff --git a/pkgs/applications/version-management/kdesvn/default.nix b/pkgs/applications/version-management/kdesvn/default.nix
index 6373eb9f7f9..60f5d8bb9e0 100644
--- a/pkgs/applications/version-management/kdesvn/default.nix
+++ b/pkgs/applications/version-management/kdesvn/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, gettext, apr, aprutil, subversion, db4, kdelibs, expat }:
+{ stdenv, fetchurl, gettext, apr, aprutil, subversion, db, kdelibs, expat }:
# the homepage mentions this is the final release.
# from now on, kdesvn will be part of the official kde software distribution
@@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
sed -i -e "s|/usr|${subversion}|g" src/svnqt/cmakemodules/FindSubversion.cmake
'';
- buildInputs = [ apr aprutil subversion db4 kdelibs expat ];
+ buildInputs = [ apr aprutil subversion db kdelibs expat ];
nativeBuildInputs = [ gettext ];
diff --git a/pkgs/applications/video/dvswitch/default.nix b/pkgs/applications/video/dvswitch/default.nix
deleted file mode 100644
index 8803fe0a786..00000000000
--- a/pkgs/applications/video/dvswitch/default.nix
+++ /dev/null
@@ -1,29 +0,0 @@
-{ stdenv, fetchurl, alsaLib, boost, cmake, gtkmm, libXau, libXdmcp
-, libXv, libav, pixman, libpthreadstubs, pkgconfig
-}:
-
-stdenv.mkDerivation rec {
- name = "dvswitch-${version}";
- version = "0.8.3.6";
-
- src = fetchurl {
- url = "https://alioth.debian.org/frs/download.php/3615/${name}.tar.gz";
- sha256 = "7bd196389f9913ae08e12a29e168d79324c508bb545eab114df77b0375cd87f0";
- };
-
- buildInputs = [
- alsaLib boost cmake gtkmm libXau libXdmcp libXv libav
- libpthreadstubs pixman pkgconfig
- ];
-
- patchPhase = ''
- sed -e "s@prefix /usr/local@prefix $out@" -i CMakeLists.txt
- '';
-
- meta = with stdenv.lib; {
- description = "interactive live video mixer for DV streams";
- homepage = "http://dvswitch.alioth.debian.org";
- license = licenses.gpl2Plus;
- maintainers = [ maintainers.goibhniu ];
- };
-}
diff --git a/pkgs/build-support/clang-wrapper/default.nix b/pkgs/build-support/clang-wrapper/default.nix
index 49ee34e9926..4b2a5a1182e 100644
--- a/pkgs/build-support/clang-wrapper/default.nix
+++ b/pkgs/build-support/clang-wrapper/default.nix
@@ -84,4 +84,6 @@ stdenv.mkDerivation {
if stdenv.system == "mips64el-linux" then "ld.so.1" else
abort "don't know the name of the dynamic linker for this platform")
else "";
+
+ preferLocalBuild = true;
}
diff --git a/pkgs/build-support/fetchgit/default.nix b/pkgs/build-support/fetchgit/default.nix
index e94e4185936..01424bae30b 100644
--- a/pkgs/build-support/fetchgit/default.nix
+++ b/pkgs/build-support/fetchgit/default.nix
@@ -44,5 +44,7 @@ stdenv.mkDerivation {
# by definition pure.
"http_proxy" "https_proxy" "ftp_proxy" "all_proxy" "no_proxy"
];
+
+ preferLocalBuild = true;
}
diff --git a/pkgs/build-support/fetchsvn/default.nix b/pkgs/build-support/fetchsvn/default.nix
index 30625a758f8..228a5eaa580 100644
--- a/pkgs/build-support/fetchsvn/default.nix
+++ b/pkgs/build-support/fetchsvn/default.nix
@@ -40,4 +40,6 @@ stdenv.mkDerivation {
# by definition pure.
"http_proxy" "https_proxy" "ftp_proxy" "all_proxy" "no_proxy"
];
+
+ preferLocalBuild = true;
}
diff --git a/pkgs/build-support/kdewrapper/default.nix b/pkgs/build-support/kdewrapper/default.nix
index be90011f493..6dcf68a324a 100644
--- a/pkgs/build-support/kdewrapper/default.nix
+++ b/pkgs/build-support/kdewrapper/default.nix
@@ -39,4 +39,6 @@ stdenv.mkDerivation {
chmod +x $PROG
done
'';
+
+ preferLocalBuild = true;
}
diff --git a/pkgs/build-support/vm/default.nix b/pkgs/build-support/vm/default.nix
index 625f93c874f..c6b774fc06c 100644
--- a/pkgs/build-support/vm/default.nix
+++ b/pkgs/build-support/vm/default.nix
@@ -924,6 +924,32 @@ rec {
packages = commonFedoraPackages ++ [ "cronie" "util-linux" ];
};
+ fedora17i386 = {
+ name = "fedora-17-i386";
+ fullName = "Fedora 17 (i386)";
+ packagesList = fetchurl {
+ url = mirror://fedora/linux/releases/17/Everything/i386/os/repodata/82dc1ea6d26e53a367dc6e7472113c4454c9a8ac7c98d4bfb11fd0b6f311450f-primary.xml.gz;
+ sha256 = "03s527rvdl0zn6zx963wmjlcjm247h8p4x3fviks6lvfsak1xp42";
+ };
+ urlPrefix = mirror://fedora/linux/releases/17/Everything/i386/os;
+ archs = ["noarch" "i386" "i586" "i686"];
+ packages = commonFedoraPackages ++ [ "cronie" "util-linux" ];
+ unifiedSystemDir = true;
+ };
+
+ fedora17x86_64 = {
+ name = "fedora-17-x86_64";
+ fullName = "Fedora 17 (x86_64)";
+ packagesList = fetchurl {
+ url = mirror://fedora/linux/releases/17/Everything/x86_64/os/repodata/7009de56f1a1c399930fa72094a310a40d38153c96d0b5af443914d3d6a7d811-primary.xml.gz;
+ sha256 = "04fqlzbd651r8jpvbl4n7hakh3d422ir88571y9rkhx1y5bdw2bh";
+ };
+ urlPrefix = mirror://fedora/linux/releases/17/Everything/x86_64/os;
+ archs = ["noarch" "x86_64"];
+ packages = commonFedoraPackages ++ [ "cronie" "util-linux" ];
+ unifiedSystemDir = true;
+ };
+
fedora18i386 = {
name = "fedora-18-i386";
fullName = "Fedora 18 (i386)";
@@ -1505,22 +1531,22 @@ rec {
debian70x86_64 = debian7x86_64;
debian7i386 = {
- name = "debian-7.3-wheezy-i386";
- fullName = "Debian 7.3 Wheezy (i386)";
+ name = "debian-7.4-wheezy-i386";
+ fullName = "Debian 7.4 Wheezy (i386)";
packagesList = fetchurl {
url = mirror://debian/dists/wheezy/main/binary-i386/Packages.bz2;
- sha256 = "037637520ce371a50beb5446fd27a731f30b51bc362c2f4a5dcfce9c7e30ffb6";
+ sha256 = "9f19822c82e25cd149f82b0d16fdbc00d1080db7f34e41de456498dc7c54f2b4";
};
urlPrefix = mirror://debian;
packages = commonDebianPackages;
};
debian7x86_64 = {
- name = "debian-7.3-wheezy-amd64";
- fullName = "Debian 7.3 Wheezy (amd64)";
+ name = "debian-7.4-wheezy-amd64";
+ fullName = "Debian 7.4 Wheezy (amd64)";
packagesList = fetchurl {
url = mirror://debian/dists/wheezy/main/binary-amd64/Packages.bz2;
- sha256 = "c2ed55a2a263d482826c934b97ad910984fa5695ab1c480841741b828d0590a5";
+ sha256 = "160ee0917693bc2e8f69b233c220857f35a70d906540d99d2779def576daf5f7";
};
urlPrefix = mirror://debian;
packages = commonDebianPackages;
diff --git a/pkgs/data/fonts/fontWrap/default.nix b/pkgs/data/fonts/fontWrap/default.nix
index 0d6750614d4..a7bf1ce0ce9 100644
--- a/pkgs/data/fonts/fontWrap/default.nix
+++ b/pkgs/data/fonts/fontWrap/default.nix
@@ -20,6 +20,7 @@ stdenv.mkDerivation rec {
name = "wrapped-font-dir";
builder = writeScript (name + "-builder")
(textClosure localDefs [ doInstall doForceShare doPropagate]);
+ preferLocalBuild = true;
meta = {
description = "
Just a wrapper to create fonts.dir and fonts.scale .
diff --git a/pkgs/desktops/gnome-3/core/baobab/default.nix b/pkgs/desktops/gnome-3/core/baobab/default.nix
new file mode 100644
index 00000000000..b905a05474d
--- /dev/null
+++ b/pkgs/desktops/gnome-3/core/baobab/default.nix
@@ -0,0 +1,45 @@
+{ stdenv, intltool, fetchurl, vala, libgtop, pkgconfig, gtk3, glib
+, bash, makeWrapper, itstool, libxml2, gnome3 }:
+
+# TODO: icons and theme still does not work
+# use packaged gnome3.gnome_icon_theme_symbolic
+
+stdenv.mkDerivation rec {
+ name = "baobab-3.10.1";
+
+ src = fetchurl {
+ url = "https://download.gnome.org/sources/baobab/3.10/${name}.tar.xz";
+ sha256 = "23ce8e4847ce5f1c8230e757532d94c84e6e273d6ec8fca20eecaed5f96563f9";
+ };
+
+ configureFlags = [ "--disable-static" ];
+
+ doCheck = true;
+
+ NIX_CFLAGS_COMPILE = "-I${gnome3.glib}/include/gio-unix-2.0";
+
+ propagatedUserEnvPkgs = [ gnome3.gnome_themes_standard ];
+
+ buildInputs = [ vala pkgconfig gtk3 glib libgtop intltool itstool libxml2
+ gnome3.gsettings_desktop_schemas makeWrapper ];
+
+ installFlags = "gsettingsschemadir=\${out}/share/${name}/glib-2.0/schemas/";
+
+ postInstall = ''
+ wrapProgram "$out/bin/baobab" \
+ --prefix XDG_DATA_DIRS : "${gtk3}/share:${gnome3.gnome_themes_standard}/share:${gnome3.gsettings_desktop_schemas}/share:$out/share:$out/share/${name}"
+ '';
+
+ preFixup = ''
+ rm $out/share/icons/hicolor/icon-theme.cache
+ rm $out/share/icons/HighContrast/icon-theme.cache
+ '';
+
+ meta = with stdenv.lib; {
+ homepage = https://wiki.gnome.org/Apps/Baobab;
+ description = "Graphical application to analyse disk usage in any Gnome environment";
+ maintainers = with maintainers; [ lethalman ];
+ license = licenses.gpl2;
+ platforms = platforms.linux;
+ };
+}
diff --git a/pkgs/desktops/gnome-3/core/evolution-data-server/default.nix b/pkgs/desktops/gnome-3/core/evolution-data-server/default.nix
index cb3db8432b6..d0c15bd96ff 100644
--- a/pkgs/desktops/gnome-3/core/evolution-data-server/default.nix
+++ b/pkgs/desktops/gnome-3/core/evolution-data-server/default.nix
@@ -1,5 +1,5 @@
{ fetchurl, stdenv, pkgconfig, gnome3, python, intltool, libsoup, libxml2, libsecret
-, p11_kit, db4, nspr, nss, libical, gperf }:
+, p11_kit, db, nspr, nss, libical, gperf }:
stdenv.mkDerivation rec {
@@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
buildInputs = with gnome3;
[ pkgconfig glib python intltool libsoup libxml2 gtk gnome_online_accounts libsecret
- gcr p11_kit db4 nspr nss libgweather libical libgdata gperf ];
+ gcr p11_kit db nspr nss libgweather libical libgdata gperf ];
# uoa irrelevant for now
configureFlags = "--disable-uoa --with-nspr-includes=${nspr}/include/nspr --with-nss-includes=${nss}/include/nss";
diff --git a/pkgs/desktops/gnome-3/default.nix b/pkgs/desktops/gnome-3/default.nix
index 197a135dcaa..204a7600cf1 100644
--- a/pkgs/desktops/gnome-3/default.nix
+++ b/pkgs/desktops/gnome-3/default.nix
@@ -14,6 +14,8 @@ rec {
at_spi2_core = callPackage ./core/at-spi2-core { };
+ baobab = callPackage ./core/baobab { };
+
caribou = callPackage ./core/caribou { };
dconf = callPackage ./core/dconf { };
diff --git a/pkgs/desktops/kde-4.12/applications/kate.nix b/pkgs/desktops/kde-4.12/applications/kate.nix
new file mode 100644
index 00000000000..63bfa12c4bb
--- /dev/null
+++ b/pkgs/desktops/kde-4.12/applications/kate.nix
@@ -0,0 +1,11 @@
+{ kde, kdelibs, kactivities, qjson, pyqt4, sip, python, pykde4}:
+
+kde {
+
+ buildInputs = [ kdelibs kactivities qjson pyqt4 sip python pykde4 ];
+
+ meta = {
+ description = "Kate, the KDE Advanced Text Editor, as well as KWrite";
+ license = "GPLv2";
+ };
+}
diff --git a/pkgs/desktops/kde-4.12/applications/konsole.nix b/pkgs/desktops/kde-4.12/applications/konsole.nix
new file mode 100644
index 00000000000..0db47fb2d7c
--- /dev/null
+++ b/pkgs/desktops/kde-4.12/applications/konsole.nix
@@ -0,0 +1,11 @@
+{ kde, kdelibs, kde_baseapps }:
+
+kde {
+
+ buildInputs = [ kdelibs kde_baseapps ];
+
+ meta = {
+ description = "Konsole, the KDE terminal emulator";
+ license = "GPLv2";
+ };
+}
diff --git a/pkgs/desktops/kde-4.12/default.nix b/pkgs/desktops/kde-4.12/default.nix
new file mode 100644
index 00000000000..b8e0a828a88
--- /dev/null
+++ b/pkgs/desktops/kde-4.12/default.nix
@@ -0,0 +1,42 @@
+{ callPackage, callPackageOrig, stdenv, qt48, release ? "4.12.2" }:
+
+let
+ # Need callPackageOrig to avoid infinite cycle
+ kde = callPackageOrig ./kde-package {
+ inherit release ignoreList extraSubpkgs callPackage;
+ };
+
+ # The list of igored individual modules
+ ignoreList = {
+ # Doesn't work yet
+ kdeutils = [ "ksecrets" ];
+ # kdeadmin/strigi-analyzer has no real code
+ kdeadmin = [ "strigi-analyzer" ];
+ # Most of kdebindings do not compile due to a bug in the buildsystem
+ kdebindings = [ "kimono" "korundum" "kross-interpreters" "perlkde" "qyoto" ];
+ };
+
+ # Extra subpackages in the manifest format
+ extraSubpkgs = {};
+
+in
+
+kde.modules // kde.individual //
+{
+ inherit (kde) manifest modules individual splittedModuleList;
+
+ akonadi = callPackage ./support/akonadi { };
+
+ qt4 = qt48;
+
+ kdebase_workspace = kde.modules.kde_workspace;
+
+ inherit release;
+
+ full = stdenv.lib.attrValues kde.modules;
+
+ l10n = callPackage ./l10n {
+ inherit release;
+ inherit (kde.manifest) stable;
+ };
+}
diff --git a/pkgs/desktops/kde-4.12/files/kde-wallpapers-buildsystem.patch b/pkgs/desktops/kde-4.12/files/kde-wallpapers-buildsystem.patch
new file mode 100644
index 00000000000..378cdb64694
--- /dev/null
+++ b/pkgs/desktops/kde-4.12/files/kde-wallpapers-buildsystem.patch
@@ -0,0 +1,17 @@
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 3d3e247..f78db67 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -1,5 +1,10 @@
+-find_package(KDE4 REQUIRED)
+-include(KDE4Defaults)
++project(kde-wallpapers NONE)
++if( WALLPAPER_INSTALL_DIR )
++ message(STATUS "Installing wallpapers to user-supplied directory ${WALLPAPER_INSTALL_DIR}")
++else()
++ find_package(KDE4 REQUIRED)
++ include(KDE4Defaults)
++endif()
+
+ install(DIRECTORY Air DESTINATION ${WALLPAPER_INSTALL_DIR} PATTERN .svn EXCLUDE)
+
diff --git a/pkgs/desktops/kde-4.12/files/polkit-install.patch b/pkgs/desktops/kde-4.12/files/polkit-install.patch
new file mode 100644
index 00000000000..d2ecac663ec
--- /dev/null
+++ b/pkgs/desktops/kde-4.12/files/polkit-install.patch
@@ -0,0 +1,12 @@
+diff -ru -x '*~' kdelibs-4.6.90-orig/kdecore/auth/ConfigureChecks.cmake kdelibs-4.6.90/kdecore/auth/ConfigureChecks.cmake
+--- kdelibs-4.6.90-orig/kdecore/auth/ConfigureChecks.cmake 2011-05-20 22:24:54.000000000 +0200
++++ kdelibs-4.6.90/kdecore/auth/ConfigureChecks.cmake 2011-07-12 14:03:00.000000000 +0200
+@@ -139,7 +139,7 @@
+ ${CMAKE_INSTALL_PREFIX} _KDE4_AUTH_POLICY_FILES_INSTALL_DIR
+ ${POLKITQT-1_POLICY_FILES_INSTALL_DIR})
+
+- set(KDE4_AUTH_POLICY_FILES_INSTALL_DIR ${_KDE4_AUTH_POLICY_FILES_INSTALL_DIR} CACHE STRING
++ set(KDE4_AUTH_POLICY_FILES_INSTALL_DIR "\${CMAKE_INSTALL_PREFIX}/share/polkit-1/actions" CACHE STRING
+ "Where policy files generated by KAuth will be installed" FORCE)
+ elseif(KDE4_AUTH_BACKEND_NAME STREQUAL "FAKE")
+ set (KAUTH_COMPILING_FAKE_BACKEND TRUE)
diff --git a/pkgs/desktops/kde-4.12/kactivities.nix b/pkgs/desktops/kde-4.12/kactivities.nix
new file mode 100644
index 00000000000..06381bb13d7
--- /dev/null
+++ b/pkgs/desktops/kde-4.12/kactivities.nix
@@ -0,0 +1,9 @@
+{ kde, kdelibs, nepomuk_core }:
+
+kde {
+ propagatedBuildInputs = [ kdelibs nepomuk_core ];
+
+ meta = {
+ description = "KDE activities library and daemon";
+ };
+}
diff --git a/pkgs/desktops/kde-4.12/kde-base-artwork.nix b/pkgs/desktops/kde-4.12/kde-base-artwork.nix
new file mode 100644
index 00000000000..3f416cebddc
--- /dev/null
+++ b/pkgs/desktops/kde-4.12/kde-base-artwork.nix
@@ -0,0 +1,14 @@
+{ kde, kdelibs }:
+
+kde {
+ outputHashAlgo = "sha256";
+ outputHashMode = "recursive";
+ outputHash = "0mrd3w7rhsj0v92c8rh9zjxyifq7wyvwszksf2gyn53dzd06blk8";
+
+ buildInputs = [ kdelibs ];
+
+ meta = {
+ description = "KDE Base artwork";
+ license = "GPL";
+ };
+}
diff --git a/pkgs/desktops/kde-4.12/kde-baseapps/kde-baseapps.nix b/pkgs/desktops/kde-4.12/kde-baseapps/kde-baseapps.nix
new file mode 100644
index 00000000000..c2a25664678
--- /dev/null
+++ b/pkgs/desktops/kde-4.12/kde-baseapps/kde-baseapps.nix
@@ -0,0 +1,11 @@
+{ kde, kdelibs, htmlTidy, kactivities
+, nepomuk_core, nepomuk_widgets, libXt }:
+
+kde {
+ buildInputs = [ kdelibs nepomuk_core nepomuk_widgets htmlTidy kactivities libXt ];
+
+ meta = {
+ description = "Base KDE applications, including the Dolphin file manager and Konqueror web browser";
+ license = "GPLv2";
+ };
+}
diff --git a/pkgs/desktops/kde-4.12/kde-package/4.12.2.nix b/pkgs/desktops/kde-4.12/kde-package/4.12.2.nix
new file mode 100644
index 00000000000..a10582d7142
--- /dev/null
+++ b/pkgs/desktops/kde-4.12/kde-package/4.12.2.nix
@@ -0,0 +1,444 @@
+{stable=true;
+hashes=builtins.listToAttrs[
+ {name="amor";value="0m5lxcsv9arkhws9xqvxip6k3gg15ppjslrds1lyr1clk1zxrras";}
+ {name="analitza";value="021msxl7jynj6b1n3j5vv1fwzlqi0ib48fwmai7ffvgc23mnsplq";}
+ {name="ark";value="0906pbmwk5l9vd1wx13299mk7lpa4v342l5b5yg4j5fmhd73i1qn";}
+ {name="audiocd-kio";value="0yx99c3g627a8swzgqiykhd7xk95b43gs1mf7ysadg33gpbcm2fj";}
+ {name="blinken";value="1hcr6ckrd6g53ivrhwd2h0hiv2lqym2lahchb1z3q07qyc2676fb";}
+ {name="bomber";value="14i3bsxmq0js7rj9wyvxry2fw8pc2jcqpfkxa7l490kz8wq01vxb";}
+ {name="bovo";value="09lmbyb2jr8q143i67gkqrsf1pa9s83g88149r7srxsy7lkz86l9";}
+ {name="cantor";value="1yf2q7x6rmims60xam2jhs52pnfmv19fphvcwd45q9mjjxkw3iqs";}
+ {name="cervisia";value="049rrjvx0djdi0rfi4f3qdbn62bjy5hr1g6w1vsr79mryifwv9sj";}
+ {name="dolphin-plugins";value="1qdvs0y7f6qmgjkg4jzbp99l89ykjfl0czn743mx4m5mmnabdwpf";}
+ {name="dragon";value="1gygky1g23mlwx0545pzaljzbg7d3g4wqfxbvbl1svdi3mw9pwxb";}
+ {name="ffmpegthumbs";value="1hsm33nq73x1l902pp1qfz88mlv1mrh4h6sxg7qjfnwxnxiaxbkd";}
+ {name="filelight";value="0z4x5dm09997ia8sv27ichxkmlbq1pn4sbvkwjb8gybgikyx083k";}
+ {name="granatier";value="1lq51441w2y1bh2hqgbbkr8xhc3zk9lqkycy8b2avgdkn9l49plr";}
+ {name="gwenview";value="1naghib8wmbdzh7bz6vga9b7lr797979gq2600ykall3nixwpwpv";}
+ {name="jovie";value="1m7spjpl8n23bfy8xq4qngwlbwj9fpy8a1bdq1q5zi0ij89ljcmw";}
+ {name="juk";value="06k7cpvzpdjxivh42n68602m5frrg97lfss8mpgn830xdbrmsp51";}
+ {name="kaccessible";value="02hlb891297l4hv4i4jx4pi4axccq9qkpmgi2is6zb3yqs0ij1l9";}
+ {name="kactivities";value="1hpnigkfyi0i6qb74jfi52m870dpnv09h5adwkqc0nq70bv8dsi9";}
+ {name="kajongg";value="1z5a9r0849r3fd2i9y5z2k9raj0nsl5hprcw53z3mlybdrpaddiq";}
+ {name="kalgebra";value="1mbyi8hcyy53zhn11yxjkiz52k7a6yb54kvndlm3abg1s862zdh2";}
+ {name="kalzium";value="1gnjz05nc3wgcr0ymahnp652hhrkqlrz400f5dzhkq5wrl7vh3ly";}
+ {name="kamera";value="1pxmh79li1f6grf07w2yin2r4ig6znvhl4ym3lqkq263ffjmjvnz";}
+ {name="kanagram";value="07fw93w78girj6rqi8kb30f5hkk8a02zmm3pdkw21rhm03iv1lm6";}
+ {name="kapman";value="10xjhz3glyrbd0l68fz678k1gsnp6arjyz7xvnwa1w6wyq82kssk";}
+ {name="kapptemplate";value="1rzs4il8rhpwbj2zjrxrvgznx6ixwpnp5rmkysz0sgc9i41f9l4k";}
+ {name="kate";value="148wymcxay6vfdri33cmxb06wzlbb1kka7cxdmqn6bw3a8967dvx";}
+ {name="katomic";value="0gk516zk4nr2lb8akw316z0kbna4yk1cr4zclpg6id5xh1jgpgly";}
+ {name="kblackbox";value="0v1ambfp1gmnzp9c42mycgds4kvayda1r1frgv3822lqv1nqcbs0";}
+ {name="kblocks";value="13qyd21h6lh880l19fzy5l1m5rfnbqjdgqc1yivwxrjhhdd5blzj";}
+ {name="kbounce";value="0d8gjvz9dqzvwl1aamf45a0qi9fj63cr2pid2wbxdp2b0v4qjqfb";}
+ {name="kbreakout";value="0wlaglbqr5hyav9m032w7hadia2a071mhnbhrvnw97195lmw7y3h";}
+ {name="kbruch";value="1zq5rzvqv7nhf1h2zqyjnw4g4w380b9dy9782dsr01l2z7ydiab6";}
+ {name="kcachegrind";value="0w63lrr6dw82r0zxsgfpb6kllqxsliw4k7ln232lj14y6ngs6fz2";}
+ {name="kcalc";value="0ga0xcnairfrfdlda6ljrmpnsn2cy8x2k2np535sckj9c0drw1n8";}
+ {name="kcharselect";value="1n8phby2i3s4myb4nlmwrmvz1acqk3llmic94zysx4j1p1vzjjj4";}
+ {name="kcolorchooser";value="1x0cr95xpqfr8vz5jgr14cg9kximnmanc7yqzazqvdlzqmza9602";}
+ {name="kcron";value="1gbzz3x39dawrjhdwsgkvi7kjsply38j0imyn0rdi0pmksd8pl1j";}
+ {name="kdeartwork";value="11ik4n16ym4lhcdkxnhnjhf2i14kaxc645fm158lghklwax00rap";}
+ {name="kde-baseapps";value="11bm9abdamql62yg6cycbhh58s9kqhsz2zg2lpwppp5z4ywzw4rg";}
+ {name="kde-base-artwork";value="12v2gg6lwq859b3ay8g08galrra44wmrislbysazbific5idxcyz";}
+ {name="kde-dev-scripts";value="0nzfd3zywr8qmq65h1yhyn7fc9grg5aw8819bcvmixws88fvrxm9";}
+ {name="kde-dev-utils";value="1bwqx7g9hrrhyhfbv475bfxw193zinrksx858aypf86r0xf57zcy";}
+ {name="kdegraphics-mobipocket";value="0cji929vibrb6nxnw151r9z3n70l2ldd01x8v8kijpd9igywwvc9";}
+ {name="kdegraphics-strigi-analyzer";value="1s9pcjskh8m69gi2r54z05p4k9xwn9j0ifb8p1163kg1qyff6bhy";}
+ {name="kdegraphics-thumbnailers";value="05bq2wr9knwjkk088fd0bnw1l352dgfb7bg6h5y691wc21dy5zi9";}
+ {name="kdelibs";value="0ykqhgjmfxvysd2skk5c4kijnkg1ynmi2z6agshijyiqjkx20gnh";}
+ {name="kdenetwork-filesharing";value="0gxiqlzxmmwyg2kxivhhyd9rxif3q800p7agp3rns91x1k1k6dxj";}
+ {name="kdenetwork-strigi-analyzers";value="1l8yigrzfrqdmnzsh8ass1n45bw4gp25s9zc22sgmz5ng9l72501";}
+ {name="kdepim";value="1axgk6v0sf7bakjkz3348kg25rdllbdy0rvxys1c3a5kcpxi6z49";}
+ {name="kdepimlibs";value="1qj7mv2dn3833fpcfqirqh6wa3046d75mn7amkbmgkh0iq7s8xg4";}
+ {name="kdepim-runtime";value="173a8mlq1lmz47p9r56dp8pxll0qyam5mfm0fiffvjygc2wlczbq";}
+ {name="kdeplasma-addons";value="1f6shv7d0a0v1iq75ywgs0p9n8x2y0n7p9g185904giz40d7sm0x";}
+ {name="kde-runtime";value="14vipbrnmnzapz1c8l0rfy93i4vap9lgqks6q819xbvm3hqg38ac";}
+ {name="kdesdk-kioslaves";value="1f18ddm8lwx3yqwj3gmvmvg3frsq10k7rn52yd60yxl2q4ifba2z";}
+ {name="kdesdk-strigi-analyzers";value="1ya6dg6a2b7p83wgj7hw2nky6x72cy6g5vmi6id8v70gix3c21bi";}
+ {name="kdesdk-thumbnailers";value="09kz9yck8lwjbfgvw2qppk6x82fm0cyvzi0k9qj3pkz9lva1g4ri";}
+ {name="kde-wallpapers";value="0ipqnnnrl04kdmcc492c3l62d1fmsf3w3gannxhmrwr17hkl530n";}
+ {name="kdewebdev";value="0sbwmwb6h5ddx3s86p01a4jdjjbgvkvji7baxjdpvxscyhp6b0m4";}
+ {name="kdf";value="190mcs9s6rcfa8p5m7c2vs6ghdlfygxz9m038ibvbfic4zyl1kk0";}
+ {name="kdiamond";value="09b9wjn30118q5c8y6ixwhd4041pb8g7izy0w420riaal314lj9b";}
+ {name="kdnssd";value="0bir835kn6m0bsrsh09ph41jn1bm347zfl5fkrwnhnxp937mba9c";}
+ {name="kfloppy";value="1mr353kij4rn4qcip81dhcxswscsmwzsk0a29rqcpxli66ydv015";}
+ {name="kfourinline";value="01qaamcmvcbv90fgmfwmgmdx5asw8mp0biayhimmsi6fc4ykbl54";}
+ {name="kgamma";value="1hhd9qw8bqrc9zj5l8lh1izay2s58qfrj2an7yvppjvcx5n8gbgw";}
+ {name="kgeography";value="1nhgl85lj9w86425n2ndird10j28ffvf0kdy8rgz99bgdhsrk15c";}
+ {name="kget";value="1ix29z9sh575z9srndzryjra0phvhs8izy849dykczjh0kqx5cvn";}
+ {name="kgoldrunner";value="01rrdx2wd0962lrf8cw4c6pyp3yj95wmxf5v0dl95y7zqg81hzaq";}
+ {name="kgpg";value="17jd3cylpj690zd2rawa12cdp5nfcqik2kvqk6i2lq2zlqm3z4aq";}
+ {name="khangman";value="1gj2wybjbrzwf7r2svsip32ll009q89y7khmvmmwz6xl2klk1s21";}
+ {name="kig";value="13i9ddj8d3w6jisdlfw7l8krsdr38g60j18hcpc2sd875ba7qv15";}
+ {name="kigo";value="180b6yqiydwfv62jfmvcxqhsc2pmp7n5s5m4cr3g58090q9lj0li";}
+ {name="killbots";value="099k2y9y2f0rbl1hafqrih58ky1al5nrslx3i1kzkbhqphl8khqa";}
+ {name="kimono";value="004ch6pi60qcrzrnz5fsfx25gmm2nx0hmx88h1s292zbi0c9ccd0";}
+ {name="kiriki";value="0niajfivghvdc88dwk13bqjzj8x8nj6h357wd4jnsvrx90wm8mp3";}
+ {name="kiten";value="07xz2rl8f5683a3zjv8rs2acp81d806vx3w5z1xbvlziiw1y2sj6";}
+ {name="kjumpingcube";value="1hn2n27vyk6zjc8jmnv8hmxhmb3323zg4qkwb6rmqkai28q9rdnd";}
+ {name="klettres";value="15is8hrmh4m45npg40iv06c1v9yjv2rk2xwfm8c7a5r3xncqh6im";}
+ {name="klickety";value="0n72r56xx9vgy19izwbddbssgnmvzacdjq6g5s9vrlnkz2lac0ak";}
+ {name="klines";value="0lrka7pgx26v5rf0kp3mqbw65q9p281hsi3whnjf0c3nnq80v25i";}
+ {name="kmag";value="0y0l19m0irmd5q3fxarr18d7f6a4537g8b1bm6hnq48v63w6f13i";}
+ {name="kmahjongg";value="06dvr50x6y0115pr2rx605pm3nll3lglz2z1q07dc8ydfgqjy2sp";}
+ {name="kmines";value="1fz2q1xbagzi27xvl2wx5hd6fnk0qy33apr103cqq1lprb68n2dl";}
+ {name="kmix";value="137v4np9nhynwybabb1z1h9wvcrzm9yvjxybjkfwz0csz747pyah";}
+ {name="kmousetool";value="1n1isbq1vncs5kw1hp0g7s84bggksg14wgas3bqzhcbcxcfdj0i3";}
+ {name="kmouth";value="07im0lvkws27sgg68lgwc5fzx8wiz758ynxigbx85gavmjvr2cv1";}
+ {name="kmplot";value="18s8826yh9krsbh20widv53z0cvd6js60apvj6iwzq00506bjjlh";}
+ {name="knavalbattle";value="1gc7kgg5q4ha5bil6r5amf5ww4jby953b4xk87m9cb7pwhp65z7s";}
+ {name="knetwalk";value="1ky2933f2mp4m6mh5z4ighvd255pqsmblqrbbsnpy8ks7qx9acwm";}
+ {name="kolf";value="0s1qkvfsw42hsi84wi6a93zm7cz1kciiqgp1p9izgdyd3qr48lml";}
+ {name="kollision";value="02jczgs348wlb8djvb1l44hkg8055zk4fl6am70i943jc1f9isiv";}
+ {name="kolourpaint";value="1m7vjnx8f7y59lf9z8gncspvw1pfbqz7aqbb1msgwphhr06m5x59";}
+ {name="kompare";value="0s8a53bn8k6x10gi9bdfyrqm30742krv2gjz9gpckpycb4d7g8k1";}
+ {name="konquest";value="1n3aai02vgb2cclljak9cvfdrcv75ay6lbaji065qnx9zb925zn7";}
+ {name="konsole";value="1qh4jjwxp3wxyh876bwg6mwbvgr5b9kcyfn7679j04z5hydzxpvc";}
+ {name="kopete";value="04xhp0293xzrimfhnhxi7l760a5bliqk370pl0bw05j9lc3fa2gw";}
+ {name="korundum";value="06cajw6disdhyajnhqjsxc68mwc34qqv95z46345i08b2z7xy7b7";}
+ {name="kpat";value="1rphkkdx7076zxfx186znay355sfz0y2m2xi7mimngydi4n0fa93";}
+ {name="kppp";value="0zji9ihid90drdd561gqqzi2bmxi2vsznf4lpi09iy2x3sl4z4ah";}
+ {name="krdc";value="0dimldcijnw14s9archnqfhyi2b519xgd65jpz2z8nw7vxnfja9y";}
+ {name="kremotecontrol";value="1rx0pa5gvncsczvdzncqhra4rxign6nnawp1w2g4amv0mpjpxdz8";}
+ {name="kreversi";value="1gh5dqsfx6hzlmxp9xivj571f3x9d434p9683cy16ck6rg3290kr";}
+ {name="krfb";value="1s515wb0bh8lhgbffkji48mvsq8wl80k6c3fka3fn84kyqc74kn8";}
+ {name="kross-interpreters";value="0qvhs3d691kzzqkg48y2d9gc45l4mr5qyzg0sb2hkmwzskdmim2b";}
+ {name="kruler";value="1q7z31g67cg5v4x1b348cics063dcy0fpbmh2vmj3g51kha9a3za";}
+ {name="ksaneplugin";value="0h05db6gid0519a79b89y74vfqjls71ncqc28wysvpcpi80rwhzn";}
+ {name="kscd";value="0q6yl13n0gblida0k5a66g8xaliizsjd6zw4xssfj5x67bfmnkq7";}
+ {name="kshisen";value="10c3akddm1qgbmays7v9fh61f9p857l9cpa0k6gvxjg9z2sixd23";}
+ {name="ksirk";value="067i4y1m4c7m6lh0c3hzwslvysfibprr2zp3hsn22if0l5l37fgp";}
+ {name="ksnakeduel";value="1wg266jvs7krvh8mpj6v7r8p5f8znpd3br4x6fs27vcy8pw91bac";}
+ {name="ksnapshot";value="0mylgwysysw1cbhf1jh34qh4d1frhrz85icwg4s7vpw8v6iz26nk";}
+ {name="kspaceduel";value="1x7sn50pxj7v36xziszzq96pl1qcb0ycczx8sxdk30wllpyi50k1";}
+ {name="ksquares";value="1mqxmzvf2wyhcn24rd7glr8g7xks87fd7l5vyh2z73w7dshlf1q2";}
+ {name="kstars";value="05yd9q1n2ja452x6b2b3x0rrr3cpg3zphcvzqk7qv1pdc7dckyyx";}
+ {name="ksudoku";value="1vmslqp8kdmbr5zj0kh0mpsagrhins0y7a5xfb2p61bwprpvqqp8";}
+ {name="ksystemlog";value="1syyjsb0yn59fvbjbdhg4i20lb1ynjd3jj4b5z3bh34d3wzbcfz5";}
+ {name="kteatime";value="1y59cnx65p5i9fw9vm2hls40nq253ps3zj7ps34fcspnjvfcipgx";}
+ {name="ktimer";value="155sbcj4lqxs6sbl2wrc7pgnha4ji5mii1jkax1rggjxspk540n4";}
+ {name="ktouch";value="1v8ybp03cv7xwx9k6ia9b0fnh657an205grk9k0zx5v930ag3p0v";}
+ {name="ktuberling";value="1bcf9vq0hcm9n4343vi8slbqjhv1bffwr7kk4m12gr38yshx5r4v";}
+ {name="kturtle";value="0lgahnmjnwsd20a9xw7f66wqg29klkz7f2i4qalzcrh55a8sbjxg";}
+ {name="ktux";value="1jw8fh47hc8i5aykrir2wq4r3n6ikbrqw1vy3wsz3jcd94434c55";}
+ {name="kubrick";value="0ylz4wf4vbaqbm78ahcz43sxcv3j7znmx20jby0i83izard9w169";}
+ {name="kuser";value="0wsdwi0cac9d1r66l6kial13gqyiyclvrnwi602jmzs10c3vz7lk";}
+ {name="kwallet";value="0a541jgbwpv0ar128bfc67j0piza4n1mifp0dx9hmjqahfylw8yv";}
+ {name="kwordquiz";value="0s6ii237625wfr5qzzdf4s5x9dmwmv2xc0qzmcniib0g4230y53k";}
+ {name="libkcddb";value="03mkgcgcg50r66gfvb9gqxhkl6ixvg5mjcshcz8wlxzamx0vkdcg";}
+ {name="libkcompactdisc";value="1kdcanilyanzi5ixxh357335030x2hlkykg0p3i6375jcivx0j4z";}
+ {name="libkdcraw";value="01xbsb6nsp3rq6l1fyg5i8ysf09hy93n8hy5n3z5jzx8j5gar0jh";}
+ {name="libkdeedu";value="16sibrnaw57j7ngj6d32hn5k0piqmvl6b9slnijzy46yaf60qqjd";}
+ {name="libkdegames";value="0gz23vigrm1q9fm02xs0pi2dkvcwackcp4by6swp8wvz5bx6r3sq";}
+ {name="libkexiv2";value="185cbm1a8sl0hrd7dq69mbkxw88c9qwlhnnip76r3cpzh0fqqcx2";}
+ {name="libkipi";value="1bgrr1dqmn3i844x5ib88z2gq4c2s0zkrxyfv54scy57gnp8z666";}
+ {name="libkmahjongg";value="1svawck122495cdp6vx427nd4vjwmvvpav8xgh15p1av4jdvlpyy";}
+ {name="libkomparediff2";value="17hiffmpknyp86h4lc9q1grn7m8ywhlk5f6p2vq6xl2la6zca6k0";}
+ {name="libksane";value="1dc4cf9wxxg9bg4ldf5ldvl0jpsh6av41kk4fnzsj8h153mak4dx";}
+ {name="lokalize";value="0yvqwbwbs8njzahcp44slg9jaagjrv2ypk8b7abynsa8zlgwjh2h";}
+ {name="lskat";value="129a9bmpiiz3rscnwck4adnmsimb9ql7dqs113yyvkmxj5ncgfdd";}
+ {name="marble";value="1fzaqck6b7gw047jjlbwwsgjlnan3jqj9drd7adxb9klx1ikpskl";}
+ {name="mplayerthumbs";value="13v63lmzzcaz83rjfydhz508m4083ksxdi1m8qrjnlkbwnc6ks2k";}
+ {name="nepomuk-core";value="0p3aya5ajaxzbwmgaqc8rpilzw5vzkms1c7jcsjmyyr51iplkyb4";}
+ {name="nepomuk-widgets";value="1am2gg46ybn6xgfgnzcwzizf9r441i2l7jx655z4zff6wgms9mz5";}
+ {name="okteta";value="0227l2hnz3i8ap19r5lai02y5hqhc3sgkz33wd7j23y0nr5cpv0k";}
+ {name="okular";value="1722ncmd81yz8qfisrllniv0iqwn2i1gyvdd0d0ygs416wj6rmjx";}
+ {name="oxygen-icons";value="1v314rrj0d6jgir7hrhapqagl376f5hwciqxkxkg7vynp6kli33r";}
+ {name="pairs";value="1pfpam1n9bwni2pcq429grzxanprazwz7g1h0l02jbksfv4sabz7";}
+ {name="palapeli";value="0ip07xsr8w45cf0mxya9i64315d7r1zaj0nd0bq4xhcw09qmyyxr";}
+ {name="parley";value="1rqw0y0p7fka6v8hpcq75n8nlk43697js99cdzb0zvrm6gzjmjm5";}
+ {name="perlkde";value="0sxz0bvavclqdimd5hmcsc884alsyflc8v31wd79l3pc51alsibs";}
+ {name="perlqt";value="18dbzm94wa49ysbar7fi64cyhd38w0b0b9rj9pjacxrpfvwa3vg2";}
+ {name="picmi";value="07ycx2xgzqr0sbirsd9gcs9bmxf01i2jnmbp2i13znv2y25xm7j6";}
+ {name="poxml";value="1skyms17zdds878rzzxnc393pvw2fv01wysyr8v7nkylzi77a8fc";}
+ {name="print-manager";value="0rjwi4l99h5wqd728by9ax26v2b7brmkam990s3waids91kbcxrb";}
+ {name="pykde4";value="0x3vz31cz12jp1prdh6rmc501f5av0qby8yi1hkqwgpkfyyqmczj";}
+ {name="qtruby";value="1y79azyhspcnfnkgx54b3k60k0a14aga85cv9hilzl6jn7w8qmmz";}
+ {name="qyoto";value="19fnpzf5bq3i75gb51fm0vrlkgi79jgjcb3sw1w1g5gzy1lkr4nc";}
+ {name="rocs";value="1a1p72slgv7ss73v4md7w1avsssbwflfb339abpc44h361w5pwnz";}
+ {name="smokegen";value="14ashkkh8g0s5i56p5v10w2rskcr435s01hb36yjqva1gfxbs1vf";}
+ {name="smokekde";value="0infmb6gsfiq8iargwba3xl4115dp2fj0whg1f595x0qkl2dlkbf";}
+ {name="smokeqt";value="1nf7jcn2cwdrws8dqk5vgxnda507yh6mg093mgxdjrr8h787x2gn";}
+ {name="step";value="1h29lm6k89nbz038z19irid0fk20dv5h829wvmmmylk1d881a6l6";}
+ {name="superkaramba";value="1n7x85zafz4z7i5p9cw15s5dbfbcr864ml7nw0rwybacppdgp59n";}
+ {name="svgpart";value="0m019wf56pq4c8qds6g7l2h51r5n7ayyf7yyhil8rp4fdwmz44ia";}
+ {name="sweeper";value="0r8qfy5a9y3pcza8ik1yl73d4jn0biiv7kdmv72ci7jjv93fiyq5";}
+ {name="umbrello";value="1d9zl92xcyqhc8b9pn1ih856dainwvgbcqvz6bky891pmggp1n7w";}
+];
+modules=[
+{
+ module="kdemultimedia";
+ split=true;
+ pkgs=[
+ { name="audiocd-kio"; sane="audiocd_kio"; }
+ { name="dragon"; }
+ { name="ffmpegthumbs"; }
+ { name="juk"; }
+ { name="kmix"; }
+ { name="kscd"; }
+ { name="libkcddb"; }
+ { name="libkcompactdisc"; }
+ { name="mplayerthumbs"; }
+ ];
+}
+{
+ module="kdegraphics";
+ split=true;
+ pkgs=[
+ { name="gwenview"; }
+ { name="kamera"; }
+ { name="kcolorchooser"; }
+ { name="kdegraphics-mobipocket"; sane="kdegraphics_mobipocket"; }
+ { name="kdegraphics-strigi-analyzer"; sane="kdegraphics_strigi_analyzer"; }
+ { name="kdegraphics-thumbnailers"; sane="kdegraphics_thumbnailers"; }
+ { name="kgamma"; }
+ { name="kolourpaint"; }
+ { name="kruler"; }
+ { name="ksaneplugin"; }
+ { name="ksnapshot"; }
+ { name="libkdcraw"; }
+ { name="libkexiv2"; }
+ { name="libkipi"; }
+ { name="libksane"; }
+ { name="okular"; }
+ { name="svgpart"; }
+ ];
+}
+{
+ module="kdelibs";
+ split=true;
+ pkgs=[
+ { name="kdelibs"; }
+ { name="nepomuk-core"; sane="nepomuk_core"; }
+ { name="nepomuk-widgets"; sane="nepomuk_widgets"; }
+ ];
+}
+{
+ module="kdenetwork";
+ split=true;
+ pkgs=[
+ { name="kdenetwork-filesharing"; sane="kdenetwork_filesharing"; }
+ { name="kdenetwork-strigi-analyzers"; sane="kdenetwork_strigi_analyzers"; }
+ { name="kdnssd"; }
+ { name="kget"; }
+ { name="kopete"; }
+ { name="kppp"; }
+ { name="krdc"; }
+ { name="krfb"; }
+ ];
+}
+{
+ module="kdeutils";
+ split=true;
+ pkgs=[
+ { name="ark"; }
+ { name="filelight"; }
+ { name="kcalc"; }
+ { name="kcharselect"; }
+ { name="kdf"; }
+ { name="kfloppy"; }
+ { name="kgpg"; }
+ { name="kremotecontrol"; }
+ { name="ktimer"; }
+ { name="kwallet"; }
+ { name="print-manager"; sane="print_manager"; }
+ { name="superkaramba"; }
+ { name="sweeper"; }
+ ];
+}
+{
+ module="applications";
+ split=true;
+ pkgs=[
+ { name="kate"; }
+ { name="konsole"; }
+ ];
+}
+{
+ module="kdetoys";
+ split=true;
+ pkgs=[
+ { name="amor"; }
+ { name="kteatime"; }
+ { name="ktux"; }
+ ];
+}
+{
+ module="kdesdk";
+ split=true;
+ pkgs=[
+ { name="cervisia"; }
+ { name="dolphin-plugins"; sane="dolphin_plugins"; }
+ { name="kapptemplate"; }
+ { name="kcachegrind"; }
+ { name="kde-dev-scripts"; sane="kde_dev_scripts"; }
+ { name="kde-dev-utils"; sane="kde_dev_utils"; }
+ { name="kdesdk-kioslaves"; sane="kdesdk_kioslaves"; }
+ { name="kdesdk-strigi-analyzers"; sane="kdesdk_strigi_analyzers"; }
+ { name="kdesdk-thumbnailers"; sane="kdesdk_thumbnailers"; }
+ { name="kompare"; }
+ { name="libkomparediff2"; }
+ { name="lokalize"; }
+ { name="okteta"; }
+ { name="poxml"; }
+ { name="umbrello"; }
+ ];
+}
+{
+ module="kdegames";
+ split=true;
+ pkgs=[
+ { name="bomber"; }
+ { name="bovo"; }
+ { name="granatier"; }
+ { name="kajongg"; }
+ { name="kapman"; }
+ { name="katomic"; }
+ { name="kblackbox"; }
+ { name="kblocks"; }
+ { name="kbounce"; }
+ { name="kbreakout"; }
+ { name="kdiamond"; }
+ { name="kfourinline"; }
+ { name="kgoldrunner"; }
+ { name="kigo"; }
+ { name="killbots"; }
+ { name="kiriki"; }
+ { name="kjumpingcube"; }
+ { name="klickety"; }
+ { name="klines"; }
+ { name="kmahjongg"; }
+ { name="kmines"; }
+ { name="knavalbattle"; }
+ { name="knetwalk"; }
+ { name="kolf"; }
+ { name="kollision"; }
+ { name="konquest"; }
+ { name="kpat"; }
+ { name="kreversi"; }
+ { name="kshisen"; }
+ { name="ksirk"; }
+ { name="ksnakeduel"; }
+ { name="kspaceduel"; }
+ { name="ksquares"; }
+ { name="ksudoku"; }
+ { name="ktuberling"; }
+ { name="kubrick"; }
+ { name="libkdegames"; }
+ { name="libkmahjongg"; }
+ { name="lskat"; }
+ { name="palapeli"; }
+ { name="picmi"; }
+ ];
+}
+{
+ module="kdeedu";
+ split=true;
+ pkgs=[
+ { name="analitza"; }
+ { name="blinken"; }
+ { name="cantor"; }
+ { name="kalgebra"; }
+ { name="kalzium"; }
+ { name="kanagram"; }
+ { name="kbruch"; }
+ { name="kgeography"; }
+ { name="khangman"; }
+ { name="kig"; }
+ { name="kiten"; }
+ { name="klettres"; }
+ { name="kmplot"; }
+ { name="kstars"; }
+ { name="ktouch"; }
+ { name="kturtle"; }
+ { name="kwordquiz"; }
+ { name="libkdeedu"; }
+ { name="marble"; }
+ { name="pairs"; }
+ { name="parley"; }
+ { name="rocs"; }
+ { name="step"; }
+ ];
+}
+{
+ module="kdeadmin";
+ split=true;
+ pkgs=[
+ { name="kcron"; }
+ { name="ksystemlog"; }
+ { name="kuser"; }
+ ];
+}
+{
+ module="kdebindings";
+ split=true;
+ pkgs=[
+ { name="kimono"; }
+ { name="korundum"; }
+ { name="kross-interpreters"; sane="kross_interpreters"; }
+ { name="perlkde"; }
+ { name="perlqt"; }
+ { name="pykde4"; }
+ { name="qtruby"; }
+ { name="qyoto"; }
+ { name="smokegen"; }
+ { name="smokekde"; }
+ { name="smokeqt"; }
+ ];
+}
+{
+ module="kdeaccessibility";
+ split=true;
+ pkgs=[
+ { name="jovie"; }
+ { name="kaccessible"; }
+ { name="kmag"; }
+ { name="kmousetool"; }
+ { name="kmouth"; }
+ ];
+}
+{
+ module="kde-baseapps";
+sane="kde_baseapps"; split=true;
+ pkgs=[
+ { name="kde-baseapps"; sane="kde_baseapps"; }
+ ];
+}
+{ module="kactivities"; split=false;}
+{ module="kdeartwork"; split=false;
+ pkgs=[
+ { name="ColorSchemes"; }
+ { name="IconThemes"; }
+ { name="emoticons"; }
+ { name="kscreensaver"; }
+ { name="kwin-styles"; sane="kwin_styles";}
+ { name="styles"; }
+ { name="wallpapers"; }
+ { name="HighResolutionWallpapers"; }
+ { name="WeatherWallpapers"; }
+ { name="desktopthemes"; }
+ ];
+
+}
+{ module="kde-base-artwork"; sane="kde_base_artwork"; split=false;}
+{ module="kdelibs"; split=false;}
+{ module="kdepim"; split=false;}
+{ module="kdepimlibs"; split=false;}
+{ module="kdepim-runtime"; sane="kdepim_runtime"; split=false;}
+{ module="kdeplasma-addons"; sane="kdeplasma_addons"; split=false;}
+{ module="kde-runtime"; sane="kde_runtime"; split=false;}
+{ module="kde-wallpapers"; sane="kde_wallpapers"; split=false;}
+{ module="kdewebdev"; split=false;
+ pkgs=[
+ { name="klinkstatus"; }
+ { name="kfilereplace"; }
+ { name="kimagemapeditor"; }
+ { name="kommander"; }
+ ];
+
+}
+{ module="kde-workspace"; sane="kde_workspace"; split=false;}
+{ module="oxygen-icons"; sane="oxygen_icons"; split=false;}
+];
+}
diff --git a/pkgs/desktops/kde-4.12/kde-package/default.nix b/pkgs/desktops/kde-4.12/kde-package/default.nix
new file mode 100644
index 00000000000..04f798c233a
--- /dev/null
+++ b/pkgs/desktops/kde-4.12/kde-package/default.nix
@@ -0,0 +1,128 @@
+{ callPackage, runCommand, stdenv, fetchurl, qt4, cmake, automoc4
+, release, ignoreList, extraSubpkgs
+}:
+
+let
+ inherit (stdenv.lib) filter fold;
+ inherit (builtins) getAttr hasAttr remoteAttrs listToAttrs tail head;
+in
+rec {
+ manifest = import (./. + "/${release}.nix");
+
+ # src attribute for $name tarball
+ kdesrc = name: fetchurl {
+ url = "mirror://kde/" + (if manifest.stable then "" else "un")
+ + "stable/${release}/src/${name}-${release}.tar.xz";
+ sha256 = getAttr name manifest.hashes;
+ };
+
+ # Default meta attribute
+ defMeta = {
+ homepage = http://www.kde.org;
+ platforms = stdenv.lib.platforms.linux;
+ inherit (qt4.meta) maintainers;
+ };
+
+ # KDE package built from the whole tarball
+ # This function is used both for monolithic modules and modules which are
+ # released as individual tarballs
+ kdeMonoPkg = name: let n_ = name; in a@{meta, name ? n_, version ? release, ...}:
+ stdenv.mkDerivation ({
+ name = "${name}-${version}";
+ src = kdesrc name;
+ meta = defMeta // meta;
+ enableParallelBuilding = true;
+ } // (removeAttrs a [ "meta" "name" ]));
+
+ # kdeMonoPkg wrapper for modules splitted upstream compatible with combinePkgs
+ # API.
+ kdeSplittedPkg = module: {name, sane ? name}: kdeMonoPkg name;
+
+ # Build subdirectory ${subdir} of tarball ${module}-${release}.tar.xz
+ kdeSubdirPkg = module:
+ {name, subdir ? name, sane ? name}:
+ let name_ = name; in
+ a@{cmakeFlags ? [], name ? name_, meta ? {}, ...}:
+ stdenv.mkDerivation ({
+ name = "${name}-${release}";
+ src = kdesrc module;
+ cmakeFlags =
+ [ "-DDISABLE_ALL_OPTIONAL_SUBDIRECTORIES=TRUE"
+ "-DBUILD_doc=TRUE"
+ "-DBUILD_${subdir}=TRUE"
+ ] ++ cmakeFlags;
+ meta = defMeta // meta;
+ enableParallelBuilding = module.enableParallelBuilding or true;
+ } // (removeAttrs a [ "meta" "name" "cmakeFlags" ]));
+
+ # A KDE monolithic module
+ kdeMonoModule = name: path: callPackage path { kde = kdeMonoPkg name; };
+
+ # Combine packages in one module.
+ # Arguments:
+ # * pkgFun --- a function of the following signature:
+ # module: manifest_attrs: manual_attrs: derivation;
+ # * module --- name of the module
+ # * pkgs --- list of packages in manifest format
+ combinePkgs = pkgFun: module: pkgs:
+ let
+ f = p@{name, ...}:
+ callPackage (./.. + "/${module}/${name}.nix") { kde = pkgFun module p; };
+ list = map f pkgs;
+ attrs = listToAttrs (map
+ ({name, sane ? name, ...}@p: { name = sane; value = f p; })
+ pkgs);
+ in
+ runCommand "${module}-${release}"
+ ({passthru = attrs // {
+ propagatedUserEnvPackages = list;
+ projects = attrs;
+ };})
+ ''
+ mkdir -pv $out/nix-support
+ echo "${toString list}" | tee $out/nix-support/propagated-user-env-packages
+ '';
+
+ # Given manifest module data, return the module
+ kdeModule = { module, sane ? module, split, pkgs ? [] }:
+ let
+ pkgs_ = filterPkgs module pkgs;
+ in
+ # Module is splitted by upstream
+ if split then combinePkgs kdeSplittedPkg module pkgs_
+ # Monolithic module
+ else if pkgs == [] then kdeMonoModule module (./.. + "/${module}.nix")
+ # Module is splitted by us
+ else combinePkgs kdeSubdirPkg module pkgs_;
+
+ # The same, as nameValuePair with sane name
+ kdeModuleNV = a@{ module, sane ? module, ... }:
+ { name = sane; value = kdeModule a; };
+
+ filterPkgs = module: (p:
+ removeNames (stdenv.lib.attrByPath [module] [] ignoreList) p
+ ++ (stdenv.lib.attrByPath [module] [] extraSubpkgs));
+
+ # Remove attrsets with x.name in subst. Optimized for empty subst.
+ removeNames = subst: big:
+ fold (s: out: filter (x: x.name != s) out) big subst;
+
+ modules = listToAttrs (map kdeModuleNV manifest.modules);
+
+ splittedModuleList =
+ let
+ splitted = filter (a: a ? pkgs) manifest.modules;
+ names = map ({module, sane ? module, ...}: sane) splitted;
+ in
+ map (m: m.projects) (stdenv.lib.attrVals names modules);
+
+ individual =
+ stdenv.lib.zipAttrsWith
+ (
+ name: list:
+ if tail list == []
+ then head list
+ else abort "Multiple modules define ${name}"
+ )
+ splittedModuleList;
+}
diff --git a/pkgs/desktops/kde-4.12/kde-package/kde-manifest.sh b/pkgs/desktops/kde-4.12/kde-package/kde-manifest.sh
new file mode 100755
index 00000000000..e964ce3ddc1
--- /dev/null
+++ b/pkgs/desktops/kde-4.12/kde-package/kde-manifest.sh
@@ -0,0 +1,146 @@
+#! /bin/sh
+
+# Usage: download kde release to $dir, then run
+# $0 $dir
+
+dir="$1"
+
+# Detect release number & whether it is a stable release
+if [[ ! -d "${dir}" ]]; then
+ echo "${dir} is not a directory (or doesn't exist)!" >&2
+ exit 1
+fi
+
+release=$(ls "${dir}"/kdelibs-*.tar.xz | \
+ sed -e 's/.*kdelibs-//' -e 's/\.tar\.xz//')
+
+if [[ ${release##*.} -gt 50 ]]; then
+ stable="false"
+else
+ stable="true"
+fi
+
+echo "Detected release ${release}" >&2
+
+declare -A hash
+declare -A modules
+declare -a packages
+declare -a top_level
+
+# xsltproc output declares -A module
+if [[ ! -f kde_projects.xml ]]; then
+ curl -O -J http://projects.kde.org/kde_projects.xml
+fi
+eval `xsltproc kde-submodules.xslt kde_projects.xml`
+
+module[kde-baseapps]=kde-baseapps
+unset module[kactivities]
+
+print_sane() {
+ echo "Called print_sane $1" >&2
+ sane="${1//[^a-z0-9_]/_}"
+ if [[ "$sane" != "$1" ]]; then
+ echo "Sane version is $sane" >&2
+ echo -n "sane=\"$sane\";"
+ fi
+}
+
+for i in `cd "${dir}"; ls *-${release}.tar.xz`; do
+ package=${i%-${release}.tar.xz}
+ packages+=( "$package" )
+ echo -n "${package}.. " >&2
+ hash[$package]=$(nix-hash --type sha256 --flat --base32 "${dir}/${i}")
+ echo -n ${hash[$package]} >&2
+
+ if [ -n "${module[$package]}" ]; then
+ m="${module[$package]}"
+ echo " (${m})" >&2
+ modules[$m]=1
+ else
+ top_level+=( "$package" )
+ echo " (top-level)" >&2
+ fi
+ #nix-store --add-fixed sha256 "${dir}/${i}" >&2
+done
+
+
+print_pkg_hash() {
+ echo " {name=\"${1}\";value=\"${hash[$1]}\";}"
+}
+
+print_hashes(){
+ echo "hashes=builtins.listToAttrs["
+ for p in "${packages[@]}"; do print_pkg_hash "$p"; done
+ echo "];"
+}
+
+print_split_module(){
+ echo -n "$1:" >&2
+ echo -e "{\n module=\"$1\";"
+ print_sane "$1"
+ echo " split=true;"
+ echo " pkgs=["
+ for p in "${packages[@]}"; do
+ if [[ "${module[$p]}" == "$1" ]]; then
+ echo -n " { name=\"$p\"; "
+ print_sane "$p"
+ echo " }"
+ echo -n " $p" >&2
+ fi
+ done
+ echo " ];"
+ echo "}"
+ echo >&2
+}
+
+print_mono_module(){
+ echo -en "{ module=\"$1\"; "
+ print_sane "$1"
+ echo -n "$1 ... " >&2
+ echo -n " split=false;"
+ cml="$1-$release/CMakeLists.txt"
+ tar -xf "${dir}/$1-${release}.tar.xz" "$cml"
+ if grep '^[^#]*add_subdirectory' $cml >/dev/null; then
+ if grep '^[^#]*add_subdirectory' $cml | grep -v macro_optional_add_subdirectory >/dev/null; then
+ echo " is monolithic (has unconditionally added subdirs)" >&2
+ else
+ subdirs=( `grep '^[^#]*add_subdirectory' $cml |
+ sed -e 's/[^#]*add_subdirectory *( *\(.*\) *)/\1/' |
+ grep -v '\(doc\|cmake\)'` )
+ echo " seems splittable, subdirs: ${subdirs[*]}" >&2
+ echo -e "\n pkgs=["
+ for s in "${subdirs[@]}"; do
+ echo -en " {"
+ echo -n " name=\"${s//\//-}\"; "
+ print_sane "$s"
+ if [[ $s != "${s//\//-}" ]]; then
+ echo -n "subdir=\"$s\"; "
+ fi
+ echo "}"
+ done
+ echo -e " ];\n"
+ fi
+ else
+ echo " is monolithic (has no subdirs)" >&2
+ fi
+ rm $cml
+ rmdir $1-$release
+ echo "}"
+}
+
+print_modules(){
+ echo "modules=["
+ echo "Printing modules splitted by upstream" >&2
+ for m in "${!modules[@]}"; do print_split_module "$m"; done
+ echo >&2
+ echo "Printing modules not splitted by upstream (${top_level[*]})" >&2
+ for m in "${top_level[@]}"; do print_mono_module "$m"; done
+ echo "];"
+}
+
+echo "Writing ${release}.nix" >&2
+exec > "${release}.nix"
+echo "{stable=${stable};"
+print_hashes
+print_modules
+echo "}"
diff --git a/pkgs/desktops/kde-4.12/kde-package/kde-submodules.xslt b/pkgs/desktops/kde-4.12/kde-package/kde-submodules.xslt
new file mode 100644
index 00000000000..952a05a9d27
--- /dev/null
+++ b/pkgs/desktops/kde-4.12/kde-package/kde-submodules.xslt
@@ -0,0 +1,22 @@
+
+
+
+
+
+
+
+
+ declare -A module
+
+
+
+ module["
+
+ "]="
+
+ "
+
+
+
+
+
diff --git a/pkgs/desktops/kde-4.12/kde-runtime.nix b/pkgs/desktops/kde-4.12/kde-runtime.nix
new file mode 100644
index 00000000000..1c9706f4f4b
--- /dev/null
+++ b/pkgs/desktops/kde-4.12/kde-runtime.nix
@@ -0,0 +1,24 @@
+{ kde, kdelibs, bzip2, libssh, exiv2, attica, qca2
+, libcanberra, virtuoso, samba, libjpeg, ntrack, pkgconfig, xz, pulseaudio
+, networkmanager, kactivities, kdepimlibs, openexr, ilmbase, gpgme
+}:
+
+kde {
+ buildInputs = [
+ kdelibs attica xz bzip2 libssh libjpeg exiv2 ntrack
+ qca2 samba libcanberra pulseaudio gpgme
+ networkmanager kactivities kdepimlibs openexr
+#todo: add openslp
+#todo: gpgme can't be found because cmake module is provided by kdepimlibs which are found too late
+ ];
+
+ nativeBuildInputs = [ pkgconfig ];
+
+ NIX_CFLAGS_COMPILE = "-I${ilmbase}/include/OpenEXR";
+
+ passthru.propagatedUserEnvPackages = [ virtuoso ];
+
+ meta = {
+ license = "LGPL";
+ };
+}
diff --git a/pkgs/desktops/kde-4.12/kde-wallpapers.nix b/pkgs/desktops/kde-4.12/kde-wallpapers.nix
new file mode 100644
index 00000000000..30e68934acf
--- /dev/null
+++ b/pkgs/desktops/kde-4.12/kde-wallpapers.nix
@@ -0,0 +1,17 @@
+{ kde, cmake }:
+
+kde {
+ nativeBuildInputs = [ cmake ];
+
+ patches = [ ./files/kde-wallpapers-buildsystem.patch ];
+
+ cmakeFlags = "-DWALLPAPER_INSTALL_DIR=share/wallpapers";
+
+ outputHashAlgo = "sha256";
+ outputHashMode = "recursive";
+ outputHash = "19d2ly05hv2x1kkzgdgvkcpjypp2nk4q9bffv17lz2q5pzhjhsa4";
+
+ meta = {
+ description = "Wallpapers for KDE";
+ };
+}
diff --git a/pkgs/desktops/kde-4.12/kde-workspace.nix b/pkgs/desktops/kde-4.12/kde-workspace.nix
new file mode 100644
index 00000000000..39e9c10a0fb
--- /dev/null
+++ b/pkgs/desktops/kde-4.12/kde-workspace.nix
@@ -0,0 +1,46 @@
+{ kde, kdelibs, qimageblitz, libdbusmenu_qt, xorg, lm_sensors
+, pciutils, libraw1394, libusb1, python, libqalculate, akonadi
+, xkeyboard_config, kdepimlibs, pam, boost, gpsd, prison
+, libjpeg, pkgconfig, kactivities, qjson, udev, fetchurl
+}:
+
+kde {
+
+ version = "4.11.6";
+
+ src = fetchurl {
+ url = "mirror://kde/stable/4.12.2/src/kde-workspace-4.11.6.tar.xz";
+ sha256 = "0lk3k9zl4x4il5dqpw7mf25gv8a3y48fd3jq3jvgmwwlviwcpcz1";
+ };
+
+#todo: wayland, xmms, libusb isn't found
+ buildInputs =
+ [ kdelibs qimageblitz libdbusmenu_qt xorg.libxcb xorg.xcbutilimage libjpeg
+ xorg.xcbutilrenderutil xorg.xcbutilkeysyms xorg.libpthreadstubs xorg.libXdmcp
+ xorg.libxkbfile xorg.libXcomposite xorg.libXtst
+ xorg.libXdamage
+
+ python boost qjson lm_sensors gpsd libraw1394 pciutils udev
+ akonadi pam libusb1 libqalculate kdepimlibs prison
+ kactivities
+ ];
+
+ nativeBuildInputs = [ pkgconfig ];
+
+ preConfigure =
+ ''
+ # Fix incorrect path to kde4-config.
+ substituteInPlace startkde.cmake --replace '$bindir/kde4-config' ${kdelibs}/bin/kde4-config
+
+ # Fix the path to the keyboard configuration files.
+ substituteInPlace kcontrol/keyboard/xkb_rules.cpp \
+ --replace /usr/share/X11 ${xkeyboard_config}/etc/X11
+ '';
+
+ enableParallelBuilding = false; # frequent problems on Hydra
+
+ meta = {
+ description = "KDE workspace components such as Plasma, Kwin and System Settings";
+ license = "GPLv2";
+ };
+}
diff --git a/pkgs/desktops/kde-4.12/kdeaccessibility/jovie.nix b/pkgs/desktops/kde-4.12/kdeaccessibility/jovie.nix
new file mode 100644
index 00000000000..d38c80c4c36
--- /dev/null
+++ b/pkgs/desktops/kde-4.12/kdeaccessibility/jovie.nix
@@ -0,0 +1,9 @@
+{ kde, kdelibs, speechd }:
+
+kde {
+ buildInputs = [ kdelibs speechd ];
+
+ meta = {
+ description = "Text-to-speech synthesis daemon";
+ };
+}
diff --git a/pkgs/desktops/kde-4.12/kdeaccessibility/kaccessible.nix b/pkgs/desktops/kde-4.12/kdeaccessibility/kaccessible.nix
new file mode 100644
index 00000000000..98fae7c983f
--- /dev/null
+++ b/pkgs/desktops/kde-4.12/kdeaccessibility/kaccessible.nix
@@ -0,0 +1,9 @@
+{ kde, kdelibs, speechd }:
+
+kde {
+ buildInputs = [ kdelibs speechd ];
+
+ meta = {
+ description = "Bridge that provides accessibility services to applications";
+ };
+}
diff --git a/pkgs/desktops/kde-4.12/kdeaccessibility/kmag.nix b/pkgs/desktops/kde-4.12/kdeaccessibility/kmag.nix
new file mode 100644
index 00000000000..606c61cddb6
--- /dev/null
+++ b/pkgs/desktops/kde-4.12/kdeaccessibility/kmag.nix
@@ -0,0 +1,10 @@
+{ kde, kdelibs }:
+
+kde {
+#todo: package qaccessibilityclient
+ buildInputs = [ kdelibs ];
+
+ meta = {
+ description = "Screen magnifier for KDE";
+ };
+}
diff --git a/pkgs/desktops/kde-4.12/kdeaccessibility/kmousetool.nix b/pkgs/desktops/kde-4.12/kdeaccessibility/kmousetool.nix
new file mode 100644
index 00000000000..8e0caa76ed9
--- /dev/null
+++ b/pkgs/desktops/kde-4.12/kdeaccessibility/kmousetool.nix
@@ -0,0 +1,9 @@
+{ kde, kdelibs, libXtst, libXt }:
+
+kde {
+ buildInputs = [ kdelibs libXtst libXt ];
+
+ meta = {
+ description = "A program that clicks the mouse for you";
+ };
+}
diff --git a/pkgs/desktops/kde-4.12/kdeaccessibility/kmouth.nix b/pkgs/desktops/kde-4.12/kdeaccessibility/kmouth.nix
new file mode 100644
index 00000000000..4159501967c
--- /dev/null
+++ b/pkgs/desktops/kde-4.12/kdeaccessibility/kmouth.nix
@@ -0,0 +1,9 @@
+{ kde, kdelibs }:
+
+kde {
+ buildInputs = [ kdelibs ];
+
+ meta = {
+ description = "A type-and-say front end for speech synthesizers";
+ };
+}
diff --git a/pkgs/desktops/kde-4.12/kdeadmin/kcron.nix b/pkgs/desktops/kde-4.12/kdeadmin/kcron.nix
new file mode 100644
index 00000000000..f585461af38
--- /dev/null
+++ b/pkgs/desktops/kde-4.12/kdeadmin/kcron.nix
@@ -0,0 +1,9 @@
+{ kde, kdelibs }:
+
+kde {
+ buildInputs = [ kdelibs ];
+
+ meta = {
+ description = "Configure and schedule tasks";
+ };
+}
diff --git a/pkgs/desktops/kde-4.12/kdeadmin/ksystemlog.nix b/pkgs/desktops/kde-4.12/kdeadmin/ksystemlog.nix
new file mode 100644
index 00000000000..88757a6b91c
--- /dev/null
+++ b/pkgs/desktops/kde-4.12/kdeadmin/ksystemlog.nix
@@ -0,0 +1,9 @@
+{ kde, kdelibs }:
+
+kde {
+ buildInputs = [ kdelibs ];
+
+ meta = {
+ description = "System log viewer tool";
+ };
+}
diff --git a/pkgs/desktops/kde-4.12/kdeadmin/kuser.nix b/pkgs/desktops/kde-4.12/kdeadmin/kuser.nix
new file mode 100644
index 00000000000..6118cf558bb
--- /dev/null
+++ b/pkgs/desktops/kde-4.12/kdeadmin/kuser.nix
@@ -0,0 +1,9 @@
+{ kde, kdelibs, kdepimlibs }:
+
+kde {
+ buildInputs = [ kdelibs kdepimlibs ];
+
+ meta = {
+ description = "User management tool";
+ };
+}
diff --git a/pkgs/desktops/kde-4.12/kdeartwork/ColorSchemes.nix b/pkgs/desktops/kde-4.12/kdeartwork/ColorSchemes.nix
new file mode 100644
index 00000000000..acccf66976f
--- /dev/null
+++ b/pkgs/desktops/kde-4.12/kdeartwork/ColorSchemes.nix
@@ -0,0 +1,11 @@
+{ kde, kdelibs }:
+
+kde {
+ name = "kde-color-schemes";
+
+ buildInputs = [ kdelibs ];
+
+ meta = {
+ description = "Additional KDE color schemes";
+ };
+}
diff --git a/pkgs/desktops/kde-4.12/kdeartwork/FindXscreensaver.cmake b/pkgs/desktops/kde-4.12/kdeartwork/FindXscreensaver.cmake
new file mode 100644
index 00000000000..499ed75268e
--- /dev/null
+++ b/pkgs/desktops/kde-4.12/kdeartwork/FindXscreensaver.cmake
@@ -0,0 +1,73 @@
+#Macro to find xscreensaver directory
+
+# Copyright (c) 2006, Laurent Montel,
+#
+# Redistribution and use is allowed according to the terms of the BSD license.
+# For details see the accompanying COPYING-CMAKE-SCRIPTS file.
+
+if (NOT XSCREENSAVER_FOUND)
+ FIND_PATH(XSCREENSAVER_DIR deco
+ HINTS
+ ${KDE4_INCLUDE_DIR}
+ PATHS
+ /usr
+ /usr/local
+ /opt/local
+ /usr/X11R6
+ /opt/kde
+ /opt/kde3
+ /usr/kde
+ /usr/local/kde
+ /usr/local/xscreensaver
+ /usr/openwin/lib/xscreensaver
+ /etc
+ PATH_SUFFIXES
+ lib${LIB_SUFFIX}/xscreensaver
+ lib${LIB_SUFFIX}/misc/xscreensaver
+ lib/xscreensaver
+ lib64/xscreensaver
+ lib/misc/xscreensaver
+ libexec/xscreensaver
+ bin/xscreensaver-hacks
+ hacks)
+ message(STATUS "XSCREENSAVER_DIR <${XSCREENSAVER_DIR}>")
+
+ FIND_PATH(XSCREENSAVER_CONFIG_DIR deco.xml
+ PATHS
+ ${KDE4_INCLUDE_DIR}
+ /usr/
+ /usr/local/
+ /opt/local/
+ /usr/X11R6/
+ /opt/kde/
+ /opt/kde3/
+ /usr/kde/
+ /usr/local/kde/
+ /usr/openwin/lib/xscreensaver/
+ /etc/
+ PATH_SUFFIXES xscreensaver xscreensaver/config share/xscreensaver/config
+ )
+ MESSAGE(STATUS "XSCREENSAVER_CONFIG_DIR :<${XSCREENSAVER_CONFIG_DIR}>")
+
+endif(NOT XSCREENSAVER_FOUND)
+
+#MESSAGE(STATUS "XSCREENSAVER_CONFIG_DIR :<${XSCREENSAVER_CONFIG_DIR}>")
+#MESSAGE(STATUS "XSCREENSAVER_DIR :<${XSCREENSAVER_DIR}>")
+
+# Need to fix hack
+if(XSCREENSAVER_DIR AND XSCREENSAVER_CONFIG_DIR)
+ set(XSCREENSAVER_FOUND TRUE)
+endif(XSCREENSAVER_DIR AND XSCREENSAVER_CONFIG_DIR)
+
+if (XSCREENSAVER_FOUND)
+ if (NOT Xscreensaver_FIND_QUIETLY)
+ message(STATUS "Found XSCREENSAVER_CONFIG_DIR <${XSCREENSAVER_CONFIG_DIR}>")
+ endif (NOT Xscreensaver_FIND_QUIETLY)
+else (XSCREENSAVER_FOUND)
+ if (Xscreensaver_FIND_REQUIRED)
+ message(FATAL_ERROR "XScreenSaver not found")
+ endif (Xscreensaver_FIND_REQUIRED)
+endif (XSCREENSAVER_FOUND)
+
+
+MARK_AS_ADVANCED(XSCREENSAVER_DIR XSCREENSAVER_CONFIG_DIR)
diff --git a/pkgs/desktops/kde-4.12/kdeartwork/HighResolutionWallpapers.nix b/pkgs/desktops/kde-4.12/kdeartwork/HighResolutionWallpapers.nix
new file mode 100644
index 00000000000..edffca1562e
--- /dev/null
+++ b/pkgs/desktops/kde-4.12/kdeartwork/HighResolutionWallpapers.nix
@@ -0,0 +1,11 @@
+{ kde, kdelibs }:
+
+kde rec {
+ name = "kde-wallpapers-high-resolution";
+
+ buildInputs = [ kdelibs ];
+
+ meta = {
+ description = "KDE wallpapers in high resolution";
+ };
+}
diff --git a/pkgs/desktops/kde-4.12/kdeartwork/IconThemes.nix b/pkgs/desktops/kde-4.12/kdeartwork/IconThemes.nix
new file mode 100644
index 00000000000..43071e8bd14
--- /dev/null
+++ b/pkgs/desktops/kde-4.12/kdeartwork/IconThemes.nix
@@ -0,0 +1,13 @@
+{ kde, kdelibs }:
+
+kde {
+ name = "kdeartwork-icon-themes";
+
+ # Sources contain primary and kdeclassic as well but they're not installed
+
+ buildInputs = [ kdelibs ];
+
+ meta = {
+ description = "KDE nuvola and mono icon themes";
+ };
+}
diff --git a/pkgs/desktops/kde-4.12/kdeartwork/WeatherWallpapers.nix b/pkgs/desktops/kde-4.12/kdeartwork/WeatherWallpapers.nix
new file mode 100644
index 00000000000..947e5e17ab0
--- /dev/null
+++ b/pkgs/desktops/kde-4.12/kdeartwork/WeatherWallpapers.nix
@@ -0,0 +1,11 @@
+{ kde, kdelibs }:
+
+kde rec {
+ name = "kde-weather-wallpapers";
+
+ buildInputs = [ kdelibs ];
+
+ meta = {
+ description = "Additional KDE wallpapers (weather)";
+ };
+}
diff --git a/pkgs/desktops/kde-4.12/kdeartwork/desktopthemes.nix b/pkgs/desktops/kde-4.12/kdeartwork/desktopthemes.nix
new file mode 100644
index 00000000000..93dd361af73
--- /dev/null
+++ b/pkgs/desktops/kde-4.12/kdeartwork/desktopthemes.nix
@@ -0,0 +1,11 @@
+{ kde, kdelibs }:
+
+kde {
+ name = "kde-desktop-themes";
+
+ buildInputs = [ kdelibs ];
+
+ meta = {
+ description = "Additional KDE desktop themes";
+ };
+}
diff --git a/pkgs/desktops/kde-4.12/kdeartwork/emoticons.nix b/pkgs/desktops/kde-4.12/kdeartwork/emoticons.nix
new file mode 100644
index 00000000000..5ef9f78a719
--- /dev/null
+++ b/pkgs/desktops/kde-4.12/kdeartwork/emoticons.nix
@@ -0,0 +1,11 @@
+{ kde, kdelibs }:
+
+kde {
+ name = "kde-emotion-icons";
+
+ buildInputs = [ kdelibs ];
+
+ meta = {
+ description = "Additional KDE emotion icons (smiles)";
+ };
+}
diff --git a/pkgs/desktops/kde-4.12/kdeartwork/kscreensaver.nix b/pkgs/desktops/kde-4.12/kdeartwork/kscreensaver.nix
new file mode 100644
index 00000000000..84cb008056e
--- /dev/null
+++ b/pkgs/desktops/kde-4.12/kdeartwork/kscreensaver.nix
@@ -0,0 +1,15 @@
+{ kde, kdelibs, xscreensaver, kde_workspace, eigen, libkexiv2, libXt, pkgconfig }:
+
+kde {
+ buildInputs = [ kdelibs xscreensaver kde_workspace eigen libkexiv2 libXt ];
+
+ nativeBuildInputs = [ pkgconfig ];
+
+ prePatch = "cp -v ${./FindXscreensaver.cmake} cmake/modules/FindXscreensaver.cmake";
+
+ cmakeFlags = [ "-DBUILD_asciiquarium:BOOL=ON" ];
+
+ meta = {
+ description = "KDE screensavers";
+ };
+}
diff --git a/pkgs/desktops/kde-4.12/kdeartwork/kwin-styles.nix b/pkgs/desktops/kde-4.12/kdeartwork/kwin-styles.nix
new file mode 100644
index 00000000000..b5d769b216d
--- /dev/null
+++ b/pkgs/desktops/kde-4.12/kdeartwork/kwin-styles.nix
@@ -0,0 +1,9 @@
+{ kde, kdelibs, kde_workspace }:
+
+kde {
+ buildInputs = [ kdelibs kde_workspace ];
+
+ meta = {
+ description = "Styles for KWin";
+ };
+}
diff --git a/pkgs/desktops/kde-4.12/kdeartwork/styles.nix b/pkgs/desktops/kde-4.12/kdeartwork/styles.nix
new file mode 100644
index 00000000000..6a1306c3710
--- /dev/null
+++ b/pkgs/desktops/kde-4.12/kdeartwork/styles.nix
@@ -0,0 +1,11 @@
+{ kde, kdelibs }:
+
+kde rec {
+ name = "kde-style-phase";
+
+ buildInputs = [ kdelibs ];
+
+ meta = {
+ description = "Phase, a widget style for KDE";
+ };
+}
diff --git a/pkgs/desktops/kde-4.12/kdeartwork/wallpapers.nix b/pkgs/desktops/kde-4.12/kdeartwork/wallpapers.nix
new file mode 100644
index 00000000000..7c9846fbf9e
--- /dev/null
+++ b/pkgs/desktops/kde-4.12/kdeartwork/wallpapers.nix
@@ -0,0 +1,11 @@
+{ kde, kdelibs }:
+
+kde rec {
+ name = "kdeartwork-wallpapers";
+
+ buildInputs = [ kdelibs ];
+
+ meta = {
+ description = "Additional KDE wallpapers";
+ };
+}
diff --git a/pkgs/desktops/kde-4.12/kdebindings/perlqt.nix b/pkgs/desktops/kde-4.12/kdebindings/perlqt.nix
new file mode 100644
index 00000000000..48eed141ce6
--- /dev/null
+++ b/pkgs/desktops/kde-4.12/kdebindings/perlqt.nix
@@ -0,0 +1,14 @@
+{ kde, cmake, smokeqt, perl }:
+
+kde {
+
+ # TODO: qscintilla2, qwt5
+
+ buildInputs = [ smokeqt perl ];
+
+ nativeBuildInputs = [ cmake ];
+
+ meta = {
+ description = "Perl bindings for Qt library";
+ };
+}
diff --git a/pkgs/desktops/kde-4.12/kdebindings/pykde4.nix b/pkgs/desktops/kde-4.12/kdebindings/pykde4.nix
new file mode 100644
index 00000000000..64e196452e3
--- /dev/null
+++ b/pkgs/desktops/kde-4.12/kdebindings/pykde4.nix
@@ -0,0 +1,32 @@
+{ kde, kdelibs, python, sip, pyqt4, kdepimlibs, shared_desktop_ontologies,
+ polkit_qt_1, boost, lndir, pkgconfig }:
+
+let pydir = "lib/python${python.majorVersion}"; in
+
+kde {
+
+ # todo: polkit isn't found by the build system
+
+ buildInputs = [
+ python kdepimlibs shared_desktop_ontologies
+ boost polkit_qt_1
+ ];
+
+ nativeBuildInputs = [ pkgconfig ];
+
+ propagatedBuildInputs = [ pyqt4 sip ];
+
+ preConfigure =
+ ''
+ # Symlink PyQt into PyKDE. This is necessary because PyQt looks
+ # in its PyQt4/uic/widget-plugins directory for plugins, and KDE
+ # needs to install a plugin.
+ mkdir -pv $out/${pydir}
+ ${lndir}/bin/lndir ${pyqt4}/${pydir} $out/${pydir}
+ cmakeFlagsArray=( "-DSIP_DEFAULT_SIP_DIR=$prefix/share/sip" )
+ '';
+
+ meta = {
+ description = "Python bindings for KDE";
+ };
+}
diff --git a/pkgs/desktops/kde-4.12/kdebindings/qtruby-install-prefix.patch b/pkgs/desktops/kde-4.12/kdebindings/qtruby-install-prefix.patch
new file mode 100644
index 00000000000..bd95a0d8bd3
--- /dev/null
+++ b/pkgs/desktops/kde-4.12/kdebindings/qtruby-install-prefix.patch
@@ -0,0 +1,15 @@
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 33078b4..30aec0e 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -31,8 +31,8 @@ if (NOT COMPILE_RUBY)
+ return()
+ endif (NOT COMPILE_RUBY)
+
+-SET(CUSTOM_RUBY_SITE_ARCH_DIR ${RUBY_SITEARCH_DIR} CACHE DIR "custom installation directory for ruby binary extension" )
+-SET(CUSTOM_RUBY_SITE_LIB_DIR ${RUBY_SITELIB_DIR} CACHE DIR "custom installation directory for ruby extension" )
++string(REPLACE "${RUBY_ROOT_DIR}" "${CMAKE_INSTALL_PREFIX}" CUSTOM_RUBY_SITE_ARCH_DIR ${RUBY_SITEARCH_DIR})
++string(REPLACE "${RUBY_ROOT_DIR}" "${CMAKE_INSTALL_PREFIX}" CUSTOM_RUBY_SITE_LIB_DIR ${RUBY_SITELIB_DIR})
+
+ # compute an overall version number which can be compared at once
+ MATH(EXPR RUBY_VERSION_NUMBER "${RUBY_VERSION_MAJOR}*10000 + ${RUBY_VERSION_MINOR}*100 + ${RUBY_VERSION_PATCH}")
diff --git a/pkgs/desktops/kde-4.12/kdebindings/qtruby.nix b/pkgs/desktops/kde-4.12/kdebindings/qtruby.nix
new file mode 100644
index 00000000000..03e9dc9a007
--- /dev/null
+++ b/pkgs/desktops/kde-4.12/kdebindings/qtruby.nix
@@ -0,0 +1,20 @@
+{ kde, cmake, smokeqt, ruby }:
+
+kde {
+
+ # TODO: scintilla2, qwt5
+
+ buildInputs = [ smokeqt ruby ];
+
+ nativeBuildInputs = [ cmake ];
+
+ # The patch is not ready for upstream submmission.
+ # I should add an option() instead.
+ patches = [ ./qtruby-install-prefix.patch ];
+
+ cmakeFlags="-DRUBY_ROOT_DIR=${ruby}";
+
+ meta = {
+ description = "Ruby bindings for Qt library";
+ };
+}
diff --git a/pkgs/desktops/kde-4.12/kdebindings/smokegen-CMakeLists.txt-nix.patch b/pkgs/desktops/kde-4.12/kdebindings/smokegen-CMakeLists.txt-nix.patch
new file mode 100644
index 00000000000..f0811d335a7
--- /dev/null
+++ b/pkgs/desktops/kde-4.12/kdebindings/smokegen-CMakeLists.txt-nix.patch
@@ -0,0 +1,13 @@
+--- smokegen-4.10.5.orig/CMakeLists.txt 2013-06-28 17:14:50.000000000 +0000
++++ smokegen-4.10.5/CMakeLists.txt 2013-07-31 19:15:17.000000000 +0000
+@@ -36,6 +36,10 @@
+ set (CMAKE_SKIP_BUILD_RPATH FALSE)
+ set (CMAKE_SKIP_RPATH FALSE)
+
++# add the automatically determined parts of the RPATH
++# which point to directories outside the build tree to the install RPATH
++SET(CMAKE_INSTALL_RPATH_USE_LINK_PATH TRUE)
++
+ configure_file( ${CMAKE_CURRENT_SOURCE_DIR}/config.h.in config.h @ONLY )
+
+ add_executable(smokegen ${generator_SRC})
\ No newline at end of file
diff --git a/pkgs/desktops/kde-4.12/kdebindings/smokegen-nix.patch b/pkgs/desktops/kde-4.12/kdebindings/smokegen-nix.patch
new file mode 100644
index 00000000000..53257e836e0
--- /dev/null
+++ b/pkgs/desktops/kde-4.12/kdebindings/smokegen-nix.patch
@@ -0,0 +1,13 @@
+diff -urN smokegen-4.10.5.orig/cmake/SmokeConfig.cmake.in smokegen-4.10.5/cmake/SmokeConfig.cmake.in
+--- smokegen-4.10.5.orig/cmake/SmokeConfig.cmake.in 2013-06-28 17:14:50.000000000 +0000
++++ smokegen-4.10.5/cmake/SmokeConfig.cmake.in 2013-07-30 21:26:33.000000000 +0000
+@@ -80,8 +80,7 @@
+ set(SMOKE_API_BIN "@SMOKE_API_BIN@")
+
+ find_library(SMOKE_BASE_LIBRARY smokebase
+- PATHS "@SMOKE_LIBRARY_PREFIX@"
+- NO_DEFAULT_PATH)
++ PATHS "@SMOKE_LIBRARY_PREFIX@")
+
+ if (NOT SMOKE_BASE_LIBRARY)
+ if (Smoke_FIND_REQUIRED)
diff --git a/pkgs/desktops/kde-4.12/kdebindings/smokegen.nix b/pkgs/desktops/kde-4.12/kdebindings/smokegen.nix
new file mode 100644
index 00000000000..a80574ff67a
--- /dev/null
+++ b/pkgs/desktops/kde-4.12/kdebindings/smokegen.nix
@@ -0,0 +1,13 @@
+{ kde, qt4, cmake }:
+
+kde {
+ buildInputs = [ qt4 ];
+ nativeBuildInputs = [ cmake ];
+
+ patches = [ ./smokegen-nix.patch ./smokegen-CMakeLists.txt-nix.patch ];
+
+ meta = {
+ description = "C++ parser used to generate language bindings for Qt/KDE";
+ license = "GPLv2";
+ };
+}
diff --git a/pkgs/desktops/kde-4.12/kdebindings/smokekde.nix b/pkgs/desktops/kde-4.12/kdebindings/smokekde.nix
new file mode 100644
index 00000000000..4474c1d9731
--- /dev/null
+++ b/pkgs/desktops/kde-4.12/kdebindings/smokekde.nix
@@ -0,0 +1,19 @@
+{ kde, cmake, smokeqt, kdelibs, akonadi, kdepimlibs, okular
+, shared_desktop_ontologies, attica, pkgconfig }:
+
+kde {
+
+ # TODO: attica, akonadi and kdepimlibs are disabled due to smokegen crash
+ # okular is disabled because the code generated is broken
+ buildInputs = [
+ smokeqt kdelibs shared_desktop_ontologies
+ ];
+
+ nativeBuildInputs = [ cmake pkgconfig ];
+
+ LD_LIBRARY_PATH = "${smokeqt}/lib/";
+
+ meta = {
+ description = "SMOKE bindings for kdelibs";
+ };
+}
diff --git a/pkgs/desktops/kde-4.12/kdebindings/smokeqt.nix b/pkgs/desktops/kde-4.12/kdebindings/smokeqt.nix
new file mode 100644
index 00000000000..72b267e43c5
--- /dev/null
+++ b/pkgs/desktops/kde-4.12/kdebindings/smokeqt.nix
@@ -0,0 +1,15 @@
+{ kde, qt4, cmake, phonon, qimageblitz, smokegen }:
+
+kde {
+
+# TODO: Qwt5, QScintilla2
+
+ propagatedBuildInputs = [ qt4 phonon qimageblitz ];
+ nativeBuildInputs = [ cmake ];
+ propagatedNativeBuildInputs = [ smokegen ];
+
+ meta = {
+ description = "C++ parser used to generate language bindings for Qt/KDE";
+ license = "GPLv2";
+ };
+}
diff --git a/pkgs/desktops/kde-4.12/kdeedu/analitza.nix b/pkgs/desktops/kde-4.12/kdeedu/analitza.nix
new file mode 100644
index 00000000000..74c3a1ebb20
--- /dev/null
+++ b/pkgs/desktops/kde-4.12/kdeedu/analitza.nix
@@ -0,0 +1,8 @@
+{ kde, kdelibs, readline }:
+kde {
+ buildInputs = [ kdelibs readline ];
+
+ meta = {
+ description = "Library part of KAlgebra";
+ };
+}
diff --git a/pkgs/desktops/kde-4.12/kdeedu/blinken.nix b/pkgs/desktops/kde-4.12/kdeedu/blinken.nix
new file mode 100644
index 00000000000..cdf9728833c
--- /dev/null
+++ b/pkgs/desktops/kde-4.12/kdeedu/blinken.nix
@@ -0,0 +1,8 @@
+{ kde, kdelibs }:
+kde {
+ buildInputs = [ kdelibs ];
+
+ meta = {
+ description = "Memory Enhancement Game";
+ };
+}
diff --git a/pkgs/desktops/kde-4.12/kdeedu/cantor.nix b/pkgs/desktops/kde-4.12/kdeedu/cantor.nix
new file mode 100644
index 00000000000..a8cd2e44957
--- /dev/null
+++ b/pkgs/desktops/kde-4.12/kdeedu/cantor.nix
@@ -0,0 +1,13 @@
+{ kde, kdelibs, libspectre, analitza, R, pkgconfig, libqalculate, python }:
+kde {
+
+# TODO: R is not found
+
+ buildInputs = [ kdelibs libspectre analitza R libqalculate python ];
+
+ nativeBuildInputs = [ pkgconfig ];
+
+ meta = {
+ description = "KDE Frontend to Mathematical Software";
+ };
+}
diff --git a/pkgs/desktops/kde-4.12/kdeedu/kalgebra.nix b/pkgs/desktops/kde-4.12/kdeedu/kalgebra.nix
new file mode 100644
index 00000000000..3675c3a225f
--- /dev/null
+++ b/pkgs/desktops/kde-4.12/kdeedu/kalgebra.nix
@@ -0,0 +1,8 @@
+{ kde, kdelibs, libkdeedu, analitza }:
+kde {
+ buildInputs = [ kdelibs libkdeedu analitza ];
+
+ meta = {
+ description = "2D and 3D Graph Calculator";
+ };
+}
diff --git a/pkgs/desktops/kde-4.12/kdeedu/kalzium.nix b/pkgs/desktops/kde-4.12/kdeedu/kalzium.nix
new file mode 100644
index 00000000000..09de79ce1c0
--- /dev/null
+++ b/pkgs/desktops/kde-4.12/kdeedu/kalzium.nix
@@ -0,0 +1,13 @@
+{ kde, kdelibs, facile, ocaml, eigen, openbabel, avogadro, pkgconfig }:
+kde {
+
+# TODO: chemical mime data
+
+ buildInputs = [ kdelibs facile ocaml eigen openbabel avogadro ];
+
+ nativeBuildInputs = [ pkgconfig ];
+
+ meta = {
+ description = "Periodic Table of Elements";
+ };
+}
diff --git a/pkgs/desktops/kde-4.12/kdeedu/kanagram.nix b/pkgs/desktops/kde-4.12/kdeedu/kanagram.nix
new file mode 100644
index 00000000000..8759c96d78c
--- /dev/null
+++ b/pkgs/desktops/kde-4.12/kdeedu/kanagram.nix
@@ -0,0 +1,8 @@
+{ kde, kdelibs, libkdeedu }:
+kde {
+ buildInputs = [ kdelibs libkdeedu ];
+
+ meta = {
+ description = "Letter Order Game";
+ };
+}
diff --git a/pkgs/desktops/kde-4.12/kdeedu/kbruch.nix b/pkgs/desktops/kde-4.12/kdeedu/kbruch.nix
new file mode 100644
index 00000000000..dc50f1e85a3
--- /dev/null
+++ b/pkgs/desktops/kde-4.12/kdeedu/kbruch.nix
@@ -0,0 +1,8 @@
+{ kde, kdelibs }:
+kde {
+ buildInputs = [ kdelibs ];
+
+ meta = {
+ description = "Practice Fractions";
+ };
+}
diff --git a/pkgs/desktops/kde-4.12/kdeedu/kgeography.nix b/pkgs/desktops/kde-4.12/kdeedu/kgeography.nix
new file mode 100644
index 00000000000..bd8d27c8d6e
--- /dev/null
+++ b/pkgs/desktops/kde-4.12/kdeedu/kgeography.nix
@@ -0,0 +1,8 @@
+{ kde, kdelibs }:
+kde {
+ buildInputs = [ kdelibs ];
+
+ meta = {
+ description = "Geography Trainer";
+ };
+}
diff --git a/pkgs/desktops/kde-4.12/kdeedu/khangman.nix b/pkgs/desktops/kde-4.12/kdeedu/khangman.nix
new file mode 100644
index 00000000000..997b50e906a
--- /dev/null
+++ b/pkgs/desktops/kde-4.12/kdeedu/khangman.nix
@@ -0,0 +1,8 @@
+{ kde, kdelibs, libkdeedu }:
+kde {
+ buildInputs = [ kdelibs libkdeedu ];
+
+ meta = {
+ description = "KDE hangman game";
+ };
+}
diff --git a/pkgs/desktops/kde-4.12/kdeedu/kig.nix b/pkgs/desktops/kde-4.12/kdeedu/kig.nix
new file mode 100644
index 00000000000..37906c32bcb
--- /dev/null
+++ b/pkgs/desktops/kde-4.12/kdeedu/kig.nix
@@ -0,0 +1,9 @@
+{ kde, kdelibs, boost, python}:
+kde {
+ buildInputs = [ kdelibs boost python ];
+
+ cmakeFlags = "-DKIG_ENABLE_PYTHON_SCRIPTING=1";
+ meta = {
+ description = "KDE Interactive Geometry";
+ };
+}
diff --git a/pkgs/desktops/kde-4.12/kdeedu/kiten.nix b/pkgs/desktops/kde-4.12/kdeedu/kiten.nix
new file mode 100644
index 00000000000..939b7a9f77a
--- /dev/null
+++ b/pkgs/desktops/kde-4.12/kdeedu/kiten.nix
@@ -0,0 +1,9 @@
+{ kde, kdelibs }:
+
+kde {
+ buildInputs = [ kdelibs ];
+
+ meta = {
+ description = "Japanese Reference/Study Tool";
+ };
+}
diff --git a/pkgs/desktops/kde-4.12/kdeedu/klettres.nix b/pkgs/desktops/kde-4.12/kdeedu/klettres.nix
new file mode 100644
index 00000000000..7a0fa83078e
--- /dev/null
+++ b/pkgs/desktops/kde-4.12/kdeedu/klettres.nix
@@ -0,0 +1,9 @@
+{ kde, kdelibs }:
+
+kde {
+ buildInputs = [ kdelibs ];
+
+ meta = {
+ description = "A KDE alphabet tutorial";
+ };
+}
diff --git a/pkgs/desktops/kde-4.12/kdeedu/kmplot.nix b/pkgs/desktops/kde-4.12/kdeedu/kmplot.nix
new file mode 100644
index 00000000000..fc7b0578c27
--- /dev/null
+++ b/pkgs/desktops/kde-4.12/kdeedu/kmplot.nix
@@ -0,0 +1,9 @@
+{ kde, kdelibs }:
+
+kde {
+ buildInputs = [ kdelibs ];
+
+ meta = {
+ description = "A KDE mathematical function plotter";
+ };
+}
diff --git a/pkgs/desktops/kde-4.12/kdeedu/kstars.nix b/pkgs/desktops/kde-4.12/kdeedu/kstars.nix
new file mode 100644
index 00000000000..0832dc2121e
--- /dev/null
+++ b/pkgs/desktops/kde-4.12/kdeedu/kstars.nix
@@ -0,0 +1,14 @@
+{ kde, kdelibs, eigen, xplanet, indilib, pkgconfig }:
+
+kde {
+
+# TODO: wcslib, astrometry
+
+ buildInputs = [ kdelibs eigen xplanet indilib ];
+
+ nativeBuildInputs = [ pkgconfig ];
+
+ meta = {
+ description = "A KDE graphical desktop planetarium";
+ };
+}
diff --git a/pkgs/desktops/kde-4.12/kdeedu/ktouch.nix b/pkgs/desktops/kde-4.12/kdeedu/ktouch.nix
new file mode 100644
index 00000000000..9e606adde33
--- /dev/null
+++ b/pkgs/desktops/kde-4.12/kdeedu/ktouch.nix
@@ -0,0 +1,9 @@
+{ kde, kdelibs, libxkbfile }:
+
+kde {
+ buildInputs = [ kdelibs libxkbfile ];
+
+ meta = {
+ description = "Touch Typing Tutor";
+ };
+}
diff --git a/pkgs/desktops/kde-4.12/kdeedu/kturtle.nix b/pkgs/desktops/kde-4.12/kdeedu/kturtle.nix
new file mode 100644
index 00000000000..1e1922b1410
--- /dev/null
+++ b/pkgs/desktops/kde-4.12/kdeedu/kturtle.nix
@@ -0,0 +1,9 @@
+{ kde, kdelibs }:
+
+kde {
+ buildInputs = [ kdelibs ];
+
+ meta = {
+ description = "Educational Programming Environment";
+ };
+}
diff --git a/pkgs/desktops/kde-4.12/kdeedu/kwordquiz.nix b/pkgs/desktops/kde-4.12/kdeedu/kwordquiz.nix
new file mode 100644
index 00000000000..1b33ba2e469
--- /dev/null
+++ b/pkgs/desktops/kde-4.12/kdeedu/kwordquiz.nix
@@ -0,0 +1,9 @@
+{ kde, kdelibs, libkdeedu }:
+
+kde {
+ buildInputs = [ kdelibs libkdeedu ];
+
+ meta = {
+ description = "Flash Card Trainer";
+ };
+}
diff --git a/pkgs/desktops/kde-4.12/kdeedu/libkdeedu.nix b/pkgs/desktops/kde-4.12/kdeedu/libkdeedu.nix
new file mode 100644
index 00000000000..def6c85fefe
--- /dev/null
+++ b/pkgs/desktops/kde-4.12/kdeedu/libkdeedu.nix
@@ -0,0 +1,8 @@
+{ kde, kdelibs }:
+kde {
+ buildInputs = [ kdelibs ];
+
+ meta = {
+ description = "Libraries used by KDE Education applications";
+ };
+}
diff --git a/pkgs/desktops/kde-4.12/kdeedu/marble.nix b/pkgs/desktops/kde-4.12/kdeedu/marble.nix
new file mode 100644
index 00000000000..2dc07d14a0d
--- /dev/null
+++ b/pkgs/desktops/kde-4.12/kdeedu/marble.nix
@@ -0,0 +1,12 @@
+{ kde, kdelibs, gpsd }:
+
+kde {
+
+# TODO: package QextSerialPort, libshp(shapelib), QtMobility, QtLocation, libwlocate, quazip
+
+ buildInputs = [ kdelibs gpsd ];
+
+ meta = {
+ description = "Marble Virtual Globe";
+ };
+}
diff --git a/pkgs/desktops/kde-4.12/kdeedu/pairs.nix b/pkgs/desktops/kde-4.12/kdeedu/pairs.nix
new file mode 100644
index 00000000000..36c4aba9604
--- /dev/null
+++ b/pkgs/desktops/kde-4.12/kdeedu/pairs.nix
@@ -0,0 +1,9 @@
+{ kde, kdelibs }:
+
+kde {
+ buildInputs = [ kdelibs ];
+
+ meta = {
+ description = "A memory and pairs game";
+ };
+}
diff --git a/pkgs/desktops/kde-4.12/kdeedu/parley.nix b/pkgs/desktops/kde-4.12/kdeedu/parley.nix
new file mode 100644
index 00000000000..f9f86dde150
--- /dev/null
+++ b/pkgs/desktops/kde-4.12/kdeedu/parley.nix
@@ -0,0 +1,9 @@
+{ kde, kdelibs, libkdeedu, attica }:
+
+kde {
+ buildInputs = [ kdelibs libkdeedu attica ];
+
+ meta = {
+ description = "Vocabulary Trainer";
+ };
+}
diff --git a/pkgs/desktops/kde-4.12/kdeedu/rocs.nix b/pkgs/desktops/kde-4.12/kdeedu/rocs.nix
new file mode 100644
index 00000000000..ce30d11fda3
--- /dev/null
+++ b/pkgs/desktops/kde-4.12/kdeedu/rocs.nix
@@ -0,0 +1,14 @@
+{ kde, kdelibs, boost, grantlee }:
+
+kde {
+ buildInputs = [ kdelibs (boost.override { enableExceptions = true; }) grantlee ];
+
+ NIX_CFLAGS_COMPILE = "-fexceptions";
+
+ meta = {
+ description = "A KDE graph theory viewer";
+ kde = {
+ name = "rocs";
+ };
+ };
+}
diff --git a/pkgs/desktops/kde-4.12/kdeedu/step.nix b/pkgs/desktops/kde-4.12/kdeedu/step.nix
new file mode 100644
index 00000000000..f36ccef9b7c
--- /dev/null
+++ b/pkgs/desktops/kde-4.12/kdeedu/step.nix
@@ -0,0 +1,12 @@
+{ kde, kdelibs, gsl, libqalculate, eigen, pkgconfig }:
+
+kde {
+
+ buildInputs = [ kdelibs gsl libqalculate eigen ];
+
+ nativeBuildInputs = [ pkgconfig ];
+
+ meta = {
+ description = "A KDE interactive physical simulator";
+ };
+}
diff --git a/pkgs/desktops/kde-4.12/kdegames/bomber.nix b/pkgs/desktops/kde-4.12/kdegames/bomber.nix
new file mode 100644
index 00000000000..026227910f2
--- /dev/null
+++ b/pkgs/desktops/kde-4.12/kdegames/bomber.nix
@@ -0,0 +1,7 @@
+{ kde, kdelibs, libkdegames }:
+kde {
+ buildInputs = [ kdelibs libkdegames ];
+ meta = {
+ description = "a single player arcade game. The player is invading various cities in a plane that is decreasing in height";
+ };
+}
diff --git a/pkgs/desktops/kde-4.12/kdegames/bovo.nix b/pkgs/desktops/kde-4.12/kdegames/bovo.nix
new file mode 100644
index 00000000000..b0e7d99c589
--- /dev/null
+++ b/pkgs/desktops/kde-4.12/kdegames/bovo.nix
@@ -0,0 +1,8 @@
+{ kde, kdelibs, libkdegames }:
+kde {
+ buildInputs = [ kdelibs libkdegames ];
+ meta = {
+ description = "a Gomoku (from Japanese 五目並べ - lit. \"five points\") like game for two players, where the opponents alternate in placing their respective pictogram on the game board";
+ };
+
+}
diff --git a/pkgs/desktops/kde-4.12/kdegames/granatier.nix b/pkgs/desktops/kde-4.12/kdegames/granatier.nix
new file mode 100644
index 00000000000..9f1ab005309
--- /dev/null
+++ b/pkgs/desktops/kde-4.12/kdegames/granatier.nix
@@ -0,0 +1,7 @@
+{ kde, kdelibs, libkdegames }:
+kde {
+ buildInputs = [ kdelibs libkdegames ];
+ meta = {
+ description = "a clone of the classic Bomberman game, inspired by the work of the Clanbomber clone";
+ };
+}
diff --git a/pkgs/desktops/kde-4.12/kdegames/kajongg.nix b/pkgs/desktops/kde-4.12/kdegames/kajongg.nix
new file mode 100644
index 00000000000..9a6f5e83695
--- /dev/null
+++ b/pkgs/desktops/kde-4.12/kdegames/kajongg.nix
@@ -0,0 +1,13 @@
+{ kde, kdelibs, libkdegames, pythonPackages, sqlite, pykde4 }:
+kde rec {
+
+ buildInputs = [ kdelibs libkdegames pythonPackages.python pythonPackages.wrapPython sqlite ] ++ pythonPath;
+
+ pythonPath = [ pythonPackages.twisted pykde4 ];
+
+ postInstall = "wrapPythonPrograms";
+
+ meta = {
+ description = "an ancient Chinese board game for 4 players";
+ };
+}
diff --git a/pkgs/desktops/kde-4.12/kdegames/kapman.nix b/pkgs/desktops/kde-4.12/kdegames/kapman.nix
new file mode 100644
index 00000000000..f10e099da3c
--- /dev/null
+++ b/pkgs/desktops/kde-4.12/kdegames/kapman.nix
@@ -0,0 +1,7 @@
+{ kde, kdelibs, libkdegames }:
+kde {
+ buildInputs = [ kdelibs libkdegames ];
+ meta = {
+ description = "a clone of the well known game Pac-Man";
+ };
+}
diff --git a/pkgs/desktops/kde-4.12/kdegames/katomic.nix b/pkgs/desktops/kde-4.12/kdegames/katomic.nix
new file mode 100644
index 00000000000..a9936c04f0e
--- /dev/null
+++ b/pkgs/desktops/kde-4.12/kdegames/katomic.nix
@@ -0,0 +1,7 @@
+{ kde, kdelibs, libkdegames }:
+kde {
+ buildInputs = [ kdelibs libkdegames ];
+ meta = {
+ description = "a fun and educational puzzle game built around molecular geometry";
+ };
+}
diff --git a/pkgs/desktops/kde-4.12/kdegames/kblackbox.nix b/pkgs/desktops/kde-4.12/kdegames/kblackbox.nix
new file mode 100644
index 00000000000..27eeff2f65b
--- /dev/null
+++ b/pkgs/desktops/kde-4.12/kdegames/kblackbox.nix
@@ -0,0 +1,7 @@
+{ kde, kdelibs, libkdegames }:
+kde {
+ buildInputs = [ kdelibs libkdegames ];
+ meta = {
+ description = "a game of hide and seek played on an grid of boxes, where the player shoots rays into the grid to deduce the positions of hidden objects";
+ };
+}
diff --git a/pkgs/desktops/kde-4.12/kdegames/kblocks.nix b/pkgs/desktops/kde-4.12/kdegames/kblocks.nix
new file mode 100644
index 00000000000..98cf068de09
--- /dev/null
+++ b/pkgs/desktops/kde-4.12/kdegames/kblocks.nix
@@ -0,0 +1,7 @@
+{ kde, kdelibs, libkdegames }:
+kde {
+ buildInputs = [ kdelibs libkdegames ];
+ meta = {
+ description = "a classic single player falling blocks puzzle game";
+ };
+}
diff --git a/pkgs/desktops/kde-4.12/kdegames/kbounce.nix b/pkgs/desktops/kde-4.12/kdegames/kbounce.nix
new file mode 100644
index 00000000000..77fa0db6352
--- /dev/null
+++ b/pkgs/desktops/kde-4.12/kdegames/kbounce.nix
@@ -0,0 +1,7 @@
+{ kde, kdelibs, libkdegames }:
+kde {
+ buildInputs = [ kdelibs libkdegames ];
+ meta = {
+ description = "a single player arcade game with the elements of puzzle";
+ };
+}
diff --git a/pkgs/desktops/kde-4.12/kdegames/kbreakout.nix b/pkgs/desktops/kde-4.12/kdegames/kbreakout.nix
new file mode 100644
index 00000000000..3a484d919bb
--- /dev/null
+++ b/pkgs/desktops/kde-4.12/kdegames/kbreakout.nix
@@ -0,0 +1,7 @@
+{ kde, kdelibs, libkdegames }:
+kde {
+ buildInputs = [ kdelibs libkdegames ];
+ meta = {
+ description = "a Breakout-like game. Its object is to destroy as many bricks as possible without losing the ball";
+ };
+}
diff --git a/pkgs/desktops/kde-4.12/kdegames/kdiamond.nix b/pkgs/desktops/kde-4.12/kdegames/kdiamond.nix
new file mode 100644
index 00000000000..06dfcee5ac3
--- /dev/null
+++ b/pkgs/desktops/kde-4.12/kdegames/kdiamond.nix
@@ -0,0 +1,7 @@
+{ kde, kdelibs, libkdegames }:
+kde {
+ buildInputs = [ kdelibs libkdegames ];
+ meta = {
+ description = "a single player puzzle game. The object of the game is to build lines of three similar diamonds";
+ };
+}
diff --git a/pkgs/desktops/kde-4.12/kdegames/kfourinline.nix b/pkgs/desktops/kde-4.12/kdegames/kfourinline.nix
new file mode 100644
index 00000000000..11b8838e708
--- /dev/null
+++ b/pkgs/desktops/kde-4.12/kdegames/kfourinline.nix
@@ -0,0 +1,7 @@
+{ kde, kdelibs, libkdegames }:
+kde {
+ buildInputs = [ kdelibs libkdegames ];
+ meta = {
+ description = "a board game for two players based on the Connect-Four game";
+ };
+}
diff --git a/pkgs/desktops/kde-4.12/kdegames/kgoldrunner.nix b/pkgs/desktops/kde-4.12/kdegames/kgoldrunner.nix
new file mode 100644
index 00000000000..6217c47a806
--- /dev/null
+++ b/pkgs/desktops/kde-4.12/kdegames/kgoldrunner.nix
@@ -0,0 +1,7 @@
+{ kde, kdelibs, libkdegames }:
+kde {
+ buildInputs = [ kdelibs libkdegames ];
+ meta = {
+ description = "an action game where the hero runs through a maze, climbs stairs, dig holes and dodges enemies in order to collect all the gold nuggets and escape to the next level";
+ };
+}
diff --git a/pkgs/desktops/kde-4.12/kdegames/kigo.nix b/pkgs/desktops/kde-4.12/kdegames/kigo.nix
new file mode 100644
index 00000000000..32eee67cc1e
--- /dev/null
+++ b/pkgs/desktops/kde-4.12/kdegames/kigo.nix
@@ -0,0 +1,7 @@
+{ kde, kdelibs, libkdegames }:
+kde {
+ buildInputs = [ kdelibs libkdegames ];
+ meta = {
+ description = "an open-source implementation of the popular Go game";
+ };
+}
diff --git a/pkgs/desktops/kde-4.12/kdegames/killbots.nix b/pkgs/desktops/kde-4.12/kdegames/killbots.nix
new file mode 100644
index 00000000000..d9c1472495e
--- /dev/null
+++ b/pkgs/desktops/kde-4.12/kdegames/killbots.nix
@@ -0,0 +1,7 @@
+{ kde, kdelibs, libkdegames }:
+kde {
+ buildInputs = [ kdelibs libkdegames ];
+ meta = {
+ description = "a simple game of evading killer robots";
+ };
+}
diff --git a/pkgs/desktops/kde-4.12/kdegames/kiriki.nix b/pkgs/desktops/kde-4.12/kdegames/kiriki.nix
new file mode 100644
index 00000000000..72f7ab67501
--- /dev/null
+++ b/pkgs/desktops/kde-4.12/kdegames/kiriki.nix
@@ -0,0 +1,7 @@
+{ kde, kdelibs, libkdegames }:
+kde {
+ buildInputs = [ kdelibs libkdegames ];
+ meta = {
+ description = "an addictive and fun dice game, designed to be played by as many as six players";
+ };
+}
diff --git a/pkgs/desktops/kde-4.12/kdegames/kjumpingcube.nix b/pkgs/desktops/kde-4.12/kdegames/kjumpingcube.nix
new file mode 100644
index 00000000000..a6d22cff51c
--- /dev/null
+++ b/pkgs/desktops/kde-4.12/kdegames/kjumpingcube.nix
@@ -0,0 +1,7 @@
+{ kde, kdelibs, libkdegames }:
+kde {
+ buildInputs = [ kdelibs libkdegames ];
+ meta = {
+ description = "a simple dice driven tactical game";
+ };
+}
diff --git a/pkgs/desktops/kde-4.12/kdegames/klickety.nix b/pkgs/desktops/kde-4.12/kdegames/klickety.nix
new file mode 100644
index 00000000000..b592bc40641
--- /dev/null
+++ b/pkgs/desktops/kde-4.12/kdegames/klickety.nix
@@ -0,0 +1,7 @@
+{ kde, kdelibs, libkdegames }:
+kde {
+ buildInputs = [ kdelibs libkdegames ];
+ meta = {
+ description = "a puzzle game where the player removes groups of colored marbles to clear the board";
+ };
+}
diff --git a/pkgs/desktops/kde-4.12/kdegames/klines.nix b/pkgs/desktops/kde-4.12/kdegames/klines.nix
new file mode 100644
index 00000000000..90952fe91c0
--- /dev/null
+++ b/pkgs/desktops/kde-4.12/kdegames/klines.nix
@@ -0,0 +1,7 @@
+{ kde, kdelibs, libkdegames }:
+kde {
+ buildInputs = [ kdelibs libkdegames ];
+ meta = {
+ description = "a simple but highly addictive one player game. The player has to move the colored balls around the game board, gathering them into the lines of the same color by five";
+ };
+}
diff --git a/pkgs/desktops/kde-4.12/kdegames/kmahjongg.nix b/pkgs/desktops/kde-4.12/kdegames/kmahjongg.nix
new file mode 100644
index 00000000000..946b531ff12
--- /dev/null
+++ b/pkgs/desktops/kde-4.12/kdegames/kmahjongg.nix
@@ -0,0 +1,7 @@
+{ kde, kdelibs, libkdegames, libkmahjongg }:
+kde {
+ buildInputs = [ kdelibs libkdegames libkmahjongg ];
+ meta = {
+ description = "the tiles are scrambled and staked on top of each other to resemble a certain shape. The player is then expected to remove all the tiles off the game board by locating each tile's matching pair";
+ };
+}
diff --git a/pkgs/desktops/kde-4.12/kdegames/kmines.nix b/pkgs/desktops/kde-4.12/kdegames/kmines.nix
new file mode 100644
index 00000000000..538454e9598
--- /dev/null
+++ b/pkgs/desktops/kde-4.12/kdegames/kmines.nix
@@ -0,0 +1,7 @@
+{ kde, kdelibs, libkdegames }:
+kde {
+ buildInputs = [ kdelibs libkdegames ];
+ meta = {
+ description = "a classic Minesweeper game";
+ };
+}
diff --git a/pkgs/desktops/kde-4.12/kdegames/knavalbattle.nix b/pkgs/desktops/kde-4.12/kdegames/knavalbattle.nix
new file mode 100644
index 00000000000..42ffd2fcb4d
--- /dev/null
+++ b/pkgs/desktops/kde-4.12/kdegames/knavalbattle.nix
@@ -0,0 +1,7 @@
+{ kde, kdelibs, libkdegames }:
+kde {
+ buildInputs = [ kdelibs libkdegames ];
+ meta = {
+ description = "a Battle Ship game";
+ };
+}
diff --git a/pkgs/desktops/kde-4.12/kdegames/knetwalk.nix b/pkgs/desktops/kde-4.12/kdegames/knetwalk.nix
new file mode 100644
index 00000000000..a16e578ce84
--- /dev/null
+++ b/pkgs/desktops/kde-4.12/kdegames/knetwalk.nix
@@ -0,0 +1,7 @@
+{ kde, kdelibs, libkdegames }:
+kde {
+ buildInputs = [ kdelibs libkdegames ];
+ meta = {
+ description = "a small game where you have to build up a computer network by rotating the wires to connect the terminals to the server";
+ };
+}
diff --git a/pkgs/desktops/kde-4.12/kdegames/kolf.nix b/pkgs/desktops/kde-4.12/kdegames/kolf.nix
new file mode 100644
index 00000000000..78815ee5799
--- /dev/null
+++ b/pkgs/desktops/kde-4.12/kdegames/kolf.nix
@@ -0,0 +1,7 @@
+{ kde, kdelibs, libkdegames }:
+kde {
+ buildInputs = [ kdelibs libkdegames ];
+ meta = {
+ description = "a miniature golf game";
+ };
+}
diff --git a/pkgs/desktops/kde-4.12/kdegames/kollision.nix b/pkgs/desktops/kde-4.12/kdegames/kollision.nix
new file mode 100644
index 00000000000..3147c7305ea
--- /dev/null
+++ b/pkgs/desktops/kde-4.12/kdegames/kollision.nix
@@ -0,0 +1,7 @@
+{ kde, kdelibs, libkdegames }:
+kde {
+ buildInputs = [ kdelibs libkdegames ];
+ meta = {
+ description = "a simple ball dodging game";
+ };
+}
diff --git a/pkgs/desktops/kde-4.12/kdegames/konquest.nix b/pkgs/desktops/kde-4.12/kdegames/konquest.nix
new file mode 100644
index 00000000000..53ddd64928c
--- /dev/null
+++ b/pkgs/desktops/kde-4.12/kdegames/konquest.nix
@@ -0,0 +1,7 @@
+{ kde, kdelibs, libkdegames }:
+kde {
+ buildInputs = [ kdelibs libkdegames ];
+ meta = {
+ description = "the KDE version of Gnu-Lactic Konquest";
+ };
+}
diff --git a/pkgs/desktops/kde-4.12/kdegames/kpat.nix b/pkgs/desktops/kde-4.12/kdegames/kpat.nix
new file mode 100644
index 00000000000..f8d9bad36dc
--- /dev/null
+++ b/pkgs/desktops/kde-4.12/kdegames/kpat.nix
@@ -0,0 +1,7 @@
+{ kde, kdelibs, libkdegames }:
+kde {
+ buildInputs = [ kdelibs libkdegames ];
+ meta = {
+ description = "a relaxing card sorting game";
+ };
+}
diff --git a/pkgs/desktops/kde-4.12/kdegames/kreversi.nix b/pkgs/desktops/kde-4.12/kdegames/kreversi.nix
new file mode 100644
index 00000000000..2aed981428e
--- /dev/null
+++ b/pkgs/desktops/kde-4.12/kdegames/kreversi.nix
@@ -0,0 +1,7 @@
+{ kde, kdelibs, libkdegames }:
+kde {
+ buildInputs = [ kdelibs libkdegames ];
+ meta = {
+ description = "a simple one player strategy game played against the computer. If a player's piece is captured by an opposing player, that piece is turned over to reveal the color of that player";
+ };
+}
diff --git a/pkgs/desktops/kde-4.12/kdegames/kshisen.nix b/pkgs/desktops/kde-4.12/kdegames/kshisen.nix
new file mode 100644
index 00000000000..9c888034038
--- /dev/null
+++ b/pkgs/desktops/kde-4.12/kdegames/kshisen.nix
@@ -0,0 +1,7 @@
+{ kde, kdelibs, libkdegames, libkmahjongg }:
+kde {
+ buildInputs = [ kdelibs libkdegames libkmahjongg ];
+ meta = {
+ description = "a solitaire-like game played using the standard set of Mahjong tiles";
+ };
+}
diff --git a/pkgs/desktops/kde-4.12/kdegames/ksirk.nix b/pkgs/desktops/kde-4.12/kdegames/ksirk.nix
new file mode 100644
index 00000000000..767eb67971a
--- /dev/null
+++ b/pkgs/desktops/kde-4.12/kdegames/ksirk.nix
@@ -0,0 +1,7 @@
+{ kde, kdelibs, libkdegames, qca2 }:
+kde {
+ buildInputs = [ kdelibs libkdegames qca2 ];
+ meta = {
+ description = "a computerized version of the well known strategic board game Risk";
+ };
+}
diff --git a/pkgs/desktops/kde-4.12/kdegames/ksnakeduel.nix b/pkgs/desktops/kde-4.12/kdegames/ksnakeduel.nix
new file mode 100644
index 00000000000..ccf1fb551e9
--- /dev/null
+++ b/pkgs/desktops/kde-4.12/kdegames/ksnakeduel.nix
@@ -0,0 +1,7 @@
+{ kde, kdelibs, libkdegames }:
+kde {
+ buildInputs = [ kdelibs libkdegames ];
+ meta = {
+ description = "a simple Tron-Clone";
+ };
+}
diff --git a/pkgs/desktops/kde-4.12/kdegames/kspaceduel.nix b/pkgs/desktops/kde-4.12/kdegames/kspaceduel.nix
new file mode 100644
index 00000000000..5285f7916ca
--- /dev/null
+++ b/pkgs/desktops/kde-4.12/kdegames/kspaceduel.nix
@@ -0,0 +1,7 @@
+{ kde, kdelibs, libkdegames }:
+kde {
+ buildInputs = [ kdelibs libkdegames ];
+ meta = {
+ description = "each of two possible players control a satellite spaceship orbiting the sun. As the game progresses players have to eliminate the opponent's spacecraft with bullets or mines";
+ };
+}
diff --git a/pkgs/desktops/kde-4.12/kdegames/ksquares.nix b/pkgs/desktops/kde-4.12/kdegames/ksquares.nix
new file mode 100644
index 00000000000..a17be2da632
--- /dev/null
+++ b/pkgs/desktops/kde-4.12/kdegames/ksquares.nix
@@ -0,0 +1,7 @@
+{ kde, kdelibs, libkdegames }:
+kde {
+ buildInputs = [ kdelibs libkdegames ];
+ meta = {
+ description = "a game modeled after the well known pen and paper based game of Dots and Boxes";
+ };
+}
diff --git a/pkgs/desktops/kde-4.12/kdegames/ksudoku.nix b/pkgs/desktops/kde-4.12/kdegames/ksudoku.nix
new file mode 100644
index 00000000000..ea4e13a5e4f
--- /dev/null
+++ b/pkgs/desktops/kde-4.12/kdegames/ksudoku.nix
@@ -0,0 +1,7 @@
+{ kde, kdelibs, libkdegames }:
+kde {
+ buildInputs = [ kdelibs libkdegames ];
+ meta = {
+ description = "a logic-based symbol placement puzzle";
+ };
+}
diff --git a/pkgs/desktops/kde-4.12/kdegames/ktuberling.nix b/pkgs/desktops/kde-4.12/kdegames/ktuberling.nix
new file mode 100644
index 00000000000..1a6ba9d653c
--- /dev/null
+++ b/pkgs/desktops/kde-4.12/kdegames/ktuberling.nix
@@ -0,0 +1,7 @@
+{ kde, kdelibs, libkdegames }:
+kde {
+ buildInputs = [ kdelibs libkdegames ];
+ meta = {
+ description = "a simple constructor game suitable for children and adults alike";
+ };
+}
diff --git a/pkgs/desktops/kde-4.12/kdegames/kubrick.nix b/pkgs/desktops/kde-4.12/kdegames/kubrick.nix
new file mode 100644
index 00000000000..9bdc6879db4
--- /dev/null
+++ b/pkgs/desktops/kde-4.12/kdegames/kubrick.nix
@@ -0,0 +1,7 @@
+{ kde, kdelibs, libkdegames }:
+kde {
+ buildInputs = [ kdelibs libkdegames ];
+ meta = {
+ description = "a game based on the Rubik's Cube™ puzzle";
+ };
+}
diff --git a/pkgs/desktops/kde-4.12/kdegames/libkdegames.nix b/pkgs/desktops/kde-4.12/kdegames/libkdegames.nix
new file mode 100644
index 00000000000..3819dcdc9ae
--- /dev/null
+++ b/pkgs/desktops/kde-4.12/kdegames/libkdegames.nix
@@ -0,0 +1,7 @@
+{ kde, kdelibs, openal, libsndfile }:
+kde {
+ buildInputs = [ kdelibs openal libsndfile ];
+ meta = {
+ description = "KDE games library";
+ };
+}
diff --git a/pkgs/desktops/kde-4.12/kdegames/libkmahjongg.nix b/pkgs/desktops/kde-4.12/kdegames/libkmahjongg.nix
new file mode 100644
index 00000000000..383b347dc33
--- /dev/null
+++ b/pkgs/desktops/kde-4.12/kdegames/libkmahjongg.nix
@@ -0,0 +1,7 @@
+{ kde, kdelibs, libkdegames }:
+kde {
+ buildInputs = [ kdelibs libkdegames ];
+ meta = {
+ description = "a library for KMahjongg game";
+ };
+}
diff --git a/pkgs/desktops/kde-4.12/kdegames/lskat.nix b/pkgs/desktops/kde-4.12/kdegames/lskat.nix
new file mode 100644
index 00000000000..2a5050cd667
--- /dev/null
+++ b/pkgs/desktops/kde-4.12/kdegames/lskat.nix
@@ -0,0 +1,7 @@
+{ kde, kdelibs, libkdegames }:
+kde {
+ buildInputs = [ kdelibs libkdegames ];
+ meta = {
+ description = "a fun and engaging card game for two players, where the second player is either live opponent, or a built in artificial intelligence";
+ };
+}
diff --git a/pkgs/desktops/kde-4.12/kdegames/palapeli.nix b/pkgs/desktops/kde-4.12/kdegames/palapeli.nix
new file mode 100644
index 00000000000..010dbd5d623
--- /dev/null
+++ b/pkgs/desktops/kde-4.12/kdegames/palapeli.nix
@@ -0,0 +1,11 @@
+{ kde, kdelibs, libkdegames }:
+kde {
+
+# TODO: package qvoronoi
+
+ buildInputs = [ kdelibs libkdegames ];
+
+ meta = {
+ description = "a single-player jigsaw puzzle game";
+ };
+}
diff --git a/pkgs/desktops/kde-4.12/kdegames/picmi.nix b/pkgs/desktops/kde-4.12/kdegames/picmi.nix
new file mode 100644
index 00000000000..165d7422f95
--- /dev/null
+++ b/pkgs/desktops/kde-4.12/kdegames/picmi.nix
@@ -0,0 +1,7 @@
+{ kde, kdelibs, libkdegames }:
+kde {
+ buildInputs = [ kdelibs libkdegames ];
+ meta = {
+ description = "a single player logic-based puzzle game";
+ };
+}
diff --git a/pkgs/desktops/kde-4.12/kdegraphics/gwenview.nix b/pkgs/desktops/kde-4.12/kdegraphics/gwenview.nix
new file mode 100644
index 00000000000..b6fd701ac12
--- /dev/null
+++ b/pkgs/desktops/kde-4.12/kdegraphics/gwenview.nix
@@ -0,0 +1,15 @@
+{ kde, kdelibs, exiv2, kde_baseapps, libkipi, nepomuk_core
+, libjpeg, pkgconfig, kactivities, lcms2 }:
+
+kde {
+
+ buildInputs =
+ [ kdelibs exiv2 nepomuk_core kactivities kde_baseapps libkipi libjpeg lcms2 ];
+
+ nativeBuildInputs = [ pkgconfig ];
+
+ meta = {
+ description = "Gwenview, the KDE image viewer";
+ license = "GPLv2";
+ };
+}
diff --git a/pkgs/desktops/kde-4.12/kdegraphics/kamera.nix b/pkgs/desktops/kde-4.12/kdegraphics/kamera.nix
new file mode 100644
index 00000000000..70904b17c23
--- /dev/null
+++ b/pkgs/desktops/kde-4.12/kdegraphics/kamera.nix
@@ -0,0 +1,10 @@
+{ kde, kdelibs, libgphoto2 }:
+
+kde {
+ buildInputs = [ kdelibs libgphoto2 ];
+
+ meta = {
+ description = "KDE camera interface library";
+ license = "GPLv2";
+ };
+}
diff --git a/pkgs/desktops/kde-4.12/kdegraphics/kcolorchooser.nix b/pkgs/desktops/kde-4.12/kdegraphics/kcolorchooser.nix
new file mode 100644
index 00000000000..58528cb186b
--- /dev/null
+++ b/pkgs/desktops/kde-4.12/kdegraphics/kcolorchooser.nix
@@ -0,0 +1,10 @@
+{ kde, kdelibs }:
+
+kde {
+ buildInputs = [ kdelibs ];
+
+ meta = {
+ description = "A small utility to select a color";
+ license = "GPLv2";
+ };
+}
diff --git a/pkgs/desktops/kde-4.12/kdegraphics/kdegraphics-mobipocket.nix b/pkgs/desktops/kde-4.12/kdegraphics/kdegraphics-mobipocket.nix
new file mode 100644
index 00000000000..2c2ba3796a2
--- /dev/null
+++ b/pkgs/desktops/kde-4.12/kdegraphics/kdegraphics-mobipocket.nix
@@ -0,0 +1,10 @@
+{ kde, kdelibs, okular }:
+
+kde {
+ buildInputs = [ kdelibs okular ];
+
+ meta = {
+ description = "A collection of plugins to handle mobipocket files";
+ license = "GPLv2";
+ };
+}
diff --git a/pkgs/desktops/kde-4.12/kdegraphics/kdegraphics-strigi-analyzer.nix b/pkgs/desktops/kde-4.12/kdegraphics/kdegraphics-strigi-analyzer.nix
new file mode 100644
index 00000000000..35af39aa611
--- /dev/null
+++ b/pkgs/desktops/kde-4.12/kdegraphics/kdegraphics-strigi-analyzer.nix
@@ -0,0 +1,10 @@
+{ kde, kdelibs, libtiff }:
+
+kde {
+ buildInputs = [ kdelibs libtiff ];
+
+ meta = {
+ description = "Strigi analyzers for various graphics file formats";
+ license = "GPLv2";
+ };
+}
diff --git a/pkgs/desktops/kde-4.12/kdegraphics/kdegraphics-thumbnailers.nix b/pkgs/desktops/kde-4.12/kdegraphics/kdegraphics-thumbnailers.nix
new file mode 100644
index 00000000000..18c6534eb5c
--- /dev/null
+++ b/pkgs/desktops/kde-4.12/kdegraphics/kdegraphics-thumbnailers.nix
@@ -0,0 +1,13 @@
+{ kde, kdelibs, libkexiv2, libkdcraw, pkgconfig }:
+
+kde {
+
+ buildInputs = [ kdelibs libkexiv2 libkdcraw ];
+
+ nativeBuildInputs = [ pkgconfig ];
+
+ meta = {
+ description = "Thumbnailers for various graphics file formats";
+ license = "GPLv2";
+ };
+}
diff --git a/pkgs/desktops/kde-4.12/kdegraphics/kgamma.nix b/pkgs/desktops/kde-4.12/kdegraphics/kgamma.nix
new file mode 100644
index 00000000000..28d9252187e
--- /dev/null
+++ b/pkgs/desktops/kde-4.12/kdegraphics/kgamma.nix
@@ -0,0 +1,10 @@
+{ kde, kdelibs, libXxf86vm }:
+
+kde {
+ buildInputs = [ kdelibs libXxf86vm ];
+
+ meta = {
+ description = "KDE monitor calibration tool";
+ license = "GPLv2";
+ };
+}
diff --git a/pkgs/desktops/kde-4.12/kdegraphics/kolourpaint.nix b/pkgs/desktops/kde-4.12/kdegraphics/kolourpaint.nix
new file mode 100644
index 00000000000..5276ec09f46
--- /dev/null
+++ b/pkgs/desktops/kde-4.12/kdegraphics/kolourpaint.nix
@@ -0,0 +1,10 @@
+{ kde, kdelibs, qimageblitz }:
+
+kde {
+ buildInputs = [ kdelibs qimageblitz ];
+
+ meta = {
+ description = "KDE paint program";
+ license = "GPLv2";
+ };
+}
diff --git a/pkgs/desktops/kde-4.12/kdegraphics/kruler.nix b/pkgs/desktops/kde-4.12/kdegraphics/kruler.nix
new file mode 100644
index 00000000000..c5c2c6e05d7
--- /dev/null
+++ b/pkgs/desktops/kde-4.12/kdegraphics/kruler.nix
@@ -0,0 +1,10 @@
+{ kde, kdelibs }:
+
+kde {
+ buildInputs = [ kdelibs ];
+
+ meta = {
+ description = "KDE screen ruler";
+ license = "GPLv2";
+ };
+}
diff --git a/pkgs/desktops/kde-4.12/kdegraphics/ksaneplugin.nix b/pkgs/desktops/kde-4.12/kdegraphics/ksaneplugin.nix
new file mode 100644
index 00000000000..1381ed7dd26
--- /dev/null
+++ b/pkgs/desktops/kde-4.12/kdegraphics/ksaneplugin.nix
@@ -0,0 +1,10 @@
+{ kde, kdelibs, libksane }:
+
+kde {
+ buildInputs = [ kdelibs libksane ];
+
+ meta = {
+ description = "A KScan plugin that implements the scanning through libksane";
+ license = "GPLv2";
+ };
+}
diff --git a/pkgs/desktops/kde-4.12/kdegraphics/ksnapshot.nix b/pkgs/desktops/kde-4.12/kdegraphics/ksnapshot.nix
new file mode 100644
index 00000000000..f01a609e20d
--- /dev/null
+++ b/pkgs/desktops/kde-4.12/kdegraphics/ksnapshot.nix
@@ -0,0 +1,10 @@
+{ kde, kdelibs, libkipi }:
+
+kde {
+ buildInputs = [ kdelibs libkipi ];
+
+ meta = {
+ description = "KDE screenshot utility";
+ license = "GPLv2";
+ };
+}
diff --git a/pkgs/desktops/kde-4.12/kdegraphics/libkdcraw.nix b/pkgs/desktops/kde-4.12/kdegraphics/libkdcraw.nix
new file mode 100644
index 00000000000..e7c01f98a8c
--- /dev/null
+++ b/pkgs/desktops/kde-4.12/kdegraphics/libkdcraw.nix
@@ -0,0 +1,13 @@
+{ kde, kdelibs, pkgconfig, libraw, lcms2 }:
+
+kde {
+
+ buildInputs = [ kdelibs libraw lcms2 ];
+
+ nativeBuildInputs = [ pkgconfig ];
+
+ meta = {
+ description = "Library for decoding RAW images";
+ license = "GPLv2";
+ };
+}
diff --git a/pkgs/desktops/kde-4.12/kdegraphics/libkexiv2.nix b/pkgs/desktops/kde-4.12/kdegraphics/libkexiv2.nix
new file mode 100644
index 00000000000..096b0a6e957
--- /dev/null
+++ b/pkgs/desktops/kde-4.12/kdegraphics/libkexiv2.nix
@@ -0,0 +1,10 @@
+{ kde, kdelibs, exiv2 }:
+
+kde {
+ buildInputs = [ kdelibs exiv2 ];
+
+ meta = {
+ description = "Exiv2 support library";
+ license = "GPLv2";
+ };
+}
diff --git a/pkgs/desktops/kde-4.12/kdegraphics/libkipi.nix b/pkgs/desktops/kde-4.12/kdegraphics/libkipi.nix
new file mode 100644
index 00000000000..6b16265e7a3
--- /dev/null
+++ b/pkgs/desktops/kde-4.12/kdegraphics/libkipi.nix
@@ -0,0 +1,10 @@
+{ kde, kdelibs }:
+
+kde {
+ buildInputs = [ kdelibs ];
+
+ meta = {
+ description = "Interface library to kipi-plugins";
+ license = "GPLv2";
+ };
+}
diff --git a/pkgs/desktops/kde-4.12/kdegraphics/libksane.nix b/pkgs/desktops/kde-4.12/kdegraphics/libksane.nix
new file mode 100644
index 00000000000..b539eab3899
--- /dev/null
+++ b/pkgs/desktops/kde-4.12/kdegraphics/libksane.nix
@@ -0,0 +1,10 @@
+{ kde, kdelibs, saneBackends }:
+
+kde {
+ buildInputs = [ kdelibs saneBackends ];
+
+ meta = {
+ description = "An image scanning library that provides a QWidget that contains all the logic needed to interface a sacanner";
+ license = "GPLv2";
+ };
+}
diff --git a/pkgs/desktops/kde-4.12/kdegraphics/okular.nix b/pkgs/desktops/kde-4.12/kdegraphics/okular.nix
new file mode 100644
index 00000000000..aca1691eace
--- /dev/null
+++ b/pkgs/desktops/kde-4.12/kdegraphics/okular.nix
@@ -0,0 +1,17 @@
+{ chmlib, djvulibre, ebook_tools, kde, kdelibs, libspectre, popplerQt4, qca2
+, qimageblitz, libtiff, kactivities, pkgconfig, libkexiv2 }:
+
+kde {
+
+# TODO: package activeapp, qmobipocket
+
+ buildInputs = [ kdelibs chmlib djvulibre ebook_tools libspectre popplerQt4
+ qca2 qimageblitz libtiff kactivities libkexiv2 ];
+
+ nativeBuildInputs = [ pkgconfig ];
+
+ meta = {
+ description = "Okular, the KDE document viewer";
+ license = "GPLv2";
+ };
+}
diff --git a/pkgs/desktops/kde-4.12/kdegraphics/svgpart.nix b/pkgs/desktops/kde-4.12/kdegraphics/svgpart.nix
new file mode 100644
index 00000000000..a344cc4b4b4
--- /dev/null
+++ b/pkgs/desktops/kde-4.12/kdegraphics/svgpart.nix
@@ -0,0 +1,10 @@
+{ kde, kdelibs }:
+
+kde {
+ buildInputs = [ kdelibs ];
+
+ meta = {
+ description = "SVG KPart";
+ license = "GPLv2";
+ };
+}
diff --git a/pkgs/desktops/kde-4.12/kdelibs/kdelibs.nix b/pkgs/desktops/kde-4.12/kdelibs/kdelibs.nix
new file mode 100644
index 00000000000..396adf9ba75
--- /dev/null
+++ b/pkgs/desktops/kde-4.12/kdelibs/kdelibs.nix
@@ -0,0 +1,46 @@
+{ kde, gcc, cmake, perl
+, qt4, bzip2, fam, shared_mime_info, giflib, jasper, strigi
+, openexr, avahi, kerberos, shared_desktop_ontologies, libXScrnSaver
+, automoc4, soprano, qca2, attica, enchant, libdbusmenu_qt, grantlee
+, docbook_xml_dtd_42, docbook_xsl, polkit_qt_1, acl, attr, libXtst
+, udev, herqq, phonon, libjpeg, xz, ilmbase, libxslt
+, pkgconfig
+}:
+
+kde {
+
+# TODO: media-player-info
+
+ buildInputs =
+ [ pkgconfig attica avahi bzip2 enchant fam giflib grantlee herqq
+ libdbusmenu_qt libXScrnSaver polkit_qt_1 qca2 acl jasper libxslt
+ shared_desktop_ontologies xz udev libjpeg kerberos openexr
+ libXtst attr
+ ];
+
+ NIX_CFLAGS_COMPILE = "-I${ilmbase}/include/OpenEXR";
+
+ propagatedBuildInputs = [ qt4 soprano phonon strigi ];
+
+ propagatedNativeBuildInputs = [ automoc4 cmake perl shared_mime_info ];
+
+ # TODO: make sonnet plugins (dictionaries) really work.
+ # There are a few hardcoded paths.
+ # Split plugins from libs?
+
+ patches = [ ../files/polkit-install.patch ];
+
+ cmakeFlags = [
+ "-DDOCBOOKXML_CURRENTDTD_DIR=${docbook_xml_dtd_42}/xml/dtd/docbook"
+ "-DDOCBOOKXSL_DIR=${docbook_xsl}/xml/xsl/docbook"
+ "-DHUPNP_ENABLED=ON"
+ "-DWITH_SOLID_UDISKS2=ON"
+ ];
+
+ passthru.wantsUdisks2 = true;
+
+ meta = {
+ description = "KDE libraries";
+ license = "LGPL";
+ };
+}
diff --git a/pkgs/desktops/kde-4.12/kdelibs/nepomuk-core.nix b/pkgs/desktops/kde-4.12/kdelibs/nepomuk-core.nix
new file mode 100644
index 00000000000..7e29eebf3b7
--- /dev/null
+++ b/pkgs/desktops/kde-4.12/kdelibs/nepomuk-core.nix
@@ -0,0 +1,20 @@
+{ kde, kdelibs, soprano, shared_desktop_ontologies, exiv2, ffmpeg, taglib, popplerQt4
+, pkgconfig, doxygen, ebook_tools
+}:
+
+kde {
+
+# TODO: qmobipocket
+
+ buildInputs = [
+ kdelibs soprano shared_desktop_ontologies taglib exiv2 ffmpeg
+ popplerQt4 ebook_tools
+ ];
+
+ nativeBuildInputs = [ pkgconfig doxygen ];
+
+ meta = {
+ description = "NEPOMUK core";
+ license = "GPLv2";
+ };
+}
diff --git a/pkgs/desktops/kde-4.12/kdelibs/nepomuk-widgets.nix b/pkgs/desktops/kde-4.12/kdelibs/nepomuk-widgets.nix
new file mode 100644
index 00000000000..0d29a4f97de
--- /dev/null
+++ b/pkgs/desktops/kde-4.12/kdelibs/nepomuk-widgets.nix
@@ -0,0 +1,11 @@
+{ kde, kdelibs, nepomuk_core }:
+
+kde {
+
+ buildInputs = [ kdelibs nepomuk_core ];
+
+ meta = {
+ description = "NEPOMUK Widgets";
+ license = "GPLv2";
+ };
+}
diff --git a/pkgs/desktops/kde-4.12/kdemultimedia/audiocd-kio.nix b/pkgs/desktops/kde-4.12/kdemultimedia/audiocd-kio.nix
new file mode 100644
index 00000000000..4c56e7529dd
--- /dev/null
+++ b/pkgs/desktops/kde-4.12/kdemultimedia/audiocd-kio.nix
@@ -0,0 +1,7 @@
+{ kde, kdelibs, libkcompactdisc, cdparanoia, libkcddb, libvorbis, flac, lame }:
+kde {
+ buildInputs = [ kdelibs libkcompactdisc cdparanoia libkcddb libvorbis flac lame ];
+ meta = {
+ description = "transparent audio CD access for applications using the KDE Platform";
+ };
+}
diff --git a/pkgs/desktops/kde-4.12/kdemultimedia/dragon.nix b/pkgs/desktops/kde-4.12/kdemultimedia/dragon.nix
new file mode 100644
index 00000000000..006300742ec
--- /dev/null
+++ b/pkgs/desktops/kde-4.12/kdemultimedia/dragon.nix
@@ -0,0 +1,7 @@
+{ kde, kdelibs }:
+kde {
+ buildInputs = [ kdelibs ];
+ meta = {
+ description = "a multimedia player with the focus on simplicity";
+ };
+}
diff --git a/pkgs/desktops/kde-4.12/kdemultimedia/ffmpegthumbs.nix b/pkgs/desktops/kde-4.12/kdemultimedia/ffmpegthumbs.nix
new file mode 100644
index 00000000000..45f6c9abcb6
--- /dev/null
+++ b/pkgs/desktops/kde-4.12/kdemultimedia/ffmpegthumbs.nix
@@ -0,0 +1,7 @@
+{ kde, kdelibs, ffmpeg }:
+kde {
+ buildInputs = [ kdelibs ffmpeg ];
+ meta = {
+ description = "a video thumbnail generator for KDE file managers like Dolphin and Konqueror";
+ };
+}
diff --git a/pkgs/desktops/kde-4.12/kdemultimedia/juk.nix b/pkgs/desktops/kde-4.12/kdemultimedia/juk.nix
new file mode 100644
index 00000000000..5d7b1db224e
--- /dev/null
+++ b/pkgs/desktops/kde-4.12/kdemultimedia/juk.nix
@@ -0,0 +1,10 @@
+{ kde, kdelibs, taglib, libtunepimp }:
+kde {
+
+# TODO: opusfile
+
+ buildInputs = [ kdelibs taglib libtunepimp ];
+ meta = {
+ description = "an audio jukebox application";
+ };
+}
diff --git a/pkgs/desktops/kde-4.12/kdemultimedia/kmix.nix b/pkgs/desktops/kde-4.12/kdemultimedia/kmix.nix
new file mode 100644
index 00000000000..1dd8108166f
--- /dev/null
+++ b/pkgs/desktops/kde-4.12/kdemultimedia/kmix.nix
@@ -0,0 +1,7 @@
+{ kde, kdelibs, libcanberra, pulseaudio }:
+kde {
+ buildInputs = [ kdelibs libcanberra pulseaudio ];
+ meta = {
+ description = "sound mixer, an application to allow you to change the volume of your sound card";
+ };
+}
diff --git a/pkgs/desktops/kde-4.12/kdemultimedia/kscd.nix b/pkgs/desktops/kde-4.12/kdemultimedia/kscd.nix
new file mode 100644
index 00000000000..e99ae53935b
--- /dev/null
+++ b/pkgs/desktops/kde-4.12/kdemultimedia/kscd.nix
@@ -0,0 +1,7 @@
+{ kde, kdelibs, libmusicbrainz }:
+kde {
+ buildInputs = [ kdelibs libmusicbrainz ];
+ meta = {
+ description = "KDE CD player";
+ };
+}
diff --git a/pkgs/desktops/kde-4.12/kdemultimedia/libkcddb.nix b/pkgs/desktops/kde-4.12/kdemultimedia/libkcddb.nix
new file mode 100644
index 00000000000..720b01d1861
--- /dev/null
+++ b/pkgs/desktops/kde-4.12/kdemultimedia/libkcddb.nix
@@ -0,0 +1,8 @@
+{ kde, kdelibs }:
+kde {
+#todo: libmusicbrainz5
+ buildInputs = [ kdelibs ];
+ meta = {
+ description = "a library used to retrieve audio CD meta data from the internet";
+ };
+}
diff --git a/pkgs/desktops/kde-4.12/kdemultimedia/libkcompactdisc.nix b/pkgs/desktops/kde-4.12/kdemultimedia/libkcompactdisc.nix
new file mode 100644
index 00000000000..6ed08af89f3
--- /dev/null
+++ b/pkgs/desktops/kde-4.12/kdemultimedia/libkcompactdisc.nix
@@ -0,0 +1,7 @@
+{ kde, kdelibs }:
+kde {
+ buildInputs = [ kdelibs ];
+ meta = {
+ description = "KDE library for playing & ripping CDs";
+ };
+}
diff --git a/pkgs/desktops/kde-4.12/kdemultimedia/mplayerthumbs.nix b/pkgs/desktops/kde-4.12/kdemultimedia/mplayerthumbs.nix
new file mode 100644
index 00000000000..c88ebcc2a5a
--- /dev/null
+++ b/pkgs/desktops/kde-4.12/kdemultimedia/mplayerthumbs.nix
@@ -0,0 +1,7 @@
+{ kde, kdelibs }:
+kde {
+ buildInputs = [ kdelibs ];
+ meta = {
+ description = "a video thumbnail generator for KDE";
+ };
+}
diff --git a/pkgs/desktops/kde-4.12/kdenetwork/kdenetwork-filesharing.nix b/pkgs/desktops/kde-4.12/kdenetwork/kdenetwork-filesharing.nix
new file mode 100644
index 00000000000..0330511a258
--- /dev/null
+++ b/pkgs/desktops/kde-4.12/kdenetwork/kdenetwork-filesharing.nix
@@ -0,0 +1,9 @@
+{ kde, kdelibs }:
+
+kde {
+ buildInputs = [ kdelibs ];
+
+ meta = {
+ description = "KDE properties dialog plugin to share a directory with the local network";
+ };
+}
diff --git a/pkgs/desktops/kde-4.12/kdenetwork/kdenetwork-strigi-analyzers.nix b/pkgs/desktops/kde-4.12/kdenetwork/kdenetwork-strigi-analyzers.nix
new file mode 100644
index 00000000000..e838d84fc5e
--- /dev/null
+++ b/pkgs/desktops/kde-4.12/kdenetwork/kdenetwork-strigi-analyzers.nix
@@ -0,0 +1,9 @@
+{ kde, kdelibs, boost }:
+
+kde {
+ buildInputs = [ kdelibs boost ];
+
+ meta = {
+ description = "Strigi analyzers for various network protocols";
+ };
+}
diff --git a/pkgs/desktops/kde-4.12/kdenetwork/kdnssd.nix b/pkgs/desktops/kde-4.12/kdenetwork/kdnssd.nix
new file mode 100644
index 00000000000..f65960cc337
--- /dev/null
+++ b/pkgs/desktops/kde-4.12/kdenetwork/kdnssd.nix
@@ -0,0 +1,9 @@
+{ kde, kdelibs }:
+
+kde {
+ buildInputs = [ kdelibs ];
+
+ meta = {
+ description = "KDE tool that monitors the network for DNS-SD services";
+ };
+}
diff --git a/pkgs/desktops/kde-4.12/kdenetwork/kget.nix b/pkgs/desktops/kde-4.12/kdenetwork/kget.nix
new file mode 100644
index 00000000000..f986da2de21
--- /dev/null
+++ b/pkgs/desktops/kde-4.12/kdenetwork/kget.nix
@@ -0,0 +1,20 @@
+{ kde, kdelibs, libktorrent, kde_workspace, sqlite, boost
+, kde_baseapps, libmms, qca2, nepomuk_core, nepomuk_widgets
+, pkgconfig }:
+
+kde {
+
+# TODO: QGpgME
+
+ buildInputs =
+ [ kdelibs libktorrent nepomuk_core nepomuk_widgets sqlite qca2
+ libmms kde_baseapps kde_workspace boost ];
+
+ nativeBuildInputs = [ pkgconfig ];
+
+ KDEDIRS = libktorrent;
+
+ meta = {
+ description = "KDE download manager";
+ };
+}
diff --git a/pkgs/desktops/kde-4.12/kdenetwork/kopete.nix b/pkgs/desktops/kde-4.12/kdenetwork/kopete.nix
new file mode 100644
index 00000000000..7d8aec21ce6
--- /dev/null
+++ b/pkgs/desktops/kde-4.12/kdenetwork/kopete.nix
@@ -0,0 +1,26 @@
+{ kde, kdelibs, libmsn, libotr, kdepimlibs, qimageblitz, libktorrent,
+ jasper, libidn, mediastreamer, pkgconfig, libxslt, giflib,
+ libgadu, boost, qca2, sqlite, jsoncpp,
+ ortp, srtp, libv4l }:
+
+kde {
+
+# TODO: libmeanwhile, xmms, jsoncpp(not found), kleopatra(from kdepim but doesn't install headers?),
+
+ buildInputs = [
+ kdelibs qca2 mediastreamer libgadu jsoncpp
+ kdepimlibs qimageblitz sqlite jasper libotr libmsn giflib
+ libidn libxslt boost
+ ortp srtp libv4l
+ ];
+
+ nativeBuildInputs = [ pkgconfig ];
+
+ KDEDIRS = libktorrent;
+
+ cmakeFlags = [ "-DBUILD_skypebuttons=TRUE" ];
+
+ meta = {
+ description = "A KDE multi-protocol IM client";
+ };
+}
diff --git a/pkgs/desktops/kde-4.12/kdenetwork/kppp.nix b/pkgs/desktops/kde-4.12/kdenetwork/kppp.nix
new file mode 100644
index 00000000000..4c6bd65769f
--- /dev/null
+++ b/pkgs/desktops/kde-4.12/kdenetwork/kppp.nix
@@ -0,0 +1,9 @@
+{ kde, kdelibs }:
+
+kde {
+ buildInputs = [ kdelibs ];
+
+ meta = {
+ description = "PPP(Dial-Up) client tool";
+ };
+}
diff --git a/pkgs/desktops/kde-4.12/kdenetwork/krdc.nix b/pkgs/desktops/kde-4.12/kdenetwork/krdc.nix
new file mode 100644
index 00000000000..80557e827fe
--- /dev/null
+++ b/pkgs/desktops/kde-4.12/kdenetwork/krdc.nix
@@ -0,0 +1,9 @@
+{ kde, kdelibs, libvncserver, freerdp, telepathy_qt }:
+
+kde {
+ buildInputs = [ kdelibs libvncserver freerdp telepathy_qt ];
+
+ meta = {
+ description = "KDE remote desktop client";
+ };
+}
diff --git a/pkgs/desktops/kde-4.12/kdenetwork/krfb.nix b/pkgs/desktops/kde-4.12/kdenetwork/krfb.nix
new file mode 100644
index 00000000000..cb4857965a3
--- /dev/null
+++ b/pkgs/desktops/kde-4.12/kdenetwork/krfb.nix
@@ -0,0 +1,9 @@
+{ kde, kdelibs, libvncserver, libXdamage, libXtst, libjpeg, telepathy_qt }:
+
+kde {
+ buildInputs = [ kdelibs libvncserver libXdamage libXtst libjpeg telepathy_qt ];
+
+ meta = {
+ description = "KDE desktop sharing";
+ };
+}
diff --git a/pkgs/desktops/kde-4.12/kdepim-runtime.nix b/pkgs/desktops/kde-4.12/kdepim-runtime.nix
new file mode 100644
index 00000000000..d92e2254820
--- /dev/null
+++ b/pkgs/desktops/kde-4.12/kdepim-runtime.nix
@@ -0,0 +1,16 @@
+{ kde, libxslt, boost, kdepimlibs, akonadi, shared_desktop_ontologies }:
+
+kde {
+
+# TODO: libkgapi(2), LibKFbAPI,libkolab, libkolabxml
+
+ buildInputs = [
+ kdepimlibs akonadi boost shared_desktop_ontologies
+ libxslt
+ ];
+
+ meta = {
+ description = "KDE PIM runtime";
+ license = "GPL";
+ };
+}
diff --git a/pkgs/desktops/kde-4.12/kdepim.nix b/pkgs/desktops/kde-4.12/kdepim.nix
new file mode 100644
index 00000000000..4f364648d23
--- /dev/null
+++ b/pkgs/desktops/kde-4.12/kdepim.nix
@@ -0,0 +1,28 @@
+{ kde, boost, gpgme, libassuan, libxslt, kdepimlibs, kdepim_runtime
+, akonadi, shared_desktop_ontologies, cyrus_sasl, grantlee, prison
+, nepomuk_widgets, kactivities, libXScrnSaver, qjson
+, pkgconfig }:
+
+kde {
+
+# TODO: LinkGrammar
+
+ buildInputs =
+ [ kdepimlibs boost shared_desktop_ontologies akonadi nepomuk_widgets
+ libxslt cyrus_sasl gpgme libassuan grantlee prison kactivities
+ libXScrnSaver qjson
+ ];
+
+ nativeBuildInputs = [ pkgconfig ];
+
+ passthru.propagatedUserEnvPackages = [ akonadi kdepimlibs kdepim_runtime ];
+
+ meta = {
+ description = "KDE PIM tools";
+ longDescription = ''
+ Contains various personal information management tools for KDE, such as an organizer.
+ '';
+ license = "GPL";
+ homepage = http://pim.kde.org;
+ };
+}
diff --git a/pkgs/desktops/kde-4.12/kdepimlibs.nix b/pkgs/desktops/kde-4.12/kdepimlibs.nix
new file mode 100644
index 00000000000..ca0af9400b1
--- /dev/null
+++ b/pkgs/desktops/kde-4.12/kdepimlibs.nix
@@ -0,0 +1,19 @@
+{ kde, pkgconfig, boost, cyrus_sasl, gpgme, libical, openldap, prison
+, kdelibs, akonadi, libxslt, nepomuk_core
+, shared_desktop_ontologies, qjson }:
+
+kde {
+ nativeBuildInputs = [ pkgconfig ];
+
+ buildInputs =
+ [ boost gpgme libical libxslt qjson prison
+ openldap cyrus_sasl akonadi shared_desktop_ontologies
+ ];
+
+ propagatedBuildInputs = [ kdelibs nepomuk_core ];
+
+ meta = {
+ description = "KDE PIM libraries";
+ license = "LGPL";
+ };
+}
diff --git a/pkgs/desktops/kde-4.12/kdeplasma-addons.nix b/pkgs/desktops/kde-4.12/kdeplasma-addons.nix
new file mode 100644
index 00000000000..550099830d9
--- /dev/null
+++ b/pkgs/desktops/kde-4.12/kdeplasma-addons.nix
@@ -0,0 +1,23 @@
+{ kde, kdelibs, marble, shared_desktop_ontologies, pkgconfig
+, boost, eigen, kde_workspace, attica, qca2, qimageblitz
+, kdepimlibs, libkexiv2, libqalculate, libXtst, libdbusmenu_qt
+, qjson, qoauth }:
+
+kde {
+
+# TODO: qwt, scim, ibus
+
+ KDEDIRS=marble;
+
+ buildInputs = [ kdelibs boost kde_workspace kdepimlibs attica qjson qoauth
+ eigen qca2 libXtst qimageblitz libqalculate
+ shared_desktop_ontologies marble libkexiv2 libdbusmenu_qt
+ ];
+
+ nativeBuildInputs = [ pkgconfig ];
+
+ meta = {
+ description = "KDE Plasma Addons";
+ license = "GPL";
+ };
+}
diff --git a/pkgs/desktops/kde-4.12/kdesdk/cervisia.nix b/pkgs/desktops/kde-4.12/kdesdk/cervisia.nix
new file mode 100644
index 00000000000..1dabe46cd42
--- /dev/null
+++ b/pkgs/desktops/kde-4.12/kdesdk/cervisia.nix
@@ -0,0 +1,9 @@
+{ kde, kdelibs }:
+
+kde {
+ buildInputs = [ kdelibs ];
+
+ meta = {
+ description = "A KDE CVS frontend";
+ };
+}
diff --git a/pkgs/desktops/kde-4.12/kdesdk/dolphin-plugins.nix b/pkgs/desktops/kde-4.12/kdesdk/dolphin-plugins.nix
new file mode 100644
index 00000000000..ad8132a850e
--- /dev/null
+++ b/pkgs/desktops/kde-4.12/kdesdk/dolphin-plugins.nix
@@ -0,0 +1,11 @@
+{ kde, kdelibs, kde_baseapps }:
+
+kde {
+
+ # Needs kdebase for libkonq
+ buildInputs = [ kdelibs kde_baseapps ];
+
+ meta = {
+ description = "Svn, mercurial, git and bazaar plugins for dolphin";
+ };
+}
diff --git a/pkgs/desktops/kde-4.12/kdesdk/kapptemplate.nix b/pkgs/desktops/kde-4.12/kdesdk/kapptemplate.nix
new file mode 100644
index 00000000000..391536248dd
--- /dev/null
+++ b/pkgs/desktops/kde-4.12/kdesdk/kapptemplate.nix
@@ -0,0 +1,9 @@
+{ kde, kdelibs }:
+
+kde {
+ buildInputs = [ kdelibs ];
+
+ meta = {
+ description = "A KDE 4 project template generator";
+ };
+}
diff --git a/pkgs/desktops/kde-4.12/kdesdk/kcachegrind.nix b/pkgs/desktops/kde-4.12/kdesdk/kcachegrind.nix
new file mode 100644
index 00000000000..65d410cca48
--- /dev/null
+++ b/pkgs/desktops/kde-4.12/kdesdk/kcachegrind.nix
@@ -0,0 +1,9 @@
+{ kde, kdelibs }:
+
+kde {
+ buildInputs = [ kdelibs ];
+
+ meta = {
+ description = "KDE Frontend for Callgrind/Cachegrind";
+ };
+}
diff --git a/pkgs/desktops/kde-4.12/kdesdk/kde-dev-scripts.nix b/pkgs/desktops/kde-4.12/kdesdk/kde-dev-scripts.nix
new file mode 100644
index 00000000000..df81145e5d6
--- /dev/null
+++ b/pkgs/desktops/kde-4.12/kdesdk/kde-dev-scripts.nix
@@ -0,0 +1,9 @@
+{ kde, kdelibs }:
+
+kde {
+ buildInputs = [ kdelibs ];
+
+ meta = {
+ description = "Various scripts to ease KDE development";
+ };
+}
diff --git a/pkgs/desktops/kde-4.12/kdesdk/kde-dev-utils.nix b/pkgs/desktops/kde-4.12/kdesdk/kde-dev-utils.nix
new file mode 100644
index 00000000000..215c0a3c613
--- /dev/null
+++ b/pkgs/desktops/kde-4.12/kdesdk/kde-dev-utils.nix
@@ -0,0 +1,11 @@
+{ kde, kdelibs, gcc, libtool }:
+
+kde {
+ buildInputs = [ kdelibs libtool ];
+
+ preConfigure = "export CMAKE_PREFIX_PATH=$CMAKE_PREFIX_PATH:${gcc}:${gcc.gcc}";
+
+ meta = {
+ description = "various KDE development utilities";
+ };
+}
diff --git a/pkgs/desktops/kde-4.12/kdesdk/kdesdk-kioslaves.nix b/pkgs/desktops/kde-4.12/kdesdk/kdesdk-kioslaves.nix
new file mode 100644
index 00000000000..98bbce35a97
--- /dev/null
+++ b/pkgs/desktops/kde-4.12/kdesdk/kdesdk-kioslaves.nix
@@ -0,0 +1,12 @@
+{ kde, kdelibs, subversionClient, apr, aprutil,perl }:
+
+kde {
+
+ buildInputs = [ kdelibs subversionClient apr aprutil perl ];
+
+ cmakeFlags = [ "-DBUILD_perldoc=ON" ];
+
+ meta = {
+ description = "Subversion and perldoc kioslaves";
+ };
+}
diff --git a/pkgs/desktops/kde-4.12/kdesdk/kdesdk-strigi-analyzers.nix b/pkgs/desktops/kde-4.12/kdesdk/kdesdk-strigi-analyzers.nix
new file mode 100644
index 00000000000..4d579b88ba8
--- /dev/null
+++ b/pkgs/desktops/kde-4.12/kdesdk/kdesdk-strigi-analyzers.nix
@@ -0,0 +1,9 @@
+{ kde, kdelibs }:
+
+kde {
+ buildInputs = [ kdelibs ];
+
+ meta = {
+ description = "Strigi analyzers for diff, po and ts";
+ };
+}
diff --git a/pkgs/desktops/kde-4.12/kdesdk/kdesdk-thumbnailers.nix b/pkgs/desktops/kde-4.12/kdesdk/kdesdk-thumbnailers.nix
new file mode 100644
index 00000000000..d707fe9038f
--- /dev/null
+++ b/pkgs/desktops/kde-4.12/kdesdk/kdesdk-thumbnailers.nix
@@ -0,0 +1,10 @@
+{ kde, kdelibs, gettext }:
+
+kde {
+
+ buildInputs = [ kdelibs gettext ];
+
+ meta = {
+ description = "PO file format thumbnailer";
+ };
+}
diff --git a/pkgs/desktops/kde-4.12/kdesdk/kompare.nix b/pkgs/desktops/kde-4.12/kdesdk/kompare.nix
new file mode 100644
index 00000000000..644c7c48dc9
--- /dev/null
+++ b/pkgs/desktops/kde-4.12/kdesdk/kompare.nix
@@ -0,0 +1,9 @@
+{ kde, kdelibs, libkomparediff2 }:
+
+kde {
+ buildInputs = [ kdelibs libkomparediff2 ];
+
+ meta = {
+ description = "A program to view the differences between files and optionally generate a diff";
+ };
+}
diff --git a/pkgs/desktops/kde-4.12/kdesdk/libkomparediff2.nix b/pkgs/desktops/kde-4.12/kdesdk/libkomparediff2.nix
new file mode 100644
index 00000000000..5933682c70a
--- /dev/null
+++ b/pkgs/desktops/kde-4.12/kdesdk/libkomparediff2.nix
@@ -0,0 +1,9 @@
+{ kde, kdelibs }:
+
+kde {
+ buildInputs = [ kdelibs ];
+
+ meta = {
+ description = "A library to compare files and strings";
+ };
+}
diff --git a/pkgs/desktops/kde-4.12/kdesdk/lokalize.nix b/pkgs/desktops/kde-4.12/kdesdk/lokalize.nix
new file mode 100644
index 00000000000..1565426eb1f
--- /dev/null
+++ b/pkgs/desktops/kde-4.12/kdesdk/lokalize.nix
@@ -0,0 +1,13 @@
+{ kde, kdelibs, hunspell }:
+
+kde {
+ buildInputs = [ kdelibs hunspell ];
+
+ meta = {
+ description = "KDE 4 Computer-aided translation system";
+ longDescription = ''
+ Computer-aided translation system.
+ Do not translate what had already been translated.
+ '';
+ };
+}
diff --git a/pkgs/desktops/kde-4.12/kdesdk/okteta.nix b/pkgs/desktops/kde-4.12/kdesdk/okteta.nix
new file mode 100644
index 00000000000..058636596ad
--- /dev/null
+++ b/pkgs/desktops/kde-4.12/kdesdk/okteta.nix
@@ -0,0 +1,13 @@
+{ kde, kdelibs, qca2 }:
+
+kde {
+ buildInputs = [ kdelibs qca2 ];
+
+# TODO: Look what does -DBUILD_mobile add
+
+ enableParallelBuilding = false;
+
+ meta = {
+ description = "KDE byte editor";
+ };
+}
diff --git a/pkgs/desktops/kde-4.12/kdesdk/poxml.nix b/pkgs/desktops/kde-4.12/kdesdk/poxml.nix
new file mode 100644
index 00000000000..6e46c3e3ab4
--- /dev/null
+++ b/pkgs/desktops/kde-4.12/kdesdk/poxml.nix
@@ -0,0 +1,9 @@
+{ kde, kdelibs, antlr, gettext }:
+
+kde {
+ buildInputs = [ kdelibs antlr gettext ];
+
+ meta = {
+ description = "Po<->xml tools";
+ };
+}
diff --git a/pkgs/desktops/kde-4.12/kdesdk/umbrello.nix b/pkgs/desktops/kde-4.12/kdesdk/umbrello.nix
new file mode 100644
index 00000000000..e83a2d9a901
--- /dev/null
+++ b/pkgs/desktops/kde-4.12/kdesdk/umbrello.nix
@@ -0,0 +1,9 @@
+{ kde, kdelibs, libxml2, libxslt, boost }:
+
+kde {
+ buildInputs = [ kdelibs libxml2 libxslt boost ];
+
+ meta = {
+ description = "Umbrello UML modeller";
+ };
+}
diff --git a/pkgs/desktops/kde-4.12/kdetoys/amor.nix b/pkgs/desktops/kde-4.12/kdetoys/amor.nix
new file mode 100644
index 00000000000..936d63d544a
--- /dev/null
+++ b/pkgs/desktops/kde-4.12/kdetoys/amor.nix
@@ -0,0 +1,9 @@
+{ kde, kdelibs }:
+
+kde {
+ buildInputs = [ kdelibs ];
+
+ meta = {
+ description = "KDE creature for your desktop";
+ };
+}
diff --git a/pkgs/desktops/kde-4.12/kdetoys/kteatime.nix b/pkgs/desktops/kde-4.12/kdetoys/kteatime.nix
new file mode 100644
index 00000000000..dacf54def4b
--- /dev/null
+++ b/pkgs/desktops/kde-4.12/kdetoys/kteatime.nix
@@ -0,0 +1,9 @@
+{ kde, kdelibs }:
+
+kde {
+ buildInputs = [ kdelibs ];
+
+ meta = {
+ description = "KDE utility for making a fine cup of tea";
+ };
+}
diff --git a/pkgs/desktops/kde-4.12/kdetoys/ktux.nix b/pkgs/desktops/kde-4.12/kdetoys/ktux.nix
new file mode 100644
index 00000000000..108f9be7c72
--- /dev/null
+++ b/pkgs/desktops/kde-4.12/kdetoys/ktux.nix
@@ -0,0 +1,9 @@
+{ kde, kdelibs, kde_workspace }:
+
+kde {
+ buildInputs = [ kdelibs kde_workspace ];
+
+ meta = {
+ description = "Tux Screen Saver";
+ };
+}
diff --git a/pkgs/desktops/kde-4.12/kdeutils/ark.nix b/pkgs/desktops/kde-4.12/kdeutils/ark.nix
new file mode 100644
index 00000000000..eb3e12281d6
--- /dev/null
+++ b/pkgs/desktops/kde-4.12/kdeutils/ark.nix
@@ -0,0 +1,9 @@
+{ kde, kdelibs, libarchive, bzip2, kde_baseapps, lzma, qjson }:
+
+kde {
+ buildInputs = [ kdelibs kde_baseapps libarchive bzip2 lzma qjson ];
+
+ meta = {
+ description = "KDE Archiving Tool";
+ };
+}
diff --git a/pkgs/desktops/kde-4.12/kdeutils/filelight.nix b/pkgs/desktops/kde-4.12/kdeutils/filelight.nix
new file mode 100644
index 00000000000..25ecabed27c
--- /dev/null
+++ b/pkgs/desktops/kde-4.12/kdeutils/filelight.nix
@@ -0,0 +1,9 @@
+{ kde, kdelibs }:
+
+kde {
+ buildInputs = [ kdelibs ];
+
+ meta = {
+ description = "Tool to visualise file and directory sizes";
+ };
+}
diff --git a/pkgs/desktops/kde-4.12/kdeutils/kcalc.nix b/pkgs/desktops/kde-4.12/kdeutils/kcalc.nix
new file mode 100644
index 00000000000..08b202e8f0e
--- /dev/null
+++ b/pkgs/desktops/kde-4.12/kdeutils/kcalc.nix
@@ -0,0 +1,9 @@
+{ kde, kdelibs, gmp }:
+
+kde {
+ buildInputs = [ kdelibs gmp ];
+
+ meta = {
+ description = "KDE Calculator";
+ };
+}
diff --git a/pkgs/desktops/kde-4.12/kdeutils/kcharselect.nix b/pkgs/desktops/kde-4.12/kdeutils/kcharselect.nix
new file mode 100644
index 00000000000..d4c9c06f483
--- /dev/null
+++ b/pkgs/desktops/kde-4.12/kdeutils/kcharselect.nix
@@ -0,0 +1,9 @@
+{ kde, kdelibs }:
+
+kde {
+ buildInputs = [ kdelibs ];
+
+ meta = {
+ description = "KDE character selection utility";
+ };
+}
diff --git a/pkgs/desktops/kde-4.12/kdeutils/kdf.nix b/pkgs/desktops/kde-4.12/kdeutils/kdf.nix
new file mode 100644
index 00000000000..3f9da58d0a6
--- /dev/null
+++ b/pkgs/desktops/kde-4.12/kdeutils/kdf.nix
@@ -0,0 +1,9 @@
+{ kde, kdelibs }:
+
+kde {
+ buildInputs = [ kdelibs ];
+
+ meta = {
+ description = "KDE free disk space utility";
+ };
+}
diff --git a/pkgs/desktops/kde-4.12/kdeutils/kfloppy.nix b/pkgs/desktops/kde-4.12/kdeutils/kfloppy.nix
new file mode 100644
index 00000000000..2434a4fa671
--- /dev/null
+++ b/pkgs/desktops/kde-4.12/kdeutils/kfloppy.nix
@@ -0,0 +1,9 @@
+{ kde, kdelibs }:
+
+kde {
+ buildInputs = [ kdelibs ];
+
+ meta = {
+ description = "Floppy disk formatting utility";
+ };
+}
diff --git a/pkgs/desktops/kde-4.12/kdeutils/kgpg.nix b/pkgs/desktops/kde-4.12/kdeutils/kgpg.nix
new file mode 100644
index 00000000000..3ff1a286ae5
--- /dev/null
+++ b/pkgs/desktops/kde-4.12/kdeutils/kgpg.nix
@@ -0,0 +1,10 @@
+{ kde, kdelibs, kdepimlibs, boost }:
+
+kde {
+
+ buildInputs = [ kdelibs kdepimlibs boost ];
+
+ meta = {
+ description = "Simple KDE GUI for GPG";
+ };
+}
diff --git a/pkgs/desktops/kde-4.12/kdeutils/kremotecontrol.nix b/pkgs/desktops/kde-4.12/kdeutils/kremotecontrol.nix
new file mode 100644
index 00000000000..70311a789f9
--- /dev/null
+++ b/pkgs/desktops/kde-4.12/kdeutils/kremotecontrol.nix
@@ -0,0 +1,9 @@
+{ kde, kdelibs, libXtst }:
+
+kde {
+ buildInputs = [ kdelibs libXtst ];
+
+ meta = {
+ description = "KDE remote control";
+ };
+}
diff --git a/pkgs/desktops/kde-4.12/kdeutils/ktimer.nix b/pkgs/desktops/kde-4.12/kdeutils/ktimer.nix
new file mode 100644
index 00000000000..5700977349e
--- /dev/null
+++ b/pkgs/desktops/kde-4.12/kdeutils/ktimer.nix
@@ -0,0 +1,9 @@
+{ kde, kdelibs }:
+
+kde {
+ buildInputs = [ kdelibs ];
+
+ meta = {
+ description = "KDE Timer";
+ };
+}
diff --git a/pkgs/desktops/kde-4.12/kdeutils/kwallet.nix b/pkgs/desktops/kde-4.12/kdeutils/kwallet.nix
new file mode 100644
index 00000000000..9ec0e6c0396
--- /dev/null
+++ b/pkgs/desktops/kde-4.12/kdeutils/kwallet.nix
@@ -0,0 +1,9 @@
+{ kde, kdelibs }:
+
+kde {
+ buildInputs = [ kdelibs ];
+
+ meta = {
+ description = "KDE Wallet (password storage) management tool";
+ };
+}
diff --git a/pkgs/desktops/kde-4.12/kdeutils/print-manager.nix b/pkgs/desktops/kde-4.12/kdeutils/print-manager.nix
new file mode 100644
index 00000000000..ae72becd1e4
--- /dev/null
+++ b/pkgs/desktops/kde-4.12/kdeutils/print-manager.nix
@@ -0,0 +1,27 @@
+{ kde, kdelibs
+, pythonPackages, cups, pyqt4, pykde4, pycups, system_config_printer }:
+
+let s_c_p = system_config_printer.override { withGUI = false; }; in
+
+kde rec {
+ buildInputs = [ kdelibs pythonPackages.python pythonPackages.wrapPython
+ ] ++ pythonPath;
+
+ pythonPath = [ cups pyqt4 pykde4 pycups s_c_p ];
+
+ passthru.propagatedUserEnvPackages = [ s_c_p ];
+
+ postInstall =
+ ''
+ wrapPythonPrograms
+
+ # "system-config-printer" supplies some D-Bus policy that we need.
+ mkdir -p $out/nix-support
+ echo ${s_c_p} > $out/nix-support/propagated-user-env-packages
+ '';
+
+ meta = {
+ description = "KDE printer manager";
+ longDescription = "Applet to view current print jobs and configure new printers";
+ };
+}
diff --git a/pkgs/desktops/kde-4.12/kdeutils/superkaramba.nix b/pkgs/desktops/kde-4.12/kdeutils/superkaramba.nix
new file mode 100644
index 00000000000..cbe7a285606
--- /dev/null
+++ b/pkgs/desktops/kde-4.12/kdeutils/superkaramba.nix
@@ -0,0 +1,11 @@
+{ kde, kdelibs, qimageblitz, python }:
+
+kde {
+ buildInputs = [ kdelibs qimageblitz python ];
+
+ cmakeFlags = [ "-DBUILD_icons=TRUE" "-DBUILD_plasma=TRUE" ];
+
+ meta = {
+ description = "A KDE Eye-candy Application";
+ };
+}
diff --git a/pkgs/desktops/kde-4.12/kdeutils/sweeper.nix b/pkgs/desktops/kde-4.12/kdeutils/sweeper.nix
new file mode 100644
index 00000000000..78d56c7df30
--- /dev/null
+++ b/pkgs/desktops/kde-4.12/kdeutils/sweeper.nix
@@ -0,0 +1,9 @@
+{ kde, kdelibs }:
+
+kde {
+ buildInputs = [ kdelibs ];
+
+ meta = {
+ description = "Helps clean unwanted traces the user leaves on the system";
+ };
+}
diff --git a/pkgs/desktops/kde-4.12/kdewebdev/kfilereplace.nix b/pkgs/desktops/kde-4.12/kdewebdev/kfilereplace.nix
new file mode 100644
index 00000000000..55e37809e07
--- /dev/null
+++ b/pkgs/desktops/kde-4.12/kdewebdev/kfilereplace.nix
@@ -0,0 +1,10 @@
+{ kde, kdelibs }:
+
+kde {
+ buildInputs = [ kdelibs ];
+
+ meta = {
+ description = "Batch search and replace tool";
+ homepage = http://www.kdewebdev.org;
+ };
+}
diff --git a/pkgs/desktops/kde-4.12/kdewebdev/kimagemapeditor.nix b/pkgs/desktops/kde-4.12/kdewebdev/kimagemapeditor.nix
new file mode 100644
index 00000000000..6d22f72461f
--- /dev/null
+++ b/pkgs/desktops/kde-4.12/kdewebdev/kimagemapeditor.nix
@@ -0,0 +1,10 @@
+{ kde, kdelibs }:
+
+kde {
+ buildInputs = [ kdelibs ];
+
+ meta = {
+ description = "An HTML imagemap editor";
+ homepage = http://www.nongnu.org/kimagemap/;
+ };
+}
diff --git a/pkgs/desktops/kde-4.12/kdewebdev/klinkstatus.nix b/pkgs/desktops/kde-4.12/kdewebdev/klinkstatus.nix
new file mode 100644
index 00000000000..918512e2b2d
--- /dev/null
+++ b/pkgs/desktops/kde-4.12/kdewebdev/klinkstatus.nix
@@ -0,0 +1,13 @@
+{ kde, kdelibs, libxml2, libxslt, kdepimlibs, htmlTidy, boost }:
+
+kde {
+
+# todo: ruby19 is not found by the build system. not linking against ruby18 due to it being too old
+
+ buildInputs = [ kdelibs kdepimlibs htmlTidy boost ];
+
+ meta = {
+ description = "A KDE link checker";
+ homepage = http://klinkstatus.kdewebdev.org;
+ };
+}
diff --git a/pkgs/desktops/kde-4.12/kdewebdev/kommander.nix b/pkgs/desktops/kde-4.12/kdewebdev/kommander.nix
new file mode 100644
index 00000000000..d5f4337f714
--- /dev/null
+++ b/pkgs/desktops/kde-4.12/kdewebdev/kommander.nix
@@ -0,0 +1,9 @@
+{ kde, kdelibs }:
+
+kde {
+ buildInputs = [ kdelibs ];
+
+ meta = {
+ description = "A graphical editor of scripted dialogs";
+ };
+}
diff --git a/pkgs/desktops/kde-4.12/l10n/default.nix b/pkgs/desktops/kde-4.12/l10n/default.nix
new file mode 100644
index 00000000000..c9fab80bffb
--- /dev/null
+++ b/pkgs/desktops/kde-4.12/l10n/default.nix
@@ -0,0 +1,45 @@
+{ stdenv, fetchurl, kdelibs, gettext, release, stable }:
+
+let
+
+ inherit (stdenv.lib) attrByPath singleton;
+
+ kdeL10nDerivation =
+ { lang, saneName, sha256 }:
+
+ stdenv.mkDerivation rec {
+ name = "kde-l10n-${saneName}-${release}";
+
+ src = fetchurl {
+ url = "mirror://kde/${if stable then "" else "un"}stable/${release}/src/kde-l10n/kde-l10n-${lang}-${release}.tar.xz";
+ name = "${name}.tar.xz";
+ inherit sha256;
+ };
+
+ buildInputs = [ gettext kdelibs ];
+
+ cmakeFlags = "-Wno-dev";
+
+ meta = {
+ description = "KDE translation for ${lang}";
+ license = "GPL";
+ platforms = stdenv.lib.platforms.linux;
+ inherit (kdelibs.meta) maintainers homepage;
+ };
+ };
+
+ kdeL10nRelease =
+ builtins.listToAttrs (
+ map ({lang, saneName, sha256}:
+ {
+ name = saneName;
+ value = kdeL10nDerivation { inherit lang saneName sha256; };
+ }
+ ) (import (./manifest + "-${release}.nix"))
+ );
+
+in
+{
+ inherit kdeL10nDerivation;
+ recurseForDerivations = true;
+} // kdeL10nRelease
diff --git a/pkgs/desktops/kde-4.12/l10n/l10n-manifest.sh b/pkgs/desktops/kde-4.12/l10n/l10n-manifest.sh
new file mode 100755
index 00000000000..ec159a1e204
--- /dev/null
+++ b/pkgs/desktops/kde-4.12/l10n/l10n-manifest.sh
@@ -0,0 +1,32 @@
+#!/bin/sh
+
+# Usage: download kde-l10n to $dir, then run
+# $0 $dir
+
+dir=$1
+
+if [[ ! -d "${dir}" ]]; then
+ echo "${dir} is not a directory (or doesn't exist)!" >&2
+ exit 1
+fi
+
+release=$(ls "${dir}"/kde-l10n-en_GB-*.tar.xz | \
+ sed -e 's/.*en_GB-//' -e 's/\.tar\.xz//')
+
+echo "Detected release ${release}" >&2
+
+exec > "manifest-${release}.nix"
+echo "["
+for i in `cd "${dir}"; ls kde-l10n-*-${release}.tar.xz`; do
+ lang=${i%-${release}.tar.xz}
+ lang=${lang#kde-l10n-}
+ echo -n "${lang}.. " >&2
+ hash=$(nix-hash --type sha256 --flat --base32 "${dir}/${i}")
+ echo "{"
+ echo " lang = \"${lang}\";"
+ echo " saneName = \"$(echo $lang | sed s^@^_^g)\";"
+ echo " sha256 = \"${hash}\";"
+ echo "}"
+ echo $hash >&2
+done
+echo "]"
diff --git a/pkgs/desktops/kde-4.12/l10n/manifest-4.12.2.nix b/pkgs/desktops/kde-4.12/l10n/manifest-4.12.2.nix
new file mode 100644
index 00000000000..9040e7006fb
--- /dev/null
+++ b/pkgs/desktops/kde-4.12/l10n/manifest-4.12.2.nix
@@ -0,0 +1,262 @@
+[
+{
+ lang = "ar";
+ saneName = "ar";
+ sha256 = "1y740kbf2dl9mvfnd7lsxc8vzxz4a7i0xxsmq78dmclid6ard3pk";
+}
+{
+ lang = "bg";
+ saneName = "bg";
+ sha256 = "1gdyplprirglmkiwxy5kv9p7zjzb4vx7za7hvs0swmi7whlx6ff2";
+}
+{
+ lang = "bs";
+ saneName = "bs";
+ sha256 = "115prvyvg5pg8ya901iwrphxih5nbrimq3awmnr4fylwvjghcxxx";
+}
+{
+ lang = "ca";
+ saneName = "ca";
+ sha256 = "0chf5kay9k810hqih18ya2dj8xzhdqqn6bj28r1gf1dwz0f8h4jb";
+}
+{
+ lang = "ca@valencia";
+ saneName = "ca_valencia";
+ sha256 = "0svgfginqjpspz556z3vsn3ldcp32fv0q4jjc8mllc9fq45331h5";
+}
+{
+ lang = "cs";
+ saneName = "cs";
+ sha256 = "0bs5pmrvgn59ff6s7a6j17xc4gjwbydklbcinfz22mjni1kl2blc";
+}
+{
+ lang = "da";
+ saneName = "da";
+ sha256 = "0z3nj26ajixvjm072ii86idd3xfflzraf7fgqyra89lzz47ahiar";
+}
+{
+ lang = "de";
+ saneName = "de";
+ sha256 = "0q7ilziqbrqs4khj91smqr88h1g8n662f1y2zh3nlm096x3gvz1n";
+}
+{
+ lang = "el";
+ saneName = "el";
+ sha256 = "0xgyi75985dz32f4q99vkfhhpx6186zknjl63xnca2603jxqcr4n";
+}
+{
+ lang = "en_GB";
+ saneName = "en_GB";
+ sha256 = "0bxg4hsixz35b2waxc5hpd4dqk5bny5j9szb8i1prdqsdhcgaqas";
+}
+{
+ lang = "es";
+ saneName = "es";
+ sha256 = "1qjipllcdc6an5vnza5bnyxaznbc9igvazrkxh9j0vpdv3g1fdgq";
+}
+{
+ lang = "et";
+ saneName = "et";
+ sha256 = "13gdhidd6qw60fdgbp73wbbb8n93maj7xf94p75mi1dzbd5i8xh8";
+}
+{
+ lang = "eu";
+ saneName = "eu";
+ sha256 = "0sbnbn6vpd66k3bb9k09vslxwqz1nb9rvaqiii8q1dkgx32fy5k6";
+}
+{
+ lang = "fi";
+ saneName = "fi";
+ sha256 = "021ylfbsvig3dq87z8f0n1hm589a2a0qymv5pkc0p43rf7bcp23n";
+}
+{
+ lang = "fr";
+ saneName = "fr";
+ sha256 = "1g175xmyphc60fi73bslnysn8sys1w65p8qhj7r52pb0ynvmg02r";
+}
+{
+ lang = "ga";
+ saneName = "ga";
+ sha256 = "13h7m9hq8rc1q1pl91253qvl69cda69lqkl4axass2l23ksfm9jr";
+}
+{
+ lang = "gl";
+ saneName = "gl";
+ sha256 = "0m6691cl3n63qznx8vb7z70yz57ll676pvplfwpvcd2nq3kc7863";
+}
+{
+ lang = "he";
+ saneName = "he";
+ sha256 = "1rxb03cdcz2cqiwwvwmilhcw36dq1b3dh1jhbjd22rkkxi6m6pl6";
+}
+{
+ lang = "hi";
+ saneName = "hi";
+ sha256 = "0ckdfqk49xqlr4pjl0kqcwg6c65lzv2hwvw83qyicaw5h8ga7rwk";
+}
+{
+ lang = "hr";
+ saneName = "hr";
+ sha256 = "1gc1ah58y5psd7v66qj1bl1yd47g36wnsdwnhz3m7hjrj87k1g7z";
+}
+{
+ lang = "hu";
+ saneName = "hu";
+ sha256 = "0kw87f4xv6zfa7xfhlpqv1fxdv8szzhb6vkmcih069h0q5s9sfxq";
+}
+{
+ lang = "ia";
+ saneName = "ia";
+ sha256 = "1izhms762vyw9ddik11dg7yg7mw3684ywp4m1648sc0jiq33p5vx";
+}
+{
+ lang = "is";
+ saneName = "is";
+ sha256 = "12r9sv7p56ilan6s1cy30pdl60sx4pn4cic8xx3wyj97i44wwq8c";
+}
+{
+ lang = "it";
+ saneName = "it";
+ sha256 = "1jy0j92426ldlnhmfh76amgaxvrkpj97a75whi49a4ki79m9z4kk";
+}
+{
+ lang = "ja";
+ saneName = "ja";
+ sha256 = "0kh3vjdvb8jhdgq3r1lg7z6vvi1qlpgmnmm64w5mqv28fg4ycrzi";
+}
+{
+ lang = "kk";
+ saneName = "kk";
+ sha256 = "0cg1ffkh3r8h0fc0fl5qljc7y0y20ynvgp5j2mhzqnxihmdfskr9";
+}
+{
+ lang = "km";
+ saneName = "km";
+ sha256 = "1rzi4wcl9dhn10k3x3j69dmc6x44kwvfh5sx1fpgrdxd08h5ga9a";
+}
+{
+ lang = "ko";
+ saneName = "ko";
+ sha256 = "1dqdk94djpy46w3jskm85k4v0gr58p2vmm3swlp4xf0fzk32x0hh";
+}
+{
+ lang = "lt";
+ saneName = "lt";
+ sha256 = "0cjcj49m8c1ldr9zv8qbk9sni66vnlk640yyv765xqppccd4gg1y";
+}
+{
+ lang = "lv";
+ saneName = "lv";
+ sha256 = "1x3a609pbvrna5zbycmk45q4fx9ycqf514yr7wygh4prl49ah5fs";
+}
+{
+ lang = "mr";
+ saneName = "mr";
+ sha256 = "1n7nr438kc2g1hdbj2ysp24yybilcjzqan39571d6n7w6qpw6b5x";
+}
+{
+ lang = "nb";
+ saneName = "nb";
+ sha256 = "0hx59fv30bgfcmqaf9xiakcvl4x4ji7imlmnyfyk4h8dvf0hj7vw";
+}
+{
+ lang = "nds";
+ saneName = "nds";
+ sha256 = "1zs25srv7z8c6hcavcq0552iykz7psw3lr77zzjzwj6y734zsjir";
+}
+{
+ lang = "nl";
+ saneName = "nl";
+ sha256 = "105km17vk03g06kdxyi487dswd3bgq0l814wqcjd6kfdgzdi3q8n";
+}
+{
+ lang = "nn";
+ saneName = "nn";
+ sha256 = "08vb5vbmvsp7chanvmmh336lh583p5xyb71ifhin4l0zkbpcv0r7";
+}
+{
+ lang = "pa";
+ saneName = "pa";
+ sha256 = "1dhsn84ai9brdy60m3r7wk91liw2wp0vhq57jqb03dgv4nzgfshd";
+}
+{
+ lang = "pl";
+ saneName = "pl";
+ sha256 = "14jhhs5mxll2102aq1019sizjggyiiqb3wdi7hnljycry22qkim6";
+}
+{
+ lang = "pt";
+ saneName = "pt";
+ sha256 = "0bs6rjqqk4vzw06w2hqdj04yan1fcrk9lpf4bag9imdxpy2380nr";
+}
+{
+ lang = "pt_BR";
+ saneName = "pt_BR";
+ sha256 = "120ccxca131r1h48vycd5jd9644yqw1ad3nsy7g6i9vqga4ibpn4";
+}
+{
+ lang = "ro";
+ saneName = "ro";
+ sha256 = "0p1scqncdrm1njlqq5npkizrvypd37xf2wzg4jyfvl8ycbv2ssx0";
+}
+{
+ lang = "ru";
+ saneName = "ru";
+ sha256 = "0k1ldvcls8shga6faym6hkknj5dk8aivq50ikakj9mkj2spp09wr";
+}
+{
+ lang = "sk";
+ saneName = "sk";
+ sha256 = "1lxpb0szs4fmsgvl482sq93g7pmlwbjdysdsd3xqq36vqz7y2ba8";
+}
+{
+ lang = "sl";
+ saneName = "sl";
+ sha256 = "0n25sll8nmidv43sq2rblpg99469hc73ykhp9zblzz4662f3fsip";
+}
+{
+ lang = "sr";
+ saneName = "sr";
+ sha256 = "1cca06ij41k3n3kyaajidkffmxng03y816xvqki250w7sz23nf3v";
+}
+{
+ lang = "sv";
+ saneName = "sv";
+ sha256 = "1jnm8931ik8vld625hn0h7x46m2v7vwmdjn4g302lkprdccp309m";
+}
+{
+ lang = "tr";
+ saneName = "tr";
+ sha256 = "04r5w6zyl6nl056c0a3rfg1qh1bkjlliin42dla6qsma9qmzhm8s";
+}
+{
+ lang = "ug";
+ saneName = "ug";
+ sha256 = "1s16lh7w6xrcv7g4gnqs959h369inmv6sdnf1zr3ijz17zd0zhpl";
+}
+{
+ lang = "uk";
+ saneName = "uk";
+ sha256 = "0600600v4r7skqw0lmj917a8rx3mnaiky3k0ckiz58z1zwbqg5fa";
+}
+{
+ lang = "vi";
+ saneName = "vi";
+ sha256 = "0vyfg21xkzk0jr20bsw1x7wmij78razynn8nll96dadfikbmz0hb";
+}
+{
+ lang = "wa";
+ saneName = "wa";
+ sha256 = "1iryrrs1jp340nkx05452gxm8yrri89qjz240n9inl9crbha35w6";
+}
+{
+ lang = "zh_CN";
+ saneName = "zh_CN";
+ sha256 = "0xjfrlfv56g2hhzifg5l19szi7vb9x5gxvnid3apwrfs9b2lgrb3";
+}
+{
+ lang = "zh_TW";
+ saneName = "zh_TW";
+ sha256 = "0jlv40v2lwlmd4qss55vwbx72wr2ld3pjx0pd13da5afr5n1dcf3";
+}
+]
diff --git a/pkgs/desktops/kde-4.12/oxygen-icons.nix b/pkgs/desktops/kde-4.12/oxygen-icons.nix
new file mode 100644
index 00000000000..626948cb24d
--- /dev/null
+++ b/pkgs/desktops/kde-4.12/oxygen-icons.nix
@@ -0,0 +1,15 @@
+{ kde, cmake }:
+
+kde {
+ outputHashAlgo = "sha256";
+ outputHashMode = "recursive";
+ outputHash = "0i28c8iz83ian5mnci66jlrdkwiw09j0vxgfs74mc4wgbj5xns2f";
+
+ nativeBuildInputs = [ cmake ];
+
+ meta = {
+ description = "KDE Oxygen theme icons";
+ longDescription = "Icons for KDE's default theme";
+ license = "GPL";
+ };
+}
diff --git a/pkgs/desktops/kde-4.12/support/akonadi/default.nix b/pkgs/desktops/kde-4.12/support/akonadi/default.nix
new file mode 100644
index 00000000000..d51996e3bc1
--- /dev/null
+++ b/pkgs/desktops/kde-4.12/support/akonadi/default.nix
@@ -0,0 +1,24 @@
+{ stdenv, fetchurl, cmake, qt4, shared_mime_info, libxslt, boost, automoc4, soprano, sqlite }:
+
+stdenv.mkDerivation rec {
+ name = "akonadi-1.11.0";
+
+ src = fetchurl {
+ url = "mirror://kde/stable/akonadi/src/${name}.tar.bz2";
+ sha256 = "0k96i8xq3xkm5rrxrj3zqgppcmqbzcpc918xnx0p54jkkm85gchc";
+ };
+
+ buildInputs = [ qt4 soprano libxslt boost sqlite ];
+
+ nativeBuildInputs = [ cmake automoc4 shared_mime_info ];
+
+ enableParallelBuilding = true;
+
+ meta = with stdenv.lib; {
+ description = "KDE PIM Storage Service";
+ license = "LGPL";
+ homepage = http://pim.kde.org/akonadi;
+ maintainers = [ maintainers.sander maintainers.urkud maintainers.phreedom ];
+ platforms = platforms.linux;
+ };
+}
diff --git a/pkgs/development/compilers/idris/default.nix b/pkgs/development/compilers/idris/default.nix
index 10aa5ba4e07..a22c8bf7762 100644
--- a/pkgs/development/compilers/idris/default.nix
+++ b/pkgs/development/compilers/idris/default.nix
@@ -1,21 +1,23 @@
-{ cabal, ansiTerminal, ansiWlPprint, binary, boehmgc, Cabal
-, deepseq, filepath, gmp, happy, haskeline, languageJava, libffi
-, llvmGeneral, llvmGeneralPure, mtl, network, parsers, split, text
-, time, transformers, trifecta, unorderedContainers, utf8String
-, vector, vectorBinaryInstances, xml
+{ cabal, annotatedWlPprint, ansiTerminal, ansiWlPprint, binary
+, boehmgc, Cabal, deepseq, filepath, gmp, happy, haskeline
+, languageJava, libffi, llvmGeneral, llvmGeneralPure, mtl, network
+, parsers, split, text, time, transformers, trifecta
+, unorderedContainers, utf8String, vector, vectorBinaryInstances
+, xml, zlib
}:
cabal.mkDerivation (self: {
pname = "idris";
- version = "0.9.10.1";
- sha256 = "194gbpk8fy64maj9lcwj9hkbndc3287bh9mz2jm09vd11i23iyg1";
- isLibrary = false;
+ version = "0.9.11.2";
+ sha256 = "16xgiygn0j3kl3l36lnv6wz422nz2bvn3lk86xkdfvwjpv4630yn";
+ isLibrary = true;
isExecutable = true;
buildDepends = [
- ansiTerminal ansiWlPprint binary Cabal deepseq filepath haskeline
- languageJava libffi llvmGeneral llvmGeneralPure mtl network parsers
- split text time transformers trifecta unorderedContainers
- utf8String vector vectorBinaryInstances xml
+ annotatedWlPprint ansiTerminal ansiWlPprint binary Cabal deepseq
+ filepath haskeline languageJava libffi llvmGeneral llvmGeneralPure
+ mtl network parsers split text time transformers trifecta
+ unorderedContainers utf8String vector vectorBinaryInstances xml
+ zlib
];
buildTools = [ happy ];
extraLibraries = [ boehmgc gmp ];
diff --git a/pkgs/development/compilers/vala/default.nix b/pkgs/development/compilers/vala/default.nix
index 95c37edb09a..8cf5fb9afed 100644
--- a/pkgs/development/compilers/vala/default.nix
+++ b/pkgs/development/compilers/vala/default.nix
@@ -4,8 +4,8 @@
let
major = "0.23";
- minor = "1";
- sha256 = "1m8f2d01r4jqp266mk29qsl68lzh7c258cqd5zzbpbryxszlzdfj";
+ minor = "2";
+ sha256 = "0g22ss9qbm3fqhx4fxhsyfmdc5g1hgdw4dz9d37f4489kl0qf8pl";
in
stdenv.mkDerivation rec {
name = "vala-${major}.${minor}";
diff --git a/pkgs/development/interpreters/python/2.6/default.nix b/pkgs/development/interpreters/python/2.6/default.nix
index 7c6516fe668..0302513e6fc 100644
--- a/pkgs/development/interpreters/python/2.6/default.nix
+++ b/pkgs/development/interpreters/python/2.6/default.nix
@@ -1,5 +1,5 @@
{ stdenv, fetchurl, zlib ? null, zlibSupport ? true, bzip2
-, sqlite, tcl, tk, x11, openssl, readline, db45, ncurses, gdbm
+, sqlite, tcl, tk, x11, openssl, readline, db, ncurses, gdbm
}:
assert zlibSupport -> zlib != null;
@@ -146,7 +146,7 @@ let
bsddb = buildInternalPythonModule {
moduleName = "bsddb";
- deps = [ db45 ];
+ deps = [ db ];
};
crypt = buildInternalPythonModule {
diff --git a/pkgs/development/interpreters/python/2.7/default.nix b/pkgs/development/interpreters/python/2.7/default.nix
index 043094c0303..4897c0a5141 100644
--- a/pkgs/development/interpreters/python/2.7/default.nix
+++ b/pkgs/development/interpreters/python/2.7/default.nix
@@ -1,5 +1,5 @@
{ stdenv, fetchurl, zlib ? null, zlibSupport ? true, bzip2
-, sqlite, tcl, tk, x11, openssl, readline, db4, ncurses, gdbm, libX11 }:
+, sqlite, tcl, tk, x11, openssl, readline, db, ncurses, gdbm, libX11 }:
assert zlibSupport -> zlib != null;
@@ -156,7 +156,7 @@ let
bsddb = buildInternalPythonModule {
moduleName = "bsddb";
- deps = [ db4 ];
+ deps = [ db ];
};
curses = buildInternalPythonModule {
diff --git a/pkgs/development/interpreters/python/3.2/default.nix b/pkgs/development/interpreters/python/3.2/default.nix
index e09602e7381..03f2d392bd1 100644
--- a/pkgs/development/interpreters/python/3.2/default.nix
+++ b/pkgs/development/interpreters/python/3.2/default.nix
@@ -1,6 +1,6 @@
{ stdenv, fetchurl
, bzip2
-, db4
+, db
, gdbm
, libX11, xproto
, ncurses
@@ -20,7 +20,7 @@ let
version = "${majorVersion}.5";
buildInputs = filter (p: p != null) [
- zlib bzip2 gdbm sqlite db4 readline ncurses openssl tcl tk libX11 xproto
+ zlib bzip2 gdbm sqlite db readline ncurses openssl tcl tk libX11 xproto
];
in
stdenv.mkDerivation {
@@ -57,7 +57,7 @@ stdenv.mkDerivation {
passthru = {
zlibSupport = zlib != null;
sqliteSupport = sqlite != null;
- db4Support = db4 != null;
+ dbSupport = db != null;
readlineSupport = readline != null;
opensslSupport = openssl != null;
tkSupport = (tk != null) && (tcl != null) && (libX11 != null) && (xproto != null);
diff --git a/pkgs/development/interpreters/python/3.3/default.nix b/pkgs/development/interpreters/python/3.3/default.nix
index 84cb9dd141a..18af6487e55 100644
--- a/pkgs/development/interpreters/python/3.3/default.nix
+++ b/pkgs/development/interpreters/python/3.3/default.nix
@@ -1,6 +1,6 @@
{ stdenv, fetchurl
, bzip2
-, db4
+, db
, gdbm
, libX11, xproto
, ncurses
@@ -20,7 +20,7 @@ let
version = "${majorVersion}.3";
buildInputs = filter (p: p != null) [
- zlib bzip2 gdbm sqlite db4 readline ncurses openssl tcl tk libX11 xproto
+ zlib bzip2 gdbm sqlite db readline ncurses openssl tcl tk libX11 xproto
];
in
stdenv.mkDerivation {
@@ -57,7 +57,7 @@ stdenv.mkDerivation {
passthru = {
zlibSupport = zlib != null;
sqliteSupport = sqlite != null;
- db4Support = db4 != null;
+ dbSupport = db != null;
readlineSupport = readline != null;
opensslSupport = openssl != null;
tkSupport = (tk != null) && (tcl != null) && (libX11 != null) && (xproto != null);
diff --git a/pkgs/development/interpreters/python/python-linkme-wrapper.nix b/pkgs/development/interpreters/python/python-linkme-wrapper.nix
index 8d783a8c11e..040dd7531a2 100644
--- a/pkgs/development/interpreters/python/python-linkme-wrapper.nix
+++ b/pkgs/development/interpreters/python/python-linkme-wrapper.nix
@@ -10,4 +10,6 @@ stdenv.mkDerivation {
cat ${./python-linkme-wrapper.sh} > $out/bin/.python-linkme-wrapper
chmod +x $out/bin/.python-linkme-wrapper
'';
+
+ preferLocalBuild = true;
}
diff --git a/pkgs/development/libraries/apr-util/default.nix b/pkgs/development/libraries/apr-util/default.nix
index e2d72fc7d6b..229529f08ce 100644
--- a/pkgs/development/libraries/apr-util/default.nix
+++ b/pkgs/development/libraries/apr-util/default.nix
@@ -1,11 +1,11 @@
{ stdenv, fetchurl, makeWrapper, apr, expat, gnused
, sslSupport ? true, openssl
-, bdbSupport ? false, db4
+, bdbSupport ? false, db
, ldapSupport ? true, openldap
}:
assert sslSupport -> openssl != null;
-assert bdbSupport -> db4 != null;
+assert bdbSupport -> db != null;
assert ldapSupport -> openldap != null;
let
@@ -24,13 +24,13 @@ stdenv.mkDerivation rec {
--with-apr=${apr} --with-expat=${expat}
--with-crypto
${stdenv.lib.optionalString sslSupport "--with-openssl=${openssl}"}
- ${stdenv.lib.optionalString bdbSupport "--with-berkeley-db=${db4}"}
+ ${stdenv.lib.optionalString bdbSupport "--with-berkeley-db=${db}"}
${stdenv.lib.optionalString ldapSupport "--with-ldap"}
'';
propagatedBuildInputs = [ makeWrapper apr expat ]
++ optional sslSupport openssl
- ++ optional bdbSupport db4
+ ++ optional bdbSupport db
++ optional ldapSupport openldap;
# Give apr1 access to sed for runtime invocations
diff --git a/pkgs/development/libraries/boost/header-only-wrapper.nix b/pkgs/development/libraries/boost/header-only-wrapper.nix
index 6027ea5c393..96c9216a371 100644
--- a/pkgs/development/libraries/boost/header-only-wrapper.nix
+++ b/pkgs/development/libraries/boost/header-only-wrapper.nix
@@ -17,6 +17,8 @@ stdenv.mkDerivation {
tar xf $src -C $out/include --strip-components=1 ${pkgid}/boost
'';
+ preferLocalBuild = true;
+
meta = {
homepage = "http://boost.org/";
description = "Boost C++ Library Collection";
diff --git a/pkgs/development/libraries/cyrus-sasl/default.nix b/pkgs/development/libraries/cyrus-sasl/default.nix
index e90ec422661..712f05b8d65 100644
--- a/pkgs/development/libraries/cyrus-sasl/default.nix
+++ b/pkgs/development/libraries/cyrus-sasl/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, openssl, db4, gettext, pam }:
+{ stdenv, fetchurl, openssl, db, gettext, pam }:
stdenv.mkDerivation rec {
name = "cyrus-sasl-2.1.26";
@@ -8,7 +8,7 @@ stdenv.mkDerivation rec {
sha256 = "1hvvbcsg21nlncbgs0cgn3iwlnb3vannzwsp6rwvnn9ba4v53g4g";
};
- buildInputs = [ openssl db4 gettext ] ++ stdenv.lib.optional stdenv.isLinux pam;
+ buildInputs = [ openssl db gettext ] ++ stdenv.lib.optional stdenv.isLinux pam;
patches = [ ./missing-size_t.patch ]; # https://bugzilla.redhat.com/show_bug.cgi?id=906519
patchFlags = "-p0";
diff --git a/pkgs/development/libraries/db4/cygwin-4.4.patch b/pkgs/development/libraries/db/cygwin-4.4.patch
similarity index 100%
rename from pkgs/development/libraries/db4/cygwin-4.4.patch
rename to pkgs/development/libraries/db/cygwin-4.4.patch
diff --git a/pkgs/development/libraries/db4/cygwin-4.5.patch b/pkgs/development/libraries/db/cygwin-4.5.patch
similarity index 100%
rename from pkgs/development/libraries/db4/cygwin-4.5.patch
rename to pkgs/development/libraries/db/cygwin-4.5.patch
diff --git a/pkgs/development/libraries/db/db-4.4.nix b/pkgs/development/libraries/db/db-4.4.nix
new file mode 100644
index 00000000000..4a182353f25
--- /dev/null
+++ b/pkgs/development/libraries/db/db-4.4.nix
@@ -0,0 +1,7 @@
+{ stdenv, fetchurl, ... } @ args:
+
+import ./generic.nix (args // rec {
+ version = "4.4.20";
+ extraPatches = [ ./cygwin-4.4.patch ];
+ sha256 = "0y9vsq8dkarx1mhhip1vaciz6imbbyv37c1dm8b20l7p064bg2i9";
+})
diff --git a/pkgs/development/libraries/db/db-4.5.nix b/pkgs/development/libraries/db/db-4.5.nix
new file mode 100644
index 00000000000..6a0a921d8de
--- /dev/null
+++ b/pkgs/development/libraries/db/db-4.5.nix
@@ -0,0 +1,7 @@
+{ stdenv, fetchurl, ... } @ args:
+
+import ./generic.nix (args // rec {
+ version = "4.5.20";
+ extraPatches = [ ./cygwin-4.5.patch ./register-race-fix.patch ];
+ sha256 = "0bd81k0qv5i8w5gbddrvld45xi9k1gvmcrfm0393v0lrm37dab7m";
+})
diff --git a/pkgs/development/libraries/db/db-4.7.nix b/pkgs/development/libraries/db/db-4.7.nix
new file mode 100644
index 00000000000..62ccfd7d3a5
--- /dev/null
+++ b/pkgs/development/libraries/db/db-4.7.nix
@@ -0,0 +1,6 @@
+{ stdenv, fetchurl, ... } @ args:
+
+import ./generic.nix (args // rec {
+ version = "4.7.25";
+ sha256 = "0gi667v9cw22c03hddd6xd6374l0pczsd56b7pba25c9sdnxjkzi";
+})
diff --git a/pkgs/development/libraries/db/db-4.8.nix b/pkgs/development/libraries/db/db-4.8.nix
new file mode 100644
index 00000000000..e77307d6fa5
--- /dev/null
+++ b/pkgs/development/libraries/db/db-4.8.nix
@@ -0,0 +1,6 @@
+{ stdenv, fetchurl, ... } @ args:
+
+import ./generic.nix (args // rec {
+ version = "4.8.30";
+ sha256 = "0ampbl2f0hb1nix195kz1syrqqxpmvnvnfvphambj7xjrl3iljg0";
+})
diff --git a/pkgs/development/libraries/db/db-5.3.nix b/pkgs/development/libraries/db/db-5.3.nix
index a59d28ba963..af16f1ddf54 100644
--- a/pkgs/development/libraries/db/db-5.3.nix
+++ b/pkgs/development/libraries/db/db-5.3.nix
@@ -1,32 +1,6 @@
-{ stdenv, fetchurl
-, cxxSupport ? true
-}:
+{ stdenv, fetchurl, ... } @ args:
-stdenv.mkDerivation rec {
- name = "db-5.3.28";
-
- src = fetchurl {
- url = "http://download.oracle.com/berkeley-db/${name}.tar.gz";
- sha256 = "0a1n5hbl7027fbz5lm0vp0zzfp1hmxnz14wx3zl9563h83br5ag0";
- };
-
- configureFlags = [
- (if cxxSupport then "--enable-cxx" else "--disable-cxx")
- ];
-
- preConfigure = ''
- cd build_unix
- configureScript=../dist/configure
- '';
-
- postInstall = ''
- rm -rf $out/docs
- '';
-
- meta = with stdenv.lib; {
- homepage = "http://www.oracle.com/technetwork/database/database-technologies/berkeleydb/index.html";
- description = "Berkeley DB";
- license = "Berkeley Database License";
- platforms = platforms.unix;
- };
-}
+import ./generic.nix (args // rec {
+ version = "5.3.28";
+ sha256 = "0a1n5hbl7027fbz5lm0vp0zzfp1hmxnz14wx3zl9563h83br5ag0";
+})
diff --git a/pkgs/development/libraries/db/db-6.0.nix b/pkgs/development/libraries/db/db-6.0.nix
new file mode 100644
index 00000000000..22e858a9d18
--- /dev/null
+++ b/pkgs/development/libraries/db/db-6.0.nix
@@ -0,0 +1,7 @@
+{ stdenv, fetchurl, ... } @ args:
+
+import ./generic.nix (args // rec {
+ version = "6.0.20";
+ sha256 = "00r2aaglq625y8r9xd5vw2y070plp88f1mb2gbq3kqsl7128lsl0";
+ license = stdenv.lib.licenses.agpl3;
+})
diff --git a/pkgs/development/libraries/db/generic.nix b/pkgs/development/libraries/db/generic.nix
new file mode 100644
index 00000000000..de9fb27b4ec
--- /dev/null
+++ b/pkgs/development/libraries/db/generic.nix
@@ -0,0 +1,41 @@
+{ stdenv, fetchurl
+, cxxSupport ? true
+, compat185 ? true
+
+# Options from inherited versions
+, version, sha256
+, extraPatches ? [ ]
+, license ? "Berkeley Database License"
+}:
+
+stdenv.mkDerivation rec {
+ name = "db-${version}";
+
+ src = fetchurl {
+ url = "http://download.oracle.com/berkeley-db/${name}.tar.gz";
+ sha256 = sha256;
+ };
+
+ patches = extraPatches;
+
+ configureFlags = [
+ (if cxxSupport then "--enable-cxx" else "--disable-cxx")
+ (if compat185 then "--enable-compat185" else "--disable-compat185")
+ ];
+
+ preConfigure = ''
+ cd build_unix
+ configureScript=../dist/configure
+ '';
+
+ postInstall = ''
+ rm -rf $out/docs
+ '';
+
+ meta = with stdenv.lib; {
+ homepage = "http://www.oracle.com/technetwork/database/database-technologies/berkeleydb/index.html";
+ description = "Berkeley DB";
+ license = license;
+ platforms = platforms.unix;
+ };
+}
diff --git a/pkgs/development/libraries/db4/register-race-fix.patch b/pkgs/development/libraries/db/register-race-fix.patch
similarity index 100%
rename from pkgs/development/libraries/db4/register-race-fix.patch
rename to pkgs/development/libraries/db/register-race-fix.patch
diff --git a/pkgs/development/libraries/db4/builder.sh b/pkgs/development/libraries/db4/builder.sh
deleted file mode 100644
index b9d48b60803..00000000000
--- a/pkgs/development/libraries/db4/builder.sh
+++ /dev/null
@@ -1,12 +0,0 @@
-source $stdenv/setup
-
-preConfigure() {
- cd build_unix
- configureScript=../dist/configure
-}
-
-postInstall() {
- rm -rf $out/docs
-}
-
-genericBuild
diff --git a/pkgs/development/libraries/db4/db4-4.4.nix b/pkgs/development/libraries/db4/db4-4.4.nix
deleted file mode 100644
index ab3ffa85cf2..00000000000
--- a/pkgs/development/libraries/db4/db4-4.4.nix
+++ /dev/null
@@ -1,22 +0,0 @@
-{stdenv, fetchurl, cxxSupport ? true, compat185 ? true}:
-
-stdenv.mkDerivation {
- name = "db4-4.4.20";
-
- builder = ./builder.sh;
-
- src = fetchurl {
- urls = [
- http://download.oracle.com/berkeley-db/db-4.4.20.NC.tar.gz
- http://tarballs.nixos.org/db-4.4.20.NC.tar.gz
- ];
- md5 = "afd9243ea353bbaa04421488d3b37900";
- };
-
- configureFlags = [
- (if cxxSupport then "--enable-cxx" else "--disable-cxx")
- (if compat185 then "--enable-compat185" else "--disable-compat185")
- ];
-
- patches = [ ./cygwin-4.4.patch ];
-}
diff --git a/pkgs/development/libraries/db4/db4-4.5.nix b/pkgs/development/libraries/db4/db4-4.5.nix
deleted file mode 100644
index e5cf6f35a01..00000000000
--- a/pkgs/development/libraries/db4/db4-4.5.nix
+++ /dev/null
@@ -1,19 +0,0 @@
-{stdenv, fetchurl, cxxSupport ? true, compat185 ? true}:
-
-stdenv.mkDerivation {
- name = "db4-4.5.20";
-
- builder = ./builder.sh;
-
- src = fetchurl {
- url = http://download-east.oracle.com/berkeley-db/db-4.5.20.tar.gz;
- md5 = "b0f1c777708cb8e9d37fb47e7ed3312d";
- };
-
- configureFlags = [
- (if cxxSupport then "--enable-cxx" else "--disable-cxx")
- (if compat185 then "--enable-compat185" else "--disable-compat185")
- ];
-
- patches = [./cygwin-4.5.patch ./register-race-fix.patch];
-}
diff --git a/pkgs/development/libraries/db4/db4-4.7.nix b/pkgs/development/libraries/db4/db4-4.7.nix
deleted file mode 100644
index 9fb0d6587c0..00000000000
--- a/pkgs/development/libraries/db4/db4-4.7.nix
+++ /dev/null
@@ -1,18 +0,0 @@
-{stdenv, fetchurl, cxxSupport ? true, compat185 ? true}:
-
-stdenv.mkDerivation {
- name = "db4-4.7.25";
-
- builder = ./builder.sh;
-
- src = fetchurl {
- url = http://download-east.oracle.com/berkeley-db/db-4.7.25.tar.gz;
- sha256 = "0gi667v9cw22c03hddd6xd6374l0pczsd56b7pba25c9sdnxjkzi";
- };
-
- configureFlags = [
- (if cxxSupport then "--enable-cxx" else "--disable-cxx")
- (if compat185 then "--enable-compat185" else "--disable-compat185")
- ];
-
-}
diff --git a/pkgs/development/libraries/db4/db4-4.8.nix b/pkgs/development/libraries/db4/db4-4.8.nix
deleted file mode 100644
index a56a42f22ae..00000000000
--- a/pkgs/development/libraries/db4/db4-4.8.nix
+++ /dev/null
@@ -1,18 +0,0 @@
-{stdenv, fetchurl, cxxSupport ? true, compat185 ? true}:
-
-stdenv.mkDerivation {
- name = "db4-4.8.30";
-
- builder = ./builder.sh;
-
- src = fetchurl {
- url = http://download.oracle.com/berkeley-db/db-4.8.30.tar.gz;
- sha256 = "0ampbl2f0hb1nix195kz1syrqqxpmvnvnfvphambj7xjrl3iljg0";
- };
-
- configureFlags = [
- (if cxxSupport then "--enable-cxx" else "--disable-cxx")
- (if compat185 then "--enable-compat185" else "--disable-compat185")
- ];
-
-}
diff --git a/pkgs/development/libraries/dbus-glib/default.nix b/pkgs/development/libraries/dbus-glib/default.nix
index be6cf442a49..9c774e802fc 100644
--- a/pkgs/development/libraries/dbus-glib/default.nix
+++ b/pkgs/development/libraries/dbus-glib/default.nix
@@ -1,16 +1,16 @@
-{ stdenv, fetchurl, pkgconfig, expat, gettext, libiconv, dbus, glib }:
+{ stdenv, fetchurl, pkgconfig, expat, gettext, libiconvOrEmpty, dbus, glib }:
stdenv.mkDerivation rec {
- name = "dbus-glib-0.100.2";
+ name = "dbus-glib-0.102";
src = fetchurl {
url = "${meta.homepage}/releases/dbus-glib/${name}.tar.gz";
- sha256 = "1ibav91yg70f2l3l18cr0hf4mna1h9d4mrg0c60w4l8zjbd45fx5";
+ sha256 = "177j5p2vrvpmzk2xrrj6akn73kvpbvnmsjvlmca9l55qbdcfsr39";
};
nativeBuildInputs = [ pkgconfig gettext ];
- buildInputs = [ expat ] ++ stdenv.lib.optional (!stdenv.isLinux) libiconv;
+ buildInputs = [ expat ] ++ libiconvOrEmpty;
propagatedBuildInputs = [ dbus.libs glib ];
diff --git a/pkgs/development/libraries/glib-networking/default.nix b/pkgs/development/libraries/glib-networking/default.nix
index 2c651980eda..1e9fdd4f0aa 100644
--- a/pkgs/development/libraries/glib-networking/default.nix
+++ b/pkgs/development/libraries/glib-networking/default.nix
@@ -9,7 +9,7 @@ stdenv.mkDerivation {
sha256 = "1g2ran0rn37009fs3xl38m95i5w8sdf9ax0ady4jbjir15844xcz";
};
- configureFlags = "--with-ca-certificates=/etc/ca-bundle.crt";
+ configureFlags = "--with-ca-certificates=/etc/ssl/certs/ca-bundle.crt";
preBuild = ''
sed -e "s@${glib}/lib/gio/modules@$out/lib/gio/modules@g" -i $(find . -name Makefile)
diff --git a/pkgs/development/libraries/google-gflags/default.nix b/pkgs/development/libraries/google-gflags/default.nix
new file mode 100644
index 00000000000..3631d4927a3
--- /dev/null
+++ b/pkgs/development/libraries/google-gflags/default.nix
@@ -0,0 +1,26 @@
+{ stdenv, fetchurl }:
+
+stdenv.mkDerivation rec {
+ name = "google-gflags-2.0";
+
+ src = fetchurl {
+ url = "https://gflags.googlecode.com/files/gflags-2.0.tar.gz";
+ sha256 = "1mypfahsfy0piavhf7il2jfs1gq7jp6yarl9sq5hhypj34s5sjnf";
+ };
+
+ doCheck = true;
+
+ meta = {
+ description = "A C++ library that implements commandline flags processing";
+ longDescription = ''
+ The gflags package contains a C++ library that implements commandline flags processing.
+ As such it's a replacement for getopt().
+ It was owned by Google. google-gflags project has been renamed to gflags and maintained by new community.
+ '';
+ homepage = https://code.google.com/p/gflags/;
+ license = stdenv.lib.licenses.bsd3;
+
+ maintainers = [ stdenv.lib.maintainers.linquize ];
+ platforms = stdenv.lib.platforms.all;
+ };
+}
diff --git a/pkgs/development/libraries/haskell/Chart-diagrams/default.nix b/pkgs/development/libraries/haskell/Chart-diagrams/default.nix
new file mode 100644
index 00000000000..008869713ef
--- /dev/null
+++ b/pkgs/development/libraries/haskell/Chart-diagrams/default.nix
@@ -0,0 +1,21 @@
+{ cabal, blazeSvg, Chart, colour, dataDefaultClass, diagramsCore
+, diagramsLib, diagramsPostscript, diagramsSvg, lens, mtl
+, operational, SVGFonts, text, time
+}:
+
+cabal.mkDerivation (self: {
+ pname = "Chart-diagrams";
+ version = "1.2";
+ sha256 = "11pvyasra4mxid6826z6rkjhr71lg37fihzr8mgvjw3arascgqxz";
+ buildDepends = [
+ blazeSvg Chart colour dataDefaultClass diagramsCore diagramsLib
+ diagramsPostscript diagramsSvg lens mtl operational SVGFonts text
+ time
+ ];
+ meta = {
+ homepage = "https://github.com/timbod7/haskell-chart/wiki";
+ description = "Diagrams backend for Charts";
+ license = self.stdenv.lib.licenses.bsd3;
+ platforms = self.ghc.meta.platforms;
+ };
+})
diff --git a/pkgs/development/libraries/haskell/DAV/default.nix b/pkgs/development/libraries/haskell/DAV/default.nix
index a7e15f2d6b4..84ef157613e 100644
--- a/pkgs/development/libraries/haskell/DAV/default.nix
+++ b/pkgs/development/libraries/haskell/DAV/default.nix
@@ -1,18 +1,19 @@
-{ cabal, caseInsensitive, httpClient, httpClientTls, httpTypes
-, lens, liftedBase, monadControl, mtl, network, optparseApplicative
-, transformers, transformersBase, xmlConduit, xmlHamlet
+{ cabal, caseInsensitive, either, errors, httpClient, httpClientTls
+, httpTypes, lens, liftedBase, monadControl, mtl, network
+, optparseApplicative, transformers, transformersBase, xmlConduit
+, xmlHamlet
}:
cabal.mkDerivation (self: {
pname = "DAV";
- version = "0.6";
- sha256 = "1lqc1w40mzj5gvpd3gc4qwgz3zrivwkz6ssa5592dsnwz81k1dxk";
+ version = "0.6.1";
+ sha256 = "0j82fz5z9cwnl41qqs69gv0li25rkjndd8lnf4zy7bbdy558nxgz";
isLibrary = true;
isExecutable = true;
buildDepends = [
- caseInsensitive httpClient httpClientTls httpTypes lens liftedBase
- monadControl mtl network optparseApplicative transformers
- transformersBase xmlConduit xmlHamlet
+ caseInsensitive either errors httpClient httpClientTls httpTypes
+ lens liftedBase monadControl mtl network optparseApplicative
+ transformers transformersBase xmlConduit xmlHamlet
];
meta = {
homepage = "http://floss.scru.org/hDAV";
diff --git a/pkgs/development/libraries/haskell/HTF/default.nix b/pkgs/development/libraries/haskell/HTF/default.nix
index 509719d383a..877fa68ab00 100644
--- a/pkgs/development/libraries/haskell/HTF/default.nix
+++ b/pkgs/development/libraries/haskell/HTF/default.nix
@@ -5,8 +5,8 @@
cabal.mkDerivation (self: {
pname = "HTF";
- version = "0.11.1.1";
- sha256 = "0j425h0av82cbwkfds2jhf3hsm2wd8vca8bjdyg8v09k6kb220cs";
+ version = "0.11.2.1";
+ sha256 = "194wjcs06cbxjfgfcax697405c0vlaklnvh705ffrxmrrww77z7l";
isLibrary = true;
isExecutable = true;
buildDepends = [
diff --git a/pkgs/development/libraries/haskell/MonadRandom/default.nix b/pkgs/development/libraries/haskell/MonadRandom/default.nix
index 32c2f9eeffe..3eac88d8880 100644
--- a/pkgs/development/libraries/haskell/MonadRandom/default.nix
+++ b/pkgs/development/libraries/haskell/MonadRandom/default.nix
@@ -2,8 +2,8 @@
cabal.mkDerivation (self: {
pname = "MonadRandom";
- version = "0.1.12";
- sha256 = "0lr1lvpcj96i6n0w810bjy8k9jygx97nnv0k2zb51d7saw6y95p4";
+ version = "0.1.13";
+ sha256 = "1pi12ymsbl2l0ly3ggihg8r0ac87ax267m419cga60wp5ry5zbnk";
buildDepends = [ mtl random transformers ];
meta = {
description = "Random-number generation monad";
diff --git a/pkgs/development/libraries/haskell/SVGFonts/default.nix b/pkgs/development/libraries/haskell/SVGFonts/default.nix
new file mode 100644
index 00000000000..de47bd200ee
--- /dev/null
+++ b/pkgs/development/libraries/haskell/SVGFonts/default.nix
@@ -0,0 +1,18 @@
+{ cabal, attoparsec, blazeMarkup, blazeSvg, dataDefaultClass
+, diagramsLib, parsec, split, text, tuple, vector, vectorSpace, xml
+}:
+
+cabal.mkDerivation (self: {
+ pname = "SVGFonts";
+ version = "1.4.0.1";
+ sha256 = "0f878xg6qngl8ahk8zz03f1kyn2jq1dz05zw8av7s91x2ms8q3rg";
+ buildDepends = [
+ attoparsec blazeMarkup blazeSvg dataDefaultClass diagramsLib parsec
+ split text tuple vector vectorSpace xml
+ ];
+ meta = {
+ description = "Fonts from the SVG-Font format";
+ license = self.stdenv.lib.licenses.bsd3;
+ platforms = self.ghc.meta.platforms;
+ };
+})
diff --git a/pkgs/development/libraries/haskell/SafeSemaphore/default.nix b/pkgs/development/libraries/haskell/SafeSemaphore/default.nix
index d4cc7490277..20c879e0dc4 100644
--- a/pkgs/development/libraries/haskell/SafeSemaphore/default.nix
+++ b/pkgs/development/libraries/haskell/SafeSemaphore/default.nix
@@ -2,8 +2,8 @@
cabal.mkDerivation (self: {
pname = "SafeSemaphore";
- version = "0.9.0";
- sha256 = "1xa30cciw8wmri675kdsz4pb5qwrh592pzylbhawqsvsarf80gz4";
+ version = "0.10.0";
+ sha256 = "0zjm99jqkbn99p5d3mdggij4b4jfpz4fk1rwpd48ld4vmzzqh92c";
buildDepends = [ stm ];
testDepends = [ HUnit ];
meta = {
diff --git a/pkgs/development/libraries/haskell/Zwaluw/default.nix b/pkgs/development/libraries/haskell/Zwaluw/default.nix
deleted file mode 100644
index 1cb214b94b0..00000000000
--- a/pkgs/development/libraries/haskell/Zwaluw/default.nix
+++ /dev/null
@@ -1,14 +0,0 @@
-{ cabal }:
-
-cabal.mkDerivation (self: {
- pname = "Zwaluw";
- version = "0.1";
- sha256 = "1crvcvni5gzpc1c6cnaqqp0gng1l9gk9d8ac23967nvp82xav7s1";
- meta = {
- homepage = "https://github.com/MedeaMelana/Zwaluw";
- description = "Combinators for bidirectional URL routing";
- license = self.stdenv.lib.licenses.bsd3;
- platforms = self.ghc.meta.platforms;
- maintainers = [ self.stdenv.lib.maintainers.andres ];
- };
-})
diff --git a/pkgs/development/libraries/haskell/aeson/0.7.0.0.nix b/pkgs/development/libraries/haskell/aeson/0.7.0.1.nix
similarity index 90%
rename from pkgs/development/libraries/haskell/aeson/0.7.0.0.nix
rename to pkgs/development/libraries/haskell/aeson/0.7.0.1.nix
index 41bbdbf5a0b..551f62d0756 100644
--- a/pkgs/development/libraries/haskell/aeson/0.7.0.0.nix
+++ b/pkgs/development/libraries/haskell/aeson/0.7.0.1.nix
@@ -5,8 +5,8 @@
cabal.mkDerivation (self: {
pname = "aeson";
- version = "0.7.0.0";
- sha256 = "14xh7i07ha2hgljq0y0v7f5gkn0pv2zqj8l9j92957mf7f17zwf6";
+ version = "0.7.0.1";
+ sha256 = "17cwclxh2f2m0mvs867lfzrv14gd9grw8a9f8l95j3nd76y58kb3";
buildDepends = [
attoparsec deepseq dlist hashable mtl scientific syb text time
unorderedContainers vector
diff --git a/pkgs/development/libraries/haskell/cairo/default.nix b/pkgs/development/libraries/haskell/cairo/default.nix
index 686cf3b9bcb..b009f6763ab 100644
--- a/pkgs/development/libraries/haskell/cairo/default.nix
+++ b/pkgs/development/libraries/haskell/cairo/default.nix
@@ -4,8 +4,8 @@
cabal.mkDerivation (self: {
pname = "cairo";
- version = "0.12.5.0";
- sha256 = "1khpksznh51yl27hs0zbabx8df04d26ccwh0vjidcwf3flvrbgwb";
+ version = "0.12.5.1";
+ sha256 = "02a57kg7s1bjfvk7cnkppfva5g7akhpwsrsa1qzm0kdld51cs86l";
buildDepends = [ mtl utf8String ];
buildTools = [ gtk2hsBuildtools ];
extraLibraries = [ cairo libc pkgconfig zlib ];
diff --git a/pkgs/development/libraries/haskell/cgi/3001.1.8.4.nix b/pkgs/development/libraries/haskell/cgi/3001.1.8.5.nix
similarity index 83%
rename from pkgs/development/libraries/haskell/cgi/3001.1.8.4.nix
rename to pkgs/development/libraries/haskell/cgi/3001.1.8.5.nix
index d2d89918086..0e6a6a71ae9 100644
--- a/pkgs/development/libraries/haskell/cgi/3001.1.8.4.nix
+++ b/pkgs/development/libraries/haskell/cgi/3001.1.8.5.nix
@@ -2,8 +2,8 @@
cabal.mkDerivation (self: {
pname = "cgi";
- version = "3001.1.8.4";
- sha256 = "1h0ynrrda18g5pn1sw2n94rhhp3k39nb7wmx53b52dhxkp2izlgn";
+ version = "3001.1.8.5";
+ sha256 = "0ffvn9ki5yq2zc65afmy04353v4s66lajc7y563fhj2kz5ib5ks6";
buildDepends = [ MonadCatchIOMtl mtl network parsec xhtml ];
meta = {
homepage = "http://andersk.mit.edu/haskell/cgi/";
diff --git a/pkgs/development/libraries/haskell/conduit/default.nix b/pkgs/development/libraries/haskell/conduit/default.nix
index 25987150533..d2d221177c8 100644
--- a/pkgs/development/libraries/haskell/conduit/default.nix
+++ b/pkgs/development/libraries/haskell/conduit/default.nix
@@ -4,8 +4,8 @@
cabal.mkDerivation (self: {
pname = "conduit";
- version = "1.0.13";
- sha256 = "19l2wqx5fil9sv4kj8jd19yvb4fa7jp3n523j38z9bd6ydnb8fni";
+ version = "1.0.13.1";
+ sha256 = "0kxfck6d72fdnymf2rj6m7h97svq1d2fq1ss5mlhsrks5fflia9y";
buildDepends = [
liftedBase mmorph monadControl mtl resourcet text transformers
transformersBase void
diff --git a/pkgs/development/libraries/haskell/diagrams/cairo.nix b/pkgs/development/libraries/haskell/diagrams/cairo.nix
index 78de7fa1f8e..186f60aecf5 100644
--- a/pkgs/development/libraries/haskell/diagrams/cairo.nix
+++ b/pkgs/development/libraries/haskell/diagrams/cairo.nix
@@ -4,8 +4,8 @@
cabal.mkDerivation (self: {
pname = "diagrams-cairo";
- version = "1.0.1.1";
- sha256 = "0mjc24sir0mm1kqhkk26mfbz90kc71hdylral4bjymxs6fpx7crh";
+ version = "1.0.1.2";
+ sha256 = "040x3zdrr70kg10isby6xp8mswvjd84xiz2rf7w1y66g9izdgfmc";
buildDepends = [
cairo colour dataDefaultClass diagramsCore diagramsLib filepath
hashable lens mtl split statestack time
diff --git a/pkgs/development/libraries/haskell/diagrams/postscript.nix b/pkgs/development/libraries/haskell/diagrams/postscript.nix
new file mode 100644
index 00000000000..2c827b5f3d1
--- /dev/null
+++ b/pkgs/development/libraries/haskell/diagrams/postscript.nix
@@ -0,0 +1,19 @@
+{ cabal, diagramsCore, diagramsLib, dlist, filepath, hashable, lens
+, monoidExtras, mtl, semigroups, split, vectorSpace
+}:
+
+cabal.mkDerivation (self: {
+ pname = "diagrams-postscript";
+ version = "1.0.1.2";
+ sha256 = "0im1w70qi8qs2z8x41v7pwvk1alfaw1h8k0683njzd5sfz2m1gny";
+ buildDepends = [
+ diagramsCore diagramsLib dlist filepath hashable lens monoidExtras
+ mtl semigroups split vectorSpace
+ ];
+ meta = {
+ homepage = "http://projects.haskell.org/diagrams/";
+ description = "Postscript backend for diagrams drawing EDSL";
+ license = self.stdenv.lib.licenses.bsd3;
+ platforms = self.ghc.meta.platforms;
+ };
+})
diff --git a/pkgs/development/libraries/haskell/diagrams/svg.nix b/pkgs/development/libraries/haskell/diagrams/svg.nix
index 56b1306a7ce..926249b853a 100644
--- a/pkgs/development/libraries/haskell/diagrams/svg.nix
+++ b/pkgs/development/libraries/haskell/diagrams/svg.nix
@@ -5,8 +5,8 @@
cabal.mkDerivation (self: {
pname = "diagrams-svg";
- version = "1.0.1.2";
- sha256 = "1aaybkizlfc4ji7m2p2naw4ml1pacppkbfr2ygqlq0k3bg0cd36k";
+ version = "1.0.1.3";
+ sha256 = "0brbvzwh7yi3400wrdpkmw6jfd2nhi238zddhid76lmx2q9zxvvx";
buildDepends = [
blazeMarkup blazeSvg colour diagramsCore diagramsLib filepath
hashable lens monoidExtras mtl split time vectorSpace
diff --git a/pkgs/development/libraries/haskell/digestive-functors-aeson/default.nix b/pkgs/development/libraries/haskell/digestive-functors-aeson/default.nix
index 02b7f35d382..dd098cbe183 100644
--- a/pkgs/development/libraries/haskell/digestive-functors-aeson/default.nix
+++ b/pkgs/development/libraries/haskell/digestive-functors-aeson/default.nix
@@ -1,14 +1,12 @@
-{ cabal, aeson, digestiveFunctors, HUnit, lens, lensAeson, mtl
-, safe, tasty, tastyHunit, text, vector
+{ cabal, aeson, digestiveFunctors, HUnit, lens, mtl, safe, tasty
+, tastyHunit, text, vector
}:
cabal.mkDerivation (self: {
pname = "digestive-functors-aeson";
- version = "1.1.4";
- sha256 = "1rca25zycmz4al5izq8j7h3cggvb4844g3gj3a1686yy38k5rfvn";
- buildDepends = [
- aeson digestiveFunctors lens lensAeson safe text vector
- ];
+ version = "1.1.5";
+ sha256 = "1mxi8zbv3hxy2crj6h6p1a885k8rd0fqhmwq7l7w7d7d73h8bmm3";
+ buildDepends = [ aeson digestiveFunctors lens safe text vector ];
testDepends = [
aeson digestiveFunctors HUnit mtl tasty tastyHunit text
];
diff --git a/pkgs/development/libraries/haskell/dimensional-tf/default.nix b/pkgs/development/libraries/haskell/dimensional-tf/default.nix
index 6bed24f5c40..4b7117a0e4c 100644
--- a/pkgs/development/libraries/haskell/dimensional-tf/default.nix
+++ b/pkgs/development/libraries/haskell/dimensional-tf/default.nix
@@ -2,8 +2,8 @@
cabal.mkDerivation (self: {
pname = "dimensional-tf";
- version = "0.2.1";
- sha256 = "1avvq8kgxagdw3345y7ly30i4x43l0i0m43rlb72j3inv6rdgxgz";
+ version = "0.3";
+ sha256 = "0z3k9962zz652bk2azv9lcms1j06v60hid3iach043dpg5r083qg";
buildDepends = [ numtypeTf time ];
meta = {
homepage = "http://dimensional.googlecode.com/";
diff --git a/pkgs/development/libraries/haskell/dimensional/default.nix b/pkgs/development/libraries/haskell/dimensional/default.nix
index 512ea378b66..f3444703c3d 100644
--- a/pkgs/development/libraries/haskell/dimensional/default.nix
+++ b/pkgs/development/libraries/haskell/dimensional/default.nix
@@ -2,8 +2,8 @@
cabal.mkDerivation (self: {
pname = "dimensional";
- version = "0.12.2";
- sha256 = "0b5w9g3xn74b7z4bcsfcijnj54r8cwbbd8129q61c3nhng1f896a";
+ version = "0.13";
+ sha256 = "1nj8h79iq7pirqlj8iw1p782nm05xgym3469x7hlzaz3ig9nwgrg";
buildDepends = [ numtype time ];
meta = {
homepage = "http://dimensional.googlecode.com/";
diff --git a/pkgs/development/libraries/haskell/either/default.nix b/pkgs/development/libraries/haskell/either/default.nix
index d6853f4cf4c..46348d7e4bb 100644
--- a/pkgs/development/libraries/haskell/either/default.nix
+++ b/pkgs/development/libraries/haskell/either/default.nix
@@ -4,8 +4,8 @@
cabal.mkDerivation (self: {
pname = "either";
- version = "4.1";
- sha256 = "1wddidjqwk283zrydl6xwi0crrrlskayici0fhjyf2abd3lgnnkc";
+ version = "4.1.1";
+ sha256 = "0wipgwrca7bm4rm843gc0p69f2hvm2z067mjrv8qvnivyxhy8i6k";
buildDepends = [
monadControl MonadRandom mtl semigroupoids semigroups transformers
transformersBase
diff --git a/pkgs/development/libraries/haskell/foldl/default.nix b/pkgs/development/libraries/haskell/foldl/default.nix
index efc0aa61d3d..3b1c61574f0 100644
--- a/pkgs/development/libraries/haskell/foldl/default.nix
+++ b/pkgs/development/libraries/haskell/foldl/default.nix
@@ -1,10 +1,10 @@
-{ cabal, text }:
+{ cabal, primitive, text, vector }:
cabal.mkDerivation (self: {
pname = "foldl";
- version = "1.0.1";
- sha256 = "194dkpjh0964cmh4mg35qffkg8dx8d821aj8k6khb40fq5s8smjy";
- buildDepends = [ text ];
+ version = "1.0.2";
+ sha256 = "11cqmw102m2bskaknl8qr7hwyn94hfv2ind5fgvjw4hwgllr8v84";
+ buildDepends = [ primitive text vector ];
meta = {
description = "Composable, streaming, and efficient left folds";
license = self.stdenv.lib.licenses.bsd3;
diff --git a/pkgs/development/libraries/haskell/force-layout/default.nix b/pkgs/development/libraries/haskell/force-layout/default.nix
index 6c1082b0f4b..70488010072 100644
--- a/pkgs/development/libraries/haskell/force-layout/default.nix
+++ b/pkgs/development/libraries/haskell/force-layout/default.nix
@@ -2,8 +2,8 @@
cabal.mkDerivation (self: {
pname = "force-layout";
- version = "0.3";
- sha256 = "1v4jgh08ppvfxc8w13wc9iiwk5hh2q9n7m5xb9vl59bmxdx81kai";
+ version = "0.3.0.1";
+ sha256 = "0x9nfmvml9hszbm2izr4rfl9xphiyv0lj0hlixjbpxvm5nqk2w95";
buildDepends = [
dataDefaultClass lens vectorSpace vectorSpacePoints
];
diff --git a/pkgs/development/libraries/haskell/ghc-mod/default.nix b/pkgs/development/libraries/haskell/ghc-mod/default.nix
index d37bfcf0f5a..02c459c8e5c 100644
--- a/pkgs/development/libraries/haskell/ghc-mod/default.nix
+++ b/pkgs/development/libraries/haskell/ghc-mod/default.nix
@@ -4,8 +4,8 @@
cabal.mkDerivation (self: {
pname = "ghc-mod";
- version = "3.1.5";
- sha256 = "1sjam6cqz9dhgsdv4sm1lgmwq5dhs9x5q3p1h7l0n34w2q7cc6if";
+ version = "3.1.6";
+ sha256 = "1z8fzh08f38cxplf14sflpgrazlwzz6q73lvxm37xyp7gww2prhi";
isLibrary = true;
isExecutable = true;
buildDepends = [
diff --git a/pkgs/development/libraries/haskell/gtk-traymanager/default.nix b/pkgs/development/libraries/haskell/gtk-traymanager/default.nix
index 8d319ee246e..f55d9f2edef 100644
--- a/pkgs/development/libraries/haskell/gtk-traymanager/default.nix
+++ b/pkgs/development/libraries/haskell/gtk-traymanager/default.nix
@@ -1,11 +1,11 @@
-{ cabal, glib, gtk, X11 }:
+{ cabal, glib, gtk, x11 }:
cabal.mkDerivation (self: {
pname = "gtk-traymanager";
version = "0.1.3";
sha256 = "07671f3j3r07djgvrlpbdaqqnm2yc7sc5f5isjn5nczrwh8n0sj4";
buildDepends = [ glib gtk ];
- pkgconfigDepends = [ gtk X11 ];
+ pkgconfigDepends = [ gtk x11 ];
meta = {
homepage = "http://github.com/travitch/gtk-traymanager";
description = "A wrapper around the eggtraymanager library for Linux system trays";
diff --git a/pkgs/development/libraries/haskell/gtk/default.nix b/pkgs/development/libraries/haskell/gtk/default.nix
index 6acf1fb90c6..9ac6fb2f6f2 100644
--- a/pkgs/development/libraries/haskell/gtk/default.nix
+++ b/pkgs/development/libraries/haskell/gtk/default.nix
@@ -4,8 +4,8 @@
cabal.mkDerivation (self: {
pname = "gtk";
- version = "0.12.5.0";
- sha256 = "1xj2x9aakk70k3z88klfniqvffzbdkn55vslbqk60k6sv4k3qs2n";
+ version = "0.12.5.2";
+ sha256 = "06jlwln3w2pgzahhy8n4sqv1chmh899naz8avqabr9ni4hmbrssb";
buildDepends = [ cairo glib mtl pango ];
buildTools = [ gtk2hsBuildtools ];
extraLibraries = [ libc pkgconfig ];
diff --git a/pkgs/development/libraries/haskell/hamlet/default.nix b/pkgs/development/libraries/haskell/hamlet/default.nix
index ca6de3fecfe..739b800e28d 100644
--- a/pkgs/development/libraries/haskell/hamlet/default.nix
+++ b/pkgs/development/libraries/haskell/hamlet/default.nix
@@ -4,8 +4,8 @@
cabal.mkDerivation (self: {
pname = "hamlet";
- version = "1.1.7.6";
- sha256 = "1b0y7imdihm87nkz32bmh2gbalidy9rzp85x677lvxc99c1m9d1d";
+ version = "1.1.7.7";
+ sha256 = "1qwx0gn367gp2a4kb1q3xc23addjyawr9gvs7bzv8vfx5xnkxglx";
buildDepends = [
blazeBuilder blazeHtml blazeMarkup failure parsec shakespeare text
];
diff --git a/pkgs/development/libraries/haskell/hledger-web/default.nix b/pkgs/development/libraries/haskell/hledger-web/default.nix
index b547c8a6042..0875c09db86 100644
--- a/pkgs/development/libraries/haskell/hledger-web/default.nix
+++ b/pkgs/development/libraries/haskell/hledger-web/default.nix
@@ -8,8 +8,8 @@
cabal.mkDerivation (self: {
pname = "hledger-web";
- version = "0.22.1";
- sha256 = "0nqw7scnhcip2bg832p9v0rqk01gn4xwj9bqsvsvmh31fh9ldchw";
+ version = "0.22.4";
+ sha256 = "07xz6ijg3nzzjair5gdjjryv5hs2rxws4maz22rrqnpf8wwjjc54";
isLibrary = true;
isExecutable = true;
buildDepends = [
@@ -21,9 +21,6 @@ cabal.mkDerivation (self: {
];
testDepends = [ hspec yesod yesodTest ];
doCheck = false;
- patchPhase = ''
- sed -i -e 's|blaze-html.*0.7|blaze-html|' -e 's|blaze-markup.*0.7|blaze-markup|' hledger-web.cabal
- '';
meta = {
homepage = "http://hledger.org";
description = "A web interface for the hledger accounting tool";
diff --git a/pkgs/development/libraries/haskell/hsimport/default.nix b/pkgs/development/libraries/haskell/hsimport/default.nix
index 8c657e780ec..eea778ec08a 100644
--- a/pkgs/development/libraries/haskell/hsimport/default.nix
+++ b/pkgs/development/libraries/haskell/hsimport/default.nix
@@ -4,8 +4,8 @@
cabal.mkDerivation (self: {
pname = "hsimport";
- version = "0.2.7";
- sha256 = "03ddrszirx3xg7lxbykhwbzs4vqr8xravn2krc7v0q308rh070nr";
+ version = "0.2.9";
+ sha256 = "1xfz1as980jg3crlwlajaj8yfj4pl4phg9l6fjap037vr0107hav";
isLibrary = true;
isExecutable = true;
buildDepends = [
diff --git a/pkgs/development/libraries/haskell/hspec-meta/default.nix b/pkgs/development/libraries/haskell/hspec-meta/default.nix
index 5374ed7cd80..1b9cbd08978 100644
--- a/pkgs/development/libraries/haskell/hspec-meta/default.nix
+++ b/pkgs/development/libraries/haskell/hspec-meta/default.nix
@@ -4,8 +4,8 @@
cabal.mkDerivation (self: {
pname = "hspec-meta";
- version = "1.8.1";
- sha256 = "03582b79cqv3c2z02ni2xyzb3kccgcw0phmg5lklaphkrarm0g3w";
+ version = "1.8.3";
+ sha256 = "12d254snnv8i1qqybsp6yzbqdxjf1wx8d29ja3lazb3kx12qwawd";
isLibrary = true;
isExecutable = true;
buildDepends = [
diff --git a/pkgs/development/libraries/haskell/hspec/default.nix b/pkgs/development/libraries/haskell/hspec/default.nix
index 10994799c43..984a046f501 100644
--- a/pkgs/development/libraries/haskell/hspec/default.nix
+++ b/pkgs/development/libraries/haskell/hspec/default.nix
@@ -5,8 +5,8 @@
cabal.mkDerivation (self: {
pname = "hspec";
- version = "1.8.1.1";
- sha256 = "1gpll1pr8zs7ha1nn13rp579av4nnjkz94rq0js6r1awz69cp0rb";
+ version = "1.8.3";
+ sha256 = "0k5l8r54nc0q5x3czdfxkwa606qnli3a6qm2xd3r5yl5bnz6hzh8";
isLibrary = true;
isExecutable = true;
buildDepends = [
diff --git a/pkgs/development/libraries/haskell/http-client-tls/default.nix b/pkgs/development/libraries/haskell/http-client-tls/default.nix
index 201e1e11564..5ec8eecd06c 100644
--- a/pkgs/development/libraries/haskell/http-client-tls/default.nix
+++ b/pkgs/development/libraries/haskell/http-client-tls/default.nix
@@ -1,12 +1,14 @@
-{ cabal, connection, dataDefault, hspec, httpClient, httpTypes
+{ cabal, connection, dataDefaultClass, hspec, httpClient, httpTypes
, network, tls
}:
cabal.mkDerivation (self: {
pname = "http-client-tls";
- version = "0.2.0.3";
- sha256 = "0v8zbwlvdmkap5qbw9aw75krvw8j4q90fn301al13azzgjp71gmb";
- buildDepends = [ connection dataDefault httpClient network tls ];
+ version = "0.2.1.1";
+ sha256 = "07kwcamc100y48gghmlfvj5ycf6y3cynqqg5kx0ymgjk85k7vim7";
+ buildDepends = [
+ connection dataDefaultClass httpClient network tls
+ ];
testDepends = [ hspec httpClient httpTypes ];
doCheck = false;
meta = {
diff --git a/pkgs/development/libraries/haskell/http-client/default.nix b/pkgs/development/libraries/haskell/http-client/default.nix
index 7d85c29e656..ff21e12bb43 100644
--- a/pkgs/development/libraries/haskell/http-client/default.nix
+++ b/pkgs/development/libraries/haskell/http-client/default.nix
@@ -1,22 +1,22 @@
{ cabal, base64Bytestring, blazeBuilder, caseInsensitive, cookie
-, dataDefault, deepseq, failure, hspec, httpTypes, monadControl
-, network, publicsuffixlist, text, time, transformers, zlib
-, zlibBindings
+, dataDefaultClass, deepseq, failure, hspec, httpTypes
+, monadControl, network, publicsuffixlist, text, time, transformers
+, zlib, zlibBindings
}:
cabal.mkDerivation (self: {
pname = "http-client";
- version = "0.2.1.1";
- sha256 = "03hcwz53sjvw3nv6xbdf24a4ny229ljq3rx89plmsxpjb44qwlq2";
+ version = "0.2.2.2";
+ sha256 = "1pn38vqbb8ff3gmwkzb8a2fika2rdymnlglpi3q7yn0jsvxl5xli";
buildDepends = [
- base64Bytestring blazeBuilder caseInsensitive cookie dataDefault
- deepseq failure httpTypes network publicsuffixlist text time
- transformers zlibBindings
+ base64Bytestring blazeBuilder caseInsensitive cookie
+ dataDefaultClass deepseq failure httpTypes network publicsuffixlist
+ text time transformers zlibBindings
];
testDepends = [
- base64Bytestring blazeBuilder caseInsensitive dataDefault deepseq
- failure hspec httpTypes monadControl network text time transformers
- zlib zlibBindings
+ base64Bytestring blazeBuilder caseInsensitive deepseq failure hspec
+ httpTypes monadControl network text time transformers zlib
+ zlibBindings
];
doCheck = false;
meta = {
diff --git a/pkgs/development/libraries/haskell/http-conduit/default.nix b/pkgs/development/libraries/haskell/http-conduit/default.nix
index c55e8a4e6e7..04c88c257c1 100644
--- a/pkgs/development/libraries/haskell/http-conduit/default.nix
+++ b/pkgs/development/libraries/haskell/http-conduit/default.nix
@@ -1,6 +1,6 @@
{ cabal, asn1Data, base64Bytestring, blazeBuilder
, blazeBuilderConduit, caseInsensitive, certificate, conduit
-, connection, cookie, cprngAes, dataDefault, deepseq, failure
+, connection, cookie, cprngAes, dataDefaultClass, deepseq, failure
, filepath, hspec, httpClient, httpClientConduit
, httpClientMultipart, httpClientTls, httpTypes, HUnit, liftedBase
, mimeTypes, monadControl, mtl, network, networkConduit
@@ -11,8 +11,8 @@
cabal.mkDerivation (self: {
pname = "http-conduit";
- version = "2.0.0.4";
- sha256 = "0902sklwfb9gr1yqxp15qa4qqik75jv6pl0nfh2s4vq65sh4gndq";
+ version = "2.0.0.5";
+ sha256 = "1vgfg2jgr7gavfbys33rd2l0dxyqk7ig7v357jhy8imxsm0xykp9";
buildDepends = [
conduit httpClient httpClientConduit httpClientTls httpTypes
liftedBase resourcet transformers
@@ -20,7 +20,7 @@ cabal.mkDerivation (self: {
testDepends = [
asn1Data base64Bytestring blazeBuilder blazeBuilderConduit
caseInsensitive certificate conduit connection cookie cprngAes
- dataDefault deepseq failure filepath hspec httpClient
+ dataDefaultClass deepseq failure filepath hspec httpClient
httpClientMultipart httpTypes HUnit liftedBase mimeTypes
monadControl mtl network networkConduit publicsuffixlist random
regexCompat resourcet socks text time transformers transformersBase
diff --git a/pkgs/development/libraries/haskell/iCalendar/default.nix b/pkgs/development/libraries/haskell/iCalendar/default.nix
index 7244e15c293..9d54e8531ab 100644
--- a/pkgs/development/libraries/haskell/iCalendar/default.nix
+++ b/pkgs/development/libraries/haskell/iCalendar/default.nix
@@ -4,8 +4,8 @@
cabal.mkDerivation (self: {
pname = "iCalendar";
- version = "0.3.0.1";
- sha256 = "0d51rb46vcpb05vsqqmk3w7rymybl3vz8cqs0pw088a52kiy4xc3";
+ version = "0.4";
+ sha256 = "1wjgrgm4m21fic7a83k5jql4jxknk7mhh3shhrgb2kvxrj0bfw8b";
buildDepends = [
base64Bytestring caseInsensitive dataDefault mime mtl network
parsec text time
diff --git a/pkgs/development/libraries/haskell/interpolatedstring-perl6/default.nix b/pkgs/development/libraries/haskell/interpolatedstring-perl6/default.nix
new file mode 100644
index 00000000000..63ea81058e5
--- /dev/null
+++ b/pkgs/development/libraries/haskell/interpolatedstring-perl6/default.nix
@@ -0,0 +1,13 @@
+{ cabal, haskellSrcMeta, text }:
+
+cabal.mkDerivation (self: {
+ pname = "interpolatedstring-perl6";
+ version = "0.9.0";
+ sha256 = "15hzmni3wfdgjl0vyk5mcld61ba99wdax87s7wkz2s8bsyxkbq9n";
+ buildDepends = [ haskellSrcMeta text ];
+ meta = {
+ description = "QuasiQuoter for Perl6-style multi-line interpolated strings";
+ license = self.stdenv.lib.licenses.bsd3;
+ platforms = self.ghc.meta.platforms;
+ };
+})
diff --git a/pkgs/development/libraries/haskell/ixdopp/default.nix b/pkgs/development/libraries/haskell/ixdopp/default.nix
index 94bfa018553..8e4a92f6dca 100644
--- a/pkgs/development/libraries/haskell/ixdopp/default.nix
+++ b/pkgs/development/libraries/haskell/ixdopp/default.nix
@@ -6,10 +6,10 @@ cabal.mkDerivation (self: {
sha256 = "1vknwznk42b33q4pmh6z620g761yf3cmsmrmhilgq42i5qhll4d4";
isLibrary = false;
isExecutable = true;
- buildDepends = [ preprocessorTools ];
+ buildDepends = [ preprocessorTools syb ];
meta = {
homepage = "http://www.eecs.harvard.edu/~tov/pubs/haskell-session-types/";
- description = "Expands a Haskell program using ixdo notation into a Haskell program using the indexed monad bind operator (>>>=)";
+ description = "A preprocessor for expanding \"ixdo\" notation for indexed monads";
license = self.stdenv.lib.licenses.bsd3;
platforms = self.ghc.meta.platforms;
};
diff --git a/pkgs/development/libraries/haskell/lens/4.0.1.nix b/pkgs/development/libraries/haskell/lens/4.0.3.nix
similarity index 94%
rename from pkgs/development/libraries/haskell/lens/4.0.1.nix
rename to pkgs/development/libraries/haskell/lens/4.0.3.nix
index d921dbe1cbb..9aca42a77df 100644
--- a/pkgs/development/libraries/haskell/lens/4.0.1.nix
+++ b/pkgs/development/libraries/haskell/lens/4.0.3.nix
@@ -10,8 +10,8 @@
cabal.mkDerivation (self: {
pname = "lens";
- version = "4.0.1";
- sha256 = "1dm4gdpyd7kndf3zaikjqa1gkc7y7wzfnyhhk3xyhjxa5hn5rj75";
+ version = "4.0.3";
+ sha256 = "01gf0hxpd136555r9ilzjrc6fyw0ng9bmr8bmkhfnkba127y7hgx";
buildDepends = [
aeson bifunctors comonad constraints contravariant distributive
exceptions filepath hashable mtl parallel primitive profunctors
diff --git a/pkgs/development/libraries/haskell/lifted-base/default.nix b/pkgs/development/libraries/haskell/lifted-base/default.nix
index cfa51bd39aa..7462b362c98 100644
--- a/pkgs/development/libraries/haskell/lifted-base/default.nix
+++ b/pkgs/development/libraries/haskell/lifted-base/default.nix
@@ -4,8 +4,8 @@
cabal.mkDerivation (self: {
pname = "lifted-base";
- version = "0.2.1.1";
- sha256 = "062mdh364c4adnyc3l037zi1aaqvgm43g1x6vf3pjb75c3sayc5k";
+ version = "0.2.2.0";
+ sha256 = "1m6mk24nxkp9a78nywdb844avbqwh931gv1bxsgcbhavavzs72jj";
buildDepends = [
baseUnicodeSymbols monadControl transformersBase
];
diff --git a/pkgs/development/libraries/haskell/llvm-general-pure/3.3.nix b/pkgs/development/libraries/haskell/llvm-general-pure/3.3.8.2.nix
similarity index 100%
rename from pkgs/development/libraries/haskell/llvm-general-pure/3.3.nix
rename to pkgs/development/libraries/haskell/llvm-general-pure/3.3.8.2.nix
diff --git a/pkgs/development/libraries/haskell/llvm-general-pure/3.4.nix b/pkgs/development/libraries/haskell/llvm-general-pure/3.4.1.0.nix
similarity index 86%
rename from pkgs/development/libraries/haskell/llvm-general-pure/3.4.nix
rename to pkgs/development/libraries/haskell/llvm-general-pure/3.4.1.0.nix
index 71947f00a23..200d8d00b44 100644
--- a/pkgs/development/libraries/haskell/llvm-general-pure/3.4.nix
+++ b/pkgs/development/libraries/haskell/llvm-general-pure/3.4.1.0.nix
@@ -4,8 +4,8 @@
cabal.mkDerivation (self: {
pname = "llvm-general-pure";
- version = "3.4.0.0";
- sha256 = "1b8nl4w16w6dsszmnvylrysi4fd86jcn2bvv531d13p81ybnxlx1";
+ version = "3.4.1.0";
+ sha256 = "0cjzqw9k6x8akbgx4rdigvhjhfv9zlq40p789invdc514qmxhr6q";
buildDepends = [ mtl parsec setenv transformers ];
testDepends = [
HUnit mtl QuickCheck testFramework testFrameworkHunit
diff --git a/pkgs/development/libraries/haskell/llvm-general/3.3.nix b/pkgs/development/libraries/haskell/llvm-general/3.3.8.2.nix
similarity index 100%
rename from pkgs/development/libraries/haskell/llvm-general/3.3.nix
rename to pkgs/development/libraries/haskell/llvm-general/3.3.8.2.nix
diff --git a/pkgs/development/libraries/haskell/llvm-general/3.4.nix b/pkgs/development/libraries/haskell/llvm-general/3.4.1.0.nix
similarity index 88%
rename from pkgs/development/libraries/haskell/llvm-general/3.4.nix
rename to pkgs/development/libraries/haskell/llvm-general/3.4.1.0.nix
index 7749c47689e..b86a65618cd 100644
--- a/pkgs/development/libraries/haskell/llvm-general/3.4.nix
+++ b/pkgs/development/libraries/haskell/llvm-general/3.4.1.0.nix
@@ -5,8 +5,8 @@
cabal.mkDerivation (self: {
pname = "llvm-general";
- version = "3.4.0.0";
- sha256 = "1hj96wkgdqyvckgmk7r43n9s9fcq4gijnv0ghrj92ggd13hhmv7b";
+ version = "3.4.1.0";
+ sha256 = "0vh0bqkkahafhiv1sqvrncxswvz4rvb2zfwf33936fnnh5vn8vyp";
buildDepends = [
llvmGeneralPure mtl parsec setenv transformers utf8String
];
diff --git a/pkgs/development/libraries/haskell/logict/default.nix b/pkgs/development/libraries/haskell/logict/default.nix
index 9dc4b58797f..b0768708429 100644
--- a/pkgs/development/libraries/haskell/logict/default.nix
+++ b/pkgs/development/libraries/haskell/logict/default.nix
@@ -2,11 +2,11 @@
cabal.mkDerivation (self: {
pname = "logict";
- version = "0.6.0.1";
- sha256 = "0sznrnx7l5sqnyvc2xwx1q33b4833qsnhppm06a3scp9gj3y1xp2";
+ version = "0.6.0.2";
+ sha256 = "07hnirv6snnym2r7iijlfz00b60jpy2856zvqxh989q0in7bd0hi";
buildDepends = [ mtl ];
meta = {
- homepage = "http://code.haskell.org/~dolio/logict";
+ homepage = "http://code.haskell.org/~dolio/";
description = "A backtracking logic-programming monad";
license = self.stdenv.lib.licenses.bsd3;
platforms = self.ghc.meta.platforms;
diff --git a/pkgs/development/libraries/haskell/lrucache/default.nix b/pkgs/development/libraries/haskell/lrucache/default.nix
index 2d494f4a896..43fdd6caf99 100644
--- a/pkgs/development/libraries/haskell/lrucache/default.nix
+++ b/pkgs/development/libraries/haskell/lrucache/default.nix
@@ -2,8 +2,8 @@
cabal.mkDerivation (self: {
pname = "lrucache";
- version = "1.1.1.3";
- sha256 = "1djjxlyfrk3wpgc4h6xljpray09v7lc956202k9bxra24vj5f1lm";
+ version = "1.1.1.4";
+ sha256 = "0w3b338wsf7c0acjxxfdjxsljfpsix67aihkl2jwnp5x71awf8qh";
meta = {
homepage = "http://github.com/chowells79/lrucache";
description = "a simple, pure LRU cache";
diff --git a/pkgs/development/libraries/haskell/monad-control/default.nix b/pkgs/development/libraries/haskell/monad-control/default.nix
index 12657a63b4c..e9c6088b5f4 100644
--- a/pkgs/development/libraries/haskell/monad-control/default.nix
+++ b/pkgs/development/libraries/haskell/monad-control/default.nix
@@ -2,8 +2,8 @@
cabal.mkDerivation (self: {
pname = "monad-control";
- version = "0.3.2.2";
- sha256 = "1wwcx2k0nzmjqxf8d8wasnhvdx5q3nxkcyq7vbprkfy85sj7ivxc";
+ version = "0.3.2.3";
+ sha256 = "1fk3cqzsiwyjpyd20z1j0i4m669rcag2q7kpl78m6vm1a405iwlw";
buildDepends = [
baseUnicodeSymbols transformers transformersBase
];
diff --git a/pkgs/development/libraries/haskell/numtype-tf/default.nix b/pkgs/development/libraries/haskell/numtype-tf/default.nix
index ad7f2d98660..d317f57efce 100644
--- a/pkgs/development/libraries/haskell/numtype-tf/default.nix
+++ b/pkgs/development/libraries/haskell/numtype-tf/default.nix
@@ -2,8 +2,8 @@
cabal.mkDerivation (self: {
pname = "numtype-tf";
- version = "0.1.1";
- sha256 = "0aj24jlfcv4rsa0zfglsfgq9f0kxln32drypp66652ycffz3ip9a";
+ version = "0.1.2";
+ sha256 = "00bnz9k4nq21z4vax37qjv6ra2jvlshk0jlici1w8y9rx39zrjyx";
meta = {
homepage = "http://dimensional.googlecode.com/";
description = "Type-level (low cardinality) integers, implemented using type families";
diff --git a/pkgs/development/libraries/haskell/numtype/default.nix b/pkgs/development/libraries/haskell/numtype/default.nix
index d35f763d32e..25e0a61beb9 100644
--- a/pkgs/development/libraries/haskell/numtype/default.nix
+++ b/pkgs/development/libraries/haskell/numtype/default.nix
@@ -2,8 +2,8 @@
cabal.mkDerivation (self: {
pname = "numtype";
- version = "1.0.1";
- sha256 = "130qchi9dplpg7pxf4pz7nz4mnprngw16mizqycp5pdlawbcp5js";
+ version = "1.1";
+ sha256 = "1az10xcfl6qpyy9qnh8g2iqx53rxnjxzc1h8kl1gira6yv7g6857";
meta = {
homepage = "http://dimensional.googlecode.com/";
description = "Type-level (low cardinality) integers";
diff --git a/pkgs/development/libraries/haskell/parsers/0.10.2.nix b/pkgs/development/libraries/haskell/parsers/0.10.3.nix
similarity index 84%
rename from pkgs/development/libraries/haskell/parsers/0.10.2.nix
rename to pkgs/development/libraries/haskell/parsers/0.10.3.nix
index 406cb610a3e..84e5619167a 100644
--- a/pkgs/development/libraries/haskell/parsers/0.10.2.nix
+++ b/pkgs/development/libraries/haskell/parsers/0.10.3.nix
@@ -4,8 +4,8 @@
cabal.mkDerivation (self: {
pname = "parsers";
- version = "0.10.2";
- sha256 = "092wck874sdyyh4aql5kzsm8k9a7dscgndvzarhh98by5k3n45bk";
+ version = "0.10.3";
+ sha256 = "1s9n59q77h0w1csq7yh945b53847a9hnpvviashgxyi7ahvw7jli";
buildDepends = [
charset parsec text transformers unorderedContainers
];
diff --git a/pkgs/development/libraries/haskell/persistent-postgresql/default.nix b/pkgs/development/libraries/haskell/persistent-postgresql/default.nix
index c4dc0be2a43..9853969d9f1 100644
--- a/pkgs/development/libraries/haskell/persistent-postgresql/default.nix
+++ b/pkgs/development/libraries/haskell/persistent-postgresql/default.nix
@@ -4,8 +4,8 @@
cabal.mkDerivation (self: {
pname = "persistent-postgresql";
- version = "1.3.0";
- sha256 = "1mayfq1z9i46nqgiajkhxx4z3hfy3gl5nzx8d5xlp7s1mliz3qjv";
+ version = "1.3.0.1";
+ sha256 = "00m78hdrnk367ymlgbi49p2zq2gkwskax1ng2h3ljskf3ic4jahf";
buildDepends = [
aeson blazeBuilder conduit monadControl persistent postgresqlLibpq
postgresqlSimple text time transformers
diff --git a/pkgs/development/libraries/haskell/persistent-sqlite/default.nix b/pkgs/development/libraries/haskell/persistent-sqlite/default.nix
index fc59c2477ed..742f4d3b516 100644
--- a/pkgs/development/libraries/haskell/persistent-sqlite/default.nix
+++ b/pkgs/development/libraries/haskell/persistent-sqlite/default.nix
@@ -4,8 +4,8 @@
cabal.mkDerivation (self: {
pname = "persistent-sqlite";
- version = "1.3.0.1";
- sha256 = "0nfih7g32pmh0hq798r4mxkkrp2zjkqb38zwhdyrdbszk6ryzx9l";
+ version = "1.3.0.2";
+ sha256 = "0mxnmbqsj67mfsp7d09wbziwfwcfdqr0rln0qcyi3wjwgybjmkzk";
buildDepends = [
aeson conduit monadControl monadLogger persistent text transformers
];
diff --git a/pkgs/development/libraries/haskell/persistent-template/default.nix b/pkgs/development/libraries/haskell/persistent-template/default.nix
index 60ae9a40ca3..9dc3ea188bb 100644
--- a/pkgs/development/libraries/haskell/persistent-template/default.nix
+++ b/pkgs/development/libraries/haskell/persistent-template/default.nix
@@ -4,8 +4,8 @@
cabal.mkDerivation (self: {
pname = "persistent-template";
- version = "1.3.1";
- sha256 = "148gznxqzd5743l0r3pc9g14gvanxpl6nfla2lhb2xsa162b2hjx";
+ version = "1.3.1.1";
+ sha256 = "13rbsxfrync5vmg5f1h5z5lc2b1vvh7nzbap4s5g5df3nvzfmmqx";
buildDepends = [
aeson monadControl monadLogger persistent text transformers
unorderedContainers
diff --git a/pkgs/development/libraries/haskell/pipes-aeson/default.nix b/pkgs/development/libraries/haskell/pipes-aeson/default.nix
index 2552970717d..899810c1539 100644
--- a/pkgs/development/libraries/haskell/pipes-aeson/default.nix
+++ b/pkgs/development/libraries/haskell/pipes-aeson/default.nix
@@ -1,13 +1,14 @@
-{ cabal, aeson, attoparsec, pipes, pipesAttoparsec, pipesParse
-, transformers
+{ cabal, aeson, attoparsec, pipes, pipesAttoparsec, pipesBytestring
+, pipesParse, transformers
}:
cabal.mkDerivation (self: {
pname = "pipes-aeson";
- version = "0.2.1";
- sha256 = "19zrbk9jbls8zsnhx8bm9dzd7rxvf98bpjkr3k9ggmx2g5p08mgz";
+ version = "0.3.0";
+ sha256 = "1kckdllw5xnh8z92gjw5swyxp9km879wqfly7af3iirwhickk4vn";
buildDepends = [
- aeson attoparsec pipes pipesAttoparsec pipesParse transformers
+ aeson attoparsec pipes pipesAttoparsec pipesBytestring pipesParse
+ transformers
];
meta = {
homepage = "https://github.com/k0001/pipes-aeson";
diff --git a/pkgs/development/libraries/haskell/pipes-attoparsec/default.nix b/pkgs/development/libraries/haskell/pipes-attoparsec/default.nix
index 484f2104567..27f9d8a0b87 100644
--- a/pkgs/development/libraries/haskell/pipes-attoparsec/default.nix
+++ b/pkgs/development/libraries/haskell/pipes-attoparsec/default.nix
@@ -1,16 +1,15 @@
-{ cabal, attoparsec, HUnit, mmorph, pipes, pipesParse, QuickCheck
-, testFramework, testFrameworkHunit, testFrameworkQuickcheck2, text
-, transformers
+{ cabal, attoparsec, HUnit, mmorph, pipes, pipesParse, tasty
+, tastyHunit, text, transformers
}:
cabal.mkDerivation (self: {
pname = "pipes-attoparsec";
- version = "0.3.1";
- sha256 = "1bvz5fxy2mfz3swiv9jfmhxl1psmm3c7nfi58pggam52lz20va2h";
+ version = "0.4.0";
+ sha256 = "0xffqxsh8yvfdk39mdgkf0l2v284fr31nz5k16dq752p63fnczkw";
buildDepends = [ attoparsec pipes pipesParse text transformers ];
testDepends = [
- attoparsec HUnit mmorph pipes pipesParse QuickCheck testFramework
- testFrameworkHunit testFrameworkQuickcheck2 text transformers
+ attoparsec HUnit mmorph pipes pipesParse tasty tastyHunit text
+ transformers
];
meta = {
homepage = "https://github.com/k0001/pipes-attoparsec";
diff --git a/pkgs/development/libraries/haskell/preprocessor-tools/0.1.3.nix b/pkgs/development/libraries/haskell/preprocessor-tools/0.1.3.nix
index 1ca159c7128..7b96ba87a8e 100644
--- a/pkgs/development/libraries/haskell/preprocessor-tools/0.1.3.nix
+++ b/pkgs/development/libraries/haskell/preprocessor-tools/0.1.3.nix
@@ -6,8 +6,8 @@ cabal.mkDerivation (self: {
sha256 = "0jz85v93zpv6cwvad18wr12nsikmv4n20gn37zli2h34zi543i9v";
buildDepends = [ mtl parsec syb ];
meta = {
- homepage = "http://www.eecs.harvard.edu/~tov/pubs/haskell-session-types/";
- description = "Extending Haskell's syntax using a custom preprocessor";
+ homepage = "http://www.ccs.neu.edu/~tov/pubs/haskell-session-types";
+ description = "A framework for extending Haskell's syntax via quick-and-dirty preprocessors";
license = self.stdenv.lib.licenses.bsd3;
platforms = self.ghc.meta.platforms;
};
diff --git a/pkgs/development/libraries/haskell/preprocessor-tools/1.0.1.nix b/pkgs/development/libraries/haskell/preprocessor-tools/1.0.1.nix
index e4a1f02eafa..c8a01b35a97 100644
--- a/pkgs/development/libraries/haskell/preprocessor-tools/1.0.1.nix
+++ b/pkgs/development/libraries/haskell/preprocessor-tools/1.0.1.nix
@@ -7,7 +7,7 @@ cabal.mkDerivation (self: {
buildDepends = [ mtl parsec syb ];
meta = {
homepage = "http://www.eecs.harvard.edu/~tov/pubs/haskell-session-types/";
- description = "Extending Haskell's syntax using a custom preprocessor";
+ description = "A framework for extending Haskell's syntax via quick-and-dirty preprocessors";
license = self.stdenv.lib.licenses.bsd3;
platforms = self.ghc.meta.platforms;
};
diff --git a/pkgs/development/libraries/haskell/pretty-show/1.6.5.nix b/pkgs/development/libraries/haskell/pretty-show/1.6.7.nix
similarity index 86%
rename from pkgs/development/libraries/haskell/pretty-show/1.6.5.nix
rename to pkgs/development/libraries/haskell/pretty-show/1.6.7.nix
index 60a191da251..7e3e3e25e8a 100644
--- a/pkgs/development/libraries/haskell/pretty-show/1.6.5.nix
+++ b/pkgs/development/libraries/haskell/pretty-show/1.6.7.nix
@@ -2,8 +2,8 @@
cabal.mkDerivation (self: {
pname = "pretty-show";
- version = "1.6.5";
- sha256 = "0yn20gh2xwzvfwb9fdzxqqbbb6vvd4rlv5ancw4vc8p2kgfhwxf3";
+ version = "1.6.7";
+ sha256 = "16qjp6cl3hyir5bchnncq95bp7nw5cpp5kd5mszkjjhzw1jj9srz";
isLibrary = true;
isExecutable = true;
buildDepends = [ filepath haskellLexer ];
diff --git a/pkgs/development/libraries/haskell/reducers/default.nix b/pkgs/development/libraries/haskell/reducers/default.nix
index bc1bf72beea..335cee497ea 100644
--- a/pkgs/development/libraries/haskell/reducers/default.nix
+++ b/pkgs/development/libraries/haskell/reducers/default.nix
@@ -5,8 +5,8 @@
cabal.mkDerivation (self: {
pname = "reducers";
- version = "3.10.1.1";
- sha256 = "1d4zhcqy499pm0wxn76gyw0brbrdycmajblqy4mi49kiy0zlg8a7";
+ version = "3.10.2";
+ sha256 = "159srk8v6zmfprq80mx3rpqrxzgzvf7xiwm8ywfaxrqyfcwkkjmg";
buildDepends = [
comonad fingertree hashable keys pointed semigroupoids semigroups
text transformers unorderedContainers
diff --git a/pkgs/development/libraries/haskell/shake/default.nix b/pkgs/development/libraries/haskell/shake/default.nix
index 411140459ed..d0c5f220099 100644
--- a/pkgs/development/libraries/haskell/shake/default.nix
+++ b/pkgs/development/libraries/haskell/shake/default.nix
@@ -4,8 +4,8 @@
cabal.mkDerivation (self: {
pname = "shake";
- version = "0.11";
- sha256 = "0w0m94ahr2pzgrknk023vpabjydaj2ir8372rca3b4xik6idaag2";
+ version = "0.11.1";
+ sha256 = "0fk3b4c9r4ybdv7x533afy91dcyf3ji2xsyfpi72z7637vmgv202";
isLibrary = true;
isExecutable = true;
buildDepends = [
diff --git a/pkgs/development/libraries/haskell/shakespeare-js/default.nix b/pkgs/development/libraries/haskell/shakespeare-js/default.nix
index ed743d87832..36d3443c958 100644
--- a/pkgs/development/libraries/haskell/shakespeare-js/default.nix
+++ b/pkgs/development/libraries/haskell/shakespeare-js/default.nix
@@ -2,8 +2,8 @@
cabal.mkDerivation (self: {
pname = "shakespeare-js";
- version = "1.2.0.2";
- sha256 = "1d7fmw2295ycjipaj9fjgw02y1088h2gxxk1d6sy4c165x95r6vx";
+ version = "1.2.0.3";
+ sha256 = "1zcqq8880rsdx3xwf1czl4vn5l9igw181snbfv5k1gxpif6myhp1";
buildDepends = [ aeson shakespeare text ];
testDepends = [ aeson hspec HUnit shakespeare text ];
meta = {
diff --git a/pkgs/development/libraries/haskell/shakespeare-text/default.nix b/pkgs/development/libraries/haskell/shakespeare-text/default.nix
index feadafeb29f..95ae94a8f26 100644
--- a/pkgs/development/libraries/haskell/shakespeare-text/default.nix
+++ b/pkgs/development/libraries/haskell/shakespeare-text/default.nix
@@ -2,8 +2,8 @@
cabal.mkDerivation (self: {
pname = "shakespeare-text";
- version = "1.0.0.10";
- sha256 = "0az3l70syb7ch5fb4i0nlibgh7wcrzqnqmlp1w5h68s796g5rjlb";
+ version = "1.0.1";
+ sha256 = "1vxy1d8r9wd8qijmy2jm7c7y7wg77qnzsh1ga0rlh3nklj9w01ml";
buildDepends = [ shakespeare text ];
testDepends = [ hspec HUnit text ];
meta = {
diff --git a/pkgs/development/libraries/haskell/smtps-gmail/default.nix b/pkgs/development/libraries/haskell/smtps-gmail/default.nix
new file mode 100644
index 00000000000..d41a37d1e5b
--- /dev/null
+++ b/pkgs/development/libraries/haskell/smtps-gmail/default.nix
@@ -0,0 +1,23 @@
+{ cabal, base64String, cprngAes, network, tlsExtra, utf8String
+}:
+
+cabal.mkDerivation (self: {
+ pname = "smtps-gmail";
+ version = "1.0.0";
+ sha256 = "0kv5m8rg5z1iic10av3bscdygnph1iab4b22sq3hmx6a93abqkc2";
+ isLibrary = true;
+ isExecutable = true;
+ buildDepends = [
+ base64String cprngAes network tlsExtra utf8String
+ ];
+ meta = {
+ homepage = "https://github.com/enzoh/smtps-gmail";
+ description = "Gmail API";
+ license = self.stdenv.lib.licenses.bsd3;
+ platforms = self.ghc.meta.platforms;
+ };
+ # adding a Setup script as it's needed by nix
+ preConfigure = ''
+ printf "import Distribution.Simple\nmain = defaultMain\n" > Setup.hs
+ '';
+})
diff --git a/pkgs/development/libraries/haskell/snaplet-acid-state/default.nix b/pkgs/development/libraries/haskell/snaplet-acid-state/default.nix
index 8a9a594e45d..4d66f69acd6 100644
--- a/pkgs/development/libraries/haskell/snaplet-acid-state/default.nix
+++ b/pkgs/development/libraries/haskell/snaplet-acid-state/default.nix
@@ -2,8 +2,8 @@
cabal.mkDerivation (self: {
pname = "snaplet-acid-state";
- version = "0.2.6";
- sha256 = "005c4x7sh820iar69rany3hv4rlbzpsd4yqd2x2v3jql9z55k4s9";
+ version = "0.2.6.1";
+ sha256 = "0wlawnsxisslqzspa29swsdmncgx04z3rd1bhwx73mx5pksykw60";
buildDepends = [ acidState snap text ];
meta = {
homepage = "https://github.com/mightybyte/snaplet-acid-state";
diff --git a/pkgs/development/libraries/haskell/sqlite-simple/default.nix b/pkgs/development/libraries/haskell/sqlite-simple/default.nix
index c566cd19d82..cc6204735d2 100644
--- a/pkgs/development/libraries/haskell/sqlite-simple/default.nix
+++ b/pkgs/development/libraries/haskell/sqlite-simple/default.nix
@@ -1,12 +1,15 @@
-{ cabal, base16Bytestring, directSqlite, HUnit, text, time
-, transformers
+{ cabal, attoparsec, base16Bytestring, blazeBuilder, blazeTextual
+, directSqlite, HUnit, text, time, transformers
}:
cabal.mkDerivation (self: {
pname = "sqlite-simple";
- version = "0.4.4.0";
- sha256 = "09vgy3hji0bjb3bwxwkwhmgf50q442dqr3d86g5l5s3xiw3hca0r";
- buildDepends = [ directSqlite text time transformers ];
+ version = "0.4.5.1";
+ sha256 = "0mmj6vk3yjvrbsggc5pyba5iprzvfhlsq1jfradpazgfc998j0ry";
+ buildDepends = [
+ attoparsec blazeBuilder blazeTextual directSqlite text time
+ transformers
+ ];
testDepends = [ base16Bytestring directSqlite HUnit text time ];
meta = {
homepage = "http://github.com/nurpax/sqlite-simple";
diff --git a/pkgs/development/libraries/haskell/th-orphans/default.nix b/pkgs/development/libraries/haskell/th-orphans/default.nix
index dd9fbc198bf..9a8d22423a3 100644
--- a/pkgs/development/libraries/haskell/th-orphans/default.nix
+++ b/pkgs/development/libraries/haskell/th-orphans/default.nix
@@ -2,8 +2,8 @@
cabal.mkDerivation (self: {
pname = "th-orphans";
- version = "0.8";
- sha256 = "0kzzcicn6pggvvblhbrs3vh0bf71izlb99lb0f5qww7ymi4smldr";
+ version = "0.8.1";
+ sha256 = "1glf1zkiip18l0qdy3856ag7ksbxzd11dzdyq00qrz87kck5y58w";
buildDepends = [ thLift ];
jailbreak = true;
meta = {
diff --git a/pkgs/development/libraries/haskell/unbounded-delays/default.nix b/pkgs/development/libraries/haskell/unbounded-delays/default.nix
index ccccf9d95d3..69f6ac60ac3 100644
--- a/pkgs/development/libraries/haskell/unbounded-delays/default.nix
+++ b/pkgs/development/libraries/haskell/unbounded-delays/default.nix
@@ -2,8 +2,8 @@
cabal.mkDerivation (self: {
pname = "unbounded-delays";
- version = "0.1.0.5";
- sha256 = "109swgxlv3ywf5g0wgm3gp2y7azd6mqf2lfb9sk21dfzcz28aq4k";
+ version = "0.1.0.6";
+ sha256 = "0yykb9jqxhvbngvp2gbzb0ch2cmzdxx8km62dclyvr3xbv6hk1h7";
meta = {
homepage = "https://github.com/basvandijk/unbounded-delays";
description = "Unbounded thread delays and timeouts";
diff --git a/pkgs/development/libraries/haskell/websockets/default.nix b/pkgs/development/libraries/haskell/websockets/default.nix
index 82a745b8725..24b0554ea01 100644
--- a/pkgs/development/libraries/haskell/websockets/default.nix
+++ b/pkgs/development/libraries/haskell/websockets/default.nix
@@ -6,8 +6,8 @@
cabal.mkDerivation (self: {
pname = "websockets";
- version = "0.8.1.2";
- sha256 = "1xr44j3fcah3p5ic5s4rirb1ribq88m7ckmdfhwz5wy42sfiwv99";
+ version = "0.8.1.3";
+ sha256 = "16iq2grgafshjwhjxwb0qdxiawr6z6hxaksix52nr8l4wm9ibhjv";
buildDepends = [
attoparsec base64Bytestring binary blazeBuilder caseInsensitive
entropy ioStreams mtl network random SHA text
diff --git a/pkgs/development/libraries/haskell/yaml/default.nix b/pkgs/development/libraries/haskell/yaml/default.nix
index e7fac87c319..35106292f85 100644
--- a/pkgs/development/libraries/haskell/yaml/default.nix
+++ b/pkgs/development/libraries/haskell/yaml/default.nix
@@ -4,8 +4,8 @@
cabal.mkDerivation (self: {
pname = "yaml";
- version = "0.8.6";
- sha256 = "0qmbgb2gsqj25hl1blxjjcpk5fp5za9d1vshjs86mpapqvlhr9rn";
+ version = "0.8.7.2";
+ sha256 = "00dmmws0gmp9fb2ha6z055ix7jlsiry24bwhkl226b680gi9a84d";
isLibrary = true;
isExecutable = true;
buildDepends = [
diff --git a/pkgs/development/libraries/haskell/yesod-bin/default.nix b/pkgs/development/libraries/haskell/yesod-bin/default.nix
index f53c8f554b0..a466da06d41 100644
--- a/pkgs/development/libraries/haskell/yesod-bin/default.nix
+++ b/pkgs/development/libraries/haskell/yesod-bin/default.nix
@@ -10,8 +10,8 @@
cabal.mkDerivation (self: {
pname = "yesod-bin";
- version = "1.2.5.8";
- sha256 = "1k9afj8f463rs0w9bzxda587jhm1g3fq3l42mabydmg8mx4hbm2c";
+ version = "1.2.6";
+ sha256 = "10p0j5w8s2lfjlmkyw4f2lslfr4xb8mzx5ijwavcpc7q9zw9zjk5";
isLibrary = false;
isExecutable = true;
buildDepends = [
diff --git a/pkgs/development/libraries/haskell/yesod-core/default.nix b/pkgs/development/libraries/haskell/yesod-core/default.nix
index 0b9284b8f14..5eaaa316ecf 100644
--- a/pkgs/development/libraries/haskell/yesod-core/default.nix
+++ b/pkgs/development/libraries/haskell/yesod-core/default.nix
@@ -10,8 +10,8 @@
cabal.mkDerivation (self: {
pname = "yesod-core";
- version = "1.2.6.6";
- sha256 = "1wmcsblzr9mq831yp7g90m0rk8a1rgsz1vcdcsr7dsjrykcvxqfq";
+ version = "1.2.6.7";
+ sha256 = "09vxi7fkiakr58ifa6ribsqq1p6fmqclznj38vhl5rdfalm7yivg";
buildDepends = [
aeson attoparsecConduit blazeBuilder blazeHtml blazeMarkup
caseInsensitive cereal clientsession conduit cookie dataDefault
diff --git a/pkgs/development/libraries/haskell/yesod-form/default.nix b/pkgs/development/libraries/haskell/yesod-form/default.nix
index f87938f9a03..7474884d4a0 100644
--- a/pkgs/development/libraries/haskell/yesod-form/default.nix
+++ b/pkgs/development/libraries/haskell/yesod-form/default.nix
@@ -6,8 +6,8 @@
cabal.mkDerivation (self: {
pname = "yesod-form";
- version = "1.3.5";
- sha256 = "01qh2s4z9w8g70xz613b2dirfrbag6c861c2niy85c6x8h05nnwy";
+ version = "1.3.5.1";
+ sha256 = "0jvza4ly3kjfsbayjcggf8fq0lcb8n9f6cp0q6fcif1xkwkkhmdh";
buildDepends = [
aeson attoparsec blazeBuilder blazeHtml blazeMarkup cryptoApi
dataDefault emailValidate hamlet network persistent resourcet
diff --git a/pkgs/development/libraries/haskell/yesod/default.nix b/pkgs/development/libraries/haskell/yesod/default.nix
index b4e935428b2..130e6eb9c33 100644
--- a/pkgs/development/libraries/haskell/yesod/default.nix
+++ b/pkgs/development/libraries/haskell/yesod/default.nix
@@ -1,18 +1,19 @@
-{ cabal, aeson, blazeHtml, blazeMarkup, dataDefault, hamlet
-, monadControl, networkConduit, safe, shakespeareCss, shakespeareJs
-, text, transformers, unorderedContainers, wai, waiExtra, warp
-, yaml, yesodAuth, yesodCore, yesodForm, yesodPersistent
+{ cabal, aeson, blazeHtml, blazeMarkup, dataDefault, fastLogger
+, hamlet, monadControl, monadLogger, networkConduit, safe
+, shakespeareCss, shakespeareJs, text, transformers
+, unorderedContainers, wai, waiExtra, warp, yaml, yesodAuth
+, yesodCore, yesodForm, yesodPersistent
}:
cabal.mkDerivation (self: {
pname = "yesod";
- version = "1.2.4";
- sha256 = "0c8z4hsplfjb2ilrk0qbyighjipwcfhf55xqaw4zqvq752yj4n7c";
+ version = "1.2.5";
+ sha256 = "0vcszhd8vasfpm754bz1vyarhlkffj3kbrfcq9q5gqmm389jfpk2";
buildDepends = [
- aeson blazeHtml blazeMarkup dataDefault hamlet monadControl
- networkConduit safe shakespeareCss shakespeareJs text transformers
- unorderedContainers wai waiExtra warp yaml yesodAuth yesodCore
- yesodForm yesodPersistent
+ aeson blazeHtml blazeMarkup dataDefault fastLogger hamlet
+ monadControl monadLogger networkConduit safe shakespeareCss
+ shakespeareJs text transformers unorderedContainers wai waiExtra
+ warp yaml yesodAuth yesodCore yesodForm yesodPersistent
];
meta = {
homepage = "http://www.yesodweb.com/";
diff --git a/pkgs/development/libraries/haskell/zeromq3-haskell/default.nix b/pkgs/development/libraries/haskell/zeromq3-haskell/default.nix
index a60bc457f85..820f174e129 100644
--- a/pkgs/development/libraries/haskell/zeromq3-haskell/default.nix
+++ b/pkgs/development/libraries/haskell/zeromq3-haskell/default.nix
@@ -4,8 +4,8 @@
cabal.mkDerivation (self: {
pname = "zeromq3-haskell";
- version = "0.5.1";
- sha256 = "0jmdhs2apmcr3wf5r739gq9qqad59qj82h7qpdk3m4cc2a7djil0";
+ version = "0.5.2";
+ sha256 = "1ky92qwyk27qsxnvaj0mc9yyhk7g19ry2nq55666ayahc899z213";
buildDepends = [
async MonadCatchIOTransformers semigroups transformers
];
@@ -13,7 +13,7 @@ cabal.mkDerivation (self: {
ansiTerminal async checkers MonadCatchIOTransformers QuickCheck
transformers
];
- extraLibraries = [ zeromq ];
+ pkgconfigDepends = [ zeromq ];
doCheck = false;
meta = {
homepage = "http://github.com/twittner/zeromq-haskell/";
diff --git a/pkgs/development/libraries/haskell/zip-archive/default.nix b/pkgs/development/libraries/haskell/zip-archive/default.nix
index bfe648f449b..2d18fcd1f83 100644
--- a/pkgs/development/libraries/haskell/zip-archive/default.nix
+++ b/pkgs/development/libraries/haskell/zip-archive/default.nix
@@ -2,8 +2,8 @@
cabal.mkDerivation (self: {
pname = "zip-archive";
- version = "0.2";
- sha256 = "0d2n8mgfikyjzc4x7qm3vvpmhhf3mva9f0q6p9l1q9b7dlf8vmdv";
+ version = "0.2.1";
+ sha256 = "1w58fg3kzbsgscadwx3k34xbq7d7hzghlv4mxyglaxn3qdcd6w8b";
isLibrary = true;
isExecutable = true;
buildDepends = [ binary digest filepath mtl text time zlib ];
diff --git a/pkgs/development/libraries/kerberos/heimdal.nix b/pkgs/development/libraries/kerberos/heimdal.nix
index d4728273d34..8f4138282f0 100644
--- a/pkgs/development/libraries/kerberos/heimdal.nix
+++ b/pkgs/development/libraries/kerberos/heimdal.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, openldap, readline, db4, openssl, cyrus_sasl, sqlite} :
+{ stdenv, fetchurl, openldap, readline, db, openssl, cyrus_sasl, sqlite} :
stdenv.mkDerivation rec {
name = "heimdal-1.5.3";
@@ -23,5 +23,5 @@ stdenv.mkDerivation rec {
rmdir $out/libexec
'';
- propagatedBuildInputs = [ readline db4 openssl openldap cyrus_sasl sqlite];
+ propagatedBuildInputs = [ readline db openssl openldap cyrus_sasl sqlite];
}
diff --git a/pkgs/development/libraries/libchop/default.nix b/pkgs/development/libraries/libchop/default.nix
index 9a1b4122365..1b16d361c6d 100644
--- a/pkgs/development/libraries/libchop/default.nix
+++ b/pkgs/development/libraries/libchop/default.nix
@@ -1,4 +1,4 @@
-{ fetchurl, stdenv, zlib, bzip2, libgcrypt, gdbm, gperf, tdb, gnutls, db4
+{ fetchurl, stdenv, zlib, bzip2, libgcrypt, gdbm, gperf, tdb, gnutls, db
, libuuid, lzo, pkgconfig, guile }:
stdenv.mkDerivation rec {
@@ -16,7 +16,7 @@ stdenv.mkDerivation rec {
buildInputs =
[ zlib bzip2 lzo
libgcrypt
- gdbm db4 tdb
+ gdbm db tdb
gnutls libuuid
guile
];
diff --git a/pkgs/development/libraries/liblastfm/default.nix b/pkgs/development/libraries/liblastfm/default.nix
index b1e8342ca91..701b4df3cd8 100644
--- a/pkgs/development/libraries/liblastfm/default.nix
+++ b/pkgs/development/libraries/liblastfm/default.nix
@@ -1,30 +1,26 @@
-{ stdenv, fetchurl, ruby, qt4, pkgconfig, libsamplerate, fftwSinglePrec, which }:
+{ stdenv, fetchurl, qt4, pkgconfig, libsamplerate, fftwSinglePrec, which, cmake }:
-let version = "0.3.3"; in
+let version = "1.0.8"; in
stdenv.mkDerivation rec {
name = "liblastfm-${version}";
# Upstream does not package git tags as tarballs. Get tarball from github.
src = fetchurl {
- url = "https://github.com/mxcl/liblastfm/tarball/${version}";
+ url = "https://github.com/lastfm/liblastfm/tarball/${version}";
name = "${name}.tar.gz";
- sha256 = "0v33vzj89mgx2pc5fmiywlz51i553ckydw9xz70fiflm2inbl1r6";
+ sha256 = "17jjhsgbwrzh09i0wcqsnmxzyrqy1png5ixpnx6rbqmhp54a3jn3";
};
prefixKey = "--prefix ";
propagatedBuildInputs = [ qt4 libsamplerate fftwSinglePrec ];
- nativeBuildInputs = [ ruby pkgconfig which ];
-
- configureFlags = "--release";
-
- patches = [ ./ruby-1.9.patch ];
- postPatch = "patchShebangs .";
+ nativeBuildInputs = [ pkgconfig which cmake ];
meta = {
- homepage = http://github.com/mxcl/liblastfm;
+ homepage = http://github.com/lastfm/liblastfm;
+ repositories.git = git://github.com/lastfm/liblastfm.git;
description = "Official LastFM library";
inherit (qt4.meta) platforms;
- maintainers = [ stdenv.lib.maintainers.urkud ];
+ maintainers = with stdenv.lib.maintainers; [ urkud phreedom ];
};
}
diff --git a/pkgs/development/libraries/liblastfm/ruby-1.9.patch b/pkgs/development/libraries/liblastfm/ruby-1.9.patch
deleted file mode 100644
index ac6d175e73a..00000000000
--- a/pkgs/development/libraries/liblastfm/ruby-1.9.patch
+++ /dev/null
@@ -1,45 +0,0 @@
-From: Yury G. Kudryashov
-Subject: [PATCH] Fix compilation with ruby-1.9
-
-__FILE__ is a relative path in ruby-1.9
-
----
- admin/Makefile.rb | 4 ++--
- admin/qpp | 2 +-
- 2 files changed, 3 insertions(+), 3 deletions(-)
-
-diff --git a/admin/Makefile.rb b/admin/Makefile.rb
-index 592f5a5..33fe688 100755
---- a/admin/Makefile.rb
-+++ b/admin/Makefile.rb
-@@ -6,7 +6,7 @@
-
- cwd = File.dirname( __FILE__ )
- require 'find'
--require "#{cwd}/platform.rb"
-+require_relative 'platform'
-
-
- ######################################################################### defs
-@@ -158,4 +158,4 @@ puts <<-EOS
- .PHONY: dist
- dist:
- git archive --prefix=#{BASENAME}/ HEAD | bzip2 > #{BASENAME}.tar.bz2
--EOS
-\ No newline at end of file
-+EOS
-diff --git a/admin/qpp b/admin/qpp
-index 36b2d05..ee840fd 100755
---- a/admin/qpp
-+++ b/admin/qpp
-@@ -4,7 +4,7 @@
-
- cwd=File.dirname __FILE__
- require 'find'
--require "#{cwd}/findsrc"
-+require_relative 'findsrc'
-
- sources = Array.new
- headers = Array.new
---
-tg: (f0b3239..) t/ruby19 (depends on: master)
diff --git a/pkgs/development/libraries/libotr/0001-Fix-pass-opdata-when-sending-message-fragment.patch b/pkgs/development/libraries/libotr/0001-Fix-pass-opdata-when-sending-message-fragment.patch
deleted file mode 100644
index 2b39d1fee9a..00000000000
--- a/pkgs/development/libraries/libotr/0001-Fix-pass-opdata-when-sending-message-fragment.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-From dc5f05eb934ebd285e01febb9a4018512db702b1 Mon Sep 17 00:00:00 2001
-From: David Goulet
-Date: Sat, 19 Jan 2013 15:53:23 -0500
-Subject: [PATCH] Fix: pass opdata when sending message fragment
-
-The inject_message callback was missing the opdata when sending message
-fragments.
-
-Signed-off-by: David Goulet
----
- src/message.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/src/message.c b/src/message.c
-index 7c39529..aa71df2 100644
---- a/src/message.c
-+++ b/src/message.c
-@@ -441,7 +441,7 @@ fragment:
- /* Fragment and send according to policy */
- if (!err && messagep && *messagep) {
- if (context) {
-- err = fragment_and_send(ops, NULL, context, *messagep,
-+ err = fragment_and_send(ops, opdata, context, *messagep,
- fragPolicy, messagep);
- }
- }
---
-1.7.10.4
-
diff --git a/pkgs/development/libraries/libotr/default.nix b/pkgs/development/libraries/libotr/default.nix
index d737b8d9916..0d5bdfcc9a7 100644
--- a/pkgs/development/libraries/libotr/default.nix
+++ b/pkgs/development/libraries/libotr/default.nix
@@ -1,26 +1,22 @@
-{stdenv, fetchurl, libgcrypt}:
+{stdenv, fetchgit, libgcrypt, autoconf, automake, libtool}:
stdenv.mkDerivation rec {
- name = "libotr-4.0.0";
- src = fetchurl {
- urls = [
- "http://www.cypherpunks.ca/otr/${name}.tar.gz"
- # The site is down at the time of updating to 4.0.0, so I add this url
- http://ftp.de.debian.org/debian/pool/main/libo/libotr/libotr_4.0.0.orig.tar.gz
- ];
- sha256 = "3f911994409898e74527730745ef35ed75c352c695a1822a677a34b2cf0293b4";
+ name = "libotr-20130821-git-f0f8a2";
+ src = fetchgit {
+ url = "http://git.code.sf.net/p/otr/libotr";
+ rev = "f0f8a2";
+ sha256 = "08019r8bnk8f4yx6574jdz217p283ry7dmpqcad2d87yhkdmc3mm";
};
- # Crashes without it, still not accepted upstream.
- # Discussed in https://github.com/cryptodotis/irssi-otr/issues/21
- patches = [ ./0001-Fix-pass-opdata-when-sending-message-fragment.patch ];
-
NIX_LDFLAGS = "-lssp";
- propagatedBuildInputs = [ libgcrypt ];
+ propagatedBuildInputs = [ libgcrypt autoconf automake libtool ];
+
+ preConfigure = "autoreconf -vfi";
meta = {
homepage = "http://www.cypherpunks.ca/otr/";
+ repositories.git = git://git.code.sf.net/p/otr/libotr;
license = "LGPLv2.1";
description = "Library for Off-The-Record Messaging";
};
diff --git a/pkgs/development/libraries/libpipeline/default.nix b/pkgs/development/libraries/libpipeline/default.nix
new file mode 100644
index 00000000000..e56a45c92fc
--- /dev/null
+++ b/pkgs/development/libraries/libpipeline/default.nix
@@ -0,0 +1,17 @@
+{ stdenv, fetchurl }:
+
+stdenv.mkDerivation rec {
+ name = "libpipeline-1.2.6";
+
+ src = fetchurl {
+ url = "mirror://savannah/libpipeline/${name}.tar.gz";
+ sha256 = "0wjsigim422ilzs46hxzv98l10zprpbk53gq3jzj6s9kn9n1wljc";
+ };
+
+ meta = with stdenv.lib; {
+ homepage = "http://libpipeline.nongnu.org";
+ description = "C library for manipulating pipelines of subprocesses in a flexible and convenient way";
+ platforms = platforms.unix;
+ license = licenses.gpl3;
+ };
+}
diff --git a/pkgs/development/libraries/libraw/default.nix b/pkgs/development/libraries/libraw/default.nix
new file mode 100644
index 00000000000..f0012f552c1
--- /dev/null
+++ b/pkgs/development/libraries/libraw/default.nix
@@ -0,0 +1,21 @@
+{ stdenv, fetchurl, lcms2, jasper, pkgconfig }:
+
+stdenv.mkDerivation rec {
+ name = "libraw-0.16.0";
+
+ src = fetchurl {
+ url = http://www.libraw.org/data/LibRaw-0.16.0.tar.gz;
+ sha256 = "15ng4s24grib39r0nlgrf18r2j9yh43qyx4vbif38d95xiqkix3i";
+ };
+
+ buildInputs = [ lcms2 jasper ] ;
+
+ nativeBuildInputs = [ pkgconfig ];
+
+ meta = {
+ description = "Library for reading RAW files obtained from digital photo cameras (CRW/CR2, NEF, RAF, DNG, and others)";
+ homepage = http://www.libraw.org/;
+ license = stdenv.lib.licenses.gpl2Plus;
+ };
+}
+
diff --git a/pkgs/development/libraries/librdf/redland.nix b/pkgs/development/libraries/librdf/redland.nix
index 26b3de70dcd..4863c928988 100644
--- a/pkgs/development/libraries/librdf/redland.nix
+++ b/pkgs/development/libraries/librdf/redland.nix
@@ -3,7 +3,7 @@
, mysql, withMysql ? false
, postgresql, withPostgresql ? false
, sqlite, withSqlite ? true
-, db4, withBdb ? false
+, db, withBdb ? false
}:
stdenv.mkDerivation rec {
@@ -20,7 +20,7 @@ stdenv.mkDerivation rec {
++ stdenv.lib.optional withMysql mysql
++ stdenv.lib.optional withSqlite sqlite
++ stdenv.lib.optional withPostgresql postgresql
- ++ stdenv.lib.optional withBdb db4;
+ ++ stdenv.lib.optional withBdb db;
propagatedBuildInputs = [ librdf_rasqal ];
@@ -28,7 +28,7 @@ stdenv.mkDerivation rec {
configureFlags =
[ "--with-threads" ]
- ++ stdenv.lib.optional withBdb "--with-bdb=${db4}";
+ ++ stdenv.lib.optional withBdb "--with-bdb=${db}";
meta = {
homepage = http://librdf.org/;
diff --git a/pkgs/development/libraries/libtorrent-rasterbar/default.nix b/pkgs/development/libraries/libtorrent-rasterbar/default.nix
index 035077e12a6..6e8567d2c46 100644
--- a/pkgs/development/libraries/libtorrent-rasterbar/default.nix
+++ b/pkgs/development/libraries/libtorrent-rasterbar/default.nix
@@ -2,11 +2,11 @@
stdenv.mkDerivation rec {
name = "libtorrent-rasterbar-${version}";
- version = "0.16.13";
+ version = "0.16.14";
src = fetchurl {
- url = "http://libtorrent.googlecode.com/files/${name}.tar.gz";
- sha256 = "1sr788hhip6pgfb842110nl36hqdc1vz2s9n5vzypm0jy7qklmvm";
+ url = mirror://sourceforge/libtorrent/libtorrent-rasterbar-0.16.14.tar.gz;
+ sha256 = "0s4f36f28cgq55pgx4h99q18a0p566bhifxmqxjhlb63a1w20m2c";
};
buildInputs = [ boost pkgconfig openssl zlib python libiconvOrNull geoip ];
diff --git a/pkgs/development/libraries/libxmlxx/default.nix b/pkgs/development/libraries/libxmlxx/default.nix
index 37f03a1dfb6..aebb81020b3 100644
--- a/pkgs/development/libraries/libxmlxx/default.nix
+++ b/pkgs/development/libraries/libxmlxx/default.nix
@@ -1,10 +1,10 @@
{ stdenv, fetchurl
, pkgconfig, libxml2, glibmm, perl }:
stdenv.mkDerivation rec {
- name = "libxml++-2.30.1";
+ name = "libxml++-2.37.1";
src = fetchurl {
- url = "mirror://gnome/sources/libxml++/2.30/${name}.tar.bz2";
- sha256 = "02mrib11cjx5fshdr8p1biwvyl0xfkf86b6nh8ashwv590v0wgs3";
+ url = "mirror://gnome/sources/libxml++/2.37/${name}.tar.xz";
+ sha256 = "17xkdndcambij33k25cb5c4mg2457wi114kiaprjma9j0mh87cgk";
};
buildInputs = [ pkgconfig glibmm perl ];
diff --git a/pkgs/development/libraries/libyaml/cve-2013-6393_a.patch b/pkgs/development/libraries/libyaml/cve-2013-6393_a.patch
deleted file mode 100644
index 130107341f7..00000000000
--- a/pkgs/development/libraries/libyaml/cve-2013-6393_a.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/src/scanner.c
-+++ a/src/scanner.c
-@@ -2574,7 +2574,7 @@
-
- /* Resize the string to include the head. */
-
-- while (string.end - string.start <= (int)length) {
-+ while ((size_t)(string.end - string.start) <= length) {
- if (!yaml_string_extend(&string.start, &string.pointer, &string.end)) {
- parser->error = YAML_MEMORY_ERROR;
- goto error;
diff --git a/pkgs/development/libraries/libyaml/cve-2013-6393_b.patch b/pkgs/development/libraries/libyaml/cve-2013-6393_b.patch
deleted file mode 100644
index db2b9ff2bba..00000000000
--- a/pkgs/development/libraries/libyaml/cve-2013-6393_b.patch
+++ /dev/null
@@ -1,16 +0,0 @@
---- a/src/api.c
-+++ a/src/api.c
-@@ -117,7 +117,12 @@
- YAML_DECLARE(int)
- yaml_stack_extend(void **start, void **top, void **end)
- {
-- void *new_start = yaml_realloc(*start, ((char *)*end - (char *)*start)*2);
-+ void *new_start;
-+
-+ if ((char *)*end - (char *)*start >= INT_MAX / 2)
-+ return 0;
-+
-+ new_start = yaml_realloc(*start, ((char *)*end - (char *)*start)*2);
-
- if (!new_start) return 0;
-
diff --git a/pkgs/development/libraries/libyaml/cve-2013-6393_c.patch b/pkgs/development/libraries/libyaml/cve-2013-6393_c.patch
deleted file mode 100644
index dc1c50da4e8..00000000000
--- a/pkgs/development/libraries/libyaml/cve-2013-6393_c.patch
+++ /dev/null
@@ -1,131 +0,0 @@
---- a/src/scanner.c Mon Dec 24 03:51:32 2012 +0000
-+++ a/src/scanner.c Mon Jan 27 19:48:28 2014 -0500
-@@ -615,11 +615,14 @@
- */
-
- static int
--yaml_parser_roll_indent(yaml_parser_t *parser, int column,
-+yaml_parser_roll_indent(yaml_parser_t *parser, size_t column,
- int number, yaml_token_type_t type, yaml_mark_t mark);
-
- static int
--yaml_parser_unroll_indent(yaml_parser_t *parser, int column);
-+yaml_parser_unroll_indent(yaml_parser_t *parser, size_t column);
-+
-+static int
-+yaml_parser_reset_indent(yaml_parser_t *parser);
-
- /*
- * Token fetchers.
-@@ -1206,7 +1209,7 @@
- */
-
- static int
--yaml_parser_roll_indent(yaml_parser_t *parser, int column,
-+yaml_parser_roll_indent(yaml_parser_t *parser, size_t column,
- int number, yaml_token_type_t type, yaml_mark_t mark)
- {
- yaml_token_t token;
-@@ -1216,7 +1219,7 @@
- if (parser->flow_level)
- return 1;
-
-- if (parser->indent < column)
-+ if (parser->indent == -1 || parser->indent < column)
- {
- /*
- * Push the current indentation level to the stack and set the new
-@@ -1254,7 +1257,7 @@
-
-
- static int
--yaml_parser_unroll_indent(yaml_parser_t *parser, int column)
-+yaml_parser_unroll_indent(yaml_parser_t *parser, size_t column)
- {
- yaml_token_t token;
-
-@@ -1263,6 +1266,15 @@
- if (parser->flow_level)
- return 1;
-
-+ /*
-+ * column is unsigned and parser->indent is signed, so if
-+ * parser->indent is less than zero the conditional in the while
-+ * loop below is incorrect. Guard against that.
-+ */
-+
-+ if (parser->indent < 0)
-+ return 1;
-+
- /* Loop through the intendation levels in the stack. */
-
- while (parser->indent > column)
-@@ -1283,6 +1295,41 @@
- }
-
- /*
-+ * Pop indentation levels from the indents stack until the current
-+ * level resets to -1. For each intendation level, append the
-+ * BLOCK-END token.
-+ */
-+
-+static int
-+yaml_parser_reset_indent(yaml_parser_t *parser)
-+{
-+ yaml_token_t token;
-+
-+ /* In the flow context, do nothing. */
-+
-+ if (parser->flow_level)
-+ return 1;
-+
-+ /* Loop through the intendation levels in the stack. */
-+
-+ while (parser->indent > -1)
-+ {
-+ /* Create a token and append it to the queue. */
-+
-+ TOKEN_INIT(token, YAML_BLOCK_END_TOKEN, parser->mark, parser->mark);
-+
-+ if (!ENQUEUE(parser, parser->tokens, token))
-+ return 0;
-+
-+ /* Pop the indentation level. */
-+
-+ parser->indent = POP(parser, parser->indents);
-+ }
-+
-+ return 1;
-+}
-+
-+/*
- * Initialize the scanner and produce the STREAM-START token.
- */
-
-@@ -1338,7 +1385,7 @@
-
- /* Reset the indentation level. */
-
-- if (!yaml_parser_unroll_indent(parser, -1))
-+ if (!yaml_parser_reset_indent(parser))
- return 0;
-
- /* Reset simple keys. */
-@@ -1369,7 +1416,7 @@
-
- /* Reset the indentation level. */
-
-- if (!yaml_parser_unroll_indent(parser, -1))
-+ if (!yaml_parser_reset_indent(parser))
- return 0;
-
- /* Reset simple keys. */
-@@ -1407,7 +1454,7 @@
-
- /* Reset the indentation level. */
-
-- if (!yaml_parser_unroll_indent(parser, -1))
-+ if (!yaml_parser_reset_indent(parser))
- return 0;
-
- /* Reset simple keys. */
diff --git a/pkgs/development/libraries/libyaml/default.nix b/pkgs/development/libraries/libyaml/default.nix
index 93f19165e88..15ba83b757a 100644
--- a/pkgs/development/libraries/libyaml/default.nix
+++ b/pkgs/development/libraries/libyaml/default.nix
@@ -1,19 +1,18 @@
-{stdenv, fetchurl}:
-
+{ stdenv, fetchurl }:
+let
+ version = "0.1.5";
+in
stdenv.mkDerivation {
- name = "libyaml-0.1.4";
+ name = "libyaml-${version}";
src = fetchurl {
- url = http://pyyaml.org/download/libyaml/yaml-0.1.4.tar.gz;
- sha256 = "0dvavrhxjrjfxgdgysxqfpdy08lpg3m9i8vxjyvdkcjsmra1by3v";
+ url = "http://pyyaml.org/download/libyaml/yaml-${version}.tar.gz";
+ sha256 = "1vrv5ly58bkmcyc049ad180f2m8iav6l9h3v8l2fqdmrny7yx1zs";
};
- # Downloaded on 2014-02-01 from https://bugzilla.redhat.com/show_bug.cgi?id=1033990
- patches = [ ./cve-2013-6393_a.patch ./cve-2013-6393_b.patch ./cve-2013-6393_c.patch ];
-
- meta = {
+ meta = with stdenv.lib; {
homepage = http://pyyaml.org/;
description = "A YAML 1.1 parser and emitter written in C";
- license = "free";
+ license = licenses.mit;
};
}
diff --git a/pkgs/development/libraries/log4cxx/default.nix b/pkgs/development/libraries/log4cxx/default.nix
index e62fa2fa1c5..b2e13a1e9ab 100644
--- a/pkgs/development/libraries/log4cxx/default.nix
+++ b/pkgs/development/libraries/log4cxx/default.nix
@@ -1,5 +1,5 @@
{ stdenv, fetchurl, autoconf, automake, libtool, libxml2, cppunit, boost
-, apr, aprutil, db4, expat
+, apr, aprutil, db, expat
}:
stdenv.mkDerivation rec {
@@ -22,7 +22,7 @@ stdenv.mkDerivation rec {
src/main/cpp/socketoutputstream.cpp
'';
- buildInputs = [autoconf automake libtool libxml2 cppunit boost apr aprutil db4 expat];
+ buildInputs = [autoconf automake libtool libxml2 cppunit boost apr aprutil db expat];
meta = {
homepage = http://logging.apache.org/log4cxx/index.html;
diff --git a/pkgs/development/libraries/openldap/default.nix b/pkgs/development/libraries/openldap/default.nix
index 8f26f29c377..c4be3358049 100644
--- a/pkgs/development/libraries/openldap/default.nix
+++ b/pkgs/development/libraries/openldap/default.nix
@@ -1,4 +1,4 @@
-{stdenv, fetchurl, openssl, cyrus_sasl, db4, groff}:
+{stdenv, fetchurl, openssl, cyrus_sasl, db, groff}:
stdenv.mkDerivation rec {
name = "openldap-2.4.38";
@@ -8,7 +8,7 @@ stdenv.mkDerivation rec {
sha256 = "1l8zng86alhcmmmw09r1c4dzl7yvk6dy5fq9zia96pgck4srl848";
};
- buildInputs = [ openssl cyrus_sasl db4 groff ];
+ buildInputs = [ openssl cyrus_sasl db groff ];
configureFlags =
[ "--enable-overlays"
diff --git a/pkgs/development/libraries/qca2/ossl.nix b/pkgs/development/libraries/qca2/ossl.nix
index 153d3ba5746..d2b8778aa14 100644
--- a/pkgs/development/libraries/qca2/ossl.nix
+++ b/pkgs/development/libraries/qca2/ossl.nix
@@ -1,4 +1,4 @@
-{stdenv, fetchurl, fetchsvn, qt4, qca2, openssl, which}:
+{stdenv, fetchurl, fetchgit, qt4, qca2, openssl, which}:
stdenv.mkDerivation rec {
version = "2.0.0-beta3";
@@ -9,10 +9,10 @@ stdenv.mkDerivation rec {
};
# SVN version has stabilized and has a lot of fixes for fresh OpenSSL
# Take the main source from there
- svn_src = fetchsvn {
- url = svn://anonsvn.kde.org/home/kde/trunk/kdesupport/qca/plugins/qca-ossl ;
- rev = 1115936;
- sha256 = "ef2c0307e8834e1e7cb23b6fea1cc22486328a37186301a6c11161b1c93d834b";
+ git_src = fetchgit {
+ url = git://anongit.kde.org/qca;
+ rev = "0a8b9db6613f2282fe492ff454412f502a6be410";
+ sha256 = "1ebb97092f21b9152c6dda56cb33795bea4e83c82800848e800ddaaaf23a31e1";
};
buildInputs = [ qt4 qca2 openssl ];
nativeBuildInputs = [ which ];
@@ -20,7 +20,7 @@ stdenv.mkDerivation rec {
configureFlags="--no-separate-debug-info --with-qca=${qca2}
--with-openssl-inc=${openssl}/include --with-openssl-lib=${openssl}/lib";
preConfigure=''
- cp ${svn_src}/qca-ossl.cpp .
+ cp ${git_src}/plugins/qca-ossl/qca-ossl.cpp .
configureFlags="$configureFlags --plugins-path=$out/lib/qt4/plugins"
'';
diff --git a/pkgs/development/libraries/taglib/default.nix b/pkgs/development/libraries/taglib/default.nix
index cd083f0d80a..41087044e49 100644
--- a/pkgs/development/libraries/taglib/default.nix
+++ b/pkgs/development/libraries/taglib/default.nix
@@ -1,20 +1,22 @@
{stdenv, fetchurl, zlib, cmake}:
stdenv.mkDerivation rec {
- name = "taglib-1.8";
+ name = "taglib-1.9.1";
src = fetchurl {
- url = "https://github.com/downloads/taglib/taglib/${name}.tar.gz";
- sha256 = "16i0zjpxqqslbwi4kl6y15qwm15mh7ykh74x19m2741wf20k9lv6";
+ url = http://taglib.github.io/releases/taglib-1.9.1.tar.gz;
+ sha256 = "06n7gnbcqa3r6c9gv00y0y1r48dyyazm6yj403i7ma0r2k6p3lvj";
};
cmakeFlags = "-DWITH_ASF=ON -DWITH_MP4=ON";
- buildInputs = [zlib];
- nativeBuildInputs = [cmake];
+ buildInputs = [ zlib ];
+ nativeBuildInputs = [ cmake ];
meta = {
homepage = http://developer.kde.org/~wheeler/taglib.html;
+ repositories.git = git://github.com/taglib/taglib.git;
+
description = "A library for reading and editing the meta-data of several popular audio formats";
inherit (cmake.meta) platforms;
maintainers = [ stdenv.lib.maintainers.urkud ];
diff --git a/pkgs/development/libraries/telepathy/qt/cmake-2.8.12.diff b/pkgs/development/libraries/telepathy/qt/cmake-2.8.12.diff
new file mode 100644
index 00000000000..f6e57c626c3
--- /dev/null
+++ b/pkgs/development/libraries/telepathy/qt/cmake-2.8.12.diff
@@ -0,0 +1,25 @@
+diff --git a/cmake/modules/FindQt.cmake b/cmake/modules/FindQt.cmake
+index c2eac76..b3131f0 100644
+--- a/cmake/modules/FindQt.cmake
++++ b/cmake/modules/FindQt.cmake
+@@ -74,10 +74,18 @@ ENDMACRO(QT_GET_MOC_FLAGS)
+
+ MACRO(QT_CREATE_MOC_COMMAND infile outfile moc_flags moc_options)
+ IF(QT_VERSION_MAJOR MATCHES 4)
+- QT4_CREATE_MOC_COMMAND(${infile} ${outfile} "${moc_flags}" "${moc_options}")
++ IF(CMAKE_VERSION VERSION_GREATER 2.8.11.20130607)
++ QT4_CREATE_MOC_COMMAND(${infile} ${outfile} "${moc_flags}" "${moc_options}" "")
++ ELSE(CMAKE_VERSION VERSION_GREATER 2.8.11.20130607)
++ QT4_CREATE_MOC_COMMAND(${infile} ${outfile} "${moc_flags}" "${moc_options}")
++ ENDIF(CMAKE_VERSION VERSION_GREATER 2.8.11.20130607)
+ ELSE(QT_VERSION_MAJOR MATCHES 4)
+ IF(QT_VERSION_MAJOR MATCHES 5)
+- QT5_CREATE_MOC_COMMAND(${infile} ${outfile} "${moc_flags}" "${moc_options}")
++ IF(CMAKE_VERSION VERSION_GREATER 2.8.11.20130607)
++ QT5_CREATE_MOC_COMMAND(${infile} ${outfile} "${moc_flags}" "${moc_options}" "")
++ ELSE(CMAKE_VERSION VERSION_GREATER 2.8.11.20130607)
++ QT5_CREATE_MOC_COMMAND(${infile} ${outfile} "${moc_flags}" "${moc_options}")
++ ENDIF(CMAKE_VERSION VERSION_GREATER 2.8.11.20130607)
+ ENDIF(QT_VERSION_MAJOR MATCHES 5)
+ ENDIF(QT_VERSION_MAJOR MATCHES 4)
+ ENDMACRO(QT_CREATE_MOC_COMMAND)
diff --git a/pkgs/development/libraries/telepathy/qt/default.nix b/pkgs/development/libraries/telepathy/qt/default.nix
index b535961357b..f2e0d194562 100644
--- a/pkgs/development/libraries/telepathy/qt/default.nix
+++ b/pkgs/development/libraries/telepathy/qt/default.nix
@@ -11,6 +11,7 @@ stdenv.mkDerivation rec {
nativeBuildInputs = [ cmake pkgconfig python libxslt ];
propagatedBuildInputs = [ qt4 dbus_glib telepathy_farstream telepathy_glib pythonDBus ];
+ patches = [ ./cmake-2.8.12.diff ./farstream-0.2.diff ];
preBuild = ''
NIX_CFLAGS_COMPILE+=" `pkg-config --cflags dbus-glib-1`"
'';
diff --git a/pkgs/development/libraries/telepathy/qt/farstream-0.2.diff b/pkgs/development/libraries/telepathy/qt/farstream-0.2.diff
new file mode 100644
index 00000000000..86d392fe1ac
--- /dev/null
+++ b/pkgs/development/libraries/telepathy/qt/farstream-0.2.diff
@@ -0,0 +1,28 @@
+diff -urB telepathy-qt/cmake/modules/FindFarstream.cmake new/cmake/modules/FindFarstream.cmake
+--- telepathy-qt/cmake/modules/FindFarstream.cmake 2012-04-25 22:14:22.275967164 +0200
++++ new/cmake/modules/FindFarstream.cmake 2012-10-07 12:19:46.543103512 +0200
+@@ -23,9 +23,9 @@
+ # in the find_path() and find_library() calls
+ find_package(PkgConfig)
+ if (FARSTREAM_MIN_VERSION)
+- PKG_CHECK_MODULES(PC_FARSTREAM farstream-0.1>=${FARSTREAM_MIN_VERSION})
++ PKG_CHECK_MODULES(PC_FARSTREAM farstream-0.2>=${FARSTREAM_MIN_VERSION})
+ else (FARSTREAM_MIN_VERSION)
+- PKG_CHECK_MODULES(PC_FARSTREAM farstream-0.1)
++ PKG_CHECK_MODULES(PC_FARSTREAM farstream-0.2)
+ endif (FARSTREAM_MIN_VERSION)
+ set(FARSTREAM_DEFINITIONS ${PC_FARSTREAM_CFLAGS_OTHER})
+ endif (NOT WIN32)
+@@ -34,10 +34,10 @@
+ PATHS
+ ${PC_FARSTREAM_INCLUDEDIR}
+ ${PC_FARSTREAM_INCLUDE_DIRS}
+- PATH_SUFFIXES farstream-0.1
++ PATH_SUFFIXES farstream-0.2
+ )
+
+-find_library(FARSTREAM_LIBRARIES NAMES farstream-0.1
++find_library(FARSTREAM_LIBRARIES NAMES farstream-0.2
+ PATHS
+ ${PC_FARSTREAM_LIBDIR}
+ ${PC_FARSTREAM_LIBRARY_DIRS}
diff --git a/pkgs/development/libraries/xlibs-wrapper/default.nix b/pkgs/development/libraries/xlibs-wrapper/default.nix
index 07220d6e1a6..fcdab133e2f 100644
--- a/pkgs/development/libraries/xlibs-wrapper/default.nix
+++ b/pkgs/development/libraries/xlibs-wrapper/default.nix
@@ -6,6 +6,8 @@ stdenv.mkDerivation {
installPhase = "mkdir -p $out";
unpackPhase = "sourceRoot=.";
propagatedBuildInputs = packages;
+
+ preferLocalBuild = true;
} // {
# For compatability with XFree86.
buildClientLibs = true;
diff --git a/pkgs/development/lisp-modules/clwrapper/default.nix b/pkgs/development/lisp-modules/clwrapper/default.nix
index 0ae4ce13064..efaadf5606e 100644
--- a/pkgs/development/lisp-modules/clwrapper/default.nix
+++ b/pkgs/development/lisp-modules/clwrapper/default.nix
@@ -17,6 +17,8 @@ stdenv.mkDerivation {
phases="installPhase fixupPhase";
+ preferLocalBuild = true;
+
passthru = {
inherit lisp;
};
diff --git a/pkgs/development/perl-modules/BerkeleyDB/default.nix b/pkgs/development/perl-modules/BerkeleyDB/default.nix
index 01f698da232..a6af84a6581 100644
--- a/pkgs/development/perl-modules/BerkeleyDB/default.nix
+++ b/pkgs/development/perl-modules/BerkeleyDB/default.nix
@@ -1,4 +1,4 @@
-{buildPerlPackage, fetchurl, db4}:
+{buildPerlPackage, fetchurl, db}:
buildPerlPackage rec {
name = "BerkeleyDB-0.54";
@@ -9,7 +9,7 @@ buildPerlPackage rec {
};
preConfigure = ''
- echo "LIB = ${db4}/lib" > config.in
- echo "INCLUDE = ${db4}/include" >> config.in
+ echo "LIB = ${db}/lib" > config.in
+ echo "INCLUDE = ${db}/include" >> config.in
'';
}
diff --git a/pkgs/development/perl-modules/DB_File/default.nix b/pkgs/development/perl-modules/DB_File/default.nix
index 4017d8f5ca5..4195f8d613e 100644
--- a/pkgs/development/perl-modules/DB_File/default.nix
+++ b/pkgs/development/perl-modules/DB_File/default.nix
@@ -1,4 +1,4 @@
-{fetchurl, buildPerlPackage, db4}:
+{fetchurl, buildPerlPackage, db}:
buildPerlPackage rec {
name = "DB_File-1.831";
@@ -12,8 +12,8 @@ buildPerlPackage rec {
cat > config.in < \&yahoo,
+ usa => \&yahoo,
diff --git a/pkgs/development/python-modules/bsddb3/default.nix b/pkgs/development/python-modules/bsddb3/default.nix
index c26347c5243..574796e2c68 100644
--- a/pkgs/development/python-modules/bsddb3/default.nix
+++ b/pkgs/development/python-modules/bsddb3/default.nix
@@ -1,4 +1,4 @@
-{stdenv, fetchurl, python, db4}:
+{stdenv, fetchurl, python, db}:
stdenv.mkDerivation rec {
name = "bsddb3-6.0.1";
@@ -8,5 +8,5 @@ stdenv.mkDerivation rec {
};
buildInputs = [python];
buildPhase = "true";
- installPhase = "python ./setup.py install --prefix=$out --berkeley-db=${db4}";
+ installPhase = "python ./setup.py install --prefix=$out --berkeley-db=${db}";
}
diff --git a/pkgs/development/tools/build-managers/cmake/default.nix b/pkgs/development/tools/build-managers/cmake/default.nix
index c71592c8ec8..9ce69374cd8 100644
--- a/pkgs/development/tools/build-managers/cmake/default.nix
+++ b/pkgs/development/tools/build-managers/cmake/default.nix
@@ -7,7 +7,7 @@ with stdenv.lib;
let
os = stdenv.lib.optionalString;
majorVersion = "2.8";
- minorVersion = "11.2";
+ minorVersion = "12.2";
version = "${majorVersion}.${minorVersion}";
in
@@ -18,19 +18,15 @@ stdenv.mkDerivation rec {
src = fetchurl {
url = "${meta.homepage}files/v${majorVersion}/cmake-${version}.tar.gz";
- sha256 = "0qh5dhd7ff08n2h569j7g9m92gb3bz14wvhwjhwl7lgx794cnamk";
+ sha256 = "0phf295a9cby0v7zqdswr238v5aiy3rb2fs6dz39zjxbmzlp8rcc";
};
enableParallelBuilding = true;
patches =
- # See https://github.com/NixOS/nixpkgs/issues/762
- # and http://public.kitware.com/Bug/view.php?id=13887
- # Remove this patch when a CMake release contains the corresponding fix
- [ ./762-13887.patch ]
# Don't search in non-Nix locations such as /usr, but do search in
# Nixpkgs' Glibc.
- ++ optional (stdenv ? glibc) ./search-path.patch;
+ optional (stdenv ? glibc) ./search-path.patch;
buildInputs = [ curl expat zlib bzip2 libarchive ]
++ optional useNcurses ncurses
diff --git a/pkgs/development/tools/misc/cgdb/default.nix b/pkgs/development/tools/misc/cgdb/default.nix
index adabcec9898..d313d271afb 100644
--- a/pkgs/development/tools/misc/cgdb/default.nix
+++ b/pkgs/development/tools/misc/cgdb/default.nix
@@ -15,6 +15,8 @@ stdenv.mkDerivation rec {
homepage = http://cgdb.sourceforge.net/;
+ repositories.git = git://github.com/cgdb/cgdb.git;
+
license = "GPLv2+";
platforms = with stdenv.lib.platforms; linux ++ cygwin;
diff --git a/pkgs/development/tools/misc/cpphs/default.nix b/pkgs/development/tools/misc/cpphs/default.nix
index e5c9df96aab..4ec9358a388 100644
--- a/pkgs/development/tools/misc/cpphs/default.nix
+++ b/pkgs/development/tools/misc/cpphs/default.nix
@@ -2,8 +2,8 @@
cabal.mkDerivation (self: {
pname = "cpphs";
- version = "1.17.1";
- sha256 = "1xk1gk3skgiy6bc8rdhm7i3f6b5nqsm9nz6qswbxq94nxmw3pg9p";
+ version = "1.18";
+ sha256 = "0b5hpqbzvw5dzkbjxqyc2d7ll2c6zf9wd8k182zhvz3kyxmkvs2s";
isLibrary = true;
isExecutable = true;
meta = {
diff --git a/pkgs/development/tools/phantomjs/default.nix b/pkgs/development/tools/phantomjs/default.nix
index ef07d04212b..6fc53595efb 100644
--- a/pkgs/development/tools/phantomjs/default.nix
+++ b/pkgs/development/tools/phantomjs/default.nix
@@ -1,6 +1,6 @@
-{ stdenv, fetchurl, freetype, fontconfig, openssl }:
+{ stdenv, fetchurl, freetype, fontconfig, openssl, unzip }:
-assert stdenv.lib.elem stdenv.system [ "i686-linux" "x86_64-linux" ];
+assert stdenv.lib.elem stdenv.system [ "i686-linux" "x86_64-linux" "x86_64-darwin" ];
stdenv.mkDerivation rec {
name = "phantomjs-1.9.7";
@@ -15,13 +15,21 @@ stdenv.mkDerivation rec {
url = "https://bitbucket.org/ariya/phantomjs/downloads/${name}-linux-i686.tar.bz2";
sha256 = "1ffd5544wnkww5cgwsims4bk4bymvm6pm19p32nbhwabxqhbnj9a";
}
- else # x86_64-linux
- fetchurl {
- url = "https://bitbucket.org/ariya/phantomjs/downloads/${name}-linux-x86_64.tar.bz2";
- sha256 = "06mhvj8rx298j0mrijw48zfm28hqgy81vdr1vv0jp4ncxbvijfs7";
- };
+ else
+ if stdenv.system == "x86_64-linux" then
+ fetchurl {
+ url = "https://bitbucket.org/ariya/phantomjs/downloads/${name}-linux-x86_64.tar.bz2";
+ sha256 = "06mhvj8rx298j0mrijw48zfm28hqgy81vdr1vv0jp4ncxbvijfs7";
+ }
+ else # x86_64-darwin
+ fetchurl {
+ url = "https://bitbucket.org/ariya/phantomjs/downloads/${name}-macosx.zip";
+ sha256 = "0vsagvx181gnypi6kgmxp4br6hnvd81vyy3cbz5pxccdys7iywvj";
+ };
- buildPhase = ''
+ buildInputs = if stdenv.isDarwin then [ unzip ] else [];
+
+ buildPhase = if stdenv.isDarwin then "" else ''
patchelf \
--set-interpreter "$(cat $NIX_GCC/nix-support/dynamic-linker)" \
--set-rpath "${freetype}/lib:${fontconfig}/lib:${stdenv.gcc.gcc}/lib64:${stdenv.gcc.gcc}/lib:${openssl}/lib" \
@@ -55,6 +63,6 @@ stdenv.mkDerivation rec {
license = stdenv.lib.licenses.bsd3;
maintainers = [ stdenv.lib.maintainers.bluescreen303 ];
- platforms = ["i686-linux" "x86_64-linux" ];
+ platforms = ["i686-linux" "x86_64-linux" "x86_64-darwin" ];
};
}
diff --git a/pkgs/development/tools/selenium/chromedriver/default.nix b/pkgs/development/tools/selenium/chromedriver/default.nix
index bccaa70ead7..bbe21378248 100644
--- a/pkgs/development/tools/selenium/chromedriver/default.nix
+++ b/pkgs/development/tools/selenium/chromedriver/default.nix
@@ -1,17 +1,17 @@
{ stdenv, fetchurl, cairo, fontconfig, freetype, gdk_pixbuf, glib
, glibc, gtk, libX11, makeWrapper, nspr, nss, pango, unzip, gconf
-, libXrender, libXext
+, libXi, libXrender, libXext
}:
# note: there is a i686 version available as well
assert stdenv.system == "x86_64-linux";
stdenv.mkDerivation rec {
- name = "chromedriver_linux64_2.0";
+ name = "chromedriver_linux64";
src = fetchurl {
- url = "http://chromedriver.googlecode.com/files/${name}.zip";
- sha256 = "165dq5550fs6262qa2jnjvm9smwjvws2zkkz7z5v4ibfg2j3409m";
+ url = "http://chromedriver.storage.googleapis.com/2.9/${name}.zip";
+ sha256 = "1m5xl5pz445igvhj31hby97xbizlw05b8fc6w53zq7faw7mzm665";
};
buildInputs = [ unzip makeWrapper ];
@@ -23,7 +23,7 @@ stdenv.mkDerivation rec {
mv chromedriver $out/bin
patchelf --set-interpreter ${glibc}/lib/ld-linux-x86-64.so.2 $out/bin/chromedriver
wrapProgram "$out/bin/chromedriver" \
- --prefix LD_LIBRARY_PATH : "$(cat ${stdenv.gcc}/nix-support/orig-gcc)/lib64:${cairo}/lib:${fontconfig}/lib:${freetype}/lib:${gdk_pixbuf}/lib:${glib}/lib:${gtk}/lib:${libX11}/lib:${nspr}/lib:${nss}/lib:${pango}/lib:${libXrender}/lib:${gconf}/lib:${libXext}/lib:\$LD_LIBRARY_PATH"
+ --prefix LD_LIBRARY_PATH : "$(cat ${stdenv.gcc}/nix-support/orig-gcc)/lib64:${cairo}/lib:${fontconfig}/lib:${freetype}/lib:${gdk_pixbuf}/lib:${glib}/lib:${gtk}/lib:${libX11}/lib:${nspr}/lib:${nss}/lib:${pango}/lib:${libXrender}/lib:${gconf}/lib:${libXext}/lib:${libXi}/lib:\$LD_LIBRARY_PATH"
'';
meta = with stdenv.lib; {
diff --git a/pkgs/misc/emulators/wine/unstable.nix b/pkgs/misc/emulators/wine/unstable.nix
index a0f03fa7b99..b6eb1038f93 100644
--- a/pkgs/misc/emulators/wine/unstable.nix
+++ b/pkgs/misc/emulators/wine/unstable.nix
@@ -7,12 +7,12 @@ assert stdenv.isLinux;
assert stdenv.gcc.gcc != null;
let
- version = "1.7.11";
+ version = "1.7.12";
name = "wine-${version}";
src = fetchurl {
url = "mirror://sourceforge/wine/${name}.tar.bz2";
- sha256 = "14sg0kqwawqb5sx4q2kshpb4igjbbr61c7diid15vi4nxmqjfzf0";
+ sha256 = "14mkh32lxjmbacz1f5pl5kr31n5dx0rfdqw5v88brhmsz1xzzk9d";
};
gecko = fetchurl {
diff --git a/pkgs/misc/themes/gtk2/oxygen-gtk/default.nix b/pkgs/misc/themes/gtk2/oxygen-gtk/default.nix
index fb51985afd1..9bee6c81a8a 100644
--- a/pkgs/misc/themes/gtk2/oxygen-gtk/default.nix
+++ b/pkgs/misc/themes/gtk2/oxygen-gtk/default.nix
@@ -2,12 +2,12 @@
cmake, dbus_glib, glib, gtk, gdk_pixbuf, pkgconfig, xorg }:
stdenv.mkDerivation rec {
- version = "1.4.1";
+ version = "1.4.3";
name = "oxygen-gtk2-${version}";
src = fetchurl {
url = "mirror://kde/stable/oxygen-gtk2/${version}/src/${name}.tar.bz2";
- sha256 = "13vrdlzg8h5gxn04f488f65yfy9m0amqpqdbs9l304yxgm7mkawd";
+ sha256 = "1611zkblfy8ahadyz4a1hc0vjfwkh8mdbnwjqm02i30vnhv3iy1j";
};
buildInputs = [ cmake dbus_glib glib gtk gdk_pixbuf
diff --git a/pkgs/os-specific/linux/iproute/default.nix b/pkgs/os-specific/linux/iproute/default.nix
index 9e8faa6a02e..2cfbc2a1df1 100644
--- a/pkgs/os-specific/linux/iproute/default.nix
+++ b/pkgs/os-specific/linux/iproute/default.nix
@@ -1,4 +1,4 @@
-{ fetchurl, stdenv, flex, bison, db4, iptables, pkgconfig }:
+{ fetchurl, stdenv, flex, bison, db, iptables, pkgconfig }:
stdenv.mkDerivation rec {
name = "iproute2-3.12.0";
@@ -20,7 +20,7 @@ stdenv.mkDerivation rec {
+ " CONFDIR=$(out)/etc DOCDIR=$(out)/share/doc/${name}"
+ " MANDIR=$(out)/share/man";
- buildInputs = [ db4 iptables ];
+ buildInputs = [ db iptables ];
nativeBuildInputs = [ bison flex pkgconfig ];
enableParallelBuilding = true;
diff --git a/pkgs/os-specific/linux/kernel/linux-3.10.nix b/pkgs/os-specific/linux/kernel/linux-3.10.nix
index 212e676a28f..a5c096491c3 100644
--- a/pkgs/os-specific/linux/kernel/linux-3.10.nix
+++ b/pkgs/os-specific/linux/kernel/linux-3.10.nix
@@ -1,11 +1,12 @@
{ stdenv, fetchurl, ... } @ args:
import ./generic.nix (args // rec {
- version = "3.10.29";
+ version = "3.10.30";
+ extraMeta.branch = "3.10";
src = fetchurl {
url = "mirror://kernel/linux/kernel/v3.x/linux-${version}.tar.xz";
- sha256 = "14g8z5g2xwf0s6r7m9586xdpd56nc810dny70cz6zq8c03kfq594";
+ sha256 = "0a9x27g026gvy64w2xkpkdf3kzjfzzgy0kgikdyk604zdz4ha2hm";
};
features.iwlwifi = true;
diff --git a/pkgs/os-specific/linux/kernel/linux-3.11.nix b/pkgs/os-specific/linux/kernel/linux-3.11.nix
index 2ef1eb98365..6c3c37663c6 100644
--- a/pkgs/os-specific/linux/kernel/linux-3.11.nix
+++ b/pkgs/os-specific/linux/kernel/linux-3.11.nix
@@ -2,6 +2,7 @@
import ./generic.nix (args // rec {
version = "3.11.10";
+ extraMeta.branch = "3.11";
src = fetchurl {
url = "mirror://kernel/linux/kernel/v3.x/linux-${version}.tar.xz";
diff --git a/pkgs/os-specific/linux/kernel/linux-3.12.nix b/pkgs/os-specific/linux/kernel/linux-3.12.nix
index 5baddbbdc7d..cd2e5cdae87 100644
--- a/pkgs/os-specific/linux/kernel/linux-3.12.nix
+++ b/pkgs/os-specific/linux/kernel/linux-3.12.nix
@@ -2,6 +2,7 @@
import ./generic.nix (args // rec {
version = "3.12.10";
+ extraMeta.branch = "3.12";
src = fetchurl {
url = "mirror://kernel/linux/kernel/v3.x/linux-${version}.tar.xz";
diff --git a/pkgs/os-specific/linux/kernel/linux-3.13.nix b/pkgs/os-specific/linux/kernel/linux-3.13.nix
index a5d816b2563..24f10ecb478 100644
--- a/pkgs/os-specific/linux/kernel/linux-3.13.nix
+++ b/pkgs/os-specific/linux/kernel/linux-3.13.nix
@@ -1,11 +1,12 @@
{ stdenv, fetchurl, ... } @ args:
import ./generic.nix (args // rec {
- version = "3.13.2";
+ version = "3.13.3";
+ extraMeta.branch = "3.13";
src = fetchurl {
url = "mirror://kernel/linux/kernel/v3.x/linux-${version}.tar.xz";
- sha256 = "1bvxcdzjff514zwk18b9dfkhhk12fjjbb4a1saynqnisdn7b78dl";
+ sha256 = "0x277h0ccdjivi16w20aj59ncazr7zs07zprazm0ph4qyffv0r4g";
};
features.iwlwifi = true;
diff --git a/pkgs/os-specific/linux/kernel/linux-3.2.nix b/pkgs/os-specific/linux/kernel/linux-3.2.nix
index c0006ed7348..f9135ea3e11 100644
--- a/pkgs/os-specific/linux/kernel/linux-3.2.nix
+++ b/pkgs/os-specific/linux/kernel/linux-3.2.nix
@@ -2,6 +2,7 @@
import ./generic.nix (args // rec {
version = "3.2.54";
+ extraMeta.branch = "3.2";
src = fetchurl {
url = "mirror://kernel/linux/kernel/v3.x/linux-${version}.tar.xz";
diff --git a/pkgs/os-specific/linux/kernel/linux-3.4.nix b/pkgs/os-specific/linux/kernel/linux-3.4.nix
index 0993b0e74ee..6e94cb5807e 100644
--- a/pkgs/os-specific/linux/kernel/linux-3.4.nix
+++ b/pkgs/os-specific/linux/kernel/linux-3.4.nix
@@ -1,11 +1,12 @@
{ stdenv, fetchurl, ... } @ args:
import ./generic.nix (args // rec {
- version = "3.4.79";
+ version = "3.4.80";
+ extraMeta.branch = "3.4";
src = fetchurl {
url = "mirror://kernel/linux/kernel/v3.x/linux-${version}.tar.xz";
- sha256 = "07xd01b5vl6gl4p2cs75fsn295jvwmlq2j9jw582b2ii8vsaavvv";
+ sha256 = "1vma3bxydryhcg7iimndq4rbpzbpjvnq7qa5md6wm6iill011pil";
};
features.iwlwifi = true;
diff --git a/pkgs/os-specific/linux/kernel/manual-config.nix b/pkgs/os-specific/linux/kernel/manual-config.nix
index b387efd5c41..ae226f0908b 100644
--- a/pkgs/os-specific/linux/kernel/manual-config.nix
+++ b/pkgs/os-specific/linux/kernel/manual-config.nix
@@ -197,6 +197,7 @@ let
+ ")");
license = "GPLv2";
homepage = http://www.kernel.org/;
+ repositories.git = https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable.git;
maintainers = [
maintainers.shlevy
];
diff --git a/pkgs/os-specific/linux/kernel/patches.nix b/pkgs/os-specific/linux/kernel/patches.nix
index 5ade01014f9..c36779c295f 100644
--- a/pkgs/os-specific/linux/kernel/patches.nix
+++ b/pkgs/os-specific/linux/kernel/patches.nix
@@ -89,11 +89,11 @@ rec {
features.apparmor = true;
};
- grsecurity_3_0_3_13_2 =
- { name = "grsecurity-3.0-3.13.2";
+ grsecurity_3_0_3_13_3 =
+ { name = "grsecurity-3.0-3.13.3";
patch = fetchurl {
- url = https://grsecurity.net/test/grsecurity-3.0-3.13.2-201402062224.patch;
- sha256 = "0w42d76bv7yzpr23bicsadf64csbmq988kmpzxg4yv5qwzhhbyh7";
+ url = http://grsecurity.net/test/grsecurity-3.0-3.13.3-201402132113.patch;
+ sha256 = "143givk7xk54c2f9q7h2v5gdc3sy1kcd8j83vn1jfcyipzqkdqnk";
};
features.grsecurity = true;
# The grsec kernel patch seems to include the apparmor patches as of 3.0-3.13.2
diff --git a/pkgs/os-specific/linux/lxc/default.nix b/pkgs/os-specific/linux/lxc/default.nix
index fd6bb9b0389..825c241e53a 100644
--- a/pkgs/os-specific/linux/lxc/default.nix
+++ b/pkgs/os-specific/linux/lxc/default.nix
@@ -3,11 +3,11 @@
}:
stdenv.mkDerivation rec {
- name = "lxc-1.0.0.beta2";
+ name = "lxc-1.0.0.beta4";
src = fetchurl {
url = "http://github.com/lxc/lxc/archive/${name}.tar.gz";
- sha256 = "0w38kxpqrhrgzd057yk8xzi4lx2vzvjkn6iysnj9zibw1bzb5rbk";
+ sha256 = "174grvh5086pmbaladp5ivy2azlm7q9v5xwgc5yww2mggx99w41j";
};
buildInputs = [ libcap apparmor perl docbook2x gnutls autoreconfHook pkgconfig ];
diff --git a/pkgs/os-specific/linux/nvidia-x11/default.nix b/pkgs/os-specific/linux/nvidia-x11/default.nix
index c89e5550f3e..1632f4f4ecb 100644
--- a/pkgs/os-specific/linux/nvidia-x11/default.nix
+++ b/pkgs/os-specific/linux/nvidia-x11/default.nix
@@ -8,9 +8,11 @@
with stdenv.lib;
+assert (!libsOnly) -> kernel != null;
+
let
- versionNumber = "331.20";
+ versionNumber = "331.38";
in
@@ -19,16 +21,18 @@ stdenv.mkDerivation {
builder = ./builder.sh;
+ patches = optional (kernel ? version && versionAtLeast kernel.version "3.13") ./kernel-3.13.patch ;
+
src =
if stdenv.system == "i686-linux" then
fetchurl {
url = "http://us.download.nvidia.com/XFree86/Linux-x86/${versionNumber}/NVIDIA-Linux-x86-${versionNumber}.run";
- sha256 = "0icpmfsppnsvk7vj0fshi3ry4s1wix435s2c8wwak47765fv1mks";
+ sha256 = "1x1b70lnw2ipwlyff7czxqrgz8yyq87djzgmgs9p3lmczy7lsvir";
}
else if stdenv.system == "x86_64-linux" then
fetchurl {
url = "http://us.download.nvidia.com/XFree86/Linux-x86_64/${versionNumber}/NVIDIA-Linux-x86_64-${versionNumber}-no-compat32.run";
- sha256 = "02503dis3ngraqv7174a4pay2x08hp697n9q74rpjjclf5k74ax1";
+ sha256 = "1ljafiqnyhj355mjp3r8wmb806xm6mbrn0x1dfgqh5pv9imhszhp";
}
else throw "nvidia-x11 does not support platform ${stdenv.system}";
@@ -49,11 +53,11 @@ stdenv.mkDerivation {
buildInputs = [ perl ];
- meta = {
+ meta = with stdenv.lib.meta; {
homepage = http://www.nvidia.com/object/unix.html;
description = "X.org driver and kernel module for NVIDIA graphics cards";
- license = stdenv.lib.licenses.unfreeRedistributable;
- platforms = stdenv.lib.platforms.linux;
- hydraPlatforms = [];
+ license = licenses.unfreeRedistributable;
+ platforms = platforms.linux;
+ maintainers = [ maintainers.vcunat ];
};
}
diff --git a/pkgs/os-specific/linux/nvidia-x11/kernel-3.13.patch b/pkgs/os-specific/linux/nvidia-x11/kernel-3.13.patch
new file mode 100644
index 00000000000..477ac1369e0
--- /dev/null
+++ b/pkgs/os-specific/linux/nvidia-x11/kernel-3.13.patch
@@ -0,0 +1,122 @@
+diff -rupN NVIDIA-Linux-x86_64-331.38.orig/kernel/nv-acpi.c NVIDIA-Linux-x86_64-331.38/kernel/nv-acpi.c
+--- NVIDIA-Linux-x86_64-331.38.orig/kernel/nv-acpi.c 2014-01-25 09:39:47.126966926 +0100
++++ NVIDIA-Linux-x86_64-331.38/kernel/nv-acpi.c 2014-01-26 09:59:45.853427603 +0100
+@@ -303,7 +303,10 @@ static int nv_acpi_remove(struct acpi_de
+
+ if (pNvAcpiObject->notify_handler_installed)
+ {
++#if LINUX_VERSION_CODE < KERNEL_VERSION(3, 13, 0)
++ /* beginning with 3.13, acpi_remove_notify_handler() waits for events to finish */
+ NV_ACPI_OS_WAIT_EVENTS_COMPLETE();
++#endif
+
+ // remove event notifier
+ status = acpi_remove_notify_handler(device->handle, ACPI_DEVICE_NOTIFY, nv_acpi_event);
+@@ -1076,10 +1079,17 @@ RM_STATUS NV_API_CALL nv_acpi_dsm_method
+ NvU8 argument3[4]; /* For all DSM sub functions, input size is 4 */
+ NvU32 data_size;
+ acpi_handle dev_handle = NULL;
++#if LINUX_VERSION_CODE < KERNEL_VERSION(3, 13, 0)
+ #ifdef DEVICE_ACPI_HANDLE
+ nv_linux_state_t *nvl = NV_GET_NVL_FROM_NV_STATE(nv);
+ dev_handle = DEVICE_ACPI_HANDLE(&nvl->dev->dev);
+ #endif
++#else
++#ifdef ACPI_HANDLE
++ nv_linux_state_t *nvl = NV_GET_NVL_FROM_NV_STATE(nv);
++ dev_handle = ACPI_HANDLE(&nvl->dev->dev);
++#endif
++#endif
+
+ if (!dev_handle)
+ return RM_ERR_NOT_SUPPORTED;
+@@ -1179,12 +1189,21 @@ RM_STATUS NV_API_CALL nv_acpi_ddc_method
+ NvU32 i;
+ acpi_handle dev_handle = NULL;
+ acpi_handle lcd_dev_handle = NULL;
++#if LINUX_VERSION_CODE < KERNEL_VERSION(3, 13, 0)
+ #ifdef DEVICE_ACPI_HANDLE
+ nv_linux_state_t *nvl = NV_GET_NVL_FROM_NV_STATE(nv);
+ dev_handle = DEVICE_ACPI_HANDLE(&nvl->dev->dev);
+ #else
+ return RM_ERR_NOT_SUPPORTED;
+ #endif
++#else
++#ifdef ACPI_HANDLE
++ nv_linux_state_t *nvl = NV_GET_NVL_FROM_NV_STATE(nv);
++ dev_handle = ACPI_HANDLE(&nvl->dev->dev);
++#else
++ return RM_ERR_NOT_SUPPORTED;
++#endif
++#endif
+ if (!dev_handle)
+ return RM_ERR_INVALID_ARGUMENT;
+
+@@ -1294,12 +1313,21 @@ RM_STATUS NV_API_CALL nv_acpi_rom_method
+ struct acpi_object_list input = { 2, rom_arg };
+ acpi_handle dev_handle = NULL;
+ uint32_t offset, length;
++#if LINUX_VERSION_CODE < KERNEL_VERSION(3, 13, 0)
+ #ifdef DEVICE_ACPI_HANDLE
+ nv_linux_state_t *nvl = NV_GET_NVL_FROM_NV_STATE(nv);
+- dev_handle = DEVICE_ACPI_HANDLE(&nvl->dev->dev);
++ dev_handle = ACPI_DEVICE_HANDLE(&nvl->dev->dev);
+ #else
+ return RM_ERR_NOT_SUPPORTED;
+ #endif
++#else
++#ifdef ACPI_HANDLE
++ nv_linux_state_t *nvl = NV_GET_NVL_FROM_NV_STATE(nv);
++ dev_handle = ACPI_HANDLE(&nvl->dev->dev);
++#else
++ return RM_ERR_NOT_SUPPORTED;
++#endif
++#endif
+
+ if (!dev_handle)
+ return RM_ERR_INVALID_ARGUMENT;
+@@ -1364,12 +1392,21 @@ RM_STATUS NV_API_CALL nv_acpi_dod_method
+ union acpi_object *dod;
+ acpi_handle dev_handle = NULL;
+ NvU32 i, count = (*pSize / sizeof(NvU32));
++#if LINUX_VERSION_CODE < KERNEL_VERSION(3, 13, 0)
+ #ifdef DEVICE_ACPI_HANDLE
+ nv_linux_state_t *nvl = NV_GET_NVL_FROM_NV_STATE(nv);
+ dev_handle = DEVICE_ACPI_HANDLE(&nvl->dev->dev);
+ #else
+ return RM_ERR_NOT_SUPPORTED;
+ #endif
++#else
++#ifdef ACPI_HANDLE
++ nv_linux_state_t *nvl = NV_GET_NVL_FROM_NV_STATE(nv);
++ dev_handle = ACPI_HANDLE(&nvl->dev->dev);
++#else
++ return RM_ERR_NOT_SUPPORTED;
++#endif
++#endif
+
+ if (!dev_handle)
+ return RM_ERR_INVALID_ARGUMENT;
+diff -rupN NVIDIA-Linux-x86_64-331.38.orig/kernel/uvm/nvidia_uvm_linux.h NVIDIA-Linux-x86_64-331.38/kernel/uvm/nvidia_uvm_linux.h
+--- NVIDIA-Linux-x86_64-331.38.orig/kernel/uvm/nvidia_uvm_linux.h 2014-01-25 09:39:47.172966925 +0100
++++ NVIDIA-Linux-x86_64-331.38/kernel/uvm/nvidia_uvm_linux.h 2014-01-25 09:46:40.572999245 +0100
+@@ -405,11 +405,17 @@ typedef void irqreturn_t;
+ // not require the RCU's read lock on current->cred.
+ //
+ //
++#if LINUX_VERSION_CODE >= KERNEL_VERSION(3, 5, 0)
++#define NV_KUID_TO_UID(value) (__kuid_val(value))
++#else
++#define NV_KUID_TO_UID(value) (value)
++#endif
++
+ #if defined(NV_TASK_STRUCT_HAS_CRED)
+ #define NV_CURRENT_EUID() \
+- (((typeof(*current->cred) __force __kernel *)current->cred)->euid)
++ NV_KUID_TO_UID(((typeof(*current->cred) __force __kernel *)current->cred)->euid)
+ #else
+-#define NV_CURRENT_EUID() (current->euid)
++#define NV_CURRENT_EUID() NV_KUID_TO_UID(current->euid)
+ #endif
+
+ #define NV_ATOMIC_SET(data,val) atomic_set(&(data), (val))
diff --git a/pkgs/os-specific/linux/xf86-input-wacom/default.nix b/pkgs/os-specific/linux/xf86-input-wacom/default.nix
index 4350694c13a..e59fd695f78 100644
--- a/pkgs/os-specific/linux/xf86-input-wacom/default.nix
+++ b/pkgs/os-specific/linux/xf86-input-wacom/default.nix
@@ -3,11 +3,11 @@
, ncurses, pkgconfig, randrproto, xorgserver, xproto, udev, libXinerama, pixman }:
stdenv.mkDerivation rec {
- name = "xf86-input-wacom-0.20.0";
+ name = "xf86-input-wacom-0.23.0";
src = fetchurl {
url = "mirror://sourceforge/linuxwacom/${name}.tar.bz2";
- sha256 = "1408zjqsakcyx6v81qwh4q7m49cc6vcaad54jaw8ycw4i832jvjq";
+ sha256 = "13capyywk4k3z0va8dawvvdbyschwid0075ji67kyabz1y431h6v";
};
buildInputs = [ inputproto libX11 libXext libXi libXrandr libXrender
diff --git a/pkgs/servers/apcupsd/default.nix b/pkgs/servers/apcupsd/default.nix
index 4ccb1b069c9..6489d4dceff 100644
--- a/pkgs/servers/apcupsd/default.nix
+++ b/pkgs/servers/apcupsd/default.nix
@@ -4,11 +4,11 @@
stdenv.mkDerivation rec {
pname = "apcupsd";
- name = "${pname}-3.14.10";
+ name = "${pname}-3.14.11";
src = fetchurl {
url = "mirror://sourceforge/${pname}/${name}.tar.gz";
- sha256 = "0ci0xyg1hzj8lnmm3vxfsvgpb3wdgh1ii3gb8jgdxyqnk7nba1q7";
+ sha256 = "0wrb8vdc872f1x0gw21b5c81h0vxvsc7yks5qzbq2j3hkbl2vixd";
};
buildInputs = [ pkgconfig utillinux man ] ++ stdenv.lib.optional enableCgiScripts gd;
diff --git a/pkgs/servers/http/nginx/default.nix b/pkgs/servers/http/nginx/default.nix
index b16911cfb5d..4504d49edbb 100644
--- a/pkgs/servers/http/nginx/default.nix
+++ b/pkgs/servers/http/nginx/default.nix
@@ -5,10 +5,10 @@
, moreheaders ? false}:
let
- version = "1.4.4";
+ version = "1.4.5";
mainSrc = fetchurl {
url = "http://nginx.org/download/nginx-${version}.tar.gz";
- sha256 = "1f82845mpgmhvm151fhn2cnqjggw9w7cvsqbva9rb320wmc9m63w";
+ sha256 = "0zh7w1bz8rcxrs5bwp39m91nzm454mxlf3m5krkv1wm8ar1h5sdd";
};
rtmp-ext = fetchgit {
diff --git a/pkgs/servers/mail/opensmtpd/default.nix b/pkgs/servers/mail/opensmtpd/default.nix
index fc518e4f889..49550647921 100644
--- a/pkgs/servers/mail/opensmtpd/default.nix
+++ b/pkgs/servers/mail/opensmtpd/default.nix
@@ -1,10 +1,10 @@
-{ stdenv, fetchurl, libevent, zlib, openssl, db4, bison, pam }:
+{ stdenv, fetchurl, libevent, zlib, openssl, db, bison, pam }:
stdenv.mkDerivation rec {
name = "opensmtpd-${version}";
version = "201307151923p1";
- buildInputs = [ libevent zlib openssl db4 bison pam ];
+ buildInputs = [ libevent zlib openssl db bison pam ];
src = fetchurl {
url = "http://www.opensmtpd.org/archives/${name}.tar.gz";
diff --git a/pkgs/servers/mail/postfix/default.nix b/pkgs/servers/mail/postfix/default.nix
index a435eea8663..0bfc31580e1 100644
--- a/pkgs/servers/mail/postfix/default.nix
+++ b/pkgs/servers/mail/postfix/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, db4, glibc, openssl, cyrus_sasl
+{ stdenv, fetchurl, db, glibc, openssl, cyrus_sasl
, coreutils, findutils, gnused, gnugrep, bison, perl
}:
@@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
sha256 = "11z07mjy53l1fnl7k4101yk4ilibgqr1164628mqcbmmr8bh2szl";
};
- buildInputs = [db4 openssl cyrus_sasl bison perl];
+ buildInputs = [db openssl cyrus_sasl bison perl];
patches = [ ./postfix-2.2.9-db.patch ./postfix-2.2.9-lib.patch ./db-linux3.patch ];
diff --git a/pkgs/servers/monitoring/zabbix/2.0.nix b/pkgs/servers/monitoring/zabbix/2.0.nix
index cc05730cee5..399fb54875a 100644
--- a/pkgs/servers/monitoring/zabbix/2.0.nix
+++ b/pkgs/servers/monitoring/zabbix/2.0.nix
@@ -5,12 +5,12 @@ assert enableJabber -> minmay != null;
let
- version = "2.0.10";
+ version = "2.0.11";
branch = "2.0";
src = fetchurl {
url = "mirror://sourceforge/zabbix/zabbix-${version}.tar.gz";
- sha256 = "0p86m634j08w0gbr2rwqr3h5p6md7k0c688w5yxc1ii3l9fmnhbi";
+ sha256 = "1vqxlqwhnz02wrca08vrqbq8k19qp84hbdplmqk7d9699njim46i";
};
preConfigure =
diff --git a/pkgs/servers/monitoring/zabbix/2.2.nix b/pkgs/servers/monitoring/zabbix/2.2.nix
index 71d4a963d7a..424001ea377 100644
--- a/pkgs/servers/monitoring/zabbix/2.2.nix
+++ b/pkgs/servers/monitoring/zabbix/2.2.nix
@@ -5,12 +5,12 @@ assert enableJabber -> minmay != null;
let
- version = "2.2.1";
+ version = "2.2.2";
branch = "2.2";
src = fetchurl {
url = "mirror://sourceforge/zabbix/zabbix-${version}.tar.gz";
- sha256 = "1yy7jbbnpr7qkvzqcspybdkmaz50v2hsa9kvg4lzjysjzg7f9j99";
+ sha256 = "1gmjbjmajdllzd7akihb5kg4l2gf0ii9c16fq8mlla37sshzj3p0";
};
preConfigure =
diff --git a/pkgs/servers/monitoring/zabbix/default.nix b/pkgs/servers/monitoring/zabbix/default.nix
index bf0366f20b1..1e46ffdbc85 100644
--- a/pkgs/servers/monitoring/zabbix/default.nix
+++ b/pkgs/servers/monitoring/zabbix/default.nix
@@ -2,11 +2,11 @@
let
- version = "1.8.19";
+ version = "1.8.20";
src = fetchurl {
url = "mirror://sourceforge/zabbix/zabbix-${version}.tar.gz";
- sha256 = "0xgki1lrqyhfvx2691v8mk7a868zz35cnvrhiyqgksq2kshm11ph";
+ sha256 = "0psdvzg5c3yhdqqmy5m1b0j3nrvcshjywhl56igy0j8vj16zxi86";
};
preConfigure =
diff --git a/pkgs/servers/mpd/clientlib.nix b/pkgs/servers/mpd/clientlib.nix
index 612ec0456f2..cd65234855f 100644
--- a/pkgs/servers/mpd/clientlib.nix
+++ b/pkgs/servers/mpd/clientlib.nix
@@ -5,15 +5,15 @@ stdenv.mkDerivation rec {
name = "libmpdclient-${version}";
src = fetchurl {
- url = "http://www.musicpd.org/download/libmpdclient/2/${name}.tar.bz2";
- sha256 = "1qwjkb56rsbk0hwhg7fl15d6sf580a19gh778zcdg374j4yym3hh";
+ url = "http://www.musicpd.org/download/libmpdclient/2/${name}.tar.xz";
+ sha256 = "1jlrfqxqq3gscwrppr2h0xqxd5abl1ypwpwpwnpxs6p9c2jppjbw";
};
buildInputs = [ doxygen ];
passthru = {
majorVersion = "2";
- minorVersion = "8";
+ minorVersion = "9";
};
meta = {
diff --git a/pkgs/servers/prayer/default.nix b/pkgs/servers/prayer/default.nix
index 8a23e480e1f..a398a3ccdf9 100644
--- a/pkgs/servers/prayer/default.nix
+++ b/pkgs/servers/prayer/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, perl, openssl, db4, zlib, uwimap, htmlTidy, pam}:
+{ stdenv, fetchurl, perl, openssl, db, zlib, uwimap, htmlTidy, pam}:
let
ssl = stdenv.lib.optionals uwimap.withSSL
@@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
sha256 = "135fjbxjn385b6cjys6qhbwfw61mdcl2akkll4jfpdzfvhbxlyda";
};
- buildInputs = [ openssl db4 zlib uwimap htmlTidy pam ];
+ buildInputs = [ openssl db zlib uwimap htmlTidy pam ];
nativeBuildInputs = [ perl ];
NIX_LDFLAGS = "-lpam";
diff --git a/pkgs/servers/search/elasticsearch/default.nix b/pkgs/servers/search/elasticsearch/default.nix
index f99ecded098..165a01517b4 100644
--- a/pkgs/servers/search/elasticsearch/default.nix
+++ b/pkgs/servers/search/elasticsearch/default.nix
@@ -1,10 +1,10 @@
{ stdenv, fetchurl, makeWrapper, jre, utillinux }:
stdenv.mkDerivation rec {
- name = "elasticsearch-0.90.3";
+ name = "elasticsearch-1.0.0";
src = fetchurl {
url = "https://download.elasticsearch.org/elasticsearch/elasticsearch/${name}.tar.gz";
- sha256 = "1l6rnp4yvlz4z6z4v3af08yd4sl91c4zz20a8yyif2p234lh3n2s";
+ sha256 = "06ym7hl47339a5dav2hawnxv820y0lbvh9xxd0lfp1f815vbql01";
};
patches = [ ./es-home.patch ];
diff --git a/pkgs/servers/search/elasticsearch/es-home.patch b/pkgs/servers/search/elasticsearch/es-home.patch
index d75a5a8c052..9b96149e5ad 100644
--- a/pkgs/servers/search/elasticsearch/es-home.patch
+++ b/pkgs/servers/search/elasticsearch/es-home.patch
@@ -1,59 +1,38 @@
-diff -rc elasticsearch-0.90.3/bin/elasticsearch elasticsearch-0.90.3-new/bin/elasticsearch
-*** elasticsearch-0.90.3/bin/elasticsearch 2013-08-06 15:19:22.000000000 +0200
---- elasticsearch-0.90.3-new/bin/elasticsearch 2013-08-27 16:42:00.935880011 +0200
-***************
-*** 62,68 ****
- done
-
- # determine elasticsearch home
-! ES_HOME=`dirname "$SCRIPT"`/..
-
- # make ELASTICSEARCH_HOME absolute
- ES_HOME=`cd "$ES_HOME"; pwd`
---- 62,71 ----
- done
-
- # determine elasticsearch home
-! if [ -z "$ES_HOME" ]; then
-! echo "You must set the ES_HOME var" >&2
-! exit 1
-! fi
-
- # make ELASTICSEARCH_HOME absolute
- ES_HOME=`cd "$ES_HOME"; pwd`
-diff -rc elasticsearch-0.90.3/bin/plugin elasticsearch-0.90.3-new/bin/plugin
-*** elasticsearch-0.90.3/bin/plugin 2013-08-06 15:19:22.000000000 +0200
---- elasticsearch-0.90.3-new/bin/plugin 2013-08-27 16:49:01.024160295 +0200
-***************
-*** 16,22 ****
- done
-
- # determine elasticsearch home
-! ES_HOME=`dirname "$SCRIPT"`/..
-
- # make ELASTICSEARCH_HOME absolute
- ES_HOME=`cd "$ES_HOME"; pwd`
---- 16,25 ----
- done
-
- # determine elasticsearch home
-! if [ -z "$ES_HOME" ]; then
-! echo "You must set the ES_HOME var" >&2
-! exit 1
-! fi
-
- # make ELASTICSEARCH_HOME absolute
- ES_HOME=`cd "$ES_HOME"; pwd`
-***************
-*** 46,50 ****
- shift
- done
-
-! exec $JAVA $JAVA_OPTS -Xmx64m -Xms16m -Delasticsearch -Des.path.home="$ES_HOME" $properties -cp "$ES_HOME/lib/*" org.elasticsearch.plugins.PluginManager $args
-
---- 49,53 ----
- shift
- done
-
-! exec $JAVA $JAVA_OPTS -Xmx64m -Xms16m -Delasticsearch -Des.path.home="$ES_HOME" $properties -cp "$ES_CLASSPATH/lib/*" org.elasticsearch.plugins.PluginManager $args
-
+diff --git a/bin/elasticsearch b/bin/elasticsearch
+index c7c9263..0fcecf6 100755
+--- a/bin/elasticsearch
++++ b/bin/elasticsearch
+@@ -76,7 +76,10 @@ while [ -h "$SCRIPT" ] ; do
+ done
+
+ # determine elasticsearch home
+-ES_HOME=`dirname "$SCRIPT"`/..
++if [ -z "$ES_HOME" ]; then
++ echo "You must set the ES_HOME var" >&2
++ exit 1
++fi
+
+ # make ELASTICSEARCH_HOME absolute
+ ES_HOME=`cd "$ES_HOME"; pwd`
+diff --git a/bin/plugin b/bin/plugin
+index a8c796a..daf7b99 100755
+--- a/bin/plugin
++++ b/bin/plugin
+@@ -16,7 +16,10 @@ while [ -h "$SCRIPT" ] ; do
+ done
+
+ # determine elasticsearch home
+-ES_HOME=`dirname "$SCRIPT"`/..
++if [ -z "$ES_HOME" ]; then
++ echo "You must set the ES_HOME var" >&2
++ exit 1
++fi
+
+ # make ELASTICSEARCH_HOME absolute
+ ES_HOME=`cd "$ES_HOME"; pwd`
+@@ -45,4 +48,4 @@ while [ $# -gt 0 ]; do
+ shift
+ done
+
+-exec $JAVA $JAVA_OPTS -Xmx64m -Xms16m -Delasticsearch -Des.path.home="$ES_HOME" $properties -cp "$ES_HOME/lib/*" org.elasticsearch.plugins.PluginManager $args
++exec $JAVA $JAVA_OPTS -Xmx64m -Xms16m -Delasticsearch -Des.path.home="$ES_HOME" $properties -cp "$ES_CLASSPATH/lib/*" org.elasticsearch.plugins.PluginManager $args
diff --git a/pkgs/servers/squid/squids.nix b/pkgs/servers/squid/squids.nix
index a41343c0cf9..18778aa80db 100644
--- a/pkgs/servers/squid/squids.nix
+++ b/pkgs/servers/squid/squids.nix
@@ -35,7 +35,7 @@ rec {
url = "http://www.squid-cache.org/Versions/v3/3.2/${name}.tar.bz2";
sha256 = "0dafqv00dr3nyrm9k47d6r7gv2r3f9hjd1ykl3kkvjca11r4n54j";
};
- buildInputs = [openldap pam db4 cyrus_sasl libcap expat libxml2
+ buildInputs = [openldap pam db cyrus_sasl libcap expat libxml2
libtool openssl];
};
diff --git a/pkgs/shells/fish/default.nix b/pkgs/shells/fish/default.nix
index 27f2b032476..7b70e98d2cd 100644
--- a/pkgs/shells/fish/default.nix
+++ b/pkgs/shells/fish/default.nix
@@ -1,34 +1,35 @@
-{ stdenv, fetchurl, autoconf, ncurses, which, groff, gettext }:
+{ stdenv, fetchurl, ncurses, python27, which, groff, gettext, man_db, bc }:
stdenv.mkDerivation rec {
- name = "fish-2.1.0";
+ name = "fish-${version}";
+ version = "2.1.0";
src = fetchurl {
- url = http://fishshell.com/files/2.1.0/fish-2.1.0.tar.gz;
- sha1 = "b1764cba540055cb8e2a96a7ea4c844b04a32522";
+ url = "http://fishshell.com/files/${version}/${name}.tar.gz";
+ sha256 = "0i7h3hx8iszli3d4kphw79sz9m07f2lc2c9hr9smdps5s7wpllmg";
};
- nativeBuildInputs = [ autoconf ];
+ buildInputs = [ ncurses ];
- buildInputs = [ ncurses which ];
-
- preConfigure = ''
- autoconf
- '';
+ # Required binaries during execution
+ # Python27: Autocompletion generated from manpages and config editing
+ propagatedBuildInputs = [ python27 which groff gettext man_db bc ];
postInstall = ''
- sed -i "s|which |command -v |" "$out/share/fish/functions/type.fish"
+ sed -i "s|bc|${bc}/bin/bc|" "$out/share/fish/functions/seq.fish"
+ sed -i "s|which |${which}/bin/which |" "$out/share/fish/functions/type.fish"
sed -i "s|nroff |${groff}/bin/nroff |" "$out/share/fish/functions/__fish_print_help.fish"
sed -e "s|gettext |${gettext}/bin/gettext |" \
- -e "s|which |command -v |" \
+ -e "s|which |${which}/bin/which |" \
-i "$out/share/fish/functions/_.fish"
+ sed -i "s|Popen(\['manpath'|Popen(\['${man_db}/bin/manpath'|" "$out/share/fish/tools/create_manpage_completions.py"
'';
meta = with stdenv.lib; {
description = "Smart and user-friendly command line shell";
- homepage = http://fishshell.com/;
+ homepage = "http://fishshell.com/";
license = licenses.gpl2;
platforms = platforms.linux;
- maintainers = [ stdenv.lib.maintainers.ocharles ];
+ maintainers = with maintainers; [ ocharles ];
};
}
diff --git a/pkgs/tools/admin/awscli/default.nix b/pkgs/tools/admin/awscli/default.nix
index aa8361c737f..a2530319014 100644
--- a/pkgs/tools/admin/awscli/default.nix
+++ b/pkgs/tools/admin/awscli/default.nix
@@ -2,17 +2,21 @@
pythonPackages.buildPythonPackage rec {
name = "awscli-${version}";
- version = "0.8.3";
+ version = "1.2.13";
namePrefix = "";
src = fetchurl {
url = "https://github.com/aws/aws-cli/archive/${version}.tar.gz";
- sha256 = "0v7igh00zja560v8qz315g3m7x9six1hprrrb10cpp9sy8n58xnn";
+ sha256 = "1mpy1q9y5qiq1fr2xc98sn1njx0p0b1g21p0rdh4ccsf9w7i0rpb";
};
propagatedBuildInputs = [
- pythonPackages.argparse
pythonPackages.botocore
+ pythonPackages.bcdoc
+ pythonPackages.six
pythonPackages.colorama
+ pythonPackages.docutils
+ pythonPackages.rsa
+ pythonPackages.pyasn1
];
}
diff --git a/pkgs/tools/backup/duply/default.nix b/pkgs/tools/backup/duply/default.nix
index b184dff11cd..91718fc02f7 100644
--- a/pkgs/tools/backup/duply/default.nix
+++ b/pkgs/tools/backup/duply/default.nix
@@ -3,11 +3,11 @@
}:
stdenv.mkDerivation {
- name = "duply-1.5.11";
+ name = "duply-1.6.0";
src = fetchurl {
- url = "mirror://sourceforge/project/ftplicity/duply%20%28simple%20duplicity%29/1.5.x/duply_1.5.11.tgz";
- sha256 = "07z4wl75z227v8y9xwc2pfdp307a5jzx4sif598vprqync0g6mmk";
+ url = "mirror://sourceforge/project/ftplicity/duply%20%28simple%20duplicity%29/1.6.x/duply_1.6.0.tgz";
+ sha256 = "1i1yy4z6fcf3lq2k72cqcyqspm7pa1m949f8l9yscjm47bwp5g8f";
};
buildInputs = [ txt2man makeWrapper ];
diff --git a/pkgs/tools/filesystems/netatalk/default.nix b/pkgs/tools/filesystems/netatalk/default.nix
index 26ffc9d50c2..850e1681248 100644
--- a/pkgs/tools/filesystems/netatalk/default.nix
+++ b/pkgs/tools/filesystems/netatalk/default.nix
@@ -1,4 +1,4 @@
-{ fetchurl, stdenv, pkgconfig, db4, libgcrypt, avahi, libiconv, pam, openssl }:
+{ fetchurl, stdenv, pkgconfig, db, libgcrypt, avahi, libiconv, pam, openssl }:
stdenv.mkDerivation rec {
name = "netatalk-3.1.0";
@@ -8,10 +8,10 @@ stdenv.mkDerivation rec {
sha256 = "1d8dc8ysslkis4yl1xab1w9p0pz7a1kg0i6fds4wxsp4fhb6wqhq";
};
- buildInputs = [ pkgconfig db4 libgcrypt avahi libiconv pam openssl ];
+ buildInputs = [ pkgconfig db libgcrypt avahi libiconv pam openssl ];
configureFlags = [
- "--with-bdb=${db4}"
+ "--with-bdb=${db}"
"--with-openssl=${openssl}"
];
diff --git a/pkgs/tools/misc/bogofilter/default.nix b/pkgs/tools/misc/bogofilter/default.nix
index 09d8e888837..f7c121d825e 100644
--- a/pkgs/tools/misc/bogofilter/default.nix
+++ b/pkgs/tools/misc/bogofilter/default.nix
@@ -1,4 +1,4 @@
-{fetchurl, stdenv, flex, db4}:
+{fetchurl, stdenv, flex, db}:
stdenv.mkDerivation rec {
name = "bogofilter-1.2.4";
@@ -10,7 +10,7 @@ stdenv.mkDerivation rec {
# FIXME: We would need `pax' as a "propagated build input" (for use
# by the `bf_tar' script) but we don't have it currently.
- buildInputs = [ flex db4 ];
+ buildInputs = [ flex db ];
meta = {
homepage = http://bogofilter.sourceforge.net/;
diff --git a/pkgs/tools/misc/ethtool/default.nix b/pkgs/tools/misc/ethtool/default.nix
index 48baa8bff01..fe5985b9698 100644
--- a/pkgs/tools/misc/ethtool/default.nix
+++ b/pkgs/tools/misc/ethtool/default.nix
@@ -1,11 +1,11 @@
{ stdenv, fetchurl }:
stdenv.mkDerivation rec {
- name = "ethtool-3.11";
+ name = "ethtool-3.13";
src = fetchurl {
url = "mirror://kernel/software/network/ethtool/${name}.tar.xz";
- sha256 = "1m1gc2g5ym7xmbq64ysw9avp9bbsagbi7x624mzki5ba3535agym";
+ sha256 = "07z7janzj8fbs04sw6nlzr039yh7b5gmzvik7ymg807i2gi5fmjs";
};
meta = with stdenv.lib; {
diff --git a/pkgs/tools/misc/i3minator/default.nix b/pkgs/tools/misc/i3minator/default.nix
new file mode 100644
index 00000000000..cb12cb33c76
--- /dev/null
+++ b/pkgs/tools/misc/i3minator/default.nix
@@ -0,0 +1,40 @@
+{ stdenv, fetchurl, buildPythonPackage, pythonPackages, python }:
+
+let
+ i3-py = buildPythonPackage rec {
+ version = "0.6.4";
+ name = "i3-py-${version}";
+
+ src = fetchurl {
+ url = "https://pypi.python.org/packages/source/i/i3-py/i3-py-${version}.tar.gz";
+ sha256 = "1sgl438jrb4cdyl7hbc3ymwsf7y3zy09g1gh7ynilxpllp37jc8y";
+ };
+
+ # no tests in tarball
+ doCheck = false;
+ };
+in buildPythonPackage rec {
+ name = "i3minator-${version}";
+ version = "0.0.3";
+
+ src = fetchurl {
+ url = "https://github.com/carlesso/i3minator/archive/v${version}.tar.gz";
+ sha256 = "0ksb0frrhq10k5rjzk72kj5rjzak1irr9q4x4f22w2vylxq19xxa";
+ };
+
+ propagatedBuildInputs = [ pythonPackages.pyyaml i3-py ];
+
+ meta = with stdenv.lib; {
+ description = "i3 project manager similar to tmuxinator";
+ longDescription = ''
+ A simple "workspace manager" for i3. It allows to quickly
+ manage workspaces defining windows and their layout. The
+ project is inspired by tmuxinator and uses i3-py.
+ '';
+ homepage = https://github.com/carlesso/i3minator;
+ license = "WTFPL"; # http://sam.zoy.org/wtfpl/
+ maintainers = with maintainers; [ iElectric ];
+ platforms = stdenv.lib.platforms.linux;
+ };
+
+}
diff --git a/pkgs/tools/misc/man-db/default.nix b/pkgs/tools/misc/man-db/default.nix
index 5374cb74361..f664bcc6917 100644
--- a/pkgs/tools/misc/man-db/default.nix
+++ b/pkgs/tools/misc/man-db/default.nix
@@ -1,32 +1,23 @@
-{stdenv, fetchurl, db4, groff}:
+{ stdenv, fetchurl, pkgconfig, libpipeline, db, groff }:
-stdenv.mkDerivation {
- name = "man-db-2.5.1";
+stdenv.mkDerivation rec {
+ name = "man-db-2.6.6";
src = fetchurl {
- url = mirror://savannah/man-db/man-db-2.5.1.tar.gz;
- sha256 = "178w1fk23ffh8vabj29cn0yyg5ps7bwy1zrrrcsw8aypbh3sfjy3";
+ url = "mirror://savannah/man-db/${name}.tar.xz";
+ sha256 = "1hv6byj6sg6cp3jyf08gbmdm4pwhvd5hzmb94xl0w7prin6hzabx";
};
- buildInputs = [db4 groff];
+ buildInputs = [ pkgconfig libpipeline db groff ];
configureFlags = ''
--disable-setuid
- --with-nroff=${groff}/bin/nroff
- --with-tbl=${groff}/bin/tbl
- --with-eqn=${groff}/bin/eqn
- --with-neqn=${groff}/bin/neqn
'';
- troff = "${groff}/bin/troff";
-
- patches = [
- # Search in "share/man" relative to each path in $PATH (in addition to "man").
- ./share.patch
- ];
-
- meta = {
- homepage = http://www.nongnu.org/man-db/;
+ meta = with stdenv.lib; {
+ homepage = "http://man-db.nongnu.org";
description = "An implementation of the standard Unix documentation system accessed using the man command";
+ license = licenses.gpl2;
+ platforms = platforms.unix;
};
}
diff --git a/pkgs/tools/misc/man-db/share.patch b/pkgs/tools/misc/man-db/share.patch
deleted file mode 100644
index 95582a50269..00000000000
--- a/pkgs/tools/misc/man-db/share.patch
+++ /dev/null
@@ -1,110 +0,0 @@
-diff -rc man-db-2.5.1-orig/src/manp.c man-db-2.5.1/src/manp.c
-*** man-db-2.5.1-orig/src/manp.c 2008-01-07 03:23:11.000000000 +0100
---- man-db-2.5.1/src/manp.c 2008-02-07 14:20:20.000000000 +0100
-***************
-*** 96,102 ****
-
- static void mkcatdirs (const char *mandir, const char *catdir);
- static inline char *get_manpath_from_path (const char *path);
-! static inline char *has_mandir (const char *p);
- static inline char *fsstnd (const char *path);
- static char *def_path (int flag);
- static void add_dir_to_list (char **lp, const char *dir);
---- 96,102 ----
-
- static void mkcatdirs (const char *mandir, const char *catdir);
- static inline char *get_manpath_from_path (const char *path);
-! static inline char *has_mandir (const char *p, const char *mandir);
- static inline char *fsstnd (const char *path);
- static char *def_path (int flag);
- static void add_dir_to_list (char **lp, const char *dir);
-***************
-*** 928,934 ****
- } else {
- debug ("is not in the config file\n");
-
-! t = has_mandir (p);
- if (t) {
- debug ("but does have a ../man or man "
- "subdirectory\n");
---- 928,934 ----
- } else {
- debug ("is not in the config file\n");
-
-! t = has_mandir (p, "man");
- if (t) {
- debug ("but does have a ../man or man "
- "subdirectory\n");
-***************
-*** 938,943 ****
---- 938,952 ----
- } else
- debug ("and doesn't have ../man or man "
- "subdirectories\n");
-+
-+ t = has_mandir (p, "share/man");
-+ if (t) {
-+ debug ("but does have a ../share/man or share/man subdirectory\n");
-+
-+ add_dir_to_list (tmplist, t);
-+ free (t);
-+ } else
-+ debug ("and doesn't have ../share/man or share/man subdirectories\n");
- }
- }
-
-***************
-*** 1013,1019 ****
-
- /* path does not exist in config file: check to see if path/../man or
- path/man exist. If so return it, if not return NULL. */
-! static inline char *has_mandir (const char *path)
- {
- char *newpath = NULL;
-
---- 1022,1028 ----
-
- /* path does not exist in config file: check to see if path/../man or
- path/man exist. If so return it, if not return NULL. */
-! static inline char *has_mandir (const char *path, const char *mandir)
- {
- char *newpath = NULL;
-
-***************
-*** 1023,1031 ****
- char *subdir = strrchr (path, '/');
- if (subdir) {
- const int prefix_len = subdir + 1 - path;
-! newpath = xmalloc (prefix_len + sizeof ("man") + 1);
- strncpy (newpath, path, prefix_len);
-! strcpy (newpath + prefix_len, "man");
-
- if (is_directory (newpath) == 1)
- return newpath;
---- 1032,1040 ----
- char *subdir = strrchr (path, '/');
- if (subdir) {
- const int prefix_len = subdir + 1 - path;
-! newpath = xmalloc (prefix_len + strlen (mandir) + 2);
- strncpy (newpath, path, prefix_len);
-! strcpy (newpath + prefix_len, mandir);
-
- if (is_directory (newpath) == 1)
- return newpath;
-***************
-*** 1033,1039 ****
- *newpath = '\0';
- }
-
-! newpath = appendstr (newpath, path, "/man", NULL);
-
- if (is_directory (newpath) == 1)
- return newpath;
---- 1042,1048 ----
- *newpath = '\0';
- }
-
-! newpath = appendstr (newpath, path, "/", mandir, NULL);
-
- if (is_directory (newpath) == 1)
- return newpath;
diff --git a/pkgs/tools/misc/plantuml/default.nix b/pkgs/tools/misc/plantuml/default.nix
index 10886e969a2..6ba3d9a4f59 100644
--- a/pkgs/tools/misc/plantuml/default.nix
+++ b/pkgs/tools/misc/plantuml/default.nix
@@ -1,12 +1,12 @@
{ stdenv, fetchurl, jre, graphviz }:
stdenv.mkDerivation rec {
- version = "7982";
+ version = "7991";
name = "plantuml-${version}";
src = fetchurl {
url = "mirror://sourceforge/project/plantuml/plantuml.${version}.jar";
- sha256 = "0hxs0whjgx36j5azdcna40rw2c7smhg0qm3kzld9vx88m0c51dgl";
+ sha256 = "0afhgiq2165ahj8ww0pmk69nqgpibllp9nhpk8wapg3zknh2hx5r";
};
# It's only a .jar file and a shell wrapper
diff --git a/pkgs/tools/misc/youtube-dl/default.nix b/pkgs/tools/misc/youtube-dl/default.nix
index 629cf93695f..c1b3cd57530 100644
--- a/pkgs/tools/misc/youtube-dl/default.nix
+++ b/pkgs/tools/misc/youtube-dl/default.nix
@@ -1,14 +1,14 @@
{ stdenv, fetchurl, python, zip }:
let
- version = "2014.02.03";
+ version = "2014.02.13";
in
stdenv.mkDerivation rec {
name = "youtube-dl-${version}";
src = fetchurl {
url = "http://youtube-dl.org/downloads/${version}/${name}.tar.gz";
- sha256 = "0ba6kg72j7h7xcldar0fd5pk809fp4ihr8nclwwp1qj93mraqjir";
+ sha256 = "0l88n1qrhjj2dvxlpd4hpqrdpxihqv3y9mrf1jgra3jyvb9pbnxq";
};
buildInputs = [ python ];
diff --git a/pkgs/tools/networking/isync/default.nix b/pkgs/tools/networking/isync/default.nix
index 30ee63f257a..86986ed9b95 100644
--- a/pkgs/tools/networking/isync/default.nix
+++ b/pkgs/tools/networking/isync/default.nix
@@ -1,4 +1,4 @@
-{ fetchurl, stdenv, openssl, pkgconfig, db4 }:
+{ fetchurl, stdenv, openssl, pkgconfig, db }:
stdenv.mkDerivation rec {
name = "isync-1.0.6";
@@ -9,7 +9,7 @@ stdenv.mkDerivation rec {
};
patches = [ ./isync-recursice-imap.patch ]; # usefull patch to enable subfolders listing
- buildInputs = [ openssl pkgconfig db4 ];
+ buildInputs = [ openssl pkgconfig db ];
meta = {
homepage = http://isync.sourceforge.net/;
diff --git a/pkgs/tools/networking/modemmanager/default.nix b/pkgs/tools/networking/modemmanager/default.nix
index 3e33b845b60..0640f55bc9e 100644
--- a/pkgs/tools/networking/modemmanager/default.nix
+++ b/pkgs/tools/networking/modemmanager/default.nix
@@ -1,11 +1,12 @@
{ stdenv, fetchurl, udev, polkit, dbus_glib, ppp, intltool, pkgconfig, libmbim, libqmi }:
stdenv.mkDerivation rec {
- name = "ModemManager-0.7.991";
+ name = "ModemManager-${version}";
+ version = "1.2.0";
src = fetchurl {
- url = "mirror://gnome/sources/ModemManager/0.7/${name}.tar.xz";
- sha256 = "0p8shqsbgnsazim7s52ylxjk064cbx2n1vm1jgywr7i58hsd6n4y";
+ url = "http://www.freedesktop.org/software/ModemManager/${name}.tar.xz";
+ sha256 = "1g08ciyhys9bi5m45z30kln17zni4r07i5byjaglmwq6np1xincb";
};
nativeBuildInputs = [ intltool pkgconfig ];
@@ -18,6 +19,13 @@ stdenv.mkDerivation rec {
"--with-systemdsystemunitdir=$(out)/etc/systemd/system"
];
+ postInstall = ''
+ # systemd in NixOS doesn't use `systemctl enable`, so we need to establish
+ # aliases ourselves.
+ ln -s $out/etc/systemd/system/ModemManager.service \
+ $out/etc/systemd/system/dbus-org.freedesktop.ModemManager1.service
+ '';
+
meta = {
description = "WWAN modem manager, part of NetworkManager";
maintainers = [ stdenv.lib.maintainers.urkud ];
diff --git a/pkgs/tools/networking/network-manager/default.nix b/pkgs/tools/networking/network-manager/default.nix
index 3fb0a729dea..8a8306ea30c 100644
--- a/pkgs/tools/networking/network-manager/default.nix
+++ b/pkgs/tools/networking/network-manager/default.nix
@@ -1,7 +1,7 @@
{ stdenv, fetchurl, intltool, wirelesstools, pkgconfig, dbus_glib, xz
, udev, libnl, libuuid, polkit, gnutls, ppp, dhcp, dhcpcd, iptables
, libgcrypt, dnsmasq, avahi, bind, perl, bluez5, substituteAll
-, gobjectIntrospection }:
+, gobjectIntrospection, modemmanager }:
stdenv.mkDerivation rec {
name = "network-manager-${version}";
@@ -33,9 +33,11 @@ stdenv.mkDerivation rec {
"--with-crypto=gnutls" "--disable-more-warnings"
"--with-systemdsystemunitdir=$(out)/etc/systemd/system"
"--with-kernel-firmware-dir=/run/current-system/firmware"
- "--with-session-tracking=systemd" ];
+ "--with-session-tracking=systemd"
+ "--with-modem-manager-1"
+ ];
- buildInputs = [ wirelesstools udev libnl libuuid polkit ppp xz bluez5 gobjectIntrospection ];
+ buildInputs = [ wirelesstools udev libnl libuuid polkit ppp xz bluez5 gobjectIntrospection modemmanager ];
propagatedBuildInputs = [ dbus_glib gnutls libgcrypt ];
@@ -57,12 +59,14 @@ stdenv.mkDerivation rec {
postInstall =
''
mkdir -p $out/lib/NetworkManager
-
+
# FIXME: Workaround until NixOS' dbus+systemd supports at_console policy
substituteInPlace $out/etc/dbus-1/system.d/org.freedesktop.NetworkManager.conf --replace 'at_console="true"' 'group="networkmanager"'
- # As NixOS doesn't seem to handle systemd Aliases, we just rename the dispatcher service file
- mv $out/etc/systemd/system/NetworkManager-dispatcher.service $out/etc/systemd/system/dbus-org.freedesktop.nm-dispatcher.service
+ # systemd in NixOS doesn't use `systemctl enable`, so we need to establish
+ # aliases ourselves.
+ ln -s $out/etc/systemd/system/NetworkManager-dispatcher.service $out/etc/systemd/system/dbus-org.freedesktop.nm-dispatcher.service
+ ln -s $out/etc/systemd/system/NetworkManager.service $out/etc/systemd/system/dbus-org.freedesktop.NetworkManager.service
'';
meta = with stdenv.lib; {
diff --git a/pkgs/tools/networking/network-manager/pptp-purity.patch b/pkgs/tools/networking/network-manager/pptp-purity.patch
index 55ade68dd41..88af666b658 100644
--- a/pkgs/tools/networking/network-manager/pptp-purity.patch
+++ b/pkgs/tools/networking/network-manager/pptp-purity.patch
@@ -2,7 +2,7 @@ diff --git a/src/nm-pptp-service.c b/src/nm-pptp-service.c
index 68a5759..568bbfe 100644
--- a/src/nm-pptp-service.c
+++ b/src/nm-pptp-service.c
-@@ -729,9 +729,7 @@ nm_find_pppd (void)
+@@ -730,9 +730,7 @@ nm_find_pppd (void)
{
static const char *pppd_binary_paths[] =
{
@@ -12,8 +12,8 @@ index 68a5759..568bbfe 100644
+ "@ppp@/sbin/pppd",
NULL
};
-
-@@ -751,9 +749,7 @@ nm_find_pptp (void)
+
+@@ -752,9 +750,7 @@ nm_find_pptp (void)
{
static const char *pptp_binary_paths[] =
{
diff --git a/pkgs/tools/networking/webalizer/default.nix b/pkgs/tools/networking/webalizer/default.nix
index efa29e81407..99fde387129 100644
--- a/pkgs/tools/networking/webalizer/default.nix
+++ b/pkgs/tools/networking/webalizer/default.nix
@@ -1,4 +1,4 @@
-{stdenv, fetchurl, zlib, libpng, gd, geoip, db4}:
+{stdenv, fetchurl, zlib, libpng, gd, geoip, db}:
stdenv.mkDerivation {
name = "webalizer-2.23-05";
@@ -14,7 +14,7 @@ stdenv.mkDerivation {
--replace "--static" ""
'';
- buildInputs = [zlib libpng gd geoip db4];
+ buildInputs = [zlib libpng gd geoip db];
configureFlags = "--enable-dns --enable-geoip --disable-static --enable-shared";
}
diff --git a/pkgs/tools/security/fail2ban/default.nix b/pkgs/tools/security/fail2ban/default.nix
index ffa204b8944..aa387eff3e7 100644
--- a/pkgs/tools/security/fail2ban/default.nix
+++ b/pkgs/tools/security/fail2ban/default.nix
@@ -1,6 +1,6 @@
{ stdenv, fetchurl, pythonPackages, unzip, gamin }:
-let version = "0.8.11"; in
+let version = "0.8.12"; in
pythonPackages.buildPythonPackage {
name = "fail2ban-${version}";
@@ -9,7 +9,7 @@ pythonPackages.buildPythonPackage {
src = fetchurl {
url = "https://github.com/fail2ban/fail2ban/zipball/${version}";
name = "fail2ban-${version}.zip";
- sha256 = "0g87c1yfa6lxb68iz3sq3gxqf5c1a8m2anlvk3lsrx1mczbq0dlc";
+ sha256 = "17cassfn3gdgw530g7gh9fvffsixfb30zamzlfmx7s5x80rnqd3k";
};
buildInputs = [ unzip ];
diff --git a/pkgs/tools/text/xml/xmlstarlet/default.nix b/pkgs/tools/text/xml/xmlstarlet/default.nix
index ffeb9a8cd7c..db7ebfbb77a 100644
--- a/pkgs/tools/text/xml/xmlstarlet/default.nix
+++ b/pkgs/tools/text/xml/xmlstarlet/default.nix
@@ -1,11 +1,11 @@
{ stdenv, fetchurl, pkgconfig, libxml2, libxslt }:
stdenv.mkDerivation rec {
- name = "xmlstarlet-1.0.2";
+ name = "xmlstarlet-1.5.0";
src = fetchurl {
url = "mirror://sourceforge/xmlstar/${name}.tar.gz";
- sha256 = "07a5c3fhqpvyy07pggl3ky7ahvlcpsmppy71x4h4albvanfbpjwj";
+ sha256 = "1fmvqvzrzyfcg53j39sdz01v7klzyhd011m3y9br54525q2fvd27";
};
buildInputs = [ pkgconfig libxml2 libxslt ];
diff --git a/pkgs/tools/typesetting/tex/texlive/aggregate.nix b/pkgs/tools/typesetting/tex/texlive/aggregate.nix
index 2d1de93fed8..e001a36cab0 100644
--- a/pkgs/tools/typesetting/tex/texlive/aggregate.nix
+++ b/pkgs/tools/typesetting/tex/texlive/aggregate.nix
@@ -68,6 +68,8 @@ rec {
done
'' ) [ "minInit" "defEnsureDir" "addInputs" ];
+ preferLocalBuild = true;
+
meta = {
description = "TeX distribution directory";
longDescription = ''
diff --git a/pkgs/tools/virtualization/aws/default.nix b/pkgs/tools/virtualization/aws/default.nix
index 00cc4e7733f..27f4ce4476f 100644
--- a/pkgs/tools/virtualization/aws/default.nix
+++ b/pkgs/tools/virtualization/aws/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, perl }:
+{ stdenv, fetchurl, perl, curl }:
stdenv.mkDerivation {
name = "aws-1.75";
@@ -15,7 +15,7 @@ stdenv.mkDerivation {
installPhase =
''
mkdir -p $out/bin
- cp $src $out/bin/aws
+ sed 's|\[curl|[${curl}/bin/curl|g' $src > $out/bin/aws
chmod +x $out/bin/aws
'';
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index e0e3967f740..62fcfaca5f4 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -1795,9 +1795,7 @@ let
inherit ppp;
};
- rpm = callPackage ../tools/package-management/rpm {
- db4 = db45;
- };
+ rpm = callPackage ../tools/package-management/rpm { };
rrdtool = callPackage ../tools/misc/rrdtool { };
@@ -3233,7 +3231,9 @@ let
python32 = callPackage ../development/interpreters/python/3.2 { };
python = python27;
- python26 = callPackage ../development/interpreters/python/2.6 { };
+ python26 = callPackage ../development/interpreters/python/2.6 {
+ db = db44;
+ };
python27 = callPackage ../development/interpreters/python/2.7 {
libX11 = xlibs.libX11;
};
@@ -3683,7 +3683,11 @@ let
peg = callPackage ../development/tools/parsing/peg { };
- phantomjs = callPackage ../development/tools/phantomjs { };
+ phantomjs = callPackage ../development/tools/phantomjs {
+ stdenv = if stdenv.isDarwin
+ then overrideGCC stdenv gccApple
+ else stdenv;
+ };
pmccabe = callPackage ../development/tools/misc/pmccabe { };
@@ -3991,19 +3995,18 @@ let
cyrus_sasl = callPackage ../development/libraries/cyrus-sasl { };
+ # Make bdb5 the default as it is the last release under the custom
+ # bsd-like license
+ db = db5;
db4 = db48;
-
- db44 = callPackage ../development/libraries/db4/db4-4.4.nix { };
-
- db45 = callPackage ../development/libraries/db4/db4-4.5.nix { };
-
- db47 = callPackage ../development/libraries/db4/db4-4.7.nix { };
-
- db48 = callPackage ../development/libraries/db4/db4-4.8.nix { };
-
+ db44 = callPackage ../development/libraries/db/db-4.4.nix { };
+ db45 = callPackage ../development/libraries/db/db-4.5.nix { };
+ db47 = callPackage ../development/libraries/db/db-4.7.nix { };
+ db48 = callPackage ../development/libraries/db/db-4.8.nix { };
db5 = db53;
-
db53 = callPackage ../development/libraries/db/db-5.3.nix { };
+ db6 = db60;
+ db60 = callPackage ../development/libraries/db/db-6.0.nix { };
dbus = callPackage ../development/libraries/dbus { };
dbus_cplusplus = callPackage ../development/libraries/dbus-cplusplus { };
@@ -4293,6 +4296,8 @@ let
goocanvas = callPackage ../development/libraries/goocanvas { };
+ google-gflags = callPackage ../development/libraries/google-gflags { };
+
gperftools = callPackage ../development/libraries/gperftools { };
gst_all_1 = recurseIntoAttrs(callPackage ../development/libraries/gstreamer { });
@@ -4931,7 +4936,9 @@ let
libosip_3 = callPackage ../development/libraries/osip/3.nix {};
- libotr = callPackage ../development/libraries/libotr { };
+ libotr = callPackage ../development/libraries/libotr {
+ libgcrypt = libgcrypt_1_6;
+ };
libotr_3_2 = callPackage ../development/libraries/libotr/3.2.nix { };
@@ -4941,6 +4948,8 @@ let
libpcap = callPackage ../development/libraries/libpcap { };
+ libpipeline = callPackage ../development/libraries/libpipeline { };
+
libpng = callPackage ../development/libraries/libpng { };
libpng_apng = libpng.override { apngSupport = true; };
libpng12 = callPackage ../development/libraries/libpng/12.nix { };
@@ -6369,7 +6378,7 @@ let
squids = recurseIntoAttrs( import ../servers/squid/squids.nix {
inherit fetchurl stdenv perl lib composableDerivation
- openldap pam db4 cyrus_sasl kerberos libcap expat libxml2 libtool
+ openldap pam db cyrus_sasl kerberos libcap expat libxml2 libtool
openssl;
});
squid = squids.squid31; # has ipv6 support
@@ -6669,7 +6678,7 @@ let
})) (args: grsecurityOverrider args));
linux_3_13_grsecurity = lowPrio (lib.overrideDerivation (linux_3_13.override (args: {
- kernelPatches = args.kernelPatches ++ [ kernelPatches.grsecurity_3_0_3_13_2 kernelPatches.grsec_path ];
+ kernelPatches = args.kernelPatches ++ [ kernelPatches.grsecurity_3_0_3_13_3 kernelPatches.grsec_path ];
argsOverride = {
modDirVersion = "${linux_3_13.modDirVersion}-grsec";
};
@@ -6877,6 +6886,8 @@ let
libsemanage = callPackage ../os-specific/linux/libsemanage { };
+ libraw = callPackage ../development/libraries/libraw { };
+
libraw1394 = callPackage ../development/libraries/libraw1394 { };
libsexy = callPackage ../development/libraries/libsexy { };
@@ -6944,9 +6955,7 @@ let
# pam_bioapi ( see http://www.thinkwiki.org/wiki/How_to_enable_the_fingerprint_reader )
- pam_ccreds = callPackage ../os-specific/linux/pam_ccreds {
- db = db4;
- };
+ pam_ccreds = callPackage ../os-specific/linux/pam_ccreds { };
pam_console = callPackage ../os-specific/linux/pam_console {
libtool = libtool_1_5;
@@ -7433,6 +7442,8 @@ let
};
awesome = awesome-3-5;
+ inherit (gnome3) baobab;
+
baresip = callPackage ../applications/networking/instant-messengers/baresip {
ffmpeg = ffmpeg_1;
};
@@ -7617,8 +7628,6 @@ let
dvdauthor = callPackage ../applications/video/dvdauthor { };
- dvswitch = callPackage ../applications/video/dvswitch { };
-
dwb = callPackage ../applications/networking/browsers/dwb { };
dwm = callPackage ../applications/window-managers/dwm {
@@ -7781,6 +7790,8 @@ let
sunriseCommander = callPackage ../applications/editors/emacs-modes/sunrise-commander { };
+ writeGood = callPackage ../applications/editors/emacs-modes/writegood { };
+
xmlRpc = callPackage ../applications/editors/emacs-modes/xml-rpc { };
};
@@ -8132,6 +8143,8 @@ let
inherit (xorg) libxkbfile;
cairo = cairo.override { xcbSupport = true; };
};
+
+ i3minator = callPackage ../tools/misc/i3minator { };
i3status = callPackage ../applications/window-managers/i3/status.nix { };
@@ -8718,6 +8731,8 @@ let
sbagen = callPackage ../applications/misc/sbagen { };
+ scite = callPackage ../applications/editors/scite { };
+
scribus = callPackage ../applications/office/scribus {
inherit (gnome) libart_lgpl;
};
@@ -9604,7 +9619,7 @@ let
kde4 = recurseIntoAttrs pkgs.kde411;
-# kde4_next = recurseIntoAttrs( lib.lowPrioSet pkgs.kde412 );
+ kde4_next = recurseIntoAttrs( lib.lowPrioSet pkgs.kde412 );
kde4_prev = recurseIntoAttrs pkgs.kde410;
@@ -9624,6 +9639,12 @@ let
libcanberra = libcanberra_kde;
}) ../desktops/kde-4.11;
+ kde412 = kdePackagesFor (pkgs.kde412 // {
+ eigen = eigen2;
+ libusb = libusb1;
+ libcanberra = libcanberra_kde;
+ }) ../desktops/kde-4.12;
+
kdePackagesFor = self: dir:
let callPackageOrig = callPackage; in
let
@@ -10350,6 +10371,17 @@ let
{ browser = vimprobable2; browserName = "vimprobable2"; desktopName = "Vimprobable2";
};
+ vimb = callPackage ../applications/networking/browsers/vimb {
+ inherit (gnome) libsoup;
+ webkit = webkit_gtk2;
+ };
+
+ vimbWrapper = wrapFirefox {
+ browser = vimb;
+ browserName = "vimb";
+ desktopName = "Vimb";
+ };
+
VisualBoyAdvance = callPackage ../misc/emulators/VisualBoyAdvance { };
# Wine cannot be built in 64-bit; use a 32-bit build instead.
diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix
index bcc738e3bce..119aca3305a 100644
--- a/pkgs/top-level/haskell-packages.nix
+++ b/pkgs/top-level/haskell-packages.nix
@@ -144,7 +144,7 @@ let result = let callPackage = x : y : modifyPrio (newScope result.finalReturn x
async = self.async_2_0_1_5;
attoparsec = self.attoparsec_0_11_1_0;
caseInsensitive = self.caseInsensitive_1_1_0_3;
- cgi = self.cgi_3001_1_8_4;
+ cgi = self.cgi_3001_1_8_5;
fgl = self.fgl_5_4_2_4;
GLUT = self.GLUT_2_5_1_0;
GLURaw = self.GLURaw_1_4_0_0;
@@ -527,7 +527,7 @@ let result = let callPackage = x : y : modifyPrio (newScope result.finalReturn x
adjunctions = callPackage ../development/libraries/haskell/adjunctions {};
aeson_0_6_2_1 = callPackage ../development/libraries/haskell/aeson/0.6.2.1.nix {};
- aeson_0_7_0_0 = callPackage ../development/libraries/haskell/aeson/0.7.0.0.nix {
+ aeson_0_7_0_1 = callPackage ../development/libraries/haskell/aeson/0.7.0.1.nix {
attoparsec = self.attoparsec_0_11_1_0;
};
aeson = self.aeson_0_6_2_1;
@@ -742,13 +742,14 @@ let result = let callPackage = x : y : modifyPrio (newScope result.finalReturn x
cgi_3001_1_7_3 = callPackage ../development/libraries/haskell/cgi/3001.1.7.3.nix {};
cgi_3001_1_7_4 = callPackage ../development/libraries/haskell/cgi/3001.1.7.4.nix {};
cgi_3001_1_7_5 = callPackage ../development/libraries/haskell/cgi/3001.1.7.5.nix {};
- cgi_3001_1_8_4 = callPackage ../development/libraries/haskell/cgi/3001.1.8.4.nix {};
- cgi = self.cgi_3001_1_8_4;
+ cgi_3001_1_8_5 = callPackage ../development/libraries/haskell/cgi/3001.1.8.5.nix {};
+ cgi = self.cgi_3001_1_8_5;
charset = callPackage ../development/libraries/haskell/charset {};
Chart = callPackage ../development/libraries/haskell/Chart {};
ChartCairo = callPackage ../development/libraries/haskell/Chart-cairo {};
+ ChartDiagrams = callPackage ../development/libraries/haskell/Chart-diagrams {};
ChartGtk = callPackage ../development/libraries/haskell/Chart-gtk {};
ChasingBottoms = callPackage ../development/libraries/haskell/ChasingBottoms {};
@@ -940,6 +941,7 @@ let result = let callPackage = x : y : modifyPrio (newScope result.finalReturn x
diagramsCore = callPackage ../development/libraries/haskell/diagrams/core.nix {};
diagramsContrib = callPackage ../development/libraries/haskell/diagrams/contrib.nix {};
diagramsLib = callPackage ../development/libraries/haskell/diagrams/lib.nix {};
+ diagramsPostscript = callPackage ../development/libraries/haskell/diagrams/postscript.nix {};
diagramsSvg = callPackage ../development/libraries/haskell/diagrams/svg.nix {};
Diff = callPackage ../development/libraries/haskell/Diff {};
@@ -952,7 +954,10 @@ let result = let callPackage = x : y : modifyPrio (newScope result.finalReturn x
digestiveFunctors = callPackage ../development/libraries/haskell/digestive-functors {};
- digestiveFunctorsAeson = callPackage ../development/libraries/haskell/digestive-functors-aeson {};
+ digestiveFunctorsAeson = callPackage ../development/libraries/haskell/digestive-functors-aeson {
+ aeson = self.aeson_0_7_0_1;
+ lens = self.lens_4_0_3;
+ };
digestiveFunctorsHeist = callPackage ../development/libraries/haskell/digestive-functors-heist {};
@@ -1473,6 +1478,8 @@ let result = let callPackage = x : y : modifyPrio (newScope result.finalReturn x
interlude = callPackage ../development/libraries/haskell/interlude {};
+ interpolatedstringPerl6 = callPackage ../development/libraries/haskell/interpolatedstring-perl6 {};
+
intervals = callPackage ../development/libraries/haskell/intervals {};
IntervalMap = callPackage ../development/libraries/haskell/IntervalMap {};
@@ -1513,8 +1520,8 @@ let result = let callPackage = x : y : modifyPrio (newScope result.finalReturn x
json = callPackage ../development/libraries/haskell/json {};
jsonAssertions = callPackage ../development/libraries/haskell/json-assertions {
- aeson = self.aeson_0_7_0_0;
- lens = self.lens_4_0_1;
+ aeson = self.aeson_0_7_0_1;
+ lens = self.lens_4_0_3;
};
jsonTypes = callPackage ../development/libraries/haskell/jsonTypes {};
@@ -1550,8 +1557,8 @@ let result = let callPackage = x : y : modifyPrio (newScope result.finalReturn x
leksahServer = callPackage ../development/libraries/haskell/leksah/leksah-server.nix {};
lens_3_10_2 = callPackage ../development/libraries/haskell/lens/3.10.2.nix {};
- lens_4_0_1 = callPackage ../development/libraries/haskell/lens/4.0.1.nix {
- aeson = self.aeson_0_7_0_0;
+ lens_4_0_3 = callPackage ../development/libraries/haskell/lens/4.0.3.nix {
+ aeson = self.aeson_0_7_0_1;
};
lens = self.lens_3_10_2;
@@ -1576,7 +1583,7 @@ let result = let callPackage = x : y : modifyPrio (newScope result.finalReturn x
liftedBase = callPackage ../development/libraries/haskell/lifted-base {};
linear = callPackage ../development/libraries/haskell/linear {
- lens = self.lens_4_0_1;
+ lens = self.lens_4_0_3;
};
List = callPackage ../development/libraries/haskell/List {};
@@ -1588,18 +1595,18 @@ let result = let callPackage = x : y : modifyPrio (newScope result.finalReturn x
ListZipper = callPackage ../development/libraries/haskell/ListZipper {};
# Needed for idris for now
- llvmGeneral_3_3 = callPackage ../development/libraries/haskell/llvm-general/3.3.nix {
+ llvmGeneral_3_3_8_2 = callPackage ../development/libraries/haskell/llvm-general/3.3.8.2.nix {
llvmConfig = pkgs.llvm_33;
- llvmGeneralPure = self.llvmGeneralPure_3_3;
+ llvmGeneralPure = self.llvmGeneralPure_3_3_8_2;
};
- llvmGeneral_3_4 = callPackage ../development/libraries/haskell/llvm-general/3.4.nix {
+ llvmGeneral_3_4_1_0 = callPackage ../development/libraries/haskell/llvm-general/3.4.1.0.nix {
llvmConfig = pkgs.llvm;
};
- llvmGeneral = self.llvmGeneral_3_4;
+ llvmGeneral = self.llvmGeneral_3_4_1_0;
- llvmGeneralPure_3_3 = callPackage ../development/libraries/haskell/llvm-general-pure/3.3.nix { };
- llvmGeneralPure_3_4 = callPackage ../development/libraries/haskell/llvm-general-pure/3.4.nix {};
- llvmGeneralPure = self.llvmGeneralPure_3_4;
+ llvmGeneralPure_3_3_8_2 = callPackage ../development/libraries/haskell/llvm-general-pure/3.3.8.2.nix { };
+ llvmGeneralPure_3_4_1_0 = callPackage ../development/libraries/haskell/llvm-general-pure/3.4.1.0.nix {};
+ llvmGeneralPure = self.llvmGeneralPure_3_4_1_0;
lrucache = callPackage ../development/libraries/haskell/lrucache {};
@@ -1852,8 +1859,8 @@ let result = let callPackage = x : y : modifyPrio (newScope result.finalReturn x
parsec = self.parsec3;
parsers_0_9 = callPackage ../development/libraries/haskell/parsers/0.9.nix {};
- parsers_0_10_2 = callPackage ../development/libraries/haskell/parsers/0.10.2.nix {};
- parsers = self.parsers_0_10_2;
+ parsers_0_10_3 = callPackage ../development/libraries/haskell/parsers/0.10.3.nix {};
+ parsers = self.parsers_0_10_3;
parsimony = callPackage ../development/libraries/haskell/parsimony {};
@@ -1937,10 +1944,10 @@ let result = let callPackage = x : y : modifyPrio (newScope result.finalReturn x
prettyclass = callPackage ../development/libraries/haskell/prettyclass {};
prettyShow_1_2 = callPackage ../development/libraries/haskell/pretty-show/1.2.nix {};
- prettyShow_1_6_5 = callPackage ../development/libraries/haskell/pretty-show/1.6.5.nix {
+ prettyShow_1_6_7 = callPackage ../development/libraries/haskell/pretty-show/1.6.7.nix {
happy = self.happy_1_19_2;
};
- prettyShow = self.prettyShow_1_6_5;
+ prettyShow = self.prettyShow_1_6_7;
punycode = callPackage ../development/libraries/haskell/punycode {};
@@ -2135,6 +2142,8 @@ let result = let callPackage = x : y : modifyPrio (newScope result.finalReturn x
smtpMail = callPackage ../development/libraries/haskell/smtp-mail {};
+ smtpsGmail = callPackage ../development/libraries/haskell/smtps-gmail {};
+
snap = callPackage ../development/libraries/haskell/snap/snap.nix {};
snapletAcidState = callPackage ../development/libraries/haskell/snaplet-acid-state {};
@@ -2152,8 +2161,8 @@ let result = let callPackage = x : y : modifyPrio (newScope result.finalReturn x
socks = callPackage ../development/libraries/haskell/socks {};
sparse = callPackage ../development/libraries/haskell/sparse {
- lens = self.lens_4_0_1;
- linear = self.linear.override { lens = self.lens_4_0_1; };
+ lens = self.lens_4_0_3;
+ linear = self.linear.override { lens = self.lens_4_0_3; };
};
srcloc = callPackage ../development/libraries/haskell/srcloc {};
@@ -2278,6 +2287,8 @@ let result = let callPackage = x : y : modifyPrio (newScope result.finalReturn x
libc = pkgs.stdenv.gcc.libc;
};
+ SVGFonts = callPackage ../development/libraries/haskell/SVGFonts {};
+
symbol = callPackage ../development/libraries/haskell/symbol {};
systemFilepath = callPackage ../development/libraries/haskell/system-filepath {};
@@ -2679,8 +2690,6 @@ let result = let callPackage = x : y : modifyPrio (newScope result.finalReturn x
zlibEnum = callPackage ../development/libraries/haskell/zlib-enum {};
- Zwaluw = callPackage ../development/libraries/haskell/Zwaluw {};
-
# Compilers.
AgdaExecutable = callPackage ../development/compilers/Agda-executable {};
@@ -2768,8 +2777,8 @@ let result = let callPackage = x : y : modifyPrio (newScope result.finalReturn x
idris_plain = callPackage ../development/compilers/idris {
parsers = self.parsers_0_9;
trifecta = self.trifecta_1_1;
- llvmGeneral = self.llvmGeneral_3_3;
- llvmGeneralPure = self.llvmGeneralPure_3_3;
+ llvmGeneral = self.llvmGeneral_3_3_8_2;
+ llvmGeneralPure = self.llvmGeneralPure_3_3_8_2;
};
idris = callPackage ../development/compilers/idris/wrapper.nix {};
diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix
index 0041d7dbd58..a42af772046 100644
--- a/pkgs/top-level/perl-packages.nix
+++ b/pkgs/top-level/perl-packages.nix
@@ -306,7 +306,7 @@ let self = _self // overrides; _self = with self; {
BerkeleyDB = import ../development/perl-modules/BerkeleyDB {
inherit buildPerlPackage fetchurl;
- inherit (pkgs) db4;
+ inherit (pkgs) db;
};
BHooksEndOfScope = buildPerlPackage {
@@ -1289,10 +1289,10 @@ let self = _self // overrides; _self = with self; {
};
Clone = buildPerlPackage {
- name = "Clone-0.34";
+ name = "Clone-0.36";
src = fetchurl {
- url = mirror://cpan/authors/id/G/GA/GARU/Clone-0.34.tar.gz;
- sha256 = "0qk32i2ncmn7wm2dbjpwhwa4js079bgfs4ayb90mnxjhwq5358ix";
+ url = mirror://cpan/authors/id/G/GA/GARU/Clone-0.36.tar.gz;
+ sha256 = "1i90l24l46dyadmdz82klyh3y1lhfn75wjjpfmgl1kbr4plgdph3";
};
meta = {
description = "Recursively copy Perl datatypes";
@@ -1430,10 +1430,10 @@ let self = _self // overrides; _self = with self; {
};
ConvertASN1 = buildPerlPackage rec {
- name = "Convert-ASN1-0.22";
+ name = "Convert-ASN1-0.26";
src = fetchurl {
- url = "mirror://cpan/authors/id/G/GB/GBARR/Convert-ASN1-0.22.tar.gz";
- sha256 = "1vpny8smwl23rai1kxngi5i31jhp6s6cdls19gjhcwsxf76daqxy";
+ url = "mirror://cpan/authors/id/G/GB/GBARR/Convert-ASN1-0.26.tar.gz";
+ sha256 = "188wpjnp4j2m1l1zzw9ak9ymiba1g7hzysf8mc6bsdnhl0pvdf2x";
};
};
@@ -1936,10 +1936,10 @@ let self = _self // overrides; _self = with self; {
};
DateTime = buildPerlModule {
- name = "DateTime-1.04";
+ name = "DateTime-1.07";
src = fetchurl {
- url = mirror://cpan/authors/id/D/DR/DROLSKY/DateTime-1.04.tar.gz;
- sha256 = "1krnrp8hv0m4v1lxrvwgc3vvcycld21ygvjy5p7vaf5h1jpjzrwz";
+ url = mirror://cpan/authors/id/D/DR/DROLSKY/DateTime-1.07.tar.gz;
+ sha256 = "1cm4zsgzz4phigak0nb48l661vkqhz93kfbb9jd83d1hq74myq31";
};
buildInputs = [ TestFatal ];
propagatedBuildInputs = [ DateTimeLocale DateTimeTimeZone ParamsValidate TryTiny ];
@@ -2201,7 +2201,7 @@ let self = _self // overrides; _self = with self; {
DBFile = import ../development/perl-modules/DB_File {
inherit fetchurl buildPerlPackage;
- inherit (pkgs) db4;
+ inherit (pkgs) db;
};
DBI = buildPerlPackage {
@@ -2369,10 +2369,10 @@ let self = _self // overrides; _self = with self; {
};
DevelFindPerl = buildPerlPackage {
- name = "Devel-FindPerl-0.006";
+ name = "Devel-FindPerl-0.012";
src = fetchurl {
- url = mirror://cpan/authors/id/L/LE/LEONT/Devel-FindPerl-0.006.tar.gz;
- sha256 = "60d5a0fd6880e5cfda381159acd3dbbc21c1121dc44c94ecd323ad5a148e03ff";
+ url = mirror://cpan/authors/id/L/LE/LEONT/Devel-FindPerl-0.012.tar.gz;
+ sha256 = "075p340m4pi761sjc3l0ymfsdwy4rrq48sqj38cyy80vg9scljh2";
};
buildInputs = [ CaptureTiny ];
propagatedBuildInputs = [ ExtUtilsConfig ];
@@ -3558,6 +3558,7 @@ let self = _self // overrides; _self = with self; {
sha256 = "4240faabe0646defd4ec76ca9e111977b9e8060eaec41adeb284eb422a428393";
};
propagatedBuildInputs = [ CryptSSLeay HTMLTableExtract HTMLTree HTTPMessage LWP ];
+ patches = [ ../development/perl-modules/finance-quote-yahoo.patch ];
meta = {
homepage = http://finance-quote.sourceforge.net/;
description = "Get stock and mutual fund quotes from various exchanges";
@@ -7787,6 +7788,20 @@ let self = _self // overrides; _self = with self; {
};
};
+ TemplatePluginIOAll = buildPerlPackage {
+ name = "Template-Plugin-IO-All-0.01";
+ src = fetchurl {
+ url = mirror://cpan/authors/id/X/XE/XERN/Template-Plugin-IO-All-0.01.tar.gz;
+ sha256 = "1f7445422a21932e09bbef935766e0af6b7cceb088e9d8e030cd7a84bcdc5ee4";
+ };
+ propagatedBuildInputs = [ IOAll TemplateToolkit ];
+ meta = {
+ maintainers = with maintainers; [ eelco ];
+ description = "Perl Template Toolkit Plugin for IO::All";
+ license = "perl";
+ };
+ };
+
TemplatePluginJavaScript = buildPerlPackage {
name = "Template-Plugin-JavaScript-0.02";
src = fetchurl {
@@ -8064,10 +8079,10 @@ let self = _self // overrides; _self = with self; {
};
TestFailWarnings = buildPerlPackage {
- name = "Test-FailWarnings-0.005";
+ name = "Test-FailWarnings-0.008";
src = fetchurl {
- url = mirror://cpan/authors/id/D/DA/DAGOLDEN/Test-FailWarnings-0.005.tar.gz;
- sha256 = "014f909e6c171f77b811139c49c1dca9d0f1e2d1c41b5dca332b6b55b3eb0b4e";
+ url = mirror://cpan/authors/id/D/DA/DAGOLDEN/Test-FailWarnings-0.008.tar.gz;
+ sha256 = "0vx9chcp5x8m0chq574p9fnfckh5gl94j7904rh9v17n568fyd6s";
};
buildInputs = [ CaptureTiny ];
meta = {
@@ -8753,10 +8768,10 @@ let self = _self // overrides; _self = with self; {
};
TextTabularDisplay = buildPerlPackage rec {
- name = "Text-TabularDisplay-1.22";
+ name = "Text-TabularDisplay-1.35";
src = fetchurl {
url = "mirror://cpan/authors/id/D/DA/DARREN/${name}.tar.gz";
- sha256 = "05r3jvdf8av16hgy0i3wnc581ski08q1bnllq5cq1fnc7h2nm1c7";
+ sha256 = "0sbyfdiln6q2g66mv64alayfcqnqg17kihdzgpslxdsn14vpvjq5";
};
propagatedBuildInputs = [TextAligner];
};
@@ -9005,10 +9020,10 @@ let self = _self // overrides; _self = with self; {
};
UNIVERSALrequire = buildPerlPackage {
- name = "UNIVERSAL-require-0.11";
+ name = "UNIVERSAL-require-0.16";
src = fetchurl {
- url = mirror://cpan/authors/id/M/MS/MSCHWERN/UNIVERSAL-require-0.11.tar.gz;
- sha256 = "1rh7i3gva4m96m31g6yfhlqcabszhghbb3k3qwxbgx3mkf5s6x6i";
+ url = mirror://cpan/authors/id/N/NE/NEILB/UNIVERSAL-require-0.16.tar.gz;
+ sha256 = "0fbx3f39lvck3n4ksqwji5m1hfdagx25jk5kg2h0gkb01jwz3za2";
};
};
@@ -9251,10 +9266,10 @@ let self = _self // overrides; _self = with self; {
};
XMLLibXSLT = buildPerlPackage rec {
- name = "XML-LibXSLT-1.70";
+ name = "XML-LibXSLT-1.87";
src = fetchurl {
- url = "mirror://cpan/modules/by-module/XML/${name}.tar.gz";
- sha256 = "0x8lqlxr6xhgwwa6zj4shrwrqlgbgs0piripc1fsnw4z1yl2gf9p";
+ url = "mirror://cpan/authors/id/S/SH/SHLOMIF/${name}.tar.gz";
+ sha256 = "18kxa51a0prr8dx0w7q7wa8gdgalswzqa24sjkxmgs0f9yhcixz1";
};
buildInputs = [ pkgs.zlib pkgs.libxml2 pkgs.libxslt ];
propagatedBuildInputs = [ XMLLibXML ];
@@ -9357,10 +9372,10 @@ let self = _self // overrides; _self = with self; {
};
YAML = buildPerlPackage {
- name = "YAML-0.84";
+ name = "YAML-0.90";
src = fetchurl {
- url = mirror://cpan/authors/id/M/MS/MSTROUT/YAML-0.84.tar.gz;
- sha256 = "03349n2z32gwjqiq7l3g57avvphl2rw3lmwc8i5cl9hmfw51yd8a";
+ url = mirror://cpan/authors/id/I/IN/INGY/YAML-0.90.tar.gz;
+ sha256 = "0kfsmhv1lmqw2g1038azpxkfb91valwkh4i4gfjvqrj2wsr2hzhq";
};
meta = {
homepage = https://github.com/ingydotnet/yaml-pm/tree;
@@ -9391,10 +9406,10 @@ let self = _self // overrides; _self = with self; {
};
YAMLLibYAML = buildPerlPackage rec {
- name = "YAML-LibYAML-0.38";
+ name = "YAML-LibYAML-0.41";
src = fetchurl {
- url = "mirror://cpan/modules/by-module/YAML/${name}.tar.gz";
- sha256 = "eb98f304d14f6557b07adfa24da16e00cfa54a9d9484b6e898e35f919c5eb7ba";
+ url = "mirror://cpan/authors/id/I/IN/INGY/${name}.tar.gz";
+ sha256 = "1kj506lpg3fhqq0726p6y2h7pk24l6xihfyhqqsf8gd6lckl8rcs";
};
};
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 6d2605e0f98..1afadd1a276 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -461,6 +461,23 @@ pythonPackages = modules // import ./python-packages-generated.nix {
};
});
+ bcdoc = buildPythonPackage rec {
+ name = "bcdoc-0.12.1";
+
+ src = fetchurl {
+ url = "https://pypi.python.org/packages/source/b/bcdoc/bcdoc-0.12.1.tar.gz";
+ md5 = "7c8617347c294ea4d36ec73fb5b2c26e";
+ };
+
+ buildInputs = [ pythonPackages.docutils pythonPackages.six ];
+
+ meta = {
+ homepage = https://github.com/botocore/bcdoc;
+ license = "Apache License 2.0";
+ description = "ReST document generation tools for botocore";
+ };
+ };
+
beautifulsoup = buildPythonPackage (rec {
name = "beautifulsoup-3.2.1";
@@ -704,12 +721,12 @@ pythonPackages = modules // import ./python-packages-generated.nix {
botocore = buildPythonPackage rec {
- version = "0.13.1";
+ version = "0.33.0";
name = "botocore-${version}";
src = fetchurl {
url = "https://pypi.python.org/packages/source/b/botocore/${name}.tar.gz";
- sha256 = "192kxgw76b22zmk5mxjkij5rskibb9jfaggvpznzy3ggsgja7yy8";
+ md5 = "6743c73a2e148abaa9c487a6e2ee53a3";
};
propagatedBuildInputs =
@@ -3283,11 +3300,11 @@ pythonPackages = modules // import ./python-packages-generated.nix {
jmespath = buildPythonPackage rec {
- name = "jmespath-0.0.2";
+ name = "jmespath-0.2.1";
src = fetchurl {
- url = "https://github.com/boto/jmespath/archive/0.0.2.tar.gz";
- sha256 = "0wr1gq3gdyn3n21pvj62csdm095512zxd10gkg5ai1vvxh0mbn3r";
+ url = "https://pypi.python.org/packages/source/j/jmespath/jmespath-0.2.1.tar.gz";
+ md5 = "7800775aa12c6303f9ad597b6a8fa03c";
};
propagatedBuildInputs = [ ply ];
@@ -5906,12 +5923,12 @@ pythonPackages = modules // import ./python-packages-generated.nix {
robotframework = buildPythonPackage rec {
- version = "2.8.1";
+ version = "2.8.4";
name = "robotframework-${version}";
src = fetchurl {
- url = "https://robotframework.googlecode.com/files/${name}.tar.gz";
- sha256 = "04zwjri1j5py3fpbhy1xlc18bhbmdm2gbd58fwa2jnhmrha5dgnw";
+ url = "https://pypi.python.org/packages/source/r/robotframework/${name}.tar.gz";
+ sha256 = "0rxk135c1051cwv45219ib3faqvi5rl50l98ncb83c7qxy92jg2n";
};
# error: invalid command 'test'
@@ -5928,12 +5945,12 @@ pythonPackages = modules // import ./python-packages-generated.nix {
robotframework-selenium2library = buildPythonPackage rec {
- version = "1.4.0";
+ version = "1.5.0";
name = "robotframework-selenium2library-${version}";
src = fetchurl {
url = "https://pypi.python.org/packages/source/r/robotframework-selenium2library/${name}.tar.gz";
- sha256 = "1rgzjxrciy74lp9mvdqxiixkma569mc0l0kizpi7lg1zkbr2k1q2";
+ sha256 = "0hjmar9766jqfpbckac8zncyal546vm059wnkbn33f68djdcnwz1";
};
# error: invalid command 'test'
@@ -5973,23 +5990,16 @@ pythonPackages = modules // import ./python-packages-generated.nix {
robotframework-ride = buildPythonPackage rec {
- version = "1.2.2";
+ version = "1.2.3";
name = "robotframework-ride-${version}";
src = fetchurl {
url = "https://robotframework-ride.googlecode.com/files/${name}.tar.gz";
- sha256 = "1yfvl0hdjjkwk90w3f3i23dxxk3yiyv4pbvnp4l7yd6cmxsia8f3";
+ sha256 = "1lf5f4x80f7d983bmkx12sxcizzii21kghs8kf63a1mj022a5x5j";
};
propagatedBuildInputs = [ pygments wxPython modules.sqlite3 ];
- # Stop copying (read-only) permission bits from the nix store into $HOME,
- # because that leads to this:
- # IOError: [Errno 13] Permission denied: '/home/bfo/.robotframework/ride/settings.cfg'
- postPatch = ''
- sed -i "s|shutil\.copy(|shutil.copyfile(|" src/robotide/preferences/settings.py
- '';
-
# ride_postinstall.py checks that needed deps are installed and creates a
# desktop shortcut. We don't really need it and it clutters up bin/ so
# remove it.
@@ -6101,6 +6111,23 @@ pythonPackages = modules // import ./python-packages-generated.nix {
});
+ rsa = buildPythonPackage rec {
+ name = "rsa-3.1.2";
+
+ src = fetchurl {
+ url = "https://bitbucket.org/sybren/python-rsa/get/version-3.1.2.tar.bz2";
+ sha256 = "0ag2q4gaapi74x47q74xhcjzs4b7r2bb6zrj2an4sz5d3yd06cgf";
+ };
+
+ buildInputs = [ pythonPackages.pyasn1 ];
+
+ meta = {
+ homepage = http://stuvel.eu/rsa;
+ license = "Apache License 2.0";
+ description = "A pure-Python RSA implementation";
+ };
+ };
+
rtslib_fb = buildPythonPackage rec {
version = "2.1.fb43";
name = "rtslib-fb-${version}";
@@ -7170,6 +7197,7 @@ pythonPackages = modules // import ./python-packages-generated.nix {
meta = {
description = "A full-featured console (xterm et al.) user interface library";
homepage = http://excess.org/urwid;
+ repositories.git = git://github.com/wardi/urwid.git;
license = pkgs.lib.licenses.lgpl21;
maintainers = [ stdenv.lib.maintainers.garbas ];
};