Merge branch 'master.upstream' into staging.upstream

This commit is contained in:
William A. Kennington III 2015-07-19 02:21:19 -07:00
commit 684f491446
49 changed files with 4361 additions and 1315 deletions

View file

@ -55,18 +55,18 @@ $ git add pkgs/development/libraries/libfoo/default.nix</screen>
<itemizedlist>
<listitem>
<para>GNU cpio: <link
xlink:href="https://github.com/NixOS/nixpkgs/blob/master/pkgs/tools/archivers/cpio/default.nix"><filename>pkgs/tools/archivers/cpio/default.nix</filename></link>.
The simplest possible package. The generic builder in
<varname>stdenv</varname> does everything for you. It has
no dependencies beyond <varname>stdenv</varname>.</para>
<para>GNU Hello: <link
xlink:href="https://github.com/NixOS/nixpkgs/blob/master/pkgs/applications/misc/hello/ex-2/default.nix"><filename>pkgs/applications/misc/hello/ex-2/default.nix</filename></link>.
Trivial package, which specifies some <varname>meta</varname>
attributes which is good practice.</para>
</listitem>
<listitem>
<para>GNU Hello: <link
xlink:href="https://github.com/NixOS/nixpkgs/blob/master/pkgs/applications/misc/hello/ex-2/default.nix"><filename>pkgs/applications/misc/hello/ex-2/default.nix</filename></link>.
Also trivial, but it specifies some <varname>meta</varname>
attributes which is good practice.</para>
<para>GNU cpio: <link
xlink:href="https://github.com/NixOS/nixpkgs/blob/master/pkgs/tools/archivers/cpio/default.nix"><filename>pkgs/tools/archivers/cpio/default.nix</filename></link>.
Also a simple package. The generic builder in
<varname>stdenv</varname> does everything for you. It has
no dependencies beyond <varname>stdenv</varname>.</para>
</listitem>
<listitem>

View file

@ -158,7 +158,7 @@ let locatedb = "/var/cache/locatedb"; in
script =
''
mkdir -m 0755 -p $(dirname ${locatedb})
exec updatedb --localuser=nobody --output=${locatedb} --prunepaths='/tmp /var/tmp /media /run'
exec updatedb --localuser=nobody --output=${locatedb} --prunepaths='/tmp /var/tmp /run'
'';
};
@ -172,4 +172,4 @@ let locatedb = "/var/cache/locatedb"; in
<xi:include href="option-declarations.xml" />
<xi:include href="option-def.xml" />
</chapter>
</chapter>

View file

@ -171,6 +171,13 @@ nix-env -f &quot;&lt;nixpkgs&gt;&quot; -iA haskellPackages.cabal-install
</para>
</listitem>
<listitem>
<para>
The <literal>phpfpm</literal> is now using the default PHP version
(<literal>pkgs.php</literal>) instead of PHP 5.4 (<literal>pkgs.php54</literal>).
</para>
</listitem>
</itemizedlist>
</para>

View file

@ -70,7 +70,7 @@ my @attrs = ();
my @kernelModules = ();
my @initrdKernelModules = ();
my @modulePackages = ();
my @imports = ("<nixpkgs/nixos/modules/installer/scan/not-detected.nix>");
my @imports;
sub debug {
@ -245,6 +245,18 @@ if ($virt eq "qemu" || $virt eq "kvm" || $virt eq "bochs") {
}
# Pull in NixOS configuration for containers.
if ($virt eq "systemd-nspawn") {
push @attrs, "boot.isContainer = true;";
}
# Provide firmware for devices that are not detected by this script,
# unless we're in a VM/container.
push @imports, "<nixpkgs/nixos/modules/installer/scan/not-detected.nix>"
if $virt eq "none";
# For a device name like /dev/sda1, find a more stable path like
# /dev/disk/by-uuid/X or /dev/disk/by-label/Y.
sub findStableDevPath {
@ -459,14 +471,14 @@ if ($showHardwareConfig) {
if ($force || ! -e $fn) {
print STDERR "writing $fn...\n";
my $bootloaderConfig;
my $bootloaderConfig = "";
if (-e "/sys/firmware/efi/efivars") {
$bootLoaderConfig = <<EOF;
# Use the gummiboot efi boot loader.
boot.loader.gummiboot.enable = true;
boot.loader.efi.canTouchEfiVariables = true;
EOF
} else {
} elsif ($virt ne "systemd-nspawn") {
$bootLoaderConfig = <<EOF;
# Use the GRUB 2 boot loader.
boot.loader.grub.enable = true;

View file

@ -36,7 +36,7 @@ in {
};
phpPackage = mkOption {
default = pkgs.php54;
default = pkgs.php;
description = ''
The PHP package to use for running the FPM service.
'';

View file

@ -56,7 +56,10 @@ in
theme = mkOption {
type = types.nullOr types.path;
default = null;
default = pkgs.fetchurl {
url = https://github.com/jagajaga/nixos-slim-theme/archive/1.1.tar.gz;
sha256 = "66c3020a6716130a20c3898567339b990fbd7888a3b7bbcb688f6544d1c05c31";
};
example = literalExample ''
pkgs.fetchurl {
url = "mirror://sourceforge/slim.berlios/slim-wave.tar.gz";

File diff suppressed because it is too large Load diff

View file

@ -12,7 +12,7 @@ alias nix-build="nix-build --no-out-link \"$origin/../../..\""
# The extra slash at the end of the URL is necessary to stop wget
# from recursing over the whole server! (No, it's not a bug.)
$(nix-build -A autonix.manifest) \
"${KDE_MIRROR}/stable/applications/15.04.2/" \
"${KDE_MIRROR}/stable/applications/15.04.3/" \
"$@" -A '*.tar.xz'
AUTONIX_DEPS_KF5=${AUTONIX_DEPS_KF5:-"$(nix-build -A haskellngPackages.autonix-deps-kf5)/bin/kf5-deps"}

View file

@ -36,7 +36,7 @@
let
# -> http://get.adobe.com/flashplayer/
version = "11.2.202.481";
version = "11.2.202.491";
src =
if stdenv.system == "x86_64-linux" then
@ -47,7 +47,7 @@ let
else rec {
inherit version;
url = "http://fpdownload.adobe.com/get/flashplayer/pdc/${version}/install_flash_player_11_linux.x86_64.tar.gz";
sha256 = "151di671xqywjif3v4hbsfw55jyd5x5qjq2zc92xw367pssi29yz";
sha256 = "150zlnkq8jhhphfmyzdrpgi1y2sniqgx0a5ij994in3gvari9gpl";
}
else if stdenv.system == "i686-linux" then
if debug then
@ -60,7 +60,7 @@ let
else rec {
inherit version;
url = "http://fpdownload.adobe.com/get/flashplayer/pdc/${version}/install_flash_player_11_linux.i386.tar.gz";
sha256 = "05ydrw1ykp49b409bkpvizhf1bz1xmfxa7alfdnabvg90vkfvyvn";
sha256 = "0lwff46gjazjv04fpck0nhv47b4z1x79n09q5444npm1w5zjfgxy";
}
else throw "Flash Player is not supported on this platform";

View file

@ -1,4 +1,4 @@
{ stdenv, fetchurl, pythonPackages, makeWrapper, nettools, libtorrentRasterbar
{ stdenv, fetchurl, pythonPackages, makeWrapper, nettools, libtorrentRasterbar, imagemagick
, enablePlayer ? false, vlc ? null }:
@ -15,6 +15,7 @@ stdenv.mkDerivation rec {
pythonPackages.python
pythonPackages.wrapPython
makeWrapper
imagemagick
];
pythonPath = [
@ -36,6 +37,7 @@ stdenv.mkDerivation rec {
installPhase =
''
find . -name '*.png' -exec convert -strip {} {} \;
# Nasty hack; call wrapPythonPrograms to set program_PYTHONPATH.
wrapPythonPrograms

View file

@ -0,0 +1,35 @@
{ stdenv, fetchurl, openssl, pkgconfig
, withPerl ? false, perl
, withPython ? false, python3
, withTcl ? false, tcl
, withCyrus ? true, cyrus_sasl
}:
with stdenv.lib;
stdenv.mkDerivation rec {
name = "znc-1.4";
src = fetchurl {
url = "http://znc.in/releases/${name}.tar.gz";
sha256 = "0lkv58pq4d5lzcyx8v8anzinx0sx0zw0js4jij13jb8qxp88zsc6";
};
buildInputs = [ openssl pkgconfig ]
++ optional withPerl perl
++ optional withPython python3
++ optional withTcl tcl
++ optional withCyrus cyrus_sasl;
configureFlags = optionalString withPerl "--enable-perl "
+ optionalString withPython "--enable-python "
+ optionalString withTcl "--enable-tcl --with-tcl=${tcl}/lib "
+ optionalString withCyrus "--enable-cyrus ";
meta = with stdenv.lib; {
description = "Advanced IRC bouncer";
homepage = http://wiki.znc.in/ZNC;
maintainers = with maintainers; [ viric ];
license = licenses.asl20;
platforms = platforms.unix;
};
}

View file

@ -1,10 +1,10 @@
{stdenv, fetchurl, gtk, gperf, pkgconfig, bzip2, tcl, tk, judy, xz}:
stdenv.mkDerivation rec {
name = "gtkwave-3.3.64";
name = "gtkwave-3.3.66";
src = fetchurl {
url = "mirror://sourceforge/gtkwave/${name}.tar.gz";
sha256 = "05bisdh82rsbs0pj0687dzbp0s30p3wzq4gypb9bbjaxwnrmdsfs";
sha256 = "17mrmgr6zzl1x1qml0wmjjhcbw7bg3w4mqy60rsy0z6gxd8hikh4";
};
buildInputs = [ gtk gperf pkgconfig bzip2 tcl tk judy xz ];

View file

@ -153,7 +153,12 @@ rec {
imagemagick = [
http://www.imagemagick.org/download/
ftp://ftp.sunet.se/pub/multimedia/graphics/ImageMagick/ # also contains older versions removed from most mirrors
http://ftp.sunet.se/pub/multimedia/graphics/ImageMagick/
ftp://ftp.imagemagick.org/pub/ImageMagick/
http://ftp.fifi.org/ImageMagick/
ftp://ftp.fifi.org/ImageMagick/
http://imagemagick.mirrorcatalogs.com/
ftp://imagemagick.mirrorcatalogs.com/imagemagick
];
# CPAN mirrors.

View file

@ -124,8 +124,8 @@ let
} //
# packages from nixpkgs
(with pkgs; {
inherit attr bash cairo cmake dbus epoxy exiv2 ffmpeg freetype
glib gnugrep gnused gtk2 gtk3 libinput libssh
inherit attr bash cairo cmake coreutils dbus epoxy exiv2 ffmpeg
freetype glib gnugrep gnused gtk2 gtk3 libinput libssh
modemmanager openconnect openexr pam pango qt4 samba
socat substituteAll taglib utillinux wayland xapian
xkeyboard_config xlibs xorg;
@ -233,7 +233,7 @@ let
patches = [ ./plasma-workspace/0001-startkde-NixOS-patches.patch ];
buildInputs = with scope.xlibs; [ libSM libXcursor scope.pam ];
inherit (scope) bash gnused gnugrep socat;
inherit (scope) bash coreutils gnused gnugrep socat;
inherit (scope) kconfig kinit kservice qt5tools;
inherit (scope.xorg) mkfontdir xmessage xprop xrdb xset xsetroot;
dbus_tools = scope.dbus.tools;

View file

@ -8,11 +8,11 @@
"propagatedBuildInputs": [
"qt5core"
],
"name": "bluez-qt-5.3.1",
"name": "bluez-qt-5.3.2",
"src": {
"url": "stable/plasma/5.3.1/bluez-qt-5.3.1.tar.xz",
"name": "bluez-qt-5.3.1.tar.xz",
"sha256": "13i5ybmkf6xg49jh5fbbayxg3gp5h8g1gayc0mdc4cwzx1v6g70l"
"url": "stable/plasma/5.3.2/bluez-qt-5.3.2.tar.xz",
"name": "bluez-qt-5.3.2.tar.xz",
"sha256": "0bc9pi8zbfh66h3p9i76hq1jh7ygavax3zw2wygl269f1k92brlh"
},
"buildInputs": [
"ecm",
@ -32,11 +32,11 @@
"propagatedNativeBuildInputs": [],
"propagatedUserEnvPkgs": [],
"propagatedBuildInputs": [],
"name": "kmenuedit-5.3.1",
"name": "kmenuedit-5.3.2",
"src": {
"url": "stable/plasma/5.3.1/kmenuedit-5.3.1.tar.xz",
"name": "kmenuedit-5.3.1.tar.xz",
"sha256": "0vyy3xb32nb2qxfv3qvrrzlnck6gas0gwyncbn4rzimaygm2vzqz"
"url": "stable/plasma/5.3.2/kmenuedit-5.3.2.tar.xz",
"name": "kmenuedit-5.3.2.tar.xz",
"sha256": "13nsjh698h09ai6b7r8zi2hlkkxfv8c00b5b6dl0pb2b474a16di"
},
"buildInputs": [
"ecm",
@ -62,11 +62,11 @@
"propagatedNativeBuildInputs": [],
"propagatedUserEnvPkgs": [],
"propagatedBuildInputs": [],
"name": "plasma-nm-5.3.1",
"name": "plasma-nm-5.3.2",
"src": {
"url": "stable/plasma/5.3.1/plasma-nm-5.3.1.tar.xz",
"name": "plasma-nm-5.3.1.tar.xz",
"sha256": "0jgrz9j2228aya7n1dg4npicsbgv93f8n80b9yjax8mrd6qhq55k"
"url": "stable/plasma/5.3.2/plasma-nm-5.3.2.tar.xz",
"name": "plasma-nm-5.3.2.tar.xz",
"sha256": "0w3cs66rn7k4fzsr7qihzcgxjwmp2safnfr78lp69md59clc45ag"
},
"buildInputs": [
"ecm",
@ -112,11 +112,11 @@
"propagatedNativeBuildInputs": [],
"propagatedUserEnvPkgs": [],
"propagatedBuildInputs": [],
"name": "khotkeys-5.3.1",
"name": "khotkeys-5.3.2",
"src": {
"url": "stable/plasma/5.3.1/khotkeys-5.3.1.tar.xz",
"name": "khotkeys-5.3.1.tar.xz",
"sha256": "11mzrjzk2j9x32mg77d2al19b4iin0rfxs710mhsjbgriq144smv"
"url": "stable/plasma/5.3.2/khotkeys-5.3.2.tar.xz",
"name": "khotkeys-5.3.2.tar.xz",
"sha256": "0f7z6vwkmi54jbvvqgyxn1mvh1gjwmrihj3afd4w7zd4cbyf61ka"
},
"buildInputs": [
"ecm",
@ -142,11 +142,11 @@
"propagatedNativeBuildInputs": [],
"propagatedUserEnvPkgs": [],
"propagatedBuildInputs": [],
"name": "plasma-workspace-wallpapers-5.3.1",
"name": "plasma-workspace-wallpapers-5.3.2",
"src": {
"url": "stable/plasma/5.3.1/plasma-workspace-wallpapers-5.3.1.tar.xz",
"name": "plasma-workspace-wallpapers-5.3.1.tar.xz",
"sha256": "1y6gdzs0qxiw4hl9r6v3blcm8gq61wapagn6sj5ixagvwlhf2w5y"
"url": "stable/plasma/5.3.2/plasma-workspace-wallpapers-5.3.2.tar.xz",
"name": "plasma-workspace-wallpapers-5.3.2.tar.xz",
"sha256": "1h3w824dv5yyjz6l9vsi6lddlb5xxmmaqdvvacz7qypy06f808aa"
},
"buildInputs": [
"ecm"
@ -159,11 +159,11 @@
"propagatedNativeBuildInputs": [],
"propagatedUserEnvPkgs": [],
"propagatedBuildInputs": [],
"name": "kscreen-5.3.1",
"name": "kscreen-5.3.2",
"src": {
"url": "stable/plasma/5.3.1/kscreen-5.3.1.tar.xz",
"name": "kscreen-5.3.1.tar.xz",
"sha256": "008ys3glpvpcvjh7n2gls3m13q9qswmnc5l2lz4zs1dvcrk5z7yr"
"url": "stable/plasma/5.3.2/kscreen-5.3.2.tar.xz",
"name": "kscreen-5.3.2.tar.xz",
"sha256": "15dnraav3sn5rcz88nj3h6n95w4jiynn45n29pfv7yc3p41yahwd"
},
"buildInputs": [
"ecm",
@ -187,11 +187,11 @@
"propagatedNativeBuildInputs": [],
"propagatedUserEnvPkgs": [],
"propagatedBuildInputs": [],
"name": "oxygen-fonts-5.3.1",
"name": "oxygen-fonts-5.3.2",
"src": {
"url": "stable/plasma/5.3.1/oxygen-fonts-5.3.1.tar.xz",
"name": "oxygen-fonts-5.3.1.tar.xz",
"sha256": "0zp81c4s0xvr1d0nvlssk3k3456farz157sqnjvgbsarxnzmgppv"
"url": "stable/plasma/5.3.2/oxygen-fonts-5.3.2.tar.xz",
"name": "oxygen-fonts-5.3.2.tar.xz",
"sha256": "0x78fbllqd8ssxlr2d0xy76pvr4v6f5xans4mvr3f3aa6xhr05ya"
},
"buildInputs": [
"ecm"
@ -204,11 +204,11 @@
"propagatedNativeBuildInputs": [],
"propagatedUserEnvPkgs": [],
"propagatedBuildInputs": [],
"name": "breeze-5.3.1",
"name": "breeze-5.3.2",
"src": {
"url": "stable/plasma/5.3.1/breeze-5.3.1.tar.xz",
"name": "breeze-5.3.1.tar.xz",
"sha256": "0sh7vgg3dz0cs6mqs4c3ygw5qg4lcjm0vdh4mm4xfxnizagkqrr5"
"url": "stable/plasma/5.3.2/breeze-5.3.2.tar.xz",
"name": "breeze-5.3.2.tar.xz",
"sha256": "0rnw5cblz6rdcx4n6x2wwr0blrk2xlkkq1gsbr06c969hp9gq4iy"
},
"buildInputs": [
"ecm",
@ -239,11 +239,11 @@
"propagatedNativeBuildInputs": [],
"propagatedUserEnvPkgs": [],
"propagatedBuildInputs": [],
"name": "oxygen-5.3.1",
"name": "oxygen-5.3.2",
"src": {
"url": "stable/plasma/5.3.1/oxygen-5.3.1.tar.xz",
"name": "oxygen-5.3.1.tar.xz",
"sha256": "03b8rxgspkv5p8mfb53v92bi62cqp7rcma2fjarmgw4ri5w6cwx9"
"url": "stable/plasma/5.3.2/oxygen-5.3.2.tar.xz",
"name": "oxygen-5.3.2.tar.xz",
"sha256": "19z18n7zq8616r1dwvnw0s73wxh114d3z952x3p3z42dhl0lkrw0"
},
"buildInputs": [
"ecm",
@ -278,11 +278,11 @@
"propagatedBuildInputs": [
"kf5sysguard"
],
"name": "plasma-workspace-5.3.1",
"name": "plasma-workspace-5.3.2",
"src": {
"url": "stable/plasma/5.3.1/plasma-workspace-5.3.1.tar.xz",
"name": "plasma-workspace-5.3.1.tar.xz",
"sha256": "1cjg8rhwhm015fg36idn4shddcy6sjnb4y0x9vmxbsdvfx2nnhr1"
"url": "stable/plasma/5.3.2/plasma-workspace-5.3.2.tar.xz",
"name": "plasma-workspace-5.3.2.tar.xz",
"sha256": "1i2lz9acxl63nd6nlvgvnv7lm3nq4bvj2kyj2lmd97f5xx3sara1"
},
"buildInputs": [
"dbusmenu-qt5",
@ -351,11 +351,11 @@
"propagatedNativeBuildInputs": [],
"propagatedUserEnvPkgs": [],
"propagatedBuildInputs": [],
"name": "kwrited-5.3.1",
"name": "kwrited-5.3.2",
"src": {
"url": "stable/plasma/5.3.1/kwrited-5.3.1.tar.xz",
"name": "kwrited-5.3.1.tar.xz",
"sha256": "0qivfycr4ak5zsplnzv968sya2rc3vz9z6h8gv4b2scf99zjp2g8"
"url": "stable/plasma/5.3.2/kwrited-5.3.2.tar.xz",
"name": "kwrited-5.3.2.tar.xz",
"sha256": "1h499rpp7jss5vikapm1247xn1bg5axq4bwwfr6frlyq03vcpga1"
},
"buildInputs": [
"ecm",
@ -378,11 +378,11 @@
"propagatedBuildInputs": [
"qt5core"
],
"name": "plasma-desktop-5.3.1",
"name": "plasma-desktop-5.3.2",
"src": {
"url": "stable/plasma/5.3.1/plasma-desktop-5.3.1.tar.xz",
"name": "plasma-desktop-5.3.1.tar.xz",
"sha256": "079v2pbpgn1gr03l3qcxk3rsgbip318xpjbni4vxf08fhsh1ixlp"
"url": "stable/plasma/5.3.2/plasma-desktop-5.3.2.tar.xz",
"name": "plasma-desktop-5.3.2.tar.xz",
"sha256": "190g0nmm97a0403nvyp1478fpk8r3d7jkxpg0mif9nvws25qfvz1"
},
"buildInputs": [
"boost",
@ -457,11 +457,11 @@
"propagatedNativeBuildInputs": [],
"propagatedUserEnvPkgs": [],
"propagatedBuildInputs": [],
"name": "systemsettings-5.3.1",
"name": "systemsettings-5.3.2",
"src": {
"url": "stable/plasma/5.3.1/systemsettings-5.3.1.tar.xz",
"name": "systemsettings-5.3.1.tar.xz",
"sha256": "06m3r31dr0ivhn25fg0sg8pbxyzvm8slsmqkqsm4cbypg028axx0"
"url": "stable/plasma/5.3.2/systemsettings-5.3.2.tar.xz",
"name": "systemsettings-5.3.2.tar.xz",
"sha256": "0lgl15hfr3na3v1dry8r5bd7z3d8jlrzh6a3avq9l9297lwfgaxd"
},
"buildInputs": [
"ecm",
@ -491,11 +491,11 @@
"propagatedBuildInputs": [
"qt5core"
],
"name": "libkscreen-5.3.1",
"name": "libkscreen-5.3.2",
"src": {
"url": "stable/plasma/5.3.1/libkscreen-5.3.1.tar.xz",
"name": "libkscreen-5.3.1.tar.xz",
"sha256": "00g401yfiyqh09ajkinlkzhfpb7lsy0wpnrk1ba8vm4wmcvkp63l"
"url": "stable/plasma/5.3.2/libkscreen-5.3.2.tar.xz",
"name": "libkscreen-5.3.2.tar.xz",
"sha256": "1k6j4nxy41d2jgwydi0ah2v0idn6zhb1lmxziyrcshqpklhwiff2"
},
"buildInputs": [
"doxygen",
@ -517,11 +517,11 @@
"propagatedNativeBuildInputs": [],
"propagatedUserEnvPkgs": [],
"propagatedBuildInputs": [],
"name": "plasma-sdk-5.3.1",
"name": "plasma-sdk-5.3.2",
"src": {
"url": "stable/plasma/5.3.1/plasma-sdk-5.3.1.tar.xz",
"name": "plasma-sdk-5.3.1.tar.xz",
"sha256": "157742d7wm21y4g7gs0483jd4sd6q2a0ppyk3mr544nagydvpqfs"
"url": "stable/plasma/5.3.2/plasma-sdk-5.3.2.tar.xz",
"name": "plasma-sdk-5.3.2.tar.xz",
"sha256": "13vkxbayxggj4bx1l40rspck59j4l736gr5hg0sd1j7hmlwcys2z"
},
"buildInputs": [
"activeapp",
@ -570,11 +570,11 @@
"propagatedNativeBuildInputs": [],
"propagatedUserEnvPkgs": [],
"propagatedBuildInputs": [],
"name": "kwin-5.3.1",
"name": "kwin-5.3.2",
"src": {
"url": "stable/plasma/5.3.1/kwin-5.3.1.tar.xz",
"name": "kwin-5.3.1.tar.xz",
"sha256": "04bxf45lcbmnl8fks1k6j6i0sk7x5abzhmyrziliz2yx5kyi4m36"
"url": "stable/plasma/5.3.2/kwin-5.3.2.tar.xz",
"name": "kwin-5.3.2.tar.xz",
"sha256": "0p2pf6aq9zy0l4f7px2p0wj1kfgax8qjmal6yn3mifx1al244xvz"
},
"buildInputs": [
"ecm",
@ -633,11 +633,11 @@
"propagatedNativeBuildInputs": [],
"propagatedUserEnvPkgs": [],
"propagatedBuildInputs": [],
"name": "kdeplasma-addons-5.3.1",
"name": "kdeplasma-addons-5.3.2",
"src": {
"url": "stable/plasma/5.3.1/kdeplasma-addons-5.3.1.tar.xz",
"name": "kdeplasma-addons-5.3.1.tar.xz",
"sha256": "1myk3508jqgalyqa1rlx1dq5afppvhvsnd7irf4wywpgls20nwnv"
"url": "stable/plasma/5.3.2/kdeplasma-addons-5.3.2.tar.xz",
"name": "kdeplasma-addons-5.3.2.tar.xz",
"sha256": "08k3736ssir41r37y3f6bdf52l1whkr7q5qc2rfhbzm6c9lhqvn4"
},
"buildInputs": [
"ecm",
@ -686,11 +686,11 @@
"propagatedNativeBuildInputs": [],
"propagatedUserEnvPkgs": [],
"propagatedBuildInputs": [],
"name": "sddm-kcm-5.3.1",
"name": "sddm-kcm-5.3.2",
"src": {
"url": "stable/plasma/5.3.1/sddm-kcm-5.3.1.tar.xz",
"name": "sddm-kcm-5.3.1.tar.xz",
"sha256": "16viwz7b8s77g5fqw7g7asrrk44fif4fmmif7g3bkmq7rncd3hw9"
"url": "stable/plasma/5.3.2/sddm-kcm-5.3.2.tar.xz",
"name": "sddm-kcm-5.3.2.tar.xz",
"sha256": "17pk95xqr08gjn16i4gs7gnp2ksc6082myywdarywf66nz4whind"
},
"buildInputs": [
"ecm",
@ -720,11 +720,11 @@
"propagatedNativeBuildInputs": [],
"propagatedUserEnvPkgs": [],
"propagatedBuildInputs": [],
"name": "khelpcenter-5.3.1",
"name": "khelpcenter-5.3.2",
"src": {
"url": "stable/plasma/5.3.1/khelpcenter-5.3.1.tar.xz",
"name": "khelpcenter-5.3.1.tar.xz",
"sha256": "0dik353w6ri6mfkvkz3v5xva6x59zlbz1sj522li0gbd73x4bzf2"
"url": "stable/plasma/5.3.2/khelpcenter-5.3.2.tar.xz",
"name": "khelpcenter-5.3.2.tar.xz",
"sha256": "1nd4kj4zhw21lfdj6yrmww2rx629mia5w0fb769y5wdas82w9wb3"
},
"buildInputs": [
"ecm",
@ -747,11 +747,11 @@
"propagatedNativeBuildInputs": [],
"propagatedUserEnvPkgs": [],
"propagatedBuildInputs": [],
"name": "bluedevil-5.3.1",
"name": "bluedevil-5.3.2",
"src": {
"url": "stable/plasma/5.3.1/bluedevil-5.3.1.tar.xz",
"name": "bluedevil-5.3.1.tar.xz",
"sha256": "050hpiifrhm2vzab527anfncdf04cikz5149iabz3aflxcvabqpl"
"url": "stable/plasma/5.3.2/bluedevil-5.3.2.tar.xz",
"name": "bluedevil-5.3.2.tar.xz",
"sha256": "0pdm4fpr4piaqd52nbyv3plib4z6y9dr7qgbh1cfk3bzfwi1jwn8"
},
"buildInputs": [
"ecm",
@ -782,11 +782,11 @@
"propagatedNativeBuildInputs": [],
"propagatedUserEnvPkgs": [],
"propagatedBuildInputs": [],
"name": "ksysguard-5.3.1",
"name": "ksysguard-5.3.2",
"src": {
"url": "stable/plasma/5.3.1/ksysguard-5.3.1.tar.xz",
"name": "ksysguard-5.3.1.tar.xz",
"sha256": "1z1qgf5qskzf4r524lf75pdyw7gdwrx2yr8nac9622hvgrfh7yhj"
"url": "stable/plasma/5.3.2/ksysguard-5.3.2.tar.xz",
"name": "ksysguard-5.3.2.tar.xz",
"sha256": "1vf2gdihrvfjrlkg5dmpg9f5yqgxawqa2cf8h9f96n2n0cd46gq7"
},
"buildInputs": [
"ecm",
@ -817,11 +817,11 @@
"qt5core",
"xapian"
],
"name": "baloo-5.9.1",
"name": "baloo-5.9.2",
"src": {
"url": "stable/plasma/5.3.1/baloo-5.9.1.tar.xz",
"name": "baloo-5.9.1.tar.xz",
"sha256": "0wx9n3l4f1ibddvhbiharhgd20s8hzs64b2c0686bm82qmbkkl7n"
"url": "stable/plasma/5.3.2/baloo-5.9.2.tar.xz",
"name": "baloo-5.9.2.tar.xz",
"sha256": "1rhrdri90xb4g23x92nv72x19lxrdzkzc16w5ivbglrnq5ipga8w"
},
"buildInputs": [
"ecm",
@ -852,11 +852,11 @@
"propagatedNativeBuildInputs": [],
"propagatedUserEnvPkgs": [],
"propagatedBuildInputs": [],
"name": "kde-cli-tools-5.3.1",
"name": "kde-cli-tools-5.3.2",
"src": {
"url": "stable/plasma/5.3.1/kde-cli-tools-5.3.1.tar.xz",
"name": "kde-cli-tools-5.3.1.tar.xz",
"sha256": "0x4k3yi4qccvfp4ia75alihcivk4slwsx8i0wdb00qjl1nj7jbc1"
"url": "stable/plasma/5.3.2/kde-cli-tools-5.3.2.tar.xz",
"name": "kde-cli-tools-5.3.2.tar.xz",
"sha256": "1ac36rhffw85yzck4mqj1l4yj20g6yrjxi40vrkakln5j26vxb3x"
},
"buildInputs": [
"ecm",
@ -884,11 +884,11 @@
"propagatedNativeBuildInputs": [],
"propagatedUserEnvPkgs": [],
"propagatedBuildInputs": [],
"name": "milou-5.3.1",
"name": "milou-5.3.2",
"src": {
"url": "stable/plasma/5.3.1/milou-5.3.1.tar.xz",
"name": "milou-5.3.1.tar.xz",
"sha256": "17xw62pngq3bb7vkbkn8c099ivsf1xmns0f65v7j112yqpz33b8a"
"url": "stable/plasma/5.3.2/milou-5.3.2.tar.xz",
"name": "milou-5.3.2.tar.xz",
"sha256": "1wlnis5ph7vxg7wj410qs8qvdc2b0s8ji1vgqpv0g19zhkph95kw"
},
"buildInputs": [
"ecm",
@ -915,11 +915,11 @@
"propagatedNativeBuildInputs": [],
"propagatedUserEnvPkgs": [],
"propagatedBuildInputs": [],
"name": "powerdevil-5.3.1",
"name": "powerdevil-5.3.2",
"src": {
"url": "stable/plasma/5.3.1/powerdevil-5.3.1.tar.xz",
"name": "powerdevil-5.3.1.tar.xz",
"sha256": "07kcqd7qzblapxnwczfdj4vwb8s6s8mp7qhl4mb663f2a0z6fn8l"
"url": "stable/plasma/5.3.2/powerdevil-5.3.2.tar.xz",
"name": "powerdevil-5.3.2.tar.xz",
"sha256": "1zyfqi9qppra2hw0i18wil1xym84pgqdgmh9yn577c778grr4kgk"
},
"buildInputs": [
"ecm",
@ -959,11 +959,11 @@
"qt5network",
"qt5widgets"
],
"name": "libksysguard-5.3.1",
"name": "libksysguard-5.3.2",
"src": {
"url": "stable/plasma/5.3.1/libksysguard-5.3.1.tar.xz",
"name": "libksysguard-5.3.1.tar.xz",
"sha256": "115iwqq4y6pnhqsa5yn30q6wdpad5v48m7hjrn7jbpm3gsiwq1ym"
"url": "stable/plasma/5.3.2/libksysguard-5.3.2.tar.xz",
"name": "libksysguard-5.3.2.tar.xz",
"sha256": "137dr7p4q3aldm7fs2rldchq4d3irij4rpqc3c799blrgmdrp98p"
},
"buildInputs": [
"ecm",
@ -998,11 +998,11 @@
"propagatedNativeBuildInputs": [],
"propagatedUserEnvPkgs": [],
"propagatedBuildInputs": [],
"name": "plasma-mediacenter-5.3.1",
"name": "plasma-mediacenter-5.3.2",
"src": {
"url": "stable/plasma/5.3.1/plasma-mediacenter-5.3.1.tar.xz",
"name": "plasma-mediacenter-5.3.1.tar.xz",
"sha256": "0h8dpyszn7hk7b1y1m9qb83gzjnp8ymslpranxdan36r5bm2ayd8"
"url": "stable/plasma/5.3.2/plasma-mediacenter-5.3.2.tar.xz",
"name": "plasma-mediacenter-5.3.2.tar.xz",
"sha256": "0nlkzhyfi87k2r567h0hdlj1a9115mwxac55yjg7j3bpm7jr36g6"
},
"buildInputs": [
"ecm",
@ -1041,11 +1041,11 @@
"propagatedBuildInputs": [
"qt5core"
],
"name": "kfilemetadata-5.9.1",
"name": "kfilemetadata-5.9.2",
"src": {
"url": "stable/plasma/5.3.1/kfilemetadata-5.9.1.tar.xz",
"name": "kfilemetadata-5.9.1.tar.xz",
"sha256": "02gffgwbic4h8zdknp32cczplw3cc9ahg483aa3frhhgvgvrq8hs"
"url": "stable/plasma/5.3.2/kfilemetadata-5.9.2.tar.xz",
"name": "kfilemetadata-5.9.2.tar.xz",
"sha256": "070m5v54birqwh8cmik6n80nbcfjh38lay4w5i3ic0hqj6as2n89"
},
"buildInputs": [
"ecm",
@ -1070,11 +1070,11 @@
"propagatedNativeBuildInputs": [],
"propagatedUserEnvPkgs": [],
"propagatedBuildInputs": [],
"name": "kde-gtk-config-5.3.1",
"name": "kde-gtk-config-5.3.2",
"src": {
"url": "stable/plasma/5.3.1/kde-gtk-config-5.3.1.tar.xz",
"name": "kde-gtk-config-5.3.1.tar.xz",
"sha256": "1frykdckgrfbiyjshdkjv6hp8mrpfz3g461w6snb65yly02qjb5l"
"url": "stable/plasma/5.3.2/kde-gtk-config-5.3.2.tar.xz",
"name": "kde-gtk-config-5.3.2.tar.xz",
"sha256": "0rw4yv8svbjnv06pqva81m9xvpl75bvka53kckz0nqi6v96rdg2m"
},
"buildInputs": [
"ecm",
@ -1103,11 +1103,11 @@
"propagatedBuildInputs": [
"qt5gui"
],
"name": "kwayland-5.3.1",
"name": "kwayland-5.3.2",
"src": {
"url": "stable/plasma/5.3.1/kwayland-5.3.1.tar.xz",
"name": "kwayland-5.3.1.tar.xz",
"sha256": "1vsdsf00py6i16zwbwpplq1v7m3fy1j0dskvkb080wm0fskz1r8f"
"url": "stable/plasma/5.3.2/kwayland-5.3.2.tar.xz",
"name": "kwayland-5.3.2.tar.xz",
"sha256": "1z8k3vhrbfmnbaaji2akzgqvwm990cqk1jqd3crgzv26pbhinvci"
},
"buildInputs": [
"ecm",
@ -1132,11 +1132,11 @@
"propagatedNativeBuildInputs": [],
"propagatedUserEnvPkgs": [],
"propagatedBuildInputs": [],
"name": "ksshaskpass-5.3.1",
"name": "ksshaskpass-5.3.2",
"src": {
"url": "stable/plasma/5.3.1/ksshaskpass-5.3.1.tar.xz",
"name": "ksshaskpass-5.3.1.tar.xz",
"sha256": "0ids7vbi46bdd5dbjgv0wfv4rfv03kpln5vr3rwavah892q1dad2"
"url": "stable/plasma/5.3.2/ksshaskpass-5.3.2.tar.xz",
"name": "ksshaskpass-5.3.2.tar.xz",
"sha256": "1v4p02141pd7xkyfxmhf7lf5385krri2zdh3vb90d8pr802mv3g7"
},
"buildInputs": [
"ecm",
@ -1157,11 +1157,11 @@
"propagatedNativeBuildInputs": [],
"propagatedUserEnvPkgs": [],
"propagatedBuildInputs": [],
"name": "kinfocenter-5.3.1",
"name": "kinfocenter-5.3.2",
"src": {
"url": "stable/plasma/5.3.1/kinfocenter-5.3.1.tar.xz",
"name": "kinfocenter-5.3.1.tar.xz",
"sha256": "02gqlidh9pb924vhhaxnidpjz3cb32r6icikhcv7csrll13wgp1a"
"url": "stable/plasma/5.3.2/kinfocenter-5.3.2.tar.xz",
"name": "kinfocenter-5.3.2.tar.xz",
"sha256": "1w8q9xq2rl1g8axf7n7l7cq49ahhw0r1zc0sdgv4409k5iwsrikr"
},
"buildInputs": [
"ecm",
@ -1203,11 +1203,11 @@
"propagatedNativeBuildInputs": [],
"propagatedUserEnvPkgs": [],
"propagatedBuildInputs": [],
"name": "polkit-kde-agent-1-5.3.1",
"name": "polkit-kde-agent-1-5.3.2",
"src": {
"url": "stable/plasma/5.3.1/polkit-kde-agent-1-5.3.1.tar.xz",
"name": "polkit-kde-agent-1-5.3.1.tar.xz",
"sha256": "01ragaa1r144g25kqdc157d7lbq69cclanaljgwkvs2mn0ib031c"
"url": "stable/plasma/5.3.2/polkit-kde-agent-1-5.3.2.tar.xz",
"name": "polkit-kde-agent-1-5.3.2.tar.xz",
"sha256": "0khbkgd3s0b2xl062rcxqimym8f3c9y6xadl5av27d4d78ayqmfn"
},
"buildInputs": [
"ecm",
@ -1237,11 +1237,11 @@
"propagatedBuildInputs": [
"qt5gui"
],
"name": "kdecoration-5.3.1",
"name": "kdecoration-5.3.2",
"src": {
"url": "stable/plasma/5.3.1/kdecoration-5.3.1.tar.xz",
"name": "kdecoration-5.3.1.tar.xz",
"sha256": "19qxz5ivrjq9a1shk7mjin0r9v37g33l762nf7lb1xf29y13mhsn"
"url": "stable/plasma/5.3.2/kdecoration-5.3.2.tar.xz",
"name": "kdecoration-5.3.2.tar.xz",
"sha256": "192infj8s4rd3jwiy8fcvbg265zvng4xbmwj7a3bqz4h9jcrjc7v"
},
"buildInputs": [
"ecm",
@ -1259,11 +1259,11 @@
"propagatedNativeBuildInputs": [],
"propagatedUserEnvPkgs": [],
"propagatedBuildInputs": [],
"name": "kio-extras-5.3.1",
"name": "kio-extras-5.3.2",
"src": {
"url": "stable/plasma/5.3.1/kio-extras-5.3.1.tar.xz",
"name": "kio-extras-5.3.1.tar.xz",
"sha256": "1m1gc0m9xhapnchiicsn93spylczkggj8c79ixgk99b1ha7vbc87"
"url": "stable/plasma/5.3.2/kio-extras-5.3.2.tar.xz",
"name": "kio-extras-5.3.2.tar.xz",
"sha256": "1vfp203mmpqvwa9dqkkpgz9rgk07f11pwhg5drvkw03azi9hbjbw"
},
"buildInputs": [
"ecm",
@ -1308,11 +1308,11 @@
"propagatedNativeBuildInputs": [],
"propagatedUserEnvPkgs": [],
"propagatedBuildInputs": [],
"name": "muon-5.3.1",
"name": "muon-5.3.2",
"src": {
"url": "stable/plasma/5.3.1/muon-5.3.1.tar.xz",
"name": "muon-5.3.1.tar.xz",
"sha256": "0k2c625d9i5gyyvdzlajkb0kcvss60lhs7qssil1a4w34ch3zfmk"
"url": "stable/plasma/5.3.2/muon-5.3.2.tar.xz",
"name": "muon-5.3.2.tar.xz",
"sha256": "0c2c94yirfrkcxp30gf77xzy9gmgznx0kkhn93idggdhc4qdyf9z"
},
"buildInputs": [
"akabeiclient",

View file

@ -12,7 +12,7 @@ alias nix-build="nix-build --no-out-link \"$origin/../../..\""
# The extra slash at the end of the URL is necessary to stop wget
# from recursing over the whole server! (No, it's not a bug.)
$(nix-build -A autonix.manifest) \
"${KDE_MIRROR}/stable/plasma/5.3.1/" \
"${KDE_MIRROR}/stable/plasma/5.3.2/" \
"$@" -A '*.tar.xz'
AUTONIX_DEPS_KF5=${AUTONIX_DEPS_KF5:-"$(nix-build -A haskellngPackages.autonix-deps-kf5)/bin/kf5-deps"}

View file

@ -1,14 +1,14 @@
From ff61c8ba856328a60e29938466b69d0bb38a357f Mon Sep 17 00:00:00 2001
From f124d2204cff11ae0ff0d6c788d268b746180407 Mon Sep 17 00:00:00 2001
From: Thomas Tuegel <ttuegel@gmail.com>
Date: Tue, 2 Jun 2015 11:21:43 -0500
Subject: [PATCH] startkde: NixOS patches
Date: Sat, 18 Jul 2015 12:13:08 -0500
Subject: [PATCH] startkde NixOS patches
---
startkde/startkde.cmake | 218 ++++++++++++++++++++----------------------------
1 file changed, 89 insertions(+), 129 deletions(-)
startkde/startkde.cmake | 222 ++++++++++++++++++++----------------------------
1 file changed, 91 insertions(+), 131 deletions(-)
diff --git a/startkde/startkde.cmake b/startkde/startkde.cmake
index 24e5c1b..e7bdd32 100644
index 6f93108..26cc2fc 100644
--- a/startkde/startkde.cmake
+++ b/startkde/startkde.cmake
@@ -1,8 +1,31 @@
@ -62,7 +62,8 @@ index 24e5c1b..e7bdd32 100644
-fi
-
# Check if a KDE session already is running and whether it's possible to connect to X
kcheckrunning
-kcheckrunning
+@out@/bin/kcheckrunning
kcheckrunning_result=$?
if test $kcheckrunning_result -eq 0 ; then
- echo "KDE seems to be already running on this display."
@ -129,7 +130,8 @@ index 24e5c1b..e7bdd32 100644
- }
-fi
-
kstartupconfig5
-kstartupconfig5
+@out@/bin/kstartupconfig5
returncode=$?
if test $returncode -ne 0; then
- xmessage -geometry 500x100 "kstartupconfig5 does not exist or fails. The error code is $returncode. Check your installation."
@ -141,7 +143,7 @@ index 24e5c1b..e7bdd32 100644
-if test "$kdeglobals_kscreen_scalefactor" -ne 1; then
- export QT_DEVICE_PIXEL_RATIO=$kdeglobals_kscreen_scalefactor
-fi
+XCURSOR_PATH=~/.icons:$(echo "$XDG_DATA_DIRS" | tr ":" "\n" | @gnused@/bin/sed 's,$,/icons,g' | tr "\n" ":")
+XCURSOR_PATH=~/.icons:$(echo "$XDG_DATA_DIRS" | @coreutils@/bin/tr ":" "\n" | @gnused@/bin/sed 's,$,/icons,g' | @coreutils@/bin/tr "\n" ":")
+export XCURSOR_PATH
# XCursor mouse theme needs to be applied here to work even for kded or ksmserver
@ -391,7 +393,7 @@ index 24e5c1b..e7bdd32 100644
for prefix in `echo "$scriptpath"`; do
- for file in `ls "$prefix"/shutdown 2> /dev/null | egrep -v '(~|\.bak)$'`; do
+ for file in `ls "$prefix"/shutdown 2> /dev/null | @gnugrep@/bin/egrep -v '(~|\.bak)$'`; do
test -x "$prefix$file" && "$prefix$file"
test -x "$prefix/shutdown/$file" && "$prefix/shutdown/$file"
done
done
@ -405,5 +407,5 @@ index 24e5c1b..e7bdd32 100644
echo 'startkde: Done.' 1>&2
--
2.4.1
2.4.5

View file

@ -619,10 +619,6 @@ self: super: {
# https://github.com/jwiegley/simple-conduit/issues/2
simple-conduit = markBroken super.simple-conduit;
# https://github.com/srijs/hwsl2/issues/1
hwsl2 = markBroken super.hwsl2;
hwsl2-reducers = dontDistribute super.hwsl2-reducers;
# https://code.google.com/p/linux-music-player/issues/detail?id=1
mp = markBroken super.mp;

View file

@ -268,4 +268,8 @@ self: super: {
# Inexplicable haddock failure
# https://github.com/gregwebs/aeson-applicative/issues/2
aeson-applicative = dontHaddock super.aeson-applicative;
# GHC 7.10.1 is affected by https://github.com/srijs/hwsl2/issues/1.
hwsl2 = dontCheck super.hwsl2;
}

View file

@ -6,9 +6,9 @@
, version, revision ? null
, sha256 ? null
, src ? fetchurl { url = "mirror://hackage/${pname}-${version}.tar.gz"; inherit sha256; }
, buildDepends ? []
, buildDepends ? [], libraryHaskellDepends ? [], executableHaskellDepends ? []
, buildTarget ? ""
, buildTools ? []
, buildTools ? [], libraryToolDepends ? [], executableToolDepends ? [], testToolDepends ? []
, configureFlags ? []
, description ? ""
, doCheck ? stdenv.lib.versionOlder "7.4" ghc.version
@ -19,7 +19,7 @@
, enableSharedLibraries ? ((ghc.isGhcjs or false) || stdenv.lib.versionOlder "7.7" ghc.version)
, enableSplitObjs ? !stdenv.isDarwin # http://hackage.haskell.org/trac/ghc/ticket/4013
, enableStaticLibraries ? true
, extraLibraries ? []
, extraLibraries ? [], librarySystemDepends ? [], executableSystemDepends ? []
, homepage ? "http://hackage.haskell.org/package/${pname}"
, hydraPlatforms ? ghc.meta.hydraPlatforms or ghc.meta.platforms
, hyperlinkSource ? true
@ -29,9 +29,9 @@
, maintainers ? []
, doHaddock ? true
, passthru ? {}
, pkgconfigDepends ? []
, pkgconfigDepends ? [], libraryPkgconfigDepends ? [], executablePkgconfigDepends ? [], testPkgconfigDepends ? []
, platforms ? ghc.meta.platforms
, testDepends ? []
, testDepends ? [], testHaskellDepends ? [], testSystemDepends ? []
, testTarget ? ""
, broken ? false
, preUnpack ? "", postUnpack ? ""
@ -84,7 +84,7 @@ let
(optionalString (enableSharedExecutables && stdenv.isLinux) "--ghc-option=-optl=-Wl,-rpath=$out/lib/${ghc.name}/${pname}-${version}")
(optionalString (enableSharedExecutables && stdenv.isDarwin) "--ghc-option=-optl=-Wl,-headerpad_max_install_names")
(optionalString enableParallelBuilding "--ghc-option=-j$NIX_BUILD_CORES")
(optionalString (useCpphs) "--with-cpphs=${cpphs}/bin/cpphs --ghc-options=-cpp --ghc-options=-pgmP${cpphs}/bin/cpphs --ghc-options=-optP--cpp")
(optionalString useCpphs "--with-cpphs=${cpphs}/bin/cpphs --ghc-options=-cpp --ghc-options=-pgmP${cpphs}/bin/cpphs --ghc-options=-optP--cpp")
(enableFeature enableSplitObjs "split-objs")
(enableFeature enableLibraryProfiling "library-profiling")
(enableFeature enableSharedLibraries "shared")
@ -105,11 +105,11 @@ let
isHaskellPkg = x: (x ? pname) && (x ? version) && (x ? env);
isSystemPkg = x: !isHaskellPkg x;
propagatedBuildInputs = buildDepends;
otherBuildInputs = extraLibraries ++
buildTools ++
optionals (pkgconfigDepends != []) ([pkgconfig] ++ pkgconfigDepends) ++
optionals doCheck testDepends;
propagatedBuildInputs = buildDepends ++ libraryHaskellDepends ++ executableHaskellDepends;
otherBuildInputs = extraLibraries ++ librarySystemDepends ++ executableSystemDepends ++
buildTools ++ libraryToolDepends ++ executableToolDepends ++
optionals (pkgconfigDepends != []) ([pkgconfig] ++ pkgconfigDepends ++ libraryPkgconfigDepends ++ executablePkgconfigDepends) ++
optionals doCheck (testDepends ++ testHaskellDepends ++ testSystemDepends);
allBuildInputs = propagatedBuildInputs ++ otherBuildInputs;
haskellBuildInputs = stdenv.lib.filter isHaskellPkg allBuildInputs;

File diff suppressed because it is too large Load diff

View file

@ -0,0 +1,17 @@
{ stdenv, fetchurl }:
stdenv.mkDerivation rec {
name = "cpptest-1.1.2";
src = fetchurl {
url = "http://downloads.sourceforge.net/project/cpptest/cpptest/${name}/${name}.tar.gz";
sha256 = "09v070a9dv6zq6hgj4v67i31zsis3s96psrnhlq9g4vhdcaxykwy";
};
meta = with stdenv.lib; {
homepage = http://cpptest.sourceforge.net/;
description = "Simple C++ unit testing framework";
maintainers = with maintainers; [ bosu ];
license = stdenv.lib.licenses.lgpl3;
};
}

View file

@ -0,0 +1,228 @@
# Maintainer's Notes:
#
# Minor updates:
# 1. Edit ./manifest.sh to point to the updated URL. Upstream sometimes
# releases updates that include only the changed packages; in this case,
# multiple URLs can be provided and the results will be merged.
# 2. Run ./manifest.sh and ./dependencies.sh.
# 3. Build and enjoy.
#
# Major updates:
# We prefer not to immediately overwrite older versions with major updates, so
# make a copy of this directory first. After copying, be sure to delete ./tmp
# if it exists. Then follow the minor update instructions.
{ pkgs, newScope, qt5 ? null, debug ? false }:
let inherit (pkgs) autonix stdenv symlinkJoin; in
with autonix; let inherit (stdenv) lib; in
let
qt5_ = if qt5 != null then qt5 else pkgs.qt54;
in
let
qt5 = qt5_;
super =
let json = builtins.fromJSON (builtins.readFile ./packages.json);
mirrorUrl = n: pkg: pkg // {
src = pkg.src // { url = "mirror://kde/${pkg.src.url}"; };
};
renames = builtins.fromJSON (builtins.readFile ./renames.json);
propagated = [ "extra-cmake-modules" ];
native = [
"bison"
"extra-cmake-modules"
"flex"
"kdoctools"
"ki18n"
"libxslt"
"perl"
"pythoninterp"
];
user = [
"qt5"
"qt5core"
"qt5dbus"
"qt5gui"
"qt5qml"
"qt5quick"
"qt5svg"
"qt5webkitwidgets"
"qt5widgets"
"qt5x11extras"
"shareddesktopontologies"
"sharedmimeinfo"
];
in lib.fold (f: attrs: f attrs) json [
(lib.mapAttrs kdePackage)
(userEnvDeps user)
(nativeDeps native)
(propagateDeps propagated)
(renameDeps renames)
(lib.mapAttrs mirrorUrl)
];
kdePackage = name: pkg:
let defaultOverride = drv: drv // {
setupHook = ./setup-hook.sh;
cmakeFlags =
(drv.cmakeFlags or [])
++ [ "-DBUILD_TESTING=OFF" ]
++ lib.optional debug "-DCMAKE_BUILD_TYPE=Debug";
meta = {
license = with stdenv.lib.licenses; [
lgpl21Plus lgpl3Plus bsd2 mit gpl2Plus gpl3Plus fdl12
];
platforms = stdenv.lib.platforms.linux;
maintainers = with stdenv.lib.maintainers; [ ttuegel ];
homepage = "http://www.kde.org";
};
};
callPackage = newScope {
inherit (stdenv) mkDerivation;
inherit (pkgs) fetchurl;
inherit scope;
};
in mkPackage callPackage defaultOverride name pkg;
scope =
# packages in this collection
self //
# packages pinned to this version of Qt 5
{
dbusmenu-qt5 = pkgs.libdbusmenu_qt5.override { inherit qt5; };
phonon4qt5 = pkgs.phonon_qt5.override { inherit qt5; };
polkit_qt5 = pkgs.polkit_qt5.override { inherit qt5; };
qt5 = qt5.base;
qt5core = qt5.base;
qt5dbus = qt5.base;
qt5gui = qt5.base;
qt5linguisttools = qt5.tools;
qt5qml = [qt5.declarative qt5.graphicaleffects];
qt5quick = [qt5.quickcontrols qt5.graphicaleffects];
qt5script = qt5.script;
qt5svg = qt5.svg;
qt5webkitwidgets = qt5.webkit;
qt5widgets = qt5.base;
qt5x11extras = qt5.x11extras;
qt5xmlpatterns = qt5.xmlpatterns;
} //
# packages from the nixpkgs collection
(with pkgs;
{
inherit acl cmake docbook_xml_dtd_45 docbook5_xsl epoxy fam gpgme
libgcrypt libgit2 modemmanager networkmanager perl
perlPackages qimageblitz xlibs zlib;
boost = boost156;
gif = giflib;
glib2 = glib;
jpeg = libjpeg;
libintl = gettext;
liblzma = lzma;
pythoninterp = python;
pythonlibrary = python;
sharedmimeinfo = shared_mime_info;
}
);
self = super // {
bluez-qt = overrideDerivation super.bluez-qt (drv: {
preConfigure = ''
substituteInPlace CMakeLists.txt \
--replace /lib/udev/rules.d "$out/lib/udev/rules.d"
'';
});
extra-cmake-modules = overrideDerivation super.extra-cmake-modules (drv: {
buildInputs = [];
nativeBuildInputs = [];
propagatedBuildInputs = [];
propagatedNativeBuildInputs = [ scope.cmake pkgs.pkgconfig qt5.tools ];
propagatedUserEnvPkgs = [];
cmakeFlags = ["-DBUILD_TESTING=OFF"];
patches = [./extra-cmake-modules/0001-extra-cmake-modules-paths.patch];
meta = {
license = stdenv.lib.licenses.bsd2;
platforms = stdenv.lib.platforms.linux;
maintainers = with stdenv.lib.maintainers; [ ttuegel ];
homepage = "http://www.kde.org";
};
});
frameworkintegration = extendDerivation super.frameworkintegration {
buildInputs = [ scope.xlibs.libXcursor ];
};
kauth = extendDerivation super.kauth {
buildInputs = [ scope.polkit_qt5 ];
patches = [ ./kauth/kauth-policy-install.patch ];
};
kcmutils = extendDerivation super.kcmutils {
patches = [ ./kcmutils/kcmutils-pluginselector-follow-symlinks.patch ];
};
kconfigwidgets = extendDerivation super.kconfigwidgets {
patches = [ ./kconfigwidgets/kconfigwidgets-helpclient-follow-symlinks.patch ];
};
kdelibs4support = extendDerivation super.kdelibs4support {
buildInputs = [ scope.networkmanager scope.xlibs.libSM ];
cmakeFlags = [
"-DDocBookXML4_DTD_DIR=${pkgs.docbook_xml_dtd_45}/xml/dtd/docbook"
"-DDocBookXML4_DTD_VERSION=4.5"
];
};
kdoctools = extendDerivation super.kdoctools {
propagatedNativeBuildInputs = [ scope.perl scope.perlPackages.URI ];
cmakeFlags = [
"-DDocBookXML4_DTD_DIR=${scope.docbook_xml_dtd_45}/xml/dtd/docbook"
"-DDocBookXML4_DTD_VERSION=4.5"
"-DDocBookXSL_DIR=${scope.docbook5_xsl}/xml/xsl/docbook"
];
patches = [ ./kdoctools/kdoctools-no-find-docbook-xml.patch ];
};
ki18n = extendDerivation super.ki18n {
propagatedNativeBuildInputs = with scope; [ libintl pythoninterp ];
};
kimageformats = extendDerivation super.kimageformats {
NIX_CFLAGS_COMPILE = "-I${pkgs.ilmbase}/include/OpenEXR";
};
kinit = extendDerivation super.kinit {
patches = [./kinit/0001-kinit-libpath.patch];
};
kpackage = extendDerivation super.kpackage {
patches = [ ./kpackage/0001-allow-external-paths.patch ];
};
kservice = extendDerivation super.kservice {
buildInputs = [ scope.kwindowsystem ];
patches = [
./kservice/kservice-kbuildsycoca-follow-symlinks.patch
./kservice/kservice-kbuildsycoca-no-canonicalize-path.patch
];
};
ktexteditor = extendDerivation super.ktexteditor {
patches = [ ./ktexteditor/0001-no-qcoreapplication.patch ];
};
kwallet = extendDerivation super.kwallet {
buildInputs = [ scope.kdoctools ];
};
networkmanager-qt = extendDerivation super.networkmanager-qt {
propagatedBuildInputs = [ scope.networkmanager ];
};
};
in self

View file

@ -0,0 +1,22 @@
#!/bin/sh
# This script rebuilds dependencies.nix.
# You must run manifest.sh first to download the packages.
# Without arguments, this will use the version of autonix-deps-kf5 in nixpkgs.
# If you are working on the packages, this is probably what you want.
# You can also pass the path to a source tree where you have built
# autonix-deps-kf5 yourself. If you are working on autonix-deps-kf5, this is
# probably what you want.
manifestXML=$(nix-build -E 'with (import ../../../.. {}); autonix.writeManifestXML ./manifest.nix')
autonixDepsKf5=""
if [[ -z $1 ]]; then
autonixDepsKF5=$(nix-build ../../../.. -A haskellngPackages.autonix-deps-kf5)/bin
else
autonixDepsKF5="$1/dist/build/kf5-deps"
fi
exec ${autonixDepsKF5}/kf5-deps "${manifestXML}"

View file

@ -0,0 +1,74 @@
From 3cc148e878b69fc3e0228f3e3bf1bbe689dad87c Mon Sep 17 00:00:00 2001
From: Thomas Tuegel <ttuegel@gmail.com>
Date: Fri, 20 Feb 2015 23:17:39 -0600
Subject: [PATCH] extra-cmake-modules paths
---
kde-modules/KDEInstallDirs.cmake | 37 ++++---------------------------------
1 file changed, 4 insertions(+), 33 deletions(-)
diff --git a/kde-modules/KDEInstallDirs.cmake b/kde-modules/KDEInstallDirs.cmake
index b7cd34d..2f868ac 100644
--- a/kde-modules/KDEInstallDirs.cmake
+++ b/kde-modules/KDEInstallDirs.cmake
@@ -193,37 +193,8 @@
# (To distribute this file outside of extra-cmake-modules, substitute the full
# License text for the above reference.)
-# Figure out what the default install directory for libraries should be.
-# This is based on the logic in GNUInstallDirs, but simplified (the
-# GNUInstallDirs code deals with re-configuring, but that is dealt with
-# by the _define_* macros in this module).
+# The default library directory on NixOS is *always* /lib.
set(_LIBDIR_DEFAULT "lib")
-# Override this default 'lib' with 'lib64' iff:
-# - we are on a Linux, kFreeBSD or Hurd system but NOT cross-compiling
-# - we are NOT on debian
-# - we are on a 64 bits system
-# reason is: amd64 ABI: http://www.x86-64.org/documentation/abi.pdf
-# For Debian with multiarch, use 'lib/${CMAKE_LIBRARY_ARCHITECTURE}' if
-# CMAKE_LIBRARY_ARCHITECTURE is set (which contains e.g. "i386-linux-gnu"
-# See http://wiki.debian.org/Multiarch
-if((CMAKE_SYSTEM_NAME MATCHES "Linux|kFreeBSD" OR CMAKE_SYSTEM_NAME STREQUAL "GNU")
- AND NOT CMAKE_CROSSCOMPILING)
- if (EXISTS "/etc/debian_version") # is this a debian system ?
- if(CMAKE_LIBRARY_ARCHITECTURE)
- set(_LIBDIR_DEFAULT "lib/${CMAKE_LIBRARY_ARCHITECTURE}")
- endif()
- else() # not debian, rely on CMAKE_SIZEOF_VOID_P:
- if(NOT DEFINED CMAKE_SIZEOF_VOID_P)
- message(AUTHOR_WARNING
- "Unable to determine default LIB_INSTALL_LIBDIR directory because no target architecture is known. "
- "Please enable at least one language before including KDEInstallDirs.")
- else()
- if("${CMAKE_SIZEOF_VOID_P}" EQUAL "8")
- set(_LIBDIR_DEFAULT "lib64")
- endif()
- endif()
- endif()
-endif()
set(_gnu_install_dirs_vars
BINDIR
@@ -445,15 +416,15 @@ if(KDE_INSTALL_USE_QT_SYS_PATHS)
"QtQuick2 imports"
QML_INSTALL_DIR)
else()
- _define_relative(QTPLUGINDIR LIBDIR "plugins"
+ _define_relative(QTPLUGINDIR LIBDIR "qt5/plugins"
"Qt plugins"
QT_PLUGIN_INSTALL_DIR)
- _define_relative(QTQUICKIMPORTSDIR QTPLUGINDIR "imports"
+ _define_relative(QTQUICKIMPORTSDIR QTPLUGINDIR "qt5/imports"
"QtQuick1 imports"
IMPORTS_INSTALL_DIR)
- _define_relative(QMLDIR LIBDIR "qml"
+ _define_relative(QMLDIR LIBDIR "qt5/qml"
"QtQuick2 imports"
QML_INSTALL_DIR)
endif()
--
2.3.0

View file

@ -0,0 +1,13 @@
diff --git a/KF5AuthConfig.cmake.in b/KF5AuthConfig.cmake.in
index e859ec7..9a8ab18 100644
--- a/KF5AuthConfig.cmake.in
+++ b/KF5AuthConfig.cmake.in
@@ -4,7 +4,7 @@ set(KAUTH_STUB_FILES_DIR "${PACKAGE_PREFIX_DIR}/@KF5_DATA_INSTALL_DIR@/kauth/")
set(KAUTH_BACKEND_NAME "@KAUTH_BACKEND_NAME@")
set(KAUTH_HELPER_BACKEND_NAME "@KAUTH_HELPER_BACKEND_NAME@")
-set(KAUTH_POLICY_FILES_INSTALL_DIR "@KAUTH_POLICY_FILES_INSTALL_DIR@")
+set(KAUTH_POLICY_FILES_INSTALL_DIR "\${CMAKE_INSTALL_PREFIX}/share/polkit-1/actions")
set(KAUTH_HELPER_INSTALL_DIR "@KAUTH_HELPER_INSTALL_DIR@")
find_dependency(KF5CoreAddons "@KF5_DEP_VERSION@")

View file

@ -0,0 +1,13 @@
diff --git a/src/kpluginselector.cpp b/src/kpluginselector.cpp
index c63241b..2243f94 100644
--- a/src/kpluginselector.cpp
+++ b/src/kpluginselector.cpp
@@ -304,7 +304,7 @@ void KPluginSelector::addPlugins(const QString &componentName,
QStringList desktopFileNames;
const QStringList dirs = QStandardPaths::locateAll(QStandardPaths::GenericDataLocation, componentName + QStringLiteral("/kpartplugins"), QStandardPaths::LocateDirectory);
Q_FOREACH (const QString &dir, dirs) {
- QDirIterator it(dir, QStringList() << QStringLiteral("*.desktop"), QDir::NoFilter, QDirIterator::Subdirectories);
+ QDirIterator it(dir, QStringList() << QStringLiteral("*.desktop"), QDir::NoFilter, QDirIterator::Subdirectories | QDirIterator::FollowSymlinks);
while (it.hasNext()) {
desktopFileNames.append(it.next());
}

View file

@ -0,0 +1,13 @@
diff --git a/src/khelpclient.cpp b/src/khelpclient.cpp
index 53a331e..80fbb01 100644
--- a/src/khelpclient.cpp
+++ b/src/khelpclient.cpp
@@ -48,7 +48,7 @@ void KHelpClient::invokeHelp(const QString &anchor, const QString &_appname)
QString docPath;
const QStringList desktopDirs = QStandardPaths::standardLocations(QStandardPaths::ApplicationsLocation);
Q_FOREACH (const QString &dir, desktopDirs) {
- QDirIterator it(dir, QStringList() << appname + QLatin1String(".desktop"), QDir::NoFilter, QDirIterator::Subdirectories);
+ QDirIterator it(dir, QStringList() << appname + QLatin1String(".desktop"), QDir::NoFilter, QDirIterator::Subdirectories | QDirIterator::FollowSymlinks);
while (it.hasNext()) {
const QString desktopPath(it.next());
KDesktopFile desktopFile(desktopPath);

View file

@ -0,0 +1,12 @@
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 5c4863c..f731775 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -46,7 +46,6 @@ set_package_properties(LibXml2 PROPERTIES
)
-find_package(DocBookXML4 "4.5")
set_package_properties(DocBookXML4 PROPERTIES
TYPE REQUIRED

View file

@ -0,0 +1,42 @@
From 723c9b1268a04127647a1c20eebe9804150566dd Mon Sep 17 00:00:00 2001
From: Thomas Tuegel <ttuegel@gmail.com>
Date: Sat, 13 Jun 2015 08:57:55 -0500
Subject: [PATCH] kinit libpath
---
src/kdeinit/kinit.cpp | 18 ++++++++++--------
1 file changed, 10 insertions(+), 8 deletions(-)
diff --git a/src/kdeinit/kinit.cpp b/src/kdeinit/kinit.cpp
index 9e775b6..0ac5646 100644
--- a/src/kdeinit/kinit.cpp
+++ b/src/kdeinit/kinit.cpp
@@ -660,15 +660,17 @@ static pid_t launch(int argc, const char *_name, const char *args,
if (!libpath.isEmpty()) {
if (!l.load()) {
if (libpath_relative) {
- // NB: Because Qt makes the actual dlopen() call, the
- // RUNPATH of kdeinit is *not* respected - see
- // https://sourceware.org/bugzilla/show_bug.cgi?id=13945
- // - so we try hacking it in ourselves
- QString install_lib_dir = QFile::decodeName(
- CMAKE_INSTALL_PREFIX "/" LIB_INSTALL_DIR "/");
- libpath = install_lib_dir + libpath;
- l.setFileName(libpath);
+ // Use QT_PLUGIN_PATH to find shared library directories
+ // For KF5, the plugin path is /lib/qt5/plugins/, so kdeinit5
+ // shared libraries should be in /lib/qt5/plugins/../../
+ const QRegExp pathSepRegExp(QString::fromLatin1("[:\b]"));
+ const QString up = QString::fromLocal8Bit("/../../");
+ const QStringList paths = QString::fromLocal8Bit(qgetenv("QT_PLUGIN_PATH")).split(pathSepRegExp, QString::KeepEmptyParts);
+ Q_FOREACH (const QString &path, paths) {
+ l.setFileName(path + up + libpath);
l.load();
+ if (l.isLoaded()) break;
+ }
}
}
if (!l.isLoaded()) {
--
2.4.2

View file

@ -0,0 +1,25 @@
From fbf10d2059fa1f19a0f0cfa2fda0abb6c435fa78 Mon Sep 17 00:00:00 2001
From: Thomas Tuegel <ttuegel@gmail.com>
Date: Wed, 28 Jan 2015 07:15:30 -0600
Subject: [PATCH] allow external paths
---
src/kpackage/package.cpp | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/kpackage/package.cpp b/src/kpackage/package.cpp
index eb4a09b..f70f1a1 100644
--- a/src/kpackage/package.cpp
+++ b/src/kpackage/package.cpp
@@ -758,7 +758,7 @@ PackagePrivate::PackagePrivate()
: QSharedData(),
fallbackPackage(0),
metadata(0),
- externalPaths(false),
+ externalPaths(true),
valid(false),
checkedValid(false)
{
--
2.1.4

View file

@ -0,0 +1,13 @@
diff --git a/src/kbuildsycoca/kbuildsycoca.cpp b/src/kbuildsycoca/kbuildsycoca.cpp
index 69b1427..9c37a49 100644
--- a/src/kbuildsycoca/kbuildsycoca.cpp
+++ b/src/kbuildsycoca/kbuildsycoca.cpp
@@ -227,7 +227,7 @@ bool KBuildSycoca::build()
QStringList relFiles;
const QStringList dirs = QStandardPaths::locateAll(QStandardPaths::GenericDataLocation, g_resourceSubdir, QStandardPaths::LocateDirectory);
Q_FOREACH (const QString &dir, dirs) {
- QDirIterator it(dir, QDirIterator::Subdirectories);
+ QDirIterator it(dir, QDirIterator::Subdirectories | QDirIterator::FollowSymlinks);
while (it.hasNext()) {
const QString filePath = it.next();
Q_ASSERT(filePath.startsWith(dir)); // due to the line below...

View file

@ -0,0 +1,13 @@
diff --git a/src/kbuildsycoca/vfolder_menu.cpp b/src/kbuildsycoca/vfolder_menu.cpp
index 2eb1275..e39a36f 100644
--- a/src/kbuildsycoca/vfolder_menu.cpp
+++ b/src/kbuildsycoca/vfolder_menu.cpp
@@ -412,7 +412,7 @@ VFolderMenu::absoluteDir(const QString &_dir, const QString &baseDir, bool keepR
}
if (!relative) {
- QString resolved = QDir(dir).canonicalPath();
+ QString resolved = QDir::cleanPath(dir);
if (!resolved.isEmpty()) {
dir = resolved;
}

View file

@ -0,0 +1,48 @@
From 71e28c7c6fdd1142f04c662f45cc8f779e457cda Mon Sep 17 00:00:00 2001
From: Thomas Tuegel <ttuegel@gmail.com>
Date: Sun, 15 Feb 2015 19:09:17 -0600
Subject: [PATCH] no qcoreapplication
---
src/syntax/data/katehighlightingindexer.cpp | 11 ++++-------
1 file changed, 4 insertions(+), 7 deletions(-)
diff --git a/src/syntax/data/katehighlightingindexer.cpp b/src/syntax/data/katehighlightingindexer.cpp
index 3f02e8c..d1a865b 100644
--- a/src/syntax/data/katehighlightingindexer.cpp
+++ b/src/syntax/data/katehighlightingindexer.cpp
@@ -49,19 +49,16 @@ QStringList readListing(const QString &fileName)
int main(int argc, char *argv[])
{
- // get app instance
- QCoreApplication app(argc, argv);
-
// ensure enough arguments are passed
- if (app.arguments().size() < 3)
+ if (argc < 3)
return 1;
// open schema
QXmlSchema schema;
- if (!schema.load(QUrl::fromLocalFile(app.arguments().at(2))))
+ if (!schema.load(QUrl::fromLocalFile(QString::fromLocal8Bit(argv[2]))))
return 2;
- const QString hlFilenamesListing = app.arguments().value(3);
+ const QString hlFilenamesListing = QString::fromLocal8Bit(argv[3]);
if (hlFilenamesListing.isEmpty()) {
return 1;
}
@@ -127,7 +124,7 @@ int main(int argc, char *argv[])
return anyError;
// create outfile, after all has worked!
- QFile outFile(app.arguments().at(1));
+ QFile outFile(QString::fromLocal8Bit(argv[1]));
if (!outFile.open(QIODevice::WriteOnly | QIODevice::Truncate))
return 7;
--
2.1.4

File diff suppressed because it is too large Load diff

View file

@ -0,0 +1,22 @@
#!/bin/sh
set -x
origin="$(pwd)"
# if setting KDE_MIRROR, be sure to set --cut-dirs=N in MANIFEST_EXTRA_ARGS
KDE_MIRROR="${KDE_MIRROR:-http://download.kde.org}"
alias nix-build="nix-build --no-out-link \"$origin/../../../..\""
# The extra slash at the end of the URL is necessary to stop wget
# from recursing over the whole server! (No, it's not a bug.)
$(nix-build -A autonix.manifest) \
"${KDE_MIRROR}/stable/frameworks/5.12/" \
"$@" -A '*.tar.xz'
AUTONIX_DEPS_KF5=${AUTONIX_DEPS_KF5:-"$(nix-build -A haskellngPackages.autonix-deps-kf5)/bin/kf5-deps"}
$AUTONIX_DEPS_KF5 manifest.json
rm manifest.json

View file

@ -0,0 +1,13 @@
diff --git a/src/plasma/package.cpp b/src/plasma/package.cpp
index 07b3c90..84417e3 100644
--- a/src/plasma/package.cpp
+++ b/src/plasma/package.cpp
@@ -791,7 +791,7 @@ PackagePrivate::PackagePrivate()
servicePrefix("plasma-applet-"),
fallbackPackage(0),
metadata(0),
- externalPaths(false),
+ externalPaths(true),
valid(false),
checkedValid(false)
{

View file

@ -0,0 +1,71 @@
{
"kf5widgetsaddons": "kwidgetsaddons",
"kf5texteditor": "ktexteditor",
"kf5designerplugin": "kdesignerplugin",
"kf5bookmarks": "kbookmarks",
"kf5frameworkintegration": "frameworkintegration",
"kf5package": "kpackage",
"kf5archive": "karchive",
"kf5plasma": "plasma-framework",
"kf5kcmutils": "kcmutils",
"kf5configwidgets": "kconfigwidgets",
"ctest": "attica",
"kf5kio": "kio",
"kf5networkmanagerqt": "networkmanager-qt",
"kf5coreaddons": "kcoreaddons",
"kf5guiaddons": "kguiaddons",
"kf5jobwidgets": "kjobwidgets",
"kf5modemmanagerqt": "modemmanager-qt",
"kf5runner": "krunner",
"kf5globalaccel": "kglobalaccel",
"kf5dbusaddons": "kdbusaddons",
"kf5crash": "kcrash",
"kf5itemviews": "kitemviews",
"kf5doctools": "kdoctools",
"kf5i18n": "ki18n",
"kf5webkit": "kdewebkit",
"kf5newstuff": "knewstuff",
"kded": "kded",
"kf5notifications": "knotifications",
"kf5activitiesexperimentalstats": "kactivities",
"kf5dnssd": "kdnssd",
"kf5notifyconfig": "knotifyconfig",
"kf5iconthemes": "kiconthemes",
"kf5js": "kjs",
"kf5kde4support": "kdelibs4support",
"kf5parts": "kparts",
"backend": "plasma-framework",
"kf5completion": "kcompletion",
"kf5threadweaver": "threadweaver",
"kf5mediaplayer": "kmediaplayer",
"kf5plasmaquick": "plasma-framework",
"kf5wallet": "kwallet",
"kf5xmlgui": "kxmlgui",
"kf5attica": "attica",
"kf5declarative": "kdeclarative",
"kf5config": "kconfig",
"kf5init": "kinit",
"kf5textwidgets": "ktextwidgets",
"kf5jsembed": "kjsembed",
"kf5codecs": "kcodecs",
"kf5service": "kservice",
"kf5sonnet": "sonnet",
"kf5kdelibs4support": "kdelibs4support",
"kf5pty": "kpty",
"kf5solid": "solid",
"kf5auth": "kauth",
"ecm": "extra-cmake-modules",
"kf5activities": "kactivities",
"kf5plotting": "kplotting",
"kf5people": "kpeople",
"kf5emoticons": "kemoticons",
"kf5kross": "kross",
"kf5su": "kdesu",
"kf5khtml": "khtml",
"kf5unitconversion": "kunitconversion",
"kf5idletime": "kidletime",
"kf5bluezqt": "bluez-qt",
"kf5windowsystem": "kwindowsystem",
"kf5xmlrpcclient": "kxmlrpcclient",
"kf5itemmodels": "kitemmodels"
}

View file

@ -0,0 +1 @@
addToSearchPath XDG_DATA_DIRS @out@/share

View file

@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
buildInputs =
[ pkgconfig libcap ] ++
lib.optional stdenv.isLinux (if usePulseAudio then [ libpulseaudio ] else [ alsaLib ]);
lib.optional stdenv.isLinux (if usePulseAudio then libpulseaudio else alsaLib);
meta = {
longDescription = ''

View file

@ -0,0 +1,19 @@
{ stdenv, fetchurl, cpptest, pkgconfig, doxygen, graphviz }:
stdenv.mkDerivation rec {
name = "uriparser-0.8.2";
src = fetchurl {
url = "http://downloads.sourceforge.net/project/uriparser/Sources/0.8.2/${name}.tar.bz2";
sha256 = "13sh7slys3y5gfscc40g2r3hkjjywjvxlcqr77ifjrazc6q6cvkd";
};
buildInputs = [ cpptest pkgconfig doxygen graphviz ];
meta = with stdenv.lib; {
homepage = http://uriparser.sourceforge.net/;
description = "Strictly RFC 3986 compliant URI parsing library";
maintainers = with maintainers; [ bosu ];
license = stdenv.lib.licenses.bsd3;
};
}

View file

@ -6,7 +6,7 @@ stdenv.mkDerivation rec {
src = fetchurl {
url = "https://github.com/boot-clj/boot/releases/download/${version}/boot.sh";
sha256 = "12c24aqvwq8kj6iiac18rp0n8vlzacl7dd95m983yz24w885chc0";
sha256 = "0hvznr0z5ck32wpaqhjv2fr9365b8h0h8brnsmwijpv699l0rf1c";
};
inherit jdk;

View file

@ -2,11 +2,11 @@
stdenv.mkDerivation rec {
name = "unifi-controller-${version}";
version = "4.6.3";
version = "4.6.6";
src = fetchurl {
url = "http://dl.ubnt.com/unifi/${version}/UniFi.unix.zip";
sha256 = "046qx7ghz5b1s4kg6aqvdiq7ck589c8x2cc3x03crcdjjj33rirq";
sha256 = "0c9j5h4dyivfdic1y2q3nvhzajzagskzxyj7009icmy3fzgkv3y5";
};
buildInputs = [ unzip ];

View file

@ -2,7 +2,7 @@
, libnetfilter_conntrack, libnl, libpcap, libsodium, liburcu, ncurses, perl
, pkgconfig, zlib }:
let version = "0.5.9-27-g3beaa23"; in
let version = "0.5.9-34-g95c4582"; in
stdenv.mkDerivation {
name = "netsniff-ng-${version}";
@ -10,8 +10,8 @@ stdenv.mkDerivation {
src = fetchFromGitHub rec {
repo = "netsniff-ng";
owner = repo;
rev = "3beaa23d4d33b51a392b56f110c8773151ac19cc";
sha256 = "0k6p57zynrs0ffnvrhbcnfkmvrj6ay2bxpj44ggm7bv327ckdzm7";
rev = "95c4582b742fd4fa58e5f14971164b941b0f730d";
sha256 = "0anai392n8zx8vcjbjg776lbiwrv95x2dbd8rypbqfzmj8nhzric";
};
buildInputs = [ bison flex geoip geolite-legacy libcli libnet libnl

View file

@ -1,11 +1,11 @@
{ stdenv, fetchurl, openssl }:
stdenv.mkDerivation rec {
name = "socat-2.0.0-b7";
name = "socat-2.0.0-b8";
src = fetchurl {
url = "http://www.dest-unreach.org/socat/download/${name}.tar.bz2";
sha256 = "0h6k9ccrnziw03j0if7myrd28vcc97nwz1bifmbrkp5jkpk69ygk";
sha256 = "1slkv1hhcp9a6c88h6yl5cs0z9g60fp2ja6865s6kywqp6fmf168";
};
buildInputs = [ openssl ];

View file

@ -1,19 +1,19 @@
{ stdenv, fetchurl, libevent, openssl, zlib, torsocks }:
{ stdenv, fetchurl, libevent, openssl, zlib, torsocks, libseccomp }:
stdenv.mkDerivation rec {
name = "tor-0.2.6.9";
name = "tor-0.2.6.10";
src = fetchurl {
url = "https://archive.torproject.org/tor-package-archive/${name}.tar.gz";
sha256 = "171gjhapymfzql3bbx5qndgkamcfdl6lincrqlr7i3d9i6njjv2a";
sha256 = "0542c0efe43b86619337862fa7eb02c7a74cb23a79d587090628a5f0f1224b8d";
};
# Note: torsocks is specified as a dependency, as the distributed
# 'torify' wrapper attempts to use it; although there is no
# ./configure time check for any of this.
buildInputs = [ libevent openssl zlib torsocks ];
buildInputs = [ libevent openssl zlib torsocks libseccomp ];
CFLAGS = stdenv.lib.optionalString stdenv.cc.isGNU "-lgcc_s";
NIX_CFLAGS_LINK = stdenv.lib.optionalString stdenv.cc.isGNU "-lgcc_s";
# Patch 'torify' to point directly to torsocks.
patchPhase = ''

View file

@ -1,7 +1,7 @@
args : with args;
rec {
src = assert !config.inHydra or false; fetchurl {
src = assert config.allowTexliveBuilds or false; fetchurl {
url = mirror://debian/pool/main/t/texlive-bin/texlive-bin_2014.20140926.35254.orig.tar.xz;
sha256 = "1c39x059jhn5jsy6i9j3akjbkm1kmmzssy1jyi1aw20rl2vp86w3";
};

View file

@ -3194,6 +3194,8 @@ let
upx = callPackage ../tools/compression/upx { };
uriparser = callPackage ../development/libraries/uriparser {};
urlview = callPackage ../applications/misc/urlview {};
usbmuxd = callPackage ../tools/misc/usbmuxd {};
@ -5366,6 +5368,8 @@ let
framac = callPackage ../development/tools/analysis/frama-c { };
cpptest = callPackage ../development/libraries/cpptest { };
cppi = callPackage ../development/tools/misc/cppi { };
cproto = callPackage ../development/tools/misc/cproto { };
@ -6603,7 +6607,8 @@ let
};
kf510 = recurseIntoAttrs (callPackage ../development/libraries/kde-frameworks-5.10 { });
kf5_latest = kf510;
kf512 = recurseIntoAttrs (callPackage ../development/libraries/kde-frameworks-5.12 { });
kf5_latest = kf512;
kf5_stable = kf510;
kinetic-cpp-client = callPackage ../development/libraries/kinetic-cpp-client { };
@ -15045,6 +15050,8 @@ let
znc = callPackage ../applications/networking/znc { };
znc_14 = callPackage ../applications/networking/znc/1.4.nix { };
zncModules = recurseIntoAttrs (
callPackage ../applications/networking/znc/modules.nix { }
);

View file

@ -1,4 +1,4 @@
{ supportedSystems, packageSet ? (import ./all-packages.nix) }:
{ supportedSystems, packageSet ? (import ./all-packages.nix), allowTexliveBuilds ? false }:
with import ../../lib;
@ -7,6 +7,7 @@ rec {
# Ensure that we don't build packages marked as unfree.
allPackages = args: packageSet (args // {
config.allowUnfree = false;
config.allowTexliveBuilds = allowTexliveBuilds;
config.inHydra = true;
});