+# Date 1479198095 28800
+# Node ID fde6e9ccfc72fbc0fcd93af7a40436b216e7ea1a
+# Parent 687eac6845a77d2cac5505da9c8912885c2a9e57
+Bug 1013882 - TestInterfaceJS should be packaged only if it's available. r=glandium, a=jcristau
+
+MozReview-Commit-ID: IEHesdoU4Sz
+
+diff --git a/b2g/installer/package-manifest.in b/b2g/installer/package-manifest.in
+--- a/b2g/installer/package-manifest.in
++++ b/b2g/installer/package-manifest.in
+@@ -570,17 +570,17 @@
+ @RESPATH@/components/InputMethod.manifest
+ #ifdef MOZ_B2G
+ @RESPATH@/components/inputmethod.xpt
+ #endif
+
+ @RESPATH@/components/SystemUpdate.manifest
+ @RESPATH@/components/SystemUpdateManager.js
+
+-#ifdef MOZ_DEBUG
++#if defined(ENABLE_TESTS) && defined(MOZ_DEBUG)
+ @RESPATH@/components/TestInterfaceJS.js
+ @RESPATH@/components/TestInterfaceJS.manifest
+ @RESPATH@/components/TestInterfaceJSMaplike.js
+ #endif
+
+ ; Modules
+ @RESPATH@/modules/*
+
+diff --git a/browser/installer/package-manifest.in b/browser/installer/package-manifest.in
+--- a/browser/installer/package-manifest.in
++++ b/browser/installer/package-manifest.in
+@@ -554,17 +554,17 @@
+ @RESPATH@/components/PresentationControlService.js
+ @RESPATH@/components/PresentationDataChannelSessionTransport.js
+ @RESPATH@/components/PresentationDataChannelSessionTransport.manifest
+
+ ; InputMethod API
+ @RESPATH@/components/MozKeyboard.js
+ @RESPATH@/components/InputMethod.manifest
+
+-#ifdef MOZ_DEBUG
++#if defined(ENABLE_TESTS) && defined(MOZ_DEBUG)
+ @RESPATH@/components/TestInterfaceJS.js
+ @RESPATH@/components/TestInterfaceJS.manifest
+ @RESPATH@/components/TestInterfaceJSMaplike.js
+ #endif
+
+ ; [Extensions]
+ @RESPATH@/components/extensions-toolkit.manifest
+ @RESPATH@/browser/components/extensions-browser.manifest
+diff --git a/mobile/android/installer/package-manifest.in b/mobile/android/installer/package-manifest.in
+--- a/mobile/android/installer/package-manifest.in
++++ b/mobile/android/installer/package-manifest.in
+@@ -381,17 +381,17 @@
+
+ @BINPATH@/components/CaptivePortalDetectComponents.manifest
+ @BINPATH@/components/captivedetect.js
+
+ #ifdef MOZ_WEBSPEECH
+ @BINPATH@/components/dom_webspeechsynth.xpt
+ #endif
+
+-#ifdef MOZ_DEBUG
++#if defined(ENABLE_TESTS) && defined(MOZ_DEBUG)
+ @BINPATH@/components/TestInterfaceJS.js
+ @BINPATH@/components/TestInterfaceJS.manifest
+ @BINPATH@/components/TestInterfaceJSMaplike.js
+ #endif
+
+ @BINPATH@/components/nsAsyncShutdown.manifest
+ @BINPATH@/components/nsAsyncShutdown.js
+
+
diff --git a/pkgs/applications/networking/browsers/firefox/wrapper.nix b/pkgs/applications/networking/browsers/firefox/wrapper.nix
index ad1091c9d39e..f2ca9eaa622b 100644
--- a/pkgs/applications/networking/browsers/firefox/wrapper.nix
+++ b/pkgs/applications/networking/browsers/firefox/wrapper.nix
@@ -17,7 +17,7 @@ browser:
, desktopName ? # browserName with first letter capitalized
(lib.toUpper (lib.substring 0 1 browserName) + lib.substring 1 (-1) browserName)
, nameSuffix ? ""
-, icon ? browserName, libtrick ? true
+, icon ? browserName
}:
let
@@ -52,16 +52,15 @@ let
gst-plugins = with gst_all; [ gst-plugins-base gst-plugins-good gst-plugins-bad gst-plugins-ugly gst-ffmpeg ];
gtk_modules = [ libcanberra_gtk2 ];
-in
-stdenv.mkDerivation {
+in stdenv.mkDerivation {
inherit name;
desktopItem = makeDesktopItem {
name = browserName;
- exec = browserName + " %U";
+ exec = "${browserName}${nameSuffix} %U";
inherit icon;
comment = "";
- desktopName = desktopName;
+ desktopName = "${desktopName}${nameSuffix}";
genericName = "Web Browser";
categories = "Application;Network;WebBrowser;";
mimeType = stdenv.lib.concatStringsSep ";" [
@@ -84,39 +83,27 @@ stdenv.mkDerivation {
exit 1
fi
- makeWrapper "${browser}/bin/${browserName}" \
+ makeWrapper "$(readlink -v --canonicalize-existing "${browser}/bin/${browserName}")" \
"$out/bin/${browserName}${nameSuffix}" \
--suffix-each MOZ_PLUGIN_PATH ':' "$plugins" \
--suffix LD_LIBRARY_PATH ':' "$libs" \
--suffix-each GTK_PATH ':' "$gtk_modules" \
--suffix-each LD_PRELOAD ':' "$(cat $(filterExisting $(addSuffix /extra-ld-preload $plugins)))" \
--prefix-contents PATH ':' "$(filterExisting $(addSuffix /extra-bin-path $plugins))" \
- --set MOZ_OBJDIR "$(ls -d "${browser}/lib/${browserName}"*)" \
+ --suffix PATH ':' "$out/bin" \
+ --set MOZ_APP_LAUNCHER "${browserName}${nameSuffix}" \
${lib.optionalString (!ffmpegSupport) ''--prefix GST_PLUGIN_SYSTEM_PATH : "$GST_PLUGIN_SYSTEM_PATH"''}
- ${ lib.optionalString libtrick
- ''
- libdirname="$(echo "${browser}/lib/${browserName}"*)"
- libdirbasename="$(basename "$libdirname")"
- mkdir -p "$out/lib/$libdirbasename"
- ln -s "$libdirname"/* "$out/lib/$libdirbasename"
- script_location="$(mktemp "$out/lib/$libdirbasename/${browserName}${nameSuffix}.XXXXXX")"
- mv "$out/bin/${browserName}${nameSuffix}" "$script_location"
- ln -s "$script_location" "$out/bin/${browserName}${nameSuffix}"
- ''
- }
-
if [ -e "${browser}/share/icons" ]; then
mkdir -p "$out/share"
ln -s "${browser}/share/icons" "$out/share/icons"
else
mkdir -p "$out/share/icons/hicolor/128x128/apps"
- ln -s "$out/lib/$libdirbasename/browser/icons/mozicon128.png" \
+ ln -s "${browser}/lib/${browserName}-"*"/browser/icons/mozicon128.png" \
"$out/share/icons/hicolor/128x128/apps/${browserName}.png"
fi
- mkdir -p $out/share/applications
- cp $desktopItem/share/applications/* $out/share/applications
+ install -D -t $out/share/applications $desktopItem/share/applications/*
# For manpages, in case the program supplies them
mkdir -p $out/nix-support
diff --git a/pkgs/applications/networking/browsers/kwebkitpart/CVE-2014-8600.diff b/pkgs/applications/networking/browsers/kwebkitpart/CVE-2014-8600.diff
deleted file mode 100644
index 0c65e68f2167..000000000000
--- a/pkgs/applications/networking/browsers/kwebkitpart/CVE-2014-8600.diff
+++ /dev/null
@@ -1,33 +0,0 @@
---- a/src/webpage.cpp
-+++ b/src/webpage.cpp
-@@ -226,23 +226,26 @@
- doc += QL1S( "" );
- doc += i18n( "Details of the Request:" );
- doc += QL1S( "
- " );
-- doc += i18n( "URL: %1", reqUrl.url() );
-+ // escape URL twice: once for i18n, and once for HTML.
-+ doc += i18n( "URL: %1", Qt::escape( Qt::escape( reqUrl.prettyUrl() ) ) );
- doc += QL1S( "
- " );
-
- const QString protocol (reqUrl.protocol());
- if ( !protocol.isNull() ) {
-- doc += i18n( "Protocol: %1", protocol );
-+ // escape protocol twice: once for i18n, and once for HTML.
-+ doc += i18n( "Protocol: %1", Qt::escape( Qt::escape( protocol ) ) );
- doc += QL1S( "
- " );
- }
-
- doc += i18n( "Date and Time: %1",
- KGlobal::locale()->formatDateTime(QDateTime::currentDateTime(), KLocale::LongDate) );
- doc += QL1S( "
- " );
-- doc += i18n( "Additional Information: %1" , text );
-+ // escape text twice: once for i18n, and once for HTML.
-+ doc += i18n( "Additional Information: %1", Qt::escape( Qt::escape( text ) ) );
- doc += QL1S( "
" );
- doc += i18n( "Description:" );
- doc += QL1S( "
" );
-- doc += description;
-+ doc += Qt::escape( description );
- doc += QL1S( "
" );
-
- if ( causes.count() ) {
diff --git a/pkgs/applications/networking/browsers/kwebkitpart/default.nix b/pkgs/applications/networking/browsers/kwebkitpart/default.nix
deleted file mode 100644
index 1cbffdd25446..000000000000
--- a/pkgs/applications/networking/browsers/kwebkitpart/default.nix
+++ /dev/null
@@ -1,25 +0,0 @@
-{ stdenv, fetchgit, automoc4, cmake, perl, pkgconfig, kdelibs }:
-
-stdenv.mkDerivation rec {
- name = "kwebkitpart-${version}";
- version = "1.3.3";
-
- src = fetchgit {
- url = git://anongit.kde.org/kwebkitpart;
- rev = "refs/tags/v${version}";
- sha256 = "13vfv88njml7x67a37ymmlv9qs30fkmvkq0278lp7llmvp5qnxcj";
- };
-
- patches = [ ./CVE-2014-8600.diff ];
-
- buildInputs = [ kdelibs ];
-
- nativeBuildInputs = [ automoc4 cmake perl pkgconfig ];
-
- meta = with stdenv.lib; {
- platforms = platforms.linux;
- maintainers = [ maintainers.phreedom ];
- description = "A WebKit KPart for Konqueror, Akregator and other KDE applications";
- homepage = https://projects.kde.org/projects/extragear/base/kwebkitpart;
- };
-}
diff --git a/pkgs/applications/networking/browsers/links2/default.nix b/pkgs/applications/networking/browsers/links2/default.nix
index 148e20f1bbcb..f504c3c2b333 100644
--- a/pkgs/applications/networking/browsers/links2/default.nix
+++ b/pkgs/applications/networking/browsers/links2/default.nix
@@ -8,18 +8,19 @@
}:
stdenv.mkDerivation rec {
- version = "2.13";
+ version = "2.14";
name = "links2-${version}";
src = fetchurl {
url = "${meta.homepage}/download/links-${version}.tar.bz2";
- sha256 = "c252095334a3b199fa791c6f9a9affe2839a7fbd536685ab07851cb7efaa4405";
+ sha256 = "1f24y83wa1vzzjq5kp857gjqdpnmf8pb29yw7fam0m8wxxw0c3gp";
};
- buildInputs =
- [ libev librsvg libpng libjpeg libtiff gpm openssl xz bzip2 zlib ]
- ++ stdenv.lib.optionals enableX11 [ libX11 libXau libXt ]
- ++ stdenv.lib.optional enableDirectFB [ directfb ];
+ buildInputs = with stdenv.lib;
+ [ libev librsvg libpng libjpeg libtiff openssl xz bzip2 zlib ]
+ ++ optionals stdenv.isLinux [ gpm ]
+ ++ optionals enableX11 [ libX11 libXau libXt ]
+ ++ optional enableDirectFB [ directfb ];
nativeBuildInputs = [ pkgconfig bzip2 ];
@@ -35,10 +36,10 @@ stdenv.mkDerivation rec {
'';
};
- meta = {
+ meta = with stdenv.lib; {
homepage = http://links.twibright.com/;
description = "A small browser with some graphics support";
- maintainers = with stdenv.lib.maintainers; [ raskin urkud viric ];
- platforms = stdenv.lib.platforms.linux;
+ maintainers = with maintainers; [ raskin viric ];
+ platforms = platforms.unix;
};
}
diff --git a/pkgs/applications/networking/browsers/luakit/default.nix b/pkgs/applications/networking/browsers/luakit/default.nix
deleted file mode 100644
index 163eb8cf5890..000000000000
--- a/pkgs/applications/networking/browsers/luakit/default.nix
+++ /dev/null
@@ -1,55 +0,0 @@
-{ stdenv , fetchurl , git , glib_networking , gsettings_desktop_schemas , gtk,
-help2man , libunique , lua5 , luafilesystem , luajit , luasqlite3, makeWrapper,
-pkgconfig , sqlite , webkit }:
-
-let
- lualibs = [ luafilesystem luasqlite3 ];
- getPath = lib : type : "${lib}/lib/lua/${lua5.luaversion}/?.${type};${lib}/share/lua/${lua5.luaversion}/?.${type}";
- getLuaPath = lib : getPath lib "lua";
- getLuaCPath = lib : getPath lib "so";
- luaPath = stdenv.lib.concatStringsSep ";" (map getLuaPath lualibs);
- luaCPath = stdenv.lib.concatStringsSep ";" (map getLuaCPath lualibs);
-in
-stdenv.mkDerivation {
-
- name = "luakit-2012.09.13";
-
- meta = with stdenv.lib; {
- description = "Fast, small, webkit based browser framework extensible in Lua";
- homepage = "http://luakit.org";
- license = licenses.gpl3;
- maintainers = with maintainers; [ matthiasbeyer ];
- platforms = platforms.linux; # I only tested linux
- };
-
- src = fetchurl {
- url = "https://github.com/mason-larobina/luakit/archive/2012.09.13-r1.tar.gz";
- sha256 = "067g3bp5w20jypc8rx54dpbn3ysbgxzchgpq7sld5yh2z36s1l52";
- };
-
- buildInputs = [ git gsettings_desktop_schemas gtk help2man libunique lua5
- luafilesystem luajit luasqlite3 makeWrapper pkgconfig sqlite webkit ];
-
- postPatch = ''
- sed -i -e "s/DESTDIR/INSTALLDIR/" ./Makefile
- sed -i -e "s|/etc/xdg/luakit/|$out/etc/xdg/luakit/|" lib/lousy/util.lua
- patchShebangs ./build-utils
- '';
-
- buildPhase = ''
- make DEVELOPMENT_PATHS=0 USE_LUAJIT=1 INSTALLDIR=$out DESTDIR=$out PREFIX=$out USE_GTK3=1
- '';
-
- installPhase = let
- luaKitPath = "$out/share/luakit/lib/?/init.lua;$out/share/luakit/lib/?.lua";
- in ''
- make DEVELOPMENT_PATHS=0 INSTALLDIR=$out DESTDIR=$out PREFIX=$out USE_GTK3=1 install
- wrapProgram $out/bin/luakit \
- --prefix GIO_EXTRA_MODULES : "${glib_networking.out}/lib/gio/modules" \
- --prefix XDG_DATA_DIRS : "${gsettings_desktop_schemas}/share:$out/usr/share/:$out/share/:$GSETTINGS_SCHEMAS_PATH" \
- --prefix XDG_CONFIG_DIRS : "$out/etc/xdg" \
- --set LUA_PATH '${luaKitPath};${luaPath};' \
- --set LUA_CPATH '${luaCPath};'
- '';
-
-}
diff --git a/pkgs/applications/networking/browsers/lynx/default.nix b/pkgs/applications/networking/browsers/lynx/default.nix
index 06c00bec7552..fb4b33ef71ab 100644
--- a/pkgs/applications/networking/browsers/lynx/default.nix
+++ b/pkgs/applications/networking/browsers/lynx/default.nix
@@ -6,26 +6,25 @@ assert sslSupport -> openssl != null;
stdenv.mkDerivation rec {
name = "lynx-${version}";
- version = "2.8.8rel.2";
-
+ version = "2.8.9dev.11";
+
src = fetchurl {
url = "http://invisible-mirror.net/archives/lynx/tarballs/lynx${version}.tar.bz2";
- sha256 = "1rxysl08acqll5b87368f04kckl8sggy1qhnq59gsxyny1ffg039";
+ sha256 = "1cqm1i7d209brkrpzaqqf2x951ra3l67dw8x9yg10vz7rpr9441a";
};
-
+
configureFlags = []
++ stdenv.lib.optionals sslSupport [ "--with-ssl=${openssl.dev}" ];
-
+
buildInputs = [ ncurses gzip ];
- nativeBuildInputs = [ ncurses ];
crossAttrs = {
configureFlags = configureFlags ++ [ "--enable-widec" ];
};
- meta = {
+ meta = with stdenv.lib; {
homepage = http://lynx.isc.org/;
description = "A text-mode web browser";
- platforms = stdenv.lib.platforms.unix;
+ platforms = platforms.unix;
};
}
diff --git a/pkgs/applications/networking/browsers/mozilla-plugins/flashplayer/default.nix b/pkgs/applications/networking/browsers/mozilla-plugins/flashplayer/default.nix
index 9e0b0852bf8a..72a1f171dec6 100644
--- a/pkgs/applications/networking/browsers/mozilla-plugins/flashplayer/default.nix
+++ b/pkgs/applications/networking/browsers/mozilla-plugins/flashplayer/default.nix
@@ -73,25 +73,25 @@ let
in
stdenv.mkDerivation rec {
name = "flashplayer-${version}";
- version = "24.0.0.221";
+ version = "25.0.0.127";
src = fetchurl {
url =
if debug then
- "https://fpdownload.macromedia.com/pub/flashplayer/updaters/24/flash_player_npapi_linux_debug.${arch}.tar.gz"
+ "https://fpdownload.macromedia.com/pub/flashplayer/updaters/25/flash_player_npapi_linux_debug.${arch}.tar.gz"
else
"https://fpdownload.adobe.com/get/flashplayer/pdc/${version}/flash_player_npapi_linux.${arch}.tar.gz";
sha256 =
if debug then
if arch == "x86_64" then
- "10f8m5zc8p4xbhihbl785lws1kpv6smnbhx4ydzf8ai3mlv3y241"
+ "0d37rwbqszl593pggph8pm8jwn05fppys7q8vk1jrk9jaz262iva"
else
- "1rz9rkbvln8wdkfmsnnq936xs6969qma141jc4qx408419q7v3hg"
+ "0lhngdx1q51kfpw3a961h9p9n1fnspk9pmg21i069hvd0h143arx"
else
if arch == "x86_64" then
- "1cb4mvslphj3bcchgr7lcswz8kk8si0s60rl5266mi53byplhw08"
+ "1yasj9xzmb6ly9209b1hmrqrzxrr1bafsfjszsr3yf994hql6nzn"
else
- "1vcyp9041171xkcnz05dlk3n7bnbcb9qbh4sy5wfgjkqsyd6i5bl";
+ "02vs12cm6fpl2fif1lij9y15m89wk6aizc8sbjiw6w59wixn3p9d";
};
nativeBuildInputs = [ unzip ];
diff --git a/pkgs/applications/networking/browsers/mozilla-plugins/flashplayer/standalone.nix b/pkgs/applications/networking/browsers/mozilla-plugins/flashplayer/standalone.nix
index 248fe63ab0c6..178b86b61c66 100644
--- a/pkgs/applications/networking/browsers/mozilla-plugins/flashplayer/standalone.nix
+++ b/pkgs/applications/networking/browsers/mozilla-plugins/flashplayer/standalone.nix
@@ -57,19 +57,19 @@ let
in
stdenv.mkDerivation rec {
name = "flashplayer-standalone-${version}";
- version = "24.0.0.221";
+ version = "25.0.0.127";
src = fetchurl {
url =
if debug then
- "https://fpdownload.macromedia.com/pub/flashplayer/updaters/24/flash_player_sa_linux_debug.x86_64.tar.gz"
+ "https://fpdownload.macromedia.com/pub/flashplayer/updaters/25/flash_player_sa_linux_debug.x86_64.tar.gz"
else
- "https://fpdownload.macromedia.com/pub/flashplayer/updaters/24/flash_player_sa_linux.x86_64.tar.gz";
+ "https://fpdownload.macromedia.com/pub/flashplayer/updaters/25/flash_player_sa_linux.x86_64.tar.gz";
sha256 =
if debug then
- "0cy81cml72ayx2wa0fd9vgp2wzny866jasahndg01v0jfxcxw5rz"
+ "07a8x1n997lmkxj74bkygh60shwzxzcvfxpz07pxj1nmvakmin51"
else
- "0xgiycd47mzmwvmhbi0ig3rd7prksfdpcd4h62as1m9gs1ax4d7l";
+ "0rzxfcvjjwbd1m6pyby8km4g5834zy5d5sih7xq3czds9x0a2jp2";
};
nativeBuildInputs = [ unzip ];
diff --git a/pkgs/applications/networking/browsers/opera/default.nix b/pkgs/applications/networking/browsers/opera/default.nix
index 7e9d4cd50b4a..2863ee876e7a 100644
--- a/pkgs/applications/networking/browsers/opera/default.nix
+++ b/pkgs/applications/networking/browsers/opera/default.nix
@@ -37,7 +37,7 @@
let
mirror = https://get.geo.opera.com/pub/opera/desktop;
- version = "42.0.2393.517";
+ version = "44.0.2510.857";
rpath = stdenv.lib.makeLibraryPath [
@@ -46,7 +46,7 @@ let
alsaLib.out
atk.out
cairo.out
- cups.out
+ cups
curl.out
dbus.lib
expat.out
@@ -91,12 +91,12 @@ in stdenv.mkDerivation {
if stdenv.system == "i686-linux" then
fetchurl {
url = "${mirror}/${version}/linux/opera-stable_${version}_i386.deb";
- sha256 = "1zdhg6lrnpn8f4rdibnagj3ps3i8s9ygm4dpj5h605rqk24xxpvs";
+ sha256 = "1589phaxbzmsr70afzqkrlm4fy4nwf2c0gn4rbv2ah2bq62bcp36";
}
else if stdenv.system == "x86_64-linux" then
fetchurl {
url = "${mirror}/${version}/linux/opera-stable_${version}_amd64.deb";
- sha256 = "04yklvxprl7kcnl43fmvk1qfj5ifvivj715n26ylzcf29pvcy1mp";
+ sha256 = "1fah9pm42ljdcdqgxjikb03c8393smhh3g2rbkhrvmjwknba05ym";
}
else throw "Opera is not supported on ${stdenv.system} (only i686-linux and x86_64 linux are supported)";
diff --git a/pkgs/applications/networking/browsers/palemoon/default.nix b/pkgs/applications/networking/browsers/palemoon/default.nix
index de21c37bc79e..bd334356df5c 100644
--- a/pkgs/applications/networking/browsers/palemoon/default.nix
+++ b/pkgs/applications/networking/browsers/palemoon/default.nix
@@ -1,23 +1,23 @@
{ stdenv, fetchFromGitHub, makeDesktopItem
, pkgconfig, autoconf213, alsaLib, bzip2, cairo
, dbus, dbus_glib, file, fontconfig, freetype
-, gstreamer, gst_plugins_base, gst_all_1
+, gstreamer, gst-plugins-base, gst_all_1
, gtk2, hunspell, icu, libevent, libjpeg, libnotify
-, libstartup_notification, libvpx, makeWrapper, mesa
-, nspr, nss, pango, perl, python, libpulseaudio, sqlite
+, libstartup_notification, libvpx, makeWrapper, mesa
+, nspr, nss, pango, perl, python, libpulseaudio, sqlite
, unzip, xlibs, which, yasm, zip, zlib
}:
stdenv.mkDerivation rec {
name = "palemoon-${version}";
- version = "27.0.3";
+ version = "27.2.1";
src = fetchFromGitHub {
name = "palemoon-src";
owner = "MoonchildProductions";
repo = "Pale-Moon";
- rev = "c09119484da17c682a66e32bacbffb8cff411608";
- sha256 = "1i4hp1lz0xaryy4zpncr67gbqg8v7a2cnyqjwvs2an86rk1vg913";
+ rev = version + "_Release";
+ sha256 = "1yyipxd5lmavf4aca4vrcnp7hb8zkn4sv2zp6n2cm6w4pxlza0g4";
};
desktopItem = makeDesktopItem {
@@ -39,7 +39,7 @@ stdenv.mkDerivation rec {
buildInputs = [
alsaLib bzip2 cairo dbus dbus_glib file fontconfig freetype
- gst_plugins_base gstreamer gst_all_1.gst-plugins-base gtk2
+ gst-plugins-base gstreamer gst_all_1.gst-plugins-base gtk2
hunspell icu libevent libjpeg libnotify libstartup_notification
libvpx makeWrapper mesa nspr nss pango perl pkgconfig python
libpulseaudio sqlite unzip which yasm zip zlib
@@ -79,6 +79,8 @@ stdenv.mkDerivation rec {
'';
installPhase = ''
+ mkdir -p $out/share/applications
+ cp ${desktopItem}/share/applications/* $out/share/applications
cd $builddir
$src/mach install
'';
diff --git a/pkgs/applications/networking/browsers/qutebrowser/default.nix b/pkgs/applications/networking/browsers/qutebrowser/default.nix
index 4c186fcf5ea9..eb26811cfb81 100644
--- a/pkgs/applications/networking/browsers/qutebrowser/default.nix
+++ b/pkgs/applications/networking/browsers/qutebrowser/default.nix
@@ -1,8 +1,10 @@
-{ stdenv, fetchurl, unzip, buildPythonApplication, makeQtWrapper, wrapGAppsHook
+{ stdenv, lib, fetchurl, unzip, buildPythonApplication, makeQtWrapper, wrapGAppsHook
, qtbase, pyqt5, jinja2, pygments, pyyaml, pypeg2, cssutils, glib_networking
, asciidoc, docbook_xml_dtd_45, docbook_xsl, libxml2, libxslt
, gst-plugins-base, gst-plugins-good, gst-plugins-bad, gst-plugins-ugly, gst-libav
-, qtwebkit-plugins }:
+, qtwebkit-plugins
+, withWebEngineDefault ? false
+}:
let
pdfjs = stdenv.mkDerivation rec {
@@ -24,12 +26,12 @@ let
in buildPythonApplication rec {
name = "qutebrowser-${version}";
- version = "0.9.1";
+ version = "0.10.1";
namePrefix = "";
src = fetchurl {
url = "https://github.com/The-Compiler/qutebrowser/releases/download/v${version}/${name}.tar.gz";
- sha256 = "0pf91nc0xcykahc3x7ww525c9czm8zpg80nxl8n2mrzc4ilgvass";
+ sha256 = "57f4915f0f2b1509f3aa1cb9c47117fdaad35b4c895e9223c4eb0a6e8af51917";
};
# Needs tox
@@ -73,7 +75,8 @@ in buildPythonApplication rec {
postFixup = ''
mv $out/bin/qutebrowser $out/bin/.qutebrowser-noqtpath
- makeQtWrapper $out/bin/.qutebrowser-noqtpath $out/bin/qutebrowser
+ makeQtWrapper $out/bin/.qutebrowser-noqtpath $out/bin/qutebrowser \
+ ${lib.optionalString withWebEngineDefault ''--add-flags "--backend webengine"''}
sed -i 's/\.qutebrowser-wrapped/qutebrowser/g' $out/bin/..qutebrowser-wrapped-wrapped
'';
diff --git a/pkgs/applications/networking/browsers/rekonq/default.nix b/pkgs/applications/networking/browsers/rekonq/default.nix
deleted file mode 100644
index 70aa648ccc50..000000000000
--- a/pkgs/applications/networking/browsers/rekonq/default.nix
+++ /dev/null
@@ -1,26 +0,0 @@
-{ stdenv, fetchurl, automoc4, cmake, gettext, perl, pkgconfig
-, kde4, shared_desktop_ontologies, qca2, qoauth }:
-
-assert builtins.compareVersions "4.8.3" kde4.release != 1; # https://bugs.kde.org/show_bug.cgi?id=306077
-
-stdenv.mkDerivation rec {
- name = "rekonq-2.4.2"; # >=1.80 need kde >=4.9.0
-
- src = fetchurl {
- url = "mirror://sourceforge/rekonq/${name}.tar.xz";
- sha256 = "09jihyf4xl7bwfwahwwbx6f11h3zqljccchnpl4mijljylr5p079";
- };
-
- buildInputs = [ kde4.kdelibs qca2 qoauth ];
-
- nativeBuildInputs = [
- automoc4 cmake gettext perl pkgconfig shared_desktop_ontologies
- ];
-
- meta = with stdenv.lib; {
- platforms = platforms.linux;
- maintainers = [ maintainers.urkud ];
- description = "KDE Webkit browser";
- homepage = https://rekonq.kde.org/;
- };
-}
diff --git a/pkgs/applications/networking/browsers/surf/default.nix b/pkgs/applications/networking/browsers/surf/default.nix
index ae6ce3dd2c30..04d475f36f07 100644
--- a/pkgs/applications/networking/browsers/surf/default.nix
+++ b/pkgs/applications/networking/browsers/surf/default.nix
@@ -1,42 +1,36 @@
-{stdenv, fetchurl, makeWrapper, gtk2, webkit, pkgconfig, glib, glib_networking, libsoup, gsettings_desktop_schemas, patches ? null}:
+{ stdenv, fetchurl
+, pkgconfig, wrapGAppsHook
+, glib, glib_networking, gsettings_desktop_schemas, gtk, libsoup, webkitgtk
+, patches ? null
+}:
stdenv.mkDerivation rec {
name = "surf-${version}";
- version="0.7";
+ version = "2.0";
src = fetchurl {
url = "http://dl.suckless.org/surf/surf-${version}.tar.gz";
- sha256 = "0jj93izd8fizxfa6ln9w1h9bwki81sz5dhskh5x1rl34zd38aq4m";
+ sha256 = "07cmajyafljigy10d21kkyvv5jf3hxkx06pz3rwwk3y3c9x4rvps";
};
- buildInputs = [ gtk2 makeWrapper webkit gsettings_desktop_schemas pkgconfig glib libsoup ];
+ nativeBuildInputs = [ pkgconfig wrapGAppsHook ];
+ buildInputs = [ glib glib_networking gsettings_desktop_schemas gtk libsoup webkitgtk ];
- # Allow users set their own list of patches
inherit patches;
- buildPhase = " make ";
-
- # `-lX11' to make sure libX11's store path is in the RPATH
- NIX_LDFLAGS = "-lX11";
- preConfigure = ''sed -i "s@PREFIX = /usr/local@PREFIX = $out@g" config.mk'';
installFlags = [ "PREFIX=/" "DESTDIR=$(out)" ];
- preFixup = ''
- wrapProgram "$out/bin/surf" \
- --prefix GIO_EXTRA_MODULES : ${glib_networking.out}/lib/gio/modules \
- --prefix XDG_DATA_DIRS : "$GSETTINGS_SCHEMAS_PATH"
- '';
-
- meta = {
- description = "Simple web browser";
+ meta = with stdenv.lib; {
+ description = "A simple web browser based on WebKit/GTK+";
longDescription = ''
Surf is a simple web browser based on WebKit/GTK+. It is able to display
websites and follow links. It supports the XEmbed protocol which makes it
possible to embed it in another application. Furthermore, one can point
surf to another URI by setting its XProperties.
- '';
+ '';
homepage = http://surf.suckless.org;
- license = stdenv.lib.licenses.mit;
- platforms = stdenv.lib.platforms.linux;
+ license = licenses.mit;
+ platforms = webkitgtk.meta.platforms;
+ maintainers = with maintainers; [ joachifm ];
};
}
diff --git a/pkgs/applications/networking/browsers/torbrowser/default.nix b/pkgs/applications/networking/browsers/torbrowser/default.nix
new file mode 100644
index 000000000000..5ce7c4780c82
--- /dev/null
+++ b/pkgs/applications/networking/browsers/torbrowser/default.nix
@@ -0,0 +1,329 @@
+{ stdenv
+, fetchurl
+, makeDesktopItem
+
+# Common run-time dependencies
+, zlib
+
+# libxul run-time dependencies
+, alsaLib
+, atk
+, cairo
+, dbus
+, dbus_glib
+, fontconfig
+, freetype
+, gdk_pixbuf
+, glib
+, gtk2
+, libX11
+, libXext
+, libXrender
+, libXt
+, pango
+
+# Pulseaudio support
+, pulseaudioSupport ? mediaSupport
+, libpulseaudio
+
+# Media support (implies pulseaudio support)
+, mediaSupport ? false
+, gstreamer
+, gst-plugins-base
+, gst-plugins-good
+, gst-ffmpeg
+, gmp
+, ffmpeg
+
+# Pluggable transport dependencies
+, python27
+}:
+
+with stdenv.lib;
+
+let
+ libPath = makeLibraryPath ([
+ alsaLib
+ atk
+ cairo
+ dbus
+ dbus_glib
+ fontconfig
+ freetype
+ gdk_pixbuf
+ glib
+ gtk2
+ libX11
+ libXext
+ libXrender
+ libXt
+ pango
+ stdenv.cc.cc
+ zlib
+ ]
+ ++ optionals pulseaudioSupport [ libpulseaudio ]
+ ++ optionals mediaSupport [
+ gstreamer
+ gst-plugins-base
+ gmp
+ ffmpeg
+ ]);
+
+ gstPluginsPath = concatMapStringsSep ":" (x:
+ "${x}/lib/gstreamer-0.10") [
+ gstreamer
+ gst-plugins-base
+ gst-plugins-good
+ gst-ffmpeg
+ ];
+
+ # Library search path for the fte transport
+ fteLibPath = makeLibraryPath [ stdenv.cc.cc gmp ];
+
+ # Upstream source
+ version = "6.5.1";
+
+ lang = "en-US";
+
+ srcs = {
+ "x86_64-linux" = fetchurl {
+ url = "https://dist.torproject.org/torbrowser/${version}/tor-browser-linux64-${version}_${lang}.tar.xz";
+ sha256 = "1p2bgavvyzahqpjg9vp14c0s50rmha3v1hs1c8zvz6fj8fgrhn0i";
+ };
+
+ "i686-linux" = fetchurl {
+ url = "https://dist.torproject.org/torbrowser/${version}/tor-browser-linux32-${version}_${lang}.tar.xz";
+ sha256 = "1zfghr01bhpn39wqaw7hyx7yap7xyla4m3mrgz2vi9a5qsyxmbcr";
+ };
+ };
+in
+
+stdenv.mkDerivation rec {
+ name = "tor-browser-${version}";
+ inherit version;
+
+ src = srcs."${stdenv.system}" or (throw "unsupported system: ${stdenv.system}");
+
+ preferLocalBuild = true;
+
+ desktopItem = makeDesktopItem {
+ name = "torbrowser";
+ exec = "tor-browser";
+ icon = "torbrowser";
+ desktopName = "Tor Browser";
+ genericName = "Web Browser";
+ comment = meta.description;
+ categories = "Network;WebBrowser;Security;";
+ };
+
+ buildCommand = ''
+ # For convenience ...
+ TBB_IN_STORE=$out/share/tor-browser
+ interp=$(< $NIX_CC/nix-support/dynamic-linker)
+
+ # Unpack & enter
+ mkdir -p "$TBB_IN_STORE"
+ tar xf "${src}" -C "$TBB_IN_STORE" --strip-components=2
+ pushd "$TBB_IN_STORE"
+
+ # Set ELF interpreter
+ for exe in firefox TorBrowser/Tor/tor ; do
+ patchelf --set-interpreter "$interp" "$exe"
+ done
+
+ # The final libPath. Note, we could split this into firefoxLibPath
+ # and torLibPath for accuracy, but this is more convenient ...
+ libPath=${libPath}:$TBB_IN_STORE:$TBB_IN_STORE/TorBrowser/Tor
+
+ # Fixup paths to pluggable transports.
+ sed -i TorBrowser/Data/Tor/torrc-defaults \
+ -e "s,./TorBrowser,$TBB_IN_STORE/TorBrowser,g"
+
+ # Fixup obfs transport. Work around patchelf failing to set
+ # interpreter for pre-compiled Go binaries by invoking the interpreter
+ # directly.
+ sed -i TorBrowser/Data/Tor/torrc-defaults \
+ -e "s|\(ClientTransportPlugin obfs2,obfs3,obfs4,scramblesuit\) exec|\1 exec $interp|" \
+
+ # Fixup fte transport
+ #
+ # Note: the script adds its dirname to search path automatically
+ sed -i TorBrowser/Tor/PluggableTransports/fteproxy.bin \
+ -e "s,/usr/bin/env python,${python27.interpreter},"
+
+ patchelf --set-rpath "${fteLibPath}" TorBrowser/Tor/PluggableTransports/fte/cDFA.so
+
+ # Prepare for autoconfig.
+ #
+ # See https://developer.mozilla.org/en-US/Firefox/Enterprise_deployment
+ cat >defaults/pref/autoconfig.js <mozilla.cfg <fonts,$TBB_IN_STORE/fonts,"
+
+ # Move default extension overrides into distribution dir, to avoid
+ # having to synchronize between local state and store.
+ mv TorBrowser/Data/Browser/profile.default/preferences/extension-overrides.js defaults/pref/torbrowser.js
+
+ # Hard-code paths to geoip data files. TBB resolves the geoip files
+ # relative to torrc-defaults_path but if we do not hard-code them
+ # here, these paths end up being written to the torrc in the user's
+ # state dir.
+ cat >>TorBrowser/Data/Tor/torrc-defaults < "$out/bin/tor-browser" << EOF
+ #! ${stdenv.shell}
+ set -o errexit -o nounset
+
+ # Enter local state directory.
+ REAL_HOME=\$HOME
+ TBB_HOME=\''${TBB_HOME:-''${XDG_DATA_HOME:-\$REAL_HOME/.local/share}/tor-browser}
+ HOME=\$TBB_HOME
+
+ mkdir -p "\$HOME"
+ cd "\$HOME"
+
+ # Initialize empty TBB local state directory hierarchy. We
+ # intentionally mirror the layout that TBB would see if executed from
+ # the unpacked bundle dir.
+ mkdir -p "\$HOME/TorBrowser" "\$HOME/TorBrowser/Data"
+
+ # Initialize the Tor data directory.
+ mkdir -p "\$HOME/TorBrowser/Data/Tor"
+
+ # Initialize the browser profile state. Note that the only data
+ # copied from the Store payload is the initial bookmark file, which is
+ # never updated once created. All other files under user's profile
+ # dir are generated by TBB.
+ mkdir -p "\$HOME/TorBrowser/Data/Browser/profile.default"
+ cp -u --no-preserve=mode,owner "$TBB_IN_STORE/TorBrowser/Data/Browser/profile.default/bookmarks.html" \
+ "\$HOME/TorBrowser/Data/Browser/profile.default/bookmarks.html"
+
+ # Clear out some files that tend to capture store references but are
+ # easily generated by firefox at startup.
+ rm -f "\$HOME/TorBrowser/Data/Browser/profile.default"/{compatibility.ini,extensions.ini,extensions.json}
+
+ # Ensure that we're always using the up-to-date extensions.
+ ln -snf "$TBB_IN_STORE/TorBrowser/Data/Browser/profile.default/extensions" \
+ "\$HOME/TorBrowser/Data/Browser/profile.default/extensions"
+
+ ${optionalString pulseaudioSupport ''
+ # Figure out some envvars for pulseaudio
+ : "\''${XDG_RUNTIME_DIR:=/run/user/\$(id -u)}"
+ : "\''${XDG_CONFIG_HOME:=\$REAL_HOME/.config}"
+ : "\''${PULSE_SERVER:=\$XDG_RUNTIME_DIR/pulse/native}"
+ : "\''${PULSE_COOKIE:=\$XDG_CONFIG_HOME/pulse/cookie}"
+ ''}
+
+ # Font cache files capture store paths; clear them out on the off
+ # chance that TBB would continue using old font files.
+ rm -rf "\$HOME/.cache/fontconfig"
+
+ # Lift-off
+ #
+ # XAUTHORITY and DISPLAY are required for TBB to work at all.
+ #
+ # DBUS_SESSION_BUS_ADDRESS is inherited to avoid auto-launch; to
+ # prevent that, set it to an empty/invalid value prior to running
+ # tor-browser.
+ #
+ # PULSE_SERVER is necessary for audio playback.
+ #
+ # Setting FONTCONFIG_FILE is required to make fontconfig read the TBB
+ # fonts.conf; upstream uses FONTCONFIG_PATH, but FC_DEBUG=1024
+ # indicates the system fonts.conf being used instead.
+ exec env -i \
+ HOME="\$HOME" \
+ XAUTHORITY="\$XAUTHORITY" \
+ DISPLAY="\$DISPLAY" \
+ DBUS_SESSION_BUS_ADDRESS="\$DBUS_SESSION_BUS_ADDRESS" \
+ \
+ PULSE_SERVER="\''${PULSE_SERVER:-}" \
+ PULSE_COOKIE="\''${PULSE_COOKIE:-}" \
+ \
+ GST_PLUGIN_SYSTEM_PATH="${optionalString mediaSupport gstPluginsPath}" \
+ GST_REGISTRY="/dev/null" \
+ GST_REGISTRY_UPDATE="no" \
+ \
+ FONTCONFIG_FILE="$FONTCONFIG_FILE" \
+ \
+ LD_LIBRARY_PATH="$libPath" \
+ \
+ "$TBB_IN_STORE/firefox" \
+ --class "Tor Browser" \
+ -no-remote \
+ -profile "\$HOME/TorBrowser/Data/Browser/profile.default" \
+ "\''${@}"
+ EOF
+ chmod +x $out/bin/tor-browser
+
+ # Easier access to docs
+ mkdir -p $out/share/doc
+ ln -s $TBB_IN_STORE/TorBrowser/Docs $out/share/doc/tor-browser
+
+ # Install .desktop item
+ mkdir -p $out/share/applications
+ cp $desktopItem/share/applications"/"* $out/share/applications
+ sed -i $out/share/applications/torbrowser.desktop \
+ -e "s,Exec=.*,Exec=$out/bin/tor-browser,"
+
+ # Install icons
+ mkdir -p $out/share/pixmaps
+ cp browser/icons/mozicon128.png $out/share/pixmaps/torbrowser.png
+
+ # Check installed apps
+ echo "Checking bundled Tor ..."
+ LD_LIBRARY_PATH=$libPath $TBB_IN_STORE/TorBrowser/Tor/tor --version >/dev/null
+
+ echo "Checking tor-browser wrapper ..."
+ DISPLAY="" XAUTHORITY="" DBUS_SESSION_BUS_ADDRESS="" TBB_HOME=$(mktemp -d) \
+ $out/bin/tor-browser --version >/dev/null
+ '';
+
+ meta = with stdenv.lib; {
+ description = "Tor Browser Bundle";
+ homepage = https://www.torproject.org/;
+ platforms = attrNames srcs;
+ maintainers = with maintainers; [ offline matejc doublec thoughtpolice joachifm ];
+ hydraPlatforms = [];
+ # MPL2.0+, GPL+, &c. While it's not entirely clear whether
+ # the compound is "libre" in a strict sense (some components place certain
+ # restrictions on redistribution), it's free enough for our purposes.
+ license = licenses.free;
+ };
+}
diff --git a/pkgs/applications/networking/browsers/vivaldi/default.nix b/pkgs/applications/networking/browsers/vivaldi/default.nix
index 0531a58f0a23..ab010653c644 100644
--- a/pkgs/applications/networking/browsers/vivaldi/default.nix
+++ b/pkgs/applications/networking/browsers/vivaldi/default.nix
@@ -3,7 +3,7 @@
, alsaLib, dbus_libs, cups, libexif, ffmpeg, systemd
, freetype, fontconfig, libXft, libXrender, libxcb, expat, libXau, libXdmcp
, libuuid, xz
-, gstreamer, gst_plugins_base, libxml2
+, gstreamer, gst-plugins-base, libxml2
, glib, gtk2, pango, gdk_pixbuf, cairo, atk, gnome3
, nss, nspr
, patchelf
@@ -41,7 +41,7 @@ in stdenv.mkDerivation rec {
libXi libXft libXcursor libXfixes libXScrnSaver libXcomposite libXdamage libXtst libXrandr
atk alsaLib dbus_libs cups gtk2 gdk_pixbuf libexif ffmpeg systemd
freetype fontconfig libXrender libuuid expat glib nss nspr
- gstreamer libxml2 gst_plugins_base pango cairo gnome3.gconf
+ gstreamer libxml2 gst-plugins-base pango cairo gnome3.gconf
patchelf
];
diff --git a/pkgs/applications/networking/cluster/docker-machine/default.nix b/pkgs/applications/networking/cluster/docker-machine/default.nix
index 0985c86949af..b2d70b1f767c 100644
--- a/pkgs/applications/networking/cluster/docker-machine/default.nix
+++ b/pkgs/applications/networking/cluster/docker-machine/default.nix
@@ -3,7 +3,7 @@
buildGoPackage rec {
name = "machine-${version}";
- version = "0.9.0";
+ version = "0.10.0";
goPackagePath = "github.com/docker/machine";
@@ -11,7 +11,7 @@ buildGoPackage rec {
rev = "v${version}";
owner = "docker";
repo = "machine";
- sha256 = "1kl30ylgdsyr9vkdms6caypnixxjv9a322wx416x6266c8lal6k4";
+ sha256 = "1ik0jbp8zqzmg8w1fnf82gdlwrvw4nl40lmins7h8y0q6psrp6gc";
};
postInstall = ''
diff --git a/pkgs/applications/networking/cluster/docker-machine/kvm-deps.nix b/pkgs/applications/networking/cluster/docker-machine/kvm-deps.nix
index 709491a76f8a..e321b2c1b0ac 100644
--- a/pkgs/applications/networking/cluster/docker-machine/kvm-deps.nix
+++ b/pkgs/applications/networking/cluster/docker-machine/kvm-deps.nix
@@ -1,21 +1,21 @@
# This file was generated by go2nix.
[
- {
- goPackagePath = "github.com/alexzorin/libvirt-go";
- fetch = {
- type = "git";
- url = "https://github.com/alexzorin/libvirt-go";
- rev = "9359c4feb97212380aa05213fa30c4b7348365f0";
- sha256 = "02ipw28pjl5ng2xk63r279apc2py1yr5brcpnsc0cnd2imd51fqa";
- };
- }
{
goPackagePath = "github.com/docker/machine";
fetch = {
type = "git";
url = "https://github.com/docker/machine";
- rev = "bb37dc7806687013c0c3097342ef7db4257655d2";
- sha256 = "0wgyxpwis4hyknqalal1cnvb0v3j8f6lscchhk9ch6i69ngiaf03";
+ rev = "457c02d06a155827c1c4af9b5ab38c0b6b4e48ea";
+ sha256 = "0hx5bhjc7q9ml6h6d2a5csqg6vqwjj68599q0cccw3pcfrb34gmd";
+ };
+ }
+ {
+ goPackagePath = "github.com/libvirt/libvirt-go";
+ fetch = {
+ type = "git";
+ url = "https://github.com/libvirt/libvirt-go";
+ rev = "e9642325d747c353ca7b76b4893d5dbdc81c296f";
+ sha256 = "1822b2kbwyxb2gigbiashcs7v4fsyw7k3sdlqh43ga0l6058fmhl";
};
}
]
diff --git a/pkgs/applications/networking/cluster/docker-machine/kvm.nix b/pkgs/applications/networking/cluster/docker-machine/kvm.nix
index 46105f34b5b7..a73ec99cb9fb 100644
--- a/pkgs/applications/networking/cluster/docker-machine/kvm.nix
+++ b/pkgs/applications/networking/cluster/docker-machine/kvm.nix
@@ -1,25 +1,21 @@
# This file was generated by go2nix.
-{ stdenv, buildGoPackage, fetchFromGitHub, libvirt }:
+{ stdenv, buildGoPackage, fetchFromGitHub, libvirt, pkgconfig }:
buildGoPackage rec {
name = "docker-machine-kvm-${version}";
- version = "0.7.0";
+ version = "0.8.2";
goPackagePath = "github.com/dhiltgen/docker-machine-kvm";
goDeps = ./kvm-deps.nix;
src = fetchFromGitHub {
- rev = "v${version}";
- owner = "dhiltgen";
- repo = "docker-machine-kvm";
- sha256 = "0zkwwkx74vsfd7v38y9sidi759mhdcpm4409l9y4cx0wmkpavlv6";
+ rev = "v${version}";
+ owner = "dhiltgen";
+ repo = "docker-machine-kvm";
+ sha256 = "1p7s340wlcjvna3xa2x13nsnixfhbn5b7dhf9cqvxds2slizlm3p";
};
- buildInputs = [ libvirt ];
-
- postInstall = ''
- mv $bin/bin/bin $bin/bin/docker-machine-driver-kvm
- '';
+ buildInputs = [ libvirt pkgconfig ];
meta = with stdenv.lib; {
homepage = https://github.com/dhiltgen/docker-machine-kvm;
diff --git a/pkgs/applications/networking/cluster/helm/default.nix b/pkgs/applications/networking/cluster/helm/default.nix
index f54964571575..31ed8946529c 100644
--- a/pkgs/applications/networking/cluster/helm/default.nix
+++ b/pkgs/applications/networking/cluster/helm/default.nix
@@ -4,12 +4,12 @@ let
then "linux-amd64"
else "darwin-amd64";
checksum = if stdenv.isLinux
- then "8bb6f9d336ca7913556e463c5b65eb8d69778c518df2fab0d20be943fbf0efc1"
- else "94c9f2d511aec3d4b7dcc5f0ce6f846506169b4eb7235e1dc137d08edf408098";
+ then "fa434644d1afd92637369a033fd65b717d8dfa910127d335e8a82c8fad74cc35"
+ else "64420d467e03ceb666a4f22b89e08b93c06f76f5917fe539860b04cd5e5e515f";
in
stdenv.mkDerivation rec {
pname = "helm";
- version = "2.1.3";
+ version = "2.2.3";
name = "${pname}-${version}";
src = fetchurl {
diff --git a/pkgs/applications/networking/cluster/kops/default.nix b/pkgs/applications/networking/cluster/kops/default.nix
index 80747e44bf53..ea25fa6ccb57 100644
--- a/pkgs/applications/networking/cluster/kops/default.nix
+++ b/pkgs/applications/networking/cluster/kops/default.nix
@@ -27,5 +27,6 @@ buildGoPackage rec {
homepage = https://github.com/kubernetes/kops;
license = licenses.asl20;
maintainers = with maintainers; [offline];
+ platforms = platforms.unix;
};
}
diff --git a/pkgs/applications/networking/cluster/kubernetes/default.nix b/pkgs/applications/networking/cluster/kubernetes/default.nix
index 0040d0ca8238..69fe6a1730aa 100644
--- a/pkgs/applications/networking/cluster/kubernetes/default.nix
+++ b/pkgs/applications/networking/cluster/kubernetes/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, lib, fetchFromGitHub, which, go, go-bindata, makeWrapper, rsync
+{ stdenv, lib, fetchFromGitHub, removeReferencesTo, which, go, go-bindata, makeWrapper, rsync
, iptables, coreutils
, components ? [
"cmd/kubeadm"
@@ -18,16 +18,16 @@ with lib;
stdenv.mkDerivation rec {
name = "kubernetes-${version}";
- version = "1.5.2";
+ version = "1.5.6";
src = fetchFromGitHub {
owner = "kubernetes";
repo = "kubernetes";
rev = "v${version}";
- sha256 = "1ps9bn5gqknyjv0b9jvp7xg3cyd4anq11j785p22347al0b8w81v";
+ sha256 = "0mkg4vgz9szgq1k5ignkdr5gmg703xlq8zsrr422a1qfqb8zp15w";
};
- buildInputs = [ makeWrapper which go rsync go-bindata ];
+ buildInputs = [ removeReferencesTo makeWrapper which go rsync go-bindata ];
outputs = ["out" "man" "pause"];
@@ -45,7 +45,7 @@ stdenv.mkDerivation rec {
postBuild = ''
./hack/generate-docs.sh
- (cd build/pause && gcc pause.c -o pause)
+ (cd build/pause && cc pause.c -o pause)
'';
installPhase = ''
@@ -59,12 +59,7 @@ stdenv.mkDerivation rec {
'';
preFixup = ''
- # Remove references to go compiler
- while read file; do
- cat $file | sed "s,${go},$(echo "${go}" | sed "s,$NIX_STORE/[^-]*,$NIX_STORE/eeeeeeeeeeeeeeeeeeeeeeeeeeeeeeee,"),g" > $file.tmp
- mv $file.tmp $file
- chmod +x $file
- done < <(find $out/bin $pause/bin -type f 2>/dev/null)
+ find $out/bin $pause/bin -type f -exec remove-references-to -t ${go} '{}' +
'';
meta = {
@@ -72,6 +67,6 @@ stdenv.mkDerivation rec {
license = licenses.asl20;
homepage = http://kubernetes.io;
maintainers = with maintainers; [offline];
- platforms = platforms.linux;
+ platforms = platforms.unix;
};
}
diff --git a/pkgs/applications/networking/cluster/marathon/default.nix b/pkgs/applications/networking/cluster/marathon/default.nix
index fa19c562e8cc..914ca259675c 100644
--- a/pkgs/applications/networking/cluster/marathon/default.nix
+++ b/pkgs/applications/networking/cluster/marathon/default.nix
@@ -2,11 +2,11 @@
stdenv.mkDerivation rec {
name = "marathon-${version}";
- version = "1.3.6";
+ version = "1.4.1";
src = fetchurl {
url = "https://downloads.mesosphere.com/marathon/v${version}/marathon-${version}.tgz";
- sha256 = "12a6ah6qsx1ap6y7sps4vwkq8lyc08k1qnak2mnsa04ifrx9z0dy";
+ sha256 = "1wpzsvvmk19qrwzwj7k12rngry1qriiqnjzq2q2pbpv5w0zb1fz5";
};
buildInputs = [ makeWrapper jdk mesos ];
@@ -24,7 +24,7 @@ stdenv.mkDerivation rec {
homepage = https://mesosphere.github.io/marathon;
description = "Cluster-wide init and control system for services in cgroups or Docker containers";
license = licenses.asl20;
- maintainers = with maintainers; [ rushmorem kamilchm kevincox ];
+ maintainers = with maintainers; [ rushmorem kamilchm kevincox pradeepchhetri ];
platforms = platforms.linux;
};
}
diff --git a/pkgs/applications/networking/cluster/mesos/default.nix b/pkgs/applications/networking/cluster/mesos/default.nix
index 818848f6a7f1..651d00e57108 100644
--- a/pkgs/applications/networking/cluster/mesos/default.nix
+++ b/pkgs/applications/networking/cluster/mesos/default.nix
@@ -58,6 +58,16 @@ in stdenv.mkDerivation rec {
# if we dynamically link the lib, we get these errors:
# https://github.com/NixOS/nixpkgs/pull/19064#issuecomment-255082684
preConfigure = ''
+ # https://issues.apache.org/jira/browse/MESOS-6616
+ configureFlagsArray+=(
+ "CXXFLAGS=-O2 -Wno-error=strict-aliasing"
+ )
+
+ # Fix cases where makedev(),major(),minor() are referenced through
+ # instead of
+ sed 1i'#include ' -i src/linux/fs.cpp
+ sed 1i'#include ' -i src/slave/containerizer/mesos/isolators/gpu/isolator.cpp
+
substituteInPlace 3rdparty/stout/include/stout/os/posix/chown.hpp \
--subst-var-by chown ${coreutils}/bin/chown
diff --git a/pkgs/applications/networking/cluster/minikube/default.nix b/pkgs/applications/networking/cluster/minikube/default.nix
index c773d8ac23a4..9d17443ac889 100644
--- a/pkgs/applications/networking/cluster/minikube/default.nix
+++ b/pkgs/applications/networking/cluster/minikube/default.nix
@@ -1,43 +1,74 @@
-{ stdenv, lib, fetchurl, makeWrapper, docker-machine-kvm, kubernetes, libvirt, qemu }:
+{ stdenv, buildGoPackage, fetchFromGitHub, fetchurl, go-bindata, kubernetes, libvirt, qemu, docker-machine-kvm, makeWrapper }:
let
- arch = if stdenv.isLinux
- then "linux-amd64"
- else "darwin-amd64";
- checksum = if stdenv.isLinux
- then "0njx4vzr0cpr3dba08w0jrlpfb8qrmxq5lqfrk3qrx29x5y6i6hi"
- else "0i21m1pys6rdxcwsk987l08lhzpcbg4bdrznaam02g6jj6jxvq0x";
+ binPath = [ kubernetes ]
+ ++ stdenv.lib.optionals stdenv.isLinux [ libvirt qemu docker-machine-kvm ]
+ ++ stdenv.lib.optionals stdenv.isDarwin [];
-# TODO: compile from source
+ # Normally, minikube bundles localkube in its own binary via go-bindata. Unfortunately, it needs to make that localkube
+ # a static linux binary, and our Linux nixpkgs go compiler doesn't seem to work when asking for a cgo binary that's static
+ # (presumably because we don't have some static system libraries it wants), and cross-compiling cgo on Darwin is a nightmare.
+ #
+ # Note that minikube can download (and cache) versions of localkube it needs on demand. Unfortunately, minikube's knowledge
+ # of where it can download versions of localkube seems to rely on a json file that doesn't get updated as often as we'd like. So
+ # instead, we download localkube ourselves and shove it into the minikube binary. The versions URL that minikube uses is
+ # currently https://storage.googleapis.com/minikube/k8s_releases.json
-in stdenv.mkDerivation rec {
- pname = "minikube";
- version = "0.16.0";
- name = "${pname}-${version}";
+ localkube-version = "1.6.0";
+ localkube-binary = fetchurl {
+ url = "https://storage.googleapis.com/minikube/k8sReleases/v${localkube-version}/localkube-linux-amd64";
+ sha256 = "0zx0c9fwairvga1g1112l5g5pspm2m9wxb42qgfxfgyidywvirha";
+ };
+in buildGoPackage rec {
+ pname = "minikube";
+ name = "${pname}-${version}";
+ version = "0.18.0";
- src = fetchurl {
- url = "https://storage.googleapis.com/minikube/releases/v${version}/minikube-${arch}";
- sha256 = "${checksum}";
+ goPackagePath = "k8s.io/minikube";
+
+ src = fetchFromGitHub {
+ owner = "kubernetes";
+ repo = "minikube";
+ rev = "v${version}";
+ sha256 = "0r8184xfsw7vvvmzhc18si582q41cnzka4ry151hwy56gmp2jyiw";
};
- phases = [ "installPhase" ];
+ # kubernetes is here only to shut up a loud warning when generating the completions below. minikube checks very eagerly
+ # that kubectl is on the $PATH, even if it doesn't use it at all to generate the completions
+ buildInputs = [ go-bindata makeWrapper kubernetes ];
+ subPackages = [ "cmd/minikube" ];
- buildInputs = [ makeWrapper ];
+ preBuild = ''
+ pushd go/src/${goPackagePath} >/dev/null
- binPath = lib.makeBinPath [ docker-machine-kvm kubernetes libvirt qemu ];
+ mkdir -p out
+ cp ${localkube-binary} out/localkube
- installPhase = ''
- install -Dm755 ${src} $out/bin/${pname}
+ go-bindata -nomemcopy -o pkg/minikube/assets/assets.go -pkg assets ./out/localkube deploy/addons/...
- wrapProgram $out/bin/${pname} \
- --prefix PATH : ${binPath}
+ ISO_VERSION=$(grep "^ISO_VERSION" Makefile | sed "s/^.*\s//")
+ ISO_BUCKET=$(grep "^ISO_BUCKET" Makefile | sed "s/^.*\s//")
+
+ export buildFlagsArray="-ldflags=\
+ -X k8s.io/minikube/pkg/version.version=v${version} \
+ -X k8s.io/minikube/pkg/version.isoVersion=$ISO_VERSION \
+ -X k8s.io/minikube/pkg/version.isoPath=$ISO_BUCKET"
+
+ popd >/dev/null
'';
+ postInstall = ''
+ mkdir -p $bin/share/bash-completion/completions/
+ MINIKUBE_WANTUPDATENOTIFICATION=false HOME=$PWD $bin/bin/minikube completion bash > $bin/share/bash-completion/completions/minikube
+ '';
+
+ postFixup = "wrapProgram $bin/bin/${pname} --prefix PATH : ${stdenv.lib.makeBinPath binPath}";
+
meta = with stdenv.lib; {
- homepage = https://github.com/kubernetes/minikube;
+ homepage = https://github.com/kubernetes/minikube;
description = "A tool that makes it easy to run Kubernetes locally";
- license = licenses.asl20;
- maintainers = with maintainers; [ ebzzry ];
- platforms = with platforms; linux ++ darwin;
+ license = licenses.asl20;
+ maintainers = with maintainers; [ ebzzry copumpkin ];
+ platforms = with platforms; unix;
};
}
diff --git a/pkgs/applications/networking/cluster/nomad/default.nix b/pkgs/applications/networking/cluster/nomad/default.nix
index ae3415adef9a..1d39534bc16c 100644
--- a/pkgs/applications/networking/cluster/nomad/default.nix
+++ b/pkgs/applications/networking/cluster/nomad/default.nix
@@ -2,7 +2,7 @@
buildGoPackage rec {
name = "nomad-${version}";
- version = "0.5.4";
+ version = "0.5.5";
rev = "v${version}";
goPackagePath = "github.com/hashicorp/nomad";
@@ -12,7 +12,7 @@ buildGoPackage rec {
owner = "hashicorp";
repo = "nomad";
inherit rev;
- sha256 = "0x7bi6wq7kpqv3wfhk5mqikj4hsb0f6lx867xz5l9cq3i39b5gj3";
+ sha256 = "17xq88ymm77b6y27l4v49i9hm6yjyrk61rdb2v7nvn8fa4bn6b65";
};
meta = with stdenv.lib; {
diff --git a/pkgs/applications/networking/cluster/spark/default.nix b/pkgs/applications/networking/cluster/spark/default.nix
index bdcb0a846259..837447fe60fb 100644
--- a/pkgs/applications/networking/cluster/spark/default.nix
+++ b/pkgs/applications/networking/cluster/spark/default.nix
@@ -1,13 +1,14 @@
{ stdenv, fetchzip, makeWrapper, jre, pythonPackages
+, RSupport? true, R
, mesosSupport ? true, mesos
, version
}:
let
versionMap = {
- "1.6.0" = {
+ "1.6.3" = {
hadoopVersion = "cdh4";
- sparkSha256 = "19ycx1r8g82vkvzmn9wxkssmv2damrg72yfmrgzpc6xyh071g91c";
+ sparkSha256 = "00il083cjb9xqzsma2ifphq9ggichwndrj6skh2z5z9jk3z0lgyn";
};
"2.1.0" = {
hadoopVersion = "hadoop2.4";
@@ -30,6 +31,7 @@ stdenv.mkDerivation rec {
};
buildInputs = [ makeWrapper jre pythonPackages.python pythonPackages.numpy ]
+ ++ optional RSupport R
++ optional mesosSupport mesos;
untarDir = "${name}-bin-${hadoopVersion}";
@@ -46,6 +48,9 @@ stdenv.mkDerivation rec {
export SPARK_HOME="$out/lib/${untarDir}"
export PYSPARK_PYTHON="${pythonPackages.python}/bin/${pythonPackages.python.executable}"
export PYTHONPATH="\$PYTHONPATH:$PYTHONPATH"
+ ${optionalString RSupport
+ ''export SPARKR_R_SHELL="${R}/bin/R"
+ export PATH=$PATH:"${R}/bin/R"''}
${optionalString mesosSupport
''export MESOS_NATIVE_LIBRARY="$MESOS_NATIVE_LIBRARY"''}
EOF
@@ -57,7 +62,7 @@ stdenv.mkDerivation rec {
'';
meta = {
- description = "Lightning-fast cluster computing";
+ description = "Apache Spark is a fast and general engine for large-scale data processing";
homepage = "http://spark.apache.org";
license = stdenv.lib.licenses.asl20;
platforms = stdenv.lib.platforms.all;
diff --git a/pkgs/applications/networking/cluster/terraform/default.nix b/pkgs/applications/networking/cluster/terraform/default.nix
index 2f57456f309c..aad5d1a80326 100644
--- a/pkgs/applications/networking/cluster/terraform/default.nix
+++ b/pkgs/applications/networking/cluster/terraform/default.nix
@@ -1,34 +1,74 @@
-{ stdenv, lib, buildGoPackage, fetchFromGitHub }:
-
-buildGoPackage rec {
- name = "terraform-${version}";
- version = "0.8.7";
+{ stdenv, lib, buildGoPackage, fetchpatch, fetchFromGitHub }:
+let
goPackagePath = "github.com/hashicorp/terraform";
- src = fetchFromGitHub {
- owner = "hashicorp";
- repo = "terraform";
- rev = "v${version}";
- sha256 = "0b30m0qc50x84klc8ggc3i83z36l46b1qmc8mpw90mxp07ra8vbw";
+ generic = { version, sha256, ... }@attrs:
+ let attrs' = builtins.removeAttrs attrs ["version" "sha256"]; in
+ buildGoPackage ({
+ name = "terraform-${version}";
+
+ inherit goPackagePath;
+
+ src = fetchFromGitHub {
+ owner = "hashicorp";
+ repo = "terraform";
+ rev = "v${version}";
+ inherit sha256;
+ };
+
+ postInstall = ''
+ # remove all plugins, they are part of the main binary now
+ for i in $bin/bin/*; do
+ if [[ $(basename $i) != terraform ]]; then
+ rm "$i"
+ fi
+ done
+ '';
+
+ preCheck = ''
+ export HOME=$TMP
+ '';
+
+ meta = with stdenv.lib; {
+ description = "Tool for building, changing, and versioning infrastructure";
+ homepage = https://www.terraform.io/;
+ license = licenses.mpl20;
+ maintainers = with maintainers; [ jgeerds zimbatm peterhoeg ];
+ };
+ } // attrs');
+
+in {
+ terraform_0_8_5 = generic {
+ version = "0.8.5";
+ sha256 = "1cxwv3652fpsbm2zk1akw356cd7w7vhny1623ighgbz9ha8gvg09";
};
- postInstall = ''
- # remove all plugins, they are part of the main binary now
- for i in $bin/bin/*; do
- if [[ $(basename $i) != terraform ]]; then
- rm "$i"
- fi
- done
- '';
+ terraform_0_8_8 = generic {
+ version = "0.8.8";
+ sha256 = "0ibgpcpvz0bmn3cw60nzsabsrxrbmmym1hv7fx6zmjxiwd68w5gb";
+ };
- meta = with stdenv.lib; {
- description = "Tool for building, changing, and versioning infrastructure";
- homepage = "https://www.terraform.io/";
- license = licenses.mpl20;
- maintainers = with maintainers; [
- jgeerds
- zimbatm
+ terraform_0_9_2 = generic {
+ version = "0.9.2";
+ sha256 = "1yj5x1d10028fm3v3gjyjdn128ps0as345hr50y8x3vn86n70lxl";
+
+ patches = [
+ (fetchpatch {
+ url = "https://github.com/hashicorp/terraform/pull/13237.patch";
+ sha256 = "03c2nq12gvqqp12znvl3lmiviwsqksx4nrplv09fns2kz2gyfnbm";
+ })
+ (fetchpatch {
+ url = "https://github.com/hashicorp/terraform/pull/13248.patch";
+ sha256 = "0awj8gaic0j7a69is95f2rll3yip4n6avai1jh20b1x7dybdrp5m";
+ })
];
+
+ postPatch = ''
+ rm builtin/providers/dns/data_dns_cname_record_set_test.go
+ rm builtin/providers/vsphere/resource_vsphere_file_test.go
+ '';
+
+ doCheck = true;
};
}
diff --git a/pkgs/applications/networking/cluster/terragrunt/0.9.8.nix b/pkgs/applications/networking/cluster/terragrunt/0.9.8.nix
new file mode 100644
index 000000000000..ec13cbe35bca
--- /dev/null
+++ b/pkgs/applications/networking/cluster/terragrunt/0.9.8.nix
@@ -0,0 +1,35 @@
+{ stdenv, lib, buildGoPackage, fetchFromGitHub, terraform, makeWrapper }:
+
+buildGoPackage rec {
+ name = "terragrunt-${version}";
+ version = "0.9.8";
+
+ goPackagePath = "github.com/gruntwork-io/terragrunt";
+
+ src = fetchFromGitHub {
+ rev = "v${version}";
+ owner = "gruntwork-io";
+ repo = "terragrunt";
+ sha256 = "0aakr17yzh5jzvlmg3pzpnsfwl31njg27bpck541492shqcqmkiz";
+ };
+
+ goDeps = ./deps.nix;
+
+ buildInputs = [ makeWrapper ];
+
+ preBuild = ''
+ buildFlagsArray+=("-ldflags" "-X main.VERSION=v${version}")
+ '';
+
+ postInstall = ''
+ wrapProgram $bin/bin/terragrunt \
+ --set TERRAGRUNT_TFPATH ${lib.getBin terraform}/bin/terraform
+ '';
+
+ meta = with stdenv.lib; {
+ description = "A thin wrapper for Terraform that supports locking for Terraform state and enforces best practices.";
+ homepage = https://github.com/gruntwork-io/terragrunt/;
+ license = licenses.mit;
+ maintainers = with maintainers; [ peterhoeg ];
+ };
+}
diff --git a/pkgs/applications/networking/cluster/terragrunt/default.nix b/pkgs/applications/networking/cluster/terragrunt/default.nix
index 4c5c6fe53ce8..28fc7fcc6662 100644
--- a/pkgs/applications/networking/cluster/terragrunt/default.nix
+++ b/pkgs/applications/networking/cluster/terragrunt/default.nix
@@ -2,7 +2,7 @@
buildGoPackage rec {
name = "terragrunt-${version}";
- version = "0.10.1";
+ version = "0.11.0";
goPackagePath = "github.com/gruntwork-io/terragrunt";
@@ -10,13 +10,17 @@ buildGoPackage rec {
rev = "v${version}";
owner = "gruntwork-io";
repo = "terragrunt";
- sha256 = "04q9wm8dnbm1pcy9i3c7ral49k3z10a7gx7h6h4bsvjy1sdf58vz";
+ sha256 = "0i0ds6llkzrn6a0qq53d2pbb6ghc47lnd004zqfbgn3kwiajx73b";
};
goDeps = ./deps.nix;
buildInputs = [ makeWrapper ];
+ preBuild = ''
+ buildFlagsArray+=("-ldflags" "-X main.VERSION=v${version}")
+ '';
+
postInstall = ''
wrapProgram $bin/bin/terragrunt \
--set TERRAGRUNT_TFPATH ${lib.getBin terraform}/bin/terraform
diff --git a/pkgs/applications/networking/cluster/terragrunt/deps.nix b/pkgs/applications/networking/cluster/terragrunt/deps.nix
index bb438ef4e326..31f9f9a2b703 100644
--- a/pkgs/applications/networking/cluster/terragrunt/deps.nix
+++ b/pkgs/applications/networking/cluster/terragrunt/deps.nix
@@ -5,8 +5,8 @@
fetch = {
type = "git";
url = "https://github.com/aws/aws-sdk-go";
- rev = "f85f603a3e5b4d0eb9516dddb33778918f3b45c6";
- sha256 = "10frgavkbsqpfninrlgwh64qjx9rwyjzbdfrikciv75v1gljh6zv";
+ rev = "78568b07950e5e7948496878fe99b9436add41d4";
+ sha256 = "0qi3q9qx8k055i2hlc6n8agl7nw1hzcw7aqqykla6z0hjv2hq0c3";
};
}
{
@@ -50,8 +50,8 @@
fetch = {
type = "git";
url = "https://github.com/hashicorp/hcl";
- rev = "372e8ddaa16fd67e371e9323807d056b799360af";
- sha256 = "1hv8p1858k1b99p3yc2jj6h77bl0iv9ziyzyp4w3xlcci2s13hnr";
+ rev = "630949a3c5fa3c613328e1b8256052cbc2327c9b";
+ sha256 = "00lalg0gz7218gnw6zgn28gfizpcl8zw8jpkghn681vj7lfah5dh";
};
}
{
@@ -95,8 +95,8 @@
fetch = {
type = "git";
url = "https://github.com/urfave/cli";
- rev = "2526b57c56f30b50466c96c4133b1a4ad0f0191f";
- sha256 = "03vvr1wq4pw2fixxsbr1d623hwqxf93d07p8vjml6iyd6k97b15p";
+ rev = "9e5b04886c4bfee2ceba1465b8121057355c4e53";
+ sha256 = "18jx6ypc1w02ha37rsx6hhmdwqmnybajd6l54qm07bdb850ip9db";
};
}
]
diff --git a/pkgs/applications/networking/corebird/default.nix b/pkgs/applications/networking/corebird/default.nix
index 3ceb9c4d8164..b4197a12db3f 100644
--- a/pkgs/applications/networking/corebird/default.nix
+++ b/pkgs/applications/networking/corebird/default.nix
@@ -1,15 +1,16 @@
{ stdenv, fetchFromGitHub, gtk3, json_glib, sqlite, libsoup, gettext, vala_0_32
-, automake, autoconf, libtool, pkgconfig, gnome3, gst_all_1, wrapGAppsHook }:
+, automake, autoconf, libtool, pkgconfig, gnome3, gst_all_1, wrapGAppsHook
+, glib_networking }:
stdenv.mkDerivation rec {
- version = "1.3.3";
+ version = "1.4.2";
name = "corebird-${version}";
src = fetchFromGitHub {
owner = "baedert";
repo = "corebird";
rev = version;
- sha256 = "09k0jrhjqrmpvyz5pf1g7wkidflkhpvw5869a95vnhfxjd45kzs3";
+ sha256 = "0s28q9c7p4p4jyhb1g6gdwdphlf6yhi6yg4yn8bkd0gmyf9acakb";
};
preConfigure = ''
@@ -19,7 +20,7 @@ stdenv.mkDerivation rec {
nativeBuildInputs = [ automake autoconf libtool pkgconfig wrapGAppsHook ];
buildInputs = [
- gtk3 json_glib sqlite libsoup gettext vala_0_32 gnome3.rest
+ gtk3 json_glib sqlite libsoup gettext vala_0_32 gnome3.rest gnome3.dconf gnome3.gspell glib_networking
] ++ (with gst_all_1; [ gstreamer gst-plugins-base gst-plugins-good gst-plugins-bad gst-libav ]);
meta = {
diff --git a/pkgs/applications/networking/droopy/default.nix b/pkgs/applications/networking/droopy/default.nix
index 8be5ee3c775a..93ff39bde64f 100644
--- a/pkgs/applications/networking/droopy/default.nix
+++ b/pkgs/applications/networking/droopy/default.nix
@@ -25,7 +25,7 @@ stdenv.mkDerivation rec {
description = "Mini Web server that let others upload files to your computer";
homepage = http://stackp.online.fr/droopy;
license = licenses.bsd3;
- maintainers = maintainers.profpatsch;
+ maintainers = [ maintainers.profpatsch ];
};
}
diff --git a/pkgs/applications/networking/dropbox-cli/default.nix b/pkgs/applications/networking/dropbox-cli/default.nix
index 892d8fa33009..18c55c80fc08 100644
--- a/pkgs/applications/networking/dropbox-cli/default.nix
+++ b/pkgs/applications/networking/dropbox-cli/default.nix
@@ -18,6 +18,8 @@ stdenv.mkDerivation {
installPhase = ''
mkdir -p "$out/bin/" "$out/share/applications"
cp data/dropbox.desktop "$out/share/applications"
+ cp -a data/icons "$out/share/icons"
+ find "$out/share/icons" -type f \! -name '*.png' -delete
substitute "dropbox.in" "$out/bin/dropbox" \
--replace '@PACKAGE_VERSION@' ${version} \
--replace '@DESKTOP_FILE_DIR@' "$out/share/applications" \
diff --git a/pkgs/applications/networking/dropbox/default.nix b/pkgs/applications/networking/dropbox/default.nix
index a083b17dcb04..44caf615205c 100644
--- a/pkgs/applications/networking/dropbox/default.nix
+++ b/pkgs/applications/networking/dropbox/default.nix
@@ -3,7 +3,7 @@
, libdrm, libffi, libICE, libSM
, libX11, libXcomposite, libXext, libXmu, libXrender, libxcb
, libxml2, libxslt, ncurses, zlib
-, qtbase, qtdeclarative, qtwebkit
+, qtbase, qtdeclarative, qtwebkit, makeQtWrapper
}:
# this package contains the daemon version of dropbox
@@ -23,11 +23,11 @@
let
# NOTE: When updating, please also update in current stable,
# as older versions stop working
- version = "19.4.13";
+ version = "23.4.17";
sha256 =
{
- "x86_64-linux" = "06lgmjj204xpid35cqrp2msasg4s4w6lf1zpz1lnk3f9x6q10254";
- "i686-linux" = "1kdj3c5s8s4smd52p2mqbzjsk68a9cd5f8x92xgsx9zzdzjqmagl";
+ "x86_64-linux" = "047i6afghb2nphwwc8sd6dxcbfi9cdyb1w4ssvwfkmbf3mznpfrh";
+ "i686-linux" = "186z540iv4gq2gmis3mjly070y09lsfwvk9ygmjrh6y7pd9dqa5n";
}."${stdenv.system}" or (throw "system ${stdenv.system} not supported");
arch =
@@ -68,31 +68,23 @@ in stdenv.mkDerivation {
sourceRoot = ".dropbox-dist";
- nativeBuildInputs = [ makeWrapper patchelf ];
- dontPatchELF = true; # patchelf invoked explicitly below
+ nativeBuildInputs = [ makeQtWrapper patchelf ];
dontStrip = true; # already done
installPhase = ''
mkdir -p "$out/${appdir}"
cp -r --no-preserve=mode "dropbox-lnx.${arch}-${version}"/* "$out/${appdir}/"
+ # Vendored libraries interact poorly with our graphics drivers
rm "$out/${appdir}/libdrm.so.2"
rm "$out/${appdir}/libffi.so.6"
rm "$out/${appdir}/libGL.so.1"
rm "$out/${appdir}/libX11-xcb.so.1"
- rm "$out/${appdir}/libQt5Core.so.5"
- rm "$out/${appdir}/libQt5DBus.so.5"
- rm "$out/${appdir}/libQt5Gui.so.5"
- rm "$out/${appdir}/libQt5Network.so.5"
- rm "$out/${appdir}/libQt5OpenGL.so.5"
- rm "$out/${appdir}/libQt5PrintSupport.so.5"
- rm "$out/${appdir}/libQt5Qml.so.5"
- rm "$out/${appdir}/libQt5Quick.so.5"
- rm "$out/${appdir}/libQt5Sql.so.5"
- rm "$out/${appdir}/libQt5WebKit.so.5"
- rm "$out/${appdir}/libQt5WebKitWidgets.so.5"
- rm "$out/${appdir}/libQt5XcbQpa.so.5"
+ # Cannot use vendored Qt libraries due to problem with xkbcommon
+ rm "$out/${appdir}/"libQt5*.so.5
+ rm "$out/${appdir}/qt.conf"
+ rm -fr "$out/${appdir}/plugins"
mkdir -p "$out/share/applications"
cp "${desktopItem}/share/applications/"* $out/share/applications
@@ -102,7 +94,7 @@ in stdenv.mkDerivation {
mkdir -p "$out/bin"
RPATH="${ldpath}:$out/${appdir}"
- makeWrapper "$out/${appdir}/dropbox" "$out/bin/dropbox" \
+ makeQtWrapper "$out/${appdir}/dropbox" "$out/bin/dropbox" \
--prefix LD_LIBRARY_PATH : "$RPATH"
chmod 755 $out/${appdir}/dropbox
@@ -112,33 +104,22 @@ in stdenv.mkDerivation {
INTERP=$(cat $NIX_CC/nix-support/dynamic-linker)
RPATH="${ldpath}:$out/${appdir}"
getType='s/ *Type: *\([A-Z]*\) (.*/\1/'
- find "$out/${appdir}" -type f -a -perm -0100 -print | while read obj; do
+ find "$out/${appdir}" -type f -print | while read obj; do
dynamic=$(readelf -S "$obj" 2>/dev/null | grep "DYNAMIC" || true)
-
if [[ -n "$dynamic" ]]; then
- type=$(readelf -h "$obj" 2>/dev/null | grep 'Type:' | sed -e "$getType")
-
- if [[ "$type" == "EXEC" ]]; then
+ if readelf -l "$obj" 2>/dev/null | grep "INTERP" >/dev/null; then
echo "patching interpreter path in $type $obj"
patchelf --set-interpreter "$INTERP" "$obj"
+ fi
+
+ type=$(readelf -h "$obj" 2>/dev/null | grep 'Type:' | sed -e "$getType")
+ if [ "$type" == "EXEC" ] || [ "$type" == "DYN" ]; then
echo "patching RPATH in $type $obj"
oldRPATH=$(patchelf --print-rpath "$obj")
patchelf --set-rpath "''${oldRPATH:+$oldRPATH:}$RPATH" "$obj"
- echo "shrinking RPATH in $type $obj"
- patchelf --shrink-rpath "$obj"
-
- elif [[ "$type" == "DYN" ]]; then
-
- echo "patching RPATH in $type $obj"
- oldRPATH=$(patchelf --print-rpath "$obj")
- patchelf --set-rpath "''${oldRPATH:+$oldRPATH:}$RPATH" "$obj"
-
- echo "shrinking RPATH in $type $obj"
- patchelf --shrink-rpath "$obj"
-
else
echo "unknown ELF type \"$type\"; not patching $obj"
diff --git a/pkgs/applications/networking/esniper/default.nix b/pkgs/applications/networking/esniper/default.nix
index bf6da8c207a0..b7bc2c6c67a0 100644
--- a/pkgs/applications/networking/esniper/default.nix
+++ b/pkgs/applications/networking/esniper/default.nix
@@ -1,11 +1,11 @@
{ stdenv, fetchurl, openssl, curl, coreutils, gawk, bash, which }:
-stdenv.mkDerivation {
- name = "esniper-2.32.0";
+stdenv.mkDerivation rec {
+ name = "esniper-2.33.0";
src = fetchurl {
- url = "mirror://sourceforge/esniper/esniper-2-32-0.tgz";
- sha256 = "04lka4d0mnrwc369yzvq28n8qi1qbm8810ykx6d0a4kaghiybqsy";
+ url = "mirror://sourceforge/esniper/${stdenv.lib.replaceStrings ["."] ["-"] name}.tgz";
+ sha256 = "1pck2x7mp7ip0b21v2sjvq86fz12gzw6kig4vvbrghz5xw5b3f69";
};
buildInputs = [ openssl curl ];
diff --git a/pkgs/applications/networking/feedreaders/rss2email/default.nix b/pkgs/applications/networking/feedreaders/rss2email/default.nix
new file mode 100644
index 000000000000..6b92db9efa55
--- /dev/null
+++ b/pkgs/applications/networking/feedreaders/rss2email/default.nix
@@ -0,0 +1,29 @@
+{ pythonPackages, fetchurl, lib }:
+
+with pythonPackages;
+
+buildPythonApplication rec {
+ name = "${pname}-${version}";
+ pname = "rss2email";
+ version = "3.9";
+
+ propagatedBuildInputs = [ feedparser beautifulsoup4 html2text ];
+
+ src = fetchurl {
+ url = "mirror://pypi/r/rss2email/${name}.tar.gz";
+ sha256 = "02wj9zhmc2ym8ba1i0z9pm1c622z2fj7fxwagnxbvpr1402ahmr5";
+ };
+
+ postInstall = ''
+ install -Dm 644 r2e.1 $out/share/man/man1/r2e.1
+ # an alias for better finding the manpage
+ ln -s -T r2e.1 $out/share/man/man1/rss2email.1
+ '';
+
+ meta = with lib; {
+ description = "A tool that converts RSS/Atom newsfeeds to email.";
+ homepage = "https://pypi.python.org/pypi/rss2email";
+ license = licenses.gpl2;
+ maintainers = with maintainers; [ jb55 profpatsch ];
+ };
+}
diff --git a/pkgs/applications/networking/ftp/filezilla/default.nix b/pkgs/applications/networking/ftp/filezilla/default.nix
index 984616173cb6..ffc22429d1e7 100644
--- a/pkgs/applications/networking/ftp/filezilla/default.nix
+++ b/pkgs/applications/networking/ftp/filezilla/default.nix
@@ -1,13 +1,13 @@
{ stdenv, fetchurl, dbus, gnutls, wxGTK30, libidn, tinyxml, gettext
, pkgconfig, xdg_utils, gtk2, sqlite, pugixml, libfilezilla, nettle }:
-let version = "3.24.0"; in
+let version = "3.25.1"; in
stdenv.mkDerivation {
name = "filezilla-${version}";
src = fetchurl {
url = "mirror://sourceforge/project/filezilla/FileZilla_Client/${version}/FileZilla_${version}_src.tar.bz2";
- sha256 = "1bacrl8lj90hqbh129hpbgqj78k1i84j83rkzn507jnykj4x8p9x";
+ sha256 = "1h9g26i16wvc3yjavd39lxifr8d21q9mvfidnwjp9ksrc1qvwww8";
};
configureFlags = [
diff --git a/pkgs/applications/networking/google-drive-ocamlfuse/default.nix b/pkgs/applications/networking/google-drive-ocamlfuse/default.nix
index 64519ce17d5b..674cf60161db 100644
--- a/pkgs/applications/networking/google-drive-ocamlfuse/default.nix
+++ b/pkgs/applications/networking/google-drive-ocamlfuse/default.nix
@@ -1,5 +1,5 @@
{ stdenv, fetchurl, zlib
-, ocaml, ocamlfuse, findlib, gapi_ocaml, ocaml_sqlite3, camlidl }:
+, ocaml, ocamlbuild, ocamlfuse, findlib, gapi_ocaml, ocaml_sqlite3, camlidl }:
stdenv.mkDerivation rec {
name = "google-drive-ocamlfuse-${version}";
@@ -10,7 +10,7 @@ stdenv.mkDerivation rec {
sha256 = "1ldja7080pnjaibrbdvfqwakp4mac8yw1lkb95f7lgldmy96lxas";
};
- buildInputs = [ zlib ocaml ocamlfuse findlib gapi_ocaml ocaml_sqlite3 camlidl];
+ buildInputs = [ zlib ocaml ocamlbuild ocamlfuse findlib gapi_ocaml ocaml_sqlite3 camlidl];
configurePhase = "ocaml setup.ml -configure --prefix \"$out\"";
buildPhase = "ocaml setup.ml -build";
diff --git a/pkgs/applications/networking/instant-messengers/baresip/default.nix b/pkgs/applications/networking/instant-messengers/baresip/default.nix
index 3ce638e6b58a..90b2695f0039 100644
--- a/pkgs/applications/networking/instant-messengers/baresip/default.nix
+++ b/pkgs/applications/networking/instant-messengers/baresip/default.nix
@@ -1,19 +1,19 @@
{stdenv, fetchurl, zlib, openssl, libre, librem, pkgconfig
-, cairo, mpg123, gstreamer, gst_ffmpeg, gst_plugins_base, gst_plugins_bad
-, gst_plugins_good, alsaLib, SDL, libv4l, celt, libsndfile, srtp, ffmpeg
-, gsm, speex, portaudio, spandsp, libuuid, ccache
+, cairo, mpg123, gstreamer, gst-ffmpeg, gst-plugins-base, gst-plugins-bad
+, gst-plugins-good, alsaLib, SDL, libv4l, celt, libsndfile, srtp, ffmpeg
+, gsm, speex, portaudio, spandsp, libuuid, ccache, libvpx
}:
stdenv.mkDerivation rec {
- version = "0.5.0";
+ version = "0.5.1";
name = "baresip-${version}";
src=fetchurl {
url = "http://www.creytiv.com/pub/baresip-${version}.tar.gz";
- sha256 = "0dhlgjkqn7jkd1pmdyid41c829clzmi5kczjdwxzh5ygn95lydjc";
+ sha256 = "0yi80gi2vb600n7wi6mk81zfdi1n5pg1dsz7458sb3z5cv5gj8yg";
};
buildInputs = [zlib openssl libre librem pkgconfig
- cairo mpg123 gstreamer gst_ffmpeg gst_plugins_base gst_plugins_bad gst_plugins_good
+ cairo mpg123 gstreamer gst-ffmpeg gst-plugins-base gst-plugins-bad gst-plugins-good
alsaLib SDL libv4l celt libsndfile srtp ffmpeg gsm speex portaudio spandsp libuuid
- ccache
+ ccache libvpx
];
makeFlags = [
"LIBRE_MK=${libre}/share/re/re.mk"
@@ -24,21 +24,22 @@ stdenv.mkDerivation rec {
"USE_VIDEO=1"
"CCACHE_DISABLE=1"
- "USE_ALSA=1" "USE_AMR=1" "USE_CAIRO=1" "USE_CELT=1"
- "USE_CONS=1" "USE_EVDEV=1" "USE_FFMPEG=1" "USE_GSM=1" "USE_GST=1"
- "USE_L16=1" "USE_MPG123=1" "USE_OSS=1" "USE_PLC=1"
- "USE_PORTAUDIO=1" "USE_SDL=1" "USE_SNDFILE=1" "USE_SPEEX=1"
- "USE_SPEEX_AEC=1" "USE_SPEEX_PP=1" "USE_SPEEX_RESAMP=1" "USE_SRTP=1"
+ "USE_ALSA=1" "USE_AMR=1" "USE_CAIRO=1" "USE_CELT=1"
+ "USE_CONS=1" "USE_EVDEV=1" "USE_FFMPEG=1" "USE_GSM=1" "USE_GST=1"
+ "USE_L16=1" "USE_MPG123=1" "USE_OSS=1" "USE_PLC=1" "USE_VPX=1"
+ "USE_PORTAUDIO=1" "USE_SDL=1" "USE_SNDFILE=1" "USE_SPEEX=1"
+ "USE_SPEEX_AEC=1" "USE_SPEEX_PP=1" "USE_SPEEX_RESAMP=1" "USE_SRTP=1"
"USE_STDIO=1" "USE_SYSLOG=1" "USE_UUID=1" "USE_V4L2=1" "USE_X11=1"
"USE_BV32=" "USE_COREAUDIO=" "USE_G711=1" "USE_G722=1" "USE_G722_1="
- "USE_ILBC=" "USE_OPUS=" "USE_SILK="
+ "USE_ILBC=" "USE_OPUS=" "USE_SILK="
]
++ stdenv.lib.optional (stdenv.cc.cc != null) "SYSROOT_ALT=${stdenv.cc.cc}"
++ stdenv.lib.optional (stdenv.cc.libc != null) "SYSROOT=${stdenv.cc.libc}"
;
+
NIX_CFLAGS_COMPILE='' -I${librem}/include/rem -I${gsm}/include/gsm
- -DHAVE_INTTYPES_H -D__GLIBC__
+ -DHAVE_INTTYPES_H -D__GLIBC__
-D__need_timeval -D__need_timespec -D__need_time_t '';
meta = {
homepage = "http://www.creytiv.com/baresip.html";
diff --git a/pkgs/applications/networking/instant-messengers/bitlbee-facebook/default.nix b/pkgs/applications/networking/instant-messengers/bitlbee-facebook/default.nix
index bfd4e11ccac1..5645e1cebaa8 100644
--- a/pkgs/applications/networking/instant-messengers/bitlbee-facebook/default.nix
+++ b/pkgs/applications/networking/instant-messengers/bitlbee-facebook/default.nix
@@ -2,16 +2,19 @@
with stdenv.lib;
stdenv.mkDerivation rec {
- name = "bitlbee-facebook-2015-08-27";
+ name = "bitlbee-facebook-${version}";
+ version = "1.1.0";
src = fetchFromGitHub {
- rev = "094a11b542e2cd8fac4f00fe01870ecd1cb4c062";
+ rev = "v${version}";
owner = "jgeboski";
repo = "bitlbee-facebook";
- sha256 = "1dvbl1z6fl3wswvqbs82vkqlggk24dyi8w7cmm5jh1fmaznmwqrl";
+ sha256 = "0qclyc2zz8144dc42bhfv2xxrahpiv9j2iwq9h3cmfxszvkb8r3s";
};
- buildInputs = [ bitlbee autoconf automake libtool pkgconfig glib json_glib ];
+ nativeBuildInputs = [ autoconf automake libtool pkgconfig ];
+
+ buildInputs = [ bitlbee glib json_glib ];
preConfigure = ''
export BITLBEE_PLUGINDIR=$out/lib/bitlbee
diff --git a/pkgs/applications/networking/instant-messengers/choqok/default.nix b/pkgs/applications/networking/instant-messengers/choqok/default.nix
deleted file mode 100644
index a50779f53dd0..000000000000
--- a/pkgs/applications/networking/instant-messengers/choqok/default.nix
+++ /dev/null
@@ -1,26 +0,0 @@
-{ stdenv, fetchurl, cmake, qt4, perl, gettext, libXScrnSaver
-, kdelibs, kdepimlibs, automoc4, pkgconfig, phonon, qca2, qjson, qoauth }:
-
-let
- pn = "choqok";
- v = "1.5";
-in
-
-stdenv.mkDerivation rec {
- name = "${pn}-${v}";
-
- src = fetchurl {
- url = "mirror://sourceforge/project/choqok/Choqok/choqok-1.5.tar.xz";
- sha256 = "5cb97ac4cdf9db4699bb7445a9411393073d213fea649ab0713f659f1308efe4";
- };
-
- buildInputs = [ cmake qt4 perl gettext libXScrnSaver kdelibs kdepimlibs
- automoc4 pkgconfig phonon qca2 qjson qoauth ];
-
- meta = with stdenv.lib; {
- description = "A KDE microblogging client";
- repositories.git = git://anongit.kde.org/choqok;
- license = "GPL";
- inherit (kdelibs.meta) maintainers platforms;
- };
-}
diff --git a/pkgs/applications/networking/instant-messengers/ekiga/default.nix b/pkgs/applications/networking/instant-messengers/ekiga/default.nix
index 9c7204b7fa10..575759ad4372 100644
--- a/pkgs/applications/networking/instant-messengers/ekiga/default.nix
+++ b/pkgs/applications/networking/instant-messengers/ekiga/default.nix
@@ -45,6 +45,7 @@ stdenv.mkDerivation rec {
description = "VOIP/Videoconferencing app with full SIP and H.323 support";
maintainers = [ maintainers.raskin ];
platforms = platforms.linux;
+ broken = true; # because of glibc-2.25
};
passthru = {
diff --git a/pkgs/applications/networking/instant-messengers/freetalk/default.nix b/pkgs/applications/networking/instant-messengers/freetalk/default.nix
index 01707dd1ff32..ca8d7f2076ec 100644
--- a/pkgs/applications/networking/instant-messengers/freetalk/default.nix
+++ b/pkgs/applications/networking/instant-messengers/freetalk/default.nix
@@ -1,42 +1,35 @@
-{ stdenv, fetchgit
+{ stdenv, fetchFromGitHub
, guile, pkgconfig, glib, loudmouth, gmp, libidn, readline, libtool
, libunwind, ncurses, curl, jansson, texinfo
, automake, autoconf
}:
-let
- s = rec {
- baseName="freetalk";
- version="4.0rc6";
- name="${baseName}-${version}";
- url="https://github.com/GNUFreetalk/freetalk";
- rev = "refs/tags/v${version}";
- sha256="1wr3q40f4gwmr0vm6w07d5vzr65q6llk9xxq75klpcj83va5l3xv";
+stdenv.mkDerivation rec {
+ name = "freetalk-${version}";
+ version = "4.1";
+
+ src = fetchFromGitHub {
+ owner = "GNUFreetalk";
+ repo = "freetalk";
+ rev = "v${version}";
+ sha256 = "09jwk2i8qd8c7wrn9xbqcwm32720dwxis22kf3jpbg8mn6w6i757";
};
- buildInputs = [
+
+ preConfigure = ''
+ ./autogen.sh
+ '';
+
+ buildInputs = [
guile pkgconfig glib loudmouth gmp libidn readline libtool
libunwind ncurses curl jansson texinfo
autoconf automake
];
-in
-stdenv.mkDerivation {
- inherit (s) name version;
- inherit buildInputs;
- src = fetchgit {
- inherit (s) url rev sha256;
- };
- preConfigure = ''
- patchShebangs .
- ./autogen.sh
- '';
-
- meta = {
- inherit (s) version;
+ meta = with stdenv.lib; {
description = "Console XMPP client";
- license = stdenv.lib.licenses.gpl3Plus ;
- maintainers = [stdenv.lib.maintainers.raskin];
- platforms = stdenv.lib.platforms.linux;
+ license = licenses.gpl3Plus ;
+ maintainers = with maintainers; [ raskin ];
+ platforms = platforms.linux;
downloadPage = "http://www.gnu.org/software/freetalk/";
};
}
diff --git a/pkgs/applications/networking/instant-messengers/gajim/default.nix b/pkgs/applications/networking/instant-messengers/gajim/default.nix
index d78bd759ea6e..1228804f5b95 100644
--- a/pkgs/applications/networking/instant-messengers/gajim/default.nix
+++ b/pkgs/applications/networking/instant-messengers/gajim/default.nix
@@ -4,7 +4,7 @@
# Test requirements
, xvfb_run
-, enableJingle ? true, farstream ? null, gst_plugins_bad ? null
+, enableJingle ? true, farstream ? null, gst-plugins-bad ? null
, libnice ? null
, enableE2E ? true
, enableRST ? true
@@ -14,7 +14,7 @@
, extraPythonPackages ? pkgs: []
}:
-assert enableJingle -> farstream != null && gst_plugins_bad != null
+assert enableJingle -> farstream != null && gst-plugins-bad != null
&& libnice != null;
assert enableE2E -> pythonPackages.pycrypto != null;
assert enableRST -> pythonPackages.docutils != null;
@@ -25,30 +25,22 @@ with stdenv.lib;
stdenv.mkDerivation rec {
name = "gajim-${version}";
- version = "0.16.6";
+ version = "0.16.7";
src = fetchurl {
name = "${name}.tar.bz2";
url = "https://dev.gajim.org/gajim/gajim/repository/archive.tar.bz2?"
+ "ref=${name}";
- sha256 = "1s0h4xll9490vh7ygmi4zsd1fa107f3s9ykhpq0snb04fllwhjq7";
+ sha256 = "18srrsswq09i54gcqqy0ylmrix1rrq43f0b8sz1lijr39h3ayw3j";
};
patches = let
# An attribute set of revisions to apply from the upstream repository.
cherries = {
- misc-test-fixes = {
- rev = "1f0d7387fd020df5dfc9a6349005ec7dedb7c008";
- sha256 = "0nazpzyg50kl0k8z4dkn033933iz60g1i6nzhib1nmzhwwbnacc5";
- };
- jingle-fix = {
- rev = "491d32a2ec13ed3a482e151e0b403eda7b4151b8";
- sha256 = "1pfg1ysr0p6rcwmd8ikjs38av3c4gcxn8pxr6cnnj27n85gvi30g";
- };
- fix-connection-mock = {
- rev = "46a19733d208fbd2404cbaeedd8c203d0b6557a4";
- sha256 = "0l3s577pksnz16r4mqa1zmz4y165amsx2mclrm4vzlszy35rmy2b";
- };
+ #example-fix = {
+ # rev = "";
+ # sha256 = "";
+ #};
};
in mapAttrsToList (name: { rev, sha256 }: fetchurl {
name = "gajim-${name}.patch";
@@ -77,7 +69,7 @@ stdenv.mkDerivation rec {
buildInputs = [
python libX11
- ] ++ optionals enableJingle [ farstream gst_plugins_bad libnice ];
+ ] ++ optionals enableJingle [ farstream gst-plugins-bad libnice ];
nativeBuildInputs = [
autoreconfHook pythonPackages.wrapPython intltool pkgconfig
diff --git a/pkgs/applications/networking/instant-messengers/jitsi/default.nix b/pkgs/applications/networking/instant-messengers/jitsi/default.nix
index ee05f16a8f4f..c4cb25dfe987 100644
--- a/pkgs/applications/networking/instant-messengers/jitsi/default.nix
+++ b/pkgs/applications/networking/instant-messengers/jitsi/default.nix
@@ -6,16 +6,14 @@
assert stdenv.isLinux;
stdenv.mkDerivation rec {
-
name = "jitsi-${version}";
- version = "2.8.5426";
+ version = "2.10.5550";
src = fetchurl {
url = "https://download.jitsi.org/jitsi/src/jitsi-src-${version}.zip";
- sha256 = "0v7k16in2i57z5amr7k5c3fc8f0azrzrs5dvn729bwbc31z8cjg6";
+ sha256 = "11vjchc3dnzj55x7c62wsm6masvwmij1ifkds917r1qvil1nzz6d";
};
-
patches = [ ./jitsi.patch ];
jitsiItem = makeDesktopItem {
@@ -42,7 +40,8 @@ stdenv.mkDerivation rec {
xorg.libXv
]);
- buildInputs = [unzip ant jdk];
+ nativeBuildInputs = [ unzip ];
+ buildInputs = [ ant jdk ];
buildPhase = ''ant make'';
@@ -55,11 +54,11 @@ stdenv.mkDerivation rec {
cp resources/install/generic/run.sh $out/bin/jitsi
chmod +x $out/bin/jitsi
substituteInPlace $out/bin/jitsi \
- --subst-var-by JAVA ${jdk}/bin/java \
- --subst-var-by EXTRALIBS ${gtk2.out}/lib
+ --subst-var-by JAVA ${jdk}/bin/java \
+ --subst-var-by EXTRALIBS ${gtk2.out}/lib
+ sed -e 's,^java\ ,${jdk}/bin/java ,' -i $out/bin/jitsi
patchShebangs $out
-
- libPath="$libPath:${jdk.jre.home}/lib/${jdk.architecture}"
+ libPath="$libPath:${jdk.home}/lib/${jdk.architecture}"
find $out/ -type f -name '*.so' | while read file; do
patchelf --set-rpath "$libPath" "$file" && \
patchelf --shrink-rpath "$file"
@@ -71,7 +70,6 @@ stdenv.mkDerivation rec {
description = "Open Source Video Calls and Chat";
license = licenses.lgpl21Plus;
platforms = platforms.linux;
- maintainers = [ maintainers.khumba ];
+ maintainers = with maintainers; [ khumba ndowens ];
};
-
}
diff --git a/pkgs/applications/networking/instant-messengers/jitsi/jitsi.patch b/pkgs/applications/networking/instant-messengers/jitsi/jitsi.patch
index 9db7ec368b08..e477bdfe2fd4 100644
--- a/pkgs/applications/networking/instant-messengers/jitsi/jitsi.patch
+++ b/pkgs/applications/networking/instant-messengers/jitsi/jitsi.patch
@@ -8,20 +8,20 @@
+#mkdir -p $HOME/.sip-communicator/log
+
+cd "$(dirname "$(dirname "$(readlink -f "${BASH_SOURCE[0]}")")")"
-
+
# Get architecture
ARCH=`uname -m | sed -e s/x86_64/64/ -e s/i.86/32/`
-@@ -6,10 +11,12 @@
+@@ -6,7 +11,9 @@
# Additionnal JVM arguments
CLIENTARGS=""
-
+
+NATIVELIBS="lib/native/linux-64"
- if [ $ARCH -eq 32 ]
+ if [ $ARCH = 32 ]
then
CLIENTARGS="-client -Xmx256m"
+ NATIVELIBS="lib/native/linux"
fi
-
+
export PATH=$PATH:native
-java $CLIENTARGS -classpath "lib/felix.jar:sc-bundles/sc-launcher.jar:sc-bundles/util.jar:lib/" -Djava.library.path=native -Dfelix.config.properties=file:./lib/felix.client.run.properties -Djava.util.logging.config.file=lib/logging.properties net.java.sip.communicator.launcher.SIPCommunicator
+LD_LIBRARY_PATH=@EXTRALIBS@ exec @JAVA@ $CLIENTARGS -classpath "lib/felix.jar:sc-bundles/sc-launcher.jar:sc-bundles/util.jar:lib/" -Djava.library.path=$NATIVELIBS -Dfelix.config.properties=file:lib/felix.client.run.properties -Djava.util.logging.config.file=lib/logging.properties net.java.sip.communicator.launcher.SIPCommunicator
diff --git a/pkgs/applications/networking/instant-messengers/messenger-for-desktop/default.nix b/pkgs/applications/networking/instant-messengers/messenger-for-desktop/default.nix
new file mode 100644
index 000000000000..f12a14c5c926
--- /dev/null
+++ b/pkgs/applications/networking/instant-messengers/messenger-for-desktop/default.nix
@@ -0,0 +1,104 @@
+{
+ stdenv, fetchurl, dpkg, alsaLib, atk, cairo, cups, curl, dbus, expat,
+ fontconfig, freetype, glib, gnome2, libnotify, nspr, nss, systemd, xorg
+}:
+
+with stdenv.lib;
+
+let
+
+ version = "2.0.6";
+
+ rpath = makeLibraryPath [
+ alsaLib
+ atk
+ cairo
+ cups
+ curl
+ dbus
+ expat
+ fontconfig
+ freetype
+ glib
+ gnome2.GConf
+ gnome2.gdk_pixbuf
+ gnome2.gtk
+ gnome2.pango
+ libnotify
+ nspr
+ nss
+ stdenv.cc.cc
+ systemd
+
+ xorg.libxkbfile
+ xorg.libX11
+ xorg.libXcomposite
+ xorg.libXcursor
+ xorg.libXdamage
+ xorg.libXext
+ xorg.libXfixes
+ xorg.libXi
+ xorg.libXrandr
+ xorg.libXrender
+ xorg.libXtst
+ xorg.libXScrnSaver
+ ] + ":${stdenv.cc.cc.lib}/lib64";
+
+ src =
+ if stdenv.system == "x86_64-linux" then
+ fetchurl {
+ url = "https://github.com/aluxian/Messenger-for-Desktop/releases/download/v2.0.6/messengerfordesktop-2.0.6-linux-amd64.deb";
+ sha256 = "bf3f3ed9ac46ceb4b7dffbeb33c7d15bbcbfcdd141c4dbfbb620e8bfefae906b";
+ }
+ else
+ throw "Messenger for Desktop is not supported on ${stdenv.system}";
+
+in stdenv.mkDerivation {
+ name = "messenger-for-desktop-${version}";
+
+ inherit src;
+
+ buildInputs = [ dpkg ];
+ unpackPhase = "true";
+ buildCommand = ''
+ mkdir -p $out
+ dpkg -x $src $out
+
+ mv $out/usr/share $out/share
+ mv $out/opt/messengerfordesktop $out/libexec
+ rmdir $out/usr $out/opt
+
+ chmod -R g-w $out
+
+ # patch the binaries
+ for file in $(find $out -type f \( -perm /0111 -o -name \*.so\* \) ); do
+ patchelf --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" "$file" || true
+ patchelf --set-rpath ${rpath}:$out/libexec $file || true
+ done
+
+ # add symlink to bin
+ mkdir -p $out/bin
+ ln -s $out/libexec/messengerfordesktop $out/bin/messengerfordesktop
+
+ # Fix the desktop link
+ substituteInPlace $out/share/applications/messengerfordesktop.desktop \
+ --replace /opt/messengerfordesktop/messengerfordesktop $out/bin/messengerfordesktop
+ '';
+
+ meta = {
+ description = "Bring messenger.com to your Linux desktop.";
+ longDescription = ''
+ A simple & beautiful desktop client for Facebook Messenger. Chat without
+ distractions on OS X, Windows and Linux. Not affiliated with Facebook.
+ This is NOT an official product.
+ '';
+ homepage = https://messengerfordesktop.org;
+ license = licenses.mit;
+ maintainers = [
+ maintainers.shawndellysse
+ ];
+ platforms = [
+ "x86_64-linux"
+ ];
+ };
+}
diff --git a/pkgs/applications/networking/instant-messengers/oneteam/default.nix b/pkgs/applications/networking/instant-messengers/oneteam/default.nix
deleted file mode 100644
index 3d70990f4620..000000000000
--- a/pkgs/applications/networking/instant-messengers/oneteam/default.nix
+++ /dev/null
@@ -1,64 +0,0 @@
-{ stdenv, fetchFromGitHub
-, perl, xulrunner, cmake, perlPackages, zip, unzip, pkgconfig
-, libpulseaudio, glib, gtk2, pixman, nspr, nss, libXScrnSaver
-, scrnsaverproto
-}:
-
-stdenv.mkDerivation rec {
- name = "oneteam-unstable-2013-02-21";
-
- src = fetchFromGitHub {
- repo = "oneteam";
- owner = "processone";
- rev = "c51bc545c3a32db4ea8b96e43b84fcfc6b8d3d2a";
- sha256 = "19104fwdaf0nnsr5w755fg8wwww5sh96wmn939gxa5ah155nf2w3";
- };
-
- nativeBuildInputs = [ pkgconfig cmake zip unzip ];
-
- buildInputs =
- [ perl xulrunner libpulseaudio glib gtk2 pixman nspr
- nss libXScrnSaver scrnsaverproto
- ] ++ [ perlPackages.SubName gtk2 glib ];
-
- postPatch = ''
- sed -e '1i#include ' -i src/rtp/otRTPDecoder.cpp src/rtp/otRTPEncoder.cpp
- '';
-
- cmakeBuildDir = "cmake-build";
- cmakeFlags = ["-D XPCOM_GECKO_SDK=${xulrunner}/lib/xulrunner-devel-${xulrunner.version}"];
-
- buildPhase = ''
- export NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE -I${nspr.dev}/include/nspr"
- cd src/components
- perl build.pl XULAPP 1
- cd ../../
- '';
-
- installPhase = ''
- TARGET_DIR="$out/share/oneteam/app"
- BUILD_DIR="$PWD"
- mkdir -p "$TARGET_DIR"
- cd "$TARGET_DIR"
- unzip "$BUILD_DIR/oneteam.xulapp"
- mkdir -p "$out/bin"
- echo "#! ${stdenv.shell}" > "$out/bin/oneteam"
- echo "\"${xulrunner}/bin/xulrunner\" \"$TARGET_DIR/application.ini\"" > "$out/bin/oneteam"
- chmod a+x "$out/bin/oneteam"
- mkdir -p "$out/share/doc"
- cp -r "$BUILD_DIR/docs" "$out/share/doc/oneteam"
- '';
-
- meta = {
- description = "An XMPP client";
- maintainers = with stdenv.lib.maintainers; [ raskin ];
- license = stdenv.lib.licenses.gpl2;
- homepage="http://oneteam.im";
- };
-
- passthru = {
- updateInfo = {
- downloadPage = "git://github.com/processone/oneteam";
- };
- };
-}
diff --git a/pkgs/applications/networking/instant-messengers/pidgin-plugins/purple-facebook/default.nix b/pkgs/applications/networking/instant-messengers/pidgin-plugins/purple-facebook/default.nix
index cc58736afa59..6e96719fd896 100644
--- a/pkgs/applications/networking/instant-messengers/pidgin-plugins/purple-facebook/default.nix
+++ b/pkgs/applications/networking/instant-messengers/pidgin-plugins/purple-facebook/default.nix
@@ -1,30 +1,58 @@
-{ stdenv, fetchFromGitHub, pidgin, glib, json_glib, mercurial, autoreconfHook } :
+{ stdenv, fetchFromGitHub, fetchhg, pidgin, glib, json_glib, mercurial, autoreconfHook } :
-stdenv.mkDerivation rec {
- name = "purple-facebook-${version}";
- version = "2016-04-09";
+
+let
+ pidginHg = fetchhg {
+ url = "https://bitbucket.org/pidgin/main";
+ # take from VERSION file
+ rev = "c9b74a765767";
+ sha256 = "07bjz87jpslsb4gdqvcwp79mkahls2mfhlmpaa5w6n4xqhahw4j3";
+ };
+
+in stdenv.mkDerivation rec {
+ name = "purple-facebook-0.9.3";
src = fetchFromGitHub {
owner = "dequis";
repo = "purple-facebook";
- rev = "66ee77378d82";
- sha256 = "0kr9idl79h70lacd3cvpmzvfd6il3b5xm2fj1sj96l7bjhiw9s3y";
+ rev = "v0.9.3-c9b74a765767";
+ sha256 = "10ncvg0arcxnd3cpb0nxry1plbws0mw9vhzjrhb40sv2i563dywb";
};
- preAutoreconf = "./autogen.sh";
+ postPatch = ''
+ # we do all patching from update.sh in preAutoreconf
+ echo "#!/bin/sh" > update.sh
+ '';
+
+ preAutoreconf = ''
+ for FILE in $(cat MANIFEST_PIDGIN); do
+ install -Dm644 "${pidginHg}/$FILE" "pidgin/$FILE" || true
+ done
+
+ touch $(cat MANIFEST_VOIDS)
+
+ patchdir="$(pwd)/patches"
+ pushd pidgin
+
+ for patch in $(ls -1 "$patchdir"); do
+ patch -p1 -i "$patchdir/$patch"
+ done
+ popd
+
+ ./autogen.sh
+ '';
makeFlags = [
"PLUGIN_DIR_PURPLE=/lib/pidgin/"
"DATA_ROOT_DIR_PURPLE=/share"
- "DESTDIR=$(out)"
];
- postInstall = ''
+ installPhase = ''
mkdir -p $out/lib/purple-2
cp pidgin/libpurple/protocols/facebook/.libs/*.so $out/lib/purple-2/
'';
- buildInputs = [ pidgin glib json_glib mercurial autoreconfHook];
+ buildInputs = [pidgin glib json_glib mercurial autoreconfHook];
meta = with stdenv.lib; {
inherit (src.meta) homepage;
diff --git a/pkgs/applications/networking/instant-messengers/pidgin-plugins/sipe/default.nix b/pkgs/applications/networking/instant-messengers/pidgin-plugins/sipe/default.nix
index 36be2517fbd0..6693550bd3b0 100644
--- a/pkgs/applications/networking/instant-messengers/pidgin-plugins/sipe/default.nix
+++ b/pkgs/applications/networking/instant-messengers/pidgin-plugins/sipe/default.nix
@@ -1,13 +1,13 @@
{ stdenv, fetchurl, pidgin, intltool, libxml2, nss, nspr }:
-let version = "1.20.0"; in
+let version = "1.22.0"; in
stdenv.mkDerivation {
name = "pidgin-sipe-${version}";
src = fetchurl {
url = "mirror://sourceforge/sipe/pidgin-sipe-${version}.tar.gz";
- sha256 = "14d8q9by531hfssm6ydn75xkgidka3ar4sy3czjdb03s1ps82srs";
+ sha256 = "1aeb348e2ba79b82b1fd102555f86cdc42eaa6f9e761b771d74c4f9c9cf15fc3";
};
meta = with stdenv.lib; {
diff --git a/pkgs/applications/networking/instant-messengers/pidgin/default.nix b/pkgs/applications/networking/instant-messengers/pidgin/default.nix
index def683882dc9..45aafba57f30 100644
--- a/pkgs/applications/networking/instant-messengers/pidgin/default.nix
+++ b/pkgs/applications/networking/instant-messengers/pidgin/default.nix
@@ -14,11 +14,11 @@
let unwrapped = stdenv.mkDerivation rec {
name = "pidgin-${version}";
majorVersion = "2";
- version = "${majorVersion}.11.0";
+ version = "${majorVersion}.12.0";
src = fetchurl {
url = "mirror://sourceforge/pidgin/${name}.tar.bz2";
- sha256 = "0crkggjj6y07v1kdwil9vw532b0vrs6p33nmlvdkpnl60m2169pp";
+ sha256 = "1y5p2mq3bfw35b66jsafmbva0w5gg1k99y9z8fyp3jfksqv3agcc";
};
inherit nss ncurses;
diff --git a/pkgs/applications/networking/instant-messengers/profanity/default.nix b/pkgs/applications/networking/instant-messengers/profanity/default.nix
index e556eeb72834..32f4f8f32b36 100644
--- a/pkgs/applications/networking/instant-messengers/profanity/default.nix
+++ b/pkgs/applications/networking/instant-messengers/profanity/default.nix
@@ -12,11 +12,11 @@ with stdenv.lib;
stdenv.mkDerivation rec {
name = "profanity-${version}";
- version = "0.5.0";
+ version = "0.5.1";
src = fetchurl {
url = "http://www.profanity.im/profanity-${version}.tar.gz";
- sha256 = "0s4njc4rcaii51qw1najxa0fa8bb2fnas00z47y94wdbdsmfhfvq";
+ sha256 = "1f7ylw3mhhnii52mmk40hyc4kqhpvjdr3hmsplzkdhsfww9kflg3";
};
buildInputs = [
@@ -35,5 +35,6 @@ stdenv.mkDerivation rec {
license = licenses.gpl3Plus;
platforms = platforms.linux;
maintainers = [ maintainers.devhell ];
+ updateWalker = true;
};
}
diff --git a/pkgs/applications/networking/instant-messengers/psi-plus/default.nix b/pkgs/applications/networking/instant-messengers/psi-plus/default.nix
new file mode 100644
index 000000000000..c4d13ac7643d
--- /dev/null
+++ b/pkgs/applications/networking/instant-messengers/psi-plus/default.nix
@@ -0,0 +1,47 @@
+{ stdenv, fetchFromGitHub, cmake
+, qt5, libidn, qca2-qt5, libXScrnSaver, hunspell
+, libgcrypt, libotr, html-tidy, libgpgerror
+}:
+
+stdenv.mkDerivation rec {
+ name = "psi-plus-${version}";
+ version = "0.16.575.639";
+
+ src = fetchFromGitHub {
+ owner = "psi-plus";
+ repo = "psi-plus-snapshots";
+ rev = "${version}";
+ sha256 = "0mn24y3y4qybw81rjy0hr46y7y96dvwdl6kk61kizwj32z1in8cg";
+ };
+
+ resources = fetchFromGitHub {
+ owner = "psi-plus";
+ repo = "resources";
+ rev = "8f5038380e1be884b04b5a1ad3cc3385e793f668";
+ sha256 = "1b8a2aixg966fzjwp9hz51rc31imyvpx014mp2fsm47k8na4470d";
+ };
+
+ postUnpack = ''
+ cp -a "${resources}/iconsets" "$sourceRoot"
+ '';
+
+ cmakeFlags = [
+ "-DENABLE_PLUGINS=ON"
+ ];
+
+ nativeBuildInputs = [ cmake ];
+
+ buildInputs = [
+ qt5.qtbase qt5.qtmultimedia qt5.qtx11extras qt5.qttools qt5.qtwebkit
+ libidn qca2-qt5 libXScrnSaver hunspell
+ libgcrypt libotr html-tidy libgpgerror
+ ];
+
+ enableParallelBuilding = true;
+
+ meta = with stdenv.lib; {
+ description = "XMPP (Jabber) client";
+ maintainers = with maintainers; [ orivej ];
+ platforms = platforms.linux;
+ };
+}
diff --git a/pkgs/applications/networking/instant-messengers/qtox/default.nix b/pkgs/applications/networking/instant-messengers/qtox/default.nix
index 036d7fb3ce52..41286331eb14 100644
--- a/pkgs/applications/networking/instant-messengers/qtox/default.nix
+++ b/pkgs/applications/networking/instant-messengers/qtox/default.nix
@@ -6,13 +6,13 @@
stdenv.mkDerivation rec {
name = "qtox-${version}";
- version = "1.8.1";
+ version = "1.9.0";
src = fetchFromGitHub {
owner = "tux3";
repo = "qTox";
rev = "v${version}";
- sha256 = "073kwfaw5n7vvcpwrpdbw5mlswbbwjipx7yy4a95r9z0gjljqnhq";
+ sha256 = "0l008mzrs1wsv5cbzxjkv3k48lghlcdsp8blqrkihjv5gcn3psml";
};
buildInputs = [
@@ -27,6 +27,10 @@ stdenv.mkDerivation rec {
nativeBuildInputs = [ cmake makeQtWrapper pkgconfig ];
+ cmakeFlags = [
+ "-DGIT_DESCRIBE=${version}"
+ ];
+
installPhase = ''
runHook preInstall
diff --git a/pkgs/applications/networking/instant-messengers/salut-a-toi/default.nix b/pkgs/applications/networking/instant-messengers/salut-a-toi/default.nix
index c035fc626651..f4f4aac5efa7 100644
--- a/pkgs/applications/networking/instant-messengers/salut-a-toi/default.nix
+++ b/pkgs/applications/networking/instant-messengers/salut-a-toi/default.nix
@@ -1,49 +1,53 @@
-{stdenv, fetchurl, pythonPackages}:
+{stdenv, fetchurl, python27Packages, file }:
let
- inherit (pythonPackages) python;
-in stdenv.mkDerivation rec {
- url = "ftp://ftp.goffi.org/sat/sat-0.2.0.tar.bz2";
- name = stdenv.lib.nameFromURL url ".tar";
- src = fetchurl {
- inherit url;
- sha256 = "14qqgsgqns1xcp97nd3jcxrq54z1x5a6kimqxy029hh7ys813mf1";
- };
+ inherit (python27Packages) python;
+in
+ stdenv.mkDerivation rec {
+ name = "salut-a-toi";
+ version = "0.6.1";
+ pname = "sat-${version}";
- buildInputs = with pythonPackages;
+ src = fetchurl {
+ url = "ftp://ftp.goffi.org/sat/${pname}.tar.bz2";
+ sha256 = "0kn9403n8fpzl0hsb9kkzicsmzq2fjl627l31yykbqzc4nsr780d";
+ };
+
+ buildInputs = with python27Packages;
[
python twisted urwid beautifulsoup wxPython pygobject2
- wokkel dbus-python pyfeed wrapPython setuptools
+ wokkel dbus-python pyfeed wrapPython setuptools file
+ pycrypto pyxdg
];
- configurePhase = ''
- sed -i "/use_setuptools/d" setup.py
- sed -e "s@sys.prefix@'$out'@g" -i setup.py
- sed -e "1aexport PATH=\"\$PATH\":\"$out/bin\":\"${pythonPackages.twisted}/bin\"" -i src/sat.sh
- sed -e "1aexport PYTHONPATH=\"\$PYTHONPATHPATH\":\"$PYTHONPATH\":"$out/${python.sitePackages}"" -i src/sat.sh
+ configurePhase = ''
+ sed -i "/use_setuptools/d" setup.py
+ sed -e "s@sys.prefix@'$out'@g" -i setup.py
+ sed -e "1aexport PATH=\"\$PATH\":\"$out/bin\":\"${python27Packages.twisted}/bin\"" -i src/sat.sh
+ sed -e "1aexport PYTHONPATH=\"\$PYTHONPATHPATH\":\"$PYTHONPATH\":"$out/${python.sitePackages}"" -i src/sat.sh
- echo 'import wokkel.muc' | python
- '';
+ echo 'import wokkel.muc' | python
+ '';
- buildPhase = ''
- ${python.interpreter} setup.py build
- '';
+ buildPhase = ''
+ ${python.interpreter} setup.py build
+ '';
- installPhase = ''
- ${python.interpreter} setup.py install --prefix="$out"
+ installPhase = ''
+ ${python.interpreter} setup.py install --prefix="$out"
- for i in "$out/bin"/*; do
+ for i in "$out/bin"/*; do
head -n 1 "$i" | grep -E '[/ ]python( |$)' && {
wrapProgram "$i" --prefix PYTHONPATH : "$PYTHONPATH:$out/${python.sitePackages}"
} || true
- done
- '';
-
- meta = {
- homepage = "http://sat.goffi.org/";
- description = "A multi-frontend XMPP client";
- platforms = stdenv.lib.platforms.linux;
- maintainers = with stdenv.lib.maintainers; [raskin];
- license = stdenv.lib.licenses.gpl3Plus;
- };
-}
+ done
+ '';
+
+ meta = with stdenv.lib; {
+ homepage = http://sat.goffi.org/;
+ description = "A multi-frontend XMPP client";
+ platforms = platforms.linux;
+ maintainers = [ maintainers.raskin ];
+ license = licenses.gpl3Plus;
+ };
+ }
diff --git a/pkgs/applications/networking/instant-messengers/scudcloud/default.nix b/pkgs/applications/networking/instant-messengers/scudcloud/default.nix
index 9bed654b9b38..d9a3dfc690dd 100644
--- a/pkgs/applications/networking/instant-messengers/scudcloud/default.nix
+++ b/pkgs/applications/networking/instant-messengers/scudcloud/default.nix
@@ -1,14 +1,14 @@
{ stdenv, fetchgit, python3Packages }:
python3Packages.buildPythonPackage {
- name = "scudcloud-1.40";
+ name = "scudcloud-1.44";
# Branch 254-port-to-qt5
- # https://github.com/raelgc/scudcloud/commit/43ddc87f123a641b1fa78ace0bab159b05d34b65
+ # https://github.com/raelgc/scudcloud/commit/65c304416dfdd5f456fa6f7301432a953d5e12d0
src = fetchgit {
url = https://github.com/raelgc/scudcloud/;
- rev = "43ddc87f123a641b1fa78ace0bab159b05d34b65";
- sha256 = "1lh9naf9xfrmj1pj7p8bd3fz7vy3gap6cvda4silk4b6ylyqa8vj";
+ rev = "65c304416dfdd5f456fa6f7301432a953d5e12d0";
+ sha256 = "0h1055y88kldqw31ayqfx9zsksgxsyqd8h0hwnhj80yn3jcx0rp6";
};
propagatedBuildInputs = with python3Packages; [ pyqt5 dbus-python ];
diff --git a/pkgs/applications/networking/instant-messengers/slack/default.nix b/pkgs/applications/networking/instant-messengers/slack/default.nix
index 240aebe91753..c0d50a86c71f 100644
--- a/pkgs/applications/networking/instant-messengers/slack/default.nix
+++ b/pkgs/applications/networking/instant-messengers/slack/default.nix
@@ -1,16 +1,17 @@
{ stdenv, fetchurl, dpkg
-, alsaLib, atk, cairo, cups, dbus, expat, fontconfig, freetype, glib, gnome2
+, alsaLib, atk, cairo, cups, curl, dbus, expat, fontconfig, freetype, glib, gnome2
, libnotify, nspr, nss, systemd, xorg }:
let
- version = "2.3.4";
+ version = "2.5.2";
rpath = stdenv.lib.makeLibraryPath [
alsaLib
atk
cairo
cups
+ curl
dbus
expat
fontconfig
@@ -26,6 +27,7 @@ let
stdenv.cc.cc
systemd
+ xorg.libxkbfile
xorg.libX11
xorg.libXcomposite
xorg.libXcursor
@@ -42,8 +44,8 @@ let
src =
if stdenv.system == "x86_64-linux" then
fetchurl {
- url = "https://slack-ssb-updates.global.ssl.fastly.net/linux_releases/slack-desktop-${version}-amd64.deb";
- sha256 = "01kr7maj8f4yinyri7rs4pmzab9cvp48xfqw3ilirx4mvh8mr1fd";
+ url = "https://downloads.slack-edge.com/linux_releases/slack-desktop-${version}-amd64.deb";
+ sha256 = "0mg8js18lnnwyvqksrhpym7d04bin16bh7sdmxbm36iijb9ajxmi";
}
else
throw "Slack is not supported on ${stdenv.system}";
@@ -59,7 +61,7 @@ in stdenv.mkDerivation {
mkdir -p $out
dpkg -x $src $out
cp -av $out/usr/* $out
- rm -rf $out/usr $out/share/lintian
+ rm -rf $out/etc $out/usr $out/share/lintian
# Otherwise it looks "suspicious"
chmod -R g-w $out
diff --git a/pkgs/applications/networking/instant-messengers/telegram/cutegram/default.nix b/pkgs/applications/networking/instant-messengers/telegram/cutegram/default.nix
index f0c99841c1b0..d05ff845ebb0 100644
--- a/pkgs/applications/networking/instant-messengers/telegram/cutegram/default.nix
+++ b/pkgs/applications/networking/instant-messengers/telegram/cutegram/default.nix
@@ -36,6 +36,7 @@ stdenv.mkDerivation rec {
license = licenses.gpl3;
maintainers = with maintainers; [ profpatsch AndersonTorres ];
platforms = platforms.linux;
+ broken = true;
};
}
#TODO: appindicator, for system tray plugin (by @profpatsch)
diff --git a/pkgs/applications/networking/instant-messengers/telegram/tdesktop/default.nix b/pkgs/applications/networking/instant-messengers/telegram/tdesktop/default.nix
index 67d86571b885..d64b5be816aa 100644
--- a/pkgs/applications/networking/instant-messengers/telegram/tdesktop/default.nix
+++ b/pkgs/applications/networking/instant-messengers/telegram/tdesktop/default.nix
@@ -1,144 +1,92 @@
{ stdenv, lib, fetchFromGitHub, fetchgit, pkgconfig, gyp, cmake
-, qtbase, qtimageformats, qtwayland
-, breakpad, ffmpeg, openalSoft, openssl, zlib, libexif, lzma, libopus
-, gtk2, glib, cairo, pango, gdk_pixbuf, atk, libappindicator-gtk2
-, libwebp, libunity, dee, libdbusmenu-glib, libva-full, wayland
-, xcbutilrenderutil, icu, libSM, libICE, libproxy, libvdpau
-
-, libxcb, xcbutilwm, xcbutilimage, xcbutilkeysyms, libxkbcommon
-, libpng, libjpeg, freetype, harfbuzz, pcre16, xproto, libX11
-, inputproto, sqlite, dbus
+, qtbase, qtimageformats, makeQtWrapper
+, breakpad, gtk3, libappindicator-gtk3, dee
+, ffmpeg, openalSoft, minizip
}:
-let
- system-x86_64 = lib.elem stdenv.system lib.platforms.x86_64;
- packagedQt = "5.6.2";
- # Hacky: split "1.2.3-4" into "1.2.3" and "4"
- systemQt = (builtins.parseDrvName qtbase.version).name;
- qtLibs = [ qtbase qtimageformats qtwayland ];
-
-in stdenv.mkDerivation rec {
+stdenv.mkDerivation rec {
name = "telegram-desktop-${version}";
- version = "1.0.2";
- qtVersion = lib.replaceStrings ["."] ["_"] packagedQt;
+ version = "1.0.27";
- src = fetchFromGitHub {
- owner = "telegramdesktop";
- repo = "tdesktop";
- rev = "v${version}";
- sha256 = "1pakxzs28v794x9mm7pb2m0phkfrwq19shz8a6lfyidb6ng85hy2";
+ # Submodules
+ src = fetchgit {
+ url = "https://github.com/telegramdesktop/tdesktop";
+ rev = "refs/tags/v${version}";
+ sha256 = "05g88g6h2a7f9biliicg81fqssx0y3akd3y5r2q2b5h8q3igqrfc";
};
tgaur = fetchgit {
- url = "https://aur.archlinux.org/telegram-desktop.git";
- rev = "957a76f9fb691486341bcf4781ad0ef3d16f6b69";
- sha256 = "01nrvvq0mrdyvamjgqr4z5aahyd1wrf28jyddpfsnixp2w5kxqj8";
+ url = "https://aur.archlinux.org/telegram-desktop-systemqt.git";
+ rev = "b4d169076ed12ec01941a95499774d5caa6fc00e";
+ sha256 = "0pmm6slabg9xazgs0ffnp8v0hx3vnpdfgymvapwqpm3h9mwk22x9";
};
buildInputs = [
- breakpad ffmpeg openalSoft openssl zlib libexif lzma libopus
- gtk2 glib libappindicator-gtk2 libunity cairo pango gdk_pixbuf atk
- dee libdbusmenu-glib libva-full xcbutilrenderutil icu libproxy
- libSM libICE
- # Qt dependencies
- libxcb xcbutilwm xcbutilimage xcbutilkeysyms libxkbcommon
- libpng libjpeg freetype harfbuzz pcre16 xproto libX11
- inputproto sqlite dbus libwebp wayland libvdpau
+ gtk3 libappindicator-gtk3 dee qtbase qtimageformats ffmpeg openalSoft minizip
];
- nativeBuildInputs = [ pkgconfig gyp cmake ];
+ nativeBuildInputs = [ pkgconfig gyp cmake makeQtWrapper ];
- patches = [ "${tgaur}/aur-fixes.diff" ];
+ patches = [ "${tgaur}/aur-build-fixes.patch" ];
enableParallelBuilding = true;
- qtSrcs = builtins.map (x: x.src) qtLibs;
- qtNames = builtins.map (x: (builtins.parseDrvName x.name).name) (lib.tail qtLibs);
- qtPatches = qtbase.patches;
+ GYP_DEFINES = lib.concatStringsSep "," [
+ "TDESKTOP_DISABLE_CRASH_REPORTS"
+ "TDESKTOP_DISABLE_AUTOUPDATE"
+ "TDESKTOP_DISABLE_REGISTER_CUSTOM_SCHEME"
+ ];
- buildCommand = ''
- unpackPhase
- cd "$sourceRoot"
-
- patchPhase
-
- sed -i Telegram/gyp/Telegram.gyp \
- -e 's,/usr/include/breakpad,${breakpad}/include/breakpad,g'
+ NIX_CFLAGS_COMPILE = [
+ "-DTDESKTOP_DISABLE_AUTOUPDATE"
+ "-DTDESKTOP_DISABLE_CRASH_REPORTS"
+ "-DTDESKTOP_DISABLE_REGISTER_CUSTOM_SCHEME"
+ "-I${minizip}/include/minizip"
+ # See Telegram/gyp/qt.gypi
+ "-I${qtbase.dev}/mkspecs/linux-g++"
+ ] ++ lib.concatMap (x: [
+ "-I${qtbase.dev}/include/${x}"
+ "-I${qtbase.dev}/include/${x}/${qtbase.version}"
+ "-I${qtbase.dev}/include/${x}/${qtbase.version}/${x}"
+ ]) [ "QtCore" "QtGui" ];
+ CPPFLAGS = NIX_CFLAGS_COMPILE;
+ preConfigure = ''
sed -i Telegram/gyp/telegram_linux.gypi \
-e 's,/usr,/does-not-exist,g' \
+ -e 's,appindicator-0.1,appindicator3-0.1,g' \
-e 's,-flto,,g'
sed -i Telegram/gyp/qt.gypi \
- -e 's,${packagedQt},${systemQt},g'
+ -e "s,/usr/bin/moc,moc,g"
+ sed -i Telegram/gyp/qt_rcc.gypi \
+ -e "s,/usr/bin/rcc,rcc,g"
- gypFlagsArray=(
- "-Dlinux_path_qt=$PWD/../qt"
- "-Dlinux_lib_ssl=-lssl"
- "-Dlinux_lib_crypto=-lcrypto"
- "-Dlinux_lib_icu=-licuuc -licutu -licui18n"
- )
+ gyp \
+ -Gconfig=Release \
+ --depth=Telegram/gyp \
+ --generator-output=../.. \
+ -Goutput_dir=out \
+ --format=cmake \
+ Telegram/gyp/Telegram.gyp
- export QMAKE=$PWD/../qt/bin/qmake
- ( mkdir -p ../Libraries
- cd ../Libraries
- for i in $qtSrcs; do
- tar -xaf $i
- done
- cd qtbase-*
- # This patch is often outdated but the fixes doesn't feel very important
- patch -p1 < ../../$sourceRoot/Telegram/Patches/qtbase_${qtVersion}.diff || true
- for i in $qtPatches; do
- patch -p1 < $i
- done
- ${qtbase.postPatch}
- cd ..
+ cd out/Release
- export configureFlags="-prefix "$PWD/../qt" -release -opensource -confirm-license -system-zlib \
- -system-libpng -system-libjpeg -system-freetype -system-harfbuzz -system-pcre -system-xcb \
- -system-xkbcommon-x11 -no-eglfs -no-gtkstyle -static -nomake examples -nomake tests \
- -no-directfb -system-proxies -openssl-linked -dbus-linked -system-sqlite -verbose \
- ${lib.optionalString (!system-x86_64) "-no-sse2"} -no-sse3 -no-ssse3 \
- -no-sse4.1 -no-sse4.2 -no-avx -no-avx2 -no-mips_dsp -no-mips_dspr2"
- export dontAddPrefix=1
- export MAKEFLAGS=-j$NIX_BUILD_CORES
+ NUM=$((`wc -l < CMakeLists.txt` - 2))
+ sed -i "$NUM r $tgaur/CMakeLists.inj" CMakeLists.txt
- ( cd qtbase-*
- configurePhase
- buildPhase
- make install
- )
- for i in $qtNames; do
- ( cd $i-*
- $QMAKE
- buildPhase
- make install
- )
- done
- )
+ export ASM=$(type -p gcc)
+ '';
- ( cd Telegram/gyp
- gyp "''${gypFlagsArray[@]}" --depth=. --generator-output=../.. -Goutput_dir=out Telegram.gyp --format=cmake
- )
-
- ( cd out/Release
- export ASM=$(type -p gcc)
- cmake .
- # For some reason, it can't find stdafx.h -- we need to build dependencies till it fails and then retry.
- buildPhase || true
- export NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE -include stdafx.h"
- buildPhase
- )
-
- install -Dm755 out/Release/Telegram $out/bin/telegram-desktop
+ installPhase = ''
+ install -Dm755 Telegram $out/bin/telegram-desktop
mkdir -p $out/share/applications $out/share/kde4/services
sed "s,/usr/bin,$out/bin,g" $tgaur/telegramdesktop.desktop > $out/share/applications/telegramdesktop.desktop
sed "s,/usr/bin,$out/bin,g" $tgaur/tg.protocol > $out/share/kde4/services/tg.protocol
for icon_size in 16 32 48 64 128 256 512; do
- install -Dm644 "Telegram/Resources/art/icon''${icon_size}.png" "$out/share/icons/hicolor/''${icon_size}x''${icon_size}/apps/telegram-desktop.png"
+ install -Dm644 "../../../Telegram/Resources/art/icon''${icon_size}.png" "$out/share/icons/hicolor/''${icon_size}x''${icon_size}/apps/telegram-desktop.png"
done
-
- fixupPhase
+ wrapQtProgram $out/bin/telegram-desktop
'';
meta = with stdenv.lib; {
diff --git a/pkgs/applications/networking/instant-messengers/telepathy/kde/default.nix b/pkgs/applications/networking/instant-messengers/telepathy/kde/default.nix
index 84ced8f62c6e..0a5a309c27da 100644
--- a/pkgs/applications/networking/instant-messengers/telepathy/kde/default.nix
+++ b/pkgs/applications/networking/instant-messengers/telepathy/kde/default.nix
@@ -1,6 +1,6 @@
{ stdenv, fetchurl, fetchgit, automoc4, cmake, gettext, perl, pkgconfig
-, telepathy_qt, kdelibs, kde_workspace, dbus_glib, dbus_libs, farstream
-, qt_gstreamer1, telepathy_glib, telepathy_logger
+, telepathy_qt, kdelibs4, kde_workspace, dbus_glib, dbus_libs, farstream
+, qt-gstreamer1, telepathy_glib, telepathy_logger
, qjson, flex, bison, qca2 }:
let
@@ -21,10 +21,10 @@ let
extraBuildInputs = {
auth_handler = [ qjson qca2 ];
- call_ui = [ qt_gstreamer1 telepathy_glib farstream ];
+ call_ui = [ qt-gstreamer1 telepathy_glib farstream ];
contact_applet = [ kde_workspace ];
- telepathy_logger_qt = [ telepathy_logger qt_gstreamer1 ];
- text_ui = [ qt_gstreamer1 telepathy_logger qjson ];
+ telepathy_logger_qt = [ telepathy_logger qt-gstreamer1 ];
+ text_ui = [ qt-gstreamer1 telepathy_logger qjson ];
common_internals = [ telepathy_qt ];
};
@@ -48,13 +48,13 @@ let
nativeBuildInputs =
[ automoc4 cmake gettext perl pkgconfig ]
++ (stdenv.lib.attrByPath [ key ] [] extraNativeBuildInputs);
- buildInputs = [ kdelibs telepathy_qt ]
+ buildInputs = [ kdelibs4 telepathy_qt ]
++ stdenv.lib.optional (name != "ktp-common-internals") ktp.common_internals
++ (stdenv.lib.attrByPath [ key ] [] extraBuildInputs);
meta = {
- inherit (kdelibs.meta) platforms;
- maintainers = [ stdenv.lib.maintainers.urkud ];
+ inherit (kdelibs4.meta) platforms;
+ maintainers = [ ];
};
}
);
diff --git a/pkgs/applications/networking/instant-messengers/telepathy/logger/default.nix b/pkgs/applications/networking/instant-messengers/telepathy/logger/default.nix
index 2ade2fd3edd0..4cf0d2a04492 100644
--- a/pkgs/applications/networking/instant-messengers/telepathy/logger/default.nix
+++ b/pkgs/applications/networking/instant-messengers/telepathy/logger/default.nix
@@ -22,7 +22,7 @@ stdenv.mkDerivation rec {
meta = {
description = "Logger service for Telepathy framework";
homepage = http://telepathy.freedesktop.org/wiki/Logger ;
- maintainers = [ stdenv.lib.maintainers.urkud ];
+ maintainers = [ ];
platforms = stdenv.lib.platforms.gnu; # Arbitrary choice
};
}
diff --git a/pkgs/applications/networking/instant-messengers/telepathy/rakia/default.nix b/pkgs/applications/networking/instant-messengers/telepathy/rakia/default.nix
deleted file mode 100644
index 7d06d57ca9ac..000000000000
--- a/pkgs/applications/networking/instant-messengers/telepathy/rakia/default.nix
+++ /dev/null
@@ -1,19 +0,0 @@
-{ stdenv, fetchurl, pkgconfigUpstream, libxslt, telepathy_glib, libxml2, dbus_glib
-, sofia_sip }:
-
-stdenv.mkDerivation rec {
- pname = "telepathy-rakia";
- name = "${pname}-0.8.0";
-
- src = fetchurl {
- url = "${meta.homepage}/releases/${pname}/${name}.tar.gz";
- sha256 = "18dxffa8hhjyvqkhhac05rrkx81vnncjrakg5ygikfp0j79vrbhv";
- };
-
- nativeBuildInputs = [pkgconfigUpstream libxslt ];
- buildInputs = [ libxml2 dbus_glib telepathy_glib sofia_sip telepathy_glib.python ];
-
- meta = {
- homepage = http://telepathy.freedesktop.org;
- };
-}
diff --git a/pkgs/applications/networking/instant-messengers/tkabber/default.nix b/pkgs/applications/networking/instant-messengers/tkabber/default.nix
deleted file mode 100644
index b4403a780ed2..000000000000
--- a/pkgs/applications/networking/instant-messengers/tkabber/default.nix
+++ /dev/null
@@ -1,68 +0,0 @@
-{ stdenv, fetchurl, tcl, tk, tcllib, tcltls, tclgpg
-, bwidget, makeWrapper, xlibsWrapper
-, withSitePlugins ? true
-, theme ? null
-}:
-
-with stdenv.lib;
-
-let
- version = "1.1";
-
- main = {
- name = "tkabber";
- sha256 = "1ip0mi2icqkjxiam4qj1qcynnz9ck1ggzcbcqyjj132hakd855a2";
- };
-
- plugins = {
- name = "tkabber-plugins";
- sha256 = "1dr12rh4vs1w1bga45k4ijgxs39801c1k4z3b892pn1dwv84il5y";
- };
-
- tclLibraries = [ bwidget tcllib tcltls tclgpg ];
-
- getTclLibPath = p: "${p}/lib/${p.libPrefix}";
-
- tclLibPaths = stdenv.lib.concatStringsSep " "
- (map getTclLibPath tclLibraries);
-
- mkTkabber = attrs: stdenv.mkDerivation (rec {
- name = "${attrs.name}-${version}";
-
- src = fetchurl {
- url = "http://files.jabber.ru/tkabber/${name}.tar.xz";
- inherit (attrs) sha256;
- };
-
- prePatch = ''
- sed -e "s@/usr/local@$out@" -i Makefile
- '';
- } // removeAttrs attrs [ "name" "sha256" ]);
-
-in mkTkabber (main // {
- postPatch = optionalString (theme != null) ''
- themePath="$out/share/doc/tkabber/examples/xrdb/${theme}.xrdb"
- sed -i '/^if.*load_default_xrdb/,/^}$/ {
- s@option readfile \(\[fullpath [^]]*\]\)@option readfile "'"$themePath"'"@
- }' tkabber.tcl
- '';
-
- postInstall = ''
- for prog in $out/bin/*; do
- wrapProgram "$prog" \
- --prefix PATH : "${tk}/bin" \
- --set TCLLIBPATH '${tclLibPaths}' \
- ${optionalString withSitePlugins ''
- --set TKABBER_SITE_PLUGINS '${mkTkabber plugins}/share/tkabber-plugins'
- ''}
- done
- '';
-
- buildInputs = [ tcl tk xlibsWrapper makeWrapper ] ++ tclLibraries;
-
- meta = {
- homepage = "http://tkabber.jabber.ru/";
- description = "A GUI XMPP (Jabber) client written in Tcl/Tk";
- license = stdenv.lib.licenses.gpl2;
- };
-})
diff --git a/pkgs/applications/networking/instant-messengers/torchat/default.nix b/pkgs/applications/networking/instant-messengers/torchat/default.nix
index 06bcd7a0400e..700fab061164 100644
--- a/pkgs/applications/networking/instant-messengers/torchat/default.nix
+++ b/pkgs/applications/networking/instant-messengers/torchat/default.nix
@@ -33,5 +33,6 @@ stdenv.mkDerivation rec {
license = licenses.gpl3;
maintainers = [ maintainers.phreedom ];
platforms = platforms.unix;
+ broken = true;
};
}
diff --git a/pkgs/applications/networking/instant-messengers/utox/default.nix b/pkgs/applications/networking/instant-messengers/utox/default.nix
index 0653558c940f..d74d3fe38657 100644
--- a/pkgs/applications/networking/instant-messengers/utox/default.nix
+++ b/pkgs/applications/networking/instant-messengers/utox/default.nix
@@ -3,13 +3,14 @@
stdenv.mkDerivation rec {
name = "utox-${version}";
- version = "0.12.2";
+ # >= 0.14 should have unit tests and dbus support
+ version = "0.13.1";
src = fetchFromGitHub {
owner = "uTox";
repo = "uTox";
rev = "v${version}";
- sha256 = "1y26dpx0qc01mhv2f325ymyc3r7ihayrr10rp25p1bs24010azwn";
+ sha256 = "07aa92isknxf7531jr9kgk89wl5rvv34jrvir043fs9xvim5zq99";
};
buildInputs = [
@@ -22,12 +23,15 @@ stdenv.mkDerivation rec {
cmake git pkgconfig
];
- doCheck = false;
+ cmakeFlags = [
+ "-DENABLE_UPDATER=OFF"
+ ];
- makeFlags = "PREFIX=$(out)";
+ doCheck = false;
meta = with stdenv.lib; {
description = "Lightweight Tox client";
+ homepage = https://github.com/uTox/uTox;
license = licenses.gpl3;
maintainers = with maintainers; [ domenkozar jgeerds ];
platforms = platforms.all;
diff --git a/pkgs/applications/networking/instant-messengers/zoom-us/default.nix b/pkgs/applications/networking/instant-messengers/zoom-us/default.nix
deleted file mode 100644
index 4e9f00b03404..000000000000
--- a/pkgs/applications/networking/instant-messengers/zoom-us/default.nix
+++ /dev/null
@@ -1,104 +0,0 @@
-{ alsaLib
-, fetchurl
-, gcc
-, glib
-, gst_plugins_base
-, gstreamer
-, icu
-, libpulseaudio
-, libuuid
-, libxml2
-, libxslt
-, makeQtWrapper
-, qt56
-, sqlite
-, stdenv
-, xlibs
-, xorg
-, zlib
-}:
-
-stdenv.mkDerivation rec {
- name = "zoom-us";
- meta = {
- homepage = http://zoom.us;
- description = "zoom.us instant messenger";
- license = stdenv.lib.licenses.unfree;
- platforms = stdenv.lib.platforms.linux;
- };
-
- version = "2.0.70790.1031";
- src = fetchurl {
- url = "https://zoom.us/client/${version}/zoom_x86_64.tar.xz";
- sha256 = "0kkg3bqv8zwhpxgrssa7ds00dxhdimnq2vfklgrdqn5qzbij31hd";
- };
-
- phases = [ "unpackPhase" "installPhase" ];
- nativeBuildInputs = [ makeQtWrapper ];
- buildInputs = [
- alsaLib
- gcc.cc
- glib
- gst_plugins_base
- gstreamer
- icu
- libpulseaudio
- libuuid
- libxml2
- libxslt
- qt56.qtbase
- qt56.qtdeclarative
- qt56.qtlocation
- qt56.qtscript
- qt56.qtwebchannel
- qt56.qtwebengine
- sqlite
- xlibs.xcbutilkeysyms
- xorg.libX11
- xorg.libxcb
- xorg.libXcomposite
- xorg.libXext
- xorg.libXfixes
- xorg.libXrender
- xorg.xcbutilimage
- zlib
- ];
-
- libPath = stdenv.lib.makeLibraryPath buildInputs;
-
- installPhase = ''
- mkdir -p $out/share
- cp -r \
- application-x-zoom.png \
- audio \
- imageformats \
- config-dump.sh \
- dingdong1.pcm \
- dingdong.pcm \
- doc \
- Droplet.pcm \
- Droplet.wav \
- platforminputcontexts \
- platforms \
- platformthemes \
- leave.pcm \
- ring.pcm \
- ring.wav \
- version.txt \
- xcbglintegrations \
- zcacert.pem \
- zoom \
- Zoom.png \
- ZXMPPROOT.cer \
- $out/share
-
- patchelf \
- --set-interpreter $(cat $NIX_CC/nix-support/dynamic-linker) \
- --set-rpath ${libPath} \
- $out/share/zoom
- paxmark m $out/share/zoom
- wrapQtProgram "$out/share/zoom"
- mkdir -p $out/bin
- ln -s $out/share/zoom $out/bin/zoom-us
- '';
- }
diff --git a/pkgs/applications/networking/ipfs/default.nix b/pkgs/applications/networking/ipfs/default.nix
index 40ac09177975..2be39df61472 100644
--- a/pkgs/applications/networking/ipfs/default.nix
+++ b/pkgs/applications/networking/ipfs/default.nix
@@ -2,15 +2,15 @@
buildGoPackage rec {
name = "ipfs-${version}";
- version = "0.4.5";
- rev = "2cb68b2210ba883bcd38a429ed62b7f832f8c064";
+ version = "0.4.8";
+ rev = "8e7484ed794d1aecb3e773e9003ae64c7b78bb87";
goPackagePath = "github.com/ipfs/go-ipfs";
extraSrcPaths = [
(fetchgx {
inherit name src;
- sha256 = "0lq4najagdcga0zfprccprjy94nq46ja2gajij2pycag0wcc538d";
+ sha256 = "1h4n74n65z4sw3fqz8nfcrwisbvvwwfq69909w3kgrjsxs7505s5";
})
];
@@ -18,7 +18,7 @@ buildGoPackage rec {
owner = "ipfs";
repo = "go-ipfs";
inherit rev;
- sha256 = "087478rdj9cfl8hfrhrbb8rdlh7b1ixdj127vvkgn2k3mlz6af47";
+ sha256 = "15jcg0wbm7g82fsmhc1vxrsszbxcghls3rsyv35n1hv5k5r5d5nh";
};
meta = with stdenv.lib; {
diff --git a/pkgs/applications/networking/irc/irssi/default.nix b/pkgs/applications/networking/irc/irssi/default.nix
index d46539a88b7d..7ab6a4438f3e 100644
--- a/pkgs/applications/networking/irc/irssi/default.nix
+++ b/pkgs/applications/networking/irc/irssi/default.nix
@@ -1,12 +1,12 @@
{ stdenv, fetchurl, pkgconfig, ncurses, glib, openssl, perl, libintlOrEmpty }:
stdenv.mkDerivation rec {
- version = "1.0.1";
+ version = "1.0.2";
name = "irssi-${version}";
src = fetchurl {
url = "https://github.com/irssi/irssi/releases/download/${version}/${name}.tar.gz";
- sha256 = "1nqrm376bipvh4x483vygydjzs05n4fmfzip1gfakq1vfqqfhshr";
+ sha256 = "1fas6dqz6g8m2400spvkhfxihj3w06qb917h4vhcb716g9wpjkwf";
};
nativeBuildInputs = [ pkgconfig ];
diff --git a/pkgs/applications/networking/irc/konversation/1.6.nix b/pkgs/applications/networking/irc/konversation/1.6.nix
deleted file mode 100644
index 9724ae5f4bf0..000000000000
--- a/pkgs/applications/networking/irc/konversation/1.6.nix
+++ /dev/null
@@ -1,82 +0,0 @@
-{ kdeDerivation
-, lib
-, fetchurl
-, ecm
-, kbookmarks
-, karchive
-, kconfig
-, kconfigwidgets
-, kcoreaddons
-, kdbusaddons
-, kdeWrapper
-, kdoctools
-, kemoticons
-, kglobalaccel
-, ki18n
-, kiconthemes
-, kidletime
-, kitemviews
-, knotifications
-, knotifyconfig
-, kio
-, kparts
-, kwallet
-, makeQtWrapper
-, solid
-, sonnet
-, phonon
-}:
-
-let
- unwrapped = let
- pname = "konversation";
- version = "1.6.2";
- in kdeDerivation rec {
- name = "${pname}-${version}";
-
- src = fetchurl {
- url = "mirror://kde/stable/${pname}/${version}/src/${name}.tar.xz";
- sha256 = "1798sslwz7a3h1v524ra33p0j5iqvcg0v1insyvb5qp4kv11slmn";
- };
-
- buildInputs = [
- kbookmarks
- karchive
- kconfig
- kconfigwidgets
- kcoreaddons
- kdbusaddons
- kdoctools
- kemoticons
- kglobalaccel
- ki18n
- kiconthemes
- kidletime
- kitemviews
- knotifications
- knotifyconfig
- kio
- kparts
- kwallet
- solid
- sonnet
- phonon
- ];
-
- nativeBuildInputs = [
- ecm
- kdoctools
- ];
-
- meta = {
- description = "Integrated IRC client for KDE";
- license = with lib.licenses; [ gpl2 ];
- maintainers = with lib.maintainers; [ fridh ];
- homepage = https://konversation.kde.org;
- };
- };
-in kdeWrapper {
- inherit unwrapped;
- targets = [ "bin/konversation" ];
-}
-
diff --git a/pkgs/applications/networking/irc/konversation/default.nix b/pkgs/applications/networking/irc/konversation/default.nix
index cbe4e3be28d4..6f4bc2af79f2 100644
--- a/pkgs/applications/networking/irc/konversation/default.nix
+++ b/pkgs/applications/networking/irc/konversation/default.nix
@@ -1,26 +1,82 @@
-{ stdenv, fetchurl, cmake, qt4, perl, gettext, libXScrnSaver
-, kdelibs, kdepimlibs, automoc4, phonon, qca2}:
+{ kdeDerivation
+, lib
+, fetchurl
+, extra-cmake-modules
+, kbookmarks
+, karchive
+, kconfig
+, kconfigwidgets
+, kcoreaddons
+, kdbusaddons
+, kdeWrapper
+, kdoctools
+, kemoticons
+, kglobalaccel
+, ki18n
+, kiconthemes
+, kidletime
+, kitemviews
+, knotifications
+, knotifyconfig
+, kio
+, kparts
+, kwallet
+, makeQtWrapper
+, solid
+, sonnet
+, phonon
+}:
let
- pn = "konversation";
- v = "1.5.1";
-in
+ unwrapped = let
+ pname = "konversation";
+ version = "1.6.2";
+ in kdeDerivation rec {
+ name = "${pname}-${version}";
-stdenv.mkDerivation rec {
- name = "${pn}-${v}";
+ src = fetchurl {
+ url = "mirror://kde/stable/${pname}/${version}/src/${name}.tar.xz";
+ sha256 = "1798sslwz7a3h1v524ra33p0j5iqvcg0v1insyvb5qp4kv11slmn";
+ };
- src = fetchurl {
- url = "mirror://kde/stable/${pn}/${v}/src/${name}.tar.xz";
- sha256 = "11hrjrq4r6v1v14ybx9llgzmrl3a45z26n292nb0q887rg1qv0wp";
- };
-
- buildInputs = [ cmake qt4 perl gettext libXScrnSaver kdelibs kdepimlibs
- automoc4 phonon qca2 ];
-
- meta = with stdenv.lib; {
- description = "Integrated IRC client for KDE";
- repositories.git = git://anongit.kde.org/konversation;
- license = "GPL";
- inherit (kdelibs.meta) maintainers platforms;
+ buildInputs = [
+ kbookmarks
+ karchive
+ kconfig
+ kconfigwidgets
+ kcoreaddons
+ kdbusaddons
+ kdoctools
+ kemoticons
+ kglobalaccel
+ ki18n
+ kiconthemes
+ kidletime
+ kitemviews
+ knotifications
+ knotifyconfig
+ kio
+ kparts
+ kwallet
+ solid
+ sonnet
+ phonon
+ ];
+
+ nativeBuildInputs = [
+ extra-cmake-modules
+ kdoctools
+ ];
+
+ meta = {
+ description = "Integrated IRC client for KDE";
+ license = with lib.licenses; [ gpl2 ];
+ maintainers = with lib.maintainers; [ fridh ];
+ homepage = https://konversation.kde.org;
+ };
};
+in kdeWrapper {
+ inherit unwrapped;
+ targets = [ "bin/konversation" ];
}
+
diff --git a/pkgs/applications/networking/irc/kvirc/default.nix b/pkgs/applications/networking/irc/kvirc/default.nix
deleted file mode 100644
index f4b451e66e07..000000000000
--- a/pkgs/applications/networking/irc/kvirc/default.nix
+++ /dev/null
@@ -1,24 +0,0 @@
-{ stdenv, fetchurl, cmake, qt4, perl, gettext, kdelibs, openssl, zlib}:
-
-let
- pn = "kvirc";
- v = "4.2.0";
-in
-
-stdenv.mkDerivation {
- name = "${pn}-${v}";
-
- src = fetchurl {
- url = "ftp://ftp.kvirc.de/pub/${pn}/${v}/source/${pn}-${v}.tar.bz2";
- sha256 = "9a547d52d804e39c9635c8dc58bccaf4d34341ef16a9a652a5eb5568d4d762cb";
- };
-
- buildInputs = [ cmake qt4 perl gettext kdelibs openssl zlib ];
-
- meta = with stdenv.lib; {
- description = "Graphic IRC client with Qt";
- license = licenses.gpl3;
- homepage = http://www.kvirc.net/;
- platforms = platforms.linux;
- };
-}
diff --git a/pkgs/applications/networking/irc/quassel/default.nix b/pkgs/applications/networking/irc/quassel/default.nix
index f48309d0b049..d631f4aa2146 100644
--- a/pkgs/applications/networking/irc/quassel/default.nix
+++ b/pkgs/applications/networking/irc/quassel/default.nix
@@ -1,15 +1,26 @@
{ monolithic ? true # build monolithic Quassel
, daemon ? false # build Quassel daemon
, client ? false # build Quassel client
-, previews ? false # enable webpage previews on hovering over URLs
, tag ? "" # tag added to the package name
-, withKDE ? stdenv.isLinux # enable KDE integration
-, kdelibs ? null
, static ? false # link statically
-, stdenv, fetchurl, cmake, makeWrapper, qt, automoc4, phonon, dconf, qca2 }:
+, stdenv, fetchurl, cmake, makeWrapper, dconf
+, qtbase, qtscript
+, phonon, libdbusmenu, qca-qt5
-let buildClient = monolithic || client;
+, withKDE ? stdenv.isLinux # enable KDE integration
+, extra-cmake-modules
+, kconfigwidgets
+, kcoreaddons
+, knotifications
+, knotifyconfig
+, ktextwidgets
+, kwidgetsaddons
+, kxmlgui
+}:
+
+let
+ buildClient = monolithic || client;
buildCore = monolithic || daemon;
in
@@ -17,7 +28,6 @@ assert stdenv.isLinux;
assert monolithic -> !client && !daemon;
assert client || daemon -> !monolithic;
-assert withKDE -> kdelibs != null;
assert !buildClient -> !withKDE; # KDE is used by the client only
let
@@ -31,21 +41,28 @@ in with stdenv; mkDerivation rec {
enableParallelBuilding = true;
- buildInputs =
- [ cmake makeWrapper qt ]
- ++ lib.optionals buildCore [qca2]
- ++ lib.optionals withKDE [automoc4 kdelibs phonon];
+ # Prevent ``undefined reference to `qt_version_tag''' in SSL check
+ NIX_CFLAGS_COMPILE = [ "-DQT_NO_VERSION_TAGGING=1" ];
- NIX_CFLAGS_COMPILE = "-fPIC";
+ buildInputs =
+ [ cmake makeWrapper qtbase ]
+ ++ lib.optionals buildCore [qtscript qca-qt5]
+ ++ lib.optionals buildClient [libdbusmenu phonon]
+ ++ lib.optionals (buildClient && withKDE) [
+ extra-cmake-modules kconfigwidgets kcoreaddons
+ knotifications knotifyconfig ktextwidgets kwidgetsaddons
+ kxmlgui
+ ];
cmakeFlags = [
- "-DEMBED_DATA=OFF" ]
+ "-DEMBED_DATA=OFF"
+ "-DUSE_QT5=ON"
+ ]
++ edf static "STATIC"
++ edf monolithic "WANT_MONO"
++ edf daemon "WANT_CORE"
++ edf client "WANT_QTCLIENT"
- ++ edf withKDE "WITH_KDE"
- ++ edf previews "WITH_WEBKIT";
+ ++ edf withKDE "WITH_KDE";
preFixup =
lib.optionalString buildClient ''
@@ -66,6 +83,6 @@ in with stdenv; mkDerivation rec {
license = stdenv.lib.licenses.gpl3;
maintainers = with maintainers; [ phreedom ttuegel ];
repositories.git = https://github.com/quassel/quassel.git;
- inherit (qt.meta) platforms;
+ inherit (qtbase.meta) platforms;
};
}
diff --git a/pkgs/applications/networking/irc/quassel/qt-5.nix b/pkgs/applications/networking/irc/quassel/qt-5.nix
deleted file mode 100644
index d631f4aa2146..000000000000
--- a/pkgs/applications/networking/irc/quassel/qt-5.nix
+++ /dev/null
@@ -1,88 +0,0 @@
-{ monolithic ? true # build monolithic Quassel
-, daemon ? false # build Quassel daemon
-, client ? false # build Quassel client
-, tag ? "" # tag added to the package name
-, static ? false # link statically
-
-, stdenv, fetchurl, cmake, makeWrapper, dconf
-, qtbase, qtscript
-, phonon, libdbusmenu, qca-qt5
-
-, withKDE ? stdenv.isLinux # enable KDE integration
-, extra-cmake-modules
-, kconfigwidgets
-, kcoreaddons
-, knotifications
-, knotifyconfig
-, ktextwidgets
-, kwidgetsaddons
-, kxmlgui
-}:
-
-let
- buildClient = monolithic || client;
- buildCore = monolithic || daemon;
-in
-
-assert stdenv.isLinux;
-
-assert monolithic -> !client && !daemon;
-assert client || daemon -> !monolithic;
-assert !buildClient -> !withKDE; # KDE is used by the client only
-
-let
- edf = flag: feature: [("-D" + feature + (if flag then "=ON" else "=OFF"))];
- source = import ./source.nix { inherit fetchurl; };
-
-in with stdenv; mkDerivation rec {
- inherit (source) src version;
-
- name = "quassel${tag}-${version}";
-
- enableParallelBuilding = true;
-
- # Prevent ``undefined reference to `qt_version_tag''' in SSL check
- NIX_CFLAGS_COMPILE = [ "-DQT_NO_VERSION_TAGGING=1" ];
-
- buildInputs =
- [ cmake makeWrapper qtbase ]
- ++ lib.optionals buildCore [qtscript qca-qt5]
- ++ lib.optionals buildClient [libdbusmenu phonon]
- ++ lib.optionals (buildClient && withKDE) [
- extra-cmake-modules kconfigwidgets kcoreaddons
- knotifications knotifyconfig ktextwidgets kwidgetsaddons
- kxmlgui
- ];
-
- cmakeFlags = [
- "-DEMBED_DATA=OFF"
- "-DUSE_QT5=ON"
- ]
- ++ edf static "STATIC"
- ++ edf monolithic "WANT_MONO"
- ++ edf daemon "WANT_CORE"
- ++ edf client "WANT_QTCLIENT"
- ++ edf withKDE "WITH_KDE";
-
- preFixup =
- lib.optionalString buildClient ''
- wrapProgram "$out/bin/quassel${lib.optionalString client "client"}" \
- --prefix GIO_EXTRA_MODULES : "${dconf}/lib/gio/modules"
- '';
-
- meta = with stdenv.lib; {
- homepage = http://quassel-irc.org/;
- description = "Qt/KDE distributed IRC client suppporting a remote daemon";
- longDescription = ''
- Quassel IRC is a cross-platform, distributed IRC client,
- meaning that one (or multiple) client(s) can attach to
- and detach from a central core -- much like the popular
- combination of screen and a text-based IRC client such
- as WeeChat, but graphical (based on Qt4/KDE4 or Qt5/KF5).
- '';
- license = stdenv.lib.licenses.gpl3;
- maintainers = with maintainers; [ phreedom ttuegel ];
- repositories.git = https://github.com/quassel/quassel.git;
- inherit (qtbase.meta) platforms;
- };
-}
diff --git a/pkgs/applications/networking/irc/shout/default.nix b/pkgs/applications/networking/irc/shout/default.nix
index 9d3e3ba449c3..bf041a8845a3 100644
--- a/pkgs/applications/networking/irc/shout/default.nix
+++ b/pkgs/applications/networking/irc/shout/default.nix
@@ -11,7 +11,7 @@ let
in nodePackages.buildNodePackage rec {
name = "shout-${version}";
- version = "0.51.1";
+ version = "0.53.0";
src = fetchFromGitHub {
owner = "erming";
diff --git a/pkgs/applications/networking/irc/sic/default.nix b/pkgs/applications/networking/irc/sic/default.nix
index 7c13b04e670f..6f48f44214cc 100644
--- a/pkgs/applications/networking/irc/sic/default.nix
+++ b/pkgs/applications/networking/irc/sic/default.nix
@@ -4,7 +4,7 @@ stdenv.mkDerivation rec {
name = "sic-${version}";
version = "1.2";
- makeFlags = "PREFIX=$out";
+ makeFlags = "PREFIX=$(out)";
src = fetchurl {
url = "http://dl.suckless.org/tools/sic-${version}.tar.gz";
sha256 = "ac07f905995e13ba2c43912d7a035fbbe78a628d7ba1c256f4ca1372fb565185";
diff --git a/pkgs/applications/networking/mailreaders/astroid/default.nix b/pkgs/applications/networking/mailreaders/astroid/default.nix
index 96b1b7d285eb..668044f5efb8 100644
--- a/pkgs/applications/networking/mailreaders/astroid/default.nix
+++ b/pkgs/applications/networking/mailreaders/astroid/default.nix
@@ -3,25 +3,23 @@
stdenv.mkDerivation rec {
name = "astroid-${version}";
- version = "0.7";
+ version = "0.8";
src = fetchFromGitHub {
owner = "astroidmail";
repo = "astroid";
rev = "v${version}";
- sha256 = "0r3hqwwr68bjhqaa1r3l9brbmvdp11pf8vhsjlvm5zv520z5y1rf";
+ sha256 = "1gjrdls1mz8y8bca7s8l965l0m7s2sb6g7a90gy848admjsyav7h";
};
- patches = [ ./propagate-environment.patch ];
-
nativeBuildInputs = [ scons pkgconfig wrapGAppsHook ];
buildInputs = [ gnome3.gtkmm gmime webkitgtk24x libsass gnome3.libpeas
notmuch boost gnome3.gsettings_desktop_schemas
gnome3.adwaita-icon-theme ];
- buildPhase = "scons --prefix=$out build";
- installPhase = "scons --prefix=$out install";
+ buildPhase = "scons --propagate-environment --prefix=$out build";
+ installPhase = "scons --propagate-environment --prefix=$out install";
meta = {
homepage = "https://astroidmail.github.io/";
diff --git a/pkgs/applications/networking/mailreaders/astroid/propagate-environment.patch b/pkgs/applications/networking/mailreaders/astroid/propagate-environment.patch
deleted file mode 100644
index db536ea721f2..000000000000
--- a/pkgs/applications/networking/mailreaders/astroid/propagate-environment.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git a/SConstruct b/SConstruct
-index a80bca3..ed2cd6d 100644
---- a/SConstruct
-+++ b/SConstruct
-@@ -5,7 +5,7 @@ from subprocess import *
- def getGitDesc():
- return Popen('git describe --abbrev=8 --tags --always', stdout=PIPE, shell=True).stdout.read ().strip ()
-
--env = Environment ()
-+env = Environment(ENV = os.environ)
-
- AddOption ("--release", action="store", dest="release", default="git", help="Make a release (default: git describe output)")
- AddOption ("--enable-debug", action="store", dest="debug", default=None, help="Enable the -g flag for debugging (default: true when release is git)")
diff --git a/pkgs/applications/networking/mailreaders/mailpile/default.nix b/pkgs/applications/networking/mailreaders/mailpile/default.nix
index 05fea05fd14e..9c2ab08babcf 100644
--- a/pkgs/applications/networking/mailreaders/mailpile/default.nix
+++ b/pkgs/applications/networking/mailreaders/mailpile/default.nix
@@ -33,5 +33,8 @@ python2Packages.buildPythonApplication rec {
license = [ licenses.asl20 licenses.agpl3 ];
platforms = platforms.linux;
maintainers = [ maintainers.domenkozar ];
+ knownVulnerabilities = [
+ "Numerous and uncounted, upstream has requested we not package it. See more: https://github.com/NixOS/nixpkgs/pull/23058#issuecomment-283515104"
+ ];
};
}
diff --git a/pkgs/applications/networking/mailreaders/mutt/default.nix b/pkgs/applications/networking/mailreaders/mutt/default.nix
index 195cf13e4c29..92d1a3446c0d 100644
--- a/pkgs/applications/networking/mailreaders/mutt/default.nix
+++ b/pkgs/applications/networking/mailreaders/mutt/default.nix
@@ -20,11 +20,11 @@ with stdenv.lib;
stdenv.mkDerivation rec {
name = "mutt-${version}";
- version = "1.7.2";
+ version = "1.8.0";
src = fetchurl {
url = "http://ftp.mutt.org/pub/mutt/${name}.tar.gz";
- sha256 = "1yazrl82s9fxmamnlvwmsxhwrxnwv6kwakgfmawda8ndhwb50lqm";
+ sha256 = "1axdcylyv0p194y6lj1jx127g5yc74zqzzxdc014cjw02bd1x125";
};
patchPhase = optionalString (openssl != null) ''
@@ -45,7 +45,6 @@ stdenv.mkDerivation rec {
(enableFeature withSidebar "sidebar")
"--enable-smtp"
"--enable-pop"
- "--enable-imap"
"--with-mailpath="
# Look in $PATH at runtime, instead of hardcoding /usr/bin/sendmail
diff --git a/pkgs/applications/networking/mailreaders/neomutt/default.nix b/pkgs/applications/networking/mailreaders/neomutt/default.nix
index 18ea017cb8c8..e61386a6819f 100644
--- a/pkgs/applications/networking/mailreaders/neomutt/default.nix
+++ b/pkgs/applications/networking/mailreaders/neomutt/default.nix
@@ -2,14 +2,14 @@
, cyrus_sasl, gdbm, gpgme, kerberos, libidn, notmuch, openssl, lmdb }:
stdenv.mkDerivation rec {
- version = "20170128";
+ version = "20170306";
name = "neomutt-${version}";
src = fetchFromGitHub {
owner = "neomutt";
repo = "neomutt";
rev = "neomutt-${version}";
- sha256 = "082ksn4fsj48nkz61ia0hcxz3396p6a4p9q8738w15qkycq23c20";
+ sha256 = "0nlazabwj4czi30m84ppga275hkr51glyndizqzg540q9wp1acz4";
};
nativeBuildInputs = [ which autoconf automake ];
diff --git a/pkgs/applications/networking/mailreaders/notmuch/muchsync.nix b/pkgs/applications/networking/mailreaders/notmuch/muchsync.nix
index 17d66ba60439..c008c478d22b 100644
--- a/pkgs/applications/networking/mailreaders/notmuch/muchsync.nix
+++ b/pkgs/applications/networking/mailreaders/notmuch/muchsync.nix
@@ -1,5 +1,5 @@
{ stdenv, fetchurl
-, notmuch, openssl, pkgconfig, sqlite, xapian
+, notmuch, openssl, pkgconfig, sqlite, xapian, zlib
}:
stdenv.mkDerivation rec {
version = "2";
@@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
url = "http://www.muchsync.org/src/${name}.tar.gz";
sha256 = "1dqp23a043kkzl0g2f4j3m7r7lg303gz7a0fsj0dm5ag3kpvp5f1";
};
- buildInputs = [ notmuch openssl pkgconfig sqlite xapian ];
+ buildInputs = [ notmuch openssl pkgconfig sqlite xapian zlib ];
meta = {
description = "Synchronize maildirs and notmuch databases";
platforms = stdenv.lib.platforms.unix;
diff --git a/pkgs/applications/networking/mailreaders/sylpheed/default.nix b/pkgs/applications/networking/mailreaders/sylpheed/default.nix
index b1cdd509f98e..509a2ab01182 100644
--- a/pkgs/applications/networking/mailreaders/sylpheed/default.nix
+++ b/pkgs/applications/networking/mailreaders/sylpheed/default.nix
@@ -1,5 +1,4 @@
{ stdenv, fetchurl, pkgconfig, gtk2
-
, openssl ? null
, gpgme ? null
, sslSupport ? true
@@ -13,15 +12,16 @@ assert gpgSupport -> gpgme != null;
stdenv.mkDerivation rec {
name = "sylpheed-${version}";
- version = "3.5.0";
+ version = "3.5.1";
src = fetchurl {
url = "http://sylpheed.sraoss.jp/sylpheed/v3.5/${name}.tar.bz2";
- sha256 = "0p50cr9h8b7cv1ayxhqxpj3kv0b7k9dga7lmmfb1lvyagg8n42sa";
+ sha256 = "11qhbfyvi5hxv1f448zgbzgrdjj3a4mxj2bfpk6k4bqf7ahh8nis";
};
+ nativeBuildInputs = [ pkgconfig ];
buildInputs =
- [ pkgconfig gtk2 ]
+ [ gtk2 ]
++ optional sslSupport openssl
++ optional gpgSupport gpgme;
diff --git a/pkgs/applications/networking/mailreaders/thunderbird-bin/default.nix b/pkgs/applications/networking/mailreaders/thunderbird-bin/default.nix
index 2bc65226c5fc..851b87374951 100644
--- a/pkgs/applications/networking/mailreaders/thunderbird-bin/default.nix
+++ b/pkgs/applications/networking/mailreaders/thunderbird-bin/default.nix
@@ -13,7 +13,7 @@
, gdk_pixbuf
, glib
, glibc
-, gst_plugins_base
+, gst-plugins-base
, gstreamer
, gtk2
, kerberos
@@ -38,6 +38,7 @@
, coreutils
, gnused
, gnugrep
+, gnupg
}:
assert stdenv.isLinux;
@@ -91,7 +92,7 @@ stdenv.mkDerivation {
gdk_pixbuf
glib
glibc
- gst_plugins_base
+ gst-plugins-base
gstreamer
gtk2
kerberos
@@ -148,7 +149,7 @@ stdenv.mkDerivation {
'';
passthru.updateScript = import ./../../browsers/firefox-bin/update.nix {
- inherit name writeScript xidel coreutils gnused gnugrep curl;
+ inherit name writeScript xidel coreutils gnused gnugrep curl gnupg;
baseName = "thunderbird";
basePath = "pkgs/applications/networking/mailreaders/thunderbird-bin";
baseUrl = "http://archive.mozilla.org/pub/thunderbird/releases/";
diff --git a/pkgs/applications/networking/mailreaders/thunderbird-bin/sources.nix b/pkgs/applications/networking/mailreaders/thunderbird-bin/sources.nix
index 556101f6f952..286911e05c6b 100644
--- a/pkgs/applications/networking/mailreaders/thunderbird-bin/sources.nix
+++ b/pkgs/applications/networking/mailreaders/thunderbird-bin/sources.nix
@@ -1,585 +1,585 @@
{
- version = "45.7.1";
+ version = "45.8.0";
sources = [
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.7.1/linux-x86_64/ar/thunderbird-45.7.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.8.0/linux-x86_64/ar/thunderbird-45.8.0.tar.bz2";
locale = "ar";
arch = "linux-x86_64";
- sha512 = "e1c0092e9068c5b687443c66e51d0a66821b509d554ae49563ceb5ca7f9f1429b47b084d39d9b8c7726aad79d61ad09b3b256118560b77ae9a179152d4914147";
+ sha512 = "b56803f7047547e0ffbe7491062e82a82b19dabf8d4a7483834720166b0fb913f4a0252bebb5653abfaaf526998a5af0c31ff8a62ad8f5ec7d9736a6d581a7d6";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.7.1/linux-x86_64/ast/thunderbird-45.7.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.8.0/linux-x86_64/ast/thunderbird-45.8.0.tar.bz2";
locale = "ast";
arch = "linux-x86_64";
- sha512 = "0dfa480291f654fcd3af50711b3634202b81e9661a037a98d1e32e7b51bdc0395331fa99d8806a49873f23a02be95a383bfbdf001f905eac42d9b132d1e170ee";
+ sha512 = "c49d973c8b138743ea8fa0bca75f2de01ce1d051b15b5d9e6516ad7a8e489028d2198ba460abcb62a06f0738994f00885d0e26e98b5f3311dddb258622ef6f36";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.7.1/linux-x86_64/be/thunderbird-45.7.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.8.0/linux-x86_64/be/thunderbird-45.8.0.tar.bz2";
locale = "be";
arch = "linux-x86_64";
- sha512 = "fd705a8bdbe5bb6e8c7e120495021b538f75ca8d5c485d9d224392808c5397e149004c2262e2dbf982d5248a7ab036ed82980665be7628cf87e789b5d4ed4e19";
+ sha512 = "8e5463a97d93c70fd9fb3b5cda89ad916c7ae2abc89974536dbe2af0633e696c839a97e8dfbf35bb3c1efc7ccf1c588c5ab3e595a0cea519596ac2c112f8012f";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.7.1/linux-x86_64/bg/thunderbird-45.7.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.8.0/linux-x86_64/bg/thunderbird-45.8.0.tar.bz2";
locale = "bg";
arch = "linux-x86_64";
- sha512 = "f6ceb36dfd93e10b29a8d5322604c1fe17d1ef96113e79bd3c5a0f9912b4a77f8a182f676919ad5a58c15ef9555fc2ab07d8c2f375654057cdf2efc0be9a1ea1";
+ sha512 = "912056b19247376e3f8f4f8da493391c9e094abe2723091cf22c83017fcaefa3402e3465db99ea2a4413ea3fdecb9eb6170e8091a2ce3bc191061e9697daf0cb";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.7.1/linux-x86_64/bn-BD/thunderbird-45.7.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.8.0/linux-x86_64/bn-BD/thunderbird-45.8.0.tar.bz2";
locale = "bn-BD";
arch = "linux-x86_64";
- sha512 = "d3dfebeb5d6a301449130c94c7cbdea50e8c29c2571b408d89b3a632a164056605bc0e15dc2957f677d639ca9712088d94c62d26c0b2ade4faadb159978519c8";
+ sha512 = "a221336fae5a44312b1fbf8027c9a6088152f96cf2e5ff55239c0256f6b824c92eddba4442b5efa9e4ae1ed81b3a7114d85fa08a785eb73a20aa0f2b86f73107";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.7.1/linux-x86_64/br/thunderbird-45.7.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.8.0/linux-x86_64/br/thunderbird-45.8.0.tar.bz2";
locale = "br";
arch = "linux-x86_64";
- sha512 = "1de73392b72d595504314e36c2c8cda7ee781a246dab443ba8f1cf46027c40a85a1e7a8626bfc46901940a08d89de69c2779a0702e5271da3f703aa299ae4767";
+ sha512 = "ba3d2a59ef9347cb1c23716bd308f62cdcf1399ea6a2c35ede563fa2af48e49a8ca9954f986f55e41c80647cceb218d664ebed0c7053e3ef4a0ea12395bd01d0";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.7.1/linux-x86_64/ca/thunderbird-45.7.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.8.0/linux-x86_64/ca/thunderbird-45.8.0.tar.bz2";
locale = "ca";
arch = "linux-x86_64";
- sha512 = "e481f63846a437dd1326820f455ec7c50ae56e638bc771814c4a53b5fcd7b397e0b6d7886965f4ebc94c15d33eeabb947c65a72ddad8ebd6a0549ec5df94be73";
+ sha512 = "f64e2eaa1208fbcc8be61e28ceedc113101fd6a9d7b2ac23299f36913b7c696b7a3fbb83934c4ea2ca8d23d632891a22e48ce3001425fea54f7669599da136cb";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.7.1/linux-x86_64/cs/thunderbird-45.7.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.8.0/linux-x86_64/cs/thunderbird-45.8.0.tar.bz2";
locale = "cs";
arch = "linux-x86_64";
- sha512 = "148114a531d1dd467fa59690836dee75e2640dca5b448175424d56224867676990561693e12faef7ea53b0e0a87cb039a5f7b35432901703f135cfb99f48e53f";
+ sha512 = "130c73d25b581988fc14f734d39bdea4d777258ba35f56f421b234a79a00cc4f322912977af0feab0b3d4ac72e3fd3d13eb26465da7b2d81d8ccbf05a42b8c0e";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.7.1/linux-x86_64/cy/thunderbird-45.7.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.8.0/linux-x86_64/cy/thunderbird-45.8.0.tar.bz2";
locale = "cy";
arch = "linux-x86_64";
- sha512 = "6ee390cc87fc717cb1e413e5e2b46eb1f7335f617877f9c190075f808f9e0f7d21f59a41a651f2bce14323a46994c499056c6ba3308dfc28a2733f125e200a0e";
+ sha512 = "a3894db9cef7368ee824ea7015b62d378a7e8733b86eaa5fa59645fea4fe9bd9bcb1752ed12678d6ac052b42060d2a3282f23c25c4451362a0c941001352a352";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.7.1/linux-x86_64/da/thunderbird-45.7.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.8.0/linux-x86_64/da/thunderbird-45.8.0.tar.bz2";
locale = "da";
arch = "linux-x86_64";
- sha512 = "1246c3338ec1c66ec0631cd3dd2e2ddfa2f55eaac2ebf36d6fc78a58cdafe15b5bb02c542447fa7aeac56eb9dce2501951b998c605844ce37fe8bb4868c100c7";
+ sha512 = "ae037f835dd51fc4b140ca0165f75ff26a305715a8536929d46c487d4db1e77cb10f101faea6a612579b021db597b63045deaaa7db1cea2b3d4160d8ef423a4d";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.7.1/linux-x86_64/de/thunderbird-45.7.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.8.0/linux-x86_64/de/thunderbird-45.8.0.tar.bz2";
locale = "de";
arch = "linux-x86_64";
- sha512 = "ba651c2f07eceb4c20a9997bd518c322b025467e3474a56c17e1c35ea9dab7c3ac08295f573cdb7c4967e531dfcaa76facf4185ecc12a66436690817c73c0454";
+ sha512 = "71255dfb152f4f204399b6ecaa837a468bce5582fb9f358a1d7bdd073e2aecd41a7302a0096f1429d20bd67a92d012172308e8df9aebde141bb7da828b158cd5";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.7.1/linux-x86_64/dsb/thunderbird-45.7.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.8.0/linux-x86_64/dsb/thunderbird-45.8.0.tar.bz2";
locale = "dsb";
arch = "linux-x86_64";
- sha512 = "5fcbb029e59b50e3c8762acdcb561f3541a1056bd467f2830b316ef39b9f55f88797693ef4c281d8411c678bfbe86abde74483f0b9418e185fe80463487da489";
+ sha512 = "39f02422d754637044fe4c75c9d677c43ff6a87229893c3eb637ff6b9c8adf541833aa929b70f2b783aa1fcf998e112645809c6256070fa746c4c95885c9232e";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.7.1/linux-x86_64/el/thunderbird-45.7.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.8.0/linux-x86_64/el/thunderbird-45.8.0.tar.bz2";
locale = "el";
arch = "linux-x86_64";
- sha512 = "36fa1fe8d3b52ee95275acfcda8eeda175f9ff5d44b7fcd0e33df2a27fd4c815d79b647265e9c32bfdcd9f1900bc98195bee6de5e580abb452ca47003a438b40";
+ sha512 = "3cf4cce1398e945a3cb41e5432aa0c2ed1fa386e8e553816b1478a12e1248ac709de8d21a938e6c3cd801fffb58fe6e10776b8b96bb295b5fa016492f70031e9";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.7.1/linux-x86_64/en-GB/thunderbird-45.7.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.8.0/linux-x86_64/en-GB/thunderbird-45.8.0.tar.bz2";
locale = "en-GB";
arch = "linux-x86_64";
- sha512 = "15973247dab22789b8c63f5617fd1d85aa2a889e78d1bfd8ade002d769bf81857cf7d84c6302c168c5923ccdd08ea561df4fca1f17f0fe3337608af161c6e86e";
+ sha512 = "609ebe7d015af9dfd3b88ebfb04d67691314ac91d3df7cff91df3f20ba7fb12db5f44dff5c773b4b7c858cc4bc5817119fcfabff03ec550ce250a5289aaea9ab";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.7.1/linux-x86_64/en-US/thunderbird-45.7.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.8.0/linux-x86_64/en-US/thunderbird-45.8.0.tar.bz2";
locale = "en-US";
arch = "linux-x86_64";
- sha512 = "4acce7404bad1bef72d1ba0630a6d9e7678716121b5520d399c3e47096a5b82c03b797a3680428d1c8447121d403de227d7f327001a27092db8df438f1d88d18";
+ sha512 = "4294c93adb8f38617b2898c91d0362b3ab327158e1810d2304f2481bdc4e0e06e1fd2a2d6748cb491cc6c732a039fa3dd83dac801b12ec7be2d7c8cf7e986286";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.7.1/linux-x86_64/es-AR/thunderbird-45.7.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.8.0/linux-x86_64/es-AR/thunderbird-45.8.0.tar.bz2";
locale = "es-AR";
arch = "linux-x86_64";
- sha512 = "68e7e8b134d6b3a6b44ecf9deaaa4fe58a2ba2324621722300eb39c74f6d4801edb7532ff81a2a22f473b55d227caefce4e5460b9527fee2bc7e9b765b4a66e9";
+ sha512 = "ded0d52934a5b74e4eff172037c1abe9c15cb522897daee5173739f4a149c1891309a366d3aded2f1306c447970e72b1a2930a9adce07d57287f7f5f0e8eec73";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.7.1/linux-x86_64/es-ES/thunderbird-45.7.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.8.0/linux-x86_64/es-ES/thunderbird-45.8.0.tar.bz2";
locale = "es-ES";
arch = "linux-x86_64";
- sha512 = "80517102d930a0613254f5f2ebbccfadc27606664e957b217e899b2d519f1a7fd189caa17756ae9849f870b97ed8a589c327d3239d2312368a94583434a31bf9";
+ sha512 = "523c9b931d9ef8319c5a30463035d84946d97b07a9714b2357637f9992a3dcda4536a29933a29340d4e4951ff2bc540d587ab290a16033bfc510ac911c32d3e7";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.7.1/linux-x86_64/et/thunderbird-45.7.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.8.0/linux-x86_64/et/thunderbird-45.8.0.tar.bz2";
locale = "et";
arch = "linux-x86_64";
- sha512 = "3399aaf7a8eb812b4ed4c56e8e6619c9e7018e552bc810f9a20773854cdaaa3a4382754fafde2809bb945885059c1613e3832071bdc55d32816aac49e38acc9e";
+ sha512 = "376e5cd8f50c4b10c4f71b6410528965f256b69c17f3d0d103efe6bdd28ed96d0fc47dcfb709dce617757c3cec603c5a16ac675ae12e17b093db3d1184c8ebfb";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.7.1/linux-x86_64/eu/thunderbird-45.7.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.8.0/linux-x86_64/eu/thunderbird-45.8.0.tar.bz2";
locale = "eu";
arch = "linux-x86_64";
- sha512 = "4b7ace6485b3d9f14a924a9827226c3337f4b95107b94e51925524aea6eff2d446868f7a7f350c22ef7dec0c3c04c0fbb79f9eac9c1db0070195ce402559b3c6";
+ sha512 = "8dba4439fadb14028903eb552ad08c62b0a63559ff5332fd2d5434179fe28a75d754b6769d1a171d7e580ec6d86fdfcad8ae6230c14c4e9aa981944013dc5b86";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.7.1/linux-x86_64/fi/thunderbird-45.7.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.8.0/linux-x86_64/fi/thunderbird-45.8.0.tar.bz2";
locale = "fi";
arch = "linux-x86_64";
- sha512 = "42330fa494ff9e09ddddaa5828fd6e984f4e016d45f90638a72d958f1d0d52458c4d66492c4bf3a9a57fad32ebb24ecd4d43efc51795f738f50d7385b3090015";
+ sha512 = "40d579d59beae9070cf548f340d5b36d67d0456bb0f9569330dcaf4667d6cef71be1be4d32ffbb49446c8921486153e50d5c33ad87746f605e4d3a79b4b74a69";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.7.1/linux-x86_64/fr/thunderbird-45.7.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.8.0/linux-x86_64/fr/thunderbird-45.8.0.tar.bz2";
locale = "fr";
arch = "linux-x86_64";
- sha512 = "53696b4b77c2dfc4eeb03059429dbf38dc31910664ef7638ce291adee5d9e0bcfb1b8a19524a96fed02594b664d125e9c4791aac674c03e9dbb272544f429cb1";
+ sha512 = "80b489cb98c0a39c641c0d49cb750cd737594e6de1c9b0559208535a41f95855afbbaf987ab0cfedf5fb5b2fa1589d538b7eada05114d7259d3789fa399e20e7";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.7.1/linux-x86_64/fy-NL/thunderbird-45.7.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.8.0/linux-x86_64/fy-NL/thunderbird-45.8.0.tar.bz2";
locale = "fy-NL";
arch = "linux-x86_64";
- sha512 = "2c8a487a2a77451d2d4c239a16cdf114e1d9ef37d7c0a1f2dd2e3e9ba6270004e39fc38828b363805ac530b2f6cd3016594dfcccf2db37525f9700866d6a513f";
+ sha512 = "6bd13607375c513be19ae9f86e806ca94d4acb087700fdf85842cd2a7eecab66735b9ca5130b013d09dcaab12134d894bb991774727d67ff71ef2cef4b0f9b49";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.7.1/linux-x86_64/ga-IE/thunderbird-45.7.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.8.0/linux-x86_64/ga-IE/thunderbird-45.8.0.tar.bz2";
locale = "ga-IE";
arch = "linux-x86_64";
- sha512 = "127d0cfc24b8e3e00aedee39aa400af198c7e48239fce97dde27416ac517108957d5f18735e5106eaba0433321f406ca9c82d774a83f1e58dc297b80e55a33dd";
+ sha512 = "de4744accb4332e8509a1cb439f29d773d67f42d3964e11df83e790e6f720063b3368d3a120f746829d61741abb18baaf1f2afd9dc3bffde1ae2a118025d7973";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.7.1/linux-x86_64/gd/thunderbird-45.7.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.8.0/linux-x86_64/gd/thunderbird-45.8.0.tar.bz2";
locale = "gd";
arch = "linux-x86_64";
- sha512 = "48dca91d52b3f71a76c3a08003247bcfe498342b3e2e6158f58087251a9248959d17a7c91437475892a5b5124d9a76a1f0cc99c118e34c763ae4227fc4776dd9";
+ sha512 = "98f73337263ea57e609bab9f8f0537c15c385448c48b84185d9c8cde8550d2d2fb6adc31735c7a45eff5d1872047f7137e168b977a5686401c1f0aa21a38effb";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.7.1/linux-x86_64/gl/thunderbird-45.7.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.8.0/linux-x86_64/gl/thunderbird-45.8.0.tar.bz2";
locale = "gl";
arch = "linux-x86_64";
- sha512 = "92993f4090d641ee6573ec08c9ed25d3126e0e9796568aaa77296e859fd70069ce0f63f017fc08a3e01d65dd9864063f8ec089ee8e43197d511358b53259fb76";
+ sha512 = "b255dcc44f33c9b8d74ba664350cb6423245a146134e64292f7bd0850ddeafedfd691d8c5e4db51c019df92283b094a8d152441512aef33971ac8959a2904656";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.7.1/linux-x86_64/he/thunderbird-45.7.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.8.0/linux-x86_64/he/thunderbird-45.8.0.tar.bz2";
locale = "he";
arch = "linux-x86_64";
- sha512 = "c7e78d6aa2920fa81820b54a3f1047d42089e65fcc424ff663ef287cf581aec7b11fec33c309c88ae5986c9a78d3967dbc3cccd6efadbacfb145e36d2409e514";
+ sha512 = "4c8406c16bae204a1aeb075dd061eb3a70585e439c29f585fed4bb7ee3c1d599f8fb2f12f2ad9d0521550729d7ad1a0b097349a3a318be89a37d10b749fa4fc1";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.7.1/linux-x86_64/hr/thunderbird-45.7.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.8.0/linux-x86_64/hr/thunderbird-45.8.0.tar.bz2";
locale = "hr";
arch = "linux-x86_64";
- sha512 = "0160db00133e4564b9ca0ddcb2771abd343bd3cef1bfc09303805bc0aaa01a5cbeeb6a23effd2e8256ae5457a2fddc149156d1702705531c728134845945dc56";
+ sha512 = "e855a5753de07b4f4435356571178149c0eb26d9b0b81bbd41de89e88bcf30c3d970514c3548a389cf719917f29899185e1bed9d18c4b467f2d31e00d271623b";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.7.1/linux-x86_64/hsb/thunderbird-45.7.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.8.0/linux-x86_64/hsb/thunderbird-45.8.0.tar.bz2";
locale = "hsb";
arch = "linux-x86_64";
- sha512 = "012f4544e60f7a917ffd49fd6668da548e6e44ce666a86f61cc0e36e53806db16496824bd20b253d079e27d5601ddb6cc1ee290c600e116c922bb842a2232294";
+ sha512 = "8afc5a73b43ae6b43595028213ff6e21da813f9e9a93aad498e583c4ad5fcc2c5eb90ecdf911a32a68710c36a742ca1a0cc89b987789aaeb9995716783e0fff3";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.7.1/linux-x86_64/hu/thunderbird-45.7.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.8.0/linux-x86_64/hu/thunderbird-45.8.0.tar.bz2";
locale = "hu";
arch = "linux-x86_64";
- sha512 = "ff13587b1098f0d503c6f3b81c2a9f3c075d192517e0dee6d9fe324927a6dce8686d989a34c3d36cff7a8e2bd6a074aee5fc96f7527ec3fd78cc0c96f4279b2c";
+ sha512 = "da48fd9398349c6dd583391413add0b789d1500dd1481758a62121052bedaa739406011b5a3747fca810c74140c98498eb8c49a092ff3f184627bbc3469df90c";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.7.1/linux-x86_64/hy-AM/thunderbird-45.7.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.8.0/linux-x86_64/hy-AM/thunderbird-45.8.0.tar.bz2";
locale = "hy-AM";
arch = "linux-x86_64";
- sha512 = "84f3ca15346c821dcb9efdcfbc2b599a68b608cf8dc28145e0aac80babcf3b82da456a0816f2e31ed47b19c47f3afa9a265f864de6662fdd4fa8586d520ea025";
+ sha512 = "588c3670d7748453e273f515255c29e5644e521f9710d1f87360a2031334f9353adba4e219b0f90c3c028102e5e02a0ffe07071a6fddea2bd2a1d972c04e1537";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.7.1/linux-x86_64/id/thunderbird-45.7.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.8.0/linux-x86_64/id/thunderbird-45.8.0.tar.bz2";
locale = "id";
arch = "linux-x86_64";
- sha512 = "2310cca9ced00d10b932eb6d27797b53e427f997671b836a5d03bc3f263fd469ea3dc5a2ba35a71da6b73e4dec83c60fc31203329562d6250ec573a38c55f115";
+ sha512 = "a9acd62a369249370f7c6b70bb48aaa8af06de2439b328d92ddd3092cb95fd59df679a451f42173e6901d0e9fce9159e295331479d5128fc50ca7a2c93129bbb";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.7.1/linux-x86_64/is/thunderbird-45.7.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.8.0/linux-x86_64/is/thunderbird-45.8.0.tar.bz2";
locale = "is";
arch = "linux-x86_64";
- sha512 = "710f180201035cde81d8e07cbc7e9e83289a160f6679393d2dd70c48c92f5b3568c0f7290e18613945abee052433f31c2b3b11019cb95cb8f6b23f04e985741d";
+ sha512 = "76aee81433e6d8f2f7906d754069a5aab3ff8caa2b3d503a730eefcc42ddc1ea2018049419015dd4725344dbb54d821633f10f1d0c0139ee62c230f7643c5ee9";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.7.1/linux-x86_64/it/thunderbird-45.7.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.8.0/linux-x86_64/it/thunderbird-45.8.0.tar.bz2";
locale = "it";
arch = "linux-x86_64";
- sha512 = "d5596d86c425f2d1251947a6d66558d87ec22a20490db23c267c514b98ddb9acebc30180c6c29a242ead4bf079fb8e9bc35414210c1d294dc735923f0ab29d3d";
+ sha512 = "c7912a63ab9141a32e8f9040522900b10bb56360fd387b8b47af860814fa1541ab7ec1c59eb6376b7aacc2a22faa046d05c4a1ae81ef12bf553fdf546cfc403a";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.7.1/linux-x86_64/ja/thunderbird-45.7.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.8.0/linux-x86_64/ja/thunderbird-45.8.0.tar.bz2";
locale = "ja";
arch = "linux-x86_64";
- sha512 = "954e41ec6842e4ea40c84354a3499085d5fa754c0a8fe581fd0e1ddafb84c218b0afc6b84d6b89448573372ca8170563f4732eb0e00388d5daf918fc9eccab5b";
+ sha512 = "03f414eba62f4188bb7a368653f89f0b8d48e850751cab0fb6d706912787aa098a32934bd5c7b3026e466b23df4cc6780f6b88f1f252943b2d56b53f1ea62cb6";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.7.1/linux-x86_64/ko/thunderbird-45.7.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.8.0/linux-x86_64/ko/thunderbird-45.8.0.tar.bz2";
locale = "ko";
arch = "linux-x86_64";
- sha512 = "3b48ec21a87f4763e95a045f273b3077cc0f73f0cd79d0fd341bab93308ca6aa122aa1b6fe60cd9857e2af30f8b868a1ce56ca5e2418235b9207c33339abe66b";
+ sha512 = "d9c1cfba0ab167b4f3e16eb8ee37ca3acfd94477df51a2526975602882b93a4c86e7936f76263bddfc904900146b0ed570c641f4cd1d48904bd5b9f09aef91ac";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.7.1/linux-x86_64/lt/thunderbird-45.7.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.8.0/linux-x86_64/lt/thunderbird-45.8.0.tar.bz2";
locale = "lt";
arch = "linux-x86_64";
- sha512 = "e314d8aebc993a9471610d885736e50a174905cdd862eacb3cc08516fda8538cd86afbe62744a7a28947f289cd9d3847436ac4be6966097c4e2d81f74bb3aa19";
+ sha512 = "5f28db94768ba285feb1a239cfd909a588a975dea16ade7793e4e1f71f8dcee1685e7370ba23cb50b253d8252a51a38a90375e8224653bfeb37e2a1e8d969d34";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.7.1/linux-x86_64/nb-NO/thunderbird-45.7.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.8.0/linux-x86_64/nb-NO/thunderbird-45.8.0.tar.bz2";
locale = "nb-NO";
arch = "linux-x86_64";
- sha512 = "2d14dad1eedc2b5043adca4d8ae9ddfa7bd7c4d9c246fb5abaf552f2bd1a27cd7d64638291a82391ceb84ba83c6c4f22f9ae09c7efc1c2530cfe986654b8b27e";
+ sha512 = "e3078466c4a5aa5a2743c7224c279c908be05730a79bc541031efa48605e0b74fb4244e087f3cf526bab6c67c40da585815f11999ff29d6a3d0867614aa11e17";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.7.1/linux-x86_64/nl/thunderbird-45.7.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.8.0/linux-x86_64/nl/thunderbird-45.8.0.tar.bz2";
locale = "nl";
arch = "linux-x86_64";
- sha512 = "fcde3900e201175fb9071b553f26dc49cad67888137df2e6ca4c7a85ffcf85aa23ca331bd4e5a3430b20615b2dbfae1ca4fe59833cd9d303f7ea6f8b73f42f64";
+ sha512 = "7e2bc54b6d72fa495ef99e132dc4e476bc233c88c1652fc625ed66b504b901fcef53b4968d63d7d468e734903b38ef897282c2122e4bfca5b492e2f4d44b51b6";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.7.1/linux-x86_64/nn-NO/thunderbird-45.7.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.8.0/linux-x86_64/nn-NO/thunderbird-45.8.0.tar.bz2";
locale = "nn-NO";
arch = "linux-x86_64";
- sha512 = "a3e41f8fe0486a691c413104fe89009db9e4709821bac4a7062a78a6a30b083fed5a522c6d5b7c004e0e9b2131aa4bdbae85e8dae3300d2f81fd875981d79b44";
+ sha512 = "99a733996460fe3a425d7ac9d37d292ef9fdd0d1bb22aac251f592bd57f4ab2228040443ed132987cf17d971b3bb2232ba9e70aa2b6b702d73967ed55a1b3b41";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.7.1/linux-x86_64/pa-IN/thunderbird-45.7.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.8.0/linux-x86_64/pa-IN/thunderbird-45.8.0.tar.bz2";
locale = "pa-IN";
arch = "linux-x86_64";
- sha512 = "841cf7f21b436d1194c4082ec0fd0067bed7ae625299b8f07f535708005ea3a7c217f4a6d3acd8b392e620ebdd15447f62f969c4e0c8e40e69f77c3b89402517";
+ sha512 = "d43dc96e3620c8ee1257243e725743e72c64f39123d2e4648eb5a31e45175b9b01b066b85ee9cc3d9765151bc2aee32f73b50579619968ff95918189d45358ca";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.7.1/linux-x86_64/pl/thunderbird-45.7.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.8.0/linux-x86_64/pl/thunderbird-45.8.0.tar.bz2";
locale = "pl";
arch = "linux-x86_64";
- sha512 = "026002b4161801b9ba44442ac2b54f0897b6fd3dea3c6819a16c5b886c829308558917470e87eba1e7bfa9adf6d5a33dcce4645f24cec8b8cf7ef4773d924e65";
+ sha512 = "32f034261425fc41ad9b2c252aa456b1526526816d9ed66e92c49fbf8fb4b077405e2ead3256dac568e1470e29971ff84466854115f57f792a254f0723278054";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.7.1/linux-x86_64/pt-BR/thunderbird-45.7.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.8.0/linux-x86_64/pt-BR/thunderbird-45.8.0.tar.bz2";
locale = "pt-BR";
arch = "linux-x86_64";
- sha512 = "7b78eed009541c2b5e99fac1c6267f42511feab8cd26b8c6cd758c8cc4fade84195da5b4ed1dd44ba078c3ae6a3d2aeed0bdd04e37a48f585938765a7e14021e";
+ sha512 = "65f85f596241f812a548a90a1ebf3cd24733e590cbedd600ca8d1164d3d3f5db9fb9a0e152ea05025039203f192168f60fd28a03121c31cdcf14449505d57c0d";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.7.1/linux-x86_64/pt-PT/thunderbird-45.7.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.8.0/linux-x86_64/pt-PT/thunderbird-45.8.0.tar.bz2";
locale = "pt-PT";
arch = "linux-x86_64";
- sha512 = "15f5f46ad34ab5506d462c68ae5a2c0ab1548b8588ac877863ca73c97166d10ed26a6af32c9f0f57bb94da7b0c025813585a17e52dd3238b49344995905bb705";
+ sha512 = "fab114396e6cbee135441392dfe6baa179640174edd19ec4d1854a4adb6d3310a38e162209bea0ac532e2734a9ad4c5abc1926e0a4ca2052c62697f99c374135";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.7.1/linux-x86_64/rm/thunderbird-45.7.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.8.0/linux-x86_64/rm/thunderbird-45.8.0.tar.bz2";
locale = "rm";
arch = "linux-x86_64";
- sha512 = "d0e70c192fdd0cc440f81173b13a09e6916355c2f65292c234e1da288e9a54ff1696e20c3a04f3a18fdb664d0fd76d8c477c7b19b0368a1d5dd889a5bfdf8f49";
+ sha512 = "e03da559d75887e2418119cc946bb9ae2f11027dc2109035e533da46c859f3dcaf8fec294a6bdcb10d164866bc5c3652ccb6b8276c58a91311c2bba63117f1fc";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.7.1/linux-x86_64/ro/thunderbird-45.7.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.8.0/linux-x86_64/ro/thunderbird-45.8.0.tar.bz2";
locale = "ro";
arch = "linux-x86_64";
- sha512 = "0bd336fa6f8e1f22e8d9f8e10071518a91922d9f8b75d4e462cda1ff9a7e6a744a4d8b4412dd3d1f5617553cea67bf73599b5023dd205437ff3aa26854916e24";
+ sha512 = "f7bed7908706485e0cb26a663bdd6b0fd8ad8ad5e687a21e1c137c39d01427e3edce5ce58602bcd18a185445badefa519ecd841367f88f169591aabdf570b940";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.7.1/linux-x86_64/ru/thunderbird-45.7.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.8.0/linux-x86_64/ru/thunderbird-45.8.0.tar.bz2";
locale = "ru";
arch = "linux-x86_64";
- sha512 = "61a02467ee16e6a14b535be1b4a3ce2fa3a6bc6a61c2804e234242758361182df976f7edd0c8080637f3403436b018946c28668da09ecb9322c0eaa5fe395ba1";
+ sha512 = "7775b9054e95d373d188e496287b2cbea1ddcd12c51681123642fbc181cff258d47b900b3dbf046f3de7d75e80eef5f343a50577a9db05ab2b56867a18f3c912";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.7.1/linux-x86_64/si/thunderbird-45.7.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.8.0/linux-x86_64/si/thunderbird-45.8.0.tar.bz2";
locale = "si";
arch = "linux-x86_64";
- sha512 = "823e069b47f42c35c194bbfae832f71203e78f14057223bc569d8a18bc631d2d5bfdc3dfe5cb18c0bbae561b39023cb43dc26bf841a0e20e53bf336128bc1210";
+ sha512 = "3e19c7e5b62b6d0bd3598ce6bfd23631abe381f7af91275aa8e424ff2950433fd5e58e912ad13c726185e528046d3bdccdb6b3e1fa540fc0cb69b18d37caa095";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.7.1/linux-x86_64/sk/thunderbird-45.7.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.8.0/linux-x86_64/sk/thunderbird-45.8.0.tar.bz2";
locale = "sk";
arch = "linux-x86_64";
- sha512 = "c3bf6785424419f7a1240c2069abafcd1275dfdf8908fe2e80dbd395176328e7c8c0c2cad9ce7ef46a605bae9e153e6c98fa696145fe7a186e30c7a2b147dde2";
+ sha512 = "35a5b23cffb7a80aaab378ac17195b727b7776a0c91e1616fe9a66708adc08d6041efa55dd5b291eee823a5420b092671a34f930276521f0d757e3b5568e7861";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.7.1/linux-x86_64/sl/thunderbird-45.7.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.8.0/linux-x86_64/sl/thunderbird-45.8.0.tar.bz2";
locale = "sl";
arch = "linux-x86_64";
- sha512 = "bbf63ca0e0992c5102b047c5e41dd9a2dd04d38bcbb983393345a54679ddf100496082804d17c088f6dbb76bcaf1d9be39f0e45d1e1cb0abc33fef98a79bde7c";
+ sha512 = "a7b27babbcd47b4bca6e0686aefa175fab17c4ab0d7f18793a0a3755fcaf04cd85e9bf8ddaec442ab83bafede0ad9f8211add33b6cad845f7c827e3af0982f76";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.7.1/linux-x86_64/sq/thunderbird-45.7.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.8.0/linux-x86_64/sq/thunderbird-45.8.0.tar.bz2";
locale = "sq";
arch = "linux-x86_64";
- sha512 = "68f2977a84aa0a1fc94b19a3504733cb4168d5835244482e775b0200cc0e17a548cb3f4e29d81edffb9172d3faced2a8d459709ddb90e1957c6c05ff792ce05d";
+ sha512 = "796d3cd98d39fbad987387f92d23c10f4176f2e612c1fa939bbbcf86eb3de5798a9c9add31549dcae001041d0318de2186e00200190f467ebfc85e5c95797cb0";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.7.1/linux-x86_64/sr/thunderbird-45.7.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.8.0/linux-x86_64/sr/thunderbird-45.8.0.tar.bz2";
locale = "sr";
arch = "linux-x86_64";
- sha512 = "d0de9ea4f4cfb619d37b957b4260477522ae1c2df9af19e6001672f7f693015c09e8e74ff0278d0107abbb0483de0c9f6d251efaa3d9175947beb8c156145ae8";
+ sha512 = "8b296aaf9314a8b0381e567ff87e8ed261ebb976c0f63d3636d03fe2e416475dad8c500058e58793a7945ae620268854f99c97b93da0ab73a40f67d801b34af9";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.7.1/linux-x86_64/sv-SE/thunderbird-45.7.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.8.0/linux-x86_64/sv-SE/thunderbird-45.8.0.tar.bz2";
locale = "sv-SE";
arch = "linux-x86_64";
- sha512 = "db4af37830a458808b9450b414b7e25aede621c602b344cfbb62f00fb610747ee48fe3a7aceb1a58c0b1fc397415ea7a9e0888e0cbd7116922f2bc28d09c6426";
+ sha512 = "59e0eb3a4e1cc65fc34369b0854d7029bfe108b3cc3550bde26628d88d82c0031bbf13ed8564c7508b2acae5ffc9a912f1cbb991bc5cecf2a210bcdb181e2a05";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.7.1/linux-x86_64/ta-LK/thunderbird-45.7.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.8.0/linux-x86_64/ta-LK/thunderbird-45.8.0.tar.bz2";
locale = "ta-LK";
arch = "linux-x86_64";
- sha512 = "1db6844293dce004878176cb76df68e7c7b3fd1147b4e78bf647d155d1a7efe01e5126c088c96d26f78dd2c9de98e0703b7eedef1f2de1584a0cb835f9123c1b";
+ sha512 = "86719203c04b90e2d359ede21ef3bca7e2190b131a78ba4ccf6a7d9644bcb2971b541cb3c6432e6a12952a3a589769851277a257aeec594b6208918c17d76b32";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.7.1/linux-x86_64/tr/thunderbird-45.7.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.8.0/linux-x86_64/tr/thunderbird-45.8.0.tar.bz2";
locale = "tr";
arch = "linux-x86_64";
- sha512 = "f05b1f63839a9d38431b9c1bce8a2f31ad242edc4df5b327f9f0a562dca1f94a9f3947ba55a517cca5dab9a96fc44b938496bf72086f1dd8d1399aa3170167a1";
+ sha512 = "5b7fa2e0881dceeb0ac371a0d84209cb9e9c414ee617766ff898b50c2b21956919410be26cc0b1e30997931519fcc491c63c6e30144a2c57af8b7b8f61cd192d";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.7.1/linux-x86_64/uk/thunderbird-45.7.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.8.0/linux-x86_64/uk/thunderbird-45.8.0.tar.bz2";
locale = "uk";
arch = "linux-x86_64";
- sha512 = "303d6b4ea136dba2217301f6c42bd91e45ff635ffa1ab38ec0633d963a1bafc1625475bbd24383e5b9dcf233a19ab0a712e70891614e14207b651c4e65016456";
+ sha512 = "8be8b331dce88d3244007066036741af4794559237811ab8d45dffe3e850383de636bb75a510d4a0500a2a78aa86d06768073a5626f5bf2676eb4d8e355eddcd";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.7.1/linux-x86_64/vi/thunderbird-45.7.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.8.0/linux-x86_64/vi/thunderbird-45.8.0.tar.bz2";
locale = "vi";
arch = "linux-x86_64";
- sha512 = "3f712c97073ff191bf2e16d61877711ca4faac204e85b2394015d53a4f600a3c0fa352787ccddf863379ebefce4020b3526f957f2556620e4632bcb20204421c";
+ sha512 = "60ff68fc5190679b4faf2e80f89b8061348f24c0426f632fc2e523be2d47b0477b2ca122fe4c9a77e8baa91d5c55ef0204fba74f65a1d7e77727abb9846c93df";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.7.1/linux-x86_64/zh-CN/thunderbird-45.7.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.8.0/linux-x86_64/zh-CN/thunderbird-45.8.0.tar.bz2";
locale = "zh-CN";
arch = "linux-x86_64";
- sha512 = "d986a5e9a60512ca4d398fc4fb503aa7980947eee68dfcd5c4a73bcc8b324c20c6a3be66855eece6d0d77019e6b22d8ae220058948488d197063f55a291a8865";
+ sha512 = "a7da3633bb13627a81681e2539472291e0ffbef2921ae59c7fa541b0115f761295221501ea7b4e71975ba89dff559aa0f4ae1be196983854021bef823cd7c40d";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.7.1/linux-x86_64/zh-TW/thunderbird-45.7.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.8.0/linux-x86_64/zh-TW/thunderbird-45.8.0.tar.bz2";
locale = "zh-TW";
arch = "linux-x86_64";
- sha512 = "7dee7ced1c48aa6019eb80c66d2c68af9b5afe89ba3c147bd83e78532fab84fbdba8afce934ef8bb55a82837b84475797cad25710001e22fa522823bc60d6a96";
+ sha512 = "dc16cdd23ad53baa7b0863aa889a9222a14ae8e81794efad08dfffc4a6282655fcce3ff64187ce149c06d808a0010af8a084bafc59e253f094d501ee6bebbbef";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.7.1/linux-i686/ar/thunderbird-45.7.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.8.0/linux-i686/ar/thunderbird-45.8.0.tar.bz2";
locale = "ar";
arch = "linux-i686";
- sha512 = "0453a451bc0ef3704cf54121f7781f11c2a35c29fa407b36a1159bdb462daf35ac13da1cb0deca19b5b9456a4bc68c8bcfa12384dde82441a8e69c5376875d5a";
+ sha512 = "21c08dc4ae1655ddf62ab03ab68ff0d5fc3efd6c8cd3ccc6d757b0b684365a3316b4cf4fac5a51b21be27a5e3067fbc875bdac1a8bca5cceab6e048c10f0f177";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.7.1/linux-i686/ast/thunderbird-45.7.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.8.0/linux-i686/ast/thunderbird-45.8.0.tar.bz2";
locale = "ast";
arch = "linux-i686";
- sha512 = "4bc10c64922604b95dfb310f0415a8e49552378c51025511265e7f1e7f2cf7bd8f9e9c6b3e45f8806f2df9fd02db451014cae4de7c2e5ce57e48dc1288cb30b3";
+ sha512 = "3669b524e5d5800f9ef3c1c6b5f874c29ba6fbb336cebbfc9a88f857e73f9bf90ccdb0fa2f1723d4e883947e71dc0333391b9021166b5acf2e39ca3d7bf02ff1";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.7.1/linux-i686/be/thunderbird-45.7.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.8.0/linux-i686/be/thunderbird-45.8.0.tar.bz2";
locale = "be";
arch = "linux-i686";
- sha512 = "0fb8f8d0a2c7ea4455c0ff90b85e4ef6b0b6f8ccd08f9f9d4852743ebc1f6a6277011be82be979142097fe8cba853d244afad30749aaa423bd9ffcde9fc3a00a";
+ sha512 = "f49f90f1998a5b7dec1e3a862b8f76bc11445d99f66cc6503675fc6629a028624e55dac5245da777b6e3acffcba24305ed199674343cb610861da9c7671c342f";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.7.1/linux-i686/bg/thunderbird-45.7.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.8.0/linux-i686/bg/thunderbird-45.8.0.tar.bz2";
locale = "bg";
arch = "linux-i686";
- sha512 = "6d586700050d399e4058eb03931bc6915ec56a9270462a7a60846f66b884aea9627526b87b14a654166e30b8a1d43412ba8acfcb12ba4af8d3fd4fd15d4d7cbb";
+ sha512 = "b46e78338269dc6c65f0eb2bcd2cb4a0dffd5c100b4b1905582c8189f79abc975f55c7edf06e1f0edbb641de86f3b6aba1ca9028d11f4fa08ea8bd1c276e41f6";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.7.1/linux-i686/bn-BD/thunderbird-45.7.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.8.0/linux-i686/bn-BD/thunderbird-45.8.0.tar.bz2";
locale = "bn-BD";
arch = "linux-i686";
- sha512 = "1cfa845129724a098cb913b3bcaf7174ab125321b35f58279ec9c11c04f7f991b37bb9000eeea4003cf033f6f0089992ebd0d7ebf1d6f8b4d7c558eb8c850d99";
+ sha512 = "d349c503a13ae9b951af173a43f4f8dcbd5cab43d5a6219fe5b00e1d37efa7a0ceeeda36576f31f51bac615d6e4307611496e8036af4f9fc40dd3dfb495a6b6c";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.7.1/linux-i686/br/thunderbird-45.7.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.8.0/linux-i686/br/thunderbird-45.8.0.tar.bz2";
locale = "br";
arch = "linux-i686";
- sha512 = "951631129aff5cbfc2695e1a5dddd88e855d57716ce335a15ae069b7bb4572d082495ddad9caea202c5d36f46f599cdcb8f028def63252f7888fb2ba24f4437f";
+ sha512 = "4afebf7eab2f7205a8760f04e566ba8d54bc2974cbd132262eedeaf880d29aaaba48ebd731bb8dd7ca537e6cc3fe444c1ae4168e3e08b7e17c55e70f763fbadb";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.7.1/linux-i686/ca/thunderbird-45.7.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.8.0/linux-i686/ca/thunderbird-45.8.0.tar.bz2";
locale = "ca";
arch = "linux-i686";
- sha512 = "cae03ff18fb33f6d097836e5e7f5884f64e7c594eaaf77cb3a0e1f46214b878ef2de51c750bf1f849f5cfddc68da21c3fb72927ddf6824a89ae51e44378123fc";
+ sha512 = "6b5e9abc4fc05ed580d35baeb6c7b1462daef2352f751e318b9a7bf16d032d8a8240f83d54fa17d02a9a967e7477a36808587a9183df4274f10b59059c55fede";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.7.1/linux-i686/cs/thunderbird-45.7.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.8.0/linux-i686/cs/thunderbird-45.8.0.tar.bz2";
locale = "cs";
arch = "linux-i686";
- sha512 = "ea9ec870c91cc2eaab758a3585e20779d24734e62c285f1f591646f9aba92e33c6a7966b0b1e484f28ba0a2f40d74f918dc899c87518f052b793fb5d1cc867ce";
+ sha512 = "1410e7bb8ffc8a4c515b1c023ffa6eedc960632c05e5e7f4675aee9e972877dfc73d09ef14deb1c308bfcc1a6333e62b24af582410854b62acf4d889c7d54158";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.7.1/linux-i686/cy/thunderbird-45.7.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.8.0/linux-i686/cy/thunderbird-45.8.0.tar.bz2";
locale = "cy";
arch = "linux-i686";
- sha512 = "082d8f2fa527a75b8a388f84085a709cde9d9c455aaa2615f35bad0eb6962de0af163d515e0481edcbba29fb858095aebb05c0a3f25f33e1e14f7136b83a73d9";
+ sha512 = "28b50a2fb0703f80fc9fb91d1add2305e71f2ddac99cfd086c8559f29b5a420e9e5e3d370f0b84a32f5c358661566b070844ccd0b33447ed4c5a427eec03cfa0";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.7.1/linux-i686/da/thunderbird-45.7.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.8.0/linux-i686/da/thunderbird-45.8.0.tar.bz2";
locale = "da";
arch = "linux-i686";
- sha512 = "9ccb84b78ec7fbef596b64e76fae50bbc8af63eb0c0d37c6f81e1353f3afc242c0e3be9495d4b0125fc0500e0b4569df3e00d5e302f93f7007bcdf3089cf0c22";
+ sha512 = "c38cffe6416ca50c78651d24d5466d6e06b2cbaa66062eb13381c4402d39a7bd55aae10cbe3400ba0fe5983309f2d70d3058a46054911399a057679b09b451be";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.7.1/linux-i686/de/thunderbird-45.7.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.8.0/linux-i686/de/thunderbird-45.8.0.tar.bz2";
locale = "de";
arch = "linux-i686";
- sha512 = "a493f5e2c4c787f7c8f15d1d2da6f457a52af3deee161d3d9c031525eff48d2aeb294b6745e3ada079026f727db06baaca943d0711aeedb8df5bcd37c3f13286";
+ sha512 = "101ee34b890f1f3f9bc3eedf4936b8ef1fc9edd2f5af79b9c8375326d430585fc564a76a0bbc81bb119ce9a638af60055d578b5e6f1f760100171696351f13c1";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.7.1/linux-i686/dsb/thunderbird-45.7.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.8.0/linux-i686/dsb/thunderbird-45.8.0.tar.bz2";
locale = "dsb";
arch = "linux-i686";
- sha512 = "4d1e7a0bf3f55d913aaa47c37ed5529c59240168f2a53faa4367d3c47e900e136d25446b2b4e465d05b3857fdf3671e9bc7f98be6fe7b42c1ec926d0216d6022";
+ sha512 = "a6dd564baa36402d082d5bc2b5bc6002a5abd66b9bd545a0962fc844f4800390e527b9deaa6ca4f197d98265bd85e7d52624e32be17b2efc96b136d4a0108109";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.7.1/linux-i686/el/thunderbird-45.7.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.8.0/linux-i686/el/thunderbird-45.8.0.tar.bz2";
locale = "el";
arch = "linux-i686";
- sha512 = "145bf4a0db9b2fd3b16637fed966d6c0f0d184eeb7ce373024609b869219720f73feb0c10b13c761a4214a88d68ceeee234ac50694ac16599a92e2fe6ea61e4a";
+ sha512 = "d5611f341f3322adeb5e94f9dc83dc0de26d6dbaaaa45a904fb9add1770f77b86db57693aa3c89f69c1aeb27e98793475c900643b78a70284911a63791048069";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.7.1/linux-i686/en-GB/thunderbird-45.7.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.8.0/linux-i686/en-GB/thunderbird-45.8.0.tar.bz2";
locale = "en-GB";
arch = "linux-i686";
- sha512 = "1d3deeccfbba4a871a54eb4ad6077be1cf2e6fc7adb0ad0c04b3638db3b7fb3cbf66b55737befaef034d0b1671e9a53bdadc8d9ee7b3b9eb33a7c64e53ce5b2e";
+ sha512 = "b8c71ccef1793589f5cbbac8e12ad1aef833131a51a0029c75b08e26f28b3d5dfa821a84654efffae1e41c23cf5575cfb1b55de29e9c29b1a5adc1632581129f";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.7.1/linux-i686/en-US/thunderbird-45.7.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.8.0/linux-i686/en-US/thunderbird-45.8.0.tar.bz2";
locale = "en-US";
arch = "linux-i686";
- sha512 = "b1340885d6c92da79ad99f9f491ca1f15429aca73759d4e5055c212f33af96f7a7d4446eec6bc37ffcff4371213051188d7211c021da50f25b85fcf445ca58dc";
+ sha512 = "dbc77f7814b3a085fdf54536d77db69ad893b0230ca1930fb5fbf916cc09e421cdf8987e7f75d726f1fe31f3c7ed0afc584da1d1b1636a2750e9e0454a6de45f";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.7.1/linux-i686/es-AR/thunderbird-45.7.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.8.0/linux-i686/es-AR/thunderbird-45.8.0.tar.bz2";
locale = "es-AR";
arch = "linux-i686";
- sha512 = "307473247bbcf0064380b4d9f9bb12ea796c32dfc012af2d4246466aab880dc040a92f06e0917acdf2f930a9df0cc0fce39b17e4ff710ea2311f4b2250b90f53";
+ sha512 = "f161bccff6692a9652568530faa89012e2a7438814fc87f816cbbf93d40425133ef24250a6d1b9990bc772e9ce86d778f905d844166527ab6020687bbede4688";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.7.1/linux-i686/es-ES/thunderbird-45.7.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.8.0/linux-i686/es-ES/thunderbird-45.8.0.tar.bz2";
locale = "es-ES";
arch = "linux-i686";
- sha512 = "3245ee600a95e1f59e8e7aabb521be96d88c1e59ae5cd29cc78825ed2c8c2abd1135dce1c2272d1eef2716717719947ca4b223359e1c56df406569b55226de61";
+ sha512 = "51ca5165f83366f0fd73fa900640b35d572656d123d14663b737e140c1903a816ca8e2980c2c121b1e0a512e9211ceef745c34d3fd8c04b21cbec84b868b468a";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.7.1/linux-i686/et/thunderbird-45.7.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.8.0/linux-i686/et/thunderbird-45.8.0.tar.bz2";
locale = "et";
arch = "linux-i686";
- sha512 = "b1cd90842d3888e555799cef84bd2e8d3eeb0c73abd4af9bab2a9db2b24ee90770f39d1376e63df567f8ab63778f6cde305ea8ba2a070aad36d6809a676a2344";
+ sha512 = "a8524b1a72353ddf3d2b883b3936606b9eb3f1898aea05530c38d7d57fd03ad9c36085996fe3442f085ddf668e2fc909a704939c370ba1d2d0684253a10fa965";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.7.1/linux-i686/eu/thunderbird-45.7.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.8.0/linux-i686/eu/thunderbird-45.8.0.tar.bz2";
locale = "eu";
arch = "linux-i686";
- sha512 = "6278435a0f46cbd40514780beacda014c8528a79bb5d9be1366b0dd46dc71aa1f7a387311511e8d04cea3e78dd84157b97307df5bb69797b6d39cd299be18a33";
+ sha512 = "6c3f12ccd7dd48258ff5972163da3617f3038f4f670223617f1b7734181234eaef5be4762156650c0398c4791fc82cfb397149f62e14bc6c873d279eaca92fb3";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.7.1/linux-i686/fi/thunderbird-45.7.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.8.0/linux-i686/fi/thunderbird-45.8.0.tar.bz2";
locale = "fi";
arch = "linux-i686";
- sha512 = "000fbb4519ed626af2dfaec3d588f4ce567212b8a01c4aeae34b1f9e8ec6086ad45b90b57412fe830b8e236606d686e05c807e60bc2078df1364fd9f58d06d0e";
+ sha512 = "2d417c63a5c5d5203bea96f88a51ac4b501dee7575bb43fcda3ea523e76e65dacaf16c3f6ad772b25a242aa8016fb36c4f3a04c86431ade23389a97b7cac25cb";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.7.1/linux-i686/fr/thunderbird-45.7.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.8.0/linux-i686/fr/thunderbird-45.8.0.tar.bz2";
locale = "fr";
arch = "linux-i686";
- sha512 = "5120e880f297f8899ee6067660d65cf1ffd66d3ae6c16a888ab5e5e1b32f48a58aefef9a7023b1a8860987a5ca6399d69fd6df8e12838c00c305c3854c18582f";
+ sha512 = "2c64e8a21306b6129a87333ff1c29ebba10f708d67636042bf6daf40bf01e5ef954038afae8d0d76c42d83ed0c8074525b13b60791f0d0e21108053c9b81822e";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.7.1/linux-i686/fy-NL/thunderbird-45.7.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.8.0/linux-i686/fy-NL/thunderbird-45.8.0.tar.bz2";
locale = "fy-NL";
arch = "linux-i686";
- sha512 = "2e3b2a7cdcd4e5bcae6e46f86c5a4956f164ec37f4cb657ac18c1233c5b36b8c0f041e6930ea15adbcd8269662f9315e2822a9ed43be38a5fae8b7c747812035";
+ sha512 = "fe444a91350d3c30e6254e526f5a506aedaebc92ed9632df6a4d2ee5c8f18246601bc8b853eadd54c0b02c2647cae21514a0c1767ff506bb3fd048aa431d5b7a";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.7.1/linux-i686/ga-IE/thunderbird-45.7.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.8.0/linux-i686/ga-IE/thunderbird-45.8.0.tar.bz2";
locale = "ga-IE";
arch = "linux-i686";
- sha512 = "b4567af9057eaffe812feb43fa195474094fe1c0d804eb79a9dc936b93662cdfafd1c1f4bba51adda57abed677473fe2bd5e5ce9523659c931035b617a1e3ad7";
+ sha512 = "73979022d045433b27f71a7278d518b2ee42a7250b166327bfd2f94c2f747acf2d14a9ea55e254f6ade0ccc3ffdc898f61e8dfaa9c7e2b8450fdee195db97b5b";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.7.1/linux-i686/gd/thunderbird-45.7.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.8.0/linux-i686/gd/thunderbird-45.8.0.tar.bz2";
locale = "gd";
arch = "linux-i686";
- sha512 = "1200cfb333861d2bd5013cfa5c764f202b7a2febadff5f4c8c0bc648f744af19362b07147e720c06046d4ceae7fac186c5bc33c1b637104241493f960a5c307c";
+ sha512 = "e856393fe16f57ecbcdc796dd027d8f426f9c1b39fd51c4bcea8ceb82934087ab71d87e7c04ae67b12de6d063994ee4eb607cca9889c7e500272600f80d65f6c";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.7.1/linux-i686/gl/thunderbird-45.7.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.8.0/linux-i686/gl/thunderbird-45.8.0.tar.bz2";
locale = "gl";
arch = "linux-i686";
- sha512 = "10ec0d042e14c80d65af5ce7a271844553e4bfb96f349a16d94c5caed3c33fa35fb2065ec99b2ae1dfb7b1e47059f6f3ce730d6d293efdd380862fe18b03c877";
+ sha512 = "c1e8ae50ce6495e9706ff1ef4fb790c53be407eaa738e86f2a788feaa16e5e903386f59bc986497d2ae9e5dff8489007a16c0f2b8b9c37456d180794dfa82642";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.7.1/linux-i686/he/thunderbird-45.7.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.8.0/linux-i686/he/thunderbird-45.8.0.tar.bz2";
locale = "he";
arch = "linux-i686";
- sha512 = "7d7edbf3fd840fcf80c3d3491fcf9cbeed923b597840bdc16e7e43097cd5843554030e2690ff178f10ad97b0f447760bd06da87b4cae545dfb32c3b0f4668b68";
+ sha512 = "6caf34bd52e21809eb80ed88b104ed1a47a1c29abdc3b3f4059fb183a0b844449936362a1839d888e4d224ee987890982d37d27c32102cfe8029bea1371847cd";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.7.1/linux-i686/hr/thunderbird-45.7.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.8.0/linux-i686/hr/thunderbird-45.8.0.tar.bz2";
locale = "hr";
arch = "linux-i686";
- sha512 = "28a2e3e0dcabecced0a9b66a5e11434fcbabe11257508eb481513e56a82d13c5bf36e79d8174fcd0080b0b310df4ada6f92f3d24fb67658d40db66823d18e0a6";
+ sha512 = "230f0bd3eddf99811d8fc60e988772ed107b75981beceec053d861f977e1e3c5261c0ea51475410aeff50efd0a4e378b5e666cdd4b2bfd76ad0ae465142a28a9";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.7.1/linux-i686/hsb/thunderbird-45.7.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.8.0/linux-i686/hsb/thunderbird-45.8.0.tar.bz2";
locale = "hsb";
arch = "linux-i686";
- sha512 = "760c99978bc2a326fa5e5d8f9b4a6fc9420a8a3c95251b42dc3db26bb399942a5fdd08f3eff3eaea9f3bc96ca85b0523abdae3f72b7400f8bed136e906a8e79f";
+ sha512 = "389b0fab729562e09c17d7ca251675ed4d333f4a79932b5ef2ffeda9d3e683adb95b7f4e4cb192fcf9416826a8aa470b7f8ae4211165b50d7a5a21fe39ba199a";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.7.1/linux-i686/hu/thunderbird-45.7.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.8.0/linux-i686/hu/thunderbird-45.8.0.tar.bz2";
locale = "hu";
arch = "linux-i686";
- sha512 = "4118ae0a62d7c8c6e68f7468040361091f98197c8135ba88ba9165ff3c807ae3ec8ac7e587224e9f45cb49290abe7c85aa11518714440db0f797f426fb73b5d5";
+ sha512 = "2d0ec213b7cf3f875518841e0c08bc6b4134173606098cd0515e93206bf2419377041d44a2737c98b17a198998b80453763e695cabedc283ebbdfb42a60abd70";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.7.1/linux-i686/hy-AM/thunderbird-45.7.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.8.0/linux-i686/hy-AM/thunderbird-45.8.0.tar.bz2";
locale = "hy-AM";
arch = "linux-i686";
- sha512 = "664dade424cdca68158c98e531dc0b46ee5482f728b4f172684061da029c7dac76d80bcaa4c0228ff929a19e6bf11fd08890b3ed71fa6e23f442dba174de84da";
+ sha512 = "f77164c2fc3a083e13a11417f77454a885fd4ac77a0b7695c0d2bf8169b54afcd06c32e7c78cb6bbb4ac447a3d690a423344cdab59bc6fdfe83d82bac5d0be0d";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.7.1/linux-i686/id/thunderbird-45.7.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.8.0/linux-i686/id/thunderbird-45.8.0.tar.bz2";
locale = "id";
arch = "linux-i686";
- sha512 = "58e48787ec26d8cfaa7be233055d95982d073ae8a1a01e4556d239e18598939ab6077f0aaa4b14051c6460730f89c1710a6dbb54ce5aaaa75967418f324073ab";
+ sha512 = "24c383b106de72a3741d7333aa4ec53c091d41ab3638c91f5f88f8d2952d25e77223e95a728611bdfd1cbe2d4418447e588069c286f90ffec0d12c7f245c07fd";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.7.1/linux-i686/is/thunderbird-45.7.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.8.0/linux-i686/is/thunderbird-45.8.0.tar.bz2";
locale = "is";
arch = "linux-i686";
- sha512 = "77e95822a92855c41ed557574ab3f0e464d8be21146139a1cbff243ae76b035ae0912e92c07513d4c5fc9d522a2da1a738dc7ab790f9327ecc6d94c0d577a124";
+ sha512 = "bae6f4fa377bb76ffd8d5257f525ce43f151f44f07eaeb5c4109a3440965c36a622c41d6577113bf111335d51d211e18b1c9decac6d9c1dea6303f90b7368f94";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.7.1/linux-i686/it/thunderbird-45.7.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.8.0/linux-i686/it/thunderbird-45.8.0.tar.bz2";
locale = "it";
arch = "linux-i686";
- sha512 = "835a2059b02ffd019fefa2988bc2f05f456e5fc8b05badc7f5477a6958ba8fac1bc3539cc66ce6eca73fe86b4c70a172b609fa365e83593ff97405e9bbb533cd";
+ sha512 = "6b6082972ea030e2564bffaf4e9349d33800b840c0b185bb646c53d0578a1b6360a3d85cdf1dbc534a648d34138f1c8cd26d1c0297c99795e93b93b145a100c0";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.7.1/linux-i686/ja/thunderbird-45.7.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.8.0/linux-i686/ja/thunderbird-45.8.0.tar.bz2";
locale = "ja";
arch = "linux-i686";
- sha512 = "11b6f0d2326bb89a6cf6d8452d2312eb8f7af616a0fcd43dd2b2263f52397c1c0a0a3ad7ceb67dd09b81a624adb95ed8a905bd7c9dba5f1d2a94114776257ff6";
+ sha512 = "66c8808d49986675e9049e77328cf7b1d2fad163b193b8442ca39be1b605bce0180e29b239141509cfec6302f053eaf2197513d5d482beb6c498f6a0ae8bbd9b";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.7.1/linux-i686/ko/thunderbird-45.7.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.8.0/linux-i686/ko/thunderbird-45.8.0.tar.bz2";
locale = "ko";
arch = "linux-i686";
- sha512 = "69f804d87a17072803b6e081dedcea57d633036299eaee9599b7df83604dd599234236b5b5b647da25c066633ee481e196fe9b219bc3da29d07b6dd55fdbf4f1";
+ sha512 = "bdb8a9d6172b6f56d29b29043c484547c9a9dc7bd1477bd8ac4aaa4bf07c0ceffe2ae1560458acefefad66e4487d62746f60b6ec56d5d91603937b0c339d5625";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.7.1/linux-i686/lt/thunderbird-45.7.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.8.0/linux-i686/lt/thunderbird-45.8.0.tar.bz2";
locale = "lt";
arch = "linux-i686";
- sha512 = "4534bc70c43b108e59d7e7c15cb53e32f54c20e0ad21a5c0e1d309b3fec32db870ab8cb268d59b8964c526c28382cd89753ccc978e34d0aedd5c87eeeb525a5e";
+ sha512 = "dd70d123787ef85ee1c596346bf4c40a99907c2ece2116f7fb4536cb078d162f9afe0f92b466b713d6b75bf92960de32a3b3dedd861946da5b2e946187d4ebc5";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.7.1/linux-i686/nb-NO/thunderbird-45.7.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.8.0/linux-i686/nb-NO/thunderbird-45.8.0.tar.bz2";
locale = "nb-NO";
arch = "linux-i686";
- sha512 = "13d4f6b638d6005ec854cac82b16c02dc347d0cd1eb804a056c106fb1031c11982973abbfbd319f4925264a1095cce8bede670f68c2efc9bd4be49ceb6b2f2a3";
+ sha512 = "caf4d3d27db952fce1f34d5c641194d555c2443b86fbecdf68869cafeed0d532d7379212f4338401743e6e26531dd98111f75bddc5e2a3af42a3a7731ec3039b";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.7.1/linux-i686/nl/thunderbird-45.7.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.8.0/linux-i686/nl/thunderbird-45.8.0.tar.bz2";
locale = "nl";
arch = "linux-i686";
- sha512 = "b6e49ff5a473dee02bb749481924fdbb345be2d532119dde93f80396a29da726b0450e2f2ee522454c8dcef74b09dfcb57474264873b873beeaa6edc81853fb2";
+ sha512 = "dd5071174889bdda282c496c4aa05158887fffc652d4c557320fab2c11e16b0cbb7e5121ef20b423d703dfbf9da52983ff288b9377ecedabfdba496f9c99eb6b";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.7.1/linux-i686/nn-NO/thunderbird-45.7.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.8.0/linux-i686/nn-NO/thunderbird-45.8.0.tar.bz2";
locale = "nn-NO";
arch = "linux-i686";
- sha512 = "3992cb6ca869e9470bb30042ba3c8d1710511a2170504a5a65cafa4a9091492903509ddd366c29f5e9e7ada9ac657416972002a297a57550a418031a7ed6ee0f";
+ sha512 = "edd6a1384ed0060398cffb4598a7014aa13cfe83891a4cd4972db2ed6eaae5068703944a6e14b033409eaf6b6426838a0a3d708b9d83eb08907f39469fde4435";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.7.1/linux-i686/pa-IN/thunderbird-45.7.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.8.0/linux-i686/pa-IN/thunderbird-45.8.0.tar.bz2";
locale = "pa-IN";
arch = "linux-i686";
- sha512 = "6aca05743fe7383490cd94281fe1d0c64451832e128b8b3da5d2643bf59f05cdcfe2130ba5218f7e314ac7c55b126ad62d4d24f987b215bfe767a17d6a8eeeed";
+ sha512 = "9e6227d28dc844621d1d9ac6c5536505dea0cc1d1b3d161bedf13b75a3255c5c681ce5b38bb510150f8db1add7f149119a8b5ce5b98c5f4dfe2427db6ad58581";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.7.1/linux-i686/pl/thunderbird-45.7.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.8.0/linux-i686/pl/thunderbird-45.8.0.tar.bz2";
locale = "pl";
arch = "linux-i686";
- sha512 = "0b8969b08e11792c547d666843799459e27d3732f4e56ab64d7624df4360e6cf65fc2cce538ffd0a287f239cf6c57ebe7aad68bd397c0f56a85dcc499f35e4a5";
+ sha512 = "8da6ec38d37df6202b751f112031e590777e587e23437cb7a4dcfeb958b27928e2f01cbd1682daa96c143df756b3c8f31f7516ca8cb30a884db2dc03f130f960";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.7.1/linux-i686/pt-BR/thunderbird-45.7.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.8.0/linux-i686/pt-BR/thunderbird-45.8.0.tar.bz2";
locale = "pt-BR";
arch = "linux-i686";
- sha512 = "4a921106175214b7fd029e27e19f4442a50076d08c2bf6f6ad4b27c1c37730d2f90ac4bd058363395777d336e5170bdd48276f71b0d253375d32daac9af66412";
+ sha512 = "00a7ffd7509d538b9fe3e801d5c2ad069edd62665a7ce045381213b78226646b1cfe6356b5c873904277330b674608711e15f18dcf4664218b9c61048cf88e40";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.7.1/linux-i686/pt-PT/thunderbird-45.7.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.8.0/linux-i686/pt-PT/thunderbird-45.8.0.tar.bz2";
locale = "pt-PT";
arch = "linux-i686";
- sha512 = "f64a4396570349d2f520f8eeca157a012e028cba1e3cf592f5e11807997b4501a2af829dd4920ffac5fee8c50bd691d037aa86bbe9396305352ed4710e854e25";
+ sha512 = "f12f544c9eb3a33f861791af9afcc987b72607c2456d7f741046ef9ad36f12552d4e9cf2682ac3f8adc108dc9d36c9fc1b013714b50ae894f72cbe367914f14b";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.7.1/linux-i686/rm/thunderbird-45.7.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.8.0/linux-i686/rm/thunderbird-45.8.0.tar.bz2";
locale = "rm";
arch = "linux-i686";
- sha512 = "540d6db390cbe93dbb607f84286e445da5234b01c55846f3d3a91cc61d30d1d32f0216fbfefc0ab0d7a60c5369a63aaab385c73362adf1a0595db57282dad01e";
+ sha512 = "9a8497f13a459d5dde822edeb9516d98beed220d75735a2f620c69b1f5e75e68987420aac6bb2a77775b6b34c2e0daa277c15d1491a6a02bb0f9658a40a16526";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.7.1/linux-i686/ro/thunderbird-45.7.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.8.0/linux-i686/ro/thunderbird-45.8.0.tar.bz2";
locale = "ro";
arch = "linux-i686";
- sha512 = "37cede489bb3082efa853f310dec5293baa411abcf15e9f193a760768cfc2b9f7be952bb6225bf901a0097bc19e77d9133c0e6dfed880c6e33cef250e80ff0f1";
+ sha512 = "2c9c650647079eb754e471757cae6b5844ae8e19bf01ce25d91a73832483507f90e604caf11305760cab719fe4f830cace5b9313b7e2a6f07a92427f35441c55";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.7.1/linux-i686/ru/thunderbird-45.7.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.8.0/linux-i686/ru/thunderbird-45.8.0.tar.bz2";
locale = "ru";
arch = "linux-i686";
- sha512 = "b091376e3937712f5f92ac789dbe39b90e1b486b4409325341dadb06d4a4a3ff4fa9438d8da2fb5b7923beab4ec6b568d6be309cd22a68c277c822614205734d";
+ sha512 = "4cbbe88691fd265b4d98aab61c5763f6baea168ea4cae222425973023174f765e7fa6b97fdef959ac0788a632f742715eb7e565113344147d43c228ece7f08ae";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.7.1/linux-i686/si/thunderbird-45.7.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.8.0/linux-i686/si/thunderbird-45.8.0.tar.bz2";
locale = "si";
arch = "linux-i686";
- sha512 = "bb53ecebf56785d7ede52b7a0afed0a01e6248d537ccd8bcd236a837fed86b3f390cf9493f1c2d6d6d58c0d349cd6cfef2a59996fd7766ee77f25dc1af75faca";
+ sha512 = "a270a871187dc95d05cb79d9f4df7947aa58b875c2b0c588c2646f806e7e0eaeb1a62f69d38e78d40399f1c588f043b26d06c0d77cedc9949d8e3d8b026ad4a5";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.7.1/linux-i686/sk/thunderbird-45.7.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.8.0/linux-i686/sk/thunderbird-45.8.0.tar.bz2";
locale = "sk";
arch = "linux-i686";
- sha512 = "c13c32cf17b0291bf049c2790fce2066e8b07aa2f30fb7bbecaf8cb88b4660bbf07506cb04e5aa8b756a35371d25c5a793b54d0134a81027946d35109e7714a9";
+ sha512 = "8cfd22b92789766c179dbb70739fcf68907c4b215e70d164c83e50f67f2c834f515176e30788ba1fcd58717fdf5642c9e1ef05640a06470146ee942737744c83";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.7.1/linux-i686/sl/thunderbird-45.7.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.8.0/linux-i686/sl/thunderbird-45.8.0.tar.bz2";
locale = "sl";
arch = "linux-i686";
- sha512 = "be0d2a0e501f074329b815f61c1ce04337499c7a88f58e3526e762b47c82ccd975c22063a363a338e22bfc12ad3403107751f66376b1d269101b660e391e7437";
+ sha512 = "fbf54d81b006625f526ab496e9ec7acf9698f7c95415d61aa4bd91896db07bce9d13c835ec944f164678fca9f49be16b69d6e8b728914ec84a5a8d733d3941b4";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.7.1/linux-i686/sq/thunderbird-45.7.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.8.0/linux-i686/sq/thunderbird-45.8.0.tar.bz2";
locale = "sq";
arch = "linux-i686";
- sha512 = "1aadc162591de3467af622c3e1fc7655885d7831d2faa470a5f53b2fb12a42dfbd44f3a942dc4089a28235942ba0e46749810a88adbb396e1417f7ed0fc07586";
+ sha512 = "f8dee08b3a4e049392f7c407e9403b972c755493fe638e7917181b8281a86d70f2d1113e69b785be756774bb9aef4cb493084bc8d0d12bda0f928f4cd468f569";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.7.1/linux-i686/sr/thunderbird-45.7.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.8.0/linux-i686/sr/thunderbird-45.8.0.tar.bz2";
locale = "sr";
arch = "linux-i686";
- sha512 = "aab1299fb2e2b022bfaaa6403461bd2f5ed70d5fea77ea29936fea465984cc57bfa1ed5be1e8968138e757118d1caa3eb664388fddb04d0008abe932035c818e";
+ sha512 = "8c8fba2fc92d91f086679b6ba451eed1af4fef5c56747260f9907300f057aab354d7f8ebc411fa25821bc006a551f26e0ddf29b344846a30dc493cfef30c7375";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.7.1/linux-i686/sv-SE/thunderbird-45.7.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.8.0/linux-i686/sv-SE/thunderbird-45.8.0.tar.bz2";
locale = "sv-SE";
arch = "linux-i686";
- sha512 = "11ce9c1b444adb242e826d4e1e8ab88e2272ac6b77f68f9d2a860c75e421c7b69f1841d0a4fef0b9b4d3a636678f0d57d5abb985f5fda6b5afd6cfb319f39b14";
+ sha512 = "caf3911023d48fc48f4834be424c01cb22bd7383582c8bfc15468401a1558351659e93955103625872b5ea3351570bf216b34e93bff9bf535eccd1789f493bca";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.7.1/linux-i686/ta-LK/thunderbird-45.7.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.8.0/linux-i686/ta-LK/thunderbird-45.8.0.tar.bz2";
locale = "ta-LK";
arch = "linux-i686";
- sha512 = "e46dff7831a6805917d2982347e4899aea9c726bcbf1e0b081c8ead225d585df1d0e9c485729d28483fd7ea8e0e5a47598fa9146f0138ed8ed65162c8191a381";
+ sha512 = "99a0db9f4e7d9f05e8398f76f0dcce418d0230b8a325a1289b690a87a43febd0c17f52248bb6070ad7bd2dc60d6e877a78f1c4a23c8888b105160f131b31ec1c";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.7.1/linux-i686/tr/thunderbird-45.7.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.8.0/linux-i686/tr/thunderbird-45.8.0.tar.bz2";
locale = "tr";
arch = "linux-i686";
- sha512 = "158e4d49beae2af88c9aeddf5933e58a73541d0acc960d3965159662dd18ec876fd9a598b7bdba31261f8eeccf1595eb5e66ace3656658b3557c1482b7a4263f";
+ sha512 = "79379c3dc58d330949aa5a0338fb38e6334ca47c964842bf090a9431e5b7267f871aaa519dd35262ed9d6e042188e998e95eb7a63c77b3592db09a81bdd95267";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.7.1/linux-i686/uk/thunderbird-45.7.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.8.0/linux-i686/uk/thunderbird-45.8.0.tar.bz2";
locale = "uk";
arch = "linux-i686";
- sha512 = "0d298daa6b416b60b696d57ae7508f56749f1fdc7f8d4ca3514fc106b91567fcc3bf41881cce398d431c0aa0b6bb9d5913d25abcded8e68628fe54fae3cbec25";
+ sha512 = "a2f0efb561fd84e5881bb93145f86f9445eb6cb3ce5ce0e209fc896c797e9a554d180ed1009f369bc12790b8d03d09d429dd3d52fda4ce48d7642009c1a9920a";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.7.1/linux-i686/vi/thunderbird-45.7.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.8.0/linux-i686/vi/thunderbird-45.8.0.tar.bz2";
locale = "vi";
arch = "linux-i686";
- sha512 = "f3e21ff0bf5b0b57bf6a3d1564ec0194c4c4b8987e0db89c84662e091131601526cd1b109e113fa8738d6b16d61220df1ef6c09acfd46c154de7e86dd9aa744b";
+ sha512 = "14a7352ac3254aa0a748e98e208f48ee0b764853b37889077f651ed1d1a401d98c35dd6cd09bb5b25a7f8c5d5c3a7b02319ddf4dcdaa7a5440aa5caae9f09a32";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.7.1/linux-i686/zh-CN/thunderbird-45.7.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.8.0/linux-i686/zh-CN/thunderbird-45.8.0.tar.bz2";
locale = "zh-CN";
arch = "linux-i686";
- sha512 = "ad624ccf882b3703de853d67b9fb2d53fa4a69a20353638dc108750b35b486f2333307e7fb947e39a76f32cc204459347fe9c52e5c6c60c8b9210d9f7ca68632";
+ sha512 = "5b991ccc4daafe744f1fffdc51882bdc72d5fadd1e570e0ff3670f7d7201a67151797a26f0222fe8cfa0ddefff45f0741da6c04d924367705347858cc028a945";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.7.1/linux-i686/zh-TW/thunderbird-45.7.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.8.0/linux-i686/zh-TW/thunderbird-45.8.0.tar.bz2";
locale = "zh-TW";
arch = "linux-i686";
- sha512 = "877e9fbfd4421fecb01d94142ae753c7b90b7a1430a01dfdfbf916e4505a1b647fc3f75d896558437e7d5c4ae3a0aefe0892881f4bec7ce9ab672d7b44c337b3";
+ sha512 = "231abcab55934962d3b8dec164ddf48b8b7bfc0e8cd70251479351d8be5d2605e2bb823bbf6c3002bba6c431461b0bfd570f101f31b5adf7c70804610262b856";
}
];
}
diff --git a/pkgs/applications/networking/mailreaders/thunderbird/default.nix b/pkgs/applications/networking/mailreaders/thunderbird/default.nix
index f71a6dff37c5..6990c12439d7 100644
--- a/pkgs/applications/networking/mailreaders/thunderbird/default.nix
+++ b/pkgs/applications/networking/mailreaders/thunderbird/default.nix
@@ -3,7 +3,7 @@
, freetype, fontconfig, file, alsaLib, nspr, nss, libnotify
, yasm, mesa, sqlite, unzip, makeWrapper
, hunspell, libevent, libstartup_notification, libvpx
-, cairo, gstreamer, gst_plugins_base, icu
+, cairo, gstreamer, gst-plugins-base, icu
, writeScript, xidel, common-updater-scripts, coreutils, gnused, gnugrep, curl
, debugBuild ? false
, # If you want the resulting program to call itself "Thunderbird"
@@ -14,7 +14,7 @@
enableOfficialBranding ? false
}:
-let version = "45.7.1"; in
+let version = "45.8.0"; in
let verName = "${version}"; in
stdenv.mkDerivation rec {
@@ -22,7 +22,7 @@ stdenv.mkDerivation rec {
src = fetchurl {
url = "mirror://mozilla/thunderbird/releases/${verName}/source/thunderbird-${verName}.source.tar.xz";
- sha512 = "aa1231169cfe243a257e6b9088281b85d0cf75207e3b9ebeda7792567a86f6098fb5c74dc397e3eeeb1925d221d2fb1b17df8762afd115eff9ad4d1370a49e56";
+ sha512 = "f8ba08d874fb1a09ac9ba5d4d1f46cefe801783ba4bf82eee682ac2ecc4e231d07033a80e036ad04bda7780c093fb7bc3122a23dc6e19c12f18fb7168dc78deb";
};
patches = [ ./gcc6.patch ];
diff --git a/pkgs/applications/networking/mpop/default.nix b/pkgs/applications/networking/mpop/default.nix
index b2cc30b6f1f3..3d0d576bffb1 100644
--- a/pkgs/applications/networking/mpop/default.nix
+++ b/pkgs/applications/networking/mpop/default.nix
@@ -1,24 +1,27 @@
{ stdenv, fetchurl, openssl, pkgconfig, gnutls, gsasl, libidn, Security }:
+with stdenv.lib;
+
stdenv.mkDerivation rec {
- version = "1.2.4";
+ version = "1.2.6";
name = "mpop-${version}";
src = fetchurl {
url = "mirror://sourceforge/mpop/${name}.tar.xz";
- sha256 = "158zl6clxrl2id4kvdig2lvdvm0vg2byqcgn1dnxfjg5mw16ngwk";
+ sha256 = "0p1ix63jh64dibrlccch8q7gxl9nn18wd2qpyr5z1h4gs2fpmv4z";
};
- buildInputs = [ openssl pkgconfig gnutls gsasl libidn ]
- ++ stdenv.lib.optional stdenv.isDarwin Security;
+ nativeBuildInputs = [ pkgconfig ];
+ buildInputs = [ openssl gnutls gsasl libidn ]
+ ++ optional stdenv.isDarwin Security;
configureFlags =
- stdenv.lib.optional stdenv.isDarwin [ "--with-macosx-keyring" ];
+ optional stdenv.isDarwin [ "--with-macosx-keyring" ];
meta = {
description = "POP3 mail retrieval agent";
- homepage = "http://mpop.sourceforge.net/";
- license = stdenv.lib.licenses.gpl3Plus;
- platforms = stdenv.lib.platforms.unix;
+ homepage = http://mpop.sourceforge.net/;
+ license = licenses.gpl3Plus;
+ platforms = platforms.unix;
};
}
diff --git a/pkgs/applications/networking/msmtp/default.nix b/pkgs/applications/networking/msmtp/default.nix
index 0754d4f28151..156ea589388d 100644
--- a/pkgs/applications/networking/msmtp/default.nix
+++ b/pkgs/applications/networking/msmtp/default.nix
@@ -1,30 +1,50 @@
-{ stdenv, fetchurl, openssl, pkgconfig, gnutls, gsasl, libidn, Security }:
+{ stdenv, lib, fetchurl, autoreconfHook, pkgconfig
+, openssl, netcat-gnu, gnutls, gsasl, libidn, Security
+, systemd ? null }:
-stdenv.mkDerivation rec {
- version = "1.6.4";
+let
+ tester = "n"; # {x| |p|P|n|s}
+ journal = if stdenv.isLinux then "y" else "n";
+
+in stdenv.mkDerivation rec {
name = "msmtp-${version}";
+ version = "1.6.6";
src = fetchurl {
url = "mirror://sourceforge/msmtp/${name}.tar.xz";
- sha256 = "1kfihblm769s4hv8iah5mqynqd6hfwlyz5rcg2v423a4llic0jcv";
+ sha256 = "0ppvww0sb09bnsrpqnvlrn8vx231r24xn2iiwpy020mxc8gxn5fs";
};
- buildInputs = [ openssl pkgconfig gnutls gsasl libidn ]
+ patches = [
+ ./paths.patch
+ ];
+
+ buildInputs = [ openssl gnutls gsasl libidn ]
++ stdenv.lib.optional stdenv.isDarwin Security;
+ nativeBuildInputs = [ autoreconfHook pkgconfig ];
configureFlags =
stdenv.lib.optional stdenv.isDarwin [ "--with-macosx-keyring" ];
postInstall = ''
- cp scripts/msmtpq/msmtp-queue scripts/msmtpq/msmtpq $prefix/bin/
- chmod +x $prefix/bin/msmtp-queue $prefix/bin/msmtpq
+ substitute scripts/msmtpq/msmtpq $out/bin/msmtpq \
+ --replace @msmtp@ $out/bin/msmtp \
+ --replace @nc@ ${netcat-gnu}/bin/nc \
+ --replace @journal@ ${journal} \
+ ${lib.optionalString (journal == "y") "--replace @systemdcat@ ${systemd}/bin/systemd-cat" } \
+ --replace @test@ ${tester}
+
+ substitute scripts/msmtpq/msmtp-queue $out/bin/msmtp-queue \
+ --replace @msmtpq@ $out/bin/msmtpq
+
+ chmod +x $out/bin/*
'';
- meta = {
- description = "Simple and easy to use SMTP client with excellent sendmail compatibility";
- homepage = "http://msmtp.sourceforge.net/";
- license = stdenv.lib.licenses.gpl3;
- maintainers = [ stdenv.lib.maintainers.garbas ];
- platforms = stdenv.lib.platforms.unix;
- };
+ meta = with stdenv.lib; {
+ description = "Simple and easy to use SMTP client with excellent sendmail compatibility";
+ homepage = "http://msmtp.sourceforge.net/";
+ license = licenses.gpl3;
+ maintainers = with maintainers; [ garbas peterhoeg ];
+ platforms = platforms.unix;
+ };
}
diff --git a/pkgs/applications/networking/msmtp/paths.patch b/pkgs/applications/networking/msmtp/paths.patch
new file mode 100644
index 000000000000..38e4155a1137
--- /dev/null
+++ b/pkgs/applications/networking/msmtp/paths.patch
@@ -0,0 +1,96 @@
+diff --git a/scripts/msmtpq/msmtp-queue b/scripts/msmtpq/msmtp-queue
+index 1dc220d..d834241 100755
+--- a/scripts/msmtpq/msmtp-queue
++++ b/scripts/msmtpq/msmtp-queue
+@@ -27,4 +27,4 @@
+ ## change the below line to be
+ ## exec /path/to/msmtpq --q-mgmt
+
+-exec msmtpq --q-mgmt "$1"
++exec @msmtpq@ --q-mgmt "$1"
+diff --git a/scripts/msmtpq/msmtpq b/scripts/msmtpq/msmtpq
+index bdb4fb8..1363a67 100755
+--- a/scripts/msmtpq/msmtpq
++++ b/scripts/msmtpq/msmtpq
+@@ -59,7 +59,7 @@ err() { dsp '' "$@" '' ; exit 1 ; }
+ ## enter the location of the msmtp executable (no quotes !!)
+ ## e.g. ( MSMTP=/path/to/msmtp )
+ ## and uncomment the test for its existence
+-MSMTP=msmtp
++MSMTP=@msmtp@
+ #[ -x "$MSMTP" ] || \
+ # log -e 1 "msmtpq : can't find the msmtp executable [ $MSMTP ]" # if not found - complain ; quit
+ ##
+@@ -70,9 +70,8 @@ MSMTP=msmtp
+ ## ( chmod 0700 msmtp.queue )
+ ##
+ ## the queue dir - modify this to reflect where you'd like it to be (no quotes !!)
+-Q=~/.msmtp.queue
+-[ -d "$Q" ] || \
+- err '' "msmtpq : can't find msmtp queue directory [ $Q ]" '' # if not present - complain ; quit
++Q=${MSMTP_QUEUE:-~/.msmtp.queue}
++test -d "$Q" || mkdir -p "$Q"
+ ##
+ ## set the queue log file var to the location of the msmtp queue log file
+ ## where it is or where you'd like it to be
+@@ -84,7 +83,10 @@ Q=~/.msmtp.queue
+ ## (doing so would be inadvisable under most conditions, however)
+ ##
+ ## the queue log file - modify (or comment out) to taste (but no quotes !!)
+-LOG=~/log/msmtp.queue.log
++LOG=${MSMTP_LOG:-~/log/msmtp.queue.log}
++test -d "$(dirname $LOG)" || mkdir -p "$(dirname $LOG)"
++
++JOURNAL=@journal@
+ ## ======================================================================================
+
+ ## msmtpq can use the following environment variables :
+@@ -108,7 +110,7 @@ LOG=~/log/msmtp.queue.log
+ ##
+ #EMAIL_CONN_NOTEST=y # deprecated ; use below var
+ #EMAIL_CONN_TEST={x| |p|P|n|s} # see settings above for EMAIL_CONN_TEST
+-EMAIL_CONN_TEST=n
++EMAIL_CONN_TEST=@test@
+ #EMAIL_QUEUE_QUIET=t
+ ## ======================================================================================
+
+@@ -138,6 +140,7 @@ on_exit() { # unlock the queue on exit if the lock was
+ ## display msg to user, as well
+ ##
+ log() {
++ local NAME=msmtpq
+ local ARG RC PFX="$('date' +'%Y %d %b %H:%M:%S')"
+ # time stamp prefix - "2008 13 Mar 03:59:45 "
+ if [ "$1" = '-e' ] ; then # there's an error exit code
+@@ -154,10 +157,19 @@ log() {
+ done
+ fi
+
++ if [ "$JOURNAL" == "y" ] ; then
++ for ARG ; do
++ [ -n "$ARG" ] && \
++ echo "$PFX : $ARG" | @systemdcat@ -t $NAME -p info
++ done
++ fi
++
+ if [ -n "$RC" ] ; then # an error ; leave w/error return
+ [ -n "$LKD" ] && lock_queue -u # unlock here (if locked)
+ [ -n "$LOG" ] && \
+ echo " exit code = $RC" >> "$LOG" # logging ok ; send exit code to log
++ [ "$JOURNAL" == "y" ] && \
++ echo "exit code= $RC" | @systemdcat@ -t $NAME -p emerg
+ exit $RC # exit w/return code
+ fi
+ }
+@@ -207,10 +219,7 @@ connect_test() {
+ ping -qnc1 -w4 8.8.8.8 >/dev/null 2>&1 || return 1
+
+ elif [ "$EMAIL_CONN_TEST" = 'n' ] ; then # use netcat (nc) test
+- # must, of course, have netcat (nc) installed
+- which nc >/dev/null 2>&1 || \
+- log -e 1 "msmtpq : can't find netcat executable [ nc ]" # if not found - complain ; quit
+- 'nc' -vz www.debian.org 80 >/dev/null 2>&1 || return 1
++ @nc@ -vz www.debian.org 80 >/dev/null 2>&1 || return 1
+
+ elif [ "$EMAIL_CONN_TEST" = 's' ] ; then # use sh sockets test
+ # note that this does not work on debian systems
diff --git a/pkgs/applications/networking/mumble/default.nix b/pkgs/applications/networking/mumble/default.nix
index 92fe9c9d01be..adcfa656eb98 100644
--- a/pkgs/applications/networking/mumble/default.nix
+++ b/pkgs/applications/networking/mumble/default.nix
@@ -1,6 +1,6 @@
{ stdenv, fetchurl, fetchgit, pkgconfig
, qt4, qmake4Hook, qt5, avahi, boost, libopus, libsndfile, protobuf, speex, libcap
-, alsaLib
+, alsaLib, python
, jackSupport ? false, libjack2 ? null
, speechdSupport ? false, speechd ? null
, pulseSupport ? false, libpulseaudio ? null
@@ -19,7 +19,7 @@ let
patches = optional jackSupport ./mumble-jack-support.patch;
- nativeBuildInputs = [ pkgconfig ]
+ nativeBuildInputs = [ pkgconfig python ]
++ { qt4 = [ qmake4Hook ]; qt5 = [ qt5.qmakeHook ]; }."qt${toString source.qtVersion}"
++ (overrides.nativeBuildInputs or [ ]);
buildInputs = [ boost protobuf avahi ]
@@ -42,6 +42,7 @@ let
preConfigure = ''
qmakeFlags="$qmakeFlags DEFINES+=PLUGIN_PATH=$out/lib"
+ patchShebangs scripts
'';
makeFlags = [ "release" ];
@@ -69,7 +70,7 @@ let
client = source: generic {
type = "mumble";
- nativeBuildInputs = optional (source.qtVersion == 5) qt5.qttools;
+ nativeBuildInputs = optionals (source.qtVersion == 5) [ qt5.qttools qt5.makeQtWrapper ];
buildInputs = [ libopus libsndfile speex ]
++ optional (source.qtVersion == 5) qt5.qtsvg
++ optional stdenv.isLinux alsaLib
@@ -90,6 +91,10 @@ let
mkdir -p $out/share/icons{,/hicolor/scalable/apps}
cp icons/mumble.svg $out/share/icons
ln -s $out/share/icon/mumble.svg $out/share/icons/hicolor/scalable/apps
+
+ ${optionalString (source.qtVersion == 5) ''
+ wrapQtProgram $out/bin/mumble
+ ''}
'';
} source;
@@ -108,12 +113,12 @@ let
};
stableSource = rec {
- version = "1.2.17";
+ version = "1.2.19";
qtVersion = 4;
src = fetchurl {
url = "https://github.com/mumble-voip/mumble/releases/download/${version}/mumble-${version}.tar.gz";
- sha256 = "176br3b0pv5sz3zvgzsz9rxr3n79irlm902h7n1wh4f6vbph2dhw";
+ sha256 = "1s60vaici3v034jzzi20x23hsj6mkjlc0glipjq4hffrg9qgnizh";
};
};
@@ -132,5 +137,7 @@ in {
mumble = client stableSource;
mumble_git = client gitSource;
murmur = server stableSource;
- murmur_git = server gitSource;
+ murmur_git = (server gitSource).overrideAttrs (old: {
+ meta = old.meta // { broken = true; };
+ });
}
diff --git a/pkgs/applications/networking/newsreaders/kwooty/0001-search-paths.patch b/pkgs/applications/networking/newsreaders/kwooty/0001-search-paths.patch
deleted file mode 100644
index 6d1d2bac409b..000000000000
--- a/pkgs/applications/networking/newsreaders/kwooty/0001-search-paths.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-From 6b5730e729d72c8d9242163e7061b956abee61f5 Mon Sep 17 00:00:00 2001
-From: Thomas Tuegel
-Date: Sat, 12 Sep 2015 16:14:10 -0500
-Subject: [PATCH] search paths
-
----
- src/utilities/utility.cpp | 3 ++-
- 1 file changed, 2 insertions(+), 1 deletion(-)
-
-diff --git a/src/utilities/utility.cpp b/src/utilities/utility.cpp
-index 2e322aa..2e9e4d2 100644
---- a/src/utilities/utility.cpp
-+++ b/src/utilities/utility.cpp
-@@ -299,6 +299,7 @@ QString Utility::searchExternalPrograms(const QString& programToSearch, bool& pr
-
- QString programPathName;
- QStringList searchPathList = Settings::searchPathList();
-+ searchPathList << "/usr/bin/unpar" << "/usr/bin/unrar" << "/usr/bin/7z";
-
- QStringList programsWithDifferentNames = programToSearch.split(";");
-
-@@ -368,7 +369,7 @@ QStringList Utility::buildPriorityArgument(const int& processPriority, const int
- QStringList niceProcessArgs;
-
- // look for 'nice' location :
-- QString nicePath = KStandardDirs::findExe("nice");
-+ QString nicePath = QString("/usr/bin/nice");
- niceProcessArgs.append(nicePath);
- niceProcessArgs.append("-n");
-
---
-2.5.0
-
diff --git a/pkgs/applications/networking/newsreaders/kwooty/default.nix b/pkgs/applications/networking/newsreaders/kwooty/default.nix
deleted file mode 100644
index f4bd04e8a2d1..000000000000
--- a/pkgs/applications/networking/newsreaders/kwooty/default.nix
+++ /dev/null
@@ -1,39 +0,0 @@
-{ stdenv, fetchurl, cmake, qt4, gettext
-, kdelibs, kdebase_workspace, perl
-, openssl, phonon, automoc4
-, libX11, libXext, libXft
-, unrar, p7zip, par2cmdline, coreutils
-}:
-
-let version = "1.1.0";
- name = "kwooty-${version}";
-in stdenv.mkDerivation {
- inherit name;
-
- src = fetchurl {
- url = "https://dl.opendesktop.org/api/files/download/id/1466631747/114385-${name}.tar.gz";
- sha256 = "10a9asjv6ja1xdjli2399dyka2rbia3qdm5bdpmcng6xdsbhx3ap";
- };
-
- patches = [ ./0001-search-paths.patch ];
-
- postPatch = ''
- echo "Changing paths to archive utilities to the nix store";
- substituteInPlace "src/utility.cpp" \
- --replace "/usr/bin/unrar" "${unrar}/bin" \
- --replace "/usr/bin/unpar" "${par2cmdline}/bin" \
- --replace "/usr/bin/7z" "${p7zip}/bin" \
- --replace "/usr/bin/nice" "${coreutils}/bin/nice"
- '';
-
- buildInputs =
- [ stdenv perl cmake qt4 gettext automoc4 openssl
- kdelibs kdebase_workspace phonon
- libX11 libXext libXft
- ];
-
- meta = {
- description = "Binary news reader of KDE";
- broken = true;
- };
-}
diff --git a/pkgs/applications/networking/newsreaders/liferea/default.nix b/pkgs/applications/networking/newsreaders/liferea/default.nix
index f3fdea59e48d..93e10fbe5664 100644
--- a/pkgs/applications/networking/newsreaders/liferea/default.nix
+++ b/pkgs/applications/networking/newsreaders/liferea/default.nix
@@ -1,41 +1,35 @@
-{ stdenv, fetchurl, pkgconfig, intltool, pythonPackages
-, glib, gnome3, pango, libxml2, libxslt, sqlite, libsoup, glib_networking
-, webkitgtk, json_glib, gobjectIntrospection, gst_all_1
-, libnotify
-, makeWrapper
+{ stdenv, fetchurl, pkgconfig, intltool, python3Packages, wrapGAppsHook
+, glib, libxml2, libxslt, sqlite, libsoup , webkitgtk, json_glib, gst_all_1
+, libnotify, gtk3, gsettings_desktop_schemas, libpeas, dconf, librsvg
+, gobjectIntrospection, glib_networking
}:
let
pname = "liferea";
- version = "1.10.19";
- inherit (pythonPackages) python pygobject3;
+ version = "1.12-rc3";
in stdenv.mkDerivation rec {
name = "${pname}-${version}";
src = fetchurl {
url = "https://github.com/lwindolf/${pname}/releases/download/v${version}/${name}.tar.bz2";
- sha256 = "1h6x8xd4ldrgw9mbf2gwf7wxi6z34h0d0rnwy9kyskdcgkymvi80";
+ sha256 = "0dd6hisqvc4ps6dx9ly34qx49ab1qa5h826b7dvf64mjqxa2v3kr";
};
- buildInputs = with gst_all_1; [
- pkgconfig intltool python
- glib gnome3.gtk pango libxml2 libxslt sqlite libsoup
- webkitgtk json_glib gobjectIntrospection gnome3.gsettings_desktop_schemas
- gnome3.libpeas gnome3.dconf
- gst-plugins-base gst-plugins-good gst-plugins-bad
- gnome3.libgnome_keyring gnome3.defaultIconTheme
- libnotify
- makeWrapper
- ];
+ nativeBuildInputs = [ wrapGAppsHook python3Packages.wrapPython intltool pkgconfig ];
+
+ buildInputs = [
+ glib gtk3 webkitgtk libxml2 libxslt sqlite libsoup gsettings_desktop_schemas
+ libpeas gsettings_desktop_schemas json_glib dconf gobjectIntrospection
+ librsvg glib_networking libnotify
+ ] ++ (with gst_all_1; [
+ gstreamer gst-plugins-base gst-plugins-good gst-plugins-bad
+ ]);
+
+ pythonPath = with python3Packages; [ pygobject3 pycairo ];
preFixup = ''
- for f in "$out"/bin/*; do
- wrapProgram "$f" \
- --prefix PYTHONPATH : "$(toPythonPath $out):$(toPythonPath ${pygobject3})" \
- --prefix GI_TYPELIB_PATH : "$GI_TYPELIB_PATH" \
- --prefix GIO_EXTRA_MODULES : "${gnome3.dconf}/lib/gio/modules:${glib_networking.out}/lib/gio/modules" \
- --prefix XDG_DATA_DIRS : "$XDG_ICON_DIRS:${gnome3.gtk.out}/share:$out/share:$GSETTINGS_SCHEMAS_PATH"
- done
+ buildPythonPath "$out $pythonPath"
+ gappsWrapperArgs+=(--prefix PYTHONPATH : "$program_PYTHONPATH")
'';
meta = with stdenv.lib; {
diff --git a/pkgs/applications/networking/newsreaders/pan/default.nix b/pkgs/applications/networking/newsreaders/pan/default.nix
index e8885edaa2aa..8c0bb8a884f8 100644
--- a/pkgs/applications/networking/newsreaders/pan/default.nix
+++ b/pkgs/applications/networking/newsreaders/pan/default.nix
@@ -12,7 +12,7 @@ stdenv.mkDerivation {
src = fetchurl {
url = "http://pan.rebelbase.com/download/releases/${version}/source/pan-${version}.tar.bz2";
- sha1 = "01ea0361a6d81489888e6abb075fd552999c3c60";
+ sha256 = "1fab2i6ngqp66lhls0g7j8d1c1rk75afiqr3r1x2sn3zk47k4pxz";
};
buildInputs = [ pkgconfig gtk2 perl gmime gettext intltool dbus_glib libnotify ]
diff --git a/pkgs/applications/networking/ostinato/default.nix b/pkgs/applications/networking/ostinato/default.nix
index 941ed60f9aff..41e64d7b721f 100644
--- a/pkgs/applications/networking/ostinato/default.nix
+++ b/pkgs/applications/networking/ostinato/default.nix
@@ -1,17 +1,19 @@
-{ stdenv, fetchgit, fetchurl, writeText
-, qt4, qmake4Hook, protobuf, libpcap
-, wireshark, gzip, diffutils, gawk
+{ stdenv, fetchFromGitHub, fetchurl, qmake4Hook, makeDesktopItem
+, qt4, protobuf, libpcap, wireshark, gzip, diffutils, gawk
}:
stdenv.mkDerivation rec {
- name = "ostinato-2015-12-24";
- src = fetchgit {
- url = "https://github.com/pstavirs/ostinato.git";
- rev = "414d89860de0987843295d149bcabeac7c6fd9e5";
- sha256 = "1yif8z8ih027jdsgnxd82z9914wrqpkpi4xgxqv9lygnb2jjjrdx";
+ name = "ostinato-${version}";
+ version = "0.8";
+
+ src = fetchFromGitHub {
+ owner = "pstavirs";
+ repo = "ostinato";
+ rev = "v${version}";
+ sha256 = "1b5a5gypcy9i03mj6md3lkrq05rqmdyhfykrr1z0sv8n3q48xca3";
};
- ostinato_png = fetchurl {
+ ostinatoIcon = fetchurl {
url = "http://ostinato.org/images/site-logo.png";
sha256 = "f5c067823f2934e4d358d76f65a343efd69ad783a7aeabd7ab4ce3cd03490d70";
};
@@ -22,7 +24,27 @@ stdenv.mkDerivation rec {
patches = [ ./drone_ini.patch ];
+ desktopItem = makeDesktopItem {
+ type = "application";
+ name = "ostinato";
+ desktopName = "Ostinato";
+ genericName = "Packet/Traffic Generator and Analyzer";
+ comment = "Network packet and traffic generator and analyzer with a friendly GUI";
+ categories = "Network";
+ terminal = "false";
+ startupNotify = "true";
+ exec = "$out/bin/ostinato";
+ icon = ostinatoIcon;
+ extraEntries = ''
+ GenericName[it]=Generatore ed Analizzatore di pacchetti di rete
+ Comment[it]=Generatore ed Analizzatore di pacchetti di rete con interfaccia amichevole
+ '';
+ };
+
postInstall = ''
+ mkdir -p $out/share/applications
+ ln -s ${desktopItem}/share/applications/* $out/share/applications/
+
cat > $out/bin/ostinato.ini < $out/share/applications/ostinato.desktop <
- #include
--#include
-+#include
- #include
- #include
- #include
diff --git a/pkgs/applications/networking/p2p/ncdc/default.nix b/pkgs/applications/networking/p2p/ncdc/default.nix
index b1181960f41a..6d204de9ac43 100644
--- a/pkgs/applications/networking/p2p/ncdc/default.nix
+++ b/pkgs/applications/networking/p2p/ncdc/default.nix
@@ -1,23 +1,22 @@
{ stdenv, fetchurl, ncurses, zlib, bzip2, sqlite, pkgconfig, glib, gnutls }:
-let
- version = "1.19.1";
-in
-stdenv.mkDerivation {
+stdenv.mkDerivation rec {
name = "ncdc-${version}";
+ version = "1.20";
src = fetchurl {
url = "http://dev.yorhel.nl/download/ncdc-${version}.tar.gz";
- sha256 = "0iwx4b3x207sw11qqjfynpwnhryhixjzbgcy9l9zfisa8f0k7cm6";
+ sha256 = "0ccn7dqbqpqsbglqyalz32c20rjvf1pw0zr88jyvd2b2vxbqi6ca";
};
- buildInputs = [ ncurses zlib bzip2 sqlite pkgconfig glib gnutls ];
+ nativeBuildInputs = [ pkgconfig ];
+ buildInputs = [ ncurses zlib bzip2 sqlite glib gnutls ];
- meta = {
+ meta = with stdenv.lib; {
description = "Modern and lightweight direct connect client with a friendly ncurses interface";
homepage = http://dev.yorhel.nl/ncdc;
- license = stdenv.lib.licenses.mit;
- platforms = stdenv.lib.platforms.linux; # arbitrary
- maintainers = [ stdenv.lib.maintainers.ehmry ];
+ license = licenses.mit;
+ platforms = platforms.linux; # arbitrary
+ maintainers = with maintainers; [ ehmry ];
};
}
diff --git a/pkgs/applications/networking/p2p/qbittorrent/default.nix b/pkgs/applications/networking/p2p/qbittorrent/default.nix
index cdafea3be79f..17548d824417 100644
--- a/pkgs/applications/networking/p2p/qbittorrent/default.nix
+++ b/pkgs/applications/networking/p2p/qbittorrent/default.nix
@@ -10,11 +10,11 @@ assert guiSupport -> (dbus_libs != null);
with stdenv.lib;
stdenv.mkDerivation rec {
name = "qbittorrent-${version}";
- version = "3.3.10";
+ version = "3.3.11";
src = fetchurl {
url = "mirror://sourceforge/qbittorrent/${name}.tar.xz";
- sha256 = "1lm8y5k9363gajbw0k9jb1cb7zg0lz5rw2ja0kd36h68rpm7qr9c";
+ sha256 = "0q57ahhlx7r5k1ji87gbp4rvjfvhirlmcx5nbwrfvqmxsigar4j8";
};
nativeBuildInputs = [ pkgconfig which ];
diff --git a/pkgs/applications/networking/p2p/transmission-remote-gtk/default.nix b/pkgs/applications/networking/p2p/transmission-remote-gtk/default.nix
index dc80d7d34dec..694b7541bbaf 100644
--- a/pkgs/applications/networking/p2p/transmission-remote-gtk/default.nix
+++ b/pkgs/applications/networking/p2p/transmission-remote-gtk/default.nix
@@ -1,21 +1,26 @@
-{ stdenv, autoconf, automake, libtool, makeWrapper, fetchgit, pkgconfig
-, intltool, gtk3, json_glib, curl }:
+{ stdenv, autoconf, automake, libtool, makeWrapper, fetchFromGitHub, pkgconfig
+, intltool, gtk3, json_glib, curl, glib, autoconf-archive, appstream-glib }:
stdenv.mkDerivation rec {
name = "transmission-remote-gtk-${version}";
- version = "1.2";
+ version = "1.3.1";
- src = fetchgit {
- url = "https://github.com/ajf8/transmission-remote-gtk.git";
- rev = "aa4e0c7d836cfcc10d8effd10225abb050343fc8";
- sha256 = "0qz0jzr5w5fik2awfps0q49blwm4z7diqca2405rr3fyhyjhx42b";
+ src = fetchFromGitHub {
+ owner = "transmission-remote-gtk";
+ repo = "transmission-remote-gtk";
+ rev = "${version}";
+ sha256 = "02q0vl7achx9rpd0iv0347h838bwzm7aj4k04y88g3bh8fi3cddh";
};
- buildInputs = [ libtool autoconf automake makeWrapper pkgconfig intltool
- gtk3 json_glib curl ];
+ preConfigure = "./autogen.sh";
- preConfigure = "sh autogen.sh";
+ nativeBuildInputs= [
+ autoconf automake libtool makeWrapper
+ pkgconfig intltool autoconf-archive
+ appstream-glib
+ ];
+ buildInputs = [ gtk3 json_glib curl glib ];
preFixup = ''
wrapProgram "$out/bin/transmission-remote-gtk" \
diff --git a/pkgs/applications/networking/p2p/transmission/default.nix b/pkgs/applications/networking/p2p/transmission/default.nix
index 12692b9566f9..6feeacc675a0 100644
--- a/pkgs/applications/networking/p2p/transmission/default.nix
+++ b/pkgs/applications/networking/p2p/transmission/default.nix
@@ -10,7 +10,7 @@ let
version = "2.92";
in
-with { inherit (stdenv.lib) optional optionals optionalString; };
+let inherit (stdenv.lib) optional optionals optionalString; in
stdenv.mkDerivation rec {
name = "transmission-" + optionalString enableGTK3 "gtk-" + version;
diff --git a/pkgs/applications/networking/p2p/tribler/default.nix b/pkgs/applications/networking/p2p/tribler/default.nix
index 890271916544..8e99d5159f87 100644
--- a/pkgs/applications/networking/p2p/tribler/default.nix
+++ b/pkgs/applications/networking/p2p/tribler/default.nix
@@ -1,14 +1,17 @@
-{ stdenv, fetchurl, pythonPackages, makeWrapper, nettools, libtorrentRasterbar, imagemagick
-, enablePlayer ? false, vlc ? null }:
-
+{ stdenv, fetchgit, pythonPackages, makeWrapper, nettools, libtorrentRasterbar, imagemagick
+, enablePlayer ? true, vlc ? null }:
stdenv.mkDerivation rec {
- name = "tribler-${version}";
- version = "v6.4.3";
+ pname = "tribler";
+ name = "${pname}-${version}";
+ version = "7.0.0-beta";
+ revision = "1d3ddb8";
- src = fetchurl {
- url = "https://github.com/Tribler/tribler/releases/download/${version}/Tribler-${version}.tar.xz";
- sha256 = "1n5qi3jlby41w60zg6dvl933ypyiflq3rb0qkwhxi4b26s3vwvgr";
+ src = fetchgit {
+ url = "https://github.com/Tribler/tribler";
+ rev = revision;
+ sha256 = "16mk76qgg7fgca11yvpygicxqbkc0kn6r82x73fly2310pagd845";
+ fetchSubmodules = true;
};
buildInputs = [
@@ -20,42 +23,56 @@ stdenv.mkDerivation rec {
pythonPath = [
libtorrentRasterbar
- pythonPackages.wxPython
pythonPackages.apsw
pythonPackages.twisted
- pythonPackages.gmpy
pythonPackages.netifaces
- pythonPackages.pillow
pythonPackages.pycrypto
pythonPackages.pyasn1
pythonPackages.requests
pythonPackages.setuptools
pythonPackages.m2crypto
+ pythonPackages.pyqt5
+ pythonPackages.chardet
+ pythonPackages.cherrypy
+ pythonPackages.cryptography
+ pythonPackages.libnacl
+ pythonPackages.configobj
+ pythonPackages.matplotlib
+ pythonPackages.plyvel
+ pythonPackages.decorator
+ pythonPackages.feedparser
];
- installPhase =
- ''
- find . -name '*.png' -exec convert -strip {} {} \;
- # Nasty hack; call wrapPythonPrograms to set program_PYTHONPATH.
- wrapPythonPrograms
+ postPatch = ''
+ ${stdenv.lib.optionalString enablePlayer ''
+ substituteInPlace "./TriblerGUI/vlc.py" --replace "ctypes.CDLL(p)" "ctypes.CDLL('${vlc}/lib/libvlc.so')"
+ substituteInPlace "./TriblerGUI/widgets/videoplayerpage.py" --replace "if vlc and vlc.plugin_path" "if vlc"
+ substituteInPlace "./TriblerGUI/widgets/videoplayerpage.py" --replace "os.environ['VLC_PLUGIN_PATH'] = vlc.plugin_path" "os.environ['VLC_PLUGIN_PATH'] = '${vlc}/lib/vlc/plugins'"
+ ''}
+ '';
- mkdir -p $out/share/tribler
- cp -prvd Tribler $out/share/tribler/
+ installPhase = ''
+ find . -name '*.png' -exec convert -strip {} {} \;
+ mkdir -pv $out
+ # Nasty hack; call wrapPythonPrograms to set program_PYTHONPATH.
+ wrapPythonPrograms
+ cp -prvd ./* $out/
+ makeWrapper ${pythonPackages.python}/bin/python $out/bin/tribler \
+ --set _TRIBLERPATH $out \
+ --set PYTHONPATH $out:$program_PYTHONPATH \
+ --set NO_AT_BRIDGE 1 \
+ --run 'cd $_TRIBLERPATH' \
+ --add-flags "-O $out/run_tribler.py" \
+ ${stdenv.lib.optionalString enablePlayer ''
+ --prefix LD_LIBRARY_PATH : ${vlc}/lib
+ ''}
+ '';
- makeWrapper ${pythonPackages.python}/bin/python $out/bin/tribler \
- --set _TRIBLERPATH $out/share/tribler \
- --set PYTHONPATH $out/share/tribler:$program_PYTHONPATH \
- --run 'cd $_TRIBLERPATH' \
- --add-flags "-O $out/share/tribler/Tribler/Main/tribler.py" \
- ${stdenv.lib.optionalString enablePlayer ''
- --prefix LD_LIBRARY_PATH : ${vlc}/lib
- ''}
- '';
-
- meta = {
+ meta = with stdenv.lib; {
+ maintainers = with maintainers; [ xvapx ];
homepage = http://www.tribler.org/;
description = "A completely decentralised P2P filesharing client based on the Bittorrent protocol";
- license = stdenv.lib.licenses.lgpl21;
- platforms = stdenv.lib.platforms.linux;
+ license = licenses.lgpl21;
+ platforms = platforms.linux;
};
}
diff --git a/pkgs/applications/networking/remote/citrix-receiver/default.nix b/pkgs/applications/networking/remote/citrix-receiver/default.nix
index 57d04e528452..c656ff24df84 100644
--- a/pkgs/applications/networking/remote/citrix-receiver/default.nix
+++ b/pkgs/applications/networking/remote/citrix-receiver/default.nix
@@ -22,14 +22,15 @@
, alsaLib
}:
-stdenv.mkDerivation rec {
+let versionRec = { major = "13"; minor = "4"; patch = "0"; };
+in stdenv.mkDerivation rec {
name = "citrix-receiver-${version}";
- version = "13.4.0";
+ version = with versionRec; "${major}.${minor}.${patch}";
homepage = https://www.citrix.com/downloads/citrix-receiver/linux/receiver-for-linux-latest.html;
prefixWithBitness = if stdenv.is64bit then "linuxx64" else "linuxx86";
- src = requireFile rec {
+ src = with versionRec; requireFile rec {
name = "${prefixWithBitness}-${version}.10109380.tar.gz";
sha256 =
if stdenv.is64bit
@@ -41,10 +42,14 @@ stdenv.mkDerivation rec {
${homepage}
+ (if you do not find version ${version} there, try at
+ https://www.citrix.com/downloads/citrix-receiver/legacy-receiver-for-linux/receiver-for-linux-latest-${major}-${minor}.html
+ or at https://www.citrix.com/downloads/citrix-receiver/ under "Earlier Versions of Receiver for Linux")
+
Once you have downloaded the file, please use the following command and re-run the
installation:
- nix-prefetch-url file://${name}
+ nix-prefetch-url file://\$PWD/${name}
'';
};
@@ -133,7 +138,8 @@ stdenv.mkDerivation rec {
echo "Wrapping wfica..."
mkdir "$out/bin"
- makeWrapper "$ICAInstDir/wfica -icaroot $ICAInstDir" "$out/bin/wfica" \
+ makeWrapper "$ICAInstDir/wfica" "$out/bin/wfica" \
+ --add-flags "-icaroot $ICAInstDir" \
--set ICAROOT "$ICAInstDir" \
--set GTK_PATH "${gtk2.out}/lib/gtk-2.0:${gnome3.gnome_themes_standard}/lib/gtk-2.0" \
--set GDK_PIXBUF_MODULE_FILE "$GDK_PIXBUF_MODULE_FILE" \
diff --git a/pkgs/applications/networking/sniffers/wireshark/default.nix b/pkgs/applications/networking/sniffers/wireshark/default.nix
index d3c3b2786070..c8880e630a6d 100644
--- a/pkgs/applications/networking/sniffers/wireshark/default.nix
+++ b/pkgs/applications/networking/sniffers/wireshark/default.nix
@@ -1,7 +1,7 @@
{ stdenv, lib, fetchurl, pkgconfig, pcre, perl, flex, bison, gettext, libpcap, libnl, c-ares
, gnutls, libgcrypt, libgpgerror, geoip, openssl, lua5, makeDesktopItem, python, libcap, glib
-, libssh, zlib, cmake, ecm
-, withGtk ? false, gtk3 ? null, pango ? null, cairo ? null, gdk_pixbuf ? null
+, libssh, zlib, cmake, extra-cmake-modules
+, withGtk ? false, gtk3 ? null, librsvg ? null, gsettings_desktop_schemas ? null, wrapGAppsHook ? null
, withQt ? false, qt5 ? null
, ApplicationServices, SystemConfiguration, gmp
}:
@@ -12,7 +12,7 @@ assert withQt -> !withGtk && qt5 != null;
with stdenv.lib;
let
- version = "2.2.4";
+ version = "2.2.5";
variant = if withGtk then "gtk" else if withQt then "qt" else "cli";
in stdenv.mkDerivation {
@@ -20,14 +20,18 @@ in stdenv.mkDerivation {
src = fetchurl {
url = "http://www.wireshark.org/download/src/all-versions/wireshark-${version}.tar.bz2";
- sha256 = "049r5962yrajhhz9r4dsnx403dab50d6091y2mw298ymxqszp9s2";
+ sha256 = "1j4sc3pmy8l6k41007spglcqiabjlzc7f85pn3jmjr9ksv9qipbm";
};
+ nativeBuildInputs = [
+ bison cmake extra-cmake-modules flex
+ ] ++ optional withGtk wrapGAppsHook;
+
buildInputs = [
- bison cmake ecm flex gettext pcre perl pkgconfig libpcap lua5 libssh openssl libgcrypt libgpgerror gnutls
- geoip c-ares python glib zlib
- ] ++ (optionals withQt (with qt5; [ qtbase qtmultimedia qtsvg qttools ]))
- ++ (optionals withGtk [ gtk3 pango cairo gdk_pixbuf ])
+ gettext pcre perl pkgconfig libpcap lua5 libssh openssl libgcrypt
+ libgpgerror gnutls geoip c-ares python glib zlib
+ ] ++ optionals withQt (with qt5; [ qtbase qtmultimedia qtsvg qttools ])
+ ++ optionals withGtk [ gtk3 librsvg gsettings_desktop_schemas ]
++ optionals stdenv.isLinux [ libcap libnl ]
++ optionals stdenv.isDarwin [ SystemConfiguration ApplicationServices gmp ];
diff --git a/pkgs/applications/networking/sync/rclone/default.nix b/pkgs/applications/networking/sync/rclone/default.nix
index adbadba411c9..93b4fc764674 100644
--- a/pkgs/applications/networking/sync/rclone/default.nix
+++ b/pkgs/applications/networking/sync/rclone/default.nix
@@ -2,7 +2,7 @@
buildGoPackage rec {
name = "rclone-${version}";
- version = "1.35";
+ version = "1.36";
goPackagePath = "github.com/ncw/rclone";
@@ -10,7 +10,7 @@ buildGoPackage rec {
owner = "ncw";
repo = "rclone";
rev = "v${version}";
- sha256 = "15dmppb7qgr3vg76dsv770l51lmsl8n8k3rvbnhhks5a2cz0kf2i";
+ sha256 = "1vx75ihg2j0chml8hwvngjkjw647cai9gicfy8ss6xsrm46w59b3";
};
meta = with stdenv.lib; {
diff --git a/pkgs/applications/networking/syncthing/default.nix b/pkgs/applications/networking/syncthing/default.nix
index 864acacaa9fc..81c459ff15a3 100644
--- a/pkgs/applications/networking/syncthing/default.nix
+++ b/pkgs/applications/networking/syncthing/default.nix
@@ -1,22 +1,17 @@
-{ stdenv, lib, fetchFromGitHub, go, pkgs }:
+{ stdenv, lib, fetchFromGitHub, go, pkgs, removeReferencesTo }:
-let
- removeExpr = ref: ''
- sed -i "s,${ref},$(echo "${ref}" | sed "s,$NIX_STORE/[^-]*,$NIX_STORE/eeeeeeeeeeeeeeeeeeeeeeeeeeeeeeee,"),g" \
- '';
-
-in stdenv.mkDerivation rec {
- version = "0.14.23";
+stdenv.mkDerivation rec {
+ version = "0.14.26";
name = "syncthing-${version}";
src = fetchFromGitHub {
owner = "syncthing";
repo = "syncthing";
rev = "v${version}";
- sha256 = "1himf8yhfpjsv5m068y2f6f696d7ip0jq7jmg69kn7035zlxicis";
+ sha256 = "1ny41fj8gg555awqcsyvsjs1zghjlwciwhyxjh5ly16hzaixn499";
};
- buildInputs = [ go ];
+ buildInputs = [ go removeReferencesTo ];
buildPhase = ''
mkdir -p src/github.com/syncthing
@@ -48,7 +43,7 @@ in stdenv.mkDerivation rec {
'';
preFixup = ''
- find $out/bin -type f -exec ${removeExpr go} '{}' '+'
+ find $out/bin -type f -exec remove-references-to -t ${go} '{}' '+'
'';
meta = with stdenv.lib; {
diff --git a/pkgs/applications/networking/znc/default.nix b/pkgs/applications/networking/znc/default.nix
index bc75fb5f9a48..88d1ae7fae13 100644
--- a/pkgs/applications/networking/znc/default.nix
+++ b/pkgs/applications/networking/znc/default.nix
@@ -6,15 +6,19 @@
}:
with stdenv.lib;
+
stdenv.mkDerivation rec {
- name = "znc-1.6.3";
+ name = "znc-${version}";
+ version = "1.6.5";
src = fetchurl {
- url = "http://znc.in/releases/${name}.tar.gz";
- sha256 = "09xqi5fs40x6nj9gq99bnw1a7saq96bvqxknxx0ilq7yfvg4c733";
+ url = "http://znc.in/releases/archive/${name}.tar.gz";
+ sha256 = "1jia6kq6bp8yxfj02d5vj9vqb4pylqcldspyjj6iz82kkka2a0ig";
};
- buildInputs = [ openssl pkgconfig ]
+ nativeBuildInputs = [ pkgconfig ];
+
+ buildInputs = [ openssl ]
++ optional withPerl perl
++ optional withPython python3
++ optional withTcl tcl
@@ -28,7 +32,7 @@ stdenv.mkDerivation rec {
meta = with stdenv.lib; {
description = "Advanced IRC bouncer";
homepage = http://wiki.znc.in/ZNC;
- maintainers = with maintainers; [ viric schneefux ];
+ maintainers = with maintainers; [ viric schneefux lnl7 ];
license = licenses.asl20;
platforms = platforms.unix;
};
diff --git a/pkgs/applications/office/basket/default.nix b/pkgs/applications/office/basket/default.nix
deleted file mode 100644
index 2417e263d442..000000000000
--- a/pkgs/applications/office/basket/default.nix
+++ /dev/null
@@ -1,25 +0,0 @@
-{ stdenv, fetchurl, automoc4, cmake, gettext, perl, pkgconfig
-, kdelibs, qimageblitz, kdepimlibs, gpgme
-}:
-
-stdenv.mkDerivation rec {
- name = "basket-1.81";
-
- src = fetchurl {
- url = "http://basket.kde.org/downloads/${name}.tar.bz2";
- sha256 = "10zxlgz96iwmqz30sw6f20pzjmnjvqhx7b5ihfwz47agyfdb98v0";
- };
-
- KDEDIRS = kdepimlibs;
-
- buildInputs = [ kdelibs qimageblitz kdepimlibs gpgme ];
-
- nativeBuildInputs = [ automoc4 cmake gettext perl pkgconfig ];
-
- meta = {
- description = "A multi-purpose note-taking application";
- homepage = http://basket.kde.org/;
- maintainers = [ stdenv.lib.maintainers.urkud ];
- inherit (kdelibs.meta) platforms;
- };
-}
diff --git a/pkgs/applications/office/calligra/default.nix b/pkgs/applications/office/calligra/default.nix
index 99107787493f..76027f29a707 100644
--- a/pkgs/applications/office/calligra/default.nix
+++ b/pkgs/applications/office/calligra/default.nix
@@ -1,8 +1,8 @@
-{ stdenv, fetchurl, automoc4, cmake, perl, pkgconfig, kdelibs, lcms2, libpng, eigen
+{ stdenv, fetchurl, automoc4, cmake, perl, pkgconfig, kdelibs4, lcms2, libpng, eigen
, exiv2, boost, sqlite, icu, vc, shared_mime_info, librevenge, libodfgen, libwpg
, libwpd, poppler_qt4, ilmbase, gsl, qca2, marble, libvisio, libmysql, postgresql
, freetds, fftw, glew, libkdcraw, pstoedit, opencolorio, kdepimlibs
-, kactivities, okular, git, oxygen_icons, makeWrapper
+, kactivities, okular, git, oxygen-icons5, makeWrapper
# TODO: not found
#, xbase, openjpeg
# TODO: package libWPS, Spnav, m2mml, LibEtonyek
@@ -19,7 +19,7 @@ stdenv.mkDerivation rec {
nativeBuildInputs = [ automoc4 cmake perl pkgconfig makeWrapper ];
buildInputs = [
- kdelibs lcms2 libpng eigen
+ kdelibs4 lcms2 libpng eigen
exiv2 boost sqlite icu vc shared_mime_info librevenge libodfgen libwpg
libwpd poppler_qt4 ilmbase gsl qca2 marble libvisio libmysql postgresql
freetds fftw glew libkdcraw opencolorio kdepimlibs
@@ -32,7 +32,7 @@ stdenv.mkDerivation rec {
for i in $out/bin/*; do
wrapProgram $i \
--prefix PATH ':' "${pstoedit.out}/bin" \
- --prefix XDG_DATA_DIRS ':' "${oxygen_icons}/share"
+ --prefix XDG_DATA_DIRS ':' "${oxygen-icons5}/share"
done
'';
@@ -48,8 +48,8 @@ stdenv.mkDerivation rec {
vector graphics.
'';
homepage = http://calligra.org;
- maintainers = with maintainers; [ urkud phreedom ebzzry ];
- inherit (kdelibs.meta) platforms;
+ maintainers = with maintainers; [ phreedom ebzzry ];
+ inherit (kdelibs4.meta) platforms;
license = licenses.gpl2;
};
}
diff --git a/pkgs/applications/office/eventlist/default.nix b/pkgs/applications/office/eventlist/default.nix
deleted file mode 100644
index 395cb3d0a914..000000000000
--- a/pkgs/applications/office/eventlist/default.nix
+++ /dev/null
@@ -1,30 +0,0 @@
-{ stdenv, fetchurl, automoc4, cmake, gettext, perl, pkgconfig
-, kdelibs, kdepimlibs, akonadi, boost }:
-
-stdenv.mkDerivation rec {
- name = "plasmoid-eventlist-0.6.96";
-
- src = fetchurl {
- url = "http://kde-look.org/CONTENT/content-files/107779-plasmoid-eventlist-0.6.96.tar.bz2";
- sha256 = "26cc7bd1c465bf1379fd0ba1fa8592eaa62f2553734d1b283e17359103908eea";
- };
-
- nativeBuildInputs = [ automoc4 cmake gettext perl pkgconfig ];
- buildInputs = [ kdelibs kdepimlibs akonadi boost ];
-
- meta = {
- inherit (kdelibs.meta) platforms;
- description = "KDE Plasmoid to show events and todos on the desktop";
- longDescription = ''
- This is a plasmoid to show the events and todos from Akonadi resources (KOrganizer, Birthdays etc.).
- With a google resource also Google calendar items can be shown.
- Also possible with a CalDAV resource.
- A facebook resource is also available.
-
- Incidences can be filtered, added, edited, deleted via context menu.
- '';
- homepage = "http://kde-look.org/content/show.php/Eventlist?content=107779";
- license = stdenv.lib.licenses.gpl3Plus;
-
- };
-}
diff --git a/pkgs/applications/office/homebank/default.nix b/pkgs/applications/office/homebank/default.nix
index b4df8fdd4606..ac2f71c872da 100644
--- a/pkgs/applications/office/homebank/default.nix
+++ b/pkgs/applications/office/homebank/default.nix
@@ -2,10 +2,10 @@
, hicolor_icon_theme, libsoup, gnome3 }:
stdenv.mkDerivation rec {
- name = "homebank-5.1.3";
+ name = "homebank-5.1.4";
src = fetchurl {
url = "http://homebank.free.fr/public/${name}.tar.gz";
- sha256 = "0wzv2hkm30a1kqjldw02bzbh49bdmac041d6qybjzvkgwvrbmci2";
+ sha256 = "07zxb9n7d281nfv29gi09fsp7y73fx4w2s48hgdn9s4vij25zwqa";
};
nativeBuildInputs = [ pkgconfig wrapGAppsHook ];
diff --git a/pkgs/applications/office/kbibtex/default.nix b/pkgs/applications/office/kbibtex/default.nix
deleted file mode 100644
index a18ba50cabe2..000000000000
--- a/pkgs/applications/office/kbibtex/default.nix
+++ /dev/null
@@ -1,21 +0,0 @@
-{ stdenv, fetchurl, automoc4, cmake, perl, pkgconfig
-, kdelibs, libxslt, poppler_qt4
-}:
-
-stdenv.mkDerivation rec {
- pname = "kbibtex";
- version = "0.4";
- name = "${pname}-${version}";
-
- src = fetchurl {
- url = "http://download.gna.org/${pname}/${version}/${name}.tar.bz2";
- sha256 = "1hq0az0dp96195z26wjfwj9ynd57pfv13f1xcl5vbsswcjfrczws";
- };
-
- patchPhase = ''
- sed -e '25i#include ' -i src/gui/preferences/settingsabstractwidget.h
- '';
-
- buildInputs = [ kdelibs libxslt poppler_qt4 ];
- nativeBuildInputs = [ automoc4 cmake perl pkgconfig ];
-}
diff --git a/pkgs/applications/office/kmymoney/default.nix b/pkgs/applications/office/kmymoney/default.nix
deleted file mode 100644
index f375da175044..000000000000
--- a/pkgs/applications/office/kmymoney/default.nix
+++ /dev/null
@@ -1,34 +0,0 @@
-{ stdenv, fetchurl, cmake, kdelibs, automoc4, kdepimlibs, gettext, pkgconfig
-, shared_mime_info, perl, boost, gpgme, gmpxx, libalkimia, libofx, libical
-, doxygen, aqbanking, gwenhywfar }:
-
-stdenv.mkDerivation rec {
- name = "kmymoney-${version}";
- version = "4.8.0";
-
- src = fetchurl {
- url = "mirror://kde/stable/kmymoney/${version}/src/${name}.tar.xz";
- sha256 = "1hlayhcmdfayma4hchv2bfyg82ry0h74hg4095d959mg19qkb9n2";
- };
-
- cmakeFlags = [
- "-DENABLE_KBANKING='true'"
- ];
-
- buildInputs = [ kdepimlibs perl boost gpgme gmpxx libalkimia libofx libical
- doxygen aqbanking gwenhywfar ];
- nativeBuildInputs = [ cmake automoc4 gettext shared_mime_info pkgconfig ];
-
- KDEDIRS = libalkimia;
-
- patches = [
- ./qgpgme.patch
- ./seqaccessmgrtest.patch
- ];
-
- meta = {
- homepage = http://kmymoney2.sourceforge.net/;
- description = "KDE personal money manager";
- inherit (kdelibs.meta) platforms maintainers;
- };
-}
diff --git a/pkgs/applications/office/kmymoney/qgpgme.patch b/pkgs/applications/office/kmymoney/qgpgme.patch
deleted file mode 100644
index 59ed37edaf8e..000000000000
--- a/pkgs/applications/office/kmymoney/qgpgme.patch
+++ /dev/null
@@ -1,17 +0,0 @@
-KMymoney tries to find qgpgme before kdepimlibs. This is wrong because
-FindQGpgme is installed by kdepimlibs, thus can be invisible until kdepimlibs
-found.
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index f6d7305..88bac67 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -59,8 +59,8 @@ else (WIN32)
- find_package(Boost "1.33.1" COMPONENTS graph)
- endif (WIN32)
- # needed by libkgpgfile
--find_package(QGpgme REQUIRED)
- find_package(KdepimLibs REQUIRED)
-+find_package(QGpgme REQUIRED)
- find_package(SharedMimeInfo REQUIRED)
-
- add_definitions( ${QT_DEFINITIONS} ${KDE4_DEFINITIONS} ${KDEPIM_DEFINITIONS})
diff --git a/pkgs/applications/office/kmymoney/seqaccessmgrtest.patch b/pkgs/applications/office/kmymoney/seqaccessmgrtest.patch
deleted file mode 100644
index d01a433ba09a..000000000000
--- a/pkgs/applications/office/kmymoney/seqaccessmgrtest.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-Fix tests for 32bit builds until we can bring these upstream
-diff --git a/kmymoney/mymoney/storage/mymoneyseqaccessmgrtest.cpp b/kmymoney/mymoney/storage/mymoneyseqaccessmgrtest.cpp
-index dcb4b4a..e803203 100644
---- a/kmymoney/mymoney/storage/mymoneyseqaccessmgrtest.cpp
-+++ b/kmymoney/mymoney/storage/mymoneyseqaccessmgrtest.cpp
-@@ -58,13 +58,13 @@ void MyMoneySeqAccessMgrTest::testEmptyConstructor()
- QCOMPARE(m->m_nextPayeeID, 0ul);
- QCOMPARE(m->m_nextScheduleID, 0ul);
- QCOMPARE(m->m_nextReportID, 0ul);
-- QCOMPARE(m->m_institutionList.count(), 0ul);
-- QCOMPARE(m->m_accountList.count(), 5ul);
-- QCOMPARE(m->m_transactionList.count(), 0ul);
-- QCOMPARE(m->m_transactionKeys.count(), 0ul);
-- QCOMPARE(m->m_payeeList.count(), 0ul);
-- QCOMPARE(m->m_tagList.count(), 0ul);
-- QCOMPARE(m->m_scheduleList.count(), 0ul);
-+ QCOMPARE(m->m_institutionList.count(), (size_t)0);
-+ QCOMPARE(m->m_accountList.count(), (size_t)5);
-+ QCOMPARE(m->m_transactionList.count(), (size_t)0);
-+ QCOMPARE(m->m_transactionKeys.count(), (size_t)0);
-+ QCOMPARE(m->m_payeeList.count(), (size_t)0);
-+ QCOMPARE(m->m_tagList.count(), (size_t)0);
-+ QCOMPARE(m->m_scheduleList.count(), (size_t)0);
-
- QCOMPARE(m->m_dirty, false);
- QCOMPARE(m->m_creationDate, QDate::currentDate());
diff --git a/pkgs/applications/office/libreoffice/default-primary-src.nix b/pkgs/applications/office/libreoffice/default-primary-src.nix
index 919ab01f5f6e..245d2a5fce1a 100644
--- a/pkgs/applications/office/libreoffice/default-primary-src.nix
+++ b/pkgs/applications/office/libreoffice/default-primary-src.nix
@@ -3,8 +3,8 @@
rec {
major = "5";
minor = "3";
- patch = "0";
- tweak = "3";
+ patch = "1";
+ tweak = "2";
subdir = "${major}.${minor}.${patch}";
@@ -12,6 +12,6 @@ rec {
src = fetchurl {
url = "http://download.documentfoundation.org/libreoffice/src/${subdir}/libreoffice-${version}.tar.xz";
- sha256 = "0vjmc8id9krpy9n4f0yil8k782cdzwmk53lvszi7r32b3ig23f84";
+ sha256 = "1zsl0z0i8pw532x2lmwd64ms6igibkkjhwf01zmm2kpnr9ycsijp";
};
}
diff --git a/pkgs/applications/office/libreoffice/default.nix b/pkgs/applications/office/libreoffice/default.nix
index 989cf17e2761..c43a06838b84 100644
--- a/pkgs/applications/office/libreoffice/default.nix
+++ b/pkgs/applications/office/libreoffice/default.nix
@@ -6,7 +6,7 @@
, openssl, gperf, cppunit, GConf, ORBit2, poppler
, librsvg, gnome_vfs, mesa, bsh, CoinMP, libwps, libabw
, autoconf, automake, openldap, bash, hunspell, librdf_redland, nss, nspr
-, libwpg, dbus_glib, glibc, qt4, kde4, clucene_core, libcdr, lcms, vigra
+, libwpg, dbus_glib, glibc, qt4, clucene_core, libcdr, lcms, vigra
, unixODBC, mdds, sane-backends, mythes, libexttextcat, libvisio
, fontsConf, pkgconfig, libzip, bluez5, libtool, maven
, libatomic_ops, graphite2, harfbuzz, libodfgen, libzmf
@@ -22,7 +22,7 @@ let
primary-src = import ./default-primary-src.nix { inherit fetchurl; };
in
-with { inherit (primary-src) major minor subdir version; };
+let inherit (primary-src) major minor subdir version; in
let
lib = stdenv.lib;
@@ -42,14 +42,14 @@ let
translations = fetchSrc {
name = "translations";
- sha256 = "1ld1zj2f0cbyr0fkibsiazyrb4qkshc9yqkfmq7b64hhp9zsa8a3";
+ sha256 = "1r386qkfmlq7p1zly4xl0s0shp1d3rq9hwm1403ap22qpgrcgqyb";
};
# TODO: dictionaries
help = fetchSrc {
name = "help";
- sha256 = "0zqs9g6hqjv5z0yzi0ag4ii158249c70ppqhg1v60haip40xan6z";
+ sha256 = "03n2lj6zhjg585zq9z458mj29dshni25p1v959a2z1xa3jzwfjfz";
};
};
@@ -252,7 +252,7 @@ in stdenv.mkDerivation rec {
libodfgen CoinMP librdf_rasqal defaultIconTheme makeWrapper
gdb
]
- ++ lib.optional kdeIntegration kde4.kdelibs;
+ ++ lib.optional kdeIntegration kdelibs4;
passthru = {
inherit srcs;
diff --git a/pkgs/applications/office/libreoffice/libreoffice-srcs-still.nix b/pkgs/applications/office/libreoffice/libreoffice-srcs-still.nix
index 8bfb54fef550..7bcb638b77ec 100644
--- a/pkgs/applications/office/libreoffice/libreoffice-srcs-still.nix
+++ b/pkgs/applications/office/libreoffice/libreoffice-srcs-still.nix
@@ -112,11 +112,11 @@
md5name = "1f467e5bb703f12cbbb09d5cf67ecf4a-converttexttonumber-1-5-0.oxt";
}
{
- name = "curl-7.51.0.tar.gz";
- url = "http://dev-www.libreoffice.org/src/curl-7.51.0.tar.gz";
- sha256 = "65b5216a6fbfa72f547eb7706ca5902d7400db9868269017a8888aa91d87977c";
- md5 = "490e19a8ccd1f4a244b50338a0eb9456";
- md5name = "490e19a8ccd1f4a244b50338a0eb9456-curl-7.51.0.tar.gz";
+ name = "curl-7.52.1.tar.gz";
+ url = "http://dev-www.libreoffice.org/src/curl-7.52.1.tar.gz";
+ sha256 = "a8984e8b20880b621f61a62d95ff3c0763a3152093a9f9ce4287cfd614add6ae";
+ md5 = "4e1ef056e117b4d25f4ec42ac609c0d4";
+ md5name = "4e1ef056e117b4d25f4ec42ac609c0d4-curl-7.52.1.tar.gz";
}
{
name = "libe-book-0.1.2.tar.bz2";
diff --git a/pkgs/applications/office/libreoffice/libreoffice-srcs.nix b/pkgs/applications/office/libreoffice/libreoffice-srcs.nix
index 375db389da99..8ac7bc2eda02 100644
--- a/pkgs/applications/office/libreoffice/libreoffice-srcs.nix
+++ b/pkgs/applications/office/libreoffice/libreoffice-srcs.nix
@@ -112,11 +112,11 @@
md5name = "1f467e5bb703f12cbbb09d5cf67ecf4a-converttexttonumber-1-5-0.oxt";
}
{
- name = "curl-7.51.0.tar.gz";
- url = "http://dev-www.libreoffice.org/src/curl-7.51.0.tar.gz";
- sha256 = "65b5216a6fbfa72f547eb7706ca5902d7400db9868269017a8888aa91d87977c";
- md5 = "490e19a8ccd1f4a244b50338a0eb9456";
- md5name = "490e19a8ccd1f4a244b50338a0eb9456-curl-7.51.0.tar.gz";
+ name = "curl-7.52.1.tar.gz";
+ url = "http://dev-www.libreoffice.org/src/curl-7.52.1.tar.gz";
+ sha256 = "a8984e8b20880b621f61a62d95ff3c0763a3152093a9f9ce4287cfd614add6ae";
+ md5 = "4e1ef056e117b4d25f4ec42ac609c0d4";
+ md5name = "4e1ef056e117b4d25f4ec42ac609c0d4-curl-7.52.1.tar.gz";
}
{
name = "libe-book-0.1.2.tar.bz2";
@@ -294,11 +294,11 @@
md5name = "17410483b5b5f267aa18b7e00b65e6e0-hsqldb_1_8_0.zip";
}
{
- name = "hunspell-1.4.1.tar.gz";
- url = "http://dev-www.libreoffice.org/src/33d370f7fe5a030985e445a5672b2067-hunspell-1.4.1.tar.gz";
- sha256 = "c4476aff0ced52eec334eae1e8d3fdaaebdd90f5ecd0b57cf2a92a6fd220d1bb";
- md5 = "33d370f7fe5a030985e445a5672b2067";
- md5name = "33d370f7fe5a030985e445a5672b2067-hunspell-1.4.1.tar.gz";
+ name = "hunspell-1.6.0.tar.gz";
+ url = "http://dev-www.libreoffice.org/src/047c3feb121261b76dc16cdb62f54483-hunspell-1.6.0.tar.gz";
+ sha256 = "512e7d2ee69dad0b35ca011076405e56e0f10963a02d4859dbcc4faf53ca68e2";
+ md5 = "047c3feb121261b76dc16cdb62f54483";
+ md5name = "047c3feb121261b76dc16cdb62f54483-hunspell-1.6.0.tar.gz";
}
{
name = "hyphen-2.8.8.tar.gz";
diff --git a/pkgs/applications/office/libreoffice/still-primary-src.nix b/pkgs/applications/office/libreoffice/still-primary-src.nix
index 0fae854f42fa..d1e87d7de6da 100644
--- a/pkgs/applications/office/libreoffice/still-primary-src.nix
+++ b/pkgs/applications/office/libreoffice/still-primary-src.nix
@@ -3,8 +3,8 @@
rec {
major = "5";
minor = "2";
- patch = "5";
- tweak = "1";
+ patch = "6";
+ tweak = "2";
subdir = "${major}.${minor}.${patch}";
@@ -12,6 +12,6 @@ rec {
src = fetchurl {
url = "http://download.documentfoundation.org/libreoffice/src/${subdir}/libreoffice-${version}.tar.xz";
- sha256 = "006kn1m5d6c1skgc1scc0gssin922raca2psjv887alplhia6mlp";
+ sha256 = "0w1myl4l1qhdkwqb3b52xld1sq45xyg8b45q40l6a50iccwy6j9x";
};
}
diff --git a/pkgs/applications/office/libreoffice/still.nix b/pkgs/applications/office/libreoffice/still.nix
index 26bb53c9b389..7a2174b557e1 100644
--- a/pkgs/applications/office/libreoffice/still.nix
+++ b/pkgs/applications/office/libreoffice/still.nix
@@ -6,7 +6,7 @@
, openssl, gperf, cppunit, GConf, ORBit2, poppler
, librsvg, gnome_vfs, mesa, bsh, CoinMP, libwps, libabw
, autoconf, automake, openldap, bash, hunspell, librdf_redland, nss, nspr
-, libwpg, dbus_glib, glibc, qt4, kde4, clucene_core, libcdr, lcms, vigra
+, libwpg, dbus_glib, glibc, qt4, kdelibs4, clucene_core, libcdr, lcms, vigra
, unixODBC, mdds, sane-backends, mythes, libexttextcat, libvisio
, fontsConf, pkgconfig, libzip, bluez5, libtool, maven
, libatomic_ops, graphite2, harfbuzz, libodfgen
@@ -22,7 +22,7 @@ let
primary-src = import ./still-primary-src.nix { inherit fetchurl; };
in
-with { inherit (primary-src) major minor subdir version; };
+let inherit (primary-src) major minor subdir version; in
let
lib = stdenv.lib;
@@ -42,14 +42,14 @@ let
translations = fetchSrc {
name = "translations";
- sha256 = "0lv3jbnzzkr7nbivsl9jm9b4m9mxvngbmhz6yasblhi0m9ifkxmb";
+ sha256 = "0w77mkxmhxx4qjwdwb8bipcdb4pkvkg202mxbbjrv0aj09k6dhvk";
};
# TODO: dictionaries
help = fetchSrc {
name = "help";
- sha256 = "1d29ppdkhhy5x8cric0l872x607ng02bnp2gvv5ck3blb759q68i";
+ sha256 = "12xqzp005dhbh618g3zb30vj7rdmccdqj6ix10jlk0clk66n9kf0";
};
};
@@ -72,6 +72,13 @@ in stdenv.mkDerivation rec {
configureScript = "./autogen.sh";
dontUseCmakeConfigure = true;
+ # ICU 58, included in 5.3.x
+ patches = [(fetchurl {
+ url = "https://gerrit.libreoffice.org/gitweb?p=core.git;a=patch;h=3e42714c76b1347babfdea0564009d8d82a83af4";
+ sha256 = "10bid0jdw1rpdsqwzzk3r4rp6bjs2cvi82h7anz2m1amfjdv86my";
+ name = "libreoffice-5.2.x-icu4c-58.patch";
+ })];
+
postUnpack = ''
mkdir -v $sourceRoot/src
'' + (stdenv.lib.concatMapStrings (f: "ln -sfv ${f} $sourceRoot/src/${f.md5 or f.outputHash}-${f.name}\nln -sfv ${f} $sourceRoot/src/${f.name}\n") srcs.third_party)
@@ -247,7 +254,7 @@ in stdenv.mkDerivation rec {
librevenge libe-book libmwaw glm glew ncurses
libodfgen CoinMP librdf_rasqal defaultIconTheme makeWrapper
]
- ++ lib.optional kdeIntegration kde4.kdelibs;
+ ++ lib.optional kdeIntegration kdelibs4;
passthru = {
inherit srcs;
diff --git a/pkgs/applications/office/marp/default.nix b/pkgs/applications/office/marp/default.nix
index 9a59bef617b5..0e53d58a083b 100644
--- a/pkgs/applications/office/marp/default.nix
+++ b/pkgs/applications/office/marp/default.nix
@@ -2,11 +2,11 @@
stdenv.mkDerivation rec {
name = "marp-${version}";
- version = "0.0.9";
+ version = "0.0.10";
src = fetchurl {
url = "https://github.com/yhatt/marp/releases/download/v${version}/${version}-Marp-linux-x64.tar.gz";
- sha256 = "142c35d88rkgjy85f4204givgx0p1qyfpipbrsa11lp3cb6jzhn2";
+ sha256 = "0x4qldbyvq88cs12znxv33bb0nxr3wxcwhyr97pkjrjc2cn7nphx";
};
sourceRoot = ".";
diff --git a/pkgs/applications/office/mendeley/default.nix b/pkgs/applications/office/mendeley/default.nix
index 0ae0732da27f..0a14a87cf560 100644
--- a/pkgs/applications/office/mendeley/default.nix
+++ b/pkgs/applications/office/mendeley/default.nix
@@ -1,6 +1,30 @@
-{ fetchurl, stdenv, dpkg, makeWrapper, which
-, gcc, orc, xorg, qt4, zlib
-, ...}:
+{ fetchurl, stdenv, dpkg, which
+, alsaLib
+, desktop_file_utils
+, dbus
+, libcap
+, fontconfig
+, freetype
+, gcc
+, gconf
+, glib
+, icu
+, libxml2
+, libxslt
+, orc
+, nss
+, nspr
+, qt5
+, sqlite
+, xorg
+, xlibs
+, zlib
+# The provided wrapper does this, but since we don't use it
+# we emulate the behavior. The downside is that this
+# will leave entries on your system after uninstalling mendeley.
+# (they can be removed by running '$out/bin/install-mendeley-link-handler.sh -u')
+, autorunLinkHandler ? true
+}:
assert stdenv.system == "i686-linux" || stdenv.system == "x86_64-linux";
@@ -12,20 +36,49 @@ let
then "i386"
else "amd64";
- shortVersion = "1.16.3-stable";
+ shortVersion = "1.17.9-stable";
version = "${shortVersion}_${arch}";
url = "http://desktop-download.mendeley.com/download/apt/pool/main/m/mendeleydesktop/mendeleydesktop_${version}.deb";
sha256 = if stdenv.system == arch32
- then "14cxysn1l6s6z8awmqj1glm4146jif0852wiyhjg1dhhh25cvpbv"
- else "1hdvawj8g4hpj36xy5ys27h1fa76xcdx8apsxa6hpg5xmxvcamqz";
+ then "0z04r3ipwp2vca3qhp3b1zj0m12h023ynmbjsz4sysnd1bb5f2yr"
+ else "0h3m6s3s5283g9w3sm4fszhhnzgmqw49nr0ihvdwyxrgawxmz4vg";
deps = [
+ qt5.qtbase
+ qt5.qtsvg
+ qt5.qtdeclarative
+ qt5.qtwebchannel
+ qt5.qtquickcontrols
+ qt5.qtwebkit
+ qt5.qtwebengine
+ alsaLib
+ dbus
+ freetype
+ fontconfig
gcc.cc
+ gconf
+ glib
+ icu
+ libcap
+ libxml2
+ libxslt
+ nspr
+ nss
orc
- qt4
+ sqlite
xorg.libX11
+ xlibs.xcbutilkeysyms
+ xorg.libxcb
+ xorg.libXcomposite
+ xorg.libXext
+ xorg.libXrender
+ xorg.libXi
+ xorg.libXcursor
+ xorg.libXtst
+ xorg.libXrandr
+ xorg.xcbutilimage
zlib
];
@@ -39,19 +92,33 @@ stdenv.mkDerivation {
sha256 = sha256;
};
- buildInputs = [ dpkg makeWrapper which ];
+ nativeBuildInputs = [ qt5.makeQtWrapper ];
+ buildInputs = [ dpkg which ] ++ deps;
unpackPhase = "true";
installPhase = ''
dpkg-deb -x $src $out
- mv $out/opt/mendeleydesktop/{bin,lib,plugins,share} $out
+ mv $out/opt/mendeleydesktop/{bin,lib,share} $out
interpreter=$(patchelf --print-interpreter $(readlink -f $(which patchelf)))
- patchelf --set-interpreter $interpreter $out/bin/mendeleydesktop
+ patchelf --set-interpreter $interpreter \
+ --set-rpath ${stdenv.lib.makeLibraryPath deps}:$out/lib \
+ $out/bin/mendeleydesktop
+ paxmark m $out/bin/mendeleydesktop
- librarypath="${stdenv.lib.makeLibraryPath deps}:$out/lib:$out/lib/qt"
- wrapProgram $out/bin/mendeleydesktop --prefix LD_LIBRARY_PATH : "$librarypath"
+ wrapQtProgram $out/bin/mendeleydesktop \
+ --add-flags "--unix-distro-build" \
+ ${stdenv.lib.optionalString autorunLinkHandler
+ ''--run "$out/bin/install-mendeley-link-handler.sh $out/bin/mendeleydesktop"''}
+
+ # Remove bundled qt bits
+ rm -rf $out/lib/qt
+ rm $out/bin/qt* $out/bin/Qt*
+
+ # Patch up link handler script
+ wrapProgram $out/bin/install-mendeley-link-handler.sh \
+ --prefix PATH ':' ${stdenv.lib.makeBinPath [ which gconf desktop_file_utils ] }
'';
dontStrip = true;
diff --git a/pkgs/applications/office/mmex/default.nix b/pkgs/applications/office/mmex/default.nix
index 2981a0f7f890..30b8809f2247 100644
--- a/pkgs/applications/office/mmex/default.nix
+++ b/pkgs/applications/office/mmex/default.nix
@@ -2,7 +2,7 @@
let
- version = "1.3.1";
+ version = "1.3.3";
in
stdenv.mkDerivation {
name = "money-manager-ex-${version}";
@@ -10,7 +10,7 @@ in
src = fetchgit {
url = "https://github.com/moneymanagerex/moneymanagerex.git";
rev = "refs/tags/v${version}";
- sha256 = "1cmwmvlzg7r85qq23lbbmq2y91vhf9f5pblpja5ph98bsd218pc0";
+ sha256 = "0r4n93z3scv0i0zqflsxwv7j4yl8jy3gr0m4l30y1q8qv0zj9n74";
};
buildInputs = [ sqlite wxGTK30 gettext ];
diff --git a/pkgs/applications/office/moneyplex/default.nix b/pkgs/applications/office/moneyplex/default.nix
new file mode 100644
index 000000000000..4530305ee12e
--- /dev/null
+++ b/pkgs/applications/office/moneyplex/default.nix
@@ -0,0 +1,121 @@
+{ stdenv, fetchurl, patchelf, libredirect, coreutils, pcsclite
+, zlib, glib, gdk_pixbuf, gtk2, cairo, pango, libX11, atk, openssl }:
+
+let
+ libPath = stdenv.lib.makeLibraryPath [
+ stdenv.cc.cc zlib glib gdk_pixbuf gtk2 cairo pango libX11 atk openssl
+ ];
+
+ src_i686 = {
+ url = "http://www.matrica.com/download/distribution/moneyplex_16_install32_22424.tar.gz";
+ sha256 = "0yfpc6s85r08g796dycl378kagkma865vp7j72npia3hjc4vwamr";
+ };
+
+ src_x86_64 = {
+ url = "http://www.matrica.com/download/distribution/moneyplex_16_install64_22424.tar.gz";
+ sha256 = "03vxbg1yp8qyvcn6bw2a5s134nxzq9cn0vqbmlld7hh4knbsfqzw";
+ };
+in
+
+stdenv.mkDerivation rec {
+ name = "moneyplex-${version}";
+ version = "16.0.22424";
+
+ src = fetchurl (if stdenv.system == "i686-linux" then src_i686
+ else if stdenv.system == "x86_64-linux" then src_x86_64
+ else throw "moneyplex requires i686-linux or x86_64-linux");
+
+
+ phases = [ "unpackPhase" "installPhase" "postInstall" ];
+
+ buildInputs = [ ];
+
+ installPhase =
+ ''
+ mkdir -p "$out/opt/moneyplex"
+ cp -r . $out/opt/moneyplex
+
+ mkdir "$out/bin"
+
+ cat > $out/bin/moneyplex < $out/share/applications/moneyplex.desktop < $out/bin/logisim << EOF
- #!${stdenv.shell}
- ${jre}/bin/java -jar $out/logisim.jar
- EOF
-
- chmod +x $out/bin/logisim
+ makeWrapper ${jre}/bin/java $out/bin/logisim --add-flags "-jar $src"
'';
meta = {
diff --git a/pkgs/applications/science/logic/redprl/default.nix b/pkgs/applications/science/logic/redprl/default.nix
index 0cbe1d1cb375..49245c73f2c4 100644
--- a/pkgs/applications/science/logic/redprl/default.nix
+++ b/pkgs/applications/science/logic/redprl/default.nix
@@ -1,10 +1,10 @@
{ stdenv, fetchgit, mlton }:
stdenv.mkDerivation {
- name = "redprl-2016-09-22";
+ name = "redprl-2017-03-28";
src = fetchgit {
url = "https://github.com/RedPRL/sml-redprl.git";
- rev = "3215faf0d494f4ac14d6e10172329a161df192c4";
- sha256 = "0pcq4q9xy34j7ziwbly4qxccpkcrl92r9y11bv6hdkbzwm1g2a77";
+ rev = "bdf027de732e4a8d10f9f954389dfff0c822f18b";
+ sha256 = "0cihwnd78d3ksxp6mppifm7xpi3fsii5mixvicajy87ggw8z305c";
fetchSubmodules = true;
};
buildInputs = [ mlton ];
diff --git a/pkgs/applications/science/math/R/default.nix b/pkgs/applications/science/math/R/default.nix
index dea095c834ff..f87a26cda8a5 100644
--- a/pkgs/applications/science/math/R/default.nix
+++ b/pkgs/applications/science/math/R/default.nix
@@ -7,18 +7,18 @@
}:
stdenv.mkDerivation rec {
- name = "R-3.2.4";
+ name = "R-3.3.3";
src = fetchurl {
url = "http://cran.r-project.org/src/base/R-3/${name}.tar.gz";
- sha256 = "0l6k3l3cy6fa9xkn23zvz5ykpw10s45779x88yz3pzn2x5gl1zds";
+ sha256 = "0v7wpj89b0i3ad3fi1wak5c93hywmbxv8sdnixhq8l17782nidss";
};
- buildInputs = [ bzip2 gfortran libX11 libXmu libXt
- libXt libjpeg libpng libtiff ncurses pango pcre perl readline
- texLive xz zlib less texinfo graphviz icu pkgconfig bison imake
- which jdk openblas curl ]
- ++ stdenv.lib.optionals (!stdenv.isDarwin) [ tcl tk ]
+ buildInputs = [
+ bzip2 gfortran libX11 libXmu libXt libXt libjpeg libpng libtiff ncurses
+ pango pcre perl readline texLive xz zlib less texinfo graphviz icu
+ pkgconfig bison imake which jdk openblas curl
+ ] ++ stdenv.lib.optionals (!stdenv.isDarwin) [ tcl tk ]
++ stdenv.lib.optionals stdenv.isDarwin [ Cocoa Foundation cf-private libobjc ];
patches = [ ./no-usr-local-search-paths.patch ];
@@ -35,10 +35,6 @@ stdenv.mkDerivation rec {
--with-libpng
--with-jpeglib
--with-libtiff
- --with-system-zlib
- --with-system-bzlib
- --with-system-pcre
- --with-system-xz
--with-ICU
${stdenv.lib.optionalString enableStrictBarrier "--enable-strict-barrier"}
--enable-R-shlib
@@ -59,26 +55,23 @@ stdenv.mkDerivation rec {
OBJC="clang"
'' + ''
)
- echo "TCLLIBPATH=${tk}/lib" >>etc/Renviron.in
- '';
-
- postConfigure = stdenv.lib.optionalString stdenv.isDarwin ''
- sed -i 's|/usr/share/zoneinfo|${tzdata}/share/zoneinfo|g' src/library/base/R/datetime.R
- sed -i 's|getenv("R_SHARE_DIR")|"${tzdata}/share"|g' src/extra/tzone/localtime.c
+ echo >>etc/Renviron.in "TCLLIBPATH=${tk}/lib"
+ echo >>etc/Renviron.in "TZDIR=${tzdata}/share/zoneinfo"
'';
installTargets = [ "install" "install-info" "install-pdf" ];
doCheck = true;
+ preCheck = "bin/Rscript -e 'sessionInfo()'";
enableParallelBuilding = true;
setupHook = ./setup-hook.sh;
- meta = {
+ meta = with stdenv.lib; {
homepage = "http://www.r-project.org/";
description = "Free software environment for statistical computing and graphics";
- license = stdenv.lib.licenses.gpl2Plus;
+ license = licenses.gpl2Plus;
longDescription = ''
GNU R is a language and environment for statistical computing and
@@ -99,9 +92,9 @@ stdenv.mkDerivation rec {
user-defined recursive functions and input and output facilities.
'';
- platforms = stdenv.lib.platforms.all;
- hydraPlatforms = stdenv.lib.platforms.linux;
+ platforms = platforms.all;
+ hydraPlatforms = platforms.linux;
- maintainers = [ stdenv.lib.maintainers.peti ];
+ maintainers = [ maintainers.peti ];
};
}
diff --git a/pkgs/applications/science/math/fricas/default.nix b/pkgs/applications/science/math/fricas/default.nix
index 0dd1222b0965..ccdd666e90bd 100644
--- a/pkgs/applications/science/math/fricas/default.nix
+++ b/pkgs/applications/science/math/fricas/default.nix
@@ -1,11 +1,15 @@
{ stdenv, fetchurl, sbcl, libX11, libXpm, libICE, libSM, libXt, libXau, libXdmcp }:
-stdenv.mkDerivation rec {
- name = "fricas-1.2.2";
+let
+ version = "1.3.1";
+ name = "fricas-" + version;
+in
+stdenv.mkDerivation {
+ inherit name;
src = fetchurl {
- url = "http://sourceforge.net/projects/fricas/files/fricas/1.2.2/${name}-full.tar.bz2";
- sha256 = "87db64a1fd4211f3b776793acea931b4271d2e7a28396414c7d7397d833defe1";
+ url = "http://sourceforge.net/projects/fricas/files/fricas/${version}/${name}-full.tar.bz2";
+ sha256 = "0c2wgj1c3mh5f8msx1ckxpnhm0dyq7dqf1wk6aiyysh8xn57cjkx";
};
buildInputs = [ sbcl libX11 libXpm libICE libSM libXt libXau libXdmcp ];
diff --git a/pkgs/applications/science/math/geogebra/default.nix b/pkgs/applications/science/math/geogebra/default.nix
index 45f8dd1960b7..d37d5c160915 100644
--- a/pkgs/applications/science/math/geogebra/default.nix
+++ b/pkgs/applications/science/math/geogebra/default.nix
@@ -2,13 +2,13 @@
stdenv.mkDerivation rec {
name = "geogebra-${version}";
- version = "5-0-331-0";
+ version = "5-0-350-0";
preferLocalBuild = true;
src = fetchurl {
url = "http://download.geogebra.org/installers/5.0/GeoGebra-Linux-Portable-${version}.tar.bz2";
- sha256 = "135g2xqafgs1gv98vqq2jpfwyi1aflyiynx1gmsgs23jxbr218v2";
+ sha256 = "0lr2calglad5d17p5sl1jbjdfsdsmn4dxgy8s89lyh0d4aihy54d";
};
srcIcon = fetchurl {
diff --git a/pkgs/applications/science/math/ginac/default.nix b/pkgs/applications/science/math/ginac/default.nix
index 9ea43023d57c..ee67af62bb19 100644
--- a/pkgs/applications/science/math/ginac/default.nix
+++ b/pkgs/applications/science/math/ginac/default.nix
@@ -19,7 +19,7 @@ stdenv.mkDerivation rec {
meta = with stdenv.lib; {
description = "GiNaC is Not a CAS";
homepage = http://www.ginac.de/;
- maintainers = with maintainers; [ lovek323 urkud ];
+ maintainers = with maintainers; [ lovek323 ];
platforms = platforms.all;
};
}
diff --git a/pkgs/applications/science/math/maxima/default.nix b/pkgs/applications/science/math/maxima/default.nix
index 85a13f7ac377..5a19f73d9cf9 100644
--- a/pkgs/applications/science/math/maxima/default.nix
+++ b/pkgs/applications/science/math/maxima/default.nix
@@ -57,6 +57,7 @@ stdenv.mkDerivation ({
platforms = stdenv.lib.platforms.unix;
maintainers = [ stdenv.lib.maintainers.peti ];
+ broken = ecl != null;
};
} // (stdenv.lib.optionalAttrs ecl-fasl {
preConfigure = ''
diff --git a/pkgs/applications/science/math/sage/default.nix b/pkgs/applications/science/math/sage/default.nix
index 9e17fe60c295..e6630815ba16 100644
--- a/pkgs/applications/science/math/sage/default.nix
+++ b/pkgs/applications/science/math/sage/default.nix
@@ -1,5 +1,5 @@
-{ stdenv, fetchurl, m4, perl, gfortran, texlive, ffmpeg, tk
-, imagemagick, liblapack, python, openssl, libpng
+{ stdenv, fetchurl, m4, perl, gfortran, texlive, ffmpeg, tk, gnused_422
+, imagemagick, liblapack, python, openssl, libpng
, which
}:
@@ -9,10 +9,11 @@ stdenv.mkDerivation rec {
src = fetchurl {
url = "http://old.files.sagemath.org/src-old/${name}.tar.gz";
sha256 = "102mrzzi215g1xn5zgcv501x9sghwg758jagx2jixvg1rj2jijj9";
+
};
- buildInputs = [ m4 perl gfortran texlive.combined.scheme-basic ffmpeg tk imagemagick liblapack
- python openssl libpng which];
+ buildInputs = [ m4 perl gfortran texlive.combined.scheme-basic ffmpeg gnused_422 tk imagemagick liblapack
+ python openssl libpng which ];
patches = [ ./spkg-singular.patch ./spkg-python.patch ./spkg-git.patch ];
@@ -36,5 +37,6 @@ stdenv.mkDerivation rec {
homepage = "http://www.sagemath.org";
description = "A free open source mathematics software system";
license = stdenv.lib.licenses.gpl2Plus;
+ broken = true;
};
}
diff --git a/pkgs/applications/science/math/singular/default.nix b/pkgs/applications/science/math/singular/default.nix
index 6cd66c62a0ad..9cd72c2fd501 100644
--- a/pkgs/applications/science/math/singular/default.nix
+++ b/pkgs/applications/science/math/singular/default.nix
@@ -44,9 +44,8 @@ stdenv.mkDerivation rec {
meta = with stdenv.lib; {
description = "A CAS for polynomial computations";
- maintainers = with maintainers;
- [ raskin ];
- platforms = platforms.linux;
+ maintainers = with maintainers; [ raskin ];
+ platforms = subtractLists platforms.i686 platforms.linux;
license = licenses.gpl3; # Or GPLv2 at your option - but not GPLv4
homepage = "http://www.singular.uni-kl.de/index.php";
downloadPage = "http://www.mathematik.uni-kl.de/ftp/pub/Math/Singular/SOURCES/";
diff --git a/pkgs/applications/science/math/speedcrunch/default.nix b/pkgs/applications/science/math/speedcrunch/default.nix
index 334423660a03..33de9cd0d975 100644
--- a/pkgs/applications/science/math/speedcrunch/default.nix
+++ b/pkgs/applications/science/math/speedcrunch/default.nix
@@ -31,6 +31,6 @@ stdenv.mkDerivation rec {
'';
maintainers = with maintainers; [ gebner ];
platforms = platforms.all;
+ broken = builtins.compareVersions qtbase.version "5.8.0" >= 0;
};
-
}
diff --git a/pkgs/applications/science/misc/boinc/default.nix b/pkgs/applications/science/misc/boinc/default.nix
index 53ea9ce72125..54be212b86cd 100644
--- a/pkgs/applications/science/misc/boinc/default.nix
+++ b/pkgs/applications/science/misc/boinc/default.nix
@@ -18,10 +18,6 @@ stdenv.mkDerivation rec {
libxcb xcbutil
];
- postConfigure = ''
- sed -i -e s,/etc,$out/etc, client/scripts/Makefile
- '';
-
NIX_LDFLAGS = "-lX11";
preConfigure = ''
diff --git a/pkgs/applications/science/misc/cytoscape/default.nix b/pkgs/applications/science/misc/cytoscape/default.nix
index 3eaf91be58f9..6b13d969bdd7 100644
--- a/pkgs/applications/science/misc/cytoscape/default.nix
+++ b/pkgs/applications/science/misc/cytoscape/default.nix
@@ -17,7 +17,7 @@ stdenv.mkDerivation rec {
ln -s $out/share/cytoscape.sh $out/bin/cytoscape
- wrapProgram $out/share/gen_vmoptions.sh \
+ wrapProgram $out/share/cytoscape.sh \
--set JAVA_HOME "${jre}" \
--set JAVA "${jre}/bin/java"
diff --git a/pkgs/applications/science/misc/golly/beta.nix b/pkgs/applications/science/misc/golly/beta.nix
new file mode 100644
index 000000000000..5fe72e44842d
--- /dev/null
+++ b/pkgs/applications/science/misc/golly/beta.nix
@@ -0,0 +1,59 @@
+{stdenv, fetchurl, fetchgit
+, wxGTK, perl, python2, zlib, mesa, libX11
+, automake, autoconf
+}:
+let
+ s = # Generated upstream information
+ rec {
+ baseName="golly";
+ version="2.8";
+ name="${baseName}-${version}";
+ hash="0a4vn2hm7h4b47v2iwip1z3n9y8isf79v08aipl2iqms2m3p5204";
+ };
+in
+stdenv.mkDerivation rec {
+ name = "golly-${version}";
+ version = "2.8.99.2.20161122";
+ #src = fetchurl {
+ # url="mirror://sourceforge/project/golly/golly/golly-2.8/golly-2.8-src.tar.gz";
+ # sha256="0a4vn2hm7h4b47v2iwip1z3n9y8isf79v08aipl2iqms2m3p5204";
+ #};
+ src = fetchgit {
+ url = "git://git.code.sf.net/p/golly/code";
+ rev = "93495edf3c9639332c6eb43ca7149c69629ee5d8";
+ sha256 = "1j308s9zlqkr3wnl1l32s5zk7r3g4ijwawkkysl8j5ik9sibi2gk";
+ };
+
+ setSourceRoot = ''
+ export sourceRoot="$(echo */gui-wx/configure)"
+ '';
+
+ nativeBuildInputs = [autoconf automake];
+
+ buildInputs = [
+ wxGTK perl python2 zlib mesa libX11
+ ];
+
+ # Link against Python explicitly as it is needed for scripts
+ makeFlags=[
+ "AM_LDFLAGS="
+ ];
+ NIX_LDFLAGS="-lpython${python2.majorVersion} -lperl";
+ preConfigure=''
+ export NIX_LDFLAGS="$NIX_LDFLAGS -L$(dirname "$(find ${perl} -name libperl.so)")"
+ export NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE
+ -DPYTHON_SHLIB=$(basename "$(
+ readlink -f ${python2}/lib/libpython*.so)")"
+
+ sh autogen.sh
+ '';
+
+ meta = {
+ inherit version;
+ description = "Cellular automata simulation program";
+ license = stdenv.lib.licenses.gpl2;
+ maintainers = [stdenv.lib.maintainers.raskin];
+ platforms = stdenv.lib.platforms.linux;
+ downloadPage = "http://sourceforge.net/projects/golly/files/golly";
+ };
+}
diff --git a/pkgs/applications/science/misc/golly/default.upstream b/pkgs/applications/science/misc/golly/default.upstream
index 24032de56684..ab9fb03e7b18 100644
--- a/pkgs/applications/science/misc/golly/default.upstream
+++ b/pkgs/applications/science/misc/golly/default.upstream
@@ -2,3 +2,4 @@ url http://sourceforge.net/projects/golly/files/golly/
version_link '[-][0-9.]+/$'
SF_version_tarball 'src'
SF_redirect
+minimize_overwrite
diff --git a/pkgs/applications/science/misc/gplates/default.nix b/pkgs/applications/science/misc/gplates/default.nix
index 9dd7b6b72db1..05e0091108aa 100644
--- a/pkgs/applications/science/misc/gplates/default.nix
+++ b/pkgs/applications/science/misc/gplates/default.nix
@@ -1,4 +1,5 @@
-{ stdenv, fetchurl, qt4, qwt6_qt4, mesa, glew, gdal_1_11, cgal, proj, boost, cmake, python2, doxygen, graphviz, gmp }:
+{ stdenv, fetchurl, qt4, qwt6_qt4, mesa, glew, gdal_1_11, cgal
+, proj, boost, cmake, python2, doxygen, graphviz, gmp }:
stdenv.mkDerivation rec {
name = "gplates-${version}";
@@ -13,7 +14,10 @@ stdenv.mkDerivation rec {
./boostfix.patch
];
- buildInputs = [ qt4 qwt6_qt4 mesa glew gdal_1_11 cgal proj boost cmake python2 doxygen graphviz gmp ];
+ buildInputs = [
+ qt4 qwt6_qt4 mesa glew gdal_1_11 cgal proj boost cmake python2
+ doxygen graphviz gmp
+ ];
meta = with stdenv.lib; {
description = "Desktop software for the interactive visualisation of plate-tectonics";
diff --git a/pkgs/applications/science/programming/fdr/default.nix b/pkgs/applications/science/programming/fdr/default.nix
new file mode 100644
index 000000000000..a82027a628f3
--- /dev/null
+++ b/pkgs/applications/science/programming/fdr/default.nix
@@ -0,0 +1,69 @@
+{stdenv, fetchurl, qtbase, qtx11extras, ncurses, xorg, zlib, python27Packages}:
+stdenv.mkDerivation {
+ name = "fdr-4.2.0";
+ src = fetchurl {
+ url = https://www.cs.ox.ac.uk/projects/fdr/downloads/fdr-3754-linux-x86_64.tar.gz;
+ sha256 = "d24492485db9b8b95c62c53a6396094f836ee079cfc743688a397503c3ec9bf8";
+ };
+
+ libPath = stdenv.lib.makeLibraryPath [
+ stdenv.cc.cc
+ python27Packages.python
+ qtbase
+ qtx11extras
+ ncurses
+ xorg.libX11
+ xorg.libXft
+ zlib
+ ];
+
+ phases = [ "unpackPhase" "installPhase" ];
+ installPhase = ''
+ mkdir -p "$out"
+
+ # shipped Qt is buggy
+ rm lib/libQt*
+ rm -r lib/qt_plugins
+
+ cp -r * "$out"
+ # Hack around lack of libtinfo in NixOS
+ ln -s ${ncurses.out}/lib/libncursesw.so.6 $out/lib/libtinfo.so.5
+ ln -s ${qtbase.out}/lib/qt5/plugins $out/lib/qt_plugins
+ ln -s ${zlib.out}/lib/libz.so.1 $out/lib/libz.so.1
+
+ for b in fdr4 _fdr4 refines _refines cspmprofiler cspmexplorerprof
+ do
+ patchelf --set-interpreter $(cat $NIX_CC/nix-support/dynamic-linker) \
+ --set-rpath "$libPath:$out/lib" \
+ "$out/bin/$b"
+ done
+
+ for l in corei7/librefines.so \
+ libcspm_process_compiler.so \
+ libcsp_operators.so \
+ _fdr.so \
+ libfdr.so \
+ libfdr_java.so \
+ libprocess_compiler.so \
+ librefines_gui.so \
+ librefines_licensing.so \
+ libboost_date_time.so.1.60.0 \
+ libboost_filesystem.so.1.60.0 \
+ libboost_iostreams.so.1.60.0 \
+ libboost_program_options.so.1.60.0 \
+ libboost_serialization.so.1.60.0 \
+ libboost_system.so.1.60.0
+ do
+ patchelf --set-rpath "$libPath:$out/lib" \
+ "$out/lib/$l"
+ done
+ '';
+
+ meta = with stdenv.lib; {
+ homepage = https://www.cs.ox.ac.uk/projects/fdr/;
+ description = "The CSP refinement checker";
+ license = licenses.unfreeRedistributable;
+ platforms = platforms.linux;
+ maintainers = with maintainers; [ nickhu ];
+ };
+}
diff --git a/pkgs/applications/science/robotics/gazebo/default.nix b/pkgs/applications/science/robotics/gazebo/default.nix
index e8b3bcb16a26..6cefb156d1df 100644
--- a/pkgs/applications/science/robotics/gazebo/default.nix
+++ b/pkgs/applications/science/robotics/gazebo/default.nix
@@ -5,7 +5,7 @@
, pythonPackages, utillinux
# these deps are hidden; cmake doesn't catch them
- , gazeboSimulator, sdformat ? gazeboSimulator.sdformat, curl, tinyxml, kde4, x11
+ , gazeboSimulator, sdformat ? gazeboSimulator.sdformat, curl, tinyxml, qt4, x11
, withIgnitionTransport ? true
, libav, withLibAvSupport ? true
, openal, withAudioSupport ? false
@@ -57,7 +57,7 @@ stdenv.mkDerivation rec {
curl
tinyxml
x11
- kde4.qt4
+ qt4
] ++ optional stdenv.isLinux utillinux # on Linux needs uuid/uuid.h
++ optional withDocs doxygen
++ optional withLibAvSupport libav #TODO: package rubygem-ronn and put it here
diff --git a/pkgs/applications/science/robotics/qgroundcontrol/default.nix b/pkgs/applications/science/robotics/qgroundcontrol/default.nix
index 4222336fe9b2..e323b42d7ae6 100644
--- a/pkgs/applications/science/robotics/qgroundcontrol/default.nix
+++ b/pkgs/applications/science/robotics/qgroundcontrol/default.nix
@@ -2,7 +2,7 @@
, qtbase, qtlocation, qtserialport, qtdeclarative, qtconnectivity, qtxmlpatterns
, qtsvg, qtquick1, qtquickcontrols, qtgraphicaleffects, qmakeHook
, makeQtWrapper, lndir
- , gst_all_1, qt_gstreamer1, pkgconfig, glibc
+ , gst_all_1, qt-gstreamer1, pkgconfig, glibc
, version ? "2.9.4"
}:
@@ -89,5 +89,6 @@ stdenv.mkDerivation rec {
license = stdenv.lib.licenses.gpl3Plus;
platforms = with stdenv.lib.platforms; linux;
maintainers = with stdenv.lib.maintainers; [ pxc ];
+ broken = true; # relies improperly on private Qt 5.5 headers
};
}
diff --git a/pkgs/applications/search/recoll/default.nix b/pkgs/applications/search/recoll/default.nix
index 345b1341c0f4..649b34e75692 100644
--- a/pkgs/applications/search/recoll/default.nix
+++ b/pkgs/applications/search/recoll/default.nix
@@ -7,16 +7,14 @@
assert stdenv.system != "powerpc-linux";
stdenv.mkDerivation rec {
- ver = "1.21.3";
+ ver = "1.23.1";
name = "recoll-${ver}";
src = fetchurl {
url = "http://www.lesbonscomptes.com/recoll/${name}.tar.gz";
- sha256 = "66f039f08b149d5e4840664d4a636f6b55145b02072f87aab83282ebe0cd593a";
+ sha256 = "0si407qm47ndy0l6zv57lqb5za4aiv0lyghnzb211g03szjkfpg8";
};
- patches = [ ./nodeblayout.patch ./versionawk.patch ];
-
configureFlags = [ "--with-inotify" ];
buildInputs = [ qt4 xapian file python bison];
@@ -61,6 +59,6 @@ stdenv.mkDerivation rec {
homepage = http://www.lesbonscomptes.com/recoll/;
license = licenses.gpl2;
platforms = platforms.unix;
- maintainers = with maintainers; [ jcumming ];
+ maintainers = [ maintainers.jcumming ];
};
}
diff --git a/pkgs/applications/version-management/git-and-tools/default.nix b/pkgs/applications/version-management/git-and-tools/default.nix
index d68b1e41c8d5..281a39149867 100644
--- a/pkgs/applications/version-management/git-and-tools/default.nix
+++ b/pkgs/applications/version-management/git-and-tools/default.nix
@@ -58,12 +58,16 @@ rec {
git-crypt = callPackage ./git-crypt { };
+ git-dit = callPackage ./git-dit { };
+
git-extras = callPackage ./git-extras { };
git-hub = callPackage ./git-hub { };
git-imerge = callPackage ./git-imerge { };
+ git-octopus = callPackage ./git-octopus { };
+
git-radar = callPackage ./git-radar { };
git-remote-hg = callPackage ./git-remote-hg { };
diff --git a/pkgs/applications/version-management/git-and-tools/diff-so-fancy/default.nix b/pkgs/applications/version-management/git-and-tools/diff-so-fancy/default.nix
index aa4b83c59b59..3b1837d16f1b 100644
--- a/pkgs/applications/version-management/git-and-tools/diff-so-fancy/default.nix
+++ b/pkgs/applications/version-management/git-and-tools/diff-so-fancy/default.nix
@@ -2,18 +2,18 @@
stdenv.mkDerivation rec {
name = "diff-so-fancy-${version}";
- version = "0.11.1";
-
- # perl is needed here so patchShebangs can do its job
- buildInputs = [perl makeWrapper];
+ version = "0.11.4";
src = fetchFromGitHub {
owner = "so-fancy";
repo = "diff-so-fancy";
rev = "v${version}";
- sha256 = "1dw32c5i9mry6zr2a6h1369fhp1qbqimx04qgdmdnmn1imyck1h3";
+ sha256 = "1za2rm8jzcdc6bkpl198nrqf5bc05nw53vlkk15nmmb9snnb69ig";
};
+ # Perl is needed here for patchShebangs
+ nativeBuildInputs = [ perl makeWrapper ];
+
buildPhase = null;
installPhase = ''
@@ -34,16 +34,14 @@ stdenv.mkDerivation rec {
--prefix PATH : "${ncurses.out}/bin"
'';
- meta = {
+ meta = with stdenv.lib; {
homepage = https://github.com/so-fancy/diff-so-fancy;
description = "Good-looking diffs filter for git";
- license = stdenv.lib.licenses.mit;
-
+ license = licenses.mit;
+ platforms = platforms.all;
longDescription = ''
diff-so-fancy builds on the good-lookin' output of git contrib's
diff-highlight to upgrade your diffs' appearances.
'';
-
- platforms = stdenv.lib.platforms.all;
};
}
diff --git a/pkgs/applications/version-management/git-and-tools/git-cola/default.nix b/pkgs/applications/version-management/git-and-tools/git-cola/default.nix
index cf7f6b82ce2a..2a9ea0715e03 100644
--- a/pkgs/applications/version-management/git-and-tools/git-cola/default.nix
+++ b/pkgs/applications/version-management/git-and-tools/git-cola/default.nix
@@ -1,33 +1,21 @@
-{ stdenv, fetchurl, pythonPackages, makeWrapper, gettext, git }:
+{ stdenv, fetchFromGitHub, pythonPackages, makeWrapper, gettext, git }:
let
inherit (pythonPackages) buildPythonApplication pyqt4 sip pyinotify python mock;
in buildPythonApplication rec {
name = "git-cola-${version}";
- version = "2.8";
+ version = "2.10";
- src = fetchurl {
- url = "https://github.com/git-cola/git-cola/archive/v${version}.tar.gz";
- sha256 = "19ff7i0h5fznrkm17lp3xkxwkq27whhiil6y6bm16b1wny5hjqlr";
+ src = fetchFromGitHub {
+ owner = "git-cola";
+ repo = "git-cola";
+ rev = "v${version}";
+ sha256 = "067g0yya6718kxagf5qm59zizp0lizca4m3ih85y732i6rqpgwv8";
};
- buildInputs = [ git makeWrapper gettext ];
+ buildInputs = [ git gettext ];
propagatedBuildInputs = [ pyqt4 sip pyinotify ];
- # HACK: wrapPythonPrograms adds 'import sys; sys.argv[0] = "git-cola"', but
- # "import __future__" must be placed above that. This removes the argv[0] line.
- postFixup = ''
- wrapPythonPrograms
-
- sed -i "$out/bin/.git-dag-wrapped" -e '{
- /import sys; sys.argv/d
- }'
-
- sed -i "$out/bin/.git-cola-wrapped" -e '{
- /import sys; sys.argv/d
- }'
- '';
-
doCheck = false;
meta = with stdenv.lib; {
diff --git a/pkgs/applications/version-management/git-and-tools/git-dit/default.nix b/pkgs/applications/version-management/git-and-tools/git-dit/default.nix
new file mode 100644
index 000000000000..a4b552bcca37
--- /dev/null
+++ b/pkgs/applications/version-management/git-and-tools/git-dit/default.nix
@@ -0,0 +1,46 @@
+{ stdenv, fetchFromGitHub, pandoc }:
+
+stdenv.mkDerivation rec {
+ name = "git-dit-${version}";
+ version = "0.1.0";
+
+ buildInputs = [ pandoc ];
+
+ src = fetchFromGitHub {
+ owner = "neithernut";
+ repo = "git-dit";
+ rev = "v${version}";
+ sha256 = "1rvp2dhnb8yqrracvfpvf8z1vz4fs0rii18hhrskr6n1sfd7x9kd";
+ };
+
+ # the Makefile doesn’t work, we emulate it below
+ dontBuild = true;
+
+ postPatch = ''
+ # resolve binaries to the right path
+ sed -e "s|exec git-dit-|exec $out/bin/git-dit-|" -i git-dit
+
+ # we change every git dit command to the local subcommand path
+ # (git dit foo -> /nix/store/…-git-dit/bin/git-dit-foo)
+ for script in git-dit-*; do
+ sed -e "s|git dit |$out/bin/git-dit-|g" -i "$script"
+ done
+ '';
+
+ installPhase = ''
+ mkdir -p $out/{bin,share/man/man1}
+ # from the Makefile
+ ${stdenv.lib.getBin pandoc}/bin/pandoc -s -t man git-dit.1.md \
+ -o $out/share/man/man1/git-dit.1
+ cp git-dit* $out/bin
+ '';
+
+ meta = with stdenv.lib; {
+ inherit (src.meta) homepage;
+ description = "Decentralized Issue Tracking for git";
+ license = licenses.gpl2;
+ maintainers = with maintainers; [ profpatsch matthiasbeyer ];
+ };
+
+
+}
diff --git a/pkgs/applications/version-management/git-and-tools/git-imerge/default.nix b/pkgs/applications/version-management/git-and-tools/git-imerge/default.nix
index 91180b33cde9..49856552aa3b 100644
--- a/pkgs/applications/version-management/git-and-tools/git-imerge/default.nix
+++ b/pkgs/applications/version-management/git-and-tools/git-imerge/default.nix
@@ -1,22 +1,20 @@
-{ stdenv, fetchurl, pythonPackages }:
+{ stdenv, fetchFromGitHub, pythonPackages }:
stdenv.mkDerivation rec {
name = "git-imerge-${version}";
- version = "0.7.0";
+ version = "1.0.0";
- src = fetchurl {
- url = "https://github.com/mhagger/git-imerge/archive/${version}.tar.gz";
- sha256 = "00nwn3rfhf15wsv01lfji5412d7yz827ric916lnyp662d6gx206";
+ src = fetchFromGitHub {
+ owner = "mhagger";
+ repo = "git-imerge";
+ rev = "v${version}";
+ sha256 = "1ylzxmbjfrzzxmcrbqzy1wv21npqj1r6cgl77a9n2zvsrz8zdb74";
};
buildInputs = [ pythonPackages.python pythonPackages.wrapPython ];
- installPhase = ''
- mkdir -p $out/bin
- make install PREFIX=$out
- wrapPythonPrograms
- '';
-
+ makeFlags = "PREFIX= DESTDIR=$(out)" ;
+
meta = with stdenv.lib; {
homepage = https://github.com/mhagger/git-imerge;
description = "Perform a merge between two branches incrementally";
diff --git a/pkgs/applications/version-management/git-and-tools/git-octopus/default.nix b/pkgs/applications/version-management/git-and-tools/git-octopus/default.nix
new file mode 100644
index 000000000000..f8d871bdcf30
--- /dev/null
+++ b/pkgs/applications/version-management/git-and-tools/git-octopus/default.nix
@@ -0,0 +1,34 @@
+{ stdenv, fetchFromGitHub, git, perl, makeWrapper }:
+
+with stdenv.lib;
+
+stdenv.mkDerivation rec {
+ name = "git-octopus-${version}";
+ version = "1.4";
+
+ installFlags = [ "prefix=$(out)" ];
+
+ buildInputs = [ makeWrapper ];
+
+ # perl provides shasum
+ postInstall = ''
+ for f in $out/bin/*; do
+ wrapProgram $f --prefix PATH : ${makeBinPath [ git perl ]}
+ done
+ '';
+
+ src = fetchFromGitHub {
+ owner = "lesfurets";
+ repo = "git-octopus";
+ rev = "v${version}";
+ sha256 = "14p61xk7jankp6gc26xciag9fnvm7r9vcbhclcy23f4ghf4q4sj1";
+ };
+
+ meta = {
+ homepage = https://github.com/lesfurets/git-octopus;
+ description = "The continuous merge workflow";
+ license = licenses.lgpl3;
+ platforms = platforms.unix;
+ maintainers = [maintainers.mic92];
+ };
+}
diff --git a/pkgs/applications/version-management/git-and-tools/git-radar/default.nix b/pkgs/applications/version-management/git-and-tools/git-radar/default.nix
index f61f9fe6d2af..3b10c3305efc 100644
--- a/pkgs/applications/version-management/git-and-tools/git-radar/default.nix
+++ b/pkgs/applications/version-management/git-and-tools/git-radar/default.nix
@@ -2,7 +2,7 @@
stdenv.mkDerivation rec {
name = "git-radar-${version}";
- version = "0.3.2";
+ version = "0.5";
phases = [ "unpackPhase" "installPhase" ];
@@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
owner = "michaeldfallen";
repo = "git-radar";
rev = "v${version}";
- sha256 = "1028462b4kqxx66vjv7r8nnr6bi3kw11fixpqyg2srqriha6447p";
+ sha256 = "1915aqx8bfc4xmvhx2gfxv72p969a6rn436kii9w4yi38hibmqv9";
};
installPhase = ''
@@ -24,7 +24,7 @@ stdenv.mkDerivation rec {
meta = with stdenv.lib; {
homepage = https://github.com/michaeldfallen/git-radar;
license = licenses.mit;
- description = "Git-radar is a tool you can add to your prompt to provide at-a-glance information on your git repo";
+ description = "A tool you can add to your prompt to provide at-a-glance information on your git repo";
platforms = with platforms; linux ++ darwin;
maintainers = with maintainers; [ kamilchm ];
};
diff --git a/pkgs/applications/version-management/git-and-tools/git/default.nix b/pkgs/applications/version-management/git-and-tools/git/default.nix
index c93015678e27..e1e01c1ed287 100644
--- a/pkgs/applications/version-management/git-and-tools/git/default.nix
+++ b/pkgs/applications/version-management/git-and-tools/git/default.nix
@@ -11,7 +11,7 @@
}:
let
- version = "2.11.1";
+ version = "2.12.2";
svn = subversionClient.override { perlBindings = true; };
in
@@ -20,7 +20,7 @@ stdenv.mkDerivation {
src = fetchurl {
url = "https://www.kernel.org/pub/software/scm/git/git-${version}.tar.xz";
- sha256 = "05b4jw86w77c3pyh3nm6aw31vhxwzvhnx2x0bcfqmm15wg57k9y0";
+ sha256 = "0jlccxx7l4c76h830y8lhrxr4kqksrxqlnmj3xb8sqbfa0irw6nj";
};
hardeningDisable = [ "format" ];
@@ -30,7 +30,6 @@ stdenv.mkDerivation {
./symlinks-in-bin.patch
./git-sh-i18n.patch
./ssh-path.patch
- ./ssl-cert-file.patch
];
postPatch = ''
diff --git a/pkgs/applications/version-management/git-and-tools/git/ssl-cert-file.patch b/pkgs/applications/version-management/git-and-tools/git/ssl-cert-file.patch
deleted file mode 100644
index bafd65e8c93e..000000000000
--- a/pkgs/applications/version-management/git-and-tools/git/ssl-cert-file.patch
+++ /dev/null
@@ -1,11 +0,0 @@
-diff -ru git-2.7.4-orig/http.c git-2.7.4/http.c
---- git-2.7.4-orig/http.c 2016-03-17 21:47:59.000000000 +0100
-+++ git-2.7.4/http.c 2016-04-12 11:38:33.187070848 +0200
-@@ -544,6 +544,7 @@
- #if LIBCURL_VERSION_NUM >= 0x070908
- set_from_env(&ssl_capath, "GIT_SSL_CAPATH");
- #endif
-+ set_from_env(&ssl_cainfo, "SSL_CERT_FILE");
- set_from_env(&ssl_cainfo, "GIT_SSL_CAINFO");
-
- set_from_env(&user_agent, "GIT_HTTP_USER_AGENT");
diff --git a/pkgs/applications/version-management/git-and-tools/gitflow/default.nix b/pkgs/applications/version-management/git-and-tools/gitflow/default.nix
index 3d411a183245..a6ac19583858 100644
--- a/pkgs/applications/version-management/git-and-tools/gitflow/default.nix
+++ b/pkgs/applications/version-management/git-and-tools/gitflow/default.nix
@@ -1,4 +1,6 @@
-{ stdenv, fetchFromGitHub }:
+{ pkgs, stdenv, fetchFromGitHub }:
+
+with pkgs.lib;
stdenv.mkDerivation rec {
pname = "gitflow";
@@ -12,10 +14,17 @@ stdenv.mkDerivation rec {
sha256 = "1i8bwi83qcqvi8zrkjn4mp2v8v7y11fd520wpg2jgy5hqyz34chg";
};
+ buildInputs = optionals (stdenv.isDarwin) [ pkgs.makeWrapper ];
+
preBuild = ''
makeFlagsArray+=(prefix="$out")
'';
+ postInstall = optional (stdenv.isDarwin) ''
+ wrapProgram $out/bin/git-flow \
+ --set FLAGS_GETOPT_CMD ${pkgs.getopt}/bin/getopt
+ '';
+
meta = with stdenv.lib; {
homepage = https://github.com/petervanderdoes/gitflow;
description = "Extend git with the Gitflow branching model";
diff --git a/pkgs/applications/version-management/git-and-tools/subgit/default.nix b/pkgs/applications/version-management/git-and-tools/subgit/default.nix
index 0774bbc9a624..7b36a142d15d 100644
--- a/pkgs/applications/version-management/git-and-tools/subgit/default.nix
+++ b/pkgs/applications/version-management/git-and-tools/subgit/default.nix
@@ -1,7 +1,7 @@
{ stdenv, fetchurl, unzip, makeWrapper, jre }:
-stdenv.mkDerivation {
- name = "subgit-3.1.0";
+stdenv.mkDerivation rec {
+ name = "subgit-3.2.4";
meta = {
description = "A tool for a smooth, stress-free SVN to Git migration";
@@ -11,7 +11,7 @@ stdenv.mkDerivation {
platforms = stdenv.lib.platforms.all;
};
- buildInputs = [ unzip makeWrapper ];
+ nativeBuildInputs = [ unzip makeWrapper ];
installPhase = ''
mkdir $out;
@@ -20,7 +20,7 @@ stdenv.mkDerivation {
'';
src = fetchurl {
- url = http://old.subgit.com/download/subgit-3.1.0.zip;
- sha256 = "08qhpg6y2ziwplm0z1ghh1wfp607sw4hyb53a7qzfn759j5kcdrg";
+ url = "http://subgit.com/download/${name}.zip";
+ sha256 = "13r6hi2zk46bs3j17anfc85kszlwliv2yc16qx834b3v4w68hajw";
};
-}
\ No newline at end of file
+}
diff --git a/pkgs/applications/version-management/git-and-tools/transcrypt/default.nix b/pkgs/applications/version-management/git-and-tools/transcrypt/default.nix
index 36d81ae9c441..6238cf9c9754 100644
--- a/pkgs/applications/version-management/git-and-tools/transcrypt/default.nix
+++ b/pkgs/applications/version-management/git-and-tools/transcrypt/default.nix
@@ -2,13 +2,13 @@
stdenv.mkDerivation rec {
name = "transcrypt-${version}";
- version = "1.0.1";
+ version = "1.0.2";
src = fetchFromGitHub {
owner = "elasticdog";
repo = "transcrypt";
rev = "v${version}";
- sha256 = "12n8714my9i93lysqa3dj1z5xgi10iv5y1mnsqki9zn5av3lgqkq";
+ sha256 = "05q0rgcsphrkavmcsm3qghsl1pkgshvhdf6zpwkn1qcj288h8gkc";
};
buildInputs = [ git makeWrapper openssl ];
diff --git a/pkgs/applications/version-management/gitkraken/default.nix b/pkgs/applications/version-management/gitkraken/default.nix
new file mode 100644
index 000000000000..b02da41f9d62
--- /dev/null
+++ b/pkgs/applications/version-management/gitkraken/default.nix
@@ -0,0 +1,99 @@
+{ stdenv, lib, libXcomposite, libgnome_keyring, makeWrapper, udev, curl, alsaLib
+, libXfixes, atk, gtk2, libXrender, pango, gnome2, cairo, freetype, fontconfig
+, libX11, libXi, libXext, libXcursor, glib, libXScrnSaver, libxkbfile, libXtst
+, nss, nspr, cups, fetchurl, expat, gdk_pixbuf, libXdamage, libXrandr, dbus
+, dpkg, makeDesktopItem
+}:
+
+with stdenv.lib;
+
+stdenv.mkDerivation rec {
+ name = "gitkraken-${version}";
+ version = "2.3.3";
+
+ src = fetchurl {
+ url = "https://release.gitkraken.com/linux/v${version}.deb";
+ sha256 = "a6e235ab1a4c1da755af8218ad819fcac6bc89b1a324aa2c0e430f3805cb1a16";
+ };
+
+ libPath = makeLibraryPath [
+ stdenv.cc.cc.lib
+ curl
+ udev
+ libX11
+ libXext
+ libXcursor
+ libXi
+ glib
+ libXScrnSaver
+ libxkbfile
+ libXtst
+ nss
+ nspr
+ cups
+ alsaLib
+ expat
+ gdk_pixbuf
+ dbus
+ libXdamage
+ libXrandr
+ atk
+ pango
+ cairo
+ freetype
+ fontconfig
+ libXcomposite
+ libXfixes
+ libXrender
+ gtk2
+ gnome2.GConf
+ libgnome_keyring
+ ];
+
+ nativeBuildInputs = [ makeWrapper ];
+
+ dontBuild = true;
+
+ desktopItem = makeDesktopItem {
+ name = "gitkraken";
+ exec = "gitkraken";
+ icon = "app";
+ desktopName = "GitKraken";
+ genericName = "Git Client";
+ categories = "Application;Development;";
+ comment = "Graphical Git client from Axosoft";
+ };
+
+ buildInputs = [ dpkg ];
+
+ unpackPhase = "dpkg-deb -x $src .";
+
+ installPhase = ''
+ mkdir -p "$out/opt/gitkraken"
+ cp -r usr/share/gitkraken/* "$out/opt/gitkraken"
+
+ mkdir -p "$out/share/applications"
+ cp $desktopItem/share/applications/* "$out/share/applications"
+
+ mkdir -p "$out/share/pixmaps"
+ cp usr/share/pixmaps/app.png "$out/share/pixmaps"
+ '';
+
+ postFixup = ''
+ patchelf --set-interpreter $(cat $NIX_CC/nix-support/dynamic-linker) \
+ --set-rpath "$libPath:$out/opt/gitkraken" "$out/opt/gitkraken/gitkraken"
+ wrapProgram $out/opt/gitkraken/gitkraken \
+ --prefix LD_PRELOAD : "${makeLibraryPath [ curl ]}/libcurl.so.4" \
+ --prefix LD_PRELOAD : "${makeLibraryPath [ libgnome_keyring ]}/libgnome-keyring.so.0"
+ mkdir "$out/bin"
+ ln -s "$out/opt/gitkraken/gitkraken" "$out/bin/gitkraken"
+ '';
+
+ meta = {
+ homepage = https://www.gitkraken.com/;
+ description = "The downright luxurious and most popular Git client for Windows, Mac & Linux";
+ license = licenses.unfree;
+ platforms = platforms.linux;
+ maintainers = with maintainers; [ xnwdd ];
+ };
+}
diff --git a/pkgs/applications/version-management/gitlab/Gemfile b/pkgs/applications/version-management/gitlab/Gemfile
index 6d6564ea5f9b..db1ac67a6667 100644
--- a/pkgs/applications/version-management/gitlab/Gemfile
+++ b/pkgs/applications/version-management/gitlab/Gemfile
@@ -7,7 +7,6 @@ gem 'rails-deprecated_sanitizer', '~> 1.0.3'
gem 'responders', '~> 2.0'
gem 'sprockets', '~> 3.7.0'
-gem 'sprockets-es6', '~> 0.9.2'
# Default values for AR models
gem 'default_value_for', '~> 3.0.0'
@@ -36,7 +35,7 @@ gem 'omniauth-twitter', '~> 1.2.0'
gem 'omniauth_crowd', '~> 2.2.0'
gem 'omniauth-authentiq', '~> 0.2.0'
gem 'rack-oauth2', '~> 1.2.1'
-gem 'jwt'
+gem 'jwt', '~> 1.5.6'
# Spam and anti-bot protection
gem 'recaptcha', '~> 3.0', require: 'recaptcha/rails'
@@ -48,6 +47,9 @@ gem 'rqrcode-rails3', '~> 0.1.7'
gem 'attr_encrypted', '~> 3.0.0'
gem 'u2f', '~> 0.2.1'
+# GitLab Pages
+gem 'validates_hostname', '~> 1.0.6'
+
# Browser detection
gem 'browser', '~> 2.2'
@@ -109,7 +111,7 @@ gem 'org-ruby', '~> 0.9.12'
gem 'creole', '~> 0.5.0'
gem 'wikicloth', '0.8.1'
gem 'asciidoctor', '~> 1.5.2'
-gem 'asciidoctor-plantuml', '0.0.6'
+gem 'asciidoctor-plantuml', '0.0.7'
gem 'rouge', '~> 2.0'
gem 'truncato', '~> 0.7.8'
@@ -219,10 +221,12 @@ gem 'oj', '~> 2.17.4'
gem 'chronic', '~> 0.10.2'
gem 'chronic_duration', '~> 0.10.6'
+gem 'webpack-rails', '~> 0.9.9'
+gem 'rack-proxy', '~> 0.6.0'
+
gem 'sass-rails', '~> 5.0.6'
gem 'coffee-rails', '~> 4.1.0'
gem 'uglifier', '~> 2.7.2'
-gem 'gitlab-turbolinks-classic', '~> 2.5', '>= 2.5.6'
gem 'addressable', '~> 2.3.8'
gem 'bootstrap-sass', '~> 3.3.0'
@@ -280,6 +284,7 @@ group :development, :test do
gem 'rspec-retry', '~> 0.4.5'
gem 'spinach-rails', '~> 0.2.1'
gem 'spinach-rerun-reporter', '~> 0.0.2'
+ gem 'rspec_profiling'
# Prevent occasions where minitest is not bundled in packaged versions of ruby (see #3826)
gem 'minitest', '~> 5.7.0'
@@ -291,13 +296,9 @@ group :development, :test do
gem 'capybara-screenshot', '~> 1.0.0'
gem 'poltergeist', '~> 1.9.0'
- gem 'teaspoon', '~> 1.1.0'
- gem 'teaspoon-jasmine', '~> 2.2.0'
-
gem 'spring', '~> 1.7.0'
gem 'spring-commands-rspec', '~> 1.0.4'
gem 'spring-commands-spinach', '~> 1.1.0'
- gem 'spring-commands-teaspoon', '~> 0.0.2'
gem 'rubocop', '~> 0.46.0', require: false
gem 'rubocop-rspec', '~> 1.9.1', require: false
diff --git a/pkgs/applications/version-management/gitlab/Gemfile.lock b/pkgs/applications/version-management/gitlab/Gemfile.lock
index 80cdf9d3258d..1916267bb89b 100644
--- a/pkgs/applications/version-management/gitlab/Gemfile.lock
+++ b/pkgs/applications/version-management/gitlab/Gemfile.lock
@@ -56,7 +56,7 @@ GEM
faraday_middleware-multi_json (~> 0.0)
oauth2 (~> 1.0)
asciidoctor (1.5.3)
- asciidoctor-plantuml (0.0.6)
+ asciidoctor-plantuml (0.0.7)
asciidoctor (~> 1.5)
ast (2.3.0)
attr_encrypted (3.0.3)
@@ -74,10 +74,6 @@ GEM
descendants_tracker (~> 0.0.4)
ice_nine (~> 0.11.0)
thread_safe (~> 0.3, >= 0.3.1)
- babel-source (5.8.35)
- babel-transpiler (0.7.0)
- babel-source (>= 4.0, < 6)
- execjs (~> 2.0)
babosa (1.0.2)
base32 (0.3.2)
bcrypt (3.1.11)
@@ -268,8 +264,6 @@ GEM
mime-types (>= 1.16, < 3)
posix-spawn (~> 0.3)
gitlab-markup (1.5.1)
- gitlab-turbolinks-classic (2.5.6)
- coffee-rails
gitlab_omniauth-ldap (1.2.1)
net-ldap (~> 0.9)
omniauth (~> 1.0)
@@ -381,7 +375,7 @@ GEM
json (1.8.3)
json-schema (2.6.2)
addressable (~> 2.3.8)
- jwt (1.5.4)
+ jwt (1.5.6)
kaminari (0.17.0)
actionpack (>= 3.0.0)
activesupport (>= 3.0.0)
@@ -550,6 +544,8 @@ GEM
rack (>= 1.1)
rack-protection (1.5.3)
rack
+ rack-proxy (0.6.0)
+ rack
rack-test (0.6.3)
rack (>= 1.0)
rails (4.2.7.1)
@@ -644,6 +640,11 @@ GEM
rspec-retry (0.4.5)
rspec-core
rspec-support (3.5.0)
+ rspec_profiling (0.0.4)
+ activerecord
+ pg
+ rails
+ sqlite3
rubocop (0.46.0)
parser (>= 2.3.1.1, < 3.0)
powerpack (~> 0.1)
@@ -662,7 +663,7 @@ GEM
sexp_processor (~> 4.1)
rubyntlm (0.5.2)
rubypants (0.2.0)
- rubyzip (1.2.0)
+ rubyzip (1.2.1)
rufus-scheduler (3.1.10)
rugged (0.24.0)
safe_yaml (1.0.4)
@@ -732,19 +733,14 @@ GEM
spring (>= 0.9.1)
spring-commands-spinach (1.1.0)
spring (>= 0.9.1)
- spring-commands-teaspoon (0.0.2)
- spring (>= 0.9.1)
sprockets (3.7.0)
concurrent-ruby (~> 1.0)
rack (> 1, < 3)
- sprockets-es6 (0.9.2)
- babel-source (>= 5.8.11)
- babel-transpiler
- sprockets (>= 3.0.0)
sprockets-rails (3.1.1)
actionpack (>= 4.0)
activesupport (>= 4.0)
sprockets (>= 3.0.0)
+ sqlite3 (1.3.11)
stackprof (0.2.10)
state_machines (0.4.0)
state_machines-activemodel (0.4.0)
@@ -757,10 +753,6 @@ GEM
sys-filesystem (1.1.6)
ffi
sysexits (1.2.0)
- teaspoon (1.1.5)
- railties (>= 3.2.5, < 6)
- teaspoon-jasmine (2.2.0)
- teaspoon (>= 1.0.0)
temple (0.7.7)
test_after_commit (1.1.0)
activerecord (>= 3.2)
@@ -795,6 +787,9 @@ GEM
get_process_mem (~> 0)
unicorn (>= 4, < 6)
uniform_notifier (1.10.0)
+ validates_hostname (1.0.6)
+ activerecord (>= 3.0)
+ activesupport (>= 3.0)
version_sorter (2.1.0)
virtus (1.0.5)
axiom-types (~> 0.1)
@@ -812,6 +807,8 @@ GEM
webmock (1.21.0)
addressable (>= 2.3.6)
crack (>= 0.3.2)
+ webpack-rails (0.9.9)
+ rails (>= 3.2.0)
websocket-driver (0.6.3)
websocket-extensions (>= 0.1.0)
websocket-extensions (0.1.2)
@@ -838,7 +835,7 @@ DEPENDENCIES
allocations (~> 1.0)
asana (~> 0.4.0)
asciidoctor (~> 1.5.2)
- asciidoctor-plantuml (= 0.0.6)
+ asciidoctor-plantuml (= 0.0.7)
attr_encrypted (~> 3.0.0)
awesome_print (~> 1.2.0)
babosa (~> 1.0.2)
@@ -888,7 +885,6 @@ DEPENDENCIES
github-linguist (~> 4.7.0)
gitlab-flowdock-git-hook (~> 1.0.1)
gitlab-markup (~> 1.5.1)
- gitlab-turbolinks-classic (~> 2.5, >= 2.5.6)
gitlab_omniauth-ldap (~> 1.2.1)
gollum-lib (~> 4.2)
gollum-rugged_adapter (~> 0.4.2)
@@ -909,7 +905,7 @@ DEPENDENCIES
jquery-rails (~> 4.1.0)
jquery-ui-rails (~> 5.0.0)
json-schema (~> 2.6.2)
- jwt
+ jwt (~> 1.5.6)
kaminari (~> 0.17.0)
knapsack (~> 1.11.0)
kubeclient (~> 2.2.0)
@@ -952,6 +948,7 @@ DEPENDENCIES
rack-attack (~> 4.4.1)
rack-cors (~> 0.4.0)
rack-oauth2 (~> 1.2.1)
+ rack-proxy (~> 0.6.0)
rails (= 4.2.7.1)
rails-deprecated_sanitizer (~> 1.0.3)
rainbow (~> 2.1.0)
@@ -968,6 +965,7 @@ DEPENDENCIES
rqrcode-rails3 (~> 0.1.7)
rspec-rails (~> 3.5.0)
rspec-retry (~> 0.4.5)
+ rspec_profiling
rubocop (~> 0.46.0)
rubocop-rspec (~> 1.9.1)
ruby-fogbugz (~> 0.2.1)
@@ -992,15 +990,11 @@ DEPENDENCIES
spring (~> 1.7.0)
spring-commands-rspec (~> 1.0.4)
spring-commands-spinach (~> 1.1.0)
- spring-commands-teaspoon (~> 0.0.2)
sprockets (~> 3.7.0)
- sprockets-es6 (~> 0.9.2)
stackprof (~> 0.2.10)
state_machines-activerecord (~> 0.4.0)
sys-filesystem (~> 1.1.6)
- teaspoon (~> 1.1.0)
- teaspoon-jasmine (~> 2.2.0)
- test_after_commit (~> 0.4.2)
+ test_after_commit (~> 1.1)
thin (~> 1.7.0)
timecop (~> 0.8.0)
truncato (~> 0.7.8)
@@ -1010,12 +1004,14 @@ DEPENDENCIES
unf (~> 0.1.4)
unicorn (~> 5.1.0)
unicorn-worker-killer (~> 0.4.4)
+ validates_hostname (~> 1.0.6)
version_sorter (~> 2.1.0)
virtus (~> 1.0.1)
vmstat (~> 2.3.0)
web-console (~> 2.0)
webmock (~> 1.21.0)
+ webpack-rails (~> 0.9.9)
wikicloth (= 0.8.1)
BUNDLED WITH
- 1.13.7
+ 1.14.5
diff --git a/pkgs/applications/version-management/gitlab/default.nix b/pkgs/applications/version-management/gitlab/default.nix
index 23100a85e7eb..442edc04fa27 100644
--- a/pkgs/applications/version-management/gitlab/default.nix
+++ b/pkgs/applications/version-management/gitlab/default.nix
@@ -1,5 +1,5 @@
-{ stdenv, lib, bundler, fetchFromGitHub, bundlerEnv, libiconv, ruby
-, tzdata, git, nodejs, procps
+{ stdenv, lib, bundler, fetchurl, fetchFromGitHub, bundlerEnv, libiconv, ruby
+, tzdata, git, nodejs, procps, dpkg
}:
/* When updating the Gemfile add `gem "activerecord-nulldb-adapter"`
@@ -18,19 +18,27 @@ let
};
};
+ version = "8.17.5";
+
+ gitlabDeb = fetchurl {
+ url = "https://packages.gitlab.com/gitlab/gitlab-ce/packages/debian/jessie/gitlab-ce_${version}-ce.0_amd64.deb/download";
+ sha256 = "1ga5ki1bh66sdk5yizjy0dqcg85hrzkdp0ag3si942yv28sjy1xk";
+ };
+
in
stdenv.mkDerivation rec {
name = "gitlab-${version}";
- version = "8.16.4";
- buildInputs = [ env ruby bundler tzdata git nodejs procps ];
+ buildInputs = [
+ env ruby bundler tzdata git nodejs procps dpkg
+ ];
src = fetchFromGitHub {
owner = "gitlabhq";
repo = "gitlabhq";
rev = "v${version}";
- sha256 = "118p3c9i9r2acc0yv5jzw9p7hql5pbp37k54qzrfgrs8vjjxi14i";
+ sha256 = "0wvszxm28c80qwx6np5mi36saxzzg4n7jcp4ckvhhr3jvczn9m8g";
};
patches = [
@@ -64,9 +72,15 @@ stdenv.mkDerivation rec {
buildPhase = ''
mv config/gitlab.yml.example config/gitlab.yml
- GITLAB_DATABASE_ADAPTER=nulldb \
- SKIP_STORAGE_VALIDATION=true \
- rake assets:precompile RAILS_ENV=production
+
+ dpkg -x ${gitlabDeb} .
+ mv -v opt/gitlab/embedded/service/gitlab-rails/public/assets public
+ rm -rf opt
+
+ export GITLAB_DATABASE_ADAPTER=nulldb
+ export SKIP_STORAGE_VALIDATION=true
+ rake assets:precompile RAILS_ENV=production
+
mv config/gitlab.yml config/gitlab.yml.example
rm config/secrets.yml
mv config config.dist
@@ -77,6 +91,10 @@ stdenv.mkDerivation rec {
cp -r . $out/share/gitlab
ln -sf /run/gitlab/uploads $out/share/gitlab/public/uploads
ln -sf /run/gitlab/config $out/share/gitlab/config
+
+ # rake tasks to mitigate CVE-2017-0882
+ # see https://about.gitlab.com/2017/03/20/gitlab-8-dot-17-dot-4-security-release/
+ cp ${./reset_token.rake} $out/share/gitlab/lib/tasks/reset_token.rake
'';
passthru = {
diff --git a/pkgs/applications/version-management/gitlab/gemset.nix b/pkgs/applications/version-management/gitlab/gemset.nix
index 1ebb7c5b1fa1..4bc57f6bd08e 100644
--- a/pkgs/applications/version-management/gitlab/gemset.nix
+++ b/pkgs/applications/version-management/gitlab/gemset.nix
@@ -146,10 +146,10 @@
asciidoctor-plantuml = {
source = {
remotes = ["https://rubygems.org"];
- sha256 = "0rd8yh0by5sxhg1c3cb1mzkp4jp3j8v6vzbyv1mx492s9ml451fx";
+ sha256 = "00ax9r822n4ykl6jizaxp03wqzknr7nn20mmqjpiwajy9j0zvr88";
type = "gem";
};
- version = "0.0.6";
+ version = "0.0.7";
};
ast = {
source = {
@@ -207,22 +207,6 @@
};
version = "0.1.1";
};
- babel-source = {
- source = {
- remotes = ["https://rubygems.org"];
- sha256 = "1ncq8h82k6hypzfb5dk7z95mmcdwnhsxmc53xz17m1nbklm25vvr";
- type = "gem";
- };
- version = "5.8.35";
- };
- babel-transpiler = {
- source = {
- remotes = ["https://rubygems.org"];
- sha256 = "0w0minwxj56w96xps1msm6n75fs0y7r1vqcr9zlsn74fksnz81jc";
- type = "gem";
- };
- version = "0.7.0";
- };
babosa = {
source = {
remotes = ["https://rubygems.org"];
@@ -944,14 +928,6 @@
};
version = "1.5.1";
};
- gitlab-turbolinks-classic = {
- source = {
- remotes = ["https://rubygems.org"];
- sha256 = "1zfqwa1pahhcz1yxvwigg94bck2zsqk2jsrc0wdcybhr0iwi5jra";
- type = "gem";
- };
- version = "2.5.6";
- };
gitlab_omniauth-ldap = {
source = {
remotes = ["https://rubygems.org"];
@@ -1235,10 +1211,10 @@
jwt = {
source = {
remotes = ["https://rubygems.org"];
- sha256 = "0s5llb4mhpy0phzbrc4jd2jd2b91h1axy4bhci7g1bdz1w2m3a2i";
+ sha256 = "124zz1142bi2if7hl5pcrcamwchv4icyr5kaal9m2q6wqbdl6aw4";
type = "gem";
};
- version = "1.5.4";
+ version = "1.5.6";
};
kaminari = {
source = {
@@ -1848,6 +1824,14 @@
};
version = "1.5.3";
};
+ rack-proxy = {
+ source = {
+ remotes = ["https://rubygems.org"];
+ sha256 = "1bpbcb9ch94ha2q7gdri88ry7ch0z6ian289kah9ayxyqg19j6f4";
+ type = "gem";
+ };
+ version = "0.6.0";
+ };
rack-test = {
source = {
remotes = ["https://rubygems.org"];
@@ -2152,6 +2136,14 @@
};
version = "3.5.0";
};
+ rspec_profiling = {
+ source = {
+ remotes = ["https://rubygems.org"];
+ sha256 = "01qrs189r0q08ys8vax269ff858q9ypsc94n1d700m9da44zi3wg";
+ type = "gem";
+ };
+ version = "0.0.4";
+ };
rubocop = {
source = {
remotes = ["https://rubygems.org"];
@@ -2227,10 +2219,10 @@
rubyzip = {
source = {
remotes = ["https://rubygems.org"];
- sha256 = "10a9p1m68lpn8pwqp972lv61140flvahm3g9yzbxzjks2z3qlb2s";
+ sha256 = "06js4gznzgh8ac2ldvmjcmg9v1vg9llm357yckkpylaj6z456zqz";
type = "gem";
};
- version = "1.2.0";
+ version = "1.2.1";
};
rufus-scheduler = {
source = {
@@ -2464,14 +2456,6 @@
};
version = "1.1.0";
};
- spring-commands-teaspoon = {
- source = {
- remotes = ["https://rubygems.org"];
- sha256 = "1g7n4m2s9d0frh7y1xibzpphqajfnx4fvgfc66nh545dd91w2nqz";
- type = "gem";
- };
- version = "0.0.2";
- };
sprockets = {
source = {
remotes = ["https://rubygems.org"];
@@ -2480,14 +2464,6 @@
};
version = "3.7.0";
};
- sprockets-es6 = {
- source = {
- remotes = ["https://rubygems.org"];
- sha256 = "0508h3vnjz08c64k11za6cqnbvvifka9pmdrycamzzjd4dmf10y3";
- type = "gem";
- };
- version = "0.9.2";
- };
sprockets-rails = {
source = {
remotes = ["https://rubygems.org"];
@@ -2496,6 +2472,14 @@
};
version = "3.1.1";
};
+ sqlite3 = {
+ source = {
+ remotes = ["https://rubygems.org"];
+ sha256 = "19r06wglnm6479ffj9dl0fa4p5j2wi6dj7k6k3d0rbx7036cv3ny";
+ type = "gem";
+ };
+ version = "1.3.11";
+ };
stackprof = {
source = {
remotes = ["https://rubygems.org"];
@@ -2552,22 +2536,6 @@
};
version = "1.2.0";
};
- teaspoon = {
- source = {
- remotes = ["https://rubygems.org"];
- sha256 = "1xz5f1w8jm2fg1g194kf17gh36imd7sgs9cx0adqx1l22p7jrkvv";
- type = "gem";
- };
- version = "1.1.5";
- };
- teaspoon-jasmine = {
- source = {
- remotes = ["https://rubygems.org"];
- sha256 = "00wygrv1jm4aj15p1ab9d5fdrj6y83kv26xgp52mx4lp78h2ms9q";
- type = "gem";
- };
- version = "2.2.0";
- };
temple = {
source = {
remotes = ["https://rubygems.org"];
@@ -2728,6 +2696,14 @@
};
version = "1.10.0";
};
+ validates_hostname = {
+ source = {
+ remotes = ["https://rubygems.org"];
+ sha256 = "04p1l0v98j4ffvaks1ig9mygx5grpbpdgz7haq3mygva9iy8ykja";
+ type = "gem";
+ };
+ version = "1.0.6";
+ };
version_sorter = {
source = {
remotes = ["https://rubygems.org"];
@@ -2776,6 +2752,14 @@
};
version = "1.21.0";
};
+ webpack-rails = {
+ source = {
+ remotes = ["https://rubygems.org"];
+ sha256 = "02jxkpdbi48yhcgldgl5jxnhnad83rdgpkkcwh8w1h6iyg04d42j";
+ type = "gem";
+ };
+ version = "0.9.9";
+ };
websocket-driver = {
source = {
remotes = ["https://rubygems.org"];
diff --git a/pkgs/applications/version-management/gitlab/reset_token.rake b/pkgs/applications/version-management/gitlab/reset_token.rake
new file mode 100644
index 000000000000..705b5830edfc
--- /dev/null
+++ b/pkgs/applications/version-management/gitlab/reset_token.rake
@@ -0,0 +1,43 @@
+# Taken from:
+# https://about.gitlab.com/2017/03/20/gitlab-8-dot-17-dot-4-security-release/
+
+# lib/tasks/reset_token.rake
+require_relative '../../app/models/concerns/token_authenticatable.rb'
+
+STDOUT.sync = true
+
+namespace :tokens do
+ desc "Reset all GitLab user auth tokens"
+ task reset_all: :environment do
+ reset_all_users_token(:reset_authentication_token!)
+ end
+
+ desc "Reset all GitLab email tokens"
+ task reset_all_email: :environment do
+ reset_all_users_token(:reset_incoming_email_token!)
+ end
+
+ def reset_all_users_token(token)
+ TmpUser.find_in_batches do |batch|
+ puts "Processing batch starting with user ID: #{batch.first.id}"
+
+ batch.each(&token)
+ end
+ end
+end
+
+class TmpUser < ActiveRecord::Base
+ include TokenAuthenticatable
+
+ self.table_name = 'users'
+
+ def reset_authentication_token!
+ write_new_token(:authentication_token)
+ save!(validate: false)
+ end
+
+ def reset_incoming_email_token!
+ write_new_token(:incoming_email_token)
+ save!(validate: false)
+ end
+end
diff --git a/pkgs/applications/version-management/gogs/default.nix b/pkgs/applications/version-management/gogs/default.nix
index b9a1f2e7a843..4ab97cc06d2a 100644
--- a/pkgs/applications/version-management/gogs/default.nix
+++ b/pkgs/applications/version-management/gogs/default.nix
@@ -3,25 +3,26 @@
, sqliteSupport ? true
}:
+with stdenv.lib;
+
buildGoPackage rec {
name = "gogs-${version}";
- version = "0.9.113";
+ version = "0.10.18";
src = fetchFromGitHub {
owner = "gogits";
repo = "gogs";
rev = "v${version}";
- sha256 = "1zk83c9jiazfw3221yi2sidp7917q3dxb2xb7wrjg4an18gj46j7";
+ sha256 = "1f1dlickjpdilf4j295i9v2h4ig4pf5d2mnpbr59wh14bby4bh0y";
};
patchPhase = ''
- substituteInPlace models/repo.go \
- --replace '#!/usr/bin/env' '#!${coreutils}/bin/env'
- '';
+ patchShebangs .
+ '';
- buildInputs = [ makeWrapper ];
+ nativeBuildInputs = [ makeWrapper ];
- buildFlags = stdenv.lib.optionalString sqliteSupport "-tags sqlite";
+ buildFlags = optionalString sqliteSupport "-tags sqlite";
outputs = [ "bin" "out" "data" ];
@@ -30,7 +31,7 @@ buildGoPackage rec {
cp -R $src/{public,templates} $data
wrapProgram $bin/bin/gogs \
- --prefix PATH : ${stdenv.lib.makeBinPath [ bash git gzip openssh ]} \
+ --prefix PATH : ${makeBinPath [ bash git gzip openssh ]} \
--run 'export GOGS_WORK_DIR=''${GOGS_WORK_DIR:-$PWD}' \
--run 'mkdir -p "$GOGS_WORK_DIR" && cd "$GOGS_WORK_DIR"' \
--run "ln -fs $data/{public,templates} ."
@@ -42,7 +43,7 @@ buildGoPackage rec {
meta = {
description = "A painless self-hosted Git service";
homepage = "https://gogs.io";
- license = stdenv.lib.licenses.mit;
- maintainers = with stdenv.lib.maintainers; [ schneefux ];
+ license = licenses.mit;
+ maintainers = [ maintainers.schneefux ];
};
}
diff --git a/pkgs/applications/version-management/kdesvn/default.nix b/pkgs/applications/version-management/kdesvn/default.nix
deleted file mode 100644
index d4c67776b529..000000000000
--- a/pkgs/applications/version-management/kdesvn/default.nix
+++ /dev/null
@@ -1,30 +0,0 @@
-{ stdenv, fetchurl, automoc4, cmake, gettext, perl, pkgconfig
-, 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
-stdenv.mkDerivation rec {
- name = "kdesvn-1.6.0";
-
- src = fetchurl rec {
- url = "http://pkgs.fedoraproject.org/repo/pkgs/kdesvn/${name}.tar.bz2/7e6adc98ff4777a06d5752d3f2b58fa3/${name}.tar.bz2";
- sha256 = "15hg6xyx5rqldfhi1yhq5ss15y6crm2is3zqm680z0bndcj6ys05";
- };
-
- prePatch = ''
- sed -i -e "s|/usr|${subversion.dev}|g" src/svnqt/cmakemodules/FindSubversion.cmake
- '';
-
- buildInputs = [ apr aprutil subversion db kdelibs expat ];
-
- nativeBuildInputs = [ automoc4 cmake gettext perl pkgconfig ];
-
- meta = {
- description = "KDE SVN front-end";
- license = "GPL";
- homepage = http://kdesvn.alwins-world.de;
- maintainers = [ stdenv.lib.maintainers.sander ];
- inherit (kdelibs.meta) platforms;
- };
-}
diff --git a/pkgs/applications/version-management/mercurial/default.nix b/pkgs/applications/version-management/mercurial/default.nix
index 034eb5344234..1c97f7252f56 100644
--- a/pkgs/applications/version-management/mercurial/default.nix
+++ b/pkgs/applications/version-management/mercurial/default.nix
@@ -7,8 +7,9 @@ let
version = "3.9.2";
name = "mercurial-${version}";
inherit (python2Packages) docutils hg-git dulwich python;
-in python2Packages.mkPythonDerivation {
+in python2Packages.buildPythonApplication {
inherit name;
+ format = "other";
src = fetchurl {
url = "https://mercurial-scm.org/release/${name}.tar.gz";
diff --git a/pkgs/applications/version-management/nitpick/default.nix b/pkgs/applications/version-management/nitpick/default.nix
new file mode 100644
index 000000000000..8fb1095dc581
--- /dev/null
+++ b/pkgs/applications/version-management/nitpick/default.nix
@@ -0,0 +1,41 @@
+{ fetchFromGitHub
+, buildPythonPackage
+, stdenv
+, isPy27
+}:
+
+buildPythonPackage rec {
+ pname = "nitpick";
+ version = "1.1";
+ name = "${pname}-${version}";
+
+ format = "other";
+ disabled = !isPy27;
+
+ src = fetchFromGitHub {
+ owner = "travisb-ca";
+ repo = pname;
+ rev = version;
+ sha256 = "11gn6nc6ypwivy20bx1r0rm2giblwx6jv485zk875a9pdbcwbrf6";
+ };
+
+ installPhase = ''
+ mkdir -p $out/share/src
+ install -m 755 -t $out/share/src nitpick.py
+
+ mkdir -p $out/bin
+ ln -s $out/share/src/nitpick.py $out/bin/nitpick
+ '';
+
+ meta = {
+ description = "A distributed issue tracker";
+ longDescription = ''
+ Nitpick is a distributed issue tracker. It helps keep track of which nits you
+ should pick. It's intended to be used with source code such that the issues can
+ follow the code via whatever VCS or distribution mechanism.
+ '';
+ homepage = http://travisbrown.ca/projects/nitpick/docs/nitpick.html;
+ license = with stdenv.lib.licenses; gpl2;
+ maintainers = [];
+ };
+}
diff --git a/pkgs/applications/version-management/peru/default.nix b/pkgs/applications/version-management/peru/default.nix
index 28df4f7fc312..01369b9685dc 100644
--- a/pkgs/applications/version-management/peru/default.nix
+++ b/pkgs/applications/version-management/peru/default.nix
@@ -1,25 +1,26 @@
-{ stdenv, fetchurl, python3Packages }:
-
-let
- pythonPackages = python3Packages;
-in pythonPackages.buildPythonApplication rec {
+{ stdenv, fetchFromGitHub, python3Packages }:
+python3Packages.buildPythonApplication rec {
name = "peru-${version}";
- version = "1.0.1";
+ version = "1.1.0";
- src = fetchurl {
- url = "mirror://pypi/p/peru/${name}.tar.gz";
- sha256 = "d51771d4aa7e16119e46c39efd71b0a1a898607bf3fb7735fc688a64fc59cbf1";
+ src = fetchFromGitHub {
+ owner = "buildinspace";
+ repo = "peru";
+ rev = "${version}";
+ sha256 = "0hvp6pvpsz0f98az4f1wl93gqlz6wj24pjnc5zs1har9rqlpq8y8";
};
- propagatedBuildInputs = with pythonPackages; [ pyyaml docopt ];
+ propagatedBuildInputs = with python3Packages; [ pyyaml docopt ];
# No tests in archive
doCheck = false;
- meta = {
+ meta = with stdenv.lib; {
homepage = https://github.com/buildinspace/peru;
description = "A tool for including other people's code in your projects";
- license = stdenv.lib.licenses.mit;
+ license = licenses.mit;
+ platforms = platforms.unix;
};
-}
\ No newline at end of file
+
+}
diff --git a/pkgs/applications/version-management/pijul/default.nix b/pkgs/applications/version-management/pijul/default.nix
index 04a91a6b4a44..134e6998670c 100644
--- a/pkgs/applications/version-management/pijul/default.nix
+++ b/pkgs/applications/version-management/pijul/default.nix
@@ -1,38 +1,30 @@
-{ stdenv, fetchdarcs, rustPlatform, openssl, libssh }:
+{ stdenv, fetchurl, rustPlatform, perl, darwin }:
with rustPlatform;
buildRustPackage rec {
name = "pijul-${version}";
- version = "0.2-6ab9ba";
+ version = "0.4.1";
- src = fetchdarcs {
- url = "http://pijul.org/";
- context = ./pijul.org.context;
- sha256 = "1cgkcr5wdkwj7s0rda90bfchbwmchgi60w5d637894w20hkplsr4";
+ src = fetchurl {
+ url = "https://pijul.org/releases/${name}.tar.gz";
+ sha256 = "e492fde1bea839f474f5b91bb762a0fab5ff6a9bc2b8f20eb91a253ca6feda5a";
};
- sourceRoot = "fetchdarcs/pijul";
+ sourceRoot = "${name}/pijul";
- depsSha256 = "110bj2lava1xs75z6k34aip7zb7rcmnxk5hmiyi32i9hs0ddsdrz";
+ buildInputs = [ perl ]++ stdenv.lib.optionals stdenv.isDarwin
+ (with darwin.apple_sdk.frameworks; [ Security ]);
- cargoUpdateHook = ''
- cp -r ../libpijul src/
- '';
-
- setSourceRoot = ''
- chmod -R u+w "$sourceRoot"
- cp -r "$sourceRoot"/../libpijul "$sourceRoot"/src/
- '';
-
- buildInputs = [ openssl libssh ];
+ doCheck = false;
+
+ depsSha256 = "17n66clr31s49gbbcsii0f31s63rncc9mmz4wwdi0yl4r6ykv9h7";
meta = with stdenv.lib; {
- homepage = https://pijul.org/;
- description = "Fast DVCS based on a categorical theory of patches";
- license = licenses.gpl3;
- platforms = stdenv.lib.platforms.x86_64; # i686 builds fail due to lmdb
- maintainers = with maintainers; [ puffnfresh ];
- broken = true;
+ description = "A distributed version control system";
+ homepage = https://pijul.org;
+ license = with licenses; [ gpl2Plus ];
+ maintainers = [ maintainers.gal_bolle ];
+ platforms = platforms.all;
};
}
diff --git a/pkgs/applications/version-management/pijul/pijul.org.context b/pkgs/applications/version-management/pijul/pijul.org.context
deleted file mode 100644
index 03a3f0f9a7c1..000000000000
--- a/pkgs/applications/version-management/pijul/pijul.org.context
+++ /dev/null
@@ -1,92 +0,0 @@
-
-Context:
-
-[+libpijul/Cargo.lock
-pe@pijul.org**20160212063509
- Ignore-this: e5a696b13850b36668a41aedb7bd1b74
-]
-
-[+pijul/Cargo.lock
-pe@pijul.org**20160212063451
- Ignore-this: a621a502d1701cb63e6b5c8fd0afbde8
-]
-
-[Error detection, gnupg messages
-pe@pijul.org**20160210101417
- Ignore-this: 3c517e122c1eca1df9520aed8fd3b0ea
-]
-
-[Login command
-pe@pijul.org**20160210055826
- Ignore-this: 7be5618dc418554a82c5f8a68cc8f515
-]
-
-[Extra functions for the nest
-pe@pijul.org**20160208205519
- Ignore-this: 39c8cbed5517b31bc846493e6ffefc76
-]
-
-[Timestamp in RFC3339
-pe@pijul.org**20160208145551
- Ignore-this: dd114fe418052570572d73e443683d85
-]
-
-[Combined external_hash and contents in libpijul (makes it easier to print patches)
-pe@pijul.org**20160208145450
- Ignore-this: 69f588e1bab551bffd719fa05ad7080a
-]
-
-[disentangle output in libpijul
-florent.becker@ens-lyon.org**20160208094544
- Ignore-this: 2dc35255cf48d77eb0c4ba2dde6d4f98
-]
-
-[Disentangle libpijul::Repository::local_diff
-florent.becker@ens-lyon.org**20160207104631
- Ignore-this: 65b119358afa95eb013e84c0d7a250d9
-]
-
-[remove redundant import
-florent.becker@ens-lyon.org**20160207104613
- Ignore-this: e3f7873ec678f62f4129be61238c2c0d
-]
-
-[Disentangle add_lines and delete_lines in diff
-florent.becker@ens-lyon.org**20160207102456
- Ignore-this: 5e89908adf7a519bbe2b2ab399cf0a2
-]
-
-[Disentangle libpijul::rec_delete
-florent.becker@ens-lyon.org**20160206214730
- Ignore-this: fb6a70c298a38724665c3d6452577649
-]
-
-[Make InternalKey type be an array rather than a reference
-florent.becker@ens-lyon.org**20160205195638
- Ignore-this: f9b5d15049358b2d8e93322d25a50e58
-]
-
-[Ask ssh known_hosts, and new file format
-pe@pijul.org**20160207120834
- Ignore-this: f7a7f2ae672a3f6f40a2ac85139d6e10
-]
-
-[Handling HTTP errors (when cloning from HTTP)
-pe@pijul.org**20160204182444
- Ignore-this: 1805ae8d3b8a4ca49da06e18dd37b151
-]
-
-[Small debugging assertions
-pe@pijul.org**20160203143007
- Ignore-this: e3d3dddc72511166d606e1751b19411b
-]
-
-[Two unused functions back (used in the nest)
-pe@pijul.org**20160202075743
- Ignore-this: 8c6904b122c8a78bfa0b9cc5416c943
-]
-
-[TAG 0.2
-pe@pijul.org**20160202073939
- Ignore-this: 1e9d04d5ffe231ffaccaf9c4ccb684d3
-]
diff --git a/pkgs/applications/version-management/rapidsvn/default.nix b/pkgs/applications/version-management/rapidsvn/default.nix
index 9397aa8a1e19..7b3c7aafa44e 100644
--- a/pkgs/applications/version-management/rapidsvn/default.nix
+++ b/pkgs/applications/version-management/rapidsvn/default.nix
@@ -1,11 +1,12 @@
-{stdenv, fetchurl, wxGTK, subversion, apr, aprutil, python}:
+{ stdenv, fetchurl, fetchpatch, wxGTK, subversion, apr, aprutil, python }:
-stdenv.mkDerivation {
- name = "rapidsvn-0.12.0-1";
+stdenv.mkDerivation rec {
+ name = "rapidsvn-${version}";
+ version = "0.12.1";
src = fetchurl {
- url = http://www.rapidsvn.org/download/release/0.12/rapidsvn-0.12.0-1.tar.gz;
- sha256 = "1i3afjmx99ljw1bj54q47fs0g1q9dmxxvr4ciq7ncp5s52shszgg";
+ url = "http://www.rapidsvn.org/download/release/${version}/${name}.tar.gz";
+ sha256 = "1bmcqjc12k5w0z40k7fkk8iysqv4fw33i80gvcmbakby3d4d4i4p";
};
buildInputs = [ wxGTK subversion apr aprutil python ];
@@ -13,6 +14,10 @@ stdenv.mkDerivation {
configureFlags = [ "--with-svn-include=${subversion.dev}/include"
"--with-svn-lib=${subversion.out}/lib" ];
+ patches = [
+ ./fix-build.patch
+ ];
+
meta = {
description = "Multi-platform GUI front-end for the Subversion revision system";
homepage = http://rapidsvn.tigris.org/;
diff --git a/pkgs/applications/version-management/rapidsvn/fix-build.patch b/pkgs/applications/version-management/rapidsvn/fix-build.patch
new file mode 100644
index 000000000000..ca4bc394c2c6
--- /dev/null
+++ b/pkgs/applications/version-management/rapidsvn/fix-build.patch
@@ -0,0 +1,122 @@
+--- a/src/svncpp/client_ls.cpp
++++ b/src/svncpp/client_ls.cpp
+@@ -25,6 +25,7 @@
+ #include "svn_client.h"
+ #include "svn_path.h"
+ #include "svn_sorts.h"
++#include "svn_version.h"
+ //#include "svn_utf.h"
+
+ // svncpp
+@@ -35,6 +36,7 @@
+ #include "m_is_empty.hpp"
+
+
++#if SVN_VER_MAJOR == 1 && SVN_VER_MINOR < 8
+ static int
+ compare_items_as_paths(const svn_sort__item_t *a, const svn_sort__item_t *b)
+ {
+@@ -84,6 +86,72 @@ namespace svn
+ }
+ }
+
++#else
++
++#include
++
++static svn_error_t* store_entry(
++ void *baton,
++ const char *path,
++ const svn_dirent_t *dirent,
++ const svn_lock_t *,
++ const char *abs_path,
++ const char *,
++ const char *,
++ apr_pool_t *scratch_pool)
++{
++ svn::DirEntries *entries = reinterpret_cast(baton);
++ if (path[0] == '\0') {
++ if (dirent->kind == svn_node_file) {
++ // for compatibility with svn_client_ls behaviour, listing a file
++ // stores that file name
++ entries->push_back(svn::DirEntry(svn_path_basename(abs_path, scratch_pool), dirent));
++ }
++ } else {
++ entries->push_back(svn::DirEntry(path, dirent));
++ }
++ return SVN_NO_ERROR;
++}
++
++static bool sort_by_path(svn::DirEntry const& a, svn::DirEntry const& b)
++{
++ return svn_path_compare_paths(a.name(), b.name()) < 0;
++}
++
++namespace svn
++{
++ DirEntries
++ Client::list(const char * pathOrUrl,
++ svn_opt_revision_t * revision,
++ bool recurse) throw(ClientException)
++ {
++ Pool pool;
++ DirEntries entries;
++
++ svn_error_t * error =
++ svn_client_list3(pathOrUrl,
++ revision,
++ revision,
++ SVN_DEPTH_INFINITY_OR_IMMEDIATES(recurse),
++ SVN_DIRENT_ALL,
++ FALSE, // fetch locks
++ FALSE, // include externals
++ &store_entry,
++ &entries,
++ *m_context,
++ pool);
++
++ if (error != SVN_NO_ERROR)
++ throw ClientException(error);
++
++ std::sort(entries.begin(), entries.end(), &sort_by_path);
++
++ return entries;
++ }
++}
++
++#endif
++
+ /* -----------------------------------------------------------------
+ * local variables:
+ * eval: (load-file "../../rapidsvn-dev.el")
+--- a/src/svncpp/dirent.cpp 2017-03-19 15:48:58.956827337 +0100
++++ b/src/svncpp/dirent.cpp 2017-03-19 15:50:19.111527279 +0100
+@@ -47,7 +47,7 @@
+ {
+ }
+
+- Data(const char * _name, svn_dirent_t * dirEntry)
++ Data(const char * _name, const svn_dirent_t * dirEntry)
+ : name(_name), kind(dirEntry->kind), size(dirEntry->size),
+ hasProps(dirEntry->has_props != 0),
+ createdRev(dirEntry->created_rev), time(dirEntry->time)
+@@ -78,7 +78,7 @@
+ {
+ }
+
+- DirEntry::DirEntry(const char * name, svn_dirent_t * DirEntry)
++ DirEntry::DirEntry(const char * name, const svn_dirent_t * DirEntry)
+ : m(new Data(name, DirEntry))
+ {
+ }
+--- a/include/svncpp/dirent.hpp 2017-03-19 15:50:54.860506116 +0100
++++ b/include/svncpp/dirent.hpp 2017-03-19 15:50:58.314407598 +0100
+@@ -41,7 +41,7 @@
+ /**
+ * constructor for existing @a svn_dirent_t entries
+ */
+- DirEntry(const char * name, svn_dirent_t * dirEntry);
++ DirEntry(const char * name, const svn_dirent_t * dirEntry);
+
+ /**
+ * copy constructor
diff --git a/pkgs/applications/version-management/src/default.nix b/pkgs/applications/version-management/src/default.nix
index 2bff15adc69d..e75223c6c363 100644
--- a/pkgs/applications/version-management/src/default.nix
+++ b/pkgs/applications/version-management/src/default.nix
@@ -1,14 +1,15 @@
-{ stdenv, fetchurl, python, rcs, git }:
+{ stdenv, fetchurl, python, rcs, git, makeWrapper }:
stdenv.mkDerivation rec {
- name = "src-1.11";
+ name = "src-${version}";
+ version = "1.13";
src = fetchurl {
url = "http://www.catb.org/~esr/src/${name}.tar.gz";
- sha256 = "07kj0ri0s0vn8s54yvkyzaag332spxs0379r718b80y31c4mgbyl";
+ sha256 = "0l13ld8nxm1c720ns22lyx3q1bq2c2zn78vi5w92b7nl6p2nncy8";
};
- buildInputs = [ python rcs git ];
+ buildInputs = [ python rcs git makeWrapper ];
preConfigure = ''
patchShebangs .
@@ -16,10 +17,16 @@ stdenv.mkDerivation rec {
makeFlags = [ "prefix=$(out)" ];
- meta = {
+ postInstall = ''
+ wrapProgram $out/bin/src \
+ --suffix PATH ":" "${rcs}/bin"
+ '';
+
+ meta = with stdenv.lib; {
description = "Simple single-file revision control";
homepage = http://www.catb.org/~esr/src/;
- license = stdenv.lib.licenses.bsd3;
- platforms = stdenv.lib.platforms.all;
+ license = licenses.bsd3;
+ platforms = platforms.all;
+ maintainers = with maintainers; [ calvertvl ];
};
}
diff --git a/pkgs/applications/version-management/subversion/default.nix b/pkgs/applications/version-management/subversion/default.nix
index eddbc0e56dd6..17ff3e4b19f3 100644
--- a/pkgs/applications/version-management/subversion/default.nix
+++ b/pkgs/applications/version-management/subversion/default.nix
@@ -26,8 +26,8 @@ let
inherit sha256;
};
- # Can't do separate $lib and $bin, as libs reference bins
- outputs = [ "out" "dev" "man" ];
+ # Can't do separate $lib and $bin, as libs reference bins
+ outputs = [ "out" "dev" "man" ];
buildInputs = [ zlib apr aprutil sqlite openssl ]
++ stdenv.lib.optional httpSupport serf
@@ -75,7 +75,7 @@ let
mkdir -p $out/share/bash-completion/completions
cp tools/client-side/bash_completion $out/share/bash-completion/completions/subversion
- for f in $out/lib/*.la; do
+ for f in $out/lib/*.la $out/lib/python*/site-packages/*/*.la; do
substituteInPlace $f \
--replace "${expat.dev}/lib" "${expat.out}/lib" \
--replace "${zlib.dev}/lib" "${zlib.out}/lib" \
diff --git a/pkgs/applications/version-management/yadm/default.nix b/pkgs/applications/version-management/yadm/default.nix
index f87d81bd8fb8..6587b25ef94a 100644
--- a/pkgs/applications/version-management/yadm/default.nix
+++ b/pkgs/applications/version-management/yadm/default.nix
@@ -1,6 +1,6 @@
{ stdenv, fetchurl, fetchFromGitHub }:
-let version = "1.05"; in
+let version = "1.07"; in
stdenv.mkDerivation {
name = "yadm-${version}";
@@ -8,7 +8,7 @@ stdenv.mkDerivation {
owner = "TheLocehiliosan";
repo = "yadm";
rev = "${version}";
- sha256 = "11bqgz28qzgb3iz8xvda9z0mh5r1a9m032pqm772ypiixsfz8hdd";
+ sha256 = "0kkxrvw17pmrx1dq0dq53jb9pm545firakrxc48znfw54n2036fw";
};
buildCommand = ''
diff --git a/pkgs/applications/video/bangarang/default.nix b/pkgs/applications/video/bangarang/default.nix
deleted file mode 100644
index ceece8879dcb..000000000000
--- a/pkgs/applications/video/bangarang/default.nix
+++ /dev/null
@@ -1,34 +0,0 @@
-{ stdenv, fetchurl, automoc4, cmake, perl, pkgconfig
-, kdelibs, phonon, soprano, shared_desktop_ontologies
-, kdemultimedia, taglib, glibc, gettext
-}:
-
-stdenv.mkDerivation rec {
- name = "bangarang-2.1";
-
- src = fetchurl {
- url = "http://bangarangissuetracking.googlecode.com/files/${name}.tar.gz";
- sha256 = "1g4pap79k8qaqi0py34xqvisxln1nc5hbvph692ah3af06n6cly1";
- };
-
- buildInputs = [
- kdelibs phonon soprano shared_desktop_ontologies kdemultimedia
- taglib gettext
- ];
-
- nativeBuildInputs = [ automoc4 cmake perl pkgconfig ];
-
- patches = [ ./gcc-4.7.patch ];
-
- meta = with stdenv.lib; {
- description = "A media player for KDE based on Nepomuk and Phonon";
- longDescription = ''
- Bangarang offers a minimalistic media center user interface,
- media collection management, playlists and statistics.
- '';
- homepage = http://bangarangkde.wordpress.com/;
- license = stdenv.lib.licenses.gpl3;
- maintainers = [ maintainers.phreedom maintainers.urkud ];
- platforms = platforms.linux;
- };
-}
diff --git a/pkgs/applications/video/bangarang/gcc-4.7.patch b/pkgs/applications/video/bangarang/gcc-4.7.patch
deleted file mode 100644
index d4f650b9caf5..000000000000
--- a/pkgs/applications/video/bangarang/gcc-4.7.patch
+++ /dev/null
@@ -1,45 +0,0 @@
-commit b893fcdb7ddfc8c59fd29a29b7265a713c3dbab1
-Author: Alex Fiestas
-Date: Thu Mar 29 10:09:22 2012 +0200
-
- Build fix: Add unistd.h include since sleep is defined there
-
-diff --git a/src/platform/infofetchers/lastfminfofetcher.cpp b/src/platform/infofetchers/lastfminfofetcher.cpp
-index 0c49d69..fcc4cd3 100644
---- a/src/platform/infofetchers/lastfminfofetcher.cpp
-+++ b/src/platform/infofetchers/lastfminfofetcher.cpp
-@@ -32,6 +32,8 @@
- #include
- #include
-
-+#include
-+
- LastfmInfoFetcher::LastfmInfoFetcher(QObject *parent) :
- InfoFetcher(parent)
- {
-diff --git a/src/platform/infofetchers/tmdbinfofetcher.cpp b/src/platform/infofetchers/tmdbinfofetcher.cpp
-index 7801644..3c01960 100644
---- a/src/platform/infofetchers/tmdbinfofetcher.cpp
-+++ b/src/platform/infofetchers/tmdbinfofetcher.cpp
-@@ -30,6 +30,8 @@
- #include
- #include
-
-+#include
-+
- TMDBInfoFetcher::TMDBInfoFetcher(QObject *parent) :
- InfoFetcher(parent)
- {
-diff --git a/src/platform/infofetchers/tvdbinfofetcher.cpp b/src/platform/infofetchers/tvdbinfofetcher.cpp
-index ff351b0..670ed18 100644
---- a/src/platform/infofetchers/tvdbinfofetcher.cpp
-+++ b/src/platform/infofetchers/tvdbinfofetcher.cpp
-@@ -30,6 +30,8 @@
- #include
- #include
-
-+#include
-+
- TVDBInfoFetcher::TVDBInfoFetcher(QObject *parent) :
- InfoFetcher(parent)
- {
diff --git a/pkgs/applications/video/devede/default.nix b/pkgs/applications/video/devede/default.nix
index 824ef9661b8e..157e4903e52e 100644
--- a/pkgs/applications/video/devede/default.nix
+++ b/pkgs/applications/video/devede/default.nix
@@ -1,23 +1,37 @@
-{ pkgs, stdenv, fetchurl, pythonPackages, ffmpeg, mplayer, vcdimager, cdrkit, dvdauthor }:
+{ pkgs, stdenv, fetchFromGitHub, python3Packages, ffmpeg, mplayer, vcdimager, cdrkit, dvdauthor
+, gtk3, gettext, wrapGAppsHook, gdk_pixbuf }:
let
- inherit (pythonPackages) dbus-python buildPythonApplication pygtk;
+ inherit (python3Packages) dbus-python buildPythonApplication pygobject3 urllib3;
in buildPythonApplication rec {
- name = "devede-3.23.0";
+ name = "devede-4.8.8";
namePrefix = "";
- src = fetchurl {
- url = "http://www.rastersoft.com/descargas/${name}.tar.bz2";
- sha256 = "9e217ca46f5f275cb0c3cadbe8c830fa1fde774c004bd95a343d1255be6f25e1";
+ src = fetchFromGitHub {
+ owner = "rastersoft";
+ repo = "devedeng";
+ rev = "c518683fbcd793aa92249e4fecafc3c3fea7da68";
+ sha256 = "0ncb8nykchrjlllbzfjpvirmfvfaps9qhilc56kvcw3nzqrnkx8q";
};
- buildInputs = [ ffmpeg ];
+ nativeBuildInputs = [
+ gettext wrapGAppsHook
+ ];
- propagatedBuildInputs = [ pygtk dbus-python ffmpeg mplayer dvdauthor vcdimager cdrkit ];
+ buildInputs = [
+ ffmpeg
+ ];
+
+ propagatedBuildInputs = [
+ gtk3 pygobject3 gdk_pixbuf dbus-python ffmpeg mplayer dvdauthor vcdimager cdrkit urllib3
+ ];
postPatch = ''
- substituteInPlace devede --replace "/usr/share/devede" "$out/share/devede"
+ substituteInPlace setup.py --replace "'/usr'," ""
+ substituteInPlace src/devedeng/configuration_data.py \
+ --replace "/usr/share" "$out/share" \
+ --replace "/usr/local/share" "$out/share"
'';
meta = with stdenv.lib; {
@@ -25,6 +39,5 @@ in buildPythonApplication rec {
homepage = http://www.rastersoft.com/programas/devede.html;
license = licenses.gpl3;
maintainers = [ maintainers.bdimcheff ];
- broken = true; # tarball is gone
};
}
diff --git a/pkgs/applications/video/dvdstyler/default.nix b/pkgs/applications/video/dvdstyler/default.nix
new file mode 100644
index 000000000000..e59469c704cb
--- /dev/null
+++ b/pkgs/applications/video/dvdstyler/default.nix
@@ -0,0 +1,85 @@
+{ stdenv, fetchurl, pkgconfig
+, flex, bison, gettext
+, xineUI, wxSVG
+, fontconfig
+, xmlto, docbook5, zip
+, cdrtools, dvdauthor, dvdplusrwtools
+, dvdisasterSupport ? true, dvdisaster ? null
+, thumbnailSupport ? true, libgnomeui ? null
+, udevSupport ? true, libudev ? null
+, dbusSupport ? true, dbus ? null
+, makeWrapper }:
+
+with stdenv.lib;
+stdenv.mkDerivation rec {
+
+ name = "dvdstyler-${version}";
+ srcName = "DVDStyler-${version}";
+ version = "3.0.3";
+
+ src = fetchurl {
+ url = "mirror://sourceforge/project/dvdstyler/dvdstyler/${version}/${srcName}.tar.bz2";
+ sha256 = "1j432kszmwmsd3nz398h5514dbm5vsrn4rr3iil72ckjj1h3i00q";
+ };
+
+ nativeBuildInputs =
+ [ pkgconfig ];
+
+ packagesToBinPath =
+ [ cdrtools dvdauthor dvdplusrwtools ];
+
+ buildInputs =
+ [ flex bison gettext xineUI
+ wxSVG fontconfig xmlto
+ docbook5 zip makeWrapper ]
+ ++ packagesToBinPath
+ ++ optionals dvdisasterSupport [ dvdisaster ]
+ ++ optionals udevSupport [ libudev ]
+ ++ optionals dbusSupport [ dbus ]
+ ++ optionals thumbnailSupport [ libgnomeui ];
+
+ binPath = makeBinPath packagesToBinPath;
+
+ postInstall = ''
+ wrapProgram $out/bin/dvdstyler \
+ --prefix PATH ":" "${binPath}"
+ '';
+
+ meta = with stdenv.lib; {
+ description = "A DVD authoring software";
+ longDescription = ''
+ DVDStyler is a cross-platform free DVD authoring application for the
+ creation of professional-looking DVDs. It allows not only burning of video
+ files on DVD that can be played practically on any standalone DVD player,
+ but also creation of individually designed DVD menus. It is Open Source
+ Software and is completely free.
+
+ Some of its features include:
+ - create and burn DVD video with interactive menus
+ - design your own DVD menu or select one from the list of ready to use menu
+ templates
+ - create photo slideshow
+ - add multiple subtitle and audio tracks
+ - support of AVI, MOV, MP4, MPEG, OGG, WMV and other file formats
+ - support of MPEG-2, MPEG-4, DivX, Xvid, MP2, MP3, AC-3 and other audio and
+ video formats
+ - support of multi-core processor
+ - use MPEG and VOB files without reencoding
+ - put files with different audio/video format on one DVD (support of
+ titleset)
+ - user-friendly interface with support of drag & drop
+ - flexible menu creation on the basis of scalable vector graphic
+ - import of image file for background
+ - place buttons, text, images and other graphic objects anywhere on the menu
+ screen
+ - change the font/color and other parameters of buttons and graphic objects
+ - scale any button or graphic object
+ - copy any menu object or whole menu
+ - customize navigation using DVD scripting
+ '';
+ homepage = http://www.dvdstyler.org/;
+ license = with licenses; gpl2;
+ maintainers = with maintainers; [ AndersonTorres ];
+ platforms = with platforms; linux;
+ };
+}
diff --git a/pkgs/applications/video/gnome-mplayer/default.nix b/pkgs/applications/video/gnome-mplayer/default.nix
index 1096a64887b0..e2980c7108f4 100644
--- a/pkgs/applications/video/gnome-mplayer/default.nix
+++ b/pkgs/applications/video/gnome-mplayer/default.nix
@@ -4,12 +4,14 @@ stdenv.mkDerivation rec {
name = "gnome-mplayer-1.0.4";
src = fetchurl {
- url = "http://gnome-mplayer.googlecode.com/files/${name}.tar.gz";
+ url = "https://storage.googleapis.com/google-code-archive-downloads/v2/code.google.com/gnome-mplayer/${name}.tar.gz";
sha256 = "1k5yplsvddcm7xza5h4nfb6vibzjcqsk8gzis890alizk07f5xp2";
};
buildInputs = [pkgconfig glib gtk2 dbus dbus_glib GConf];
-
+
+ hardeningDisable = [ "format" ];
+
meta = {
homepage = http://kdekorte.googlepages.com/gnomemplayer;
description = "Gnome MPlayer, a simple GUI for MPlayer";
diff --git a/pkgs/applications/video/handbrake/default.nix b/pkgs/applications/video/handbrake/default.nix
index b8a161649889..f62e274874c1 100644
--- a/pkgs/applications/video/handbrake/default.nix
+++ b/pkgs/applications/video/handbrake/default.nix
@@ -8,87 +8,93 @@
# making licenses more clear and reducing compile time/install size.
#
# Only tested on Linux
-#
-# TODO: package and use libappindicator
-{ stdenv, config, fetchurl,
- python2, pkgconfig, yasm,
- autoconf, automake, libtool, m4,
- libass, libsamplerate, fribidi, libxml2, bzip2,
- libogg, libtheora, libvorbis, libdvdcss, a52dec, fdk_aac,
+{ stdenv, lib, fetchFromGitHub,
+ python2, pkgconfig, yasm, harfbuzz, zlib,
+ autoconf, automake, cmake, libtool, m4, jansson,
+ libass, libiconv, libsamplerate, fribidi, libxml2, bzip2,
+ libogg, libopus, libtheora, libvorbis, libdvdcss, a52dec, fdk_aac,
lame, ffmpeg, libdvdread, libdvdnav, libbluray,
mp4v2, mpeg2dec, x264, x265, libmkv,
fontconfig, freetype, hicolor_icon_theme,
glib, gtk3, intltool, libnotify,
gst_all_1, dbus_glib, udev, libgudev, libvpx,
- wrapGAppsHook,
- useGtk ? true
+ useGtk ? true, wrapGAppsHook ? null, libappindicator-gtk3 ? null
}:
stdenv.mkDerivation rec {
- version = "0.10.5";
+ version = "1.0.3";
name = "handbrake-${version}";
- buildInputsX = stdenv.lib.optionals useGtk [
- glib gtk3 intltool libnotify
- gst_all_1.gstreamer gst_all_1.gst-plugins-base dbus_glib udev
- libgudev
- wrapGAppsHook
- ];
-
- nativeBuildInputs = [ python2 pkgconfig yasm autoconf automake libtool m4 ];
- buildInputs = [
- fribidi fontconfig freetype hicolor_icon_theme
- libass libsamplerate libxml2 bzip2
- libogg libtheora libvorbis libdvdcss a52dec libmkv fdk_aac
- lame ffmpeg libdvdread libdvdnav libbluray mp4v2 mpeg2dec x264 x265 libvpx
- ] ++ buildInputsX;
-
- src = fetchurl {
- url = "http://download.handbrake.fr/releases/${version}/HandBrake-${version}.tar.bz2";
- sha256 = "1w720y3bplkz187wgvy4a4xm0vpppg45mlni55l6yi8v2bfk14pv";
+ src = fetchFromGitHub {
+ owner = "HandBrake";
+ repo = "HandBrake";
+ rev = "${version}";
+ sha256 = "1r8yzs0xih03p5ybx5096zkvlwxhcmg34047awmda1wq3z3rdjh5";
};
+ nativeBuildInputs = [
+ cmake python2 pkgconfig yasm autoconf automake libtool m4
+ ] ++ (lib.optionals useGtk [
+ intltool wrapGAppsHook
+ ]);
+
+ buildInputs = [
+ fribidi fontconfig freetype jansson zlib
+ libass libiconv libsamplerate libxml2 bzip2
+ libogg libopus libtheora libvorbis libdvdcss a52dec libmkv fdk_aac
+ lame ffmpeg libdvdread libdvdnav libbluray mp4v2 mpeg2dec x264 x265 libvpx
+ ] ++ (lib.optionals useGtk [
+ glib gtk3 libappindicator-gtk3 libnotify
+ gst_all_1.gstreamer gst_all_1.gst-plugins-base dbus_glib udev
+ libgudev
+ ]);
+
+ dontUseCmakeConfigure = true;
+
preConfigure = ''
- # Fake wget to prevent downloads
- mkdir wget
- echo "#!/bin/sh" > wget/wget
- echo "echo ===== Not fetching \$*" >> wget/wget
- echo "exit 1" >> wget/wget
- chmod +x wget/wget
- export PATH=$PATH:$PWD/wget
+ patchShebangs scripts
+
+ echo 'TAG=${version}' > version.txt
+
+ # `configure` errors out when trying to read the current year which is too low
+ substituteInPlace make/configure.py \
+ --replace developer release \
+ --replace 'repo.date.strftime("%Y-%m-%d %H:%M:%S")' '""'
+
+ substituteInPlace libhb/module.defs \
+ --replace /usr/include/libxml2 ${libxml2.dev}/include/libxml2
# Force using nixpkgs dependencies
sed -i '/MODULES += contrib/d' make/include/main.defs
sed -i '/PKG_CONFIG_PATH=/d' gtk/module.rules
-
- patch -p1 -R < ${./handbrake-0.10.3-nolibav.patch}
'';
configureFlags = [
+ "--disable-df-fetch"
+ "--disable-df-verify"
"--enable-fdk-aac"
(if useGtk then "--disable-gtk-update-checks" else "--disable-gtk")
];
+ NIX_LDFLAGS = [
+ "-lx265"
+ ];
+
preBuild = ''
cd build
'';
- LD_LIBRARY_PATH = stdenv.lib.makeLibraryPath [ x265 ];
- preFixup = ''
- gappsWrapperArgs+=(--prefix LD_LIBRARY_PATH : "${LD_LIBRARY_PATH}")
- '';
-
- meta = {
+ meta = with stdenv.lib; {
homepage = http://handbrake.fr/;
description = "A tool for ripping DVDs into video files";
longDescription = ''
Handbrake is a versatile transcoding DVD ripper. This package
provides the cli HandbrakeCLI and the GTK+ version ghb.
'';
- license = stdenv.lib.licenses.gpl2;
- maintainers = [ stdenv.lib.maintainers.wmertens ];
+ license = licenses.gpl2;
+ maintainers = with maintainers; [ wmertens ];
# Not tested on anything else
- platforms = stdenv.lib.platforms.linux;
+ platforms = platforms.linux;
};
}
diff --git a/pkgs/applications/video/kdenlive/default.nix b/pkgs/applications/video/kdenlive/default.nix
deleted file mode 100644
index 3da5180352c6..000000000000
--- a/pkgs/applications/video/kdenlive/default.nix
+++ /dev/null
@@ -1,41 +0,0 @@
-{ stdenv, fetchurl, frei0r, lib, cmake, qt4, perl, kdelibs, automoc4
-, phonon , makeWrapper, mlt, gettext , qimageblitz, qjson
-, shared_mime_info, soprano, pkgconfig, shared_desktop_ontologies
-, libv4l, oxygen_icons
-}:
-
-stdenv.mkDerivation rec {
- name = "kdenlive-${version}";
- version = "0.9.10";
-
- src = fetchurl {
- url = "mirror://kde/stable/kdenlive/${version}/src/${name}.tar.bz2";
- sha256 = "0qxpxnfbr8g6xq0h32skgqqi2xylrv2bnmyx5x1cws9y2wwxp3zn";
- };
-
- buildInputs = [
- frei0r kdelibs libv4l mlt phonon qimageblitz qjson qt4
- shared_desktop_ontologies soprano
- ];
-
- nativeBuildInputs = [
- automoc4 cmake gettext makeWrapper perl pkgconfig shared_mime_info
- ];
-
- propagatedUserEnvPkgs = [ oxygen_icons ];
-
- enableParallelBuilding = true;
-
- postInstall = ''
- wrapProgram $out/bin/kdenlive --prefix FREI0R_PATH : ${frei0r}/lib/frei0r-1
- wrapProgram $out/bin/kdenlive_render --prefix FREI0R_PATH : ${frei0r}/lib/frei0r-1
- '';
-
- meta = {
- description = "Free and open source video editor";
- license = stdenv.lib.licenses.gpl2Plus;
- homepage = http://www.kdenlive.org/;
- maintainers = with stdenv.lib.maintainers; [ goibhniu viric ];
- platforms = with stdenv.lib.platforms; linux;
- };
-}
diff --git a/pkgs/applications/video/kmplayer/default.nix b/pkgs/applications/video/kmplayer/default.nix
index cbd0347078ef..59b9893ded14 100644
--- a/pkgs/applications/video/kmplayer/default.nix
+++ b/pkgs/applications/video/kmplayer/default.nix
@@ -1,6 +1,6 @@
{ stdenv, fetchurl
, automoc4, cmake, gettext, makeWrapper, perl, pkgconfig
-, kdelibs, cairo, dbus_glib, mplayer
+, kdelibs4, cairo, dbus_glib, mplayer
}:
stdenv.mkDerivation {
@@ -12,7 +12,7 @@ stdenv.mkDerivation {
sha256 = "1yvbkb1hh5y7fqfvixjf2rryzm0fm0fpkx4lmvhi7k7d0v4wpgky";
};
- buildInputs = [ kdelibs cairo dbus_glib ];
+ buildInputs = [ kdelibs4 cairo dbus_glib ];
nativeBuildInputs = [ automoc4 cmake gettext makeWrapper perl pkgconfig ];
diff --git a/pkgs/applications/video/kodi/default.nix b/pkgs/applications/video/kodi/default.nix
index ee0be6419aa0..9c421e0c8280 100644
--- a/pkgs/applications/video/kodi/default.nix
+++ b/pkgs/applications/video/kodi/default.nix
@@ -44,12 +44,12 @@ let
sha256 = "14jicb26s20nr3qmfpazszpc892yjwjn81zbsb8szy3a5xs19y81";
};
in stdenv.mkDerivation rec {
- name = "kodi-" + version;
- version = "17.0";
+ name = "kodi-${version}";
+ version = "17.1";
src = fetchurl {
url = "https://github.com/xbmc/xbmc/archive/${version}-${rel}.tar.gz";
- sha256 = "0ib59x733yf8ivsw82qlsq43jn5214n668nrn5df2flpjcjgmzsb";
+ sha256 = "1vmvrq0qdjnphw34yils2b5jnm05cmsg777hc4lwqz5mrc1kjgrh";
};
buildInputs = [
@@ -97,10 +97,19 @@ in stdenv.mkDerivation rec {
'';
preConfigure = ''
+ patchShebangs .
./bootstrap
+ # tests here fail
+ sed -i '/TestSystemInfo.cpp/d' xbmc/utils/test/{Makefile,CMakeLists.txt}
+ # tests here trigger a segfault in kodi.bin
+ sed -i '/TestWebServer.cpp/d' xbmc/network/test/{Makefile,CMakeLists.txt}
'';
- configureFlags = [ ]
+ enableParallelBuild = true;
+
+ doCheck = true;
+
+ configureFlags = [ "--enable-libcec" ]
++ lib.optional (!sambaSupport) "--disable-samba"
++ lib.optional vdpauSupport "--enable-vdpau"
++ lib.optional pulseSupport "--enable-pulse"
@@ -110,19 +119,17 @@ in stdenv.mkDerivation rec {
postInstall = ''
for p in $(ls $out/bin/) ; do
wrapProgram $out/bin/$p \
- --prefix PATH ":" "${python2}/bin" \
- --prefix PATH ":" "${glxinfo}/bin" \
- --prefix PATH ":" "${xdpyinfo}/bin" \
+ --prefix PATH ":" "${lib.makeBinPath
+ [ python2 glxinfo xdpyinfo ]}" \
--prefix LD_LIBRARY_PATH ":" "${lib.makeLibraryPath
- [ curl systemd libmad libvdpau libcec libcec_platform rtmpdump libass SDL2 ]
- }"
+ [ curl systemd libmad libvdpau libcec libcec_platform rtmpdump libass SDL2 ]}"
done
'';
meta = with stdenv.lib; {
homepage = http://kodi.tv/;
description = "Media center";
- license = stdenv.lib.licenses.gpl2;
+ license = licenses.gpl2;
platforms = platforms.linux;
maintainers = with maintainers; [ domenkozar titanous edwtjo ];
};
diff --git a/pkgs/applications/video/miro/default.nix b/pkgs/applications/video/miro/default.nix
index 0652ac7e6642..0efa4aba2767 100644
--- a/pkgs/applications/video/miro/default.nix
+++ b/pkgs/applications/video/miro/default.nix
@@ -2,7 +2,7 @@
, pythonPackages, pyrex096, ffmpeg, boost, glib, gtk2, webkitgtk2, libsoup
, taglib, sqlite
, libtorrentRasterbar, glib_networking, gsettings_desktop_schemas
-, gst_python, gst_plugins_base, gst_plugins_good, gst_ffmpeg
+, gst-python, gst-plugins-base, gst-plugins-good, gst-ffmpeg
, enableBonjour ? false, avahi ? null
}:
@@ -77,7 +77,7 @@ in buildPythonApplication rec {
propagatedBuildInputs = with pythonPackages; [
pygobject2 pygtk pycurl mutagen pycairo dbus-python
pywebkitgtk] ++ [ libtorrentRasterbar
- gst_python gst_plugins_base gst_plugins_good gst_ffmpeg
+ gst-python gst-plugins-base gst-plugins-good gst-ffmpeg
] ++ optional enableBonjour avahi;
meta = {
diff --git a/pkgs/applications/video/mkvtoolnix/default.nix b/pkgs/applications/video/mkvtoolnix/default.nix
index e8dc1227ef87..ce6935a26064 100644
--- a/pkgs/applications/video/mkvtoolnix/default.nix
+++ b/pkgs/applications/video/mkvtoolnix/default.nix
@@ -1,6 +1,6 @@
-{ stdenv, fetchFromGitHub, pkgconfig, autoconf, automake
-, drake, ruby, file, xdg_utils, gettext, expat, qt5, boost
-, libebml, zlib, libmatroska, libogg, libvorbis, flac
+{ stdenv, fetchFromGitHub, pkgconfig, autoconf, automake, libiconv
+, drake, ruby, docbook_xsl, file, xdg_utils, gettext, expat, qt5, boost
+, libebml, zlib, libmatroska, libogg, libvorbis, flac, libxslt
, withGUI ? true
}:
@@ -10,21 +10,23 @@ with stdenv.lib;
stdenv.mkDerivation rec {
name = "mkvtoolnix-${version}";
- version = "9.8.0";
+ version = "9.9.0";
src = fetchFromGitHub {
owner = "mbunkus";
repo = "mkvtoolnix";
rev = "release-${version}";
- sha256 = "1hnk92ksgg290q4kwdl8jqrz7vzlwki4f85bb6kgdgzpjkblw76n";
+ sha256 = "1jiz23s52l3gpl84yx4yw3w445jqzcimvnvibvrv3a21k29hyik1";
};
- nativeBuildInputs = [ pkgconfig autoconf automake gettext drake ruby ];
+ nativeBuildInputs = [ pkgconfig autoconf automake gettext drake ruby docbook_xsl libxslt ];
buildInputs = [
expat file xdg_utils boost libebml zlib libmatroska libogg
libvorbis flac
- ] ++ optional withGUI qt5.qtbase;
+ ]
+ ++ optional stdenv.isDarwin libiconv
+ ++ optional withGUI qt5.qtbase;
preConfigure = "./autogen.sh; patchShebangs .";
buildPhase = "drake -j $NIX_BUILD_CORES";
@@ -39,6 +41,7 @@ stdenv.mkDerivation rec {
"--disable-precompiled-headers"
"--disable-static-qt"
"--with-gettext"
+ "--with-docbook-xsl-root=${docbook_xsl}/share/xml/docbook-xsl"
(enableFeature withGUI "qt")
];
@@ -47,6 +50,7 @@ stdenv.mkDerivation rec {
homepage = http://www.bunkus.org/videotools/mkvtoolnix/;
license = licenses.gpl2;
maintainers = with maintainers; [ codyopel fuuzetsu rnhmjoj ];
- platforms = platforms.linux;
+ platforms = platforms.linux
+ ++ optionals (!withGUI) platforms.darwin;
};
}
diff --git a/pkgs/applications/video/mplayer/default.nix b/pkgs/applications/video/mplayer/default.nix
index 60625412617a..ba02583a2744 100644
--- a/pkgs/applications/video/mplayer/default.nix
+++ b/pkgs/applications/video/mplayer/default.nix
@@ -198,7 +198,7 @@ stdenv.mkDerivation rec {
description = "A movie player that supports many video formats";
homepage = "http://mplayerhq.hu";
license = "GPL";
- maintainers = [ stdenv.lib.maintainers.eelco stdenv.lib.maintainers.urkud ];
+ maintainers = [ stdenv.lib.maintainers.eelco ];
platforms = stdenv.lib.platforms.linux ++ stdenv.lib.platforms.darwin;
};
}
diff --git a/pkgs/applications/video/mpv/default.nix b/pkgs/applications/video/mpv/default.nix
index 960dabd75695..3a5313b78279 100644
--- a/pkgs/applications/video/mpv/default.nix
+++ b/pkgs/applications/video/mpv/default.nix
@@ -31,7 +31,7 @@
, libpngSupport ? true, libpng ? null
, youtubeSupport ? true, youtube-dl ? null
, vaapiSupport ? true, libva ? null
-, drmSupport ? true, libdrm ? null
+, drmSupport ? !stdenv.isDarwin, libdrm ? null
, vapoursynthSupport ? false, vapoursynth ? null
, jackaudioSupport ? false, libjack2 ? null
@@ -79,13 +79,13 @@ let
};
in stdenv.mkDerivation rec {
name = "mpv-${version}";
- version = "0.23.0";
+ version = "0.24.0";
src = fetchFromGitHub {
owner = "mpv-player";
repo = "mpv";
rev = "v${version}";
- sha256 = "02k8p4z1mwxxlg9spwwrlcciia80kyrpp09hpl60g22h85jj1ng9";
+ sha256 = "1aq1lvhw4l0i2gc9x6ijaaj2h3894jbcpd4j055n0y9vg9vqm6yy";
};
patchPhase = ''
@@ -114,7 +114,9 @@ in stdenv.mkDerivation rec {
buildInputs = [
ffmpeg_3_2 freetype libass libpthreadstubs
lua lua5_sockets libuchardet
- ] ++ optional alsaSupport alsaLib
+ ] ++ optionals stdenv.isDarwin (with darwin.apple_sdk.frameworks; [
+ libiconv Cocoa CoreAudio ])
+ ++ optional alsaSupport alsaLib
++ optional xvSupport libXv
++ optional theoraSupport libtheora
++ optional xineramaSupport libXinerama
@@ -122,9 +124,6 @@ in stdenv.mkDerivation rec {
++ optional bluraySupport libbluray
++ optional jackaudioSupport libjack2
++ optional pulseSupport libpulseaudio
- ++ optional stdenv.isDarwin libiconv
- ++ optionals stdenv.isDarwin (with darwin.apple_sdk.frameworks; [
- Cocoa CoreAudio ])
++ optional rubberbandSupport rubberband
++ optional screenSaverSupport libXScrnSaver
++ optional vdpauSupport libvdpau
@@ -171,7 +170,7 @@ in stdenv.mkDerivation rec {
description = "A media player that supports many video formats (MPlayer and mplayer2 fork)";
homepage = http://mpv.io;
license = licenses.gpl2Plus;
- maintainers = with maintainers; [ AndersonTorres fuuzetsu ];
+ maintainers = with maintainers; [ AndersonTorres fuuzetsu fpletz ];
platforms = platforms.darwin ++ platforms.linux;
longDescription = ''
diff --git a/pkgs/applications/video/obs-studio/default.nix b/pkgs/applications/video/obs-studio/default.nix
index 8051d5ee3764..539314867ab9 100644
--- a/pkgs/applications/video/obs-studio/default.nix
+++ b/pkgs/applications/video/obs-studio/default.nix
@@ -22,13 +22,13 @@ let
optional = stdenv.lib.optional;
in stdenv.mkDerivation rec {
name = "obs-studio-${version}";
- version = "17.0.1";
+ version = "18.0.1";
src = fetchFromGitHub {
owner = "jp9000";
repo = "obs-studio";
- rev = "${version}";
- sha256 = "0x5lnl1xkmm8x4g0f8rma8ir1bcldz9sssj2fzkv80hn79h2cvxm";
+ rev = "624aa2a5";
+ sha256 = "1bs82rqyq7wjjg99mh23ap8z5bmrhjfnza5iyjx808fzqc0bgzaj";
};
nativeBuildInputs = [ cmake
diff --git a/pkgs/applications/video/openshot-qt/default.nix b/pkgs/applications/video/openshot-qt/default.nix
index eb184933964b..3232e9c089bc 100644
--- a/pkgs/applications/video/openshot-qt/default.nix
+++ b/pkgs/applications/video/openshot-qt/default.nix
@@ -1,29 +1,24 @@
-{stdenv, fetchurl, fetchFromGitHub, callPackage, makeWrapper, doxygen
-, ffmpeg, python3Packages, qt55}:
+{ stdenv, fetchFromGitHub
+, doxygen, python3Packages, ffmpeg, libopenshot
+, qtbase, qtmultimedia, makeQtWrapper }:
with stdenv.lib;
-
-let
- libopenshot = callPackage ./libopenshot.nix {};
-in
stdenv.mkDerivation rec {
name = "openshot-qt-${version}";
- version = "2.1.0";
+ version = "2.2.0";
src = fetchFromGitHub {
owner = "OpenShot";
repo = "openshot-qt";
rev = "v${version}";
- sha256 = "1cyr5m1n6qcb9bzkhh3v6ka91a6x9c50dl5j0ilrc8vj0mb43g8c";
+ sha256 = "0dg4fkkci1rz49yrdd4fa1whv10c1pgm3cl4i49452ckqa7qg037";
};
+
+ buildInputs =
+ [ python3Packages.python ffmpeg libopenshot qtbase qtmultimedia ];
- buildInputs = [doxygen python3Packages.python makeWrapper ffmpeg];
-
- propagatedBuildInputs = [
- qt55.qtbase
- qt55.qtmultimedia
- libopenshot
- ];
+ nativeBuildInputs =
+ [ doxygen makeQtWrapper ];
installPhase = ''
mkdir -p $(toPythonPath $out)
@@ -32,17 +27,24 @@ stdenv.mkDerivation rec {
echo "#/usr/bin/env sh" >$out/bin/openshot-qt
echo "exec ${python3Packages.python.interpreter} $(toPythonPath $out)/launch.py" >>$out/bin/openshot-qt
chmod +x $out/bin/openshot-qt
- wrapProgram $out/bin/openshot-qt \
+ wrapQtProgram $out/bin/openshot-qt \
--prefix PYTHONPATH : "$(toPythonPath $out):$(toPythonPath ${libopenshot}):$(toPythonPath ${python3Packages.pyqt5}):$(toPythonPath ${python3Packages.sip}):$(toPythonPath ${python3Packages.httplib2}):$(toPythonPath ${python3Packages.pyzmq}):$PYTHONPATH"
'';
doCheck = false;
meta = {
- homepage = "http://openshot.org/";
+ homepage = http://openshot.org/;
description = "Free, open-source video editor";
- license = licenses.gpl3Plus;
- maintainers = [maintainers.tohl];
- platforms = platforms.linux;
+ longDescription = ''
+ OpenShot Video Editor is a free, open-source video editor for Linux.
+ OpenShot can take your videos, photos, and music files and help you
+ create the film you have always dreamed of. Easily add sub-titles,
+ transitions, and effects, and then export your film to DVD, YouTube,
+ Vimeo, Xbox 360, and many other common formats.
+ '';
+ license = with licenses; gpl3Plus;
+ maintainers = with maintainers; [ AndersonTorres ];
+ platforms = with platforms; linux;
};
}
diff --git a/pkgs/applications/video/openshot-qt/libopenshot-audio.nix b/pkgs/applications/video/openshot-qt/libopenshot-audio.nix
index fdaa049fa428..82c7f247189e 100644
--- a/pkgs/applications/video/openshot-qt/libopenshot-audio.nix
+++ b/pkgs/applications/video/openshot-qt/libopenshot-audio.nix
@@ -1,8 +1,7 @@
-{stdenv, fetchurl, fetchFromGitHub, cmake, doxygen
-, libX11, libXft, libXrandr, libXinerama, libXext, libXcursor, alsaLib}:
+{ stdenv, fetchFromGitHub, pkgconfig, cmake, doxygen, alsaLib
+, libX11, libXft, libXrandr, libXinerama, libXext, libXcursor }:
with stdenv.lib;
-
stdenv.mkDerivation rec {
name = "libopenshot-audio-${version}";
version = "0.1.2";
@@ -14,18 +13,24 @@ stdenv.mkDerivation rec {
sha256 = "0dxyhnqkjc5y4hra8s17q9lafll6fx0pgibmmjznjm70whqcj8a6";
};
- buildInputs = [
- cmake doxygen
- libX11 libXft libXrandr libXinerama libXext libXcursor alsaLib
- ];
+ nativeBuildInputs =
+ [ pkgconfig cmake doxygen ];
+
+ buildInputs =
+ [ alsaLib libX11 libXft libXrandr libXinerama libXext libXcursor ];
doCheck = false;
meta = {
- homepage = "http://openshot.org/";
- description = "Free, open-source video editor";
- license = licenses.gpl3Plus;
- maintainers = [maintainers.tohl];
- platforms = platforms.linux;
+ homepage = http://openshot.org/;
+ description = "High-quality sound editing library";
+ longDescription = ''
+ OpenShot Audio Library (libopenshot-audio) is a program that allows the
+ high-quality editing and playback of audio, and is based on the amazing
+ JUCE library.
+ '';
+ license = with licenses; gpl3Plus;
+ maintainers = with maintainers; [ AndersonTorres ];
+ platforms = with platforms; linux;
};
}
diff --git a/pkgs/applications/video/openshot-qt/libopenshot.nix b/pkgs/applications/video/openshot-qt/libopenshot.nix
index 841587fcab30..dd1410431695 100644
--- a/pkgs/applications/video/openshot-qt/libopenshot.nix
+++ b/pkgs/applications/video/openshot-qt/libopenshot.nix
@@ -1,22 +1,20 @@
-{stdenv, fetchurl, fetchFromGitHub, callPackage, cmake, doxygen
-, imagemagick, ffmpeg, qt55, swig, python3, ruby, unittest-cpp
-, cppzmq, czmqpp
-}:
+{ stdenv, fetchFromGitHub
+, pkgconfig, cmake, doxygen
+, libopenshot-audio, imagemagick, ffmpeg
+, swig, python3, ruby
+, unittest-cpp, cppzmq, czmqpp
+, qtbase, qtmultimedia }:
with stdenv.lib;
-
-let
- libopenshot_audio = callPackage ./libopenshot-audio.nix {};
-in
stdenv.mkDerivation rec {
name = "libopenshot-${version}";
- version = "0.1.2";
+ version = "0.1.3";
src = fetchFromGitHub {
owner = "OpenShot";
repo = "libopenshot";
rev = "v${version}";
- sha256 = "00051ipb8y4z9j5m5smwm1ahv755k0glarwic8fv5b9fzryfbrdm";
+ sha256 = "0slszl6w96rhxhi6agw85dc4gmpab2qw03mq32g4qrirz68anz6f";
};
patchPhase = ''
@@ -27,22 +25,27 @@ stdenv.mkDerivation rec {
export RUBY_VENDOR_ARCH_DIR=$out/lib/ruby/site-packages
'';
- buildInputs = [
- cmake doxygen
- imagemagick ffmpeg qt55.qtbase qt55.qtmultimedia swig python3 ruby
- unittest-cpp cppzmq czmqpp
- ];
+ nativeBuildInputs = [ pkgconfig cmake doxygen ];
- LIBOPENSHOT_AUDIO_DIR = "${libopenshot_audio}";
+ buildInputs =
+ [ imagemagick ffmpeg swig python3 ruby unittest-cpp
+ cppzmq czmqpp qtbase qtmultimedia ];
+
+ LIBOPENSHOT_AUDIO_DIR = "${libopenshot-audio}";
"UNITTEST++_INCLUDE_DIR" = "${unittest-cpp}/include/UnitTest++";
doCheck = false;
meta = {
- homepage = "http://openshot.org/";
- description = "Free, open-source video editor";
- license = licenses.gpl3Plus;
- maintainers = [maintainers.tohl];
- platforms = platforms.linux;
+ homepage = http://openshot.org/;
+ description = "Free, open-source video editor library";
+ longDescription = ''
+ OpenShot Library (libopenshot) is an open-source project dedicated to
+ delivering high quality video editing, animation, and playback solutions
+ to the world. API currently supports C++, Python, and Ruby.
+ '';
+ license = with licenses; gpl3Plus;
+ maintainers = with maintainers; [ AndersonTorres ];
+ platforms = with platforms; linux;
};
}
diff --git a/pkgs/applications/video/simplescreenrecorder/default.nix b/pkgs/applications/video/simplescreenrecorder/default.nix
index f50a41129adb..571f46de3854 100644
--- a/pkgs/applications/video/simplescreenrecorder/default.nix
+++ b/pkgs/applications/video/simplescreenrecorder/default.nix
@@ -4,11 +4,11 @@
stdenv.mkDerivation rec {
name = "simplescreenrecorder-${version}";
- version = "0.3.6";
+ version = "0.3.8";
src = fetchurl {
url = "https://github.com/MaartenBaert/ssr/archive/${version}.tar.gz";
- sha256 = "1d89ncspjd8c4mckf0nb6y3hrxpv4rjpbj868pznhvfmdgr5nvql";
+ sha256 = "0v8w35n8w772s08w7k0icynqdsdakbrcanbgx6j847bfqfsg21gg";
};
patches = [ ./fix-paths.patch ];
diff --git a/pkgs/applications/video/smplayer/default.nix b/pkgs/applications/video/smplayer/default.nix
index 9c2f6d041197..d7411c1128e2 100644
--- a/pkgs/applications/video/smplayer/default.nix
+++ b/pkgs/applications/video/smplayer/default.nix
@@ -1,11 +1,11 @@
{ stdenv, fetchurl, qmakeHook, qtscript }:
stdenv.mkDerivation rec {
- name = "smplayer-17.2.0";
+ name = "smplayer-17.3.0";
src = fetchurl {
url = "mirror://sourceforge/smplayer/${name}.tar.bz2";
- sha256 = "05nqwpyh3zlyzip7chs711sz97cgijb92h44cd5aqbwbx06hihdd";
+ sha256 = "0yv7725kr3dq02mcanc07sapirx6s73l4b6d13nzvq5rkwr8crmj";
};
buildInputs = [ qtscript ];
diff --git a/pkgs/applications/virtualization/containerd/default.nix b/pkgs/applications/virtualization/containerd/default.nix
index c428c56b313b..c07670b5de65 100644
--- a/pkgs/applications/virtualization/containerd/default.nix
+++ b/pkgs/applications/virtualization/containerd/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, lib, fetchFromGitHub
+{ stdenv, lib, fetchFromGitHub, removeReferencesTo
, go, libapparmor, apparmor-parser, libseccomp }:
with lib;
@@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
sha256 = "16p8kixhzdx8afpciyf3fjx43xa3qrqpx06r5aqxdrqviw851zh8";
};
- buildInputs = [ go ];
+ buildInputs = [ removeReferencesTo go ];
preBuild = ''
ln -s $(pwd) vendor/src/github.com/docker/containerd
@@ -26,10 +26,7 @@ stdenv.mkDerivation rec {
'';
preFixup = ''
- # remove references to go compiler
- while read file; do
- sed -ri "s,${go},$(echo "${go}" | sed "s,$NIX_STORE/[^-]*,$NIX_STORE/eeeeeeeeeeeeeeeeeeeeeeeeeeeeeeee,"),g" $file
- done < <(find $out/bin -type f 2>/dev/null)
+ find $out -type f -exec remove-references-to -t ${go} '{}' +
'';
meta = {
diff --git a/pkgs/applications/virtualization/docker-distribution/default.nix b/pkgs/applications/virtualization/docker-distribution/default.nix
index 4850d7d9f5f5..c3c0de149668 100644
--- a/pkgs/applications/virtualization/docker-distribution/default.nix
+++ b/pkgs/applications/virtualization/docker-distribution/default.nix
@@ -2,7 +2,7 @@
buildGoPackage rec {
name = "distribution-${version}";
- version = "2.5.1";
+ version = "2.6.0";
rev = "v${version}";
goPackagePath = "github.com/docker/distribution";
@@ -11,7 +11,7 @@ buildGoPackage rec {
owner = "docker";
repo = "distribution";
inherit rev;
- sha256 = "08nxcsl9bc3k9gav2mkqccm5byrlfcgy6qaqaywiyza0b0cn4kdc";
+ sha256 = "1yg2zrikn3vkvkx5mn51p6bfjk840qdkn7ahhhvvcsc8mpigrjc6";
};
meta = with stdenv.lib; {
diff --git a/pkgs/applications/virtualization/docker/default.nix b/pkgs/applications/virtualization/docker/default.nix
index 903ee98a0e1b..6f3feddfda0b 100644
--- a/pkgs/applications/virtualization/docker/default.nix
+++ b/pkgs/applications/virtualization/docker/default.nix
@@ -1,144 +1,171 @@
-{ stdenv, lib, fetchFromGitHub, makeWrapper, pkgconfig, go-md2man
-, go, containerd, runc, docker-proxy, tini
+{ stdenv, lib, fetchFromGitHub, makeWrapper, removeReferencesTo, pkgconfig
+, go-md2man, go, containerd, runc, docker-proxy, tini
, sqlite, iproute, bridge-utils, devicemapper, systemd
, btrfs-progs, iptables, e2fsprogs, xz, utillinux, xfsprogs
, procps
}:
# https://github.com/docker/docker/blob/master/project/PACKAGERS.md
+# https://github.com/docker/docker/blob/TAG/hack/dockerfile/binaries-commits
with lib;
-stdenv.mkDerivation rec {
- name = "docker-${version}";
- version = "1.13.1";
- rev = "092cba3"; # should match the version commit
+rec {
+ dockerGen = {
+ version, rev, sha256
+ , runcRev, runcSha256
+ , containerdRev, containerdSha256
+ , tiniRev, tiniSha256
+ } : stdenv.mkDerivation rec {
+ inherit version rev;
- src = fetchFromGitHub {
- owner = "docker";
- repo = "docker";
- rev = "v${version}";
- sha256 = "0l9kjibnpwcgk844sibxk9ppyqniw9r0np1mzp95f8f461jb0iar";
- };
+ name = "docker-${version}";
- docker-runc = runc.overrideAttrs (oldAttrs: rec {
- name = "docker-runc";
src = fetchFromGitHub {
owner = "docker";
- repo = "runc";
- rev = "9df8b306d01f59d3a8029be411de015b7304dd8f";
- sha256 = "1yvrk1w2409b90gk55k72z7l3jlkj682x4h3b7004mkl9bhscqd9";
- };
- # docker/runc already include these patches / are not applicable
- patches = [];
- });
- docker-containerd = containerd.overrideAttrs (oldAttrs: rec {
- name = "docker-containerd";
- src = fetchFromGitHub {
- owner = "docker";
- repo = "containerd";
- rev = "aa8187dbd3b7ad67d8e5e3a15115d3eef43a7ed1";
- sha256 = "0vidbsgyn77m98kisrqnbykva0zmk1ljprgqhbfp5lw16ac6qj8c";
- };
- });
- docker-tini = tini.overrideAttrs (oldAttrs: rec {
- name = "docker-init";
- src = fetchFromGitHub {
- owner = "krallin";
- repo = "tini";
- rev = "949e6facb77383876aeff8a6944dde66b3089574";
- sha256 = "0zj4kdis1vvc6dwn4gplqna0bs7v6d1y2zc8v80s3zi018inhznw";
+ repo = "docker";
+ rev = "v${version}";
+ sha256 = sha256;
};
- # Do not remove static from make files as we want a static binary
- patchPhase = ''
+ docker-runc = runc.overrideAttrs (oldAttrs: rec {
+ name = "docker-runc";
+ src = fetchFromGitHub {
+ owner = "docker";
+ repo = "runc";
+ rev = runcRev;
+ sha256 = runcSha256;
+ };
+ # docker/runc already include these patches / are not applicable
+ patches = [];
+ });
+ docker-containerd = containerd.overrideAttrs (oldAttrs: rec {
+ name = "docker-containerd";
+ src = fetchFromGitHub {
+ owner = "docker";
+ repo = "containerd";
+ rev = containerdRev;
+ sha256 = containerdSha256;
+ };
+ });
+ docker-tini = tini.overrideAttrs (oldAttrs: rec {
+ name = "docker-init";
+ src = fetchFromGitHub {
+ owner = "krallin";
+ repo = "tini";
+ rev = tiniRev;
+ sha256 = tiniSha256;
+ };
+
+ # Do not remove static from make files as we want a static binary
+ patchPhase = ''
+ '';
+
+ NIX_CFLAGS_COMPILE = [
+ "-DMINIMAL=ON"
+ ];
+ });
+
+ buildInputs = [
+ makeWrapper removeReferencesTo pkgconfig go-md2man go
+ sqlite devicemapper btrfs-progs systemd
+ ];
+
+ dontStrip = true;
+
+ DOCKER_BUILDTAGS = []
+ ++ optional (systemd != null) [ "journald" ]
+ ++ optional (btrfs-progs == null) "exclude_graphdriver_btrfs"
+ ++ optional (devicemapper == null) "exclude_graphdriver_devicemapper";
+
+ # systemd 230 no longer has libsystemd-journal as a separate entity from libsystemd
+ postPatch = ''
+ substituteInPlace ./hack/make.sh --replace libsystemd-journal libsystemd
+ substituteInPlace ./daemon/logger/journald/read.go --replace libsystemd-journal libsystemd
'';
- NIX_CFLAGS_COMPILE = [
- "-DMINIMAL=ON"
- ];
- });
+ buildPhase = ''
+ patchShebangs .
+ export AUTO_GOPATH=1
+ export DOCKER_GITCOMMIT="${rev}"
+ ./hack/make.sh dynbinary
+ '';
- buildInputs = [
- makeWrapper pkgconfig go-md2man go
- sqlite devicemapper btrfs-progs systemd
- ];
+ outputs = ["out" "man"];
- dontStrip = true;
+ extraPath = makeBinPath [ iproute iptables e2fsprogs xz xfsprogs procps utillinux ];
- DOCKER_BUILDTAGS = []
- ++ optional (systemd != null) [ "journald" ]
- ++ optional (btrfs-progs == null) "exclude_graphdriver_btrfs"
- ++ optional (devicemapper == null) "exclude_graphdriver_devicemapper";
+ installPhase = ''
+ install -Dm755 ./bundles/${version}/dynbinary-client/docker-${version} $out/libexec/docker/docker
+ install -Dm755 ./bundles/${version}/dynbinary-daemon/dockerd-${version} $out/libexec/docker/dockerd
+ makeWrapper $out/libexec/docker/docker $out/bin/docker \
+ --prefix PATH : "$out/libexec/docker:$extraPath"
+ makeWrapper $out/libexec/docker/dockerd $out/bin/dockerd \
+ --prefix PATH : "$out/libexec/docker:$extraPath"
- # systemd 230 no longer has libsystemd-journal as a separate entity from libsystemd
- postPatch = ''
- substituteInPlace ./hack/make.sh --replace libsystemd-journal libsystemd
- substituteInPlace ./daemon/logger/journald/read.go --replace libsystemd-journal libsystemd
- '';
+ # docker uses containerd now
+ ln -s ${docker-containerd}/bin/containerd $out/libexec/docker/docker-containerd
+ ln -s ${docker-containerd}/bin/containerd-shim $out/libexec/docker/docker-containerd-shim
+ ln -s ${docker-runc}/bin/runc $out/libexec/docker/docker-runc
+ ln -s ${docker-proxy}/bin/docker-proxy $out/libexec/docker/docker-proxy
+ ln -s ${docker-tini}/bin/tini-static $out/libexec/docker/docker-init
- buildPhase = ''
- patchShebangs .
- export AUTO_GOPATH=1
- export DOCKER_GITCOMMIT="${rev}"
- ./hack/make.sh dynbinary
- '';
+ # systemd
+ install -Dm644 ./contrib/init/systemd/docker.service $out/etc/systemd/system/docker.service
- outputs = ["out" "man"];
+ # completion
+ install -Dm644 ./contrib/completion/bash/docker $out/share/bash-completion/completions/docker
+ install -Dm644 ./contrib/completion/fish/docker.fish $out/share/fish/vendor_completions.d/docker.fish
+ install -Dm644 ./contrib/completion/zsh/_docker $out/share/zsh/site-functions/_docker
- extraPath = makeBinPath [ iproute iptables e2fsprogs xz xfsprogs procps utillinux ];
-
- installPhase = ''
- install -Dm755 ./bundles/${version}/dynbinary-client/docker-${version} $out/libexec/docker/docker
- install -Dm755 ./bundles/${version}/dynbinary-daemon/dockerd-${version} $out/libexec/docker/dockerd
- makeWrapper $out/libexec/docker/docker $out/bin/docker \
- --prefix PATH : "$out/libexec/docker:$extraPath"
- makeWrapper $out/libexec/docker/dockerd $out/bin/dockerd \
- --prefix PATH : "$out/libexec/docker:$extraPath"
-
- # docker uses containerd now
- ln -s ${docker-containerd}/bin/containerd $out/libexec/docker/docker-containerd
- ln -s ${docker-containerd}/bin/containerd-shim $out/libexec/docker/docker-containerd-shim
- ln -s ${docker-runc}/bin/runc $out/libexec/docker/docker-runc
- ln -s ${docker-proxy}/bin/docker-proxy $out/libexec/docker/docker-proxy
- ln -s ${docker-tini}/bin/tini-static $out/libexec/docker/docker-init
-
- # systemd
- install -Dm644 ./contrib/init/systemd/docker.service $out/etc/systemd/system/docker.service
-
- # completion
- install -Dm644 ./contrib/completion/bash/docker $out/share/bash-completion/completions/docker
- install -Dm644 ./contrib/completion/fish/docker.fish $out/share/fish/vendor_completions.d/docker.fish
- install -Dm644 ./contrib/completion/zsh/_docker $out/share/zsh/site-functions/_docker
-
- # Include contributed man pages
- man/md2man-all.sh -q
- manRoot="$man/share/man"
- mkdir -p "$manRoot"
- for manDir in man/man?; do
- manBase="$(basename "$manDir")" # "man1"
- for manFile in "$manDir"/*; do
- manName="$(basename "$manFile")" # "docker-build.1"
- mkdir -p "$manRoot/$manBase"
- gzip -c "$manFile" > "$manRoot/$manBase/$manName.gz"
+ # Include contributed man pages
+ man/md2man-all.sh -q
+ manRoot="$man/share/man"
+ mkdir -p "$manRoot"
+ for manDir in man/man?; do
+ manBase="$(basename "$manDir")" # "man1"
+ for manFile in "$manDir"/*; do
+ manName="$(basename "$manFile")" # "docker-build.1"
+ mkdir -p "$manRoot/$manBase"
+ gzip -c "$manFile" > "$manRoot/$manBase/$manName.gz"
+ done
done
- done
- '';
+ '';
- preFixup = ''
- # remove references to go compiler, gcc and glibc
- while read file; do
- sed -ri "s,${go},$(echo "${go}" | sed "s,$NIX_STORE/[^-]*,$NIX_STORE/eeeeeeeeeeeeeeeeeeeeeeeeeeeeeeee,"),g" $file
- sed -ri "s,${stdenv.cc.cc},$(echo "${stdenv.cc.cc}" | sed "s,$NIX_STORE/[^-]*,$NIX_STORE/eeeeeeeeeeeeeeeeeeeeeeeeeeeeeeee,"),g" $file
- sed -ri "s,${stdenv.glibc.dev},$(echo "${stdenv.glibc.dev}" | sed "s,$NIX_STORE/[^-]*,$NIX_STORE/eeeeeeeeeeeeeeeeeeeeeeeeeeeeeeee,"),g" $file
- done < <(find $out -type f 2>/dev/null)
- '';
+ preFixup = ''
+ find $out -type f -exec remove-references-to -t ${go} -t ${stdenv.cc.cc} -t ${stdenv.glibc.dev} '{}' +
+ '';
- meta = {
- homepage = http://www.docker.com/;
- description = "An open source project to pack, ship and run any application as a lightweight container";
- license = licenses.asl20;
- maintainers = with maintainers; [ offline tailhook ];
- platforms = platforms.linux;
+ meta = {
+ homepage = http://www.docker.com/;
+ description = "An open source project to pack, ship and run any application as a lightweight container";
+ license = licenses.asl20;
+ maintainers = with maintainers; [ offline tailhook ];
+ platforms = platforms.linux;
+ };
+ };
+
+ docker_17_03 = dockerGen rec {
+ version = "17.03.1-ce";
+ rev = "c6d412e"; # git commit
+ sha256 = "1h3hkg15c3isfgaqpkp3mr7ys5826cz24hn3f3wz07jmismq98q7";
+ runcRev = "54296cf40ad8143b62dbcaa1d90e520a2136ddfe";
+ runcSha256 = "0ylymx7pi4jmvbqj94j2i8qspy8cpq0m91l6a0xiqlx43yx6qi2m";
+ containerdRev = "4ab9917febca54791c5f071a9d1f404867857fcc";
+ containerdSha256 = "06f2gsx4w9z4wwjhrpafmz6c829wi8p7crj6sya6x9ii50bkn8p6";
+ tiniRev = "949e6facb77383876aeff8a6944dde66b3089574";
+ tiniSha256 = "0zj4kdis1vvc6dwn4gplqna0bs7v6d1y2zc8v80s3zi018inhznw";
+ };
+
+ docker_17_04 = dockerGen rec {
+ version = "17.04.0-ce";
+ rev = "4845c56"; # git commit
+ sha256 = "04farary19ws7xzsyack0sbrxjzp5xwjh26frxbpdd0a88pxnbj7";
+ runcRev = "9c2d8d184e5da67c95d601382adf14862e4f2228";
+ runcSha256 = "131jv8f77pbdlx88ar0zjwdsp0a5v8kydaw0w0cl3i0j3622ydjl";
+ containerdRev = "422e31ce907fd9c3833a38d7b8fdd023e5a76e73";
+ containerdSha256 = "1g0k82f1mk3vn57k130q776wp5c226d06qbiq1q148pqxxhym2r2";
+ tiniRev = "949e6facb77383876aeff8a6944dde66b3089574";
+ tiniSha256 = "0zj4kdis1vvc6dwn4gplqna0bs7v6d1y2zc8v80s3zi018inhznw";
};
}
diff --git a/pkgs/applications/virtualization/lkl/default.nix b/pkgs/applications/virtualization/lkl/default.nix
index a307099783eb..398c269d0746 100644
--- a/pkgs/applications/virtualization/lkl/default.nix
+++ b/pkgs/applications/virtualization/lkl/default.nix
@@ -39,7 +39,7 @@ stdenv.mkDerivation rec {
meta = with stdenv.lib; {
description = "LKL (Linux Kernel Library) aims to allow reusing the Linux kernel code as extensively as possible with minimal effort and reduced maintenance overhead";
- platforms = platforms.linux; # Darwin probably works too but I haven't tested it
+ platforms = [ "x86_64-linux" ]; # Darwin probably works too but I haven't tested it
license = licenses.gpl2;
maintainers = with maintainers; [ copumpkin ];
};
diff --git a/pkgs/applications/virtualization/open-vm-tools/default.nix b/pkgs/applications/virtualization/open-vm-tools/default.nix
index 78fa090f9254..4c0e0f11e7b3 100644
--- a/pkgs/applications/virtualization/open-vm-tools/default.nix
+++ b/pkgs/applications/virtualization/open-vm-tools/default.nix
@@ -33,6 +33,9 @@ stdenv.mkDerivation rec {
sed -i 's,etc/vmware-tools,''${prefix}/etc/vmware-tools,' services/vmtoolsd/Makefile.am
sed -i 's,$(PAM_PREFIX),''${prefix}/$(PAM_PREFIX),' services/vmtoolsd/Makefile.am
sed -i 's,$(UDEVRULESDIR),''${prefix}/$(UDEVRULESDIR),' udev/Makefile.am
+
+ # Avoid a glibc >= 2.25 deprecation warning that gets fatal via -Werror.
+ sed 1i'#include ' -i lib/wiper/wiperPosix.c
'';
configureFlags = [ "--without-kernel-modules" "--without-xmlsecurity" ]
diff --git a/pkgs/applications/virtualization/qemu/default.nix b/pkgs/applications/virtualization/qemu/default.nix
index d7910eb938fc..e5620b6ce456 100644
--- a/pkgs/applications/virtualization/qemu/default.nix
+++ b/pkgs/applications/virtualization/qemu/default.nix
@@ -9,7 +9,9 @@
, pulseSupport ? !stdenv.isDarwin, libpulseaudio
, sdlSupport ? !stdenv.isDarwin, SDL
, vncSupport ? true, libjpeg, libpng
-, spiceSupport ? !stdenv.isDarwin, spice, spice_protocol, usbredir
+, spiceSupport ? !stdenv.isDarwin, spice, spice_protocol
+, usbredirSupport ? spiceSupport, usbredir
+, xenSupport ? false, xen
, x86Only ? false
, nixosTestRunner ? false
}:
@@ -24,6 +26,7 @@ in
stdenv.mkDerivation rec {
name = "qemu-"
+ + stdenv.lib.optionalString xenSupport "xen-"
+ stdenv.lib.optionalString x86Only "x86-only-"
+ stdenv.lib.optionalString nixosTestRunner "for-vm-tests-"
+ version;
@@ -44,14 +47,102 @@ stdenv.mkDerivation rec {
++ optionals pulseSupport [ libpulseaudio ]
++ optionals sdlSupport [ SDL ]
++ optionals vncSupport [ libjpeg libpng ]
- ++ optionals spiceSupport [ spice_protocol spice usbredir ]
- ++ optionals stdenv.isLinux [ alsaLib libaio libcap_ng libcap attr ];
+ ++ optionals spiceSupport [ spice_protocol spice ]
+ ++ optionals usbredirSupport [ usbredir ]
+ ++ optionals stdenv.isLinux [ alsaLib libaio libcap_ng libcap attr ]
+ ++ optionals xenSupport [ xen ];
enableParallelBuilding = true;
- patches = [
+ patches = let
+ upstreamPatch = name: commit: sha256: fetchurl {
+ name = "${name}.patch";
+ url = "http://git.qemu-project.org/?p=qemu.git;a=patch;h=${commit}";
+ inherit sha256;
+ };
+ in [
./no-etc-install.patch
+
+ # bugfixes
+ (fetchurl {
+ name = "qemu-vnc-do-not-disconnect-on-EAGAIN.patch";
+ url = "https://anonscm.debian.org/cgit/pkg-qemu/qemu.git/plain/debian/patches/vnc-do-not-disconnect-on-EAGAIN.patch?h=debian/qemu_2.8%2bdfsg-3";
+ sha256 = "1nqhfgfw1pzhid094pk204qy36r6n7w1yilsiwabgcsyxs5bymnh";
+ })
+
+ (upstreamPatch "qemu-fix-win7-xhci" "7da76e12cc5cc902dda4c168d8d608fd4e61cbc5"
+ "0m1ggbxziy7vqz9007ypzg23cni8cc4db36wlnhxz0kdpq70c6x0")
+
+ (upstreamPatch "qemu-xhci-free-completed-transfers" "f94d18d6c6df388fde196d3ab252f57e33843a8b"
+ "0lk19qss6ky7cqnvis54742cr2z0vl8c64chhch0kp6n83hray9x")
+
+ # security fixes from debian
+ (fetchurl {
+ name = "CVE-2016-9602.patch";
+ url = "https://anonscm.debian.org/cgit/pkg-qemu/qemu.git/plain/debian/patches/9pfs-symlink-attack-fixes-CVE-2016-9602.patch?h=debian/qemu_2.8%2bdfsg-3";
+ sha256 = "0f7m1k3hbw9v0dwqn53ds36s7s334vlidvbn0682s9r2sq0sjlkv";
+ })
+
+ (fetchurl {
+ name = "CVE-2017-2630.patch";
+ url = "https://anonscm.debian.org/cgit/pkg-qemu/qemu.git/plain/debian/patches/nbd_client-fix-drop_sync-CVE-2017-2630.patch?h=debian/qemu_2.8%2bdfsg-3";
+ sha256 = "1gdxaari53iwgj3gyczz30rhg8lj6xqycxym4snw9z5vmkyj1bbq";
+ })
+
+ (fetchurl {
+ name = "CVE-2017-6058.patch";
+ url = "https://anonscm.debian.org/cgit/pkg-qemu/qemu.git/plain/debian/patches/vmxnet3-fix-memory-corruption-on-vlan-header-stripping-CVE-2017-6058.patch?h=debian/qemu_2.8%2bdfsg-3";
+ sha256 = "0w8az2cr116mnijxjd4aprl8dvfdj76gm7ddajmngdslxiax601f";
+ })
+
+ # security fixes from upstream
+ (upstreamPatch "CVE-2016-7907" "81f17e0d435c3db3a3e67e0d32ebf9c98973211f"
+ "0dzghbm3jmnyw34kd40a6akrr1cpizd9hdzqmhlc2ljab7pr1rcb")
+
+ (upstreamPatch "CVE-2016-10155" "eb7a20a3616085d46aa6b4b4224e15587ec67e6e"
+ "1xk00fyls0hdza11dyfrnzcn6gibmmcrwy7sxgp6iizp6wgzi3vw")
+
+ (upstreamPatch "CVE-2017-2615" "62d4c6bd5263bb8413a06c80144fc678df6dfb64"
+ "0miph2x4d474issa44hmc542zxmkc7lsr4ncb7pwarq6j7v52l8h")
+
+ (upstreamPatch "CVE-2017-2620" "92f2b88cea48c6aeba8de568a45f2ed958f3c298"
+ "1kz12qmvfccy7xilsrxahbs67jycv4zjfbijxivadvx9klxs1n58")
+
+ (upstreamPatch "CVE-2017-5525" "12351a91da97b414eec8cdb09f1d9f41e535a401"
+ "190b4aqr35p4lb3rjarknfi1ip1c9zizliqp1dd6frx4364y5yp2")
+
+ (upstreamPatch "CVE-2017-5526" "069eb7b2b8fc47c7cb52e5a4af23ea98d939e3da"
+ "05xgzd3zldk3x2vqpjag9z5ilhdkpkyh633fb5kvnz8scns6v86f")
+
+ (upstreamPatch "CVE-2017-5579" "8409dc884a201bf74b30a9d232b6bbdd00cb7e2b"
+ "0lbcyhif1kdcy8my0bv8aqr2f421kmljcch3plrjzj9pgcm4sv83")
+
+ (upstreamPatch "CVE-2017-5667" "42922105beb14c2fc58185ea022b9f72fb5465e9"
+ "049vq70is3fj9bf4ysfj3s44iz93qhyqn6xijck32w1x6yyzqyx4")
+
+ (upstreamPatch "CVE-2017-5667-fix" "913a87885f589d263e682c2eb6637c6e14538061"
+ "0nm1k2r9n6r86dvjr16hxak2vcsinj7ijlqw5i6f4y5h2sh37wr5")
+
+ (upstreamPatch "CVE-2017-5856" "765a707000e838c30b18d712fe6cb3dd8e0435f3"
+ "03pjkn8l8rp9ip5h5rm1dp0nrwd43nmgpwamz4z1vy3rli1z3yjw")
+
+ (upstreamPatch "CVE-2017-5857" "5e8e3c4c75c199aa1017db816fca02be2a9f8798"
+ "1kz14rmxf049zl5m27apzpbvy8dk0g47n9gnwy0nm70g65rl1dh8")
+
+ (upstreamPatch "CVE-2017-5898" "c7dfbf322595ded4e70b626bf83158a9f3807c6a"
+ "1y2j0qw04s8fl0cs8i619y08kj75lxn3c0y19g710fzpk3rq8dvn")
+
+ (upstreamPatch "CVE-2017-5931" "a08aaff811fb194950f79711d2afe5a892ae03a4"
+ "0hlih9jhbb1mb174hvxs7pf7lgcs7s9g705ri9rliw7wrhqdpja5")
+
+ (upstreamPatch "CVE-2017-5973" "f89b60f6e5fee3923bedf80e82b4e5efc1bb156b"
+ "06niyighjxb4p5z2as3mqfmrwrzn4sq47j7raipbq9gnda7x9sw6")
+
+ (upstreamPatch "CVE-2017-5987" "6e86d90352adf6cb08295255220295cf23c4286e"
+ "09yfxf93cisx8rhm0h48ib1ibwfs420k5pqpz8dnz33nci9567jm")
+
] ++ optional nixosTestRunner ./force-uid0-on-9p.patch;
+
hardeningDisable = [ "stackprotector" ];
configureFlags =
@@ -63,9 +154,11 @@ stdenv.mkDerivation rec {
++ optional numaSupport "--enable-numa"
++ optional seccompSupport "--enable-seccomp"
++ optional spiceSupport "--enable-spice"
+ ++ optional usbredirSupport "--enable-usb-redir"
++ optional x86Only "--target-list=i386-softmmu,x86_64-softmmu"
++ optional stdenv.isDarwin "--enable-cocoa"
- ++ optional stdenv.isLinux "--enable-linux-aio";
+ ++ optional stdenv.isLinux "--enable-linux-aio"
+ ++ optional xenSupport "--enable-xen";
postFixup =
''
diff --git a/pkgs/applications/virtualization/qemu/force-uid0-on-9p.patch b/pkgs/applications/virtualization/qemu/force-uid0-on-9p.patch
index 9578d595129f..33c4ffff6fe5 100644
--- a/pkgs/applications/virtualization/qemu/force-uid0-on-9p.patch
+++ b/pkgs/applications/virtualization/qemu/force-uid0-on-9p.patch
@@ -1,8 +1,8 @@
diff --git a/hw/9pfs/9p-local.c b/hw/9pfs/9p-local.c
-index 3f271fc..dc273f4 100644
+index 45e9a1f9b0..494ee00c66 100644
--- a/hw/9pfs/9p-local.c
+++ b/hw/9pfs/9p-local.c
-@@ -45,6 +45,23 @@
+@@ -84,6 +84,23 @@ static void unlinkat_preserve_errno(int dirfd, const char *path, int flags)
#define VIRTFS_META_DIR ".virtfs_metadata"
@@ -23,10 +23,10 @@ index 3f271fc..dc273f4 100644
+ return 0;
+}
+
- static char *local_mapped_attr_path(FsContext *ctx, const char *path)
+ static FILE *local_fopenat(int dirfd, const char *name, const char *mode)
{
- int dirlen;
-@@ -128,6 +145,8 @@ static int local_lstat(FsContext *fs_ctx, V9fsPath *fs_path, struct stat *stbuf)
+ int fd, o_mode = 0;
+@@ -161,6 +178,8 @@ static int local_lstat(FsContext *fs_ctx, V9fsPath *fs_path, struct stat *stbuf)
if (err) {
goto err_out;
}
@@ -35,28 +35,17 @@ index 3f271fc..dc273f4 100644
if (fs_ctx->export_flags & V9FS_SM_MAPPED) {
/* Actual credentials are part of extended attrs */
uid_t tmp_uid;
-@@ -462,6 +481,11 @@ static ssize_t local_pwritev(FsContext *ctx, V9fsFidOpenState *fs,
- return ret;
- }
-
-+static inline int maybe_chmod(const char *path, mode_t mode)
-+{
-+ return is_in_store_path(path) ? 0 : chmod(path, mode);
-+}
-+
- static int local_chmod(FsContext *fs_ctx, V9fsPath *fs_path, FsCred *credp)
+@@ -280,6 +299,9 @@ static int fchmodat_nofollow(int dirfd, const char *name, mode_t mode)
{
- char *buffer;
-@@ -477,7 +501,7 @@ static int local_chmod(FsContext *fs_ctx, V9fsPath *fs_path, FsCred *credp)
- } else if ((fs_ctx->export_flags & V9FS_SM_PASSTHROUGH) ||
- (fs_ctx->export_flags & V9FS_SM_NONE)) {
- buffer = rpath(fs_ctx, path);
-- ret = chmod(buffer, credp->fc_mode);
-+ ret = maybe_chmod(buffer, credp->fc_mode);
- g_free(buffer);
- }
- return ret;
-@@ -621,6 +645,8 @@ static int local_fstat(FsContext *fs_ctx, int fid_type,
+ int fd, ret;
+
++ if (is_in_store_path(name))
++ return 0;
++
+ /* FIXME: this should be handled with fchmodat(AT_SYMLINK_NOFOLLOW).
+ * Unfortunately, the linux kernel doesn't implement it yet. As an
+ * alternative, let's open the file and use fchmod() instead. This
+@@ -661,6 +683,8 @@ static int local_fstat(FsContext *fs_ctx, int fid_type,
if (err) {
return err;
}
@@ -65,13 +54,28 @@ index 3f271fc..dc273f4 100644
if (fs_ctx->export_flags & V9FS_SM_MAPPED) {
/* Actual credentials are part of extended attrs */
uid_t tmp_uid;
-@@ -916,7 +942,8 @@ static int local_chown(FsContext *fs_ctx, V9fsPath *fs_path, FsCred *credp)
+@@ -795,8 +819,11 @@ static int local_symlink(FsContext *fs_ctx, const char *oldpath,
+ if (err) {
+ goto out;
+ }
+- err = fchownat(dirfd, name, credp->fc_uid, credp->fc_gid,
+- AT_SYMLINK_NOFOLLOW);
++ if (is_in_store_path(name))
++ err = 0;
++ else
++ err = fchownat(dirfd, name, credp->fc_uid, credp->fc_gid,
++ AT_SYMLINK_NOFOLLOW);
+ if (err == -1) {
+ /*
+ * If we fail to change ownership and if we are
+@@ -911,7 +938,9 @@ static int local_chown(FsContext *fs_ctx, V9fsPath *fs_path, FsCred *credp)
+ goto out;
+ }
+
+- if ((credp->fc_uid == -1 && credp->fc_gid == -1) ||
++ if (is_in_store_path(name)) {
++ ret = 0;
++ } else if ((credp->fc_uid == -1 && credp->fc_gid == -1) ||
(fs_ctx->export_flags & V9FS_SM_PASSTHROUGH) ||
(fs_ctx->export_flags & V9FS_SM_NONE)) {
- buffer = rpath(fs_ctx, path);
-- ret = lchown(buffer, credp->fc_uid, credp->fc_gid);
-+ ret = is_in_store_path(buffer)
-+ ? 0 : lchown(buffer, credp->fc_uid, credp->fc_gid);
- g_free(buffer);
- } else if (fs_ctx->export_flags & V9FS_SM_MAPPED) {
- buffer = rpath(fs_ctx, path);
+ ret = fchownat(dirfd, name, credp->fc_uid, credp->fc_gid,
diff --git a/pkgs/applications/virtualization/rkt/default.nix b/pkgs/applications/virtualization/rkt/default.nix
index 7059b8606808..81e26f78528d 100644
--- a/pkgs/applications/virtualization/rkt/default.nix
+++ b/pkgs/applications/virtualization/rkt/default.nix
@@ -12,7 +12,7 @@ let
stage1Dir = "lib/rkt/stage1-images";
in stdenv.mkDerivation rec {
- version = "1.24.0";
+ version = "1.25.0";
name = "rkt-${version}";
BUILDDIR="build-${name}";
@@ -20,7 +20,7 @@ in stdenv.mkDerivation rec {
owner = "coreos";
repo = "rkt";
rev = "v${version}";
- sha256 = "11vp3pm00xsksdgdv67sgvrrpj3ayp7sx1wprn4aa579vbbr83bd";
+ sha256 = "0lcnhyaxq8z0ndwqg0svcc1gg0ahhcprxlf9gifm4mpxqimhaz8j";
};
stage1BaseImage = fetchurl {
diff --git a/pkgs/applications/virtualization/runc/default.nix b/pkgs/applications/virtualization/runc/default.nix
index 7f19121b7f5b..3ce183d90e26 100644
--- a/pkgs/applications/virtualization/runc/default.nix
+++ b/pkgs/applications/virtualization/runc/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, lib, fetchFromGitHub, fetchpatch, go-md2man
+{ stdenv, lib, fetchFromGitHub, fetchpatch, removeReferencesTo, go-md2man
, go, pkgconfig, libapparmor, apparmor-parser, libseccomp }:
with lib;
@@ -33,7 +33,7 @@ stdenv.mkDerivation rec {
hardeningDisable = ["fortify"];
- buildInputs = [ go-md2man go pkgconfig libseccomp libapparmor apparmor-parser ];
+ buildInputs = [ removeReferencesTo go-md2man go pkgconfig libseccomp libapparmor apparmor-parser ];
makeFlags = ''BUILDTAGS+=seccomp BUILDTAGS+=apparmor'';
@@ -61,10 +61,7 @@ stdenv.mkDerivation rec {
'';
preFixup = ''
- # remove references to go compiler
- while read file; do
- sed -ri "s,${go},$(echo "${go}" | sed "s,$NIX_STORE/[^-]*,$NIX_STORE/eeeeeeeeeeeeeeeeeeeeeeeeeeeeeeee,"),g" $file
- done < <(find $out/bin -type f 2>/dev/null)
+ find $out/bin -type f -exec remove-references-to -t ${go} '{}' +
'';
meta = {
diff --git a/pkgs/applications/virtualization/virt-manager/default.nix b/pkgs/applications/virtualization/virt-manager/default.nix
index bd003df57f85..9bc2bc3db08e 100644
--- a/pkgs/applications/virtualization/virt-manager/default.nix
+++ b/pkgs/applications/virtualization/virt-manager/default.nix
@@ -1,33 +1,35 @@
-{ stdenv, fetchurl, python2Packages, intltool, curl
-, wrapGAppsHook, virtinst, gtkvnc, vte
-, gtk3, gobjectIntrospection, libvirt-glib, gsettings_desktop_schemas, glib
-, avahi, dconf, spiceSupport ? true, spice_gtk, libosinfo, gnome3, system-libvirt
+{ stdenv, fetchurl, python2Packages, intltool, file
+, wrapGAppsHook, virtinst, gtkvnc, vte, avahi, dconf
+, gobjectIntrospection, libvirt-glib, system-libvirt
+, gsettings_desktop_schemas, glib, libosinfo, gnome3
+, spiceSupport ? true, spice_gtk ? null
}:
with stdenv.lib;
-with python2Packages;
-buildPythonApplication rec {
+python2Packages.buildPythonApplication rec {
name = "virt-manager-${version}";
- version = "1.4.0";
+ version = "1.4.1";
namePrefix = "";
src = fetchurl {
url = "http://virt-manager.org/download/sources/virt-manager/${name}.tar.gz";
- sha256 = "1jnawqjmcqd2db78ngx05x7cxxn3iy1sb4qfgbwcn045qh6a8cdz";
+ sha256 = "0i1rkxz730vw1nqghrp189jhhp53pw81k0h71hhxmyqlkyclkig6";
};
- propagatedBuildInputs =
- [ eventlet greenlet gflags netaddr carrot routes
- PasteDeploy m2crypto ipy twisted
- distutils_extra simplejson glanceclient cheetah lockfile httplib2
- urlgrabber virtinst pyGtkGlade dbus-python /*gnome_python FIXME*/ pygobject3
- libvirt libxml2 ipaddr vte libosinfo gobjectIntrospection gtk3 mox
- gtkvnc libvirt-glib glib gsettings_desktop_schemas gnome3.defaultIconTheme
- wrapGAppsHook
+ nativeBuildInputs = [ wrapGAppsHook intltool file ];
+
+ buildInputs =
+ [ libvirt-glib vte virtinst dconf gtkvnc gnome3.defaultIconTheme avahi
+ gsettings_desktop_schemas libosinfo
] ++ optional spiceSupport spice_gtk;
- buildInputs = [ dconf avahi intltool ];
+ propagatedBuildInputs = with python2Packages;
+ [ eventlet greenlet gflags netaddr carrot routes PasteDeploy
+ m2crypto ipy twisted distutils_extra simplejson glanceclient
+ cheetah lockfile httplib2 urlgrabber pyGtkGlade dbus-python
+ pygobject3 ipaddr mox libvirt libxml2
+ ];
patchPhase = ''
sed -i 's|/usr/share/libvirt/cpu_map.xml|${system-libvirt}/share/libvirt/cpu_map.xml|g' virtinst/capabilities.py
@@ -35,7 +37,7 @@ buildPythonApplication rec {
'';
postConfigure = ''
- ${python.interpreter} setup.py configure --prefix=$out
+ ${python2Packages.python.interpreter} setup.py configure --prefix=$out
'';
postInstall = ''
@@ -54,6 +56,6 @@ buildPythonApplication rec {
manages Xen and LXC (linux containers).
'';
license = licenses.gpl2;
- maintainers = with maintainers; [qknight offline];
+ maintainers = with maintainers; [ qknight offline fpletz ];
};
}
diff --git a/pkgs/applications/virtualization/virt-manager/qt.nix b/pkgs/applications/virtualization/virt-manager/qt.nix
new file mode 100644
index 000000000000..1952102e71a2
--- /dev/null
+++ b/pkgs/applications/virtualization/virt-manager/qt.nix
@@ -0,0 +1,47 @@
+{ stdenv, fetchFromGitHub, cmake, pkgconfig
+, qtbase, qtmultimedia, qtsvg, makeQtWrapper
+, lxqt, libvncserver, libvirt, pixman, spice_gtk, spice_protocol
+}:
+
+stdenv.mkDerivation rec {
+ name = "virt-manager-qt-${version}";
+ version = "0.42.67";
+
+ src = fetchFromGitHub {
+ owner = "F1ash";
+ repo = "qt-virt-manager";
+ rev = "${version}";
+ sha256 = "0hskaffc84wf8h9qck5xg840jw8x2krfy6cw4hqnq946z9lbyanr";
+ };
+
+ cmakeFlags = [
+ "-DBUILD_QT_VERSION=5"
+ ];
+
+ buildInputs = [
+ qtbase qtmultimedia qtsvg lxqt.qtermwidget
+ libvirt libvncserver pixman spice_gtk spice_protocol
+ ];
+
+ nativeBuildInputs = [ cmake pkgconfig makeQtWrapper ];
+
+ postFixup = ''
+ for f in $out/bin/* ; do
+ wrapQtProgram $f
+ done
+ '';
+
+ enableParallelBuilding = true;
+
+ meta = with stdenv.lib; {
+ homepage = http://f1ash.github.io/qt-virt-manager;
+ description = "Desktop user interface for managing virtual machines (QT)";
+ longDescription = ''
+ The virt-manager application is a desktop user interface for managing
+ virtual machines through libvirt. It primarily targets KVM VMs, but also
+ manages Xen and LXC (linux containers).
+ '';
+ license = licenses.gpl2;
+ maintainers = with maintainers; [ peterhoeg ];
+ };
+}
diff --git a/pkgs/applications/virtualization/virt-viewer/default.nix b/pkgs/applications/virtualization/virt-viewer/default.nix
index f63eeb603068..3b8d0a7cf63e 100644
--- a/pkgs/applications/virtualization/virt-viewer/default.nix
+++ b/pkgs/applications/virtualization/virt-viewer/default.nix
@@ -1,7 +1,9 @@
{ stdenv, fetchurl, pkgconfig, intltool, glib, libxml2, gtk3, gtkvnc, gmp
-, libgcrypt, gnupg, cyrus_sasl, shared_mime_info, libvirt, libcap_ng, yajl
-, gsettings_desktop_schemas, makeWrapper, xen, numactl
-, spiceSupport ? true, spice_gtk ? null, spice_protocol ? null, libcap ? null, gdbm ? null
+, libgcrypt, gnupg, cyrus_sasl, shared_mime_info, libvirt, yajl, xen
+, gsettings_desktop_schemas, makeWrapper, libvirt-glib, libcap_ng, numactl
+, libapparmor
+, spiceSupport ? true
+, spice_gtk ? null, spice_protocol ? null, libcap ? null, gdbm ? null
}:
assert spiceSupport ->
@@ -11,18 +13,19 @@ with stdenv.lib;
stdenv.mkDerivation rec {
baseName = "virt-viewer";
- version = "2.0";
+ version = "5.0";
name = "${baseName}-${version}";
src = fetchurl {
url = "http://virt-manager.org/download/sources/${baseName}/${name}.tar.gz";
- sha256 = "0dylhpk5rq9jz0l1cxs50q2s74z0wingygm1m33bmnmcnny87ig9";
+ sha256 = "0blbp1wkw8ahss9va0bmcz2yx18j0mvm6fzrzhh2ly3sja5ysb8b";
};
+ nativeBuildInputs = [ pkgconfig intltool ];
buildInputs = [
- pkgconfig intltool glib libxml2 gtk3 gtkvnc gmp libgcrypt gnupg cyrus_sasl
- shared_mime_info libvirt libcap_ng yajl gsettings_desktop_schemas makeWrapper
- xen numactl
+ glib libxml2 gtk3 gtkvnc gmp libgcrypt gnupg cyrus_sasl shared_mime_info
+ libvirt yajl gsettings_desktop_schemas makeWrapper libvirt-glib
+ libcap_ng numactl libapparmor xen
] ++ optionals spiceSupport [ spice_gtk spice_protocol libcap gdbm ];
postInstall = ''
diff --git a/pkgs/applications/virtualization/virtualbox/default.nix b/pkgs/applications/virtualization/virtualbox/default.nix
index 7512ddb6b0f8..6c49e95b6b94 100644
--- a/pkgs/applications/virtualization/virtualbox/default.nix
+++ b/pkgs/applications/virtualization/virtualbox/default.nix
@@ -18,10 +18,10 @@ let
python = python2;
buildType = "release";
- extpack = "baddb7cc49224ecc1147f82d77fce2685ac39941ac9b0aac83c270dd6570ea85";
- extpackRev = 112924;
- main = "8267bb026717c6e55237eb798210767d9c703cfcdf01224d9bc26f7dac9f228a";
- version = "5.1.14";
+ extpack = "996f783996a597d3936fc5f1ccf56edd31ae1f8fb4d527009647d9a2c8c853cd";
+ extpackRev = "114002";
+ main = "7ed0959bbbd02826b86b3d5dc8348931ddfab267c31f8ed36ee53c12f5522cd9";
+ version = "5.1.18";
# See https://github.com/NixOS/nixpkgs/issues/672 for details
extensionPack = requireFile rec {
@@ -58,7 +58,7 @@ in stdenv.mkDerivation {
++ optional pythonBindings python # Python is needed even when not building bindings
++ optional pulseSupport libpulseaudio
++ optionals (headless) [ libXrandr ]
- ++ optionals (!headless) [ qt5.qtbase qt5.qtx11extras libXinerama SDL ];
+ ++ optionals (!headless) [ qt5.qtbase qt5.qtx11extras qt5.makeQtWrapper libXinerama SDL ];
hardeningDisable = [ "fortify" "pic" "stackprotector" ];
@@ -66,20 +66,23 @@ in stdenv.mkDerivation {
set -x
sed -e 's@MKISOFS --version@MKISOFS -version@' \
-e 's@PYTHONDIR=.*@PYTHONDIR=${if pythonBindings then python else ""}@' \
+ -e 's@CXX_FLAGS="\(.*\)"@CXX_FLAGS="-std=c++11 \1"@' \
${optionalString (!headless) ''
-e 's@TOOLQT5BIN=.*@TOOLQT5BIN="${getDev qt5.qtbase}/bin"@' \
''} -i configure
ls kBuild/bin/linux.x86/k* tools/linux.x86/bin/* | xargs -n 1 patchelf --set-interpreter ${stdenv.glibc.out}/lib/ld-linux.so.2
ls kBuild/bin/linux.amd64/k* tools/linux.amd64/bin/* | xargs -n 1 patchelf --set-interpreter ${stdenv.glibc.out}/lib/ld-linux-x86-64.so.2
- sed -i -e '
- s@"libdbus-1\.so\.3"@"${dbus.lib}/lib/libdbus-1.so.3"@g
- s@"libasound\.so\.2"@"${alsaLib.out}/lib/libasound.so.2"@g
- ${optionalString pulseSupport ''
- s@"libpulse\.so\.0"@"${libpulseaudio.out}/lib/libpulse.so.0"@g
- ''}
- ' src/VBox/Main/xml/Settings.cpp \
- src/VBox/Devices/Audio/{alsa,pulse}_stubs.c \
- include/VBox/dbus-calls.h
+
+ grep 'libpulse\.so\.0' src include -rI --files-with-match | xargs sed -i -e '
+ ${optionalString pulseSupport
+ ''s@"libpulse\.so\.0"@"${libpulseaudio.out}/lib/libpulse.so.0"@g''}'
+
+ grep 'libdbus-1\.so\.3' src include -rI --files-with-match | xargs sed -i -e '
+ s@"libdbus-1\.so\.3"@"${dbus.lib}/lib/libdbus-1.so.3"@g'
+
+ grep 'libasound\.so\.2' src include -rI --files-with-match | xargs sed -i -e '
+ s@"libasound\.so\.2"@"${alsaLib.out}/lib/libasound.so.2"@g'
+
export USER=nix
set +x
'';
@@ -152,7 +155,12 @@ in stdenv.mkDerivation {
# Create wrapper script
mkdir -p $out/bin
- for file in VirtualBox VBoxManage VBoxSDL VBoxBalloonCtrl VBoxBFE VBoxHeadless; do
+ ${optionalString (!headless) ''
+ makeQtWrapper "$libexec/VirtualBox" $out/bin/VirtualBox
+ ''}
+ for file in ${optionalString (!headless) "VBoxSDL rdesktop-vrdp"} VBoxManage VBoxBalloonCtrl VBoxHeadless; do
+ echo "Linking $file to /bin"
+ test -x "$libexec/$file"
ln -s "$libexec/$file" $out/bin/$file
done
diff --git a/pkgs/applications/virtualization/virtualbox/guest-additions/default.nix b/pkgs/applications/virtualization/virtualbox/guest-additions/default.nix
index 6e58d42a1cb5..df59f3e0e2e1 100644
--- a/pkgs/applications/virtualization/virtualbox/guest-additions/default.nix
+++ b/pkgs/applications/virtualization/virtualbox/guest-additions/default.nix
@@ -19,7 +19,7 @@ stdenv.mkDerivation {
src = fetchurl {
url = "http://download.virtualbox.org/virtualbox/${version}/VBoxGuestAdditions_${version}.iso";
- sha256 = "1b206b76050dccd3ed979307230f9ddea79551e1c0aba93faee77416733cdc8a";
+ sha256 = "f2951b49f48a560fbc1afe9d135d1f3f82a3e158b9002278d05d978428adca8a";
};
KERN_DIR = "${kernel.dev}/lib/modules/*/build";
diff --git a/pkgs/applications/virtualization/xen/0000-fix-install-python.patch b/pkgs/applications/virtualization/xen/0000-fix-install-python.patch
new file mode 100644
index 000000000000..53821c0d9c51
--- /dev/null
+++ b/pkgs/applications/virtualization/xen/0000-fix-install-python.patch
@@ -0,0 +1,16 @@
+tools/python/install-wrap script brakes shebangs patching, disable
+
+diff --git a/tools/Rules.mk b/tools/Rules.mk
+index 87a56dc..a7da869 100644
+--- a/tools/Rules.mk
++++ b/tools/Rules.mk
+@@ -90,8 +90,7 @@ CFLAGS += $(CFLAGS-y)
+
+ CFLAGS += $(EXTRA_CFLAGS_XEN_TOOLS)
+
+-INSTALL_PYTHON_PROG = \
+- $(XEN_ROOT)/tools/python/install-wrap "$(PYTHON_PATH)" $(INSTALL_PROG)
++INSTALL_PYTHON_PROG = $(INSTALL_PROG)
+
+ %.opic: %.c
+ $(CC) $(CPPFLAGS) -DPIC $(CFLAGS) $(CFLAGS_$*.opic) -fPIC -c -o $@ $< $(APPEND_CFLAGS)
diff --git a/pkgs/applications/virtualization/xen/0000-fix-ipxe-src.patch b/pkgs/applications/virtualization/xen/0000-fix-ipxe-src.patch
new file mode 100644
index 000000000000..072338b87aba
--- /dev/null
+++ b/pkgs/applications/virtualization/xen/0000-fix-ipxe-src.patch
@@ -0,0 +1,27 @@
+hack to make etherboot use prefetched ipxe
+
+diff --git a/tools/firmware/etherboot/Makefile b/tools/firmware/etherboot/Makefile
+index a0578d2..64428a0 100644
+--- a/tools/firmware/etherboot/Makefile
++++ b/tools/firmware/etherboot/Makefile
+@@ -16,6 +16,7 @@ IPXE_TARBALL_URL ?= $(XEN_EXTFILES_URL)/ipxe-git-$(IPXE_GIT_TAG).tar.gz
+
+ D=ipxe
+ T=ipxe.tar.gz
++G=ipxe.git
+
+ ROMS = $(addprefix $D/src/bin/, $(addsuffix .rom, $(ETHERBOOT_NICS)))
+
+@@ -36,9 +37,9 @@ $T:
+ fi
+ mv _$T $T
+
+-$D/src/arch/i386/Makefile: $T Config
+- rm -rf $D
+- gzip -dc $T | tar xf -
++$D/src/arch/i386/Makefile: $G Config
++ mkdir $D
++ cp -a $G/* $D
+ for i in $$(cat patches/series) ; do \
+ patch -d $D -p1 --quiet !withSeabios;
+assert withInternalOVMF -> !withOVMF;
+
+with stdenv.lib;
+
+# Patching XEN? Check the XSAs at
+# https://xenbits.xen.org/xsa/
+# and try applying all the ones we don't have yet.
let
- # Xen 4.5.5
- #
- # Patching XEN? Check the XSAs and try applying all the ones we
- # don't have yet.
- #
- # XSAs at: https://xenbits.xen.org/xsa/
- xenConfig = rec {
- version = "4.5.5";
+ xsaPatch = { name , sha256 }: (fetchpatch {
+ url = "https://xenbits.xen.org/xsa/xsa${name}.patch";
+ inherit sha256;
+ });
- xsaPatch = { name , sha256 }: (fetchpatch {
- url = "https://xenbits.xen.org/xsa/xsa${name}.patch";
- inherit sha256;
- });
+ qemuDeps = [
+ udev pciutils xorg.libX11 SDL pixman acl glusterfs spice_protocol usbredir
+ alsaLib
+ ];
+in
- name = "xen-${version}";
+callPackage (import ./generic.nix (rec {
+ version = "4.5.5";
- src = fetchurl {
- url = "http://bits.xensource.com/oss-xen/release/${version}/${name}.tar.gz";
- sha256 = "1y74ms4yc3znf8jc3fgyq94va2y0pf7jh8m9pfqnpgklywqnw8g2";
- };
-
- # Sources needed to build the xen tools and tools/firmware.
- firmwareGits =
- [
- { git = { name = "seabios";
- url = https://xenbits.xen.org/git-http/seabios.git;
- rev = "rel-1.7.5";
- sha256 = "0jk54ybhmw97pzyhpm6jr2x99f702kbn0ipxv5qxcbynflgdazyb";
- };
- patches = [ ./0000-qemu-seabios-enable-ATA_DMA.patch ];
- }
- ];
-
- toolsGits =
- [
- { git = { name = "qemu-xen";
- url = https://xenbits.xen.org/git-http/qemu-xen.git;
- rev = "refs/tags/qemu-xen-${version}";
- sha256 = "014s755slmsc7xzy7qhk9i3kbjr2grxb5yznjp71dl6xxfvnday2";
- };
- }
- { git = { name = "qemu-xen-traditional";
- url = https://xenbits.xen.org/git-http/qemu-xen-traditional.git;
- # rev = "28c21388c2a32259cff37fc578684f994dca8c9f";
- rev = "refs/tags/xen-${version}";
- sha256 = "0n0ycxlf1wgdjkdl8l2w1i0zzssk55dfv67x8i6b2ima01r0k93r";
- };
- }
- { git = { name = "xen-libhvm";
- url = https://github.com/ts468/xen-libhvm;
- rev = "442dcc4f6f4e374a51e4613532468bd6b48bdf63";
- sha256 = "9ba97c39a00a54c154785716aa06691d312c99be498ebbc00dc3769968178ba8";
- };
- description = ''
- Helper library for reading ACPI and SMBIOS firmware values
- from the host system for use with the HVM guest firmware
- pass-through feature in Xen.
- '';
- #license = licenses.bsd2;
- }
- ];
-
- # Note this lacks patches for:
- # XSA-201
- # XSA-199
- # XSA-197
- # they didn't apply, and there are plenty of other patches here
- # to get this deployed as-is.
- xenPatches = [ ./0001-libxl-Spice-image-compression-setting-support-for-up.patch
- ./0002-libxl-Spice-streaming-video-setting-support-for-upst.patch
- ./0003-Add-qxl-vga-interface-support-for-upstream-qem.patch
- (xsaPatch {
- name = "190-4.5";
- sha256 = "0f8pw38kkxky89ny3ic5h26v9zsjj9id89lygx896zc3w1klafqm";
- })
- (xsaPatch {
- name = "191-4.6";
- sha256 = "1wl1ndli8rflmc44pkp8cw4642gi8z7j7gipac8mmlavmn3wdqhg";
- })
- (xsaPatch {
- name = "192-4.5";
- sha256 = "0m8cv0xqvx5pdk7fcmaw2vv43xhl62plyx33xqj48y66x5z9lxpm";
- })
- (xsaPatch {
- name = "193-4.5";
- sha256 = "0k9mykhrpm4rbjkhv067f6s05lqmgnldcyb3vi8cl0ndlyh66lvr";
- })
- (xsaPatch {
- name = "195";
- sha256 = "0m0g953qnjy2knd9qnkdagpvkkgjbk3ydgajia6kzs499dyqpdl7";
- })
- (xsaPatch {
- name = "196-0001-x86-emul-Correct-the-IDT-entry-calculation-in-inject";
- sha256 = "0z53nzrjvc745y26z1qc8jlg3blxp7brawvji1hx3s74n346ssl6";
- })
- (xsaPatch {
- name = "196-0002-x86-svm-Fix-injection-of-software-interrupts";
- sha256 = "11cqvr5jn2s92wsshpilx9qnfczrd9hnyb5aim6qwmz3fq3hrrkz";
- })
- (xsaPatch {
- name = "198";
- sha256 = "0d1nndn4p520c9xa87ixnyks3mrvzcri7c702d6mm22m8ansx6d9";
- })
- (xsaPatch {
- name = "200-4.6";
- sha256 = "0k918ja83470iz5k4vqi15293zjvz2dipdhgc9sy9rrhg4mqncl7";
- })
- (xsaPatch {
- name = "202-4.6";
- sha256 = "0nnznkrvfbbc8z64dr9wvbdijd4qbpc0wz2j5vpmx6b32sm7932f";
- })
- (xsaPatch {
- name = "204-4.5";
- sha256 = "083z9pbdz3f532fnzg7n2d5wzv6rmqc0f4mvc3mnmkd0rzqw8vcp";
- })
- ];
+ src = fetchurl {
+ url = "http://bits.xensource.com/oss-xen/release/${version}/xen-${version}.tar.gz";
+ sha256 = "1y74ms4yc3znf8jc3fgyq94va2y0pf7jh8m9pfqnpgklywqnw8g2";
};
-in callPackage ./generic.nix (args // { xenConfig=xenConfig; })
+ # Sources needed to build tools and firmwares.
+ xenfiles = optionalAttrs withInternalQemu {
+ "qemu-xen" = {
+ src = fetchgit {
+ url = https://xenbits.xen.org/git-http/qemu-xen.git;
+ rev = "refs/tags/qemu-xen-${version}";
+ sha256 = "014s755slmsc7xzy7qhk9i3kbjr2grxb5yznjp71dl6xxfvnday2";
+ };
+ buildInputs = qemuDeps;
+ patches = [
+ (xsaPatch {
+ name = "197-4.5-qemuu";
+ sha256 = "09gp980qdlfpfmxy0nk7ncyaa024jnrpzx9gpq2kah21xygy5myx";
+ })
+ (xsaPatch {
+ name = "208-qemuu-4.7";
+ sha256 = "0z9b1whr8rp2riwq7wndzcnd7vw1ckwx0vbk098k2pcflrzppgrb";
+ })
+ (xsaPatch {
+ name = "209-qemuu/0001-display-cirrus-ignore-source-pitch-value-as-needed-i";
+ sha256 = "1xvxzsrsq05fj6szjlpbgg4ia3cw54dn5g7xzq1n1dymbhv606m0";
+ })
+ (xsaPatch {
+ name = "209-qemuu/0002-cirrus-add-blit_is_unsafe-call-to-cirrus_bitblt_cput";
+ sha256 = "0avxqs9922qjfsxxlk7bh10432a526j2yyykhags8dk1bzxkpxwv";
+ })
+ ];
+ meta.description = "Xen's fork of upstream Qemu";
+ };
+ } // optionalAttrs withInternalTraditionalQemu {
+ "qemu-xen-traditional" = {
+ src = fetchgit {
+ url = https://xenbits.xen.org/git-http/qemu-xen-traditional.git;
+ rev = "refs/tags/xen-${version}";
+ sha256 = "0n0ycxlf1wgdjkdl8l2w1i0zzssk55dfv67x8i6b2ima01r0k93r";
+ };
+ buildInputs = qemuDeps;
+ patches = [
+ (xsaPatch {
+ name = "197-4.5-qemut";
+ sha256 = "17l7npw00gyhqzzaqamwm9cawfvzm90zh6jjyy95dmqbh7smvy79";
+ })
+ (xsaPatch {
+ name = "199-trad";
+ sha256 = "0dfw6ciycw9a9s97sbnilnzhipnzmdm9f7xcfngdjfic8cqdcv42";
+ })
+ (xsaPatch {
+ name = "208-qemut";
+ sha256 = "0960vhchixp60j9h2lawgbgzf6mpcdk440kblk25a37bd6172l54";
+ })
+ (xsaPatch {
+ name = "209-qemut";
+ sha256 = "1hq8ghfzw6c47pb5vf9ngxwgs8slhbbw6cq7gk0nam44rwvz743r";
+ })
+ ];
+ postPatch = ''
+ substituteInPlace xen-hooks.mak \
+ --replace /usr/include/pci ${pciutils}/include/pci
+ '';
+ meta.description = "Xen's fork of upstream Qemu that uses old device model";
+ };
+ } // optionalAttrs withInternalSeabios {
+ "firmware/seabios-dir-remote" = {
+ src = fetchgit {
+ url = https://xenbits.xen.org/git-http/seabios.git;
+ rev = "e51488c5f8800a52ac5c8da7a31b85cca5cc95d2";
+ #rev = "rel-1.7.5";
+ sha256 = "0jk54ybhmw97pzyhpm6jr2x99f702kbn0ipxv5qxcbynflgdazyb";
+ };
+ patches = [ ./0000-qemu-seabios-enable-ATA_DMA.patch ];
+ meta.description = "Xen's fork of Seabios";
+ };
+ } // optionalAttrs withInternalOVMF {
+ "firmware/ovmf-dir-remote" = {
+ src = fetchgit {
+ url = https://xenbits.xen.org/git-http/ovmf.git;
+ rev = "cb9a7ebabcd6b8a49dc0854b2f9592d732b5afbd";
+ sha256 = "07zmdj90zjrzip74fvd4ss8n8njk6cim85s58mc6snxmqqv7gmcq";
+ };
+ meta.description = "Xen's fork of OVMF";
+ };
+ } // {
+ # TODO: patch Xen to make this optional?
+ "firmware/etherboot/ipxe.git" = {
+ src = fetchgit {
+ url = https://git.ipxe.org/ipxe.git;
+ rev = "9a93db3f0947484e30e753bbd61a10b17336e20e";
+ sha256 = "1ga3h1b34q0cl9azj7j9nswn7mfcs3cgfjdihrm5zkp2xw2hpvr6";
+ };
+ meta.description = "Xen's fork of iPXE";
+ };
+ } // optionalAttrs withLibHVM {
+ "xen-libhvm-dir-remote" = {
+ src = fetchgit {
+ name = "xen-libhvm";
+ url = https://github.com/ts468/xen-libhvm;
+ rev = "442dcc4f6f4e374a51e4613532468bd6b48bdf63";
+ sha256 = "9ba97c39a00a54c154785716aa06691d312c99be498ebbc00dc3769968178ba8";
+ };
+ buildPhase = ''
+ make
+ cd biospt
+ cc -Wall -g -D_LINUX -Wstrict-prototypes biospt.c -o biospt -I../libhvm -L../libhvm -lxenhvm
+ '';
+ installPhase = ''
+ make install
+ cp biospt/biospt $out/bin/
+ '';
+ meta = {
+ description = ''
+ Helper library for reading ACPI and SMBIOS firmware values
+ from the host system for use with the HVM guest firmware
+ pass-through feature in Xen'';
+ license = licenses.bsd2;
+ };
+ };
+ };
+
+ configureFlags = []
+ ++ optional (!withInternalQemu) "--with-system-qemu" # use qemu from PATH
+ ++ optional (withInternalTraditionalQemu) "--enable-qemu-traditional"
+ ++ optional (!withInternalTraditionalQemu) "--disable-qemu-traditional"
+
+ ++ optional (withSeabios) "--with-system-seabios=${seabios}"
+ ++ optional (!withInternalSeabios && !withSeabios) "--disable-seabios"
+
+ ++ optional (withOVMF) "--with-system-ovmf=${OVMF}"
+ ++ optional (withInternalOVMF) "--enable-ovmf";
+
+ patches =
+ [ ./0001-libxl-Spice-image-compression-setting-support-for-up.patch
+ ./0002-libxl-Spice-streaming-video-setting-support-for-upst.patch
+ ./0003-Add-qxl-vga-interface-support-for-upstream-qem.patch
+ (xsaPatch {
+ name = "190-4.5";
+ sha256 = "0f8pw38kkxky89ny3ic5h26v9zsjj9id89lygx896zc3w1klafqm";
+ })
+ (xsaPatch {
+ name = "191-4.6";
+ sha256 = "1wl1ndli8rflmc44pkp8cw4642gi8z7j7gipac8mmlavmn3wdqhg";
+ })
+ (xsaPatch {
+ name = "192-4.5";
+ sha256 = "0m8cv0xqvx5pdk7fcmaw2vv43xhl62plyx33xqj48y66x5z9lxpm";
+ })
+ (xsaPatch {
+ name = "193-4.5";
+ sha256 = "0k9mykhrpm4rbjkhv067f6s05lqmgnldcyb3vi8cl0ndlyh66lvr";
+ })
+ (xsaPatch {
+ name = "195";
+ sha256 = "0m0g953qnjy2knd9qnkdagpvkkgjbk3ydgajia6kzs499dyqpdl7";
+ })
+ (xsaPatch {
+ name = "196-0001-x86-emul-Correct-the-IDT-entry-calculation-in-inject";
+ sha256 = "0z53nzrjvc745y26z1qc8jlg3blxp7brawvji1hx3s74n346ssl6";
+ })
+ (xsaPatch {
+ name = "196-0002-x86-svm-Fix-injection-of-software-interrupts";
+ sha256 = "11cqvr5jn2s92wsshpilx9qnfczrd9hnyb5aim6qwmz3fq3hrrkz";
+ })
+ (xsaPatch {
+ name = "198";
+ sha256 = "0d1nndn4p520c9xa87ixnyks3mrvzcri7c702d6mm22m8ansx6d9";
+ })
+ (xsaPatch {
+ name = "200-4.6";
+ sha256 = "0k918ja83470iz5k4vqi15293zjvz2dipdhgc9sy9rrhg4mqncl7";
+ })
+ (xsaPatch {
+ name = "202-4.6";
+ sha256 = "0nnznkrvfbbc8z64dr9wvbdijd4qbpc0wz2j5vpmx6b32sm7932f";
+ })
+ (xsaPatch {
+ name = "204-4.5";
+ sha256 = "083z9pbdz3f532fnzg7n2d5wzv6rmqc0f4mvc3mnmkd0rzqw8vcp";
+ })
+ (xsaPatch {
+ name = "207";
+ sha256 = "0wdlhijmw9mdj6a82pyw1rwwiz605dwzjc392zr3fpb2jklrvibc";
+ })
+ ];
+
+ # Fix build on Glibc 2.24.
+ NIX_CFLAGS_COMPILE = "-Wno-error=deprecated-declarations";
+
+ postPatch = ''
+ # Avoid a glibc >= 2.25 deprecation warnings that get fatal via -Werror.
+ sed 1i'#include ' \
+ -i tools/blktap2/control/tap-ctl-allocate.c \
+ -i tools/libxl/libxl_device.c
+ '';
+
+})) args
diff --git a/pkgs/applications/virtualization/xen/generic.nix b/pkgs/applications/virtualization/xen/generic.nix
index a697e2aa7ef4..953368b7e3bc 100644
--- a/pkgs/applications/virtualization/xen/generic.nix
+++ b/pkgs/applications/virtualization/xen/generic.nix
@@ -1,183 +1,219 @@
-{ stdenv, fetchurl, which, zlib, pkgconfig, SDL, openssl
-, libuuid, gettext, ncurses, dev86, iasl, pciutils, bzip2
-, lvm2, utillinux, procps, texinfo, perl, python2Packages
-, glib, bridge-utils, xorg, pixman, iproute, udev, bison
-, flex, cmake, ocamlPackages, figlet, libaio, yajl
-, checkpolicy, transfig, glusterfs, acl, fetchgit, xz, spice
-, spice_protocol, usbredir, alsaLib, quilt
+config:
+{ stdenv, cmake, pkgconfig, which
+
+# Xen
+, bison, bzip2, checkpolicy, dev86, figlet, flex, gettext, glib
+, iasl, libaio, libiconv, libuuid, ncurses, openssl, perl
+, python2Packages
+# python2Packages.python
+, xz, yajl, zlib
+
+# Xen Optional
+, ocamlPackages
+
+# Scripts
, coreutils, gawk, gnused, gnugrep, diffutils, multipath-tools
-, inetutils, iptables, openvswitch, nbd, drbd, xenConfig
-, xenserverPatched ? false, ... }:
+, iproute, inetutils, iptables, bridge-utils, openvswitch, nbd, drbd
+, lvm2, utillinux, procps
+
+# Documentation
+# python2Packages.markdown
+, transfig, ghostscript, texinfo, pandoc
+
+, ...} @ args:
with stdenv.lib;
let
+ #TODO: fix paths instead
+ scriptEnvPath = concatMapStringsSep ":" (x: "${x}/bin") [
+ which perl
+ coreutils gawk gnused gnugrep diffutils utillinux multipath-tools
+ iproute inetutils iptables bridge-utils openvswitch nbd drbd
+ ];
- libDir = if stdenv.is64bit then "lib64" else "lib";
+ withXenfiles = f: concatStringsSep "\n" (mapAttrsToList f config.xenfiles);
- # Sources needed to build the tools
- # These sources are already rather old and probably do not change frequently
- xenExtfiles = [
- { url = http://xenbits.xensource.com/xen-extfiles/ipxe-git-9a93db3f0947484e30e753bbd61a10b17336e20e.tar.gz;
- sha256 = "0p206zaxlhda60ci33h9gipi5gm46fvvsm6k5c0w7b6cjg0yhb33";
- }
- ];
-
- scriptEnvPath = stdenv.lib.concatStrings (stdenv.lib.intersperse ":" (map (x: "${x}/bin")
- [ coreutils gawk gnused gnugrep which perl diffutils utillinux multipath-tools
- iproute inetutils iptables bridge-utils openvswitch nbd drbd ]));
+ withTools = a: f: withXenfiles (name: x: optionalString (hasAttr a x) ''
+ echo "processing ${name}"
+ __do() {
+ cd "tools/${name}"
+ ${f name x}
+ }
+ ( __do )
+ '');
in
+stdenv.mkDerivation (rec {
+ inherit (config) version;
-
-stdenv.mkDerivation {
- inherit (xenConfig) name version src;
+ name = "xen-${version}";
dontUseCmakeConfigure = true;
- buildInputs =
- [ which zlib pkgconfig SDL openssl libuuid gettext ncurses
- dev86 iasl pciutils bzip2 xz texinfo perl yajl
- python2Packages.python python2Packages.wrapPython
- glib bridge-utils pixman iproute udev bison xorg.libX11
- flex ocamlPackages.ocaml ocamlPackages.findlib figlet libaio
- checkpolicy python2Packages.markdown transfig
- glusterfs acl cmake spice spice_protocol usbredir
- alsaLib quilt
- ];
-
hardeningDisable = [ "stackprotector" "fortify" "pic" ];
- patches = stdenv.lib.optionals ((xenserverPatched == false) && (builtins.hasAttr "xenPatches" xenConfig)) xenConfig.xenPatches;
+ buildInputs = [
+ cmake pkgconfig which
+
+ # Xen
+ bison bzip2 checkpolicy dev86 figlet flex gettext glib iasl libaio
+ libiconv libuuid ncurses openssl perl python2Packages.python xz yajl zlib
+
+ # oxenstored
+ ocamlPackages.findlib ocamlPackages.ocaml
+
+ # Python fixes
+ python2Packages.wrapPython
+
+ # Documentation
+ python2Packages.markdown transfig ghostscript texinfo pandoc
+
+ # Others
+ ] ++ (concatMap (x: x.buildInputs or []) (attrValues config.xenfiles))
+ ++ (config.buildInputs or []);
+
+ prePatch = ''
+ ### Generic fixes
+
+ # Xen's stubdoms, tools and firmwares need various sources that
+ # are usually fetched at build time using wget and git. We can't
+ # have that, so we prefetch them in nix-expression and setup
+ # fake wget and git for debugging purposes.
+
+ mkdir fake-bin
+
+ # Fake git: just print what it wants and die
+ cat > fake-bin/wget << EOF
+ #!/bin/sh -e
+ echo ===== FAKE WGET: Not fetching \$*
+ [ -e \$3 ]
+ EOF
+
+ # Fake git: just print what it wants and die
+ cat > fake-bin/git << EOF
+ #!/bin/sh
+ echo ===== FAKE GIT: Not cloning \$*
+ [ -e \$3 ]
+ EOF
+
+ chmod +x fake-bin/*
+ export PATH=$PATH:$PWD/fake-bin
+
+ # Remove in-tree qemu stuff in case we build from a tar-ball
+ rm -rf tools/qemu-xen tools/qemu-xen-traditional
+
+ # Fix shebangs, mainly for build-scipts
+ # We want to do this before getting prefetched stuff to speed things up
+ # (prefetched stuff has lots of files)
+ find . -type f | xargs sed -i 's@/usr/bin/\(python\|perl\)@/usr/bin/env \1@g'
+ find . -type f | xargs sed -i 's@/bin/bash@/bin/sh@g'
+
+ # Get prefetched stuff
+ ${withXenfiles (name: x: ''
+ echo "${x.src} -> tools/${name}"
+ cp -r ${x.src} tools/${name}
+ chmod -R +w tools/${name}
+ '')}
+ '';
+
+ patches = [ ./0000-fix-ipxe-src.patch
+ ./0000-fix-install-python.patch ]
+ ++ (config.patches or []);
postPatch = ''
- ${stdenv.lib.optionalString ((xenserverPatched == true) && (builtins.hasAttr "xenserverPatches" xenConfig)) xenConfig.xenserverPatches}
+ ### Hacks
- # Xen's tools and firmares need various git repositories that it
- # usually checks out at time using git. We can't have that.
- ${flip concatMapStrings xenConfig.toolsGits (x: let src = fetchgit x.git; in ''
- cp -r ${src} tools/${src.name}-dir-remote
- chmod -R +w tools/${src.name}-dir-remote
- '' + stdenv.lib.optionalString (builtins.hasAttr "patches" x) ''
- ( cd tools/${src.name}-dir-remote; ${concatStringsSep "; " (map (p: "patch -p1 < ${p}") x.patches)} )
- '')}
- ${flip concatMapStrings xenConfig.firmwareGits (x: let src = fetchgit x.git; in ''
- cp -r ${src} tools/firmware/${src.name}-dir-remote
- chmod -R +w tools/firmware/${src.name}-dir-remote
- '' + stdenv.lib.optionalString (builtins.hasAttr "patches" x) ''
- ( cd tools/firmware/${src.name}-dir-remote; ${concatStringsSep "; " (map (p: "patch -p1 < ${p}") x.patches)} )
- '')}
+ # Work around a bug in our GCC wrapper: `gcc -MF foo -v' doesn't
+ # print the GCC version number properly.
+ substituteInPlace xen/Makefile \
+ --replace '$(CC) $(CFLAGS) -v' '$(CC) -v'
- # Xen's stubdoms and firmwares need various sources that are usually fetched
- # at build time using wget. We can't have that, so we prefetch Xen's ext_files.
- mkdir xen_ext_files
- ${flip concatMapStrings xenExtfiles (x: let src = fetchurl x; in ''
- cp ${src} xen_ext_files/${src.name}
- '')}
+ # Hack to get `gcc -m32' to work without having 32-bit Glibc headers.
+ mkdir -p tools/include/gnu
+ touch tools/include/gnu/stubs-32.h
+
+ ### Fixing everything else
+
+ substituteInPlace tools/libfsimage/common/fsimage_plugin.c \
+ --replace /usr $out
+
+ substituteInPlace tools/blktap2/lvm/lvm-util.c \
+ --replace /usr/sbin/vgs ${lvm2}/bin/vgs \
+ --replace /usr/sbin/lvs ${lvm2}/bin/lvs
+
+ substituteInPlace tools/misc/xenpvnetboot \
+ --replace /usr/sbin/mount ${utillinux}/bin/mount \
+ --replace /usr/sbin/umount ${utillinux}/bin/umount
+
+ substituteInPlace tools/xenmon/xenmon.py \
+ --replace /usr/bin/pkill ${procps}/bin/pkill
+
+ substituteInPlace tools/xenstat/Makefile \
+ --replace /usr/include/curses.h ${ncurses.dev}/include/curses.h
+
+ # TODO: use this as a template and support our own if-up scripts instead?
+ substituteInPlace tools/hotplug/Linux/xen-backend.rules.in \
+ --replace "@XEN_SCRIPT_DIR@" $out/etc/xen/scripts
+
+ # blktap is not provided by xen, but by xapi
+ sed -i '/blktap/d' tools/hotplug/Linux/xen-backend.rules.in
+
+ ${withTools "patches" (name: x: ''
+ ${concatMapStringsSep "\n" (p: ''
+ echo "# Patching with ${p}"
+ patch -p1 < ${p}
+ '') x.patches}
+ '')}
+
+ ${withTools "postPatch" (name: x: x.postPatch)}
+
+ ${config.postPatch or ""}
'';
- preConfigure = ''
- # Fake wget: copy prefetched downloads instead
- mkdir wget
- echo "#!/bin/sh" > wget/wget
- echo "echo ===== Not fetching \$*, copy pre-fetched file instead" >> wget/wget
- echo "cp \$4 \$3" >> wget/wget
- chmod +x wget/wget
- export PATH=$PATH:$PWD/wget
- export EXTRA_QEMUU_CONFIGURE_ARGS="--enable-spice --enable-usb-redir --enable-linux-aio"
- '';
-
- # https://github.com/NixOS/nixpkgs/issues/13590
- configureFlags = ["--disable-stubdom"];
-
- postConfigure =
- ''
- substituteInPlace tools/libfsimage/common/fsimage_plugin.c \
- --replace /usr $out
-
- substituteInPlace tools/blktap2/lvm/lvm-util.c \
- --replace /usr/sbin/vgs ${lvm2}/sbin/vgs \
- --replace /usr/sbin/lvs ${lvm2}/sbin/lvs
-
- substituteInPlace tools/xenmon/xenmon.py \
- --replace /usr/bin/pkill ${procps}/bin/pkill
-
- substituteInPlace tools/xenstat/Makefile \
- --replace /usr/include/curses.h ${ncurses.dev}/include/curses.h
-
- substituteInPlace tools/qemu-xen-traditional/xen-hooks.mak \
- --replace /usr/include/pci ${pciutils}/include/pci
-
- substituteInPlace tools/qemu-xen-traditional-dir-remote/xen-hooks.mak \
- --replace /usr/include/pci ${pciutils}/include/pci
-
- substituteInPlace tools/hotplug/Linux/xen-backend.rules \
- --replace /etc/xen/scripts $out/etc/xen/scripts
-
- # blktap is not provided by xen, but by xapi
- sed -i '/blktap/d' tools/hotplug/Linux/xen-backend.rules
-
- # Work around a bug in our GCC wrapper: `gcc -MF foo -v' doesn't
- # print the GCC version number properly.
- substituteInPlace xen/Makefile \
- --replace '$(CC) $(CFLAGS) -v' '$(CC) -v'
-
- # Allow the location of the xendomains config file to be
- # overriden at runtime.
- substituteInPlace tools/hotplug/Linux/init.d/xendomains \
- --replace 'XENDOM_CONFIG=/etc/sysconfig/xendomains' "" \
- --replace 'XENDOM_CONFIG=/etc/default/xendomains' "" \
- --replace /etc/xen/scripts/hotplugpath.sh $out/etc/xen/scripts/hotplugpath.sh \
- --replace /bin/ls ls
-
- substituteInPlace tools/hotplug/Linux/xendomains \
- --replace /bin/ls ls
-
- # Hack to get `gcc -m32' to work without having 32-bit Glibc headers.
- mkdir -p tools/include/gnu
- touch tools/include/gnu/stubs-32.h
- '';
-
- # Fix build on Glibc 2.24.
- NIX_CFLAGS_COMPILE = "-Wno-error=deprecated-declarations";
-
# TODO: Flask needs more testing before enabling it by default.
#makeFlags = "XSM_ENABLE=y FLASK_ENABLE=y PREFIX=$(out) CONFIG_DIR=/etc XEN_EXTFILES_URL=\\$(XEN_ROOT)/xen_ext_files ";
- makeFlags = "PREFIX=$(out) CONFIG_DIR=/etc XEN_EXTFILES_URL=\\$(XEN_ROOT)/xen_ext_files ";
+ makeFlags = [ "PREFIX=$(out) CONFIG_DIR=/etc" "XEN_SCRIPT_DIR=/etc/xen/scripts" ]
+ ++ (config.makeFlags or []);
buildFlags = "xen tools";
- postBuild =
- ''
- make -C docs man-pages
+ postBuild = ''
+ make -C docs man-pages
- (cd tools/xen-libhvm-dir-remote; make)
- (cd tools/xen-libhvm-dir-remote/biospt; cc -Wall -g -D_LINUX -Wstrict-prototypes biospt.c -o biospt -I../libhvm -L../libhvm -lxenhvm)
- '';
+ ${withTools "buildPhase" (name: x: x.buildPhase)}
+ '';
- installPhase =
- ''
- mkdir -p $out $out/share
- cp -prvd dist/install/nix/store/*/* $out/
- cp -prvd dist/install/boot $out/boot
- cp -prvd dist/install/etc $out
- cp -dR docs/man1 docs/man5 $out/share/man/
- wrapPythonPrograms
- substituteInPlace $out/etc/xen/scripts/hotplugpath.sh --replace SBINDIR=\"$out/sbin\" SBINDIR=\"$out/bin\"
+ installPhase = ''
+ mkdir -p $out $out/share
+ cp -prvd dist/install/nix/store/*/* $out/
+ cp -prvd dist/install/boot $out/boot
+ cp -prvd dist/install/etc $out
+ cp -dR docs/man1 docs/man5 $out/share/man/
- shopt -s extglob
- for i in $out/etc/xen/scripts/!(*.sh); do
- sed -i "2s@^@export PATH=$out/bin:${scriptEnvPath}\n@" $i
- done
+ ${withTools "installPhase" (name: x: x.installPhase)}
- (cd tools/xen-libhvm-dir-remote; make install)
- cp tools/xen-libhvm-dir-remote/biospt/biospt $out/bin/.
- '';
+ # Hack
+ substituteInPlace $out/etc/xen/scripts/hotplugpath.sh \
+ --replace SBINDIR=\"$out/sbin\" SBINDIR=\"$out/bin\"
+
+ wrapPythonPrograms
+
+ shopt -s extglob
+ for i in $out/etc/xen/scripts/!(*.sh); do
+ sed -i "2s@^@export PATH=$out/bin:${scriptEnvPath}\n@" $i
+ done
+ '';
meta = {
homepage = http://www.xen.org/;
- description = "Xen hypervisor and management tools for Dom0";
+ description = "Xen hypervisor and related components"
+ + optionalString (args ? meta && args.meta ? description)
+ " (${args.meta.description})";
+ longDescription = (args.meta.longDescription or "")
+ + "\nIncludes:\n"
+ + withXenfiles (name: x: ''* ${name}: ${x.meta.description or "(No description)"}.'');
platforms = [ "x86_64-linux" ];
- maintainers = with stdenv.lib.maintainers; [ eelco tstrobel ];
+ maintainers = with stdenv.lib.maintainers; [ eelco tstrobel oxij ];
};
-}
+} // removeAttrs config [ "xenfiles" "buildInputs" "patches" "postPatch" "meta" ])
diff --git a/pkgs/applications/virtualization/xen/packages.nix b/pkgs/applications/virtualization/xen/packages.nix
new file mode 100644
index 000000000000..633ec4f3d124
--- /dev/null
+++ b/pkgs/applications/virtualization/xen/packages.nix
@@ -0,0 +1,64 @@
+{ callPackage
+, stdenv, overrideCC, gcc49
+}:
+
+# TODO on new Xen version: generalize this to generate [vanilla slim
+# light] for each ./.nix.
+
+rec {
+
+ xen_4_5-vanilla = callPackage ./4.5.nix {
+ # At the very least included seabios and etherboot need gcc49,
+ # so we have to build all of it with gcc49.
+ stdenv = overrideCC stdenv gcc49;
+
+ meta = {
+ description = "vanilla";
+ longDescription = ''
+ Vanilla version of Xen. Uses forks of Qemu and Seabios bundled
+ with Xen. This gives vanilla experince, but wastes space and
+ build time: typical NixOS setup that runs lots of VMs will
+ build three different versions of Qemu when using this (two
+ forks and upstream).
+ '';
+ };
+ };
+
+ xen_4_5-slim = xen_4_5-vanilla.override {
+ withInternalQemu = false;
+ withInternalTraditionalQemu = true;
+ withInternalSeabios = false;
+ withSeabios = true;
+
+ meta = {
+ description = "slim";
+ longDescription = ''
+ Slimmed-down version of Xen that reuses nixpkgs packages as
+ much as possible. Different parts may get out of sync, but
+ this builds faster and uses less space than vanilla. Use with
+ `qemu_xen` from nixpkgs.
+ '';
+ };
+ };
+
+ xen_4_5-light = xen_4_5-vanilla.override {
+ withInternalQemu = false;
+ withInternalTraditionalQemu = false;
+ withInternalSeabios = false;
+ withSeabios = true;
+
+ meta = {
+ description = "light";
+ longDescription = ''
+ Slimmed-down version of Xen without `qemu-traditional` (you
+ don't need it if you don't know what it is). Use with
+ `qemu_xen-light` from nixpkgs.
+ '';
+ };
+ };
+
+ xen-vanilla = xen_4_5-vanilla;
+ xen-slim = xen_4_5-slim;
+ xen-light = xen_4_5-light;
+
+}
diff --git a/pkgs/applications/virtualization/xhyve/default.nix b/pkgs/applications/virtualization/xhyve/default.nix
index b7205ac000e2..c519784a6233 100644
--- a/pkgs/applications/virtualization/xhyve/default.nix
+++ b/pkgs/applications/virtualization/xhyve/default.nix
@@ -1,19 +1,25 @@
-{ stdenv, lib, fetchurl }:
+{ stdenv, lib, fetchurl, Hypervisor, vmnet, xpc, libobjc }:
stdenv.mkDerivation rec {
- name = "xhyve-${version}";
- version = "0.2.0";
+ name = "xhyve-${version}";
+ version = "1f1dbe305";
src = fetchurl {
- url = "https://github.com/mist64/xhyve/archive/v${version}.tar.gz";
- sha256 = "0g1vknnh88kxc8aaqv3j9wqhq45mm9xxxbn1vcrypj3kk9991hrj";
+ url = "https://github.com/mist64/xhyve/archive/1f1dbe3059904f885e4ab2b3328f4bb350ea5c37.tar.gz";
+ sha256 = "0hfix8yr90szlv2yyqb2rlq5qsrxyam8kg52sly0adja0cpwfjvx";
};
+ buildInputs = [ Hypervisor vmnet xpc libobjc ];
+
# Don't use git to determine version
- buildFlags = ''
- CFLAGS=-DVERSION=\"${version}\"
+ prePatch = ''
+ substituteInPlace Makefile \
+ --replace 'shell git describe --abbrev=6 --dirty --always --tags' "$version"
'';
+
+ makeFlags = [ "CFLAGS+=-Wno-shift-sign-overflow" ''CFLAGS+=-DVERSION=\"${version}\"'' ];
+
installPhase = ''
mkdir -p $out/bin
cp build/xhyve $out/bin
diff --git a/pkgs/applications/window-managers/2bwm/default.nix b/pkgs/applications/window-managers/2bwm/default.nix
new file mode 100644
index 000000000000..50c342269c71
--- /dev/null
+++ b/pkgs/applications/window-managers/2bwm/default.nix
@@ -0,0 +1,30 @@
+{ stdenv, fetchFromGitHub, patches
+, libxcb, xcbutilkeysyms, xcbutilwm
+, libX11, xcbutil, xcbutilxrm }:
+
+stdenv.mkDerivation rec {
+ version = "0.2";
+ name = "2bwm-${version}";
+
+ src = fetchFromGitHub {
+ owner = "venam";
+ repo = "2bwm";
+ rev = "v${version}";
+ sha256 = "1la1ixpm5knsj2gvdcmxzj1jfbzxvhmgzps4f5kbvx5047xc6ici";
+ };
+
+ # Allow users set their own list of patches
+ inherit patches;
+
+ buildInputs = [ libxcb xcbutilkeysyms xcbutilwm libX11 xcbutil xcbutilxrm ];
+
+ installPhase = "make install DESTDIR=$out PREFIX=\"\"";
+
+ meta = with stdenv.lib; {
+ homepage = "https://github.com/venam/2bwm";
+ description = "A fast floating WM written over the XCB library and derived from mcwm";
+ license = licenses.mit;
+ maintainers = [ maintainers.sternenseemann ];
+ platforms = platforms.unix;
+ };
+}
diff --git a/pkgs/applications/window-managers/awesome/default.nix b/pkgs/applications/window-managers/awesome/default.nix
index 0a1256d67a48..eccb1a19538a 100644
--- a/pkgs/applications/window-managers/awesome/default.nix
+++ b/pkgs/applications/window-managers/awesome/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, luaPackages, cairo, cmake, imagemagick, pkgconfig, gdk_pixbuf
+{ stdenv, fetchurl, fetchFromGitHub, luaPackages, cairo, cmake, imagemagick, pkgconfig, gdk_pixbuf
, xorg, libstartup_notification, libxdg_basedir, libpthreadstubs
, xcb-util-cursor, makeWrapper, pango, gobjectIntrospection, unclutter
, compton, procps, iproute, coreutils, curl, alsaUtils, findutils, xterm
@@ -9,10 +9,13 @@
with luaPackages; stdenv.mkDerivation rec {
name = "awesome-${version}";
- version = "4.0";
- src = fetchurl {
- url = "http://github.com/awesomeWM/awesome-releases/raw/master/${name}.tar.xz";
- sha256 = "0czkcz67sab63gf5m2p2pgg05yinjx60hfb9rfyzdkkg28q9f02w";
+ version = "4.1";
+
+ src = fetchFromGitHub {
+ owner = "awesomewm";
+ repo = "awesome";
+ rev = "v${version}";
+ sha256 = "1qik8h5nwjq4535lpdpal85vas1k7am3s6l5r763kpdzxhfcyyaj";
};
nativeBuildInputs = [
@@ -22,8 +25,10 @@ with luaPackages; stdenv.mkDerivation rec {
imagemagick
makeWrapper
pkgconfig
- xmlto docbook_xml_dtd_45 docbook_xsl findXMLCatalogs
+ xmlto docbook_xml_dtd_45
+ docbook_xsl findXMLCatalogs
];
+
propagatedUserEnvPkgs = [ hicolor_icon_theme ];
buildInputs = [ cairo dbus gdk_pixbuf gobjectIntrospection
git lgi libpthreadstubs libstartup_notification
@@ -33,6 +38,13 @@ with luaPackages; stdenv.mkDerivation rec {
xorg.xcbutilrenderutil xorg.xcbutilwm libxkbcommon
xcbutilxrm ];
+ patches = [
+ (fetchurl {
+ url = "https://patch-diff.githubusercontent.com/raw/awesomeWM/awesome/pull/1639.patch";
+ sha256 = "00piynmbxajd2xbg960gmf0zlqn7m489f4ww482y49ravfy1jhsj";
+ })
+ ];
+
#cmakeFlags = "-DGENERATE_MANPAGES=ON";
LD_LIBRARY_PATH = "${stdenv.lib.makeLibraryPath [ cairo pango gobjectIntrospection ]}";
diff --git a/pkgs/applications/window-managers/bevelbar/default.nix b/pkgs/applications/window-managers/bevelbar/default.nix
new file mode 100644
index 000000000000..582f9cb61f8e
--- /dev/null
+++ b/pkgs/applications/window-managers/bevelbar/default.nix
@@ -0,0 +1,25 @@
+{ stdenv, fetchFromGitHub, libX11, libXrandr, libXft }:
+
+stdenv.mkDerivation rec {
+ name = "bevelbar-${version}";
+ version = "16.11";
+
+ src = fetchFromGitHub {
+ owner = "vain";
+ repo = "bevelbar";
+ rev = "v${version}";
+ sha256 = "1hbwg3vdxw9fyshy85skv476p0zr4ynvhcz2xkijydpzm2j3rmjm";
+ };
+
+ buildInputs = [ libX11 libXrandr libXft ];
+
+ installFlags = [ "prefix=$(out)" ];
+
+ meta = with stdenv.lib; {
+ description = "An X11 status bar with fancy schmancy 1985-ish beveled borders";
+ inherit (src.meta) homepage;
+ license = licenses.mit;
+ platforms = platforms.all;
+ maintainers = [ maintainers.neeasade ];
+ };
+}
diff --git a/pkgs/applications/window-managers/fvwm/default.nix b/pkgs/applications/window-managers/fvwm/default.nix
index b374c9829318..f8c8a59f6f61 100644
--- a/pkgs/applications/window-managers/fvwm/default.nix
+++ b/pkgs/applications/window-managers/fvwm/default.nix
@@ -26,5 +26,6 @@ stdenv.mkDerivation rec {
description = "A multiple large virtual desktop window manager";
license = stdenv.lib.licenses.gpl2Plus;
platforms = stdenv.lib.platforms.linux;
+ maintainers = with stdenv.lib.maintainers; [ edanaher ];
};
}
diff --git a/pkgs/applications/window-managers/i3/default.nix b/pkgs/applications/window-managers/i3/default.nix
index b6de07bff8ad..fded295b0ef1 100644
--- a/pkgs/applications/window-managers/i3/default.nix
+++ b/pkgs/applications/window-managers/i3/default.nix
@@ -58,6 +58,8 @@ stdenv.mkDerivation rec {
done
'';
+ separateDebugInfo = true;
+
meta = with stdenv.lib; {
description = "A tiling window manager";
homepage = "http://i3wm.org";
diff --git a/pkgs/applications/window-managers/i3/lock-color.nix b/pkgs/applications/window-managers/i3/lock-color.nix
index dd781143d862..aa4001f62dea 100644
--- a/pkgs/applications/window-managers/i3/lock-color.nix
+++ b/pkgs/applications/window-managers/i3/lock-color.nix
@@ -2,17 +2,19 @@
, xcbutilimage, pam, libX11, libev, cairo, libxkbcommon, libxkbfile }:
stdenv.mkDerivation rec {
- rev = "c8e1aece7301c3c6481bf2f695734f8d273f252e";
- version = "2.7-2016-09-17";
+ version = "2.7-2017-04-01";
name = "i3lock-color-${version}";
+
src = fetchFromGitHub {
owner = "chrjguill";
repo = "i3lock-color";
- inherit rev;
- sha256 = "07fpvwgdfxsnxnf63idrz3n1kbyayr53lsfns2q775q93cz1mfia";
+ rev = "61f6428aedbe4829d3e0f51d137283c8aec1e206";
+ sha256 = "0h4nzx46kcsp6b1i2lm9y4d1w1icrpvjl8g1h3wbpa5x4crh4703";
};
- buildInputs = [ which pkgconfig libxcb xcbutilkeysyms xcbutilimage pam libX11
+ nativeBuildInputs = [ pkgconfig ];
+ buildInputs = [ which libxcb xcbutilkeysyms xcbutilimage pam libX11
libev cairo libxkbcommon libxkbfile ];
+
makeFlags = "all";
preInstall = ''
mkdir -p $out/share/man/man1
diff --git a/pkgs/applications/window-managers/icewm/default.nix b/pkgs/applications/window-managers/icewm/default.nix
index 861313431b07..ef3ad8fda251 100644
--- a/pkgs/applications/window-managers/icewm/default.nix
+++ b/pkgs/applications/window-managers/icewm/default.nix
@@ -22,7 +22,7 @@ stdenv.mkDerivation rec {
};
preConfigure = ''
- export cmakeFlags="-DPREFIX=$out"
+ export cmakeFlags="-DPREFIX=$out -DCFGDIR=/etc/icewm"
'';
meta = {
diff --git a/pkgs/applications/window-managers/jwm/default.nix b/pkgs/applications/window-managers/jwm/default.nix
index c670dc52e52d..2082f48d2577 100644
--- a/pkgs/applications/window-managers/jwm/default.nix
+++ b/pkgs/applications/window-managers/jwm/default.nix
@@ -5,13 +5,13 @@
stdenv.mkDerivation rec {
name = "jwm-${version}";
- version = "1580";
+ version = "1582";
src = fetchFromGitHub {
owner = "joewing";
repo = "jwm";
rev = "s${version}";
- sha256 = "098m54mn8f1vzdb7j6zmlflid7a4yjinbdh7avg2a0z45nl1znb4";
+ sha256 = "1z6cxf18n69sjd20bbyxrnd19hhy955ddvakgpfyhiprpfjkkv70";
};
nativeBuildInputs = [ pkgconfig automake autoconf libtool gettext which ];
diff --git a/pkgs/applications/window-managers/spectrwm/default.nix b/pkgs/applications/window-managers/spectrwm/default.nix
index 39825e37f30f..1a3c976f77de 100644
--- a/pkgs/applications/window-managers/spectrwm/default.nix
+++ b/pkgs/applications/window-managers/spectrwm/default.nix
@@ -36,7 +36,10 @@ stdenv.mkDerivation rec {
xcbutilwm
];
- sourceRoot = "spectrwm-SPECTRWM_2_7_2/linux";
+ sourceRoot = let
+ subdir = if stdenv.isDarwin then "osx" else "linux";
+ in "spectrwm-SPECTRWM_2_7_2/${subdir}";
+
makeFlags="PREFIX=$(out)";
installPhase = "PREFIX=$out make install";
diff --git a/pkgs/applications/window-managers/sway/default.nix b/pkgs/applications/window-managers/sway/default.nix
index 79077b477b44..f392945b36dd 100644
--- a/pkgs/applications/window-managers/sway/default.nix
+++ b/pkgs/applications/window-managers/sway/default.nix
@@ -1,10 +1,11 @@
{ stdenv, fetchFromGitHub, pango, libinput
, makeWrapper, cmake, pkgconfig, asciidoc, libxslt, docbook_xsl, cairo
, wayland, wlc, libxkbcommon, pixman, fontconfig, pcre, json_c, dbus_libs, libcap
+, xwayland
}:
let
- version = "0.11";
+ version = "0.12.2";
in
stdenv.mkDerivation rec {
name = "sway-${version}";
@@ -13,12 +14,12 @@ in
owner = "Sircmpwn";
repo = "sway";
rev = "${version}";
- sha256 = "01k01f72kh90fwgqh2hgg6dv9931x4v18bzz11b47mn7p9z68ddv";
+ sha256 = "1hkr6pmz45xa5w5y21ijz7i2dwb62rifhcy28r8kh5r2hwbil2hs";
};
nativeBuildInputs = [ makeWrapper cmake pkgconfig asciidoc libxslt docbook_xsl ];
- buildInputs = [ wayland wlc libxkbcommon pixman fontconfig pcre json_c dbus_libs pango cairo libinput libcap ];
+ buildInputs = [ wayland wlc libxkbcommon pixman fontconfig pcre json_c dbus_libs pango cairo libinput libcap xwayland ];
patchPhase = ''
sed -i s@/etc/sway@$out/etc/sway@g CMakeLists.txt;
diff --git a/pkgs/applications/window-managers/way-cooler/default.nix b/pkgs/applications/window-managers/way-cooler/default.nix
new file mode 100755
index 000000000000..d9d84e834304
--- /dev/null
+++ b/pkgs/applications/window-managers/way-cooler/default.nix
@@ -0,0 +1,40 @@
+{ stdenv, fetchFromGitHub, rustPlatform, pkgconfig
+, wayland, xwayland, wlc, dbus_libs, dbus_glib, cairo, libxkbcommon }:
+
+with rustPlatform;
+
+buildRustPackage rec {
+ name = "way-cooler-${version}";
+ version = "0.5.2";
+
+ src = fetchFromGitHub {
+ owner = "way-cooler";
+ repo = "way-cooler";
+ rev = "v${version}";
+ sha256 = "10s01x54kwjm2c85v57i6g3pvj5w3wpkjblj036mmd865fla1brb";
+ };
+
+ depsSha256 = "1k5xbw2zhm5z650mxdbxixr90im53wlpjdvq2pbnx2snqm84idlc";
+
+ buildInputs = [ wlc dbus_libs dbus_glib cairo libxkbcommon ];
+
+ nativeBuildInputs = [ pkgconfig ];
+
+ meta = with stdenv.lib; {
+ description = "Customizable Wayland compositor (window manager)";
+ longDescription = ''
+ Way Cooler is a customizable tiling window manager written in Rust
+ for Wayland and configurable using Lua. It is heavily inspired by
+ the tiling and extensibility of both i3 and awesome. While Lua is
+ used for the configuration, like awesome, extensions for Way Cooler
+ are implemented as totally separate client programs using D-Bus.
+ This means that you can use virtually any language to extend the
+ window manager, with much better guarantees about interoperability
+ between extensions.
+ '';
+ homepage = http://way-cooler.org/;
+ license = with licenses; [ mit ];
+ maintainers = [ maintainers.miltador ];
+ platforms = platforms.all;
+ };
+}
diff --git a/pkgs/applications/window-managers/windowmaker/default.nix b/pkgs/applications/window-managers/windowmaker/default.nix
index a8b5be83234e..d83c4493accb 100644
--- a/pkgs/applications/window-managers/windowmaker/default.nix
+++ b/pkgs/applications/window-managers/windowmaker/default.nix
@@ -4,12 +4,12 @@
stdenv.mkDerivation rec {
name = "windowmaker-${version}";
- version = "0.95.7";
+ version = "0.95.8";
srcName = "WindowMaker-${version}";
src = fetchurl {
url = "http://windowmaker.org/pub/source/release/${srcName}.tar.gz";
- sha256 = "1acph0nq6fsb452sl7j7a7kcc87zqqaw7qms1p8ijar19dn4hbc4";
+ sha256 = "12p8kljqgx5hnic0zvs5mxwp7kg21sb6qjagb2qw8ydvf5amrgwx";
};
nativeBuildInputs = [ pkgconfig ];
@@ -36,8 +36,8 @@ stdenv.mkDerivation rec {
contributions being made by programmers from around the world.
'';
license = licenses.gpl2Plus;
- maintainers = [ maintainers.AndersonTorres ];
platforms = platforms.linux;
+ maintainers = [ maintainers.AndersonTorres ];
};
}
diff --git a/pkgs/applications/window-managers/wtftw/default.nix b/pkgs/applications/window-managers/wtftw/default.nix
new file mode 100644
index 000000000000..0ff3367e3aee
--- /dev/null
+++ b/pkgs/applications/window-managers/wtftw/default.nix
@@ -0,0 +1,37 @@
+{ stdenv, fetchFromGitHub, rustPlatform, cargo, libXinerama, libX11, xlibs, pkgconfig }:
+
+rustPlatform.buildRustPackage rec {
+ name = "wtftw-0.0pre20161001";
+ src = fetchFromGitHub {
+ owner = "kintaro";
+ repo = "wtftw";
+ rev = "b72a1bd24430a614d953d6ecf61732805277cc0c";
+ sha256 = "1ajxkncqh4azyhmsdyk07r1kbhwv81vl1ix3w4iaz8cyln4gs0kp";
+ };
+
+ depsSha256 = "0z7h8ybh2db3xl8qxbzby5lncdaijixzmbn1j8a45lbky1xiix71";
+
+ buildInputs = [ libXinerama libX11 pkgconfig ];
+ libPath = stdenv.lib.makeLibraryPath [ libXinerama libX11 ];
+
+ preInstall = ''
+ cargo update
+ '';
+
+ installPhase = ''
+ mkdir -p $out/bin
+ mkdir -p $out/share/xsessions
+ cp -p target/release/wtftw $out/bin/
+ echo "[Desktop Entry]
+ Name=wtftw
+ Exec=/bin/wtftw
+ Type=XSession
+ DesktopName=wtftw" > $out/share/xsessions/wtftw.desktop
+ '';
+
+ meta = with stdenv.lib; {
+ description = "A tiling window manager in Rust";
+ homepage = https://github.com/Kintaro/wtftw;
+ license = stdenv.lib.licenses.bsd3;
+ };
+}
diff --git a/pkgs/build-support/build-dotnet-package/default.nix b/pkgs/build-support/build-dotnet-package/default.nix
index 3d24f6fb4340..2b1b34429c57 100644
--- a/pkgs/build-support/build-dotnet-package/default.nix
+++ b/pkgs/build-support/build-dotnet-package/default.nix
@@ -102,8 +102,9 @@ attrsOrig @
mkdir -p "$out"/bin
commandName="$(basename -s .exe "$(echo "$exe" | tr "[A-Z]" "[a-z]")")"
makeWrapper \
- "${mono}/bin/mono \"$exe\"" \
+ "${mono}/bin/mono" \
"$out"/bin/"$commandName" \
+ --add-flags "\"$exe\"" \
''${makeWrapperArgs}
done
done
diff --git a/pkgs/build-support/emacs/buffer.nix b/pkgs/build-support/emacs/buffer.nix
index e366fd1f739f..6c5e0570fd0d 100644
--- a/pkgs/build-support/emacs/buffer.nix
+++ b/pkgs/build-support/emacs/buffer.nix
@@ -12,15 +12,16 @@
; Only set up nixpkgs buffer handling when we have some buffers active
(defvar nixpkgs--buffer-count 0)
(when (eq nixpkgs--buffer-count 0)
+ (make-variable-buffer-local 'nixpkgs--is-nixpkgs-buffer)
; When generating a new temporary buffer (one whose name starts with a space), do inherit-local inheritance and make it a nixpkgs buffer
(defun nixpkgs--around-generate (orig name)
- (if (eq (aref name 0) ?\s)
+ (if (and nixpkgs--is-nixpkgs-buffer (eq (aref name 0) ?\s))
(let ((buf (funcall orig name)))
- (when (inherit-local-inherit-child buf)
+ (progn
+ (inherit-local-inherit-child buf)
(with-current-buffer buf
- (make-local-variable 'kill-buffer-hook)
(setq nixpkgs--buffer-count (1+ nixpkgs--buffer-count))
- (add-hook 'kill-buffer-hook 'nixpkgs--decrement-buffer-count)))
+ (add-hook 'kill-buffer-hook 'nixpkgs--decrement-buffer-count nil t)))
buf)
(funcall orig name)))
(advice-add 'generate-new-buffer :around #'nixpkgs--around-generate)
@@ -32,16 +33,20 @@
(fmakunbound 'nixpkgs--around-generate)
(fmakunbound 'nixpkgs--decrement-buffer-count))))
(setq nixpkgs--buffer-count (1+ nixpkgs--buffer-count))
- (make-local-variable 'kill-buffer-hook)
- (add-hook 'kill-buffer-hook 'nixpkgs--decrement-buffer-count)
+ (add-hook 'kill-buffer-hook 'nixpkgs--decrement-buffer-count nil t)
; Add packages to PATH and exec-path
(make-local-variable 'process-environment)
(put 'process-environment 'permanent-local t)
(inherit-local 'process-environment)
+ ; setenv modifies in place, so copy the environment first
+ (setq process-environment (copy-tree process-environment))
(setenv "PATH" (concat "${lib.makeSearchPath "bin" pkgs}:" (getenv "PATH")))
(inherit-local-permanent exec-path (append '(${builtins.concatStringsSep " " (map (p: "\"${p}/bin\"") pkgs)}) exec-path))
+ (setq nixpkgs--is-nixpkgs-buffer t)
+ (inherit-local 'nixpkgs--is-nixpkgs-buffer)
+
${lib.concatStringsSep "\n" extras}
'';
}
diff --git a/pkgs/build-support/fetchdarcs/default.nix b/pkgs/build-support/fetchdarcs/default.nix
index 3c2e0524eea5..2644a20d0a53 100644
--- a/pkgs/build-support/fetchdarcs/default.nix
+++ b/pkgs/build-support/fetchdarcs/default.nix
@@ -1,13 +1,16 @@
{stdenv, darcs, nix}: {url, rev ? null, context ? null, md5 ? "", sha256 ? ""}:
+if md5 != "" then
+ throw "fetchdarcs does not support md5 anymore, please use sha256"
+else
stdenv.mkDerivation {
name = "fetchdarcs";
builder = ./builder.sh;
buildInputs = [darcs];
- outputHashAlgo = if sha256 == "" then "md5" else "sha256";
+ outputHashAlgo = "sha256";
outputHashMode = "recursive";
- outputHash = if sha256 == "" then md5 else sha256;
-
+ outputHash = sha256;
+
inherit url rev context;
}
diff --git a/pkgs/build-support/fetchegg/default.nix b/pkgs/build-support/fetchegg/default.nix
index 3e0d5d566ad7..41d2c936e01e 100644
--- a/pkgs/build-support/fetchegg/default.nix
+++ b/pkgs/build-support/fetchegg/default.nix
@@ -4,14 +4,17 @@
{ stdenv, chicken }:
{ name, version, md5 ? "", sha256 ? "" }:
+if md5 != "" then
+ throw "fetchegg does not support md5 anymore, please use sha256"
+else
stdenv.mkDerivation {
name = "chicken-${name}-export";
builder = ./builder.sh;
buildInputs = [ chicken ];
- outputHashAlgo = if sha256 == "" then "md5" else "sha256";
+ outputHashAlgo = "sha256";
outputHashMode = "recursive";
- outputHash = if sha256 == "" then md5 else sha256;
+ outputHash = sha256;
inherit version;
diff --git a/pkgs/build-support/fetchgit/default.nix b/pkgs/build-support/fetchgit/default.nix
index e40b460d390a..d85d2c893c52 100644
--- a/pkgs/build-support/fetchgit/default.nix
+++ b/pkgs/build-support/fetchgit/default.nix
@@ -39,18 +39,20 @@ in
server admins start using the new version?
*/
-assert md5 != "" || sha256 != "";
assert deepClone -> leaveDotGit;
+if md5 != "" then
+ throw "fetchgit does not support md5 anymore, please use sha256"
+else
stdenv.mkDerivation {
inherit name;
builder = ./builder.sh;
fetcher = "${./nix-prefetch-git}"; # This must be a string to ensure it's called with bash.
buildInputs = [git];
- outputHashAlgo = if sha256 == "" then "md5" else "sha256";
+ outputHashAlgo = "sha256";
outputHashMode = "recursive";
- outputHash = if sha256 == "" then md5 else sha256;
+ outputHash = sha256;
inherit url rev leaveDotGit fetchSubmodules deepClone branchName;
diff --git a/pkgs/build-support/fetchgx/default.nix b/pkgs/build-support/fetchgx/default.nix
index c72bbec66321..6d209cec2549 100644
--- a/pkgs/build-support/fetchgx/default.nix
+++ b/pkgs/build-support/fetchgx/default.nix
@@ -18,7 +18,7 @@ stdenv.mkDerivation {
buildPhase = ''
export GOPATH=$(pwd)/vendor
- mkdir vendor
+ mkdir -p vendor
gx install
'';
diff --git a/pkgs/build-support/fetchhg/default.nix b/pkgs/build-support/fetchhg/default.nix
index 79f610166a79..aba12317963a 100644
--- a/pkgs/build-support/fetchhg/default.nix
+++ b/pkgs/build-support/fetchhg/default.nix
@@ -1,5 +1,8 @@
{stdenv, mercurial, nix}: {name ? null, url, rev ? null, md5 ? null, sha256 ? null, fetchSubrepos ? false}:
+if md5 != null then
+ throw "fetchhg does not support md5 anymore, please use sha256"
+else
# TODO: statically check if mercurial as the https support if the url starts woth https.
stdenv.mkDerivation {
name = "hg-archive" + (if name != null then "-${name}" else "");
@@ -8,14 +11,11 @@ stdenv.mkDerivation {
impureEnvVars = stdenv.lib.fetchers.proxyImpureEnvVars;
- # Nix <= 0.7 compatibility.
- id = md5;
-
subrepoClause = if fetchSubrepos then "S" else "";
- outputHashAlgo = if md5 != null then "md5" else "sha256";
+ outputHashAlgo = "sha256";
outputHashMode = "recursive";
- outputHash = if md5 != null then md5 else sha256;
+ outputHash = sha256;
inherit url rev;
preferLocalBuild = true;
diff --git a/pkgs/build-support/fetchnuget/default.nix b/pkgs/build-support/fetchnuget/default.nix
index 95bb7b7cd8da..62b700dd81b5 100644
--- a/pkgs/build-support/fetchnuget/default.nix
+++ b/pkgs/build-support/fetchnuget/default.nix
@@ -8,9 +8,12 @@ attrs @
, md5 ? ""
, ...
}:
+if md5 != "" then
+ throw "fetchnuget does not support md5 anymore, please use sha256"
+else
buildDotnetPackage ({
src = fetchurl {
- inherit url sha256 md5;
+ inherit url sha256;
name = "${baseName}.${version}.zip";
};
diff --git a/pkgs/build-support/fetchrepoproject/default.nix b/pkgs/build-support/fetchrepoproject/default.nix
new file mode 100644
index 000000000000..8c55db5372d9
--- /dev/null
+++ b/pkgs/build-support/fetchrepoproject/default.nix
@@ -0,0 +1,73 @@
+{ stdenv, git, gitRepo, gnupg ? null, cacert, copyPathsToStore }:
+
+{ name, manifest, rev ? "HEAD", sha256, repoRepoURL ? "", repoRepoRev ? "", referenceDir ? ""
+, localManifests ? [], createMirror ? false, useArchive ? !createMirror
+}:
+
+assert repoRepoRev != "" -> repoRepoURL != "";
+assert createMirror -> !useArchive;
+
+with stdenv.lib;
+
+let
+ repoInitFlags = [
+ "--manifest-url=${manifest}"
+ "--manifest-branch=${rev}"
+ "--depth=1"
+ #TODO: fetching clone.bundle seems to fail spectacularly inside a sandbox.
+ "--no-clone-bundle"
+ (optionalString createMirror "--mirror")
+ (optionalString useArchive "--archive")
+ (optionalString (repoRepoURL != "") "--repo-url=${repoRepoURL}")
+ (optionalString (repoRepoRev != "") "--repo-branch=${repoRepoRev}")
+ (optionalString (referenceDir != "") "--reference=${referenceDir}")
+ ];
+
+ local_manifests = copyPathsToStore localManifests;
+
+in
+
+with stdenv.lib;
+
+let
+ extraRepoInitFlags = [
+ (optionalString (repoRepoURL != "") "--repo-url=${repoRepoURL}")
+ (optionalString (repoRepoRev != "") "--repo-branch=${repoRepoRev}")
+ (optionalString (referenceDir != "") "--reference=${referenceDir}")
+ ];
+in
+
+stdenv.mkDerivation {
+ buildCommand = ''
+ mkdir .repo
+ ${optionalString (local_manifests != []) ''
+ mkdir ./.repo/local_manifests
+ for local_manifest in ${concatMapStringsSep " " toString local_manifests}
+
+ do
+ cp $local_manifest ./.repo/local_manifests/$(stripHash $local_manifest; echo $strippedName)
+ done
+ ''}
+
+ export HOME=.repo
+ repo init ${concatStringsSep " " repoInitFlags}
+
+ repo sync --jobs=$NIX_BUILD_CORES --current-branch
+ ${optionalString (!createMirror) "rm -rf $out/.repo"}
+ '';
+
+ GIT_SSL_CAINFO = "${cacert}/etc/ssl/certs/ca-bundle.crt";
+
+ impureEnvVars = stdenv.lib.fetchers.proxyImpureEnvVars ++ [
+ "GIT_PROXY_COMMAND" "SOCKS_SERVER"
+ ];
+
+ buildInputs = [git gitRepo cacert] ++ optional (gnupg != null) [gnupg] ;
+ outputHashAlgo = "sha256";
+ outputHashMode = "recursive";
+ outputHash = sha256;
+
+ preferLocalBuild = true;
+ enableParallelBuilding = true;
+ inherit name cacert manifest rev repoRepoURL repoRepoRev referenceDir;
+}
diff --git a/pkgs/build-support/fetchsvn/builder.sh b/pkgs/build-support/fetchsvn/builder.sh
index 3ab6e730a51b..7a8a161712d6 100644
--- a/pkgs/build-support/fetchsvn/builder.sh
+++ b/pkgs/build-support/fetchsvn/builder.sh
@@ -22,7 +22,8 @@ fi;
# server's certificate. This is perfectly safe: we don't care
# whether the server is being spoofed --- only the cryptographic
# hash of the output matters. Pass in extra p's to handle redirects.
-printf 'p\np\np\n' | svn export --trust-server-cert --non-interactive ${ignoreExternals:+--ignore-externals} \
+printf 'p\np\np\n' | svn export --trust-server-cert --non-interactive \
+ ${ignoreExternals:+--ignore-externals} ${ignoreKeywords:+--ignore-keywords} \
-r "$rev" "$url" "$out"
stopNest
diff --git a/pkgs/build-support/fetchsvn/default.nix b/pkgs/build-support/fetchsvn/default.nix
index 85ec52c4bde0..6ed34ec02763 100644
--- a/pkgs/build-support/fetchsvn/default.nix
+++ b/pkgs/build-support/fetchsvn/default.nix
@@ -1,5 +1,6 @@
{stdenv, subversion, sshSupport ? false, openssh ? null}:
-{url, rev ? "HEAD", md5 ? "", sha256 ? "", ignoreExternals ? false, name ? null}:
+{url, rev ? "HEAD", md5 ? "", sha256 ? "",
+ ignoreExternals ? false, ignoreKeywords ? false, name ? null}:
let
repoName = with stdenv.lib;
@@ -7,7 +8,9 @@ let
fst = head;
snd = l: head (tail l);
trd = l: head (tail (tail l));
- path_ = reverseList (splitString "/" url);
+ path_ =
+ (p: if head p == "" then tail p else p) # ~ drop final slash if any
+ (reverseList (splitString "/" url));
path = [ (removeSuffix "/" (head path_)) ] ++ (tail path_);
in
# ../repo/trunk -> repo
@@ -22,16 +25,19 @@ let
name_ = if name == null then "${repoName}-r${toString rev}" else name;
in
+if md5 != "" then
+ throw "fetchsvn does not support md5 anymore, please use sha256"
+else
stdenv.mkDerivation {
name = name_;
builder = ./builder.sh;
buildInputs = [subversion];
- outputHashAlgo = if sha256 == "" then "md5" else "sha256";
+ outputHashAlgo = "sha256";
outputHashMode = "recursive";
- outputHash = if sha256 == "" then md5 else sha256;
-
- inherit url rev sshSupport openssh ignoreExternals;
+ outputHash = sha256;
+
+ inherit url rev sshSupport openssh ignoreExternals ignoreKeywords;
impureEnvVars = stdenv.lib.fetchers.proxyImpureEnvVars;
preferLocalBuild = true;
diff --git a/pkgs/build-support/fetchsvnssh/default.nix b/pkgs/build-support/fetchsvnssh/default.nix
index 6c6c03d68732..a6f3d3469f09 100644
--- a/pkgs/build-support/fetchsvnssh/default.nix
+++ b/pkgs/build-support/fetchsvnssh/default.nix
@@ -1,16 +1,20 @@
{stdenv, subversion, sshSupport ? false, openssh ? null, expect}:
{username, password, url, rev ? "HEAD", md5 ? "", sha256 ? ""}:
+
+if md5 != "" then
+ throw "fetchsvnssh does not support md5 anymore, please use sha256"
+else
stdenv.mkDerivation {
name = "svn-export-ssh";
builder = ./builder.sh;
buildInputs = [subversion expect];
- outputHashAlgo = if sha256 == "" then "md5" else "sha256";
+ outputHashAlgo = "sha256";
outputHashMode = "recursive";
- outputHash = if sha256 == "" then md5 else sha256;
-
+ outputHash = sha256;
+
sshSubversion = ./sshsubversion.exp;
-
+
inherit username password url rev sshSupport openssh;
}
diff --git a/pkgs/build-support/fetchurl/default.nix b/pkgs/build-support/fetchurl/default.nix
index 00f485ce6975..1e872fbc57a4 100644
--- a/pkgs/build-support/fetchurl/default.nix
+++ b/pkgs/build-support/fetchurl/default.nix
@@ -87,12 +87,14 @@ assert sha512 != "" -> builtins.compareVersions "1.11" builtins.nixVersion <= 0;
let
hasHash = showURLs || (outputHash != "" && outputHashAlgo != "")
- || md5 != "" || sha1 != "" || sha256 != "" || sha512 != "";
+ || sha1 != "" || sha256 != "" || sha512 != "";
urls_ = if urls != [] then urls else [url];
in
-if (!hasHash) then throw "Specify hash for fetchurl fixed-output derivation: ${stdenv.lib.concatStringsSep ", " urls_}" else stdenv.mkDerivation {
+if md5 != "" then throw "fetchsvnssh does not support md5 anymore, please use sha256 or sha512"
+else if (!hasHash) then throw "Specify hash for fetchurl fixed-output derivation: ${stdenv.lib.concatStringsSep ", " urls_}"
+else stdenv.mkDerivation {
name =
if showURLs then "urls"
else if name != "" then name
@@ -110,9 +112,9 @@ if (!hasHash) then throw "Specify hash for fetchurl fixed-output derivation: ${s
# New-style output content requirements.
outputHashAlgo = if outputHashAlgo != "" then outputHashAlgo else
- if sha512 != "" then "sha512" else if sha256 != "" then "sha256" else if sha1 != "" then "sha1" else "md5";
+ if sha512 != "" then "sha512" else if sha256 != "" then "sha256" else "sha1";
outputHash = if outputHash != "" then outputHash else
- if sha512 != "" then sha512 else if sha256 != "" then sha256 else if sha1 != "" then sha1 else md5;
+ if sha512 != "" then sha512 else if sha256 != "" then sha256 else sha1;
outputHashMode = if (recursiveHash || executable) then "recursive" else "flat";
diff --git a/pkgs/build-support/fetchurl/mirrors.nix b/pkgs/build-support/fetchurl/mirrors.nix
index 7071fa18c231..1dfe968f129e 100644
--- a/pkgs/build-support/fetchurl/mirrors.nix
+++ b/pkgs/build-support/fetchurl/mirrors.nix
@@ -399,4 +399,9 @@ rec {
https://archive.mozilla.org/pub/
];
+ # Maven Central
+ maven = [
+ http://repo1.maven.org/maven2/
+ http://central.maven.org/maven2/
+ ];
}
diff --git a/pkgs/build-support/kde/derivation.nix b/pkgs/build-support/kde/derivation.nix
new file mode 100644
index 000000000000..2e29a0a661e1
--- /dev/null
+++ b/pkgs/build-support/kde/derivation.nix
@@ -0,0 +1,17 @@
+{ stdenv, lib, debug ? false }:
+
+args:
+
+stdenv.mkDerivation (args // {
+
+ outputs = args.outputs or [ "out" "dev" ];
+
+ propagatedUserEnvPkgs =
+ builtins.map lib.getBin (args.propagatedBuildInputs or []);
+
+ cmakeFlags =
+ (args.cmakeFlags or [])
+ ++ [ "-DBUILD_TESTING=OFF" ]
+ ++ lib.optional debug "-DCMAKE_BUILD_TYPE=Debug";
+
+})
diff --git a/pkgs/development/libraries/kde-frameworks/kde-wrapper.nix b/pkgs/build-support/kde/wrapper.nix
similarity index 85%
rename from pkgs/development/libraries/kde-frameworks/kde-wrapper.nix
rename to pkgs/build-support/kde/wrapper.nix
index f5add12e8eca..228eb696bd9a 100644
--- a/pkgs/development/libraries/kde-frameworks/kde-wrapper.nix
+++ b/pkgs/build-support/kde/wrapper.nix
@@ -1,4 +1,4 @@
-{ stdenv, lib, makeWrapper, buildEnv }:
+{ stdenv, lib, makeWrapper, buildEnv, gtk3, dconf }:
packages:
@@ -47,10 +47,11 @@ stdenv.mkDerivation {
--argv0 '"$0"' \
--suffix PATH : "$env/bin" \
--prefix XDG_CONFIG_DIRS : "$env/etc/xdg" \
- --prefix XDG_DATA_DIRS : "$env/share" \
+ --prefix XDG_DATA_DIRS : "$env/share:${gtk3}/share/gsettings-schemas/${gtk3.name}" \
--set QML_IMPORT_PATH "$env/lib/qt5/imports" \
--set QML2_IMPORT_PATH "$env/lib/qt5/qml" \
- --set QT_PLUGIN_PATH "$env/lib/qt5/plugins"
+ --set QT_PLUGIN_PATH "$env/lib/qt5/plugins" \
+ --prefix GIO_EXTRA_MODULES : "${dconf.lib}/lib/gio/modules"
good="1"
break
fi
diff --git a/pkgs/build-support/kdewrapper/default.nix b/pkgs/build-support/kdewrapper/default.nix
deleted file mode 100644
index 64dfd7d0ca6b..000000000000
--- a/pkgs/build-support/kdewrapper/default.nix
+++ /dev/null
@@ -1,44 +0,0 @@
-{ stdenv, kde4, shared_mime_info, extraLibs ? [] }:
-
-/* Supply a KDE program, and it will have the necessary KDE vars to
- get icons, mime types, etc. working.
- For example:
-
- packageOverrides = pkgs : {
- kdenliveWrapped = kde4.wrapper kde4.kdenlive;
- };
- */
-program:
-
-let
- libs = with kde4; [ kdelibs kde_runtime oxygen_icons shared_mime_info ]
- ++ extraLibs;
-in
-stdenv.mkDerivation {
- name = program.name + "-wrapped";
-
- inherit libs;
-
- buildCommand = ''
- mkdir -p $out/bin
-
- KDEDIRS=${program}
- QT_PLUGIN_PATH=${program}/lib/qt4/plugins:${program}/lib/kde4/plugins
- for a in $libs; do
- KDEDIRS=$a''${KDEDIRS:+:}$KDEDIRS
- QT_PLUGIN_PATH=$a/lib/qt4/plugins:$a/lib/kde4/plugins''${QT_PLUGIN_PATH:+:}$QT_PLUGIN_PATH
- done
- for a in ${program}/bin/*; do
- PROG=$out/bin/`basename $a`
- cat > $PROG << END
- #!/bin/sh
- export KDEDIRS=$KDEDIRS\''${KDEDIRS:+:}\$KDEDIRS
- export QT_PLUGIN_PATH=$QT_PLUGIN_PATH\''${QT_PLUGIN_PATH:+:}\$QT_PLUGIN_PATH
- exec $a "\$@"
- END
- chmod +x $PROG
- done
- '';
-
- preferLocalBuild = true;
-}
diff --git a/pkgs/build-support/remove-references-to/default.nix b/pkgs/build-support/remove-references-to/default.nix
new file mode 100644
index 000000000000..8b1d05fc2307
--- /dev/null
+++ b/pkgs/build-support/remove-references-to/default.nix
@@ -0,0 +1,34 @@
+# The program `remove-references-to' created by this derivation replaces all
+# references to the given Nix store paths in the specified files by a
+# non-existent path (/nix/store/eeee...). This is useful for getting rid of
+# dependencies that you know are not actually needed at runtime.
+
+{ stdenv, writeScriptBin }:
+
+writeScriptBin "remove-references-to" ''
+#! ${stdenv.shell} -e
+
+# References to remove
+targets=()
+while getopts t: o; do
+ case "$o" in
+ t) storeId=$(echo "$OPTARG" | sed -n "s|^$NIX_STORE/\\([a-z0-9]\{32\}\\)-.*|\1|p")
+ if [ -z "$storeId" ]; then
+ echo "-t argument must be a Nix store path"
+ exit 1
+ fi
+ targets+=("$storeId")
+ esac
+done
+shift $(($OPTIND-1))
+
+# Files to remove the references from
+regions=()
+for i in "$@"; do
+ test ! -L "$i" -a -f "$i" && regions+=("$i")
+done
+
+for target in "''${targets[@]}" ; do
+ sed -i -e "s|$NIX_STORE/$target-|$NIX_STORE/eeeeeeeeeeeeeeeeeeeeeeeeeeeeeeee-|g" "''${regions[@]}"
+done
+''
diff --git a/pkgs/build-support/rust/default.nix b/pkgs/build-support/rust/default.nix
index a69ef5c6b07f..91569d0c070a 100644
--- a/pkgs/build-support/rust/default.nix
+++ b/pkgs/build-support/rust/default.nix
@@ -33,7 +33,7 @@ in stdenv.mkDerivation (args // {
echo "Using cargo deps from $cargoDeps"
- cp -r "$cargoDeps" deps
+ cp -a "$cargoDeps" deps
chmod +w deps -R
# It's OK to use /dev/null as the URL because by the time we do this, cargo
diff --git a/pkgs/build-support/setup-hooks/compress-man-pages.sh b/pkgs/build-support/setup-hooks/compress-man-pages.sh
index f1d9cf3a3696..d10a898d6e46 100644
--- a/pkgs/build-support/setup-hooks/compress-man-pages.sh
+++ b/pkgs/build-support/setup-hooks/compress-man-pages.sh
@@ -3,26 +3,30 @@ fixupOutputHooks+=('if [ -z "$dontGzipMan" ]; then compressManPages "$prefix"; f
compressManPages() {
local dir="$1"
- if [ ! -d "$dir/share/man" ]; then return; fi
- echo "gzipping man pages in $dir"
+ if [ -L "$dir"/share ] || [ -L "$dir"/share/man ] || [ ! -d "$dir/share/man" ]
+ then return
+ fi
+ echo "gzipping man pages under $dir/share/man/"
- GLOBIGNORE=.:..:*.gz:*.bz2
-
- for f in "$dir"/share/man/*/* "$dir"/share/man/*/*/*; do
- if [ -f "$f" -a ! -L "$f" ]; then
- if gzip -c -n "$f" > "$f".gz; then
- rm "$f"
- else
- rm "$f".gz
- fi
+ # Compress all uncompressed manpages. Don't follow symlinks, etc.
+ find "$dir"/share/man/ -type f -a '!' -regex '.*\.\(bz2\|gz\)$' -print0 \
+ | while IFS= read -r -d $'\0' f
+ do
+ if gzip -c -n "$f" > "$f".gz; then
+ rm "$f"
+ else
+ rm "$f".gz
fi
done
- for f in "$dir"/share/man/*/* "$dir"/share/man/*/*/*; do
- if [ -L "$f" -a -f `readlink -f "$f"`.gz ]; then
- ln -sf `readlink "$f"`.gz "$f".gz && rm "$f"
+ # Point symlinks to compressed manpages.
+ find "$dir"/share/man/ -type l -a '!' -regex '.*\.\(bz2\|gz\)$' -print0 \
+ | while IFS= read -r -d $'\0' f
+ do
+ local target
+ target="$(readlink -f "$f")"
+ if [ -f "$target".gz ]; then
+ ln -sf "$target".gz "$f".gz && rm "$f"
fi
done
-
- unset GLOBIGNORE
}
diff --git a/pkgs/build-support/setup-hooks/fix-darwin-frameworks.sh b/pkgs/build-support/setup-hooks/fix-darwin-frameworks.sh
new file mode 100644
index 000000000000..e3a08b2598d9
--- /dev/null
+++ b/pkgs/build-support/setup-hooks/fix-darwin-frameworks.sh
@@ -0,0 +1,31 @@
+# On Mac OS X, frameworks are linked to the system CoreFoundation but
+# dynamic libraries built with nix use a pure version of CF this
+# causes segfaults for binaries that depend on it at runtime. This
+# can be solved in two ways.
+# 1. Rewrite references to the pure CF using this setup hook, this
+# works for the simple case but this can still cause problems if other
+# dependencies (eg. python) use the pure CF.
+# 2. Create a wrapper for the binary that sets DYLD_FRAMEWORK_PATH to
+# /System/Library/Frameworks. This will make everything load the
+# system's CoreFoundation framework while still keeping the
+# dependencies pure for other packages.
+
+fixupOutputHooks+=('fixDarwinFrameworksIn $prefix')
+
+fixDarwinFrameworks() {
+ local systemPrefix='/System/Library/Frameworks'
+
+ for fn in "$@"; do
+ if [ -L "$fn" ]; then continue; fi
+ echo "$fn: fixing dylib"
+
+ for framework in $(otool -L "$fn" | awk '/CoreFoundation\.framework/ {print $1}'); do
+ install_name_tool -change "$framework" "$systemPrefix/CoreFoundation.framework/Versions/A/CoreFoundation" "$fn" >&2
+ done
+ done
+}
+
+fixDarwinFrameworksIn() {
+ local dir="$1"
+ fixDarwinFrameworks $(find "$dir" -name "*.dylib")
+}
diff --git a/pkgs/build-support/setup-hooks/make-wrapper.sh b/pkgs/build-support/setup-hooks/make-wrapper.sh
index 4f55493ae483..96e50773138b 100644
--- a/pkgs/build-support/setup-hooks/make-wrapper.sh
+++ b/pkgs/build-support/setup-hooks/make-wrapper.sh
@@ -19,98 +19,100 @@
# are read first and used as VALS
# --suffix-contents
makeWrapper() {
- local original=$1
- local wrapper=$2
+ local original="$1"
+ local wrapper="$2"
local params varName value command separator n fileNames
- local argv0 flagsBefore flags extraFlagsArray
+ local argv0 flagsBefore flags
- mkdir -p "$(dirname $wrapper)"
+ mkdir -p "$(dirname "$wrapper")"
- echo "#! $SHELL -e" > $wrapper
+ echo "#! $SHELL -e" > "$wrapper"
params=("$@")
for ((n = 2; n < ${#params[*]}; n += 1)); do
- p=${params[$n]}
+ p="${params[$n]}"
if test "$p" = "--set"; then
- varName=${params[$((n + 1))]}
- value=${params[$((n + 2))]}
+ varName="${params[$((n + 1))]}"
+ value="${params[$((n + 2))]}"
n=$((n + 2))
- echo "export $varName=\"$value\"" >> $wrapper
+ echo "export $varName=\"$value\"" >> "$wrapper"
fi
if test "$p" = "--unset"; then
- varName=${params[$((n + 1))]}
+ varName="${params[$((n + 1))]}"
n=$((n + 1))
echo "unset $varName" >> "$wrapper"
fi
if test "$p" = "--run"; then
- command=${params[$((n + 1))]}
+ command="${params[$((n + 1))]}"
n=$((n + 1))
- echo "$command" >> $wrapper
+ echo "$command" >> "$wrapper"
fi
if test "$p" = "--suffix" -o "$p" = "--prefix"; then
- varName=${params[$((n + 1))]}
- separator=${params[$((n + 2))]}
- value=${params[$((n + 3))]}
+ varName="${params[$((n + 1))]}"
+ separator="${params[$((n + 2))]}"
+ value="${params[$((n + 3))]}"
n=$((n + 3))
if test -n "$value"; then
if test "$p" = "--suffix"; then
- echo "export $varName=\$$varName\${$varName:+$separator}$value" >> $wrapper
+ echo "export $varName=\$$varName\${$varName:+$separator}$value" >> "$wrapper"
else
- echo "export $varName=$value\${$varName:+$separator}\$$varName" >> $wrapper
+ echo "export $varName=$value\${$varName:+$separator}\$$varName" >> "$wrapper"
fi
fi
fi
if test "$p" = "--suffix-each"; then
- varName=${params[$((n + 1))]}
- separator=${params[$((n + 2))]}
- values=${params[$((n + 3))]}
+ varName="${params[$((n + 1))]}"
+ separator="${params[$((n + 2))]}"
+ values="${params[$((n + 3))]}"
n=$((n + 3))
for value in $values; do
- echo "export $varName=\$$varName\${$varName:+$separator}$value" >> $wrapper
+ echo "export $varName=\$$varName\${$varName:+$separator}$value" >> "$wrapper"
done
fi
if test "$p" = "--suffix-contents" -o "$p" = "--prefix-contents"; then
- varName=${params[$((n + 1))]}
- separator=${params[$((n + 2))]}
- fileNames=${params[$((n + 3))]}
+ varName="${params[$((n + 1))]}"
+ separator="${params[$((n + 2))]}"
+ fileNames="${params[$((n + 3))]}"
n=$((n + 3))
for fileName in $fileNames; do
if test "$p" = "--suffix-contents"; then
- echo "export $varName=\$$varName\${$varName:+$separator}$(cat $fileName)" >> $wrapper
+ echo "export $varName=\$$varName\${$varName:+$separator}$(cat "$fileName")" >> "$wrapper"
else
- echo "export $varName=$(cat $fileName)\${$varName:+$separator}\$$varName" >> $wrapper
+ echo "export $varName=$(cat "$fileName")\${$varName:+$separator}\$$varName" >> "$wrapper"
fi
done
fi
if test "$p" = "--add-flags"; then
- flags=${params[$((n + 1))]}
+ flags="${params[$((n + 1))]}"
n=$((n + 1))
flagsBefore="$flagsBefore $flags"
fi
if test "$p" = "--argv0"; then
- argv0=${params[$((n + 1))]}
+ argv0="${params[$((n + 1))]}"
n=$((n + 1))
fi
done
# Note: extraFlagsArray is an array containing additional flags
# that may be set by --run actions.
- echo exec ${argv0:+-a $argv0} "$original" \
- $flagsBefore '"${extraFlagsArray[@]}"' '"$@"' >> $wrapper
+ # Silence warning about unexpanded extraFlagsArray:
+ # shellcheck disable=SC2016
+ echo exec ${argv0:+-a \"$argv0\"} \""$original"\" \
+ "$flagsBefore" '"${extraFlagsArray[@]}"' '"$@"' >> "$wrapper"
- chmod +x $wrapper
+ chmod +x "$wrapper"
}
addSuffix() {
- suffix=$1
+ suffix="$1"
shift
for name in "$@"; do
echo "$name$suffix"
@@ -128,7 +130,10 @@ filterExisting() {
# Syntax: wrapProgram
wrapProgram() {
local prog="$1"
- local hidden="$(dirname "$prog")/.$(basename "$prog")"-wrapped
- mv $prog $hidden
- makeWrapper $hidden $prog --argv0 '"$0"' "$@"
+ local hidden
+ hidden="$(dirname "$prog")/.$(basename "$prog")"-wrapped
+ mv "$prog" "$hidden"
+ # Silence warning about unexpanded $0:
+ # shellcheck disable=SC2016
+ makeWrapper "$hidden" "$prog" --argv0 '$0' "$@"
}
diff --git a/pkgs/build-support/setup-hooks/strip.sh b/pkgs/build-support/setup-hooks/strip.sh
index 6860c9b9cb9a..0bf37e10d870 100644
--- a/pkgs/build-support/setup-hooks/strip.sh
+++ b/pkgs/build-support/setup-hooks/strip.sh
@@ -30,7 +30,7 @@ stripDirs() {
if [ -n "${dirs}" ]; then
header "stripping (with flags $stripFlags) in$dirs"
- find $dirs -type f -print0 | xargs -0 ${xargsFlags:--r} strip $commonStripFlags $stripFlags || true
+ find $dirs -type f -print0 | xargs -0 ${xargsFlags:--r} strip $commonStripFlags $stripFlags 2>/dev/null || true
stopNest
fi
}
diff --git a/pkgs/build-support/setup-systemd-units.nix b/pkgs/build-support/setup-systemd-units.nix
new file mode 100644
index 000000000000..4fa2f42c39dc
--- /dev/null
+++ b/pkgs/build-support/setup-systemd-units.nix
@@ -0,0 +1,83 @@
+# | Build a script to install and start a set of systemd units on any
+# systemd-based system.
+#
+# Creates a symlink at /etc/systemd-static/${namespace} for slightly
+# improved atomicity.
+{ writeScriptBin
+, bash
+, coreutils
+, systemd
+, runCommand
+, lib
+}:
+ { units # : AttrSet String (Either Path { path : Path, wanted-by : [ String ] })
+ # ^ A set whose names are unit names and values are
+ # either paths to the corresponding unit files or a set
+ # containing the path and the list of units this unit
+ # should be wanted-by (none by default).
+ #
+ # The names should include the unit suffix
+ # (e.g. ".service")
+ , namespace # : String
+ # The namespace for the unit files, to allow for
+ # multiple independent unit sets managed by
+ # `setupSystemdUnits`.
+ }:
+ let static = runCommand "systemd-static" {}
+ ''
+ mkdir -p $out
+ ${lib.concatStringsSep "\n" (lib.mapAttrsToList (nm: file:
+ "ln -sv ${file.path or file} $out/${nm}"
+ ) units)}
+ '';
+ add-unit-snippet = name: file:
+ ''
+ oldUnit=$(readlink -f "$unitDir/${name}" || echo "$unitDir/${name}")
+ if [ -f "$oldUnit" -a "$oldUnit" != "${file.path or file}" ]; then
+ unitsToStop+=("${name}")
+ fi
+ ln -sf "/etc/systemd-static/${namespace}/${name}" \
+ "$unitDir/.${name}.tmp"
+ mv -T "$unitDir/.${name}.tmp" "$unitDir/${name}"
+ ${lib.concatStringsSep "\n" (map (unit:
+ ''
+ mkdir -p "$unitDir/${unit}.wants"
+ ln -sf "../${name}" \
+ "$unitDir/${unit}.wants/.${name}.tmp"
+ mv -T "$unitDir/${unit}.wants/.${name}.tmp" \
+ "$unitDir/${unit}.wants/${name}"
+ ''
+ ) file.wanted-by or [])}
+ unitsToStart+=("${name}")
+ '';
+ in
+ writeScriptBin "setup-systemd-units"
+ ''
+ #!${bash}/bin/bash -e
+ export PATH=${coreutils}/bin:${systemd}/bin
+
+ unitDir=/etc/systemd/system
+ if [ ! -w "$unitDir" ]; then
+ unitDir=/etc/systemd-mutable/system
+ mkdir -p "$unitDir"
+ fi
+ declare -a unitsToStop unitsToStart
+
+ oldStatic=$(readlink -f /etc/systemd-static/${namespace} || true)
+ if [ "$oldStatic" != "${static}" ]; then
+ ${lib.concatStringsSep "\n"
+ (lib.mapAttrsToList add-unit-snippet units)}
+ if [ ''${#unitsToStop[@]} -ne 0 ]; then
+ echo "Stopping unit(s) ''${unitsToStop[@]}" >&2
+ systemctl stop "''${unitsToStop[@]}"
+ fi
+ mkdir -p /etc/systemd-static
+ ln -sfT ${static} /etc/systemd-static/.${namespace}.tmp
+ mv -T /etc/systemd-static/.${namespace}.tmp /etc/systemd-static/${namespace}
+ systemctl daemon-reload
+ echo "Starting unit(s) ''${unitsToStart[@]}" >&2
+ systemctl start "''${unitsToStart[@]}"
+ else
+ echo "Units unchanged, doing nothing" >&2
+ fi
+ ''
diff --git a/pkgs/build-support/vm/default.nix b/pkgs/build-support/vm/default.nix
index 461bdd08fb57..19a3f24a470d 100644
--- a/pkgs/build-support/vm/default.nix
+++ b/pkgs/build-support/vm/default.nix
@@ -242,6 +242,14 @@ rec {
eval "$preVM"
+ if [ "$enableParallelBuilding" = 1 ]; then
+ if [ ''${NIX_BUILD_CORES:-0} = 0 ]; then
+ QEMU_OPTS+=" -smp cpus=$(nproc)"
+ else
+ QEMU_OPTS+=" -smp cpus=$NIX_BUILD_CORES"
+ fi
+ fi
+
# Write the command to start the VM to a file so that the user can
# debug inside the VM if the build fails (when Nix is called with
# the -K option to preserve the temporary build directory).
@@ -858,7 +866,7 @@ rec {
fullName = "Fedora 10 (i386)";
packagesList = fetchurl {
url = mirror://fedora/linux/releases/10/Everything/i386/os/repodata/beeea88d162e76993c25b9dd8139868274ee7fa1-primary.xml.gz;
- sha1 = "beeea88d162e76993c25b9dd8139868274ee7fa1";
+ sha256 = "17lyvzqjsxw3ll7726dpg14f9jc2p3fz5cr5cwd8hp3rkm5nfclv";
};
urlPrefix = mirror://fedora/linux/releases/10/Everything/i386/os;
packages = commonFedoraPackages ++ [ "cronie" "util-linux-ng" ];
@@ -869,7 +877,7 @@ rec {
fullName = "Fedora 10 (x86_64)";
packagesList = fetchurl {
url = mirror://fedora/linux/releases/10/Everything/x86_64/os/repodata/7958210175e86b5cc843cf4bd0bc8659e445e261-primary.xml.gz;
- sha1 = "7958210175e86b5cc843cf4bd0bc8659e445e261";
+ sha256 = "02pzqmb26zmmzdni11dip3bar4kr54ddsrq9z4vda7ldwwkqd3py";
};
urlPrefix = mirror://fedora/linux/releases/10/Everything/x86_64/os;
archs = ["noarch" "x86_64"];
@@ -1154,6 +1162,32 @@ rec {
unifiedSystemDir = true;
};
+ fedora25i386 = {
+ name = "fedora-25-i386";
+ fullName = "Fedora 25 (i386)";
+ packagesList = fetchurl rec {
+ url = "mirror://fedora/linux/releases/25/Everything/i386/os/repodata/${sha256}-primary.xml.gz";
+ sha256 = "4d399e5eebb8d543d50e2da274348280fae07a6efcc469491784582b39d73bba";
+ };
+ urlPrefix = mirror://fedora/linux/releases/25/Everything/i386/os;
+ archs = ["noarch" "i386" "i586" "i686"];
+ packages = commonFedoraPackages ++ [ "cronie" "util-linux" ];
+ unifiedSystemDir = true;
+ };
+
+ fedora25x86_64 = {
+ name = "fedora-25-x86_64";
+ fullName = "Fedora 25 (x86_64)";
+ packagesList = fetchurl rec {
+ url = "mirror://fedora/linux/releases/25/Everything/x86_64/os/repodata/${sha256}-primary.xml.gz";
+ sha256 = "eaea04bff7327c49d90240992dff2be6d451a1758ef83e94825f23d4ff27e868";
+ };
+ urlPrefix = mirror://fedora/linux/releases/25/Everything/x86_64/os;
+ archs = ["noarch" "x86_64"];
+ packages = commonFedoraPackages ++ [ "cronie" "util-linux" ];
+ unifiedSystemDir = true;
+ };
+
opensuse103i386 = {
name = "opensuse-10.3-i586";
fullName = "openSUSE 10.3 (i586)";
@@ -1291,7 +1325,7 @@ rec {
fullName = "Ubuntu 7.10 Gutsy (i386)";
packagesList = fetchurl {
url = mirror://ubuntu/dists/gutsy/main/binary-i386/Packages.bz2;
- sha1 = "8b52ee3d417700e2b2ee951517fa25a8792cabfd";
+ sha256 = "0fmac8svxq86a4w878g6syczvy5ff4jrdc1gajd3xd8z0dypnw27";
};
urlPrefix = mirror://ubuntu;
packages = commonDebianPackages;
@@ -1302,7 +1336,7 @@ rec {
fullName = "Ubuntu 8.04 Hardy (i386)";
packagesList = fetchurl {
url = mirror://ubuntu/dists/hardy/main/binary-i386/Packages.bz2;
- sha1 = "db74581ee75cb3bee2a8ae62364e97956c723259";
+ sha256 = "19132nc9fhdfmgmvn834lk0d8c0n3jv0ndz9inyynh9k6pc8b5hd";
};
urlPrefix = mirror://ubuntu;
packages = commonDebianPackages;
@@ -1313,7 +1347,7 @@ rec {
fullName = "Ubuntu 8.04 Hardy (amd64)";
packagesList = fetchurl {
url = mirror://ubuntu/dists/hardy/main/binary-amd64/Packages.bz2;
- sha1 = "d1f1d2b3cc62533d6e4337f2696a5d27235d1f28";
+ sha256 = "1xjcgh0ydixmim7kgxss0mhfw0sibpgygvgsyac4bdz9m503sj3h";
};
urlPrefix = mirror://ubuntu;
packages = commonDebianPackages;
@@ -1377,7 +1411,7 @@ rec {
ubuntu910x86_64 = {
name = "ubuntu-9.10-karmic-amd64";
fullName = "Ubuntu 9.10 Karmic (amd64)";
- packagesList = fetchurl {
+ packagesList = fetchurl {
url = mirror://ubuntu/dists/karmic/main/binary-amd64/Packages.bz2;
sha256 = "3a604fcb0c135eeb8b95da3e90a8fd4cfeff519b858cd3c9e62ea808cb9fec40";
};
@@ -1793,6 +1827,40 @@ rec {
packages = commonDebPackages ++ [ "diffutils" "libc-bin" ];
};
+ ubuntu1610i386 = {
+ name = "ubuntu-16.10-yakkety-i386";
+ fullName = "Ubuntu 16.10 Yakkety (i386)";
+ packagesLists =
+ [ (fetchurl {
+ url = mirror://ubuntu/dists/yakkety/main/binary-i386/Packages.xz;
+ sha256 = "da811f582779a969f738f2366c17e075cf0da3c4f2a4ed1926093a2355fd72ba";
+ })
+ (fetchurl {
+ url = mirror://ubuntu/dists/yakkety/universe/binary-i386/Packages.xz;
+ sha256 = "5162b0a87173cd5dea7ce2273788befe36f38089d44a2379ed9dd92f76c6b2aa";
+ })
+ ];
+ urlPrefix = mirror://ubuntu;
+ packages = commonDebPackages ++ [ "diffutils" "libc-bin" ];
+ };
+
+ ubuntu1610x86_64 = {
+ name = "ubuntu-16.10-yakkety-amd64";
+ fullName = "Ubuntu 16.10 Yakkety (amd64)";
+ packagesList =
+ [ (fetchurl {
+ url = mirror://ubuntu/dists/yakkety/main/binary-amd64/Packages.xz;
+ sha256 = "356c4cfab0d7f77b75c473cd78b22ee7288f63b24c9739049924dc081dd2e3d1";
+ })
+ (fetchurl {
+ url = mirror://ubuntu/dists/yakkety/universe/binary-amd64/Packages.xz;
+ sha256 = "a72660f8feffd6978e3b9328c6259b5387ac0b4f33d1029e4a17091ceb5057e6";
+ })
+ ];
+ urlPrefix = mirror://ubuntu;
+ packages = commonDebPackages ++ [ "diffutils" "libc-bin" ];
+ };
+
debian40i386 = {
name = "debian-4.0r9-etch-i386";
fullName = "Debian 4.0r9 Etch (i386)";
diff --git a/pkgs/data/documentation/rnrs/common.nix b/pkgs/data/documentation/rnrs/common.nix
index 8053020a3f27..bd38389eb47e 100644
--- a/pkgs/data/documentation/rnrs/common.nix
+++ b/pkgs/data/documentation/rnrs/common.nix
@@ -24,5 +24,7 @@ stdenv.mkDerivation rec {
'';
homepage = http://swiss.csail.mit.edu/~jaffer/Scheme;
+
+ broken = true;
};
}
diff --git a/pkgs/data/fonts/babelstone-han/default.nix b/pkgs/data/fonts/babelstone-han/default.nix
new file mode 100644
index 000000000000..16534d4d6cbe
--- /dev/null
+++ b/pkgs/data/fonts/babelstone-han/default.nix
@@ -0,0 +1,30 @@
+{stdenv, fetchurl, unzip}:
+
+stdenv.mkDerivation rec {
+ name = "babelstone-han-${version}";
+ version = "9.0.2";
+
+ src = fetchurl {
+ url = "http://www.babelstone.co.uk/Fonts/8672/BabelStoneHan.zip";
+ sha256 = "09zlrp3mqdsbxpq4sssd8gj5isnxfbr56pcdp7mnr27nv4pvp6ha";
+ };
+
+ buildInputs = [ unzip ];
+
+ sourceRoot = ".";
+
+ installPhase = ''
+ mkdir -p $out/share/fonts/truetype
+ cp -v *.ttf $out/share/fonts/truetype
+ '';
+
+ meta = with stdenv.lib; {
+ description = "Unicode CJK font with over 32600 Han characters";
+ homepage = http://www.babelstone.co.uk/Fonts/Han.html;
+
+ license = licenses.free;
+ platforms = platforms.all;
+ hydraPlatforms = [];
+ maintainers = [ maintainers.volth ];
+ };
+}
diff --git a/pkgs/data/fonts/fontconfig-penultimate/default.nix b/pkgs/data/fonts/fontconfig-penultimate/default.nix
new file mode 100644
index 000000000000..148cbb2f8c1d
--- /dev/null
+++ b/pkgs/data/fonts/fontconfig-penultimate/default.nix
@@ -0,0 +1,26 @@
+{ stdenv, fetchFromGitHub }:
+
+let version = "0.3.3"; in
+stdenv.mkDerivation {
+ name = "fontconfig-penultimate-${version}";
+
+ src = fetchFromGitHub {
+ owner = "ttuegel";
+ repo = "fontconfig-penultimate";
+ rev = version;
+ sha256 = "0392lw31jps652dcjazln77ihb6bl7gk201gb7wb9i223avp86w9";
+ };
+
+ installPhase = ''
+ mkdir -p $out/etc/fonts/conf.d
+ cp *.conf $out/etc/fonts/conf.d
+ '';
+
+ meta = with stdenv.lib; {
+ homepage = https://github.com/ttuegel/fontconfig-penultimate;
+ description = "Sensible defaults for Fontconfig";
+ license = licenses.asl20;
+ maintainers = [ maintainers.ttuegel ];
+ platforms = platforms.all;
+ };
+}
diff --git a/pkgs/data/fonts/hasklig/default.nix b/pkgs/data/fonts/hasklig/default.nix
index 3b5aff984e42..3bca24379142 100644
--- a/pkgs/data/fonts/hasklig/default.nix
+++ b/pkgs/data/fonts/hasklig/default.nix
@@ -2,11 +2,11 @@
stdenv.mkDerivation rec {
name = "hasklig-${version}";
- version = "0.9";
+ version = "1.1";
src = fetchurl {
url = "https://github.com/i-tu/Hasklig/releases/download/${version}/Hasklig-${version}.zip";
- sha256 = "0rav55f6j1b8pqjgwvw52b92j2m630ampamlsiiym2xf684wnw2d";
+ sha256 = "1hwmdbygallw2kjk0v3a3dl7w6b21wii3acrl0w3ibn05g1cxv4q";
};
buildInputs = [ unzip ];
diff --git a/pkgs/data/fonts/iosevka/default.nix b/pkgs/data/fonts/iosevka/default.nix
index cbd963e903df..ac7dcea31b13 100644
--- a/pkgs/data/fonts/iosevka/default.nix
+++ b/pkgs/data/fonts/iosevka/default.nix
@@ -1,16 +1,18 @@
-{ stdenv, fetchFromGitHub }:
+{ stdenv, fetchurl, unzip }:
stdenv.mkDerivation rec {
name = "iosevka-${version}";
- version = "1.4.2";
+ version = "1.12.1";
- src = fetchFromGitHub {
- owner = "be5invis";
- repo = "Iosevka";
- rev = "v${version}";
- sha256 = "1h1lmvjpjk0238bhdhnv2c149s98qpbndc8rxzlk6bhmxcy6rwsk";
+ buildInputs = [ unzip ];
+
+ src = fetchurl {
+ url = "https://github.com/be5invis/Iosevka/releases/download/v${version}/iosevka-pack-${version}.zip";
+ sha256 = "1rwg06fbizf2cmjwysx4ciz96nh80k48drsyr3rshppycajnaahj";
};
+ sourceRoot = ".";
+
installPhase = ''
fontdir=$out/share/fonts/iosevka
diff --git a/pkgs/data/fonts/shrikhand/default.nix b/pkgs/data/fonts/shrikhand/default.nix
new file mode 100644
index 000000000000..942a284e2c0d
--- /dev/null
+++ b/pkgs/data/fonts/shrikhand/default.nix
@@ -0,0 +1,25 @@
+{ stdenv, fetchFromGitHub }:
+
+stdenv.mkDerivation rec {
+ version = "2016-03-03";
+ name = "shrikhand-${version}";
+
+ src = fetchFromGitHub {
+ owner = "jonpinhorn";
+ repo = "shrikhand";
+ rev = "c11c9b0720fba977fad7cb4f339ebacdba1d1394";
+ sha256 = "1d21bvj4w8i0zrmkdrgbn0rpzac89iazfids1x273gsrsvvi45kk";
+ };
+
+ installPhase = ''
+ install -D -m644 build/Shrikhand-Regular.ttf $out/share/fonts/truetype/Shrikhand-Regular.ttf
+ '';
+
+ meta = with stdenv.lib; {
+ homepage = https://jonpinhorn.github.io/shrikhand/;
+ description = "A vibrant and playful typeface for both Latin and Gujarati writing systems";
+ maintainers = with maintainers; [ sternenseemann ];
+ platforms = platforms.all;
+ license = licenses.ofl;
+ };
+}
diff --git a/pkgs/data/fonts/source-han-sans/default.nix b/pkgs/data/fonts/source-han-sans/default.nix
index 11132710a905..240f0ff5d290 100644
--- a/pkgs/data/fonts/source-han-sans/default.nix
+++ b/pkgs/data/fonts/source-han-sans/default.nix
@@ -23,10 +23,11 @@ let
'';
meta = {
- description = "${language} subset of an open source Pan-CJK typeface";
+ description = "${language} subset of an open source Pan-CJK sans-serif typeface";
homepage = https://github.com/adobe-fonts/source-han-sans;
- license = stdenv.lib.licenses.asl20;
+ license = stdenv.lib.licenses.ofl;
platforms = stdenv.lib.platforms.unix;
+ maintainers = with stdenv.lib.maintainers; [ taku0 ];
};
};
in
diff --git a/pkgs/data/fonts/source-han-serif/default.nix b/pkgs/data/fonts/source-han-serif/default.nix
new file mode 100644
index 000000000000..148f5a4538f5
--- /dev/null
+++ b/pkgs/data/fonts/source-han-serif/default.nix
@@ -0,0 +1,59 @@
+{stdenv, fetchurl, unzip}:
+
+let
+ makePackage = {variant, language, region, sha256}: stdenv.mkDerivation rec {
+ version = "1.000R";
+ name = "source-han-serif-${variant}-${version}";
+ revision = "f6cf97d92b22e7bd77e355a61fe549ae44b6de76";
+
+ buildInputs = [ unzip ];
+
+ src = fetchurl {
+ url = "https://github.com/adobe-fonts/source-han-serif/raw/${revision}/SubsetOTF/SourceHanSerif${region}.zip";
+ inherit sha256;
+ };
+
+ setSourceRoot = ''
+ sourceRoot=$( echo SourceHanSerif* )
+ '';
+
+ installPhase = ''
+ mkdir -p $out/share/fonts/opentype
+ cp $( find . -name '*.otf' ) $out/share/fonts/opentype
+ '';
+
+ meta = {
+ description = "${language} subset of an open source Pan-CJK serif typeface";
+ homepage = https://github.com/adobe-fonts/source-han-sans;
+ license = stdenv.lib.licenses.ofl;
+ platforms = stdenv.lib.platforms.unix;
+ maintainers = with stdenv.lib.maintainers; [ taku0 ];
+ };
+ };
+in
+{
+ japanese = makePackage {
+ variant = "japanese";
+ language = "Japanese";
+ region = "JP";
+ sha256 = "0488zxr6jpwinzayrznc4ciy8mqcq9afx80xnp37pl9gcxsv0jp7";
+ };
+ korean = makePackage {
+ variant = "korean";
+ language = "Korean";
+ region = "KR";
+ sha256 = "1kwsqrb3s52nminq65n3la540dgvahnhvgwv5h168nrmz881ni9r";
+ };
+ simplified-chinese = makePackage {
+ variant = "simplified-chinese";
+ language = "Simplified Chinese";
+ region = "CN";
+ sha256 = "0y6js0hjgf1i8mf7kzklcl02qg0bi7j8n7j1l4awmkij1ix2yc43";
+ };
+ traditional-chinese = makePackage {
+ variant = "traditional-chinese";
+ language = "Traditional Chinese";
+ region = "TW";
+ sha256 = "0q52dn0vh3pqpr9gn4r4qk99lkvhf2gl12y99n9423brrqyfbi6h";
+ };
+}
diff --git a/pkgs/data/fonts/stix-two/default.nix b/pkgs/data/fonts/stix-two/default.nix
new file mode 100644
index 000000000000..d4ec083a0708
--- /dev/null
+++ b/pkgs/data/fonts/stix-two/default.nix
@@ -0,0 +1,28 @@
+{ stdenv, fetchurl, unzip }:
+
+stdenv.mkDerivation rec {
+ name = "stix-two-${version}";
+ version = "2.0.0";
+
+ src = fetchurl {
+ url = "mirror://sourceforge/stixfonts/Current%20Release/STIXv${version}.zip";
+ sha256 = "0f6rcg0p2dhnks523nywgkjk56bjajz3gnwsrap932674xxjkb3g";
+ };
+
+ buildInputs = [ unzip ];
+
+ phases = [ "unpackPhase" "installPhase" ];
+
+ installPhase = ''
+ mkdir -p $out/share/fonts/opentype
+ cp -v "Fonts/OTF/"*.otf $out/share/fonts/opentype
+ '';
+
+ meta = with stdenv.lib; {
+ homepage = http://www.stixfonts.org/;
+ description = "Fonts for Scientific and Technical Information eXchange";
+ license = licenses.ofl;
+ platforms = platforms.all;
+ maintainers = [ maintainers.rycee ];
+ };
+}
diff --git a/pkgs/data/icons/moka-icon-theme/default.nix b/pkgs/data/icons/moka-icon-theme/default.nix
index 0ffe2411c4fa..57dfe0797fac 100644
--- a/pkgs/data/icons/moka-icon-theme/default.nix
+++ b/pkgs/data/icons/moka-icon-theme/default.nix
@@ -3,13 +3,13 @@
stdenv.mkDerivation rec {
name = "${package-name}-${version}";
package-name = "moka-icon-theme";
- version = "2016-10-06";
+ version = "2017-02-13";
src = fetchFromGitHub {
owner = "snwh";
repo = package-name;
- rev = "50894ee9411721649019cd168b8ae2c85f4b5cf0";
- sha256 = "1dlpsgqsn731ra5drkx72wljcgv1zydgldy4nn5bbia9s5w8mfgs";
+ rev = "5ac530d2394574bdbd5360de46391d0dfc7aa2ab";
+ sha256 = "1zw1jm03706086gnplkkrdlrcyhgwm9kp4qax57wwc1s27bhc90n";
};
nativeBuildInputs = [ autoreconfHook ];
diff --git a/pkgs/data/icons/numix-icon-theme/default.nix b/pkgs/data/icons/numix-icon-theme/default.nix
index 8732172ead4c..7f6a3fe48d79 100644
--- a/pkgs/data/icons/numix-icon-theme/default.nix
+++ b/pkgs/data/icons/numix-icon-theme/default.nix
@@ -1,7 +1,7 @@
{ stdenv, fetchFromGitHub }:
stdenv.mkDerivation rec {
- version = "2016-11-13";
+ version = "2017-01-25";
package-name = "numix-icon-theme";
@@ -10,8 +10,8 @@ stdenv.mkDerivation rec {
src = fetchFromGitHub {
owner = "numixproject";
repo = package-name;
- rev = "45878a1195abd997341c91d51381625644f9a356";
- sha256 = "0in7vx8mdwbfkgylh9p95kcsnn7dnv2vpmv788n0bbgldxmrldga";
+ rev = "271471c7944d592a1d666910de0adce82a393d31";
+ sha256 = "1yc9jk1233ybk6cd7q4x3q87rwgq9nkcgkn9fw9si422dkvnwd7h";
};
dontBuild = true;
diff --git a/pkgs/data/icons/paper-icon-theme/default.nix b/pkgs/data/icons/paper-icon-theme/default.nix
index 13adb7efaafc..e0ea56831b4d 100644
--- a/pkgs/data/icons/paper-icon-theme/default.nix
+++ b/pkgs/data/icons/paper-icon-theme/default.nix
@@ -3,13 +3,13 @@
stdenv.mkDerivation rec {
name = "${package-name}-${version}";
package-name = "paper-icon-theme";
- version = "2016-11-05";
+ version = "2017-02-13";
src = fetchFromGitHub {
owner = "snwh";
repo = package-name;
- rev = "2a1f25a47fe8fb92e9d4db5537bbddb539586602";
- sha256 = "0v956wrfraaj5qznz86q7s3zi55xd3gxmg7pzcfsw2ghgfv13swd";
+ rev = "fcaf8bb2aacdd1bb7dcde3d45ef92d0751567e8e";
+ sha256 = "1l1w99411jrv4l7jr5dvwszghrncsir23c7lpc26gh2f0ydf3d0d";
};
nativeBuildInputs = [ autoreconfHook ];
diff --git a/pkgs/data/misc/iana-etc/default.nix b/pkgs/data/misc/iana-etc/default.nix
index 6adb45758392..01203f9b0bd0 100644
--- a/pkgs/data/misc/iana-etc/default.nix
+++ b/pkgs/data/misc/iana-etc/default.nix
@@ -1,17 +1,21 @@
{stdenv, fetchurl}:
stdenv.mkDerivation rec {
- name = "iana-etc-2.30";
+ name = "iana-etc-${version}";
+ version = "20170328";
src = fetchurl {
- url = "http://sethwklein.net/projects/iana-etc/downloads/${name}.tar.bz2";
- sha256 = "03gjlg5zlwsdk6qyw3v85l129rna5bpm4m7pzrp864h0n97qg9mr";
+ url = "https://github.com/Mic92/iana-etc/releases/download/${version}/iana-etc-${version}.tar.gz";
+ sha256 = "0c0zgijmh035wan3pvz8ykkmkdbraml4b9kx36b4j1lj9fhgy1yk";
};
- preInstall = "installFlags=\"PREFIX=$out\"";
+ installPhase = ''
+ mkdir -p $out/etc
+ cp services protocols $out/etc/
+ '';
meta = {
- homepage = http://sethwklein.net/projects/iana-etc/;
+ homepage = https://github.com/Mic92/iana-etc;
description = "IANA protocol and port number assignments (/etc/protocols and /etc/services)";
platforms = stdenv.lib.platforms.unix;
};
diff --git a/pkgs/data/misc/mobile-broadband-provider-info/default.nix b/pkgs/data/misc/mobile-broadband-provider-info/default.nix
index 0c4e5bc2a134..95c66ed029ef 100644
--- a/pkgs/data/misc/mobile-broadband-provider-info/default.nix
+++ b/pkgs/data/misc/mobile-broadband-provider-info/default.nix
@@ -18,6 +18,6 @@ stdenv.mkDerivation rec {
homepage = http://live.gnome.org/NetworkManager/MobileBroadband/ServiceProviders;
platforms = stdenv.lib.platforms.all;
license = stdenv.lib.licenses.publicDomain;
- maintainers = [ stdenv.lib.maintainers.urkud ];
+ maintainers = [ ];
};
}
diff --git a/pkgs/data/misc/poppler-data/default.nix b/pkgs/data/misc/poppler-data/default.nix
index beac81051993..59f4724e1bee 100644
--- a/pkgs/data/misc/poppler-data/default.nix
+++ b/pkgs/data/misc/poppler-data/default.nix
@@ -19,6 +19,6 @@ stdenv.mkDerivation rec {
description = "Encoding files for Poppler, a PDF rendering library";
platforms = platforms.all;
license = licenses.free; # more free licenses combined
- maintainers = with maintainers; [ urkud ];
+ maintainers = with maintainers; [ ];
};
}
diff --git a/pkgs/data/misc/shared-desktop-ontologies/default.nix b/pkgs/data/misc/shared-desktop-ontologies/default.nix
index 831028467f42..72895653479b 100644
--- a/pkgs/data/misc/shared-desktop-ontologies/default.nix
+++ b/pkgs/data/misc/shared-desktop-ontologies/default.nix
@@ -20,7 +20,7 @@ stdenv.mkDerivation rec {
are used by projects like KDE or Strigi.
'';
platforms = platforms.all;
- maintainers = [ maintainers.sander maintainers.urkud ];
+ maintainers = [ maintainers.sander ];
};
}
diff --git a/pkgs/data/misc/xorg-rgb/default.nix b/pkgs/data/misc/xorg-rgb/default.nix
new file mode 100644
index 000000000000..9a3db92adcc2
--- /dev/null
+++ b/pkgs/data/misc/xorg-rgb/default.nix
@@ -0,0 +1,22 @@
+{stdenv, fetchurl, pkgconfig, xproto}:
+stdenv.mkDerivation rec {
+ name = "${pname}-${version}";
+ pname = "rgb";
+ version = "1.0.6";
+
+ src = fetchurl {
+ url = "http://xorg.freedesktop.org/archive/individual/app/rgb-${version}.tar.bz2";
+ sha256 = "1c76zcjs39ljil6f6jpx1x17c8fnvwazz7zvl3vbjfcrlmm7rjmv";
+ };
+
+ nativeBuildInputs = [pkgconfig];
+ buildInputs = [xproto];
+ meta = {
+ inherit version;
+ description = "X11 colorname to RGB mapping database";
+ license = stdenv.lib.licenses.mit;
+ maintainers = [stdenv.lib.maintainers.raskin];
+ platforms = stdenv.lib.platforms.linux;
+ homepage = http://xorg.freedesktop.org/;
+ };
+}
diff --git a/pkgs/desktops/enlightenment/enlightenment.nix b/pkgs/desktops/enlightenment/enlightenment.nix
index 3949bffaba17..23805b469ae1 100644
--- a/pkgs/desktops/enlightenment/enlightenment.nix
+++ b/pkgs/desktops/enlightenment/enlightenment.nix
@@ -4,11 +4,11 @@ mesa_glu , xkeyboard_config }:
stdenv.mkDerivation rec {
name = "enlightenment-${version}";
- version = "0.21.5";
+ version = "0.21.7";
src = fetchurl {
url = "http://download.enlightenment.org/rel/apps/enlightenment/${name}.tar.xz";
- sha256 = "1fslq70z4s6v9ipahnk8s5fgqnqq4njv4rlqv951r1bh1xk5lx7h";
+ sha256 = "1xvngjdsa0p901vfhrh2qpa50k32hwwhc8bgi16a9b5d9byzfhvn";
};
nativeBuildInputs = [ pkgconfig ];
diff --git a/pkgs/desktops/gnome-2/platform/gtkglextmm/default.nix b/pkgs/desktops/gnome-2/platform/gtkglextmm/default.nix
index 97bad111ca74..152c1d98b8c8 100644
--- a/pkgs/desktops/gnome-2/platform/gtkglextmm/default.nix
+++ b/pkgs/desktops/gnome-2/platform/gtkglextmm/default.nix
@@ -28,9 +28,8 @@ stdenv.mkDerivation rec {
meta = {
description = "C++ wrappers for GtkGLExt";
-
license = stdenv.lib.licenses.lgpl2Plus;
-
platforms = stdenv.lib.platforms.linux;
+ broken = true;
};
}
diff --git a/pkgs/desktops/gnome-3/3.22/apps/evolution/default.nix b/pkgs/desktops/gnome-3/3.22/apps/evolution/default.nix
index 87a014f8f74e..c802f9636eb1 100644
--- a/pkgs/desktops/gnome-3/3.22/apps/evolution/default.nix
+++ b/pkgs/desktops/gnome-3/3.22/apps/evolution/default.nix
@@ -2,7 +2,7 @@
, pkgconfig, gtk3, glib, libnotify, gtkspell3
, wrapGAppsHook, itstool, shared_mime_info, libical, db, gcr, sqlite
, gnome3, librsvg, gdk_pixbuf, libsecret, nss, nspr, icu, libtool
-, libcanberra_gtk3, bogofilter, gst_all_1, procps, p11_kit, dconf }:
+, libcanberra_gtk3, bogofilter, gst_all_1, procps, p11_kit, dconf, openldap}:
let
majVer = gnome3.version;
@@ -24,12 +24,13 @@ in stdenv.mkDerivation rec {
gst_all_1.gstreamer gst_all_1.gst-plugins-base p11_kit
nss nspr libnotify procps highlight gnome3.libgweather
gnome3.gsettings_desktop_schemas dconf
- gnome3.libgnome_keyring gnome3.glib_networking ];
+ gnome3.libgnome_keyring gnome3.glib_networking openldap ];
nativeBuildInputs = [ pkgconfig wrapGAppsHook ];
- configureFlags = [ "--disable-spamassassin" "--disable-pst-import" "--disable-autoar"
- "--disable-libcryptui" ];
+
+ configureFlags = [ "--disable-pst-import" "--disable-autoar"
+ "--disable-libcryptui" "--with-openldap"];
NIX_CFLAGS_COMPILE = "-I${nss.dev}/include/nss -I${glib.dev}/include/gio-unix-2.0";
diff --git a/pkgs/desktops/gnome-3/3.22/apps/gnome-boxes/default.nix b/pkgs/desktops/gnome-3/3.22/apps/gnome-boxes/default.nix
index a9bb4514a3a2..cb8bf49254ba 100644
--- a/pkgs/desktops/gnome-3/3.22/apps/gnome-boxes/default.nix
+++ b/pkgs/desktops/gnome-3/3.22/apps/gnome-boxes/default.nix
@@ -1,9 +1,9 @@
{ stdenv, fetchurl, makeWrapper, pkgconfig, intltool, itstool, libvirt-glib
, glib, gobjectIntrospection, libxml2, gtk3, gtkvnc, libvirt, spice_gtk
, spice_protocol, libuuid, libsoup, libosinfo, systemd, tracker, vala_0_32
-, libcap_ng, libcap, yajl, gmp, gdbm, cyrus_sasl, gnome3, librsvg
-, desktop_file_utils, mtools, cdrkit, libcdio, numactl, xen
-, libusb, libarchive, acl, libgudev, qemu, libsecret
+, libcap, yajl, gmp, gdbm, cyrus_sasl, gnome3, librsvg, desktop_file_utils
+, mtools, cdrkit, libcdio, libusb, libarchive, acl, libgudev, qemu, libsecret
+, libcap_ng, numactl, xen, libapparmor
}:
# TODO: ovirt (optional)
@@ -15,12 +15,16 @@ stdenv.mkDerivation rec {
doCheck = true;
+ nativeBuildInputs = [
+ makeWrapper pkgconfig intltool
+ ];
+
buildInputs = [
- makeWrapper pkgconfig intltool itstool libvirt-glib glib
- gobjectIntrospection libxml2 gtk3 gtkvnc libvirt spice_gtk spice_protocol
- libuuid libsoup libosinfo systemd tracker vala_0_32 libcap_ng libcap yajl gmp
- gdbm cyrus_sasl gnome3.defaultIconTheme libusb libarchive
- librsvg desktop_file_utils acl libgudev numactl xen libsecret
+ itstool libvirt-glib glib gobjectIntrospection libxml2 gtk3 gtkvnc
+ libvirt spice_gtk spice_protocol libuuid libsoup libosinfo systemd
+ tracker vala_0_32 libcap yajl gmp gdbm cyrus_sasl libusb libarchive
+ gnome3.defaultIconTheme librsvg desktop_file_utils acl libgudev libsecret
+ libcap_ng numactl xen libapparmor
];
preFixup = ''
diff --git a/pkgs/desktops/gnome-3/3.22/core/baobab/default.nix b/pkgs/desktops/gnome-3/3.22/core/baobab/default.nix
index f7a0ff473cc1..15db270e80c5 100644
--- a/pkgs/desktops/gnome-3/3.22/core/baobab/default.nix
+++ b/pkgs/desktops/gnome-3/3.22/core/baobab/default.nix
@@ -1,6 +1,6 @@
-{ stdenv, intltool, fetchurl, vala_0_32, libgtop
+{ stdenv, intltool, fetchurl, vala, libgtop
, pkgconfig, gtk3, glib
-, bash, makeWrapper, itstool, libxml2
+, bash, wrapGAppsHook, itstool, libxml2
, gnome3, librsvg, gdk_pixbuf, file }:
stdenv.mkDerivation rec {
@@ -10,17 +10,8 @@ stdenv.mkDerivation rec {
NIX_CFLAGS_COMPILE = "-I${gnome3.glib.dev}/include/gio-unix-2.0";
- propagatedUserEnvPkgs = [ gnome3.gnome_themes_standard ];
-
- buildInputs = [ vala_0_32 pkgconfig gtk3 glib libgtop intltool itstool libxml2
- gnome3.gsettings_desktop_schemas makeWrapper file
- gdk_pixbuf gnome3.defaultIconTheme librsvg ];
-
- preFixup = ''
- wrapProgram "$out/bin/baobab" \
- --set GDK_PIXBUF_MODULE_FILE "$GDK_PIXBUF_MODULE_FILE" \
- --prefix XDG_DATA_DIRS : "${gnome3.gnome_themes_standard}/share:$out/share:$XDG_ICON_DIRS:$GSETTINGS_SCHEMAS_PATH"
- '';
+ buildInputs = [ vala pkgconfig gtk3 glib libgtop intltool itstool libxml2
+ wrapGAppsHook file gdk_pixbuf gnome3.defaultIconTheme librsvg ];
meta = with stdenv.lib; {
homepage = https://wiki.gnome.org/Apps/Baobab;
diff --git a/pkgs/desktops/gnome-3/3.22/core/dconf/default.nix b/pkgs/desktops/gnome-3/3.22/core/dconf/default.nix
index 02c60256e15b..f67dc7e32ae0 100644
--- a/pkgs/desktops/gnome-3/3.22/core/dconf/default.nix
+++ b/pkgs/desktops/gnome-3/3.22/core/dconf/default.nix
@@ -13,6 +13,8 @@ stdenv.mkDerivation rec {
sha256 = "1jaqsr1r0grpd25rbsc2v3vb0sc51lia9w31wlqswgqsncp2k0w6";
};
+ outputs = [ "out" "lib" "dev" ];
+
buildInputs = [ vala_0_32 libxslt pkgconfig glib dbus_glib gnome3.gtk libxml2
intltool docbook_xsl docbook_xsl_ns makeWrapper ];
diff --git a/pkgs/desktops/gnome-3/3.22/core/gconf/default.nix b/pkgs/desktops/gnome-3/3.22/core/gconf/default.nix
index a4cb3e8c1464..d3b2d814b164 100644
--- a/pkgs/desktops/gnome-3/3.22/core/gconf/default.nix
+++ b/pkgs/desktops/gnome-3/3.22/core/gconf/default.nix
@@ -24,6 +24,8 @@ stdenv.mkDerivation rec {
# ToDo: ldap reported as not found but afterwards reported as supported
+ outputs = [ "out" "dev" ];
+
meta = with stdenv.lib; {
homepage = http://projects.gnome.org/gconf/;
description = "A system for storing application preferences";
diff --git a/pkgs/desktops/gnome-3/3.22/core/gdm/default.nix b/pkgs/desktops/gnome-3/3.22/core/gdm/default.nix
index 7ba3c3734f84..0d8e46aeeced 100644
--- a/pkgs/desktops/gnome-3/3.22/core/gdm/default.nix
+++ b/pkgs/desktops/gnome-3/3.22/core/gdm/default.nix
@@ -23,7 +23,7 @@ stdenv.mkDerivation rec {
enableParallelBuilding = true;
# Disable Access Control because our X does not support FamilyServerInterpreted yet
- patches = [ #./xserver_path.patch # gdm now uses wayland
+ patches = [ ./xserver_path.patch
./sessions_dir.patch
./gdm-x-session_extra_args.patch
./gdm-session-worker_xserver-path.patch
diff --git a/pkgs/desktops/gnome-3/3.22/core/gnome-keyring/default.nix b/pkgs/desktops/gnome-3/3.22/core/gnome-keyring/default.nix
index 3ea108808f50..df47c1a477b9 100644
--- a/pkgs/desktops/gnome-3/3.22/core/gnome-keyring/default.nix
+++ b/pkgs/desktops/gnome-3/3.22/core/gnome-keyring/default.nix
@@ -1,5 +1,5 @@
{ stdenv, fetchurl, pkgconfig, dbus, libgcrypt, libtasn1, pam, python, glib, libxslt
-, intltool, pango, gcr, gdk_pixbuf, atk, p11_kit, makeWrapper
+, intltool, pango, gcr, gdk_pixbuf, atk, p11_kit, wrapGAppsHook
, docbook_xsl_ns, docbook_xsl, gnome3 }:
stdenv.mkDerivation rec {
@@ -7,25 +7,18 @@ stdenv.mkDerivation rec {
buildInputs = with gnome3; [
dbus libgcrypt pam python gtk3 gconf libgnome_keyring
- pango gcr gdk_pixbuf atk p11_kit makeWrapper
+ pango gcr gdk_pixbuf atk p11_kit
];
propagatedBuildInputs = [ glib libtasn1 libxslt ];
- nativeBuildInputs = [ pkgconfig intltool docbook_xsl_ns docbook_xsl ];
+ nativeBuildInputs = [ pkgconfig intltool docbook_xsl_ns docbook_xsl wrapGAppsHook ];
configureFlags = [
"--with-pkcs11-config=$$out/etc/pkcs11/" # installation directories
"--with-pkcs11-modules=$$out/lib/pkcs11/"
];
- preFixup = ''
- wrapProgram "$out/bin/gnome-keyring" \
- --prefix XDG_DATA_DIRS : "${glib.out}/share:$out/share:$GSETTINGS_SCHEMAS_PATH"
- wrapProgram "$out/bin/gnome-keyring-daemon" \
- --prefix XDG_DATA_DIRS : "${glib.out}/share:$out/share:$GSETTINGS_SCHEMAS_PATH"
- '';
-
meta = with stdenv.lib; {
platforms = platforms.linux;
maintainers = gnome3.maintainers;
diff --git a/pkgs/desktops/gnome-3/3.22/core/gnome-settings-daemon/default.nix b/pkgs/desktops/gnome-3/3.22/core/gnome-settings-daemon/default.nix
index 00999353c2fb..ff5670935bd9 100644
--- a/pkgs/desktops/gnome-3/3.22/core/gnome-settings-daemon/default.nix
+++ b/pkgs/desktops/gnome-3/3.22/core/gnome-settings-daemon/default.nix
@@ -1,7 +1,7 @@
{ fetchurl, stdenv, pkgconfig, gnome3, intltool, glib, libnotify, lcms2, libXtst
, libxkbfile, libpulseaudio, libcanberra_gtk3, upower, colord, libgweather, polkit
, geoclue2, librsvg, xf86_input_wacom, udev, libgudev, libwacom, libxslt, libtool, networkmanager
-, docbook_xsl, docbook_xsl_ns, makeWrapper, ibus, xkeyboard_config }:
+, docbook_xsl, docbook_xsl_ns, wrapGAppsHook, ibus, xkeyboard_config }:
stdenv.mkDerivation rec {
inherit (import ./src.nix fetchurl) name src;
@@ -14,15 +14,7 @@ stdenv.mkDerivation rec {
libnotify gnome_desktop lcms2 libXtst libxkbfile libpulseaudio
libcanberra_gtk3 upower colord libgweather xkeyboard_config
polkit geocode_glib geoclue2 librsvg xf86_input_wacom udev libgudev libwacom libxslt
- libtool docbook_xsl docbook_xsl_ns makeWrapper gnome_themes_standard ];
-
- # FIXME: glib binaries shouldn't be in .dev!
- preFixup = ''
- wrapProgram "$out/libexec/gnome-settings-daemon-localeexec" \
- --prefix GI_TYPELIB_PATH : "$GI_TYPELIB_PATH" \
- --prefix PATH : "${glib.dev}/bin" \
- --prefix XDG_DATA_DIRS : "$out/share:$GSETTINGS_SCHEMAS_PATH"
- '';
+ libtool docbook_xsl docbook_xsl_ns wrapGAppsHook gnome_themes_standard ];
meta = with stdenv.lib; {
platforms = platforms.linux;
diff --git a/pkgs/desktops/gnome-3/3.22/core/gnome-shell/default.nix b/pkgs/desktops/gnome-3/3.22/core/gnome-shell/default.nix
index dccdb8a5a5f8..8f77b7e5e3b1 100644
--- a/pkgs/desktops/gnome-3/3.22/core/gnome-shell/default.nix
+++ b/pkgs/desktops/gnome-3/3.22/core/gnome-shell/default.nix
@@ -7,7 +7,9 @@
# http://sources.gentoo.org/cgi-bin/viewvc.cgi/gentoo-x86/gnome-base/gnome-shell/gnome-shell-3.10.2.1.ebuild?revision=1.3&view=markup
-stdenv.mkDerivation rec {
+let
+ pythonEnv = python3Packages.python.withPackages ( ps: with ps; [ pygobject3 ] );
+in stdenv.mkDerivation rec {
inherit (import ./src.nix fetchurl) name src;
# Needed to find /etc/NetworkManager/VPN
@@ -23,9 +25,8 @@ stdenv.mkDerivation rec {
defaultIconTheme sqlite gnome3.gnome-bluetooth
libgweather # not declared at build time, but typelib is needed at runtime
gnome3.gnome-clocks # schemas needed
- at_spi2_core upower ibus gnome_desktop telepathy_logger gnome3.gnome_settings_daemon ];
-
- propagatedBuildInputs = [ python3Packages.pygobject3 python3Packages.python gobjectIntrospection ];
+ at_spi2_core upower ibus gnome_desktop telepathy_logger gnome3.gnome_settings_daemon
+ pythonEnv gobjectIntrospection ];
installFlags = [ "keysdir=$(out)/share/gnome-control-center/keybindings" ];
@@ -42,9 +43,6 @@ stdenv.mkDerivation rec {
--prefix XDG_DATA_DIRS : "${gnome_themes_standard}/share:$out/share:$XDG_ICON_DIRS" \
--suffix XDG_DATA_DIRS : "$GSETTINGS_SCHEMAS_PATH"
- wrapProgram "$out/bin/gnome-shell-extension-tool" \
- --prefix PYTHONPATH : "${python3Packages.pygobject3}/${python3Packages.python.sitePackages}:$PYTHONPATH"
-
wrapProgram "$out/libexec/gnome-shell-calendar-server" \
--prefix XDG_DATA_DIRS : "${evolution_data_server}/share:$out/share:$XDG_ICON_DIRS:$GSETTINGS_SCHEMAS_PATH"
diff --git a/pkgs/desktops/gnome-3/3.22/core/libgee/default.nix b/pkgs/desktops/gnome-3/3.22/core/libgee/default.nix
index 7b49af3c50ff..d4697c99a938 100644
--- a/pkgs/desktops/gnome-3/3.22/core/libgee/default.nix
+++ b/pkgs/desktops/gnome-3/3.22/core/libgee/default.nix
@@ -20,7 +20,7 @@ stdenv.mkDerivation rec {
meta = with stdenv.lib; {
description = "Utility library providing GObject-based interfaces and classes for commonly used data structures";
license = licenses.lgpl21Plus;
- platforms = platforms.linux;
+ platforms = platforms.unix;
maintainers = gnome3.maintainers;
};
}
diff --git a/pkgs/desktops/gnome-3/3.22/core/mutter/default.nix b/pkgs/desktops/gnome-3/3.22/core/mutter/default.nix
index 9fad1873fbd6..4818d05517ba 100644
--- a/pkgs/desktops/gnome-3/3.22/core/mutter/default.nix
+++ b/pkgs/desktops/gnome-3/3.22/core/mutter/default.nix
@@ -7,7 +7,7 @@ stdenv.mkDerivation rec {
inherit (import ./src.nix fetchurl) name src;
# fatal error: gio/gunixfdlist.h: No such file or directory
- NIX_CFLAGS_COMPILE = "-I${gnome3.glib.dev}/include/gio-unix-2.0";
+ NIX_CFLAGS_COMPILE = "-I${gnome3.glib.dev}/include/gio-unix-2.0 -Wno-error=format -Wno-error=sign-compare";
configureFlags = "--with-x --disable-static --enable-shape --enable-sm --enable-startup-notification --enable-xsync --enable-verbose-mode --with-libcanberra --with-xwayland-path=${xwayland}/bin/Xwayland";
@@ -23,7 +23,7 @@ stdenv.mkDerivation rec {
'';
patches = [
- #./x86.patch ./math.patch
+ ./x86.patch # ./math.patch
];
enableParallelBuilding = true;
diff --git a/pkgs/desktops/gnome-3/3.22/core/mutter/x86.patch b/pkgs/desktops/gnome-3/3.22/core/mutter/x86.patch
index a997b27540ee..93df1e7f2831 100644
--- a/pkgs/desktops/gnome-3/3.22/core/mutter/x86.patch
+++ b/pkgs/desktops/gnome-3/3.22/core/mutter/x86.patch
@@ -18,16 +18,3 @@
MetaRectangle unconstrained_rect;
MetaRectangle constrained_rect;
MetaMoveResizeResultFlags result = 0;
---- a/src/core/startup-notification.c 2016-06-06 12:13:27.100251933 +0200
-+++ b/src/core/startup-notification.c 2016-06-06 12:13:42.554956773 +0200
-@@ -418,7 +418,7 @@
- elapsed = ctod->now - timestamp;
-
- meta_topic (META_DEBUG_STARTUP,
-- "Sequence used %ld ms vs. %d max: %s\n",
-+ "Sequence used %" G_GINT64_FORMAT " ms vs. %d max: %s\n",
- elapsed, STARTUP_TIMEOUT,
- meta_startup_notification_sequence_get_id (sequence));
-
-[?25l[J[J[J[34h[?25h[?1049h[?1h=[1;44r[34l[34h[?25h[23m[24m[0m[H[J[?25l[2;1H[1m[34m~ [3;1H~ [4;1H~ [5;1H~ [6;1H~ [7;1H~ [8;1H~ [9;1H~ [10;1H~ [11;1H~ [12;1H~ [13;1H~ [14;1H~ [15;1H~ [16;1H~ [17;1H~ [18;1H~ [19;1H~ [20;1H~ [21;1H~ [22;1H~ [23;1H~ [24;1H~ [25;1H~ [26;1H~ [27;1H~ [28;1H~ [29;1H~ [30;1H~ [31;1H~ [32;1H~ [33;1H~ [34;1H~ [35;1H~ [36;1H~ [37;1H~ [38;1H~ [39;1H~ [40;1H~ [41;1H~ [42;1H~ [43;1H~ [1;1H[34h[?25h[?25l[0m[44;1HType :quit to exit Vim[1;1H[34h[?25h[?25l[34h[?25h[?25l[34h[?25h[?25l[34h[?25h[?25l[34h[?25h[?25l[34h[?25h[?25l[34h[?25h[44;1H
-[?1l>[?1049l
diff --git a/pkgs/desktops/gnome-3/3.22/core/zenity/default.nix b/pkgs/desktops/gnome-3/3.22/core/zenity/default.nix
index 8f525945a6af..80f2dde534ec 100644
--- a/pkgs/desktops/gnome-3/3.22/core/zenity/default.nix
+++ b/pkgs/desktops/gnome-3/3.22/core/zenity/default.nix
@@ -1,5 +1,5 @@
{ stdenv, fetchurl, pkgconfig, cairo, libxml2, libxslt, gnome3, pango
-, gnome_doc_utils, intltool, libX11, which, itstool }:
+, gnome_doc_utils, intltool, libX11, which, itstool, wrapGAppsHook }:
stdenv.mkDerivation rec {
inherit (import ./src.nix fetchurl) name src;
@@ -10,7 +10,7 @@ stdenv.mkDerivation rec {
buildInputs = [ gnome3.gtk libxml2 libxslt libX11 itstool ];
- nativeBuildInputs = [ pkgconfig intltool gnome_doc_utils which ];
+ nativeBuildInputs = [ pkgconfig intltool gnome_doc_utils which wrapGAppsHook ];
meta = with stdenv.lib; {
platforms = platforms.linux;
diff --git a/pkgs/desktops/gnome-3/3.22/default.nix b/pkgs/desktops/gnome-3/3.22/default.nix
index 21e1ecc7a049..c6b2f1a76f50 100644
--- a/pkgs/desktops/gnome-3/3.22/default.nix
+++ b/pkgs/desktops/gnome-3/3.22/default.nix
@@ -31,7 +31,7 @@ let
gucharmap nautilus totem vino yelp gnome-bluetooth
gnome-calculator gnome-contacts gnome-font-viewer gnome-screenshot
gnome-system-log gnome-system-monitor
- gnome_terminal gnome-user-docs bijiben evolution file-roller gedit
+ gnome_terminal gnome-user-docs evolution file-roller gedit
gnome-clocks gnome-music gnome-tweak-tool gnome-photos
nautilus-sendto dconf-editor vinagre gnome-weather gnome-logs
gnome-maps gnome-characters gnome-calendar accerciser gnome-nettool
diff --git a/pkgs/desktops/gnome-3/3.22/misc/gnome-tweak-tool/default.nix b/pkgs/desktops/gnome-3/3.22/misc/gnome-tweak-tool/default.nix
index f75cdd0e83e2..5a1baa5e3307 100644
--- a/pkgs/desktops/gnome-3/3.22/misc/gnome-tweak-tool/default.nix
+++ b/pkgs/desktops/gnome-3/3.22/misc/gnome-tweak-tool/default.nix
@@ -4,7 +4,7 @@
, gnome3, librsvg, gdk_pixbuf, file, libnotify, gobjectIntrospection, wrapGAppsHook }:
let
- python = python2Packages.python.withPackages ( ps: with ps; [ pygobject3 ] );
+ pythonEnv = python2Packages.python.withPackages ( ps: with ps; [ pygobject3 ] );
in stdenv.mkDerivation rec {
inherit (import ./src.nix fetchurl) name src;
@@ -12,15 +12,6 @@ in stdenv.mkDerivation rec {
propagatedUserEnvPkgs = [ gnome3.gnome_themes_standard ];
- # Make sure that Python 2 is first in $PATH because gnome3.gnome_shell
- # propagates python3Packages.python. If we do not do this, autoconf will use
- # Python 3 instead which gnome-tweak-tool does not support at this time. See:
- # https://github.com/NixOS/nixpkgs/issues/21851
- # https://github.com/NixOS/nixpkgs/pull/22370
- preConfigure = ''
- PATH="${python}/bin:$PATH"
- '';
-
makeFlags = [ "DESTDIR=/" ];
buildInputs = [ pkgconfig gtk3 glib intltool itstool libxml2
@@ -28,11 +19,10 @@ in stdenv.mkDerivation rec {
gdk_pixbuf gnome3.defaultIconTheme librsvg
libnotify gnome3.gnome_shell
libsoup gnome3.gnome_settings_daemon gnome3.nautilus
- gnome3.gnome_desktop wrapGAppsHook ];
+ gnome3.gnome_desktop wrapGAppsHook
+ python2Packages.pygobject3.dev pythonEnv gobjectIntrospection ];
- propagatedBuildInputs = [ python gobjectIntrospection ];
-
- PYTHONPATH = "$out/${python.python.sitePackages}";
+ PYTHONPATH = "$out/${pythonEnv.python.sitePackages}";
wrapPrefixVariables = [ "PYTHONPATH" ];
diff --git a/pkgs/desktops/gnome-3/3.22/misc/gspell/default.nix b/pkgs/desktops/gnome-3/3.22/misc/gspell/default.nix
index fbb95efb27ac..3024d3ed59ff 100644
--- a/pkgs/desktops/gnome-3/3.22/misc/gspell/default.nix
+++ b/pkgs/desktops/gnome-3/3.22/misc/gspell/default.nix
@@ -1,9 +1,9 @@
-{ stdenv, fetchurl, pkgconfig, glib, gtk3, enchant, isocodes }:
+{ stdenv, fetchurl, pkgconfig, glib, gtk3, enchant, isocodes, vala }:
stdenv.mkDerivation rec {
inherit (import ./src.nix fetchurl) name src;
- buildInputs = [ pkgconfig glib gtk3 enchant isocodes ];
+ buildInputs = [ pkgconfig glib gtk3 enchant isocodes vala ];
meta = with stdenv.lib; {
platforms = platforms.linux;
diff --git a/pkgs/desktops/gnome-3/3.22/misc/gspell/src.nix b/pkgs/desktops/gnome-3/3.22/misc/gspell/src.nix
index 248e39151524..850e13fb011e 100644
--- a/pkgs/desktops/gnome-3/3.22/misc/gspell/src.nix
+++ b/pkgs/desktops/gnome-3/3.22/misc/gspell/src.nix
@@ -1,10 +1,10 @@
fetchurl: rec {
- major = "1.0";
- minor = "3";
+ major = "1.2";
+ minor = "1";
name = "gspell-${major}.${minor}";
src = fetchurl {
url = "mirror://gnome/sources/gspell/${major}/${name}.tar.xz";
- sha256 = "1m8v4rqaxjsblccc3nnirkbkzgqm90vfpzp3x08lkqriqvk0anfr";
+ sha256 = "18zisdrq14my2iq6iv3lhqfn9jg98bqwbzcdidp7hfk915gkw74z";
};
}
diff --git a/pkgs/desktops/gnome-3/3.22/misc/pomodoro/default.nix b/pkgs/desktops/gnome-3/3.22/misc/pomodoro/default.nix
index 8c1ab41de520..3ceabe70ad80 100644
--- a/pkgs/desktops/gnome-3/3.22/misc/pomodoro/default.nix
+++ b/pkgs/desktops/gnome-3/3.22/misc/pomodoro/default.nix
@@ -1,5 +1,5 @@
{ stdenv, fetchFromGitHub, which, automake113x, intltool, pkgconfig, libtool, makeWrapper,
- dbus_glib, libcanberra_gtk2, gst_all_1, vala_0_32, gnome3, gtk3, gst_plugins_base,
+ dbus_glib, libcanberra_gtk2, gst_all_1, vala_0_32, gnome3, gtk3, gst-plugins-base,
glib, gobjectIntrospection, telepathy_glib
}:
diff --git a/pkgs/desktops/gnustep/back/default.nix b/pkgs/desktops/gnustep/back/default.nix
index 8e11a2862841..6678b11df023 100644
--- a/pkgs/desktops/gnustep/back/default.nix
+++ b/pkgs/desktops/gnustep/back/default.nix
@@ -5,6 +5,7 @@
, x11
, freetype
, pkgconfig
+, libXmu
}:
let
version = "0.25.0";
@@ -15,7 +16,7 @@ gsmakeDerivation {
url = "ftp://ftp.gnustep.org/pub/gnustep/core/gnustep-back-${version}.tar.gz";
sha256 = "14gs1b32ahnihd7mwpjrws2b8hl11rl1wl24a7651d3z2l7f6xj2";
};
- buildInputs = [ cairo base gui freetype pkgconfig x11 ];
+ buildInputs = [ cairo base gui freetype pkgconfig x11 libXmu ];
meta = {
description = "A generic backend for GNUstep";
};
diff --git a/pkgs/desktops/gnustep/gworkspace/default.nix b/pkgs/desktops/gnustep/gworkspace/default.nix
index 67fffd10a0f4..210b72292fd6 100644
--- a/pkgs/desktops/gnustep/gworkspace/default.nix
+++ b/pkgs/desktops/gnustep/gworkspace/default.nix
@@ -4,13 +4,13 @@
, system_preferences
}:
let
- version = "0.9.3";
+ version = "0.9.4";
in
gsmakeDerivation {
name = "gworkspace-${version}";
src = fetchurl {
url = "ftp://ftp.gnustep.org/pub/gnustep/usr-apps/gworkspace-${version}.tar.gz";
- sha256 = "0jchqwb0dj522j98jqlqlib44jppax39zx2zqyzdwiz4qjl470r3";
+ sha256 = "0cjn83m7qmbwdpldlyhs239nwswgip3yaz01ahls130dq5qq7hgk";
};
# additional dependencies:
# - PDFKit framework from http://gap.nongnu.org/
diff --git a/pkgs/desktops/kde-4.14/applications/kate.nix b/pkgs/desktops/kde-4.14/applications/kate.nix
deleted file mode 100644
index ddeb89063e50..000000000000
--- a/pkgs/desktops/kde-4.14/applications/kate.nix
+++ /dev/null
@@ -1,11 +0,0 @@
-{ stdenv, kde, kdelibs, kactivities, qjson, pythonPackages, pykde4}:
-
-kde {
-
- buildInputs = [ kdelibs kactivities qjson pythonPackages.pyqt4 pythonPackages.python pykde4 ];
-
- meta = {
- description = "Kate, the KDE Advanced Text Editor, as well as KWrite";
- license = stdenv.lib.licenses.gpl2;
- };
-}
diff --git a/pkgs/desktops/kde-4.14/applications/konsole.nix b/pkgs/desktops/kde-4.14/applications/konsole.nix
deleted file mode 100644
index bd4e9e58cd05..000000000000
--- a/pkgs/desktops/kde-4.14/applications/konsole.nix
+++ /dev/null
@@ -1,11 +0,0 @@
-{ stdenv, kde, kdelibs, kde_baseapps }:
-
-kde {
-
- buildInputs = [ kdelibs kde_baseapps ];
-
- meta = {
- description = "Konsole, the KDE terminal emulator";
- license = stdenv.lib.licenses.gpl2;
- };
-}
diff --git a/pkgs/desktops/kde-4.14/default.nix b/pkgs/desktops/kde-4.14/default.nix
index f11a139aec72..02cd509537d1 100644
--- a/pkgs/desktops/kde-4.14/default.nix
+++ b/pkgs/desktops/kde-4.14/default.nix
@@ -25,20 +25,10 @@ in
kde.modules // kde.individual //
{
- inherit (kde) manifest modules individual splittedModuleList;
-
- inherit kdelibs;
-
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 branch;
inherit (kde.manifest) stable;
diff --git a/pkgs/desktops/kde-4.14/files/kde-wallpapers-buildsystem.patch b/pkgs/desktops/kde-4.14/files/kde-wallpapers-buildsystem.patch
deleted file mode 100644
index 378cdb646940..000000000000
--- a/pkgs/desktops/kde-4.14/files/kde-wallpapers-buildsystem.patch
+++ /dev/null
@@ -1,17 +0,0 @@
-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.14/files/rocs-0001-duplicate-add_test.patch b/pkgs/desktops/kde-4.14/files/rocs-0001-duplicate-add_test.patch
deleted file mode 100644
index 4127b16d5f6d..000000000000
--- a/pkgs/desktops/kde-4.14/files/rocs-0001-duplicate-add_test.patch
+++ /dev/null
@@ -1,62 +0,0 @@
-From 93081f817f20bbc26b55e1b37b22d60535d153f7 Mon Sep 17 00:00:00 2001
-From: Thomas Tuegel
-Date: Thu, 10 Sep 2015 18:41:57 -0500
-Subject: [PATCH] duplicate add_test
-
----
- RocsCore/LoadSave/Plugins/dotFileFormat/Tests/CMakeLists.txt | 1 -
- RocsCore/LoadSave/Plugins/gmlFileFormat/Tests/CMakeLists.txt | 1 -
- RocsCore/LoadSave/Plugins/kmlFileFormat/Tests/CMakeLists.txt | 1 -
- RocsCore/LoadSave/Plugins/tgfFileFormat/Tests/CMakeLists.txt | 1 -
- RocsCore/LoadSave/Plugins/tikzFileFormat/Tests/CMakeLists.txt | 1 -
- 5 files changed, 5 deletions(-)
-
-diff --git a/RocsCore/LoadSave/Plugins/dotFileFormat/Tests/CMakeLists.txt b/RocsCore/LoadSave/Plugins/dotFileFormat/Tests/CMakeLists.txt
-index 32a2504..4fbb838 100644
---- a/RocsCore/LoadSave/Plugins/dotFileFormat/Tests/CMakeLists.txt
-+++ b/RocsCore/LoadSave/Plugins/dotFileFormat/Tests/CMakeLists.txt
-@@ -33,4 +33,3 @@ target_link_libraries(TestDotFileFormatPlugin
- ${QT_QTTEST_LIBRARY}
- ${KDE4_KDECORE_LIBS}
- )
--add_test(TestDotFileFormatPlugin TestDotFileFormatPlugin)
-diff --git a/RocsCore/LoadSave/Plugins/gmlFileFormat/Tests/CMakeLists.txt b/RocsCore/LoadSave/Plugins/gmlFileFormat/Tests/CMakeLists.txt
-index 615004c..6383bd8 100644
---- a/RocsCore/LoadSave/Plugins/gmlFileFormat/Tests/CMakeLists.txt
-+++ b/RocsCore/LoadSave/Plugins/gmlFileFormat/Tests/CMakeLists.txt
-@@ -32,4 +32,3 @@ target_link_libraries(TestGmlFileFormatPlugin
- ${QT_QTTEST_LIBRARY}
- ${KDE4_KDECORE_LIBS}
- )
--add_test(TestGmlFileFormatPlugin TestGmlFileFormatPlugin)
-diff --git a/RocsCore/LoadSave/Plugins/kmlFileFormat/Tests/CMakeLists.txt b/RocsCore/LoadSave/Plugins/kmlFileFormat/Tests/CMakeLists.txt
-index f9cdbfa..842d14b 100644
---- a/RocsCore/LoadSave/Plugins/kmlFileFormat/Tests/CMakeLists.txt
-+++ b/RocsCore/LoadSave/Plugins/kmlFileFormat/Tests/CMakeLists.txt
-@@ -30,4 +30,3 @@ target_link_libraries(TestKmlFileFormatPlugin
- ${QT_QTTEST_LIBRARY}
- ${KDE4_KDECORE_LIBS}
- )
--add_test(TestKmlFileFormatPlugin TestKmlFileFormatPlugin)
-diff --git a/RocsCore/LoadSave/Plugins/tgfFileFormat/Tests/CMakeLists.txt b/RocsCore/LoadSave/Plugins/tgfFileFormat/Tests/CMakeLists.txt
-index 33c0da8..70cab8d 100644
---- a/RocsCore/LoadSave/Plugins/tgfFileFormat/Tests/CMakeLists.txt
-+++ b/RocsCore/LoadSave/Plugins/tgfFileFormat/Tests/CMakeLists.txt
-@@ -35,4 +35,3 @@ target_link_libraries(TestTgfFileFormatPlugin
- ${QT_QTTEST_LIBRARY}
- ${KDE4_KDECORE_LIBS}
- )
--add_test(TestTgfFileFormatPlugin TestTgfFileFormatPlugin)
-diff --git a/RocsCore/LoadSave/Plugins/tikzFileFormat/Tests/CMakeLists.txt b/RocsCore/LoadSave/Plugins/tikzFileFormat/Tests/CMakeLists.txt
-index b52736e..58ee40e 100644
---- a/RocsCore/LoadSave/Plugins/tikzFileFormat/Tests/CMakeLists.txt
-+++ b/RocsCore/LoadSave/Plugins/tikzFileFormat/Tests/CMakeLists.txt
-@@ -29,5 +29,4 @@ target_link_libraries(TestTikzFileFormatPlugin
- ${QT_QTTEST_LIBRARY}
- ${KDE4_KDECORE_LIBS}
- )
--add_test(TestTikzFileFormatPlugin TestTikzFileFormatPlugin)
-
---
-2.5.0
-
diff --git a/pkgs/desktops/kde-4.14/kactivities.nix b/pkgs/desktops/kde-4.14/kactivities.nix
index a1f9d0d81719..dd14e0429ddb 100644
--- a/pkgs/desktops/kde-4.14/kactivities.nix
+++ b/pkgs/desktops/kde-4.14/kactivities.nix
@@ -1,4 +1,4 @@
-{ fetchurl, kde, kdelibs, nepomuk_core }:
+{ fetchurl, kde, kdelibs }:
kde {
@@ -13,7 +13,7 @@ kde {
setOutputFlags = false;
- propagatedBuildInputs = [ kdelibs nepomuk_core ];
+ propagatedBuildInputs = [ kdelibs ];
meta = {
description = "KDE activities library and daemon";
diff --git a/pkgs/desktops/kde-4.14/kde-base-artwork.nix b/pkgs/desktops/kde-4.14/kde-base-artwork.nix
deleted file mode 100644
index 3f416cebddc4..000000000000
--- a/pkgs/desktops/kde-4.14/kde-base-artwork.nix
+++ /dev/null
@@ -1,14 +0,0 @@
-{ 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.14/kde-baseapps/kde-baseapps.nix b/pkgs/desktops/kde-4.14/kde-baseapps/kde-baseapps.nix
index 98fab7d25592..df211f491993 100644
--- a/pkgs/desktops/kde-4.14/kde-baseapps/kde-baseapps.nix
+++ b/pkgs/desktops/kde-4.14/kde-baseapps/kde-baseapps.nix
@@ -1,5 +1,4 @@
-{ stdenv, kde, kdelibs, html-tidy, kactivities
-, nepomuk_core, nepomuk_widgets, libXt }:
+{ stdenv, kde, kdelibs, html-tidy, kactivities, libXt }:
kde {
postPatch = ''
@@ -7,7 +6,7 @@ kde {
--replace buffio.h tidybuffio.h
'';
- buildInputs = [ kdelibs nepomuk_core nepomuk_widgets html-tidy kactivities libXt ];
+ buildInputs = [ kdelibs html-tidy kactivities libXt ];
meta = {
description = "Base KDE applications, including the Dolphin file manager and Konqueror web browser";
diff --git a/pkgs/desktops/kde-4.14/kde-package/4.14.3.nix b/pkgs/desktops/kde-4.14/kde-package/4.14.3.nix
index a78041c5a0cc..a05e6d0c62a2 100644
--- a/pkgs/desktops/kde-4.14/kde-package/4.14.3.nix
+++ b/pkgs/desktops/kde-4.14/kde-package/4.14.3.nix
@@ -1,380 +1,48 @@
{stable=true;
hashes=builtins.listToAttrs[
- {name="amor";value="1n9qhy7pcprhh7a5v5i9xi5pr3a3lbg08j315kbahn89py2wqk6x";}
- {name="analitza";value="08p4rky4q4c1r5mkw087s31k38xvc8k50fyahf6y0bkc03v7q8h0";}
- {name="ark";value="1p5q96i7hxp80c3hzxaqfixc3rn16cdnhhhjdaqz7k5zkgmgfbnb";}
- {name="artikulate";value="1spb3qwf62agc76vnji7hgm1xsahb7i2fg818gmqwd9ndd4rf0fk";}
- {name="audiocd-kio";value="0572hwlzn4l53d3xi2w20pgdf6wsyankr49q4522ckfjw9zh2p33";}
{name="baloo";value="0p3awsrc20q79kq04x0vjz84acxz6gjm9jc7j2al4kybkyzx5p4y";}
- {name="baloo-widgets";value="1lxwm8cb1f1dy91zr1d54alw0f67d30kixhr7hnbpqlanfw44sbv";}
- {name="blinken";value="0zmfvj64xzgi9mmdx92csknm6nrgq57z458dmqr82glvdq6sy53w";}
- {name="bomber";value="09bwp2fnyhi2jq6j36ssvcd02gxihd162b14hj4h76p50q9142ly";}
- {name="bovo";value="0pflfpnxni01nfmljrb356bvb9sq7xg1yx7ylli8ws591s1wjv2f";}
- {name="cantor";value="1qb58pnrpn23qr94j1nrdyj87yxc6gr9drra76mq583acra19j4g";}
- {name="cervisia";value="1dgg0m8l2vb1ypkzq2lvp8d5faxn005z9fylf4pg6yczgj51y2m0";}
- {name="dolphin-plugins";value="1vb5q9xwxplwxwfs57fqy1bi2hsq96cy1z705lbyiy1pq1g0xw5p";}
- {name="dragon";value="195hv0l3w6n32qghdbqj3jzl4833lkbw90q53rnay56ia3azd7nk";}
- {name="ffmpegthumbs";value="1waj02snh48qk8h021p1agy9pifpb7k7848ni9cyr1q76xmqbw3r";}
- {name="filelight";value="16pp16zdvm8l6aaywj0cvvmpc1fgwr1ik1nf9s3vnj6pnqw91mc1";}
- {name="granatier";value="08fs7nvhgg33cr54v2ib5p64lc9kmzshl12swsa88sp1fzakpdlj";}
- {name="gwenview";value="1817nhd3qwghimbh4v57nxpbk9y2z9gh33i9s7rr190fqa5x2ci0";}
- {name="jovie";value="06cvnycbab5w1vgws6fyfbpdnps63mvss2gnsv6ig1gm18pq8kh4";}
- {name="juk";value="02dv0v34dbac9wpfj0p1kh438b380025qg0mpnhdisw9ng4igx83";}
- {name="kaccessible";value="0blkyalm45c1q670wp9jn6mmqq4igw16hlsa39bv1dj82m5f0bkb";}
- {name="kajongg";value="1f4fv1s1x2bg9ghf317br0kl6lgj9nacmck6fv1g3r14j60z5sfn";}
- {name="kalgebra";value="0zgnppmnm2g0anq4yldlyd4bncjabr72b66h4s9ns6wd7kk9z6rs";}
- {name="kalzium";value="1r8phdshq9whcglb7nyjcg8qjqnqya8rj1rm91mwax18jin0i3ab";}
- {name="kamera";value="09n11d1hvl6xxfsp9j72q6ja103vda54gmrl7lqscnp5nvlfl2vg";}
- {name="kanagram";value="0ns95365rdzx4v7akrsnbz1vgyl10d5h4jnavg1x08yrq7sm3rcm";}
- {name="kapman";value="1c27dlpdnnmvxqwsr5359ixl386z54ijs5ysb5vd7f0nw980kjk0";}
- {name="kapptemplate";value="089znigfd0c4gb318qjbxhyk3gc6j9z4vb4lw76g3nwjkk52s35s";}
- {name="kate";value="0zbhgrhpa3f9zaf8a9b0s69p05m17rg6harvmyfbb9kgqgi4lgai";}
- {name="katomic";value="1j3y0zfwcms2wfv2v3jpn6lisl2qw5zhvwswhyc2k44wq934vwq6";}
- {name="kblackbox";value="1vlc37il59xh6k4zcap7cs25b1r70cbzi0b6jybpwhxrq2zh1zmz";}
- {name="kblocks";value="16k8j3h8dvjz2yqdb22dkb9z6mi3k28c4wkhpa1l5q151kb8q6ba";}
- {name="kbounce";value="16g2f6vvax74gqz3jn1b9rfwcdaia7dphnwg37d03ayflp2s7mji";}
- {name="kbreakout";value="1011gcbajlk4h5z16nyr8xxkqz5k86vwgn1h5k4fqqpbl2g9aryr";}
- {name="kbruch";value="0jrd0hqqiaghyhj1rw66j0skqs1f7p21czx3adiy2v50ni70i84z";}
- {name="kcachegrind";value="0954zvzzhfc76msbs7pc10c9nqd4ganqwqdyn051n4204np1fyd6";}
- {name="kcalc";value="03px8j0ga6bbla6bxbj3ahcw4jxwb4kkqhls0rxldbfkjwz2q1wz";}
- {name="kcharselect";value="0js5wxdjmzg2yq83m0kpil9mdjwb1bschh8d9hsk044327i9wmz7";}
- {name="kcolorchooser";value="1z5snm4vxn6whdhxh64kd18bvl58i65qb4p4xdznrc0gyrgnl92a";}
- {name="kcron";value="1d685808rya0fjysn2smh0d1p6xqcg7a1r3ah54hnj58y4r3rxyc";}
- {name="kdeartwork";value="1x0fz21xi54gxz4dkk7qhpv9a5j3nc0crgvygpq32jrkvv5ygp4k";}
{name="kde-baseapps";value="1nz6mm257rd916dklnbrix4r25scylvjil99b1djb35blx1aynqj";}
- {name="kde-base-artwork";value="14l83fd6drwpl9j4v876afp3k7na3dirpjwh03c1a7lcn27grzkn";}
- {name="kde-dev-scripts";value="17zw6ckbvq5iqykc3ijdnp7j0nh4k06jgqwfsrnqnvp5fqqcf1vn";}
- {name="kde-dev-utils";value="16kdr5i48jlflzdv1y5n2xca2kws5whwlymliqdqy7wlcgy0lh7q";}
- {name="kdegraphics-mobipocket";value="0m41s8scy5hym6mk0kfmjj54dc3yxahsdrliaadixhp0fx02cx0v";}
- {name="kdegraphics-strigi-analyzer";value="08d2vrghwqkw4mg4vmgsynfnhygxpavxnscvs3z70hdff7i001f0";}
- {name="kdegraphics-thumbnailers";value="1lhb7m298mbz7dk50savqdz3p6lkbscn0gi6bqapji24464vlb8k";}
- {name="kdenetwork-filesharing";value="0a8vw6jj0kz0lq96mj3mfzpdvb6xpw8xvccwxhjqp164bzqdz66d";}
- {name="kdenetwork-strigi-analyzers";value="14px6ddp8flqd40bww0sl71jmn5bfqm9j3v6rqm63ii7z87qk6xl";}
- {name="kdepim";value="0i7r68r5nzflmpdkkzpj5xc3fwxg5903g1fj5g1yn79v5zx1gzd3";}
{name="kdepimlibs";value="1mv8k0wr0wr0hnlb1al50nmz8d77vbm73p2hhipipgliq6zb3vb5";}
- {name="kdepim-runtime";value="03xmm9c5whr96bwrdrdmaq8w53qg251g0kd479g02x3br20yi3rd";}
- {name="kdeplasma-addons";value="094gj8z1xx4d5vlkq8izifpgvh6sfq36bh08n8ylfa976qq8xm8j";}
- {name="kde-runtime";value="01c6pjsq4xp75yma8wbfpg92lrvvppp9ighlxvy7z2afkd8lx9vq";}
- {name="kdesdk-kioslaves";value="0k0ff1nq10z0gajr3rnrbhm1rml42d2fi9ahwxdjnxyaav31ml24";}
- {name="kdesdk-strigi-analyzers";value="12r17q7mg74prir52h80prc61bn5rq1031cbp3xswh658srf1lg0";}
- {name="kdesdk-thumbnailers";value="1kmdpb52kg04smgp9v5a51bjjrw6fsh347ajnxhr8ygg7d8zw763";}
- {name="kde-wallpapers";value="05jb5ry6ziz64lqxrmi7c53n8j5hpgrz3lii4y1wnr204342ln6k";}
- {name="kdewebdev";value="0sclb72i6nbrsz4a5jlxf7mgngdn7wbd669fqa7xw6axrsjj1cgn";}
{name="kde-workspace";value="00bf708i0vzl47dgcr8mp61n7k0xjzqnlb8j1smliy5bydiaa86g";}
- {name="kdf";value="0y5d6d6wl5ycmcswrkgwc301jbj77jnb46sgl38i9q4nf7b3ham0";}
- {name="kdiamond";value="0z8c07vx3k466ysri1syka0wm0bkz581kb72d5sns86np0rg0wmp";}
{name="kfilemetadata";value="0wak1nphnphcam8r6pba7m2gld4w04dkk8qn23myjammv3myc59i";}
- {name="kfloppy";value="02sv0k6cqvd9zf7hwsjxgb6l3jawx5fkg1siffbb62cgp49y8fw0";}
- {name="kfourinline";value="0zhvpbgmk89cn7pjzgdzc4kah8rkjj3w97yym205phc8fc36nwa4";}
- {name="kgamma";value="1cpm1d0sr3zphkqpfg11farqal2h2hl6gcdnf8p1b10np1b8rxwk";}
- {name="kgeography";value="125772x1kbh136ymja903w2k7vgahs2d1nw471nr8fx511pnxcj4";}
- {name="kget";value="1v1j5sfsym1sz8w6ll23il0n4qq74sjx9c9ij29zhdwxy21xasv9";}
- {name="kgoldrunner";value="1mc93hwl1diygjlpalf2wdzhdnhcjq1mj9srlxhr5f1w0687pzar";}
- {name="kgpg";value="0ihc5pp1mxsa67ynrvf2mpxwhyni6lkcdarj1xmvpcf56nlkfzdw";}
- {name="khangman";value="0wddflgsfslbhdpkl39qipnc2xx6b23ci1gr19ipyiyif8d74zix";}
- {name="kig";value="1kp3rhsfprp9c9f0wp264x9d6n454ff26ysfnli9gl5l2imxhw9f";}
- {name="kigo";value="1gdsr31ybc07bkcyfrrm4fz081l3l5h5rv46ld0f6rfmxm3xv01j";}
- {name="killbots";value="1d31pxvjls5a9m521a9n7rynl317585ald1nn4bpk2f138475d12";}
- {name="kimono";value="17n1nx66kqcc2wfp6ql7xpn8lq9y3b6djf6y1n3ajvyjh8m357jf";}
- {name="kiriki";value="00iis3vx95nlcarysy9mrbz4jnw4rbxgmjpy48z85imdd7yydd8x";}
- {name="kiten";value="17n6q1kan8dlxqhnhk73nzn4jg39yw1hh88vsndswmx1s4k68x7r";}
- {name="kjumpingcube";value="0p9kswv2wnxqgmlvwbcwxrb27b0h6by1zx91k5vmv16qm789gfk9";}
- {name="klettres";value="01vf6cdiafncv0n35cp5v44azxkjjzn1rp1r8rw05vlmh2296p0l";}
- {name="klickety";value="0c156fkchcpfybmvc3qkvdqizc62b758drkdqc8pawal8766ff27";}
- {name="klines";value="1w8k18azfqsb0q90aijn7xfkkfrbnrnfwn6w66wc8xn2b6hibahl";}
- {name="kmag";value="091h7vb3wcp5zg06mp240a2vdhj18xqw40i25djkl7a861xxhpb8";}
- {name="kmahjongg";value="0qb933kjv205narrkgr83ha516pldpfxi65l8yhm7801nhljhpsg";}
- {name="kmines";value="103lzgr7p2ic29afn8imk6mh7ab0pfpcrdwlsg21zkvrrbrcaq6k";}
- {name="kmix";value="153fif25m7w94g8g20ahg5fjppkf3bi8rn4njq1zl1g0bsnrgpfp";}
- {name="kmousetool";value="1z62h71mcxdrp4y2dl497x89295m6mlilaqnvp9ijpw6fm4b9czd";}
- {name="kmouth";value="06n6srd6011bk29w5xnqihvs6pbhmg0sf5h7mwfwp4szvm167hc4";}
- {name="kmplot";value="1xajighandffidp85rjjch4si0gb3mfjks3yh5i8sig8j4797b86";}
- {name="knavalbattle";value="1fmh6qds3ql5w3nsw6zk18ia0z4immpwj8sl35qq2kkx1g0hbv0c";}
- {name="knetwalk";value="0h17ck55fdwipvsdqfdhmn612jb1nrq6vkj0g9i3qchvw9qz0hcs";}
- {name="kolf";value="006h7iqwn55bjrgsc9p6316lgvxvda0kvcdxxfd4sqg2ain64h7q";}
- {name="kollision";value="1hc07r3z4w8gqby0pyb5m1ylp8izmvx0ib3dlpmh2jd5khp0qyhj";}
- {name="kolourpaint";value="0kf6wjxcd80mc4hxb4nhpksxj0bm9339i835iwpsbjfn8xs1s55h";}
- {name="kompare";value="0zhpw7kz1c9hcmqfhnvsg39xw4zhi36q39bgifcbyfvjs0ymbvi4";}
- {name="konquest";value="125ciy00h77y7byrlnqv0zhw3pxp9a5i5clz12dlc1z251z3l588";}
- {name="konsole";value="0mgi0fw5sc216cy8j45g4zd733d02l2d6z4wjcxqm7rh61lhwx9g";}
- {name="kopete";value="0i9qq7k19vyss1k22ppr6xq3y3bb6mndg8b5323f0cvjlpgcc8xs";}
- {name="korundum";value="0zapd60frhq652p1xnpaj680vpaqr595dqbhha552c4dfabvgv4j";}
- {name="kpat";value="0kfvhkwamrfllgmd8yl6p3xlc0jmivxy0rsdrxpabvpb0vcqh9ml";}
- {name="kppp";value="01pj8q1m3gwww6wvgwnd24lgbyvzfm6gskv2c802lzjcj7p9218m";}
- {name="kqtquickcharts";value="1vml9scxva9gr8bb6rkxl8gaaghx3lyvwcwcifq5hz0154q875d5";}
- {name="krdc";value="07p67z8gh9xnnr71kjy8g6ki07w22c767qbrk2fzar2zvc8dgnw6";}
- {name="kremotecontrol";value="06nkg9chkimmzs1ww0sbxglssibby3157jkw6bncg661yfbsd48r";}
- {name="kreversi";value="1pjjw3vim3pjazcxggs9axglkl7l1g0fpzqgjdxxn0p8vfh84jgg";}
- {name="krfb";value="08qpw93slflx7whp9jbq1bsq1ikm0pgdvys11idvhmzl2lg86j1d";}
- {name="kross-interpreters";value="1v6xjdpflzx3gi12vaf6ywzhb4ycrnawb839pjbpw3cy83p1m6pa";}
- {name="kruler";value="08b54gimg0z4hl9lgndsbl797r5h88mjlamzzv10k0rf7rsd0924";}
- {name="ksaneplugin";value="1rcmjkzr3yxanpvkfvbvf06dg57m1mmfmmy4n6ixy51ir0mh1v5j";}
- {name="kscd";value="01nchy6pb4spvbhgmkfqglmrm8jgkslg6k1q1vzvahyns4lv8b6d";}
- {name="kshisen";value="0i9imqb4zz2yvc80dgvbz08s3pxncm8dnvvwxjaw674nks0jxlh8";}
- {name="ksirk";value="1lnsz5fg86vqdks3d5dfsxzkdxs8kzakjrwx4ixpab5xhq05vzls";}
- {name="ksnakeduel";value="0721xwg3rjwib3aazgzhdmph0bpl2p5zkha8jbmq7aqr5i8ddkx0";}
- {name="ksnapshot";value="10grzlp7sq367g91858d16sadzipzmgwczhnb5xvy0437lqhhz7c";}
- {name="kspaceduel";value="0cwgmpv2xcjwz914hqx6rivi5sk4x66imcdqy7pjnj5vk4f197m7";}
- {name="ksquares";value="1zzg6y6zfqd1a0939hd1wy7ix4wld7ixp5pz2qs315g51m9lpn7i";}
- {name="ksudoku";value="0qgjx7fbawhn63vv37wv4z56jf0gi4chs64aw9bllbq52syirmgb";}
- {name="ksystemlog";value="11xh1psqhq7vimymb394kxjk83yax3gzi9fdckjspk6p10cycln2";}
- {name="kteatime";value="16rrlxc67afkin3afdf1s9dlr7z2281dfsja64pdrrdilwwpyqwi";}
- {name="ktimer";value="02yw6zgp5wbgfvq38adbnn8mqpjc69chz4rndphmyskvflszz6n4";}
- {name="ktouch";value="110haqrk8ixq7hmsb8hymkbqw7jygybxh467p4ag0pczr09gr3d3";}
- {name="ktuberling";value="1jpnzb6dbmcv2f0hb7y3alqn9jqq589jzz2chbvlsm7p7xnpv2h2";}
- {name="kturtle";value="1z6mx1ls5ymh5biyzf5f99q6qapr4a2jgxdi2za0qclqjsla4hrf";}
- {name="ktux";value="1n854lccqs540c0lsg6794g0ir25zli1h6z92vyccsvranjb6k9r";}
- {name="kubrick";value="1sa53z2bdk4rnvr5fs73nazl1aisbcg9yyianazggqshhy0l6w8k";}
- {name="kuser";value="1rkjah60cwpkp355ldcbvb7cwap9ib1mvj1aska9zn2kad0dg8n1";}
- {name="kwalletmanager";value="1w3csapcddpzn7l7v4a2802wwh6d1zm8vqx9lz3wmajczpx6xjab";}
- {name="kwordquiz";value="0zvxzva65cvqin64v105zh9hwbv0yi8mx9lll4ybbp915dw8701q";}
{name="libkcddb";value="0xrmg53p5lh4ral2l5zh96angaf9czhih3zzvwr9qr9h9ks5vrn1";}
- {name="libkcompactdisc";value="14hjlql1vzzszfpxhz0rzvjpi0q7f20ry5857lpdbqhnrc0p3bmg";}
{name="libkdcraw";value="0ksarwq8aaxc77cp0ryfnw1n311wkykzdlhj03rln8jjlbdm3j3q";}
- {name="libkdeedu";value="1i2sfby6ya8cfkdk28a9ia5zixwbixy56ql488v41w29mf1jnvzx";}
- {name="libkdegames";value="0rd24v67fg09h5ilr4r7g9q21z165q1pm37y17l2qgjzr04czwn4";}
{name="libkexiv2";value="1z8fmxfphx7szf4a17fs7zfjyxj6wncbvsphfvf6i5rlqy60g1y4";}
- {name="libkipi";value="0fjm96pwird4km4wlhag1b67czwi03vsc2anng9iw3l4avavmvfw";}
- {name="libkmahjongg";value="1ab66zgxya23yi7l3ga78yrm1kkr0l6hl709khyyk667kgzfqf16";}
- {name="libkomparediff2";value="0bx672rysz78y2322lmm8a0i1k9v755wx8vmh538amk5smq936mz";}
- {name="libksane";value="18nd90hrfmrgwmm6p5hgdr9dwc7z9978v2ibmjiim8dv44myk2is";}
- {name="lokalize";value="1ig5mvzcspyz6ihr43fmwnhw560pby2kij0bz598xjkvb5hwfn8g";}
- {name="lskat";value="01vgf40apf9x322k4f3i78n9ha01maga3xh3zvw4kmbs8kd662bi";}
{name="marble";value="1w603miykq0s84jk6j17b7pg44rd4az0dhzgq7j7d6dfcz7nfrjd";}
- {name="mplayerthumbs";value="0zin10mah7wm7f5v3hqffbwq2pqs7v39i2qhdizrijp85wsp925v";}
- {name="nepomuk-core";value="0gdb7vk3qjvv04a5xqwlv0f4bjn391a3k3hkgibkql9ggxbjbrvl";}
- {name="nepomuk-widgets";value="1qbrs56af9zdzhfb8964p44706gdf4j0bmj378xy5jva7km9cypx";}
- {name="okteta";value="1vgs9kwp1bb5fvp1ja5hzvgll1s7n3ds5gg4500khy47k2z2cvmx";}
{name="okular";value="0ijw71vkk1lj873hqczc23vllhkc9s0miipsbllxblx57rgi5qp6";}
- {name="oxygen-icons";value="1nwjjcm0isjnn3i8xf75nk6mhbg1zm20farlmyrzx261r2cj68lv";}
- {name="pairs";value="124rpv22cx6bi65ixz5889zk46q17913w4l80d94pp9l6aypn4fm";}
- {name="palapeli";value="08rklllik0zsrw19ff6b6l0ijxkyxy8wn5mxm3i07h9pbzv1ga5k";}
- {name="parley";value="1mx0s7dmcmprrr44iim3pzr782cacndqiqiy7zz1zdw41mif3q16";}
- {name="perlkde";value="0aiv8wmv08yp19rk228m7wirh43dagz4yapp3f7bgg50f4c6rpkb";}
- {name="perlqt";value="0villxkgqwscx0sipfqnacxdyi3kzkmma4p9fkjq0hvqzq1b4pd0";}
- {name="picmi";value="0x6nv6ahgsb90brckgv97grsmdb4za5m9izrkcyz6rg5gnn848c4";}
- {name="poxml";value="020lf3wc7vn9d01pqqn1ygvvx7699vxkk5n9hq8zw7rf6n25gifx";}
- {name="print-manager";value="0df1zca0cdk3qdyjfsymhghdadixz3fwm5w4h833iwf7fgr3c5q8";}
{name="pykde4";value="1z40gnkyjlv6ds3cmpzvv99394rhmydr6rxx7qj33m83xnsxgfbz";}
- {name="qtruby";value="179wjl7w8vdm1606m1dzphhmcqxynfbdrcnrjzpyyvhibsdyfl10";}
- {name="qyoto";value="0inwdnwhmi3cf82z0ni1abf621l6322r84kq447cqia6rkmf59j4";}
- {name="rocs";value="1z6lk3xzbrw6581gy8hd3lm3ry4vkphg9wcdl8l03az1nyk2xp61";}
- {name="smokegen";value="1if43r4icp7fz8ngmfw8i5wdylak48j79pp3bdvizfwn4pazl2s3";}
- {name="smokekde";value="099c4qkpwwhbj9yibsm5zkgczv22qs4vd6s84v1p347kxr5in1hd";}
- {name="smokeqt";value="02drfr1bnhac27a4c8pvbvvag250pmg71iz7ig968bp2gqvxcf99";}
- {name="step";value="14f4a2k2al21ynkmwqrh5c33fgn6bhw3g461yhvmnq2sf8fwg8wb";}
- {name="superkaramba";value="1jf3dck707svpbnbpwv46mlcgf5x52djnix5wjsg3wmkipgs4w88";}
{name="svgpart";value="1bj9gaaj6nqdgchmqnn381288aqw09ky0kbm1naddqa82pk196f6";}
- {name="sweeper";value="0fhq9n1ffhcka37j6m9gs0rdxs0dzfn7lnl66v9wpgw075lfiaxx";}
- {name="umbrello";value="0cvks49ij449grh3ldbpmmagz3yx61zq1g0fsg2ii9pqzbd6hn3x";}
- {name="zeroconf-ioslave";value="0hhm5jj0kbi1y18m4x50hnpnfi1cjgh6mglggbscp8xr32jgmgjm";}
];
versions=builtins.listToAttrs[
- {name="amor";value="4.14.3";}
- {name="analitza";value="4.14.3";}
- {name="ark";value="4.14.3";}
- {name="artikulate";value="4.14.3";}
- {name="audiocd-kio";value="4.14.3";}
{name="baloo";value="4.14.3";}
- {name="baloo-widgets";value="4.14.3";}
- {name="blinken";value="4.14.3";}
- {name="bomber";value="4.14.3";}
- {name="bovo";value="4.14.3";}
- {name="cantor";value="4.14.3";}
- {name="cervisia";value="4.14.3";}
- {name="dolphin-plugins";value="4.14.3";}
- {name="dragon";value="4.14.3";}
- {name="ffmpegthumbs";value="4.14.3";}
- {name="filelight";value="4.14.3";}
- {name="granatier";value="4.14.3";}
- {name="gwenview";value="4.14.3";}
- {name="jovie";value="4.14.3";}
- {name="juk";value="4.14.3";}
- {name="kaccessible";value="4.14.3";}
{name="kactivities";value="4.13.3";}
- {name="kajongg";value="4.14.3";}
- {name="kalgebra";value="4.14.3";}
- {name="kalzium";value="4.14.3";}
- {name="kamera";value="4.14.3";}
- {name="kanagram";value="4.14.3";}
- {name="kapman";value="4.14.3";}
- {name="kapptemplate";value="4.14.3";}
- {name="kate";value="4.14.3";}
- {name="katomic";value="4.14.3";}
- {name="kblackbox";value="4.14.3";}
- {name="kblocks";value="4.14.3";}
- {name="kbounce";value="4.14.3";}
- {name="kbreakout";value="4.14.3";}
- {name="kbruch";value="4.14.3";}
- {name="kcachegrind";value="4.14.3";}
- {name="kcalc";value="4.14.3";}
- {name="kcharselect";value="4.14.3";}
- {name="kcolorchooser";value="4.14.3";}
- {name="kcron";value="4.14.3";}
- {name="kdeartwork";value="4.14.3";}
{name="kde-baseapps";value="4.14.3";}
- {name="kde-base-artwork";value="4.14.3";}
- {name="kde-dev-scripts";value="4.14.3";}
- {name="kde-dev-utils";value="4.14.3";}
- {name="kdegraphics-mobipocket";value="4.14.3";}
- {name="kdegraphics-strigi-analyzer";value="4.14.3";}
- {name="kdegraphics-thumbnailers";value="4.14.3";}
- {name="kdenetwork-filesharing";value="4.14.3";}
- {name="kdenetwork-strigi-analyzers";value="4.14.3";}
- {name="kdepim";value="4.14.3";}
{name="kdepimlibs";value="4.14.3";}
- {name="kdepim-runtime";value="4.14.3";}
- {name="kdeplasma-addons";value="4.14.3";}
{name="kde-runtime";value="4.14.3";}
- {name="kdesdk-kioslaves";value="4.14.3";}
- {name="kdesdk-strigi-analyzers";value="4.14.3";}
- {name="kdesdk-thumbnailers";value="4.14.3";}
- {name="kde-wallpapers";value="4.14.3";}
- {name="kdewebdev";value="4.14.3";}
{name="kde-workspace";value="4.11.14";}
- {name="kdf";value="4.14.3";}
- {name="kdiamond";value="4.14.3";}
{name="kfilemetadata";value="4.14.3";}
- {name="kfloppy";value="4.14.3";}
- {name="kfourinline";value="4.14.3";}
- {name="kgamma";value="4.14.3";}
- {name="kgeography";value="4.14.3";}
- {name="kget";value="4.14.3";}
- {name="kgoldrunner";value="4.14.3";}
- {name="kgpg";value="4.14.3";}
- {name="khangman";value="4.14.3";}
- {name="kig";value="4.14.3";}
- {name="kigo";value="4.14.3";}
- {name="killbots";value="4.14.3";}
- {name="kimono";value="4.14.3";}
- {name="kiriki";value="4.14.3";}
- {name="kiten";value="4.14.3";}
- {name="kjumpingcube";value="4.14.3";}
- {name="klettres";value="4.14.3";}
- {name="klickety";value="4.14.3";}
- {name="klines";value="4.14.3";}
- {name="kmag";value="4.14.3";}
- {name="kmahjongg";value="4.14.3";}
- {name="kmines";value="4.14.3";}
- {name="kmix";value="4.14.3";}
- {name="kmousetool";value="4.14.3";}
- {name="kmouth";value="4.14.3";}
- {name="kmplot";value="4.14.3";}
- {name="knavalbattle";value="4.14.3";}
- {name="knetwalk";value="4.14.3";}
- {name="kolf";value="4.14.3";}
- {name="kollision";value="4.14.3";}
- {name="kolourpaint";value="4.14.3";}
- {name="kompare";value="4.14.3";}
- {name="konquest";value="4.14.3";}
- {name="konsole";value="4.14.3";}
- {name="kopete";value="4.14.3";}
- {name="korundum";value="4.14.3";}
- {name="kpat";value="4.14.3";}
- {name="kppp";value="4.14.3";}
- {name="kqtquickcharts";value="4.14.3";}
- {name="krdc";value="4.14.3";}
- {name="kremotecontrol";value="4.14.3";}
- {name="kreversi";value="4.14.3";}
- {name="krfb";value="4.14.3";}
- {name="kross-interpreters";value="4.14.3";}
- {name="kruler";value="4.14.3";}
- {name="ksaneplugin";value="4.14.3";}
- {name="kscd";value="4.14.3";}
- {name="kshisen";value="4.14.3";}
- {name="ksirk";value="4.14.3";}
- {name="ksnakeduel";value="4.14.3";}
- {name="ksnapshot";value="4.14.3";}
- {name="kspaceduel";value="4.14.3";}
- {name="ksquares";value="4.14.3";}
- {name="ksudoku";value="4.14.3";}
- {name="ksystemlog";value="4.14.3";}
- {name="kteatime";value="4.14.3";}
- {name="ktimer";value="4.14.3";}
- {name="ktouch";value="4.14.3";}
- {name="ktuberling";value="4.14.3";}
- {name="kturtle";value="4.14.3";}
- {name="ktux";value="4.14.3";}
- {name="kubrick";value="4.14.3";}
- {name="kuser";value="4.14.3";}
- {name="kwalletmanager";value="4.14.3";}
- {name="kwordquiz";value="4.14.3";}
{name="libkcddb";value="4.14.3";}
- {name="libkcompactdisc";value="4.14.3";}
{name="libkdcraw";value="4.14.3";}
- {name="libkdeedu";value="4.14.3";}
- {name="libkdegames";value="4.14.3";}
{name="libkexiv2";value="4.14.3";}
- {name="libkipi";value="4.14.3";}
- {name="libkmahjongg";value="4.14.3";}
- {name="libkomparediff2";value="4.14.3";}
- {name="libksane";value="4.14.3";}
- {name="lokalize";value="4.14.3";}
- {name="lskat";value="4.14.3";}
{name="marble";value="4.14.3";}
- {name="mplayerthumbs";value="4.14.3";}
- {name="nepomuk-core";value="4.14.3";}
- {name="nepomuk-widgets";value="4.14.3";}
- {name="okteta";value="4.14.3";}
{name="okular";value="4.14.3";}
- {name="oxygen-icons";value="4.14.3";}
- {name="pairs";value="4.14.3";}
- {name="palapeli";value="4.14.3";}
- {name="parley";value="4.14.3";}
- {name="perlkde";value="4.14.3";}
- {name="perlqt";value="4.14.3";}
- {name="picmi";value="4.14.3";}
- {name="poxml";value="4.14.3";}
- {name="print-manager";value="4.14.3";}
{name="pykde4";value="4.14.3";}
- {name="qtruby";value="4.14.3";}
- {name="qyoto";value="4.14.3";}
- {name="rocs";value="4.14.3";}
- {name="smokegen";value="4.14.3";}
- {name="smokekde";value="4.14.3";}
- {name="smokeqt";value="4.14.3";}
- {name="step";value="4.14.3";}
- {name="superkaramba";value="4.14.3";}
{name="svgpart";value="4.14.3";}
- {name="sweeper";value="4.14.3";}
- {name="umbrello";value="4.14.3";}
- {name="zeroconf-ioslave";value="4.14.3";}
];
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"; }
];
@@ -383,196 +51,22 @@ modules=[
module="kdelibs";
split=true;
pkgs=[
- { name="baloo"; }
- { name="baloo-widgets"; sane="baloo_widgets"; }
- { name="kfilemetadata"; }
- { 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="kget"; }
- { name="kopete"; }
- { name="kppp"; }
- { name="krdc"; }
- { name="krfb"; }
- { name="zeroconf-ioslave"; sane="zeroconf_ioslave"; }
- ];
-}
-{
- module="kdeutils";
- split=true;
- pkgs=[
- { name="ark"; }
- { name="filelight"; }
- { name="kcalc"; }
- { name="kcharselect"; }
- { name="kdf"; }
- { name="kfloppy"; }
- { name="kgpg"; }
- { name="kremotecontrol"; }
- { name="ktimer"; }
- { name="kwalletmanager"; }
- { 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"; }
+ { name = "baloo"; }
+ { name = "kfilemetadata"; }
];
}
{
module="kdeedu";
split=true;
pkgs=[
- { name="analitza"; }
- { name="artikulate"; }
- { 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="kqtquickcharts"; }
- { 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"; }
];
}
{
@@ -583,38 +77,7 @@ sane="kde_baseapps"; split=true;
];
}
{ 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="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.14/kde-package/default.nix b/pkgs/desktops/kde-4.14/kde-package/default.nix
index 4bb961b8d2e7..d5de6f5f6bc1 100644
--- a/pkgs/desktops/kde-4.14/kde-package/default.nix
+++ b/pkgs/desktops/kde-4.14/kde-package/default.nix
@@ -113,14 +113,18 @@ rec {
removeNames = subst: big:
fold (s: out: filter (x: x.name != s) out) big subst;
- modules = listToAttrs (map kdeModuleNV manifest.modules);
+ allModules = listToAttrs (map kdeModuleNV manifest.modules);
+
+ modules =
+ let unsplit = filter (a: ! (a ? pkgs)) manifest.modules;
+ in listToAttrs (map kdeModuleNV unsplit);
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);
+ map (m: m.projects) (stdenv.lib.attrVals names allModules);
individual =
stdenv.lib.zipAttrsWith
diff --git a/pkgs/desktops/kde-4.14/kde-runtime.nix b/pkgs/desktops/kde-4.14/kde-runtime.nix
deleted file mode 100644
index a66d189a6007..000000000000
--- a/pkgs/desktops/kde-4.14/kde-runtime.nix
+++ /dev/null
@@ -1,24 +0,0 @@
-{ kde, kdelibs, bzip2, libssh, exiv2, attica, qca2, shared_mime_info
-, libcanberra, samba, libjpeg, ntrack, pkgconfig, xz, libpulseaudio
-, networkmanager, kactivities, kdepimlibs, openexr, ilmbase, gpgme, glib
-}:
-
-kde {
- patches = [ ./CVE-2014-8600.diff ];
-
- buildInputs = [
- kdelibs attica xz bzip2 libssh libjpeg exiv2 ntrack
- qca2 samba libcanberra libpulseaudio 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 = [ shared_mime_info ];
-
- NIX_CFLAGS_COMPILE = "-I${ilmbase.dev}/include/OpenEXR -I${glib.dev}/include/glib-2.0 -I${glib.out}/lib/glib-2.0/include";
-
- meta = {
- license = "LGPL";
- };
-}
diff --git a/pkgs/desktops/kde-4.14/kde-wallpapers.nix b/pkgs/desktops/kde-4.14/kde-wallpapers.nix
deleted file mode 100644
index 875eb6769c0e..000000000000
--- a/pkgs/desktops/kde-4.14/kde-wallpapers.nix
+++ /dev/null
@@ -1,17 +0,0 @@
-{ kde, cmake }:
-
-kde {
- nativeBuildInputs = [ cmake ];
-
- patches = [ ./files/kde-wallpapers-buildsystem.patch ];
-
- cmakeFlags = "-DWALLPAPER_INSTALL_DIR=share/wallpapers";
-
- outputHashAlgo = "sha256";
- outputHashMode = "recursive";
- outputHash = "1mzj7jk0ag7yas2wm2x60z3ymv64g9jrjsz3nwlr719b4bhmgwjj";
-
- meta = {
- description = "Wallpapers for KDE";
- };
-}
diff --git a/pkgs/desktops/kde-4.14/kdeaccessibility/jovie.nix b/pkgs/desktops/kde-4.14/kdeaccessibility/jovie.nix
deleted file mode 100644
index d38c80c4c36a..000000000000
--- a/pkgs/desktops/kde-4.14/kdeaccessibility/jovie.nix
+++ /dev/null
@@ -1,9 +0,0 @@
-{ kde, kdelibs, speechd }:
-
-kde {
- buildInputs = [ kdelibs speechd ];
-
- meta = {
- description = "Text-to-speech synthesis daemon";
- };
-}
diff --git a/pkgs/desktops/kde-4.14/kdeaccessibility/kaccessible.nix b/pkgs/desktops/kde-4.14/kdeaccessibility/kaccessible.nix
deleted file mode 100644
index 98fae7c983f8..000000000000
--- a/pkgs/desktops/kde-4.14/kdeaccessibility/kaccessible.nix
+++ /dev/null
@@ -1,9 +0,0 @@
-{ kde, kdelibs, speechd }:
-
-kde {
- buildInputs = [ kdelibs speechd ];
-
- meta = {
- description = "Bridge that provides accessibility services to applications";
- };
-}
diff --git a/pkgs/desktops/kde-4.14/kdeaccessibility/kmag.nix b/pkgs/desktops/kde-4.14/kdeaccessibility/kmag.nix
deleted file mode 100644
index 606c61cddb63..000000000000
--- a/pkgs/desktops/kde-4.14/kdeaccessibility/kmag.nix
+++ /dev/null
@@ -1,10 +0,0 @@
-{ kde, kdelibs }:
-
-kde {
-#todo: package qaccessibilityclient
- buildInputs = [ kdelibs ];
-
- meta = {
- description = "Screen magnifier for KDE";
- };
-}
diff --git a/pkgs/desktops/kde-4.14/kdeaccessibility/kmousetool.nix b/pkgs/desktops/kde-4.14/kdeaccessibility/kmousetool.nix
deleted file mode 100644
index 8e0caa76ed9c..000000000000
--- a/pkgs/desktops/kde-4.14/kdeaccessibility/kmousetool.nix
+++ /dev/null
@@ -1,9 +0,0 @@
-{ 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.14/kdeaccessibility/kmouth.nix b/pkgs/desktops/kde-4.14/kdeaccessibility/kmouth.nix
deleted file mode 100644
index 4159501967cd..000000000000
--- a/pkgs/desktops/kde-4.14/kdeaccessibility/kmouth.nix
+++ /dev/null
@@ -1,9 +0,0 @@
-{ kde, kdelibs }:
-
-kde {
- buildInputs = [ kdelibs ];
-
- meta = {
- description = "A type-and-say front end for speech synthesizers";
- };
-}
diff --git a/pkgs/desktops/kde-4.14/kdeadmin/kcron.nix b/pkgs/desktops/kde-4.14/kdeadmin/kcron.nix
deleted file mode 100644
index f585461af381..000000000000
--- a/pkgs/desktops/kde-4.14/kdeadmin/kcron.nix
+++ /dev/null
@@ -1,9 +0,0 @@
-{ kde, kdelibs }:
-
-kde {
- buildInputs = [ kdelibs ];
-
- meta = {
- description = "Configure and schedule tasks";
- };
-}
diff --git a/pkgs/desktops/kde-4.14/kdeadmin/ksystemlog.nix b/pkgs/desktops/kde-4.14/kdeadmin/ksystemlog.nix
deleted file mode 100644
index 88757a6b91c7..000000000000
--- a/pkgs/desktops/kde-4.14/kdeadmin/ksystemlog.nix
+++ /dev/null
@@ -1,9 +0,0 @@
-{ kde, kdelibs }:
-
-kde {
- buildInputs = [ kdelibs ];
-
- meta = {
- description = "System log viewer tool";
- };
-}
diff --git a/pkgs/desktops/kde-4.14/kdeadmin/kuser.nix b/pkgs/desktops/kde-4.14/kdeadmin/kuser.nix
deleted file mode 100644
index 6118cf558bbd..000000000000
--- a/pkgs/desktops/kde-4.14/kdeadmin/kuser.nix
+++ /dev/null
@@ -1,9 +0,0 @@
-{ kde, kdelibs, kdepimlibs }:
-
-kde {
- buildInputs = [ kdelibs kdepimlibs ];
-
- meta = {
- description = "User management tool";
- };
-}
diff --git a/pkgs/desktops/kde-4.14/kdeartwork/ColorSchemes.nix b/pkgs/desktops/kde-4.14/kdeartwork/ColorSchemes.nix
deleted file mode 100644
index acccf66976fc..000000000000
--- a/pkgs/desktops/kde-4.14/kdeartwork/ColorSchemes.nix
+++ /dev/null
@@ -1,11 +0,0 @@
-{ kde, kdelibs }:
-
-kde {
- name = "kde-color-schemes";
-
- buildInputs = [ kdelibs ];
-
- meta = {
- description = "Additional KDE color schemes";
- };
-}
diff --git a/pkgs/desktops/kde-4.14/kdeartwork/FindXscreensaver.cmake b/pkgs/desktops/kde-4.14/kdeartwork/FindXscreensaver.cmake
deleted file mode 100644
index 499ed75268e9..000000000000
--- a/pkgs/desktops/kde-4.14/kdeartwork/FindXscreensaver.cmake
+++ /dev/null
@@ -1,73 +0,0 @@
-#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.14/kdeartwork/HighResolutionWallpapers.nix b/pkgs/desktops/kde-4.14/kdeartwork/HighResolutionWallpapers.nix
deleted file mode 100644
index edffca1562e1..000000000000
--- a/pkgs/desktops/kde-4.14/kdeartwork/HighResolutionWallpapers.nix
+++ /dev/null
@@ -1,11 +0,0 @@
-{ 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.14/kdeartwork/IconThemes.nix b/pkgs/desktops/kde-4.14/kdeartwork/IconThemes.nix
deleted file mode 100644
index 43071e8bd142..000000000000
--- a/pkgs/desktops/kde-4.14/kdeartwork/IconThemes.nix
+++ /dev/null
@@ -1,13 +0,0 @@
-{ 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.14/kdeartwork/WeatherWallpapers.nix b/pkgs/desktops/kde-4.14/kdeartwork/WeatherWallpapers.nix
deleted file mode 100644
index 947e5e17ab0c..000000000000
--- a/pkgs/desktops/kde-4.14/kdeartwork/WeatherWallpapers.nix
+++ /dev/null
@@ -1,11 +0,0 @@
-{ kde, kdelibs }:
-
-kde rec {
- name = "kde-weather-wallpapers";
-
- buildInputs = [ kdelibs ];
-
- meta = {
- description = "Additional KDE wallpapers (weather)";
- };
-}
diff --git a/pkgs/desktops/kde-4.14/kdeartwork/desktopthemes.nix b/pkgs/desktops/kde-4.14/kdeartwork/desktopthemes.nix
deleted file mode 100644
index 93dd361af738..000000000000
--- a/pkgs/desktops/kde-4.14/kdeartwork/desktopthemes.nix
+++ /dev/null
@@ -1,11 +0,0 @@
-{ kde, kdelibs }:
-
-kde {
- name = "kde-desktop-themes";
-
- buildInputs = [ kdelibs ];
-
- meta = {
- description = "Additional KDE desktop themes";
- };
-}
diff --git a/pkgs/desktops/kde-4.14/kdeartwork/emoticons.nix b/pkgs/desktops/kde-4.14/kdeartwork/emoticons.nix
deleted file mode 100644
index 5ef9f78a7195..000000000000
--- a/pkgs/desktops/kde-4.14/kdeartwork/emoticons.nix
+++ /dev/null
@@ -1,11 +0,0 @@
-{ kde, kdelibs }:
-
-kde {
- name = "kde-emotion-icons";
-
- buildInputs = [ kdelibs ];
-
- meta = {
- description = "Additional KDE emotion icons (smiles)";
- };
-}
diff --git a/pkgs/desktops/kde-4.14/kdeartwork/kscreensaver.nix b/pkgs/desktops/kde-4.14/kdeartwork/kscreensaver.nix
deleted file mode 100644
index 84cb008056e4..000000000000
--- a/pkgs/desktops/kde-4.14/kdeartwork/kscreensaver.nix
+++ /dev/null
@@ -1,15 +0,0 @@
-{ 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.14/kdeartwork/kwin-styles.nix b/pkgs/desktops/kde-4.14/kdeartwork/kwin-styles.nix
deleted file mode 100644
index b5d769b216db..000000000000
--- a/pkgs/desktops/kde-4.14/kdeartwork/kwin-styles.nix
+++ /dev/null
@@ -1,9 +0,0 @@
-{ kde, kdelibs, kde_workspace }:
-
-kde {
- buildInputs = [ kdelibs kde_workspace ];
-
- meta = {
- description = "Styles for KWin";
- };
-}
diff --git a/pkgs/desktops/kde-4.14/kdeartwork/styles.nix b/pkgs/desktops/kde-4.14/kdeartwork/styles.nix
deleted file mode 100644
index 6a1306c37100..000000000000
--- a/pkgs/desktops/kde-4.14/kdeartwork/styles.nix
+++ /dev/null
@@ -1,11 +0,0 @@
-{ 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.14/kdeartwork/wallpapers.nix b/pkgs/desktops/kde-4.14/kdeartwork/wallpapers.nix
deleted file mode 100644
index 7c9846fbf9e8..000000000000
--- a/pkgs/desktops/kde-4.14/kdeartwork/wallpapers.nix
+++ /dev/null
@@ -1,11 +0,0 @@
-{ kde, kdelibs }:
-
-kde rec {
- name = "kdeartwork-wallpapers";
-
- buildInputs = [ kdelibs ];
-
- meta = {
- description = "Additional KDE wallpapers";
- };
-}
diff --git a/pkgs/desktops/kde-4.14/kdebindings/perlqt.nix b/pkgs/desktops/kde-4.14/kdebindings/perlqt.nix
deleted file mode 100644
index 48eed141ce64..000000000000
--- a/pkgs/desktops/kde-4.14/kdebindings/perlqt.nix
+++ /dev/null
@@ -1,14 +0,0 @@
-{ 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.14/kdebindings/qtruby-install-prefix.patch b/pkgs/desktops/kde-4.14/kdebindings/qtruby-install-prefix.patch
deleted file mode 100644
index bd95a0d8bd3d..000000000000
--- a/pkgs/desktops/kde-4.14/kdebindings/qtruby-install-prefix.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-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.14/kdebindings/qtruby.nix b/pkgs/desktops/kde-4.14/kdebindings/qtruby.nix
deleted file mode 100644
index ed83dd03eca1..000000000000
--- a/pkgs/desktops/kde-4.14/kdebindings/qtruby.nix
+++ /dev/null
@@ -1,22 +0,0 @@
-{ kde, cmake, smokeqt, ruby_2_2 }:
-
-kde {
-
- # TODO: scintilla2, qwt5
-
- buildInputs = [ smokeqt ruby_2_2 ];
-
- nativeBuildInputs = [ cmake ];
-
- hardeningDisable = [ "all" ];
-
- # The patch is not ready for upstream submmission.
- # I should add an option() instead.
- patches = [ ./qtruby-install-prefix.patch ];
-
- cmakeFlags="-DRUBY_ROOT_DIR=${ruby_2_2}";
-
- meta = {
- description = "Ruby bindings for Qt library";
- };
-}
diff --git a/pkgs/desktops/kde-4.14/kdebindings/smokegen-CMakeLists.txt-nix.patch b/pkgs/desktops/kde-4.14/kdebindings/smokegen-CMakeLists.txt-nix.patch
deleted file mode 100644
index 7436b6112d57..000000000000
--- a/pkgs/desktops/kde-4.14/kdebindings/smokegen-CMakeLists.txt-nix.patch
+++ /dev/null
@@ -1,16 +0,0 @@
-diff -Naur smokegen-4.14.3-upstream/CMakeLists.txt smokegen-4.14.3/CMakeLists.txt
---- smokegen-4.14.3-upstream/CMakeLists.txt 2014-09-15 13:23:01.000000000 -0430
-+++ smokegen-4.14.3/CMakeLists.txt 2015-03-29 16:41:59.295598992 -0430
-@@ -32,9 +32,9 @@
- type.cpp
- )
-
--# force RPATH so that the binary is usable from within the build tree
--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 )
-
diff --git a/pkgs/desktops/kde-4.14/kdebindings/smokegen-nix.patch b/pkgs/desktops/kde-4.14/kdebindings/smokegen-nix.patch
deleted file mode 100644
index 53257e836e04..000000000000
--- a/pkgs/desktops/kde-4.14/kdebindings/smokegen-nix.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-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.14/kdebindings/smokegen.nix b/pkgs/desktops/kde-4.14/kdebindings/smokegen.nix
deleted file mode 100644
index 5708d0f96eb2..000000000000
--- a/pkgs/desktops/kde-4.14/kdebindings/smokegen.nix
+++ /dev/null
@@ -1,13 +0,0 @@
-{ stdenv, 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 = stdenv.lib.licenses.gpl2;
- };
-}
diff --git a/pkgs/desktops/kde-4.14/kdebindings/smokekde.nix b/pkgs/desktops/kde-4.14/kdebindings/smokekde.nix
deleted file mode 100644
index 4474c1d9731e..000000000000
--- a/pkgs/desktops/kde-4.14/kdebindings/smokekde.nix
+++ /dev/null
@@ -1,19 +0,0 @@
-{ 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.14/kdebindings/smokeqt.nix b/pkgs/desktops/kde-4.14/kdebindings/smokeqt.nix
deleted file mode 100644
index 494bc85e6465..000000000000
--- a/pkgs/desktops/kde-4.14/kdebindings/smokeqt.nix
+++ /dev/null
@@ -1,15 +0,0 @@
-{ stdenv, 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 = stdenv.lib.licenses.gpl2;
- };
-}
diff --git a/pkgs/desktops/kde-4.14/kdeedu/analitza.nix b/pkgs/desktops/kde-4.14/kdeedu/analitza.nix
deleted file mode 100644
index 74c3a1ebb200..000000000000
--- a/pkgs/desktops/kde-4.14/kdeedu/analitza.nix
+++ /dev/null
@@ -1,8 +0,0 @@
-{ kde, kdelibs, readline }:
-kde {
- buildInputs = [ kdelibs readline ];
-
- meta = {
- description = "Library part of KAlgebra";
- };
-}
diff --git a/pkgs/desktops/kde-4.14/kdeedu/artikulate.nix b/pkgs/desktops/kde-4.14/kdeedu/artikulate.nix
deleted file mode 100644
index 8674a774443f..000000000000
--- a/pkgs/desktops/kde-4.14/kdeedu/artikulate.nix
+++ /dev/null
@@ -1,8 +0,0 @@
-{ kde, kdelibs, qt_gstreamer1 }:
-kde {
- buildInputs = [ kdelibs qt_gstreamer1 ];
-
- meta = {
- description = "A pronunciation learning program for KDE";
- };
-}
diff --git a/pkgs/desktops/kde-4.14/kdeedu/blinken.nix b/pkgs/desktops/kde-4.14/kdeedu/blinken.nix
deleted file mode 100644
index cdf9728833c2..000000000000
--- a/pkgs/desktops/kde-4.14/kdeedu/blinken.nix
+++ /dev/null
@@ -1,8 +0,0 @@
-{ kde, kdelibs }:
-kde {
- buildInputs = [ kdelibs ];
-
- meta = {
- description = "Memory Enhancement Game";
- };
-}
diff --git a/pkgs/desktops/kde-4.14/kdeedu/cantor.nix b/pkgs/desktops/kde-4.14/kdeedu/cantor.nix
deleted file mode 100644
index 625a2678e48b..000000000000
--- a/pkgs/desktops/kde-4.14/kdeedu/cantor.nix
+++ /dev/null
@@ -1,15 +0,0 @@
-{ kde, kdelibs, libspectre, analitza, R, pkgconfig, libqalculate, python }:
-kde {
-
-# TODO: R is not found
-
- buildInputs = [ kdelibs libspectre analitza R libqalculate python ];
-
- nativeBuildInputs = [ pkgconfig ];
-
- patches = [ ./commit-846cf02 ];
-
- meta = {
- description = "KDE Frontend to Mathematical Software";
- };
-}
diff --git a/pkgs/desktops/kde-4.14/kdeedu/commit-846cf02 b/pkgs/desktops/kde-4.14/kdeedu/commit-846cf02
deleted file mode 100644
index 66e756e21bb8..000000000000
--- a/pkgs/desktops/kde-4.14/kdeedu/commit-846cf02
+++ /dev/null
@@ -1,42 +0,0 @@
-diff --git a/src/backends/R/rserver/rcallbacks.h b/src/backends/R/rserver/rcallbacks.h
-index 8f4752c..6d0e9a2 100644
---- a/src/backends/R/rserver/rcallbacks.h
-+++ b/src/backends/R/rserver/rcallbacks.h
-@@ -30,7 +30,6 @@ class Expression;
- #include
- #include
- #define R_INTERFACE_PTRS
--#include
- #include
-
- //This File implements the necessary callbacks for R
-commit 846cf02ab1618b9322b83eafc18dff3264988b72
-Author: Raymond Wooninck
-Date: Mon Apr 27 16:08:51 2015 +0200
-
- Also build against R >= 3.2.
-
-diff --git a/src/backends/R/rserver/rcallbacks.cpp b/src/backends/R/rserver/rcallbacks.cpp
-index 2c86531..492f270 100644
---- a/src/backends/R/rserver/rcallbacks.cpp
-+++ b/src/backends/R/rserver/rcallbacks.cpp
-@@ -26,6 +26,7 @@
- #include
-
- #include
-+#include
-
- RServer* server;
- Expression* currentExpression;
-diff --git a/src/backends/R/rserver/rserver.cpp b/src/backends/R/rserver/rserver.cpp
-index 30cdb70..f689f42 100644
---- a/src/backends/R/rserver/rserver.cpp
-+++ b/src/backends/R/rserver/rserver.cpp
-@@ -42,7 +42,6 @@
- #include
- #include
- #define R_INTERFACE_PTRS
--#include
- #include
-
- // Not making a member to prevent pulling R headers into rserver.h
diff --git a/pkgs/desktops/kde-4.14/kdeedu/kalgebra.nix b/pkgs/desktops/kde-4.14/kdeedu/kalgebra.nix
deleted file mode 100644
index 3675c3a225f4..000000000000
--- a/pkgs/desktops/kde-4.14/kdeedu/kalgebra.nix
+++ /dev/null
@@ -1,8 +0,0 @@
-{ kde, kdelibs, libkdeedu, analitza }:
-kde {
- buildInputs = [ kdelibs libkdeedu analitza ];
-
- meta = {
- description = "2D and 3D Graph Calculator";
- };
-}
diff --git a/pkgs/desktops/kde-4.14/kdeedu/kalzium.nix b/pkgs/desktops/kde-4.14/kdeedu/kalzium.nix
deleted file mode 100644
index 8338eee55110..000000000000
--- a/pkgs/desktops/kde-4.14/kdeedu/kalzium.nix
+++ /dev/null
@@ -1,13 +0,0 @@
-{ kde, kdelibs, facile, ocaml, eigen2, eigen, openbabel, avogadro, pkgconfig }:
-kde {
-
-# TODO: chemical mime data
-
- buildInputs = [ kdelibs facile ocaml eigen2 eigen openbabel avogadro ];
-
- nativeBuildInputs = [ pkgconfig ];
-
- meta = {
- description = "Periodic Table of Elements";
- };
-}
diff --git a/pkgs/desktops/kde-4.14/kdeedu/kanagram.nix b/pkgs/desktops/kde-4.14/kdeedu/kanagram.nix
deleted file mode 100644
index 8759c96d78c4..000000000000
--- a/pkgs/desktops/kde-4.14/kdeedu/kanagram.nix
+++ /dev/null
@@ -1,8 +0,0 @@
-{ kde, kdelibs, libkdeedu }:
-kde {
- buildInputs = [ kdelibs libkdeedu ];
-
- meta = {
- description = "Letter Order Game";
- };
-}
diff --git a/pkgs/desktops/kde-4.14/kdeedu/kbruch.nix b/pkgs/desktops/kde-4.14/kdeedu/kbruch.nix
deleted file mode 100644
index dc50f1e85a37..000000000000
--- a/pkgs/desktops/kde-4.14/kdeedu/kbruch.nix
+++ /dev/null
@@ -1,8 +0,0 @@
-{ kde, kdelibs }:
-kde {
- buildInputs = [ kdelibs ];
-
- meta = {
- description = "Practice Fractions";
- };
-}
diff --git a/pkgs/desktops/kde-4.14/kdeedu/kgeography.nix b/pkgs/desktops/kde-4.14/kdeedu/kgeography.nix
deleted file mode 100644
index bd8d27c8d6e2..000000000000
--- a/pkgs/desktops/kde-4.14/kdeedu/kgeography.nix
+++ /dev/null
@@ -1,8 +0,0 @@
-{ kde, kdelibs }:
-kde {
- buildInputs = [ kdelibs ];
-
- meta = {
- description = "Geography Trainer";
- };
-}
diff --git a/pkgs/desktops/kde-4.14/kdeedu/khangman.nix b/pkgs/desktops/kde-4.14/kdeedu/khangman.nix
deleted file mode 100644
index 997b50e906a2..000000000000
--- a/pkgs/desktops/kde-4.14/kdeedu/khangman.nix
+++ /dev/null
@@ -1,8 +0,0 @@
-{ kde, kdelibs, libkdeedu }:
-kde {
- buildInputs = [ kdelibs libkdeedu ];
-
- meta = {
- description = "KDE hangman game";
- };
-}
diff --git a/pkgs/desktops/kde-4.14/kdeedu/kig.nix b/pkgs/desktops/kde-4.14/kdeedu/kig.nix
deleted file mode 100644
index 37906c32bcb2..000000000000
--- a/pkgs/desktops/kde-4.14/kdeedu/kig.nix
+++ /dev/null
@@ -1,9 +0,0 @@
-{ 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.14/kdeedu/kiten.nix b/pkgs/desktops/kde-4.14/kdeedu/kiten.nix
deleted file mode 100644
index 939b7a9f77a2..000000000000
--- a/pkgs/desktops/kde-4.14/kdeedu/kiten.nix
+++ /dev/null
@@ -1,9 +0,0 @@
-{ kde, kdelibs }:
-
-kde {
- buildInputs = [ kdelibs ];
-
- meta = {
- description = "Japanese Reference/Study Tool";
- };
-}
diff --git a/pkgs/desktops/kde-4.14/kdeedu/klettres.nix b/pkgs/desktops/kde-4.14/kdeedu/klettres.nix
deleted file mode 100644
index 7a0fa83078e3..000000000000
--- a/pkgs/desktops/kde-4.14/kdeedu/klettres.nix
+++ /dev/null
@@ -1,9 +0,0 @@
-{ kde, kdelibs }:
-
-kde {
- buildInputs = [ kdelibs ];
-
- meta = {
- description = "A KDE alphabet tutorial";
- };
-}
diff --git a/pkgs/desktops/kde-4.14/kdeedu/kmplot.nix b/pkgs/desktops/kde-4.14/kdeedu/kmplot.nix
deleted file mode 100644
index fc7b0578c27b..000000000000
--- a/pkgs/desktops/kde-4.14/kdeedu/kmplot.nix
+++ /dev/null
@@ -1,9 +0,0 @@
-{ kde, kdelibs }:
-
-kde {
- buildInputs = [ kdelibs ];
-
- meta = {
- description = "A KDE mathematical function plotter";
- };
-}
diff --git a/pkgs/desktops/kde-4.14/kdeedu/kqtquickcharts.nix b/pkgs/desktops/kde-4.14/kdeedu/kqtquickcharts.nix
deleted file mode 100644
index 3e243b8c4032..000000000000
--- a/pkgs/desktops/kde-4.14/kdeedu/kqtquickcharts.nix
+++ /dev/null
@@ -1,8 +0,0 @@
-{ kde, kdelibs }:
-kde {
- buildInputs = [ kdelibs ];
-
- meta = {
- description = "Qt Quick 1 plugin for beautiful and interactive charts";
- };
-}
diff --git a/pkgs/desktops/kde-4.14/kdeedu/ktouch.nix b/pkgs/desktops/kde-4.14/kdeedu/ktouch.nix
deleted file mode 100644
index 9e606adde336..000000000000
--- a/pkgs/desktops/kde-4.14/kdeedu/ktouch.nix
+++ /dev/null
@@ -1,9 +0,0 @@
-{ kde, kdelibs, libxkbfile }:
-
-kde {
- buildInputs = [ kdelibs libxkbfile ];
-
- meta = {
- description = "Touch Typing Tutor";
- };
-}
diff --git a/pkgs/desktops/kde-4.14/kdeedu/kturtle.nix b/pkgs/desktops/kde-4.14/kdeedu/kturtle.nix
deleted file mode 100644
index 1e1922b1410d..000000000000
--- a/pkgs/desktops/kde-4.14/kdeedu/kturtle.nix
+++ /dev/null
@@ -1,9 +0,0 @@
-{ kde, kdelibs }:
-
-kde {
- buildInputs = [ kdelibs ];
-
- meta = {
- description = "Educational Programming Environment";
- };
-}
diff --git a/pkgs/desktops/kde-4.14/kdeedu/kwordquiz.nix b/pkgs/desktops/kde-4.14/kdeedu/kwordquiz.nix
deleted file mode 100644
index 1b33ba2e469f..000000000000
--- a/pkgs/desktops/kde-4.14/kdeedu/kwordquiz.nix
+++ /dev/null
@@ -1,9 +0,0 @@
-{ kde, kdelibs, libkdeedu }:
-
-kde {
- buildInputs = [ kdelibs libkdeedu ];
-
- meta = {
- description = "Flash Card Trainer";
- };
-}
diff --git a/pkgs/desktops/kde-4.14/kdeedu/libkdeedu.nix b/pkgs/desktops/kde-4.14/kdeedu/libkdeedu.nix
deleted file mode 100644
index def6c85fefe2..000000000000
--- a/pkgs/desktops/kde-4.14/kdeedu/libkdeedu.nix
+++ /dev/null
@@ -1,8 +0,0 @@
-{ kde, kdelibs }:
-kde {
- buildInputs = [ kdelibs ];
-
- meta = {
- description = "Libraries used by KDE Education applications";
- };
-}
diff --git a/pkgs/desktops/kde-4.14/kdeedu/pairs.nix b/pkgs/desktops/kde-4.14/kdeedu/pairs.nix
deleted file mode 100644
index 36c4aba9604b..000000000000
--- a/pkgs/desktops/kde-4.14/kdeedu/pairs.nix
+++ /dev/null
@@ -1,9 +0,0 @@
-{ kde, kdelibs }:
-
-kde {
- buildInputs = [ kdelibs ];
-
- meta = {
- description = "A memory and pairs game";
- };
-}
diff --git a/pkgs/desktops/kde-4.14/kdeedu/parley.nix b/pkgs/desktops/kde-4.14/kdeedu/parley.nix
deleted file mode 100644
index f9f86dde150d..000000000000
--- a/pkgs/desktops/kde-4.14/kdeedu/parley.nix
+++ /dev/null
@@ -1,9 +0,0 @@
-{ kde, kdelibs, libkdeedu, attica }:
-
-kde {
- buildInputs = [ kdelibs libkdeedu attica ];
-
- meta = {
- description = "Vocabulary Trainer";
- };
-}
diff --git a/pkgs/desktops/kde-4.14/kdeedu/rocs.nix b/pkgs/desktops/kde-4.14/kdeedu/rocs.nix
deleted file mode 100644
index 76131d8f0f0f..000000000000
--- a/pkgs/desktops/kde-4.14/kdeedu/rocs.nix
+++ /dev/null
@@ -1,16 +0,0 @@
-{ kde, kdelibs, boost, grantlee }:
-
-kde {
- patches = [ ../files/rocs-0001-duplicate-add_test.patch ];
-
- 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.14/kdeedu/step.nix b/pkgs/desktops/kde-4.14/kdeedu/step.nix
deleted file mode 100644
index 95e991e84815..000000000000
--- a/pkgs/desktops/kde-4.14/kdeedu/step.nix
+++ /dev/null
@@ -1,12 +0,0 @@
-{ kde, kdelibs, gsl, libqalculate, eigen2, pkgconfig }:
-
-kde {
-
- buildInputs = [ kdelibs gsl libqalculate eigen2 ];
-
- nativeBuildInputs = [ pkgconfig ];
-
- meta = {
- description = "A KDE interactive physical simulator";
- };
-}
diff --git a/pkgs/desktops/kde-4.14/kdegames/bomber.nix b/pkgs/desktops/kde-4.14/kdegames/bomber.nix
deleted file mode 100644
index 542ff24f5e65..000000000000
--- a/pkgs/desktops/kde-4.14/kdegames/bomber.nix
+++ /dev/null
@@ -1,7 +0,0 @@
-{ 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.14/kdegames/bovo.nix b/pkgs/desktops/kde-4.14/kdegames/bovo.nix
deleted file mode 100644
index 89dff46129b6..000000000000
--- a/pkgs/desktops/kde-4.14/kdegames/bovo.nix
+++ /dev/null
@@ -1,8 +0,0 @@
-{ 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.14/kdegames/granatier.nix b/pkgs/desktops/kde-4.14/kdegames/granatier.nix
deleted file mode 100644
index 50c3bf985b5b..000000000000
--- a/pkgs/desktops/kde-4.14/kdegames/granatier.nix
+++ /dev/null
@@ -1,7 +0,0 @@
-{ 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.14/kdegames/kajongg.nix b/pkgs/desktops/kde-4.14/kdegames/kajongg.nix
deleted file mode 100644
index cea4fb38b4fb..000000000000
--- a/pkgs/desktops/kde-4.14/kdegames/kajongg.nix
+++ /dev/null
@@ -1,13 +0,0 @@
-{ 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.14/kdegames/kapman.nix b/pkgs/desktops/kde-4.14/kdegames/kapman.nix
deleted file mode 100644
index 616533911ff8..000000000000
--- a/pkgs/desktops/kde-4.14/kdegames/kapman.nix
+++ /dev/null
@@ -1,7 +0,0 @@
-{ 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.14/kdegames/katomic.nix b/pkgs/desktops/kde-4.14/kdegames/katomic.nix
deleted file mode 100644
index 3f7c1343289a..000000000000
--- a/pkgs/desktops/kde-4.14/kdegames/katomic.nix
+++ /dev/null
@@ -1,7 +0,0 @@
-{ 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.14/kdegames/kblackbox.nix b/pkgs/desktops/kde-4.14/kdegames/kblackbox.nix
deleted file mode 100644
index 1e20cf0051ea..000000000000
--- a/pkgs/desktops/kde-4.14/kdegames/kblackbox.nix
+++ /dev/null
@@ -1,7 +0,0 @@
-{ 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.14/kdegames/kblocks.nix b/pkgs/desktops/kde-4.14/kdegames/kblocks.nix
deleted file mode 100644
index 08e8c62d2629..000000000000
--- a/pkgs/desktops/kde-4.14/kdegames/kblocks.nix
+++ /dev/null
@@ -1,7 +0,0 @@
-{ kde, kdelibs, libkdegames }:
-kde {
- buildInputs = [ kdelibs libkdegames ];
- meta = {
- description = "A classic single player falling blocks puzzle game";
- };
-}
diff --git a/pkgs/desktops/kde-4.14/kdegames/kbounce.nix b/pkgs/desktops/kde-4.14/kdegames/kbounce.nix
deleted file mode 100644
index 291e4c65a43a..000000000000
--- a/pkgs/desktops/kde-4.14/kdegames/kbounce.nix
+++ /dev/null
@@ -1,7 +0,0 @@
-{ 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.14/kdegames/kbreakout.nix b/pkgs/desktops/kde-4.14/kdegames/kbreakout.nix
deleted file mode 100644
index 4c5b2f62852f..000000000000
--- a/pkgs/desktops/kde-4.14/kdegames/kbreakout.nix
+++ /dev/null
@@ -1,7 +0,0 @@
-{ 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.14/kdegames/kdiamond.nix b/pkgs/desktops/kde-4.14/kdegames/kdiamond.nix
deleted file mode 100644
index b21a945a64b9..000000000000
--- a/pkgs/desktops/kde-4.14/kdegames/kdiamond.nix
+++ /dev/null
@@ -1,7 +0,0 @@
-{ 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.14/kdegames/kfourinline.nix b/pkgs/desktops/kde-4.14/kdegames/kfourinline.nix
deleted file mode 100644
index 6504d069660b..000000000000
--- a/pkgs/desktops/kde-4.14/kdegames/kfourinline.nix
+++ /dev/null
@@ -1,7 +0,0 @@
-{ 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.14/kdegames/kgoldrunner.nix b/pkgs/desktops/kde-4.14/kdegames/kgoldrunner.nix
deleted file mode 100644
index 86aff7e77ace..000000000000
--- a/pkgs/desktops/kde-4.14/kdegames/kgoldrunner.nix
+++ /dev/null
@@ -1,7 +0,0 @@
-{ 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.14/kdegames/kigo.nix b/pkgs/desktops/kde-4.14/kdegames/kigo.nix
deleted file mode 100644
index e417e89a0078..000000000000
--- a/pkgs/desktops/kde-4.14/kdegames/kigo.nix
+++ /dev/null
@@ -1,7 +0,0 @@
-{ 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.14/kdegames/killbots.nix b/pkgs/desktops/kde-4.14/kdegames/killbots.nix
deleted file mode 100644
index 9d8b307be756..000000000000
--- a/pkgs/desktops/kde-4.14/kdegames/killbots.nix
+++ /dev/null
@@ -1,7 +0,0 @@
-{ kde, kdelibs, libkdegames }:
-kde {
- buildInputs = [ kdelibs libkdegames ];
- meta = {
- description = "A simple game of evading killer robots";
- };
-}
diff --git a/pkgs/desktops/kde-4.14/kdegames/kiriki.nix b/pkgs/desktops/kde-4.14/kdegames/kiriki.nix
deleted file mode 100644
index 433991abd75b..000000000000
--- a/pkgs/desktops/kde-4.14/kdegames/kiriki.nix
+++ /dev/null
@@ -1,7 +0,0 @@
-{ 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.14/kdegames/kjumpingcube.nix b/pkgs/desktops/kde-4.14/kdegames/kjumpingcube.nix
deleted file mode 100644
index 888dba71b662..000000000000
--- a/pkgs/desktops/kde-4.14/kdegames/kjumpingcube.nix
+++ /dev/null
@@ -1,7 +0,0 @@
-{ kde, kdelibs, libkdegames }:
-kde {
- buildInputs = [ kdelibs libkdegames ];
- meta = {
- description = "A simple dice driven tactical game";
- };
-}
diff --git a/pkgs/desktops/kde-4.14/kdegames/klickety.nix b/pkgs/desktops/kde-4.14/kdegames/klickety.nix
deleted file mode 100644
index 87415f9a4f81..000000000000
--- a/pkgs/desktops/kde-4.14/kdegames/klickety.nix
+++ /dev/null
@@ -1,7 +0,0 @@
-{ 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.14/kdegames/klines.nix b/pkgs/desktops/kde-4.14/kdegames/klines.nix
deleted file mode 100644
index e5c32d3fa9ab..000000000000
--- a/pkgs/desktops/kde-4.14/kdegames/klines.nix
+++ /dev/null
@@ -1,7 +0,0 @@
-{ 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.14/kdegames/kmahjongg.nix b/pkgs/desktops/kde-4.14/kdegames/kmahjongg.nix
deleted file mode 100644
index 6aca3c229946..000000000000
--- a/pkgs/desktops/kde-4.14/kdegames/kmahjongg.nix
+++ /dev/null
@@ -1,7 +0,0 @@
-{ 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.14/kdegames/kmines.nix b/pkgs/desktops/kde-4.14/kdegames/kmines.nix
deleted file mode 100644
index c02a61506d75..000000000000
--- a/pkgs/desktops/kde-4.14/kdegames/kmines.nix
+++ /dev/null
@@ -1,7 +0,0 @@
-{ kde, kdelibs, libkdegames }:
-kde {
- buildInputs = [ kdelibs libkdegames ];
- meta = {
- description = "A classic Minesweeper game";
- };
-}
diff --git a/pkgs/desktops/kde-4.14/kdegames/knavalbattle.nix b/pkgs/desktops/kde-4.14/kdegames/knavalbattle.nix
deleted file mode 100644
index aed9b48511ac..000000000000
--- a/pkgs/desktops/kde-4.14/kdegames/knavalbattle.nix
+++ /dev/null
@@ -1,7 +0,0 @@
-{ kde, kdelibs, libkdegames }:
-kde {
- buildInputs = [ kdelibs libkdegames ];
- meta = {
- description = "A Battle Ship game";
- };
-}
diff --git a/pkgs/desktops/kde-4.14/kdegames/knetwalk.nix b/pkgs/desktops/kde-4.14/kdegames/knetwalk.nix
deleted file mode 100644
index d7a80f133168..000000000000
--- a/pkgs/desktops/kde-4.14/kdegames/knetwalk.nix
+++ /dev/null
@@ -1,7 +0,0 @@
-{ 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.14/kdegames/kolf.nix b/pkgs/desktops/kde-4.14/kdegames/kolf.nix
deleted file mode 100644
index 67a75cb9a36f..000000000000
--- a/pkgs/desktops/kde-4.14/kdegames/kolf.nix
+++ /dev/null
@@ -1,7 +0,0 @@
-{ kde, kdelibs, libkdegames }:
-kde {
- buildInputs = [ kdelibs libkdegames ];
- meta = {
- description = "A miniature golf game";
- };
-}
diff --git a/pkgs/desktops/kde-4.14/kdegames/kollision.nix b/pkgs/desktops/kde-4.14/kdegames/kollision.nix
deleted file mode 100644
index b0911d093ddd..000000000000
--- a/pkgs/desktops/kde-4.14/kdegames/kollision.nix
+++ /dev/null
@@ -1,7 +0,0 @@
-{ kde, kdelibs, libkdegames }:
-kde {
- buildInputs = [ kdelibs libkdegames ];
- meta = {
- description = "A simple ball dodging game";
- };
-}
diff --git a/pkgs/desktops/kde-4.14/kdegames/konquest.nix b/pkgs/desktops/kde-4.14/kdegames/konquest.nix
deleted file mode 100644
index 974730a46d0b..000000000000
--- a/pkgs/desktops/kde-4.14/kdegames/konquest.nix
+++ /dev/null
@@ -1,7 +0,0 @@
-{ kde, kdelibs, libkdegames }:
-kde {
- buildInputs = [ kdelibs libkdegames ];
- meta = {
- description = "The KDE version of Gnu-Lactic Konquest";
- };
-}
diff --git a/pkgs/desktops/kde-4.14/kdegames/kpat.nix b/pkgs/desktops/kde-4.14/kdegames/kpat.nix
deleted file mode 100644
index f33ddfb8570c..000000000000
--- a/pkgs/desktops/kde-4.14/kdegames/kpat.nix
+++ /dev/null
@@ -1,8 +0,0 @@
-{ kde, kdelibs, libkdegames, shared_mime_info }:
-kde {
- buildInputs = [ kdelibs libkdegames ];
- nativeBuildInputs = [ shared_mime_info ];
- meta = {
- description = "A relaxing card sorting game";
- };
-}
diff --git a/pkgs/desktops/kde-4.14/kdegames/kreversi.nix b/pkgs/desktops/kde-4.14/kdegames/kreversi.nix
deleted file mode 100644
index 065ee4bb657c..000000000000
--- a/pkgs/desktops/kde-4.14/kdegames/kreversi.nix
+++ /dev/null
@@ -1,7 +0,0 @@
-{ 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.14/kdegames/kshisen.nix b/pkgs/desktops/kde-4.14/kdegames/kshisen.nix
deleted file mode 100644
index 085b91584c70..000000000000
--- a/pkgs/desktops/kde-4.14/kdegames/kshisen.nix
+++ /dev/null
@@ -1,7 +0,0 @@
-{ 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.14/kdegames/ksirk.nix b/pkgs/desktops/kde-4.14/kdegames/ksirk.nix
deleted file mode 100644
index bfdd8f358dd1..000000000000
--- a/pkgs/desktops/kde-4.14/kdegames/ksirk.nix
+++ /dev/null
@@ -1,7 +0,0 @@
-{ 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.14/kdegames/ksnakeduel.nix b/pkgs/desktops/kde-4.14/kdegames/ksnakeduel.nix
deleted file mode 100644
index ce5e75336c97..000000000000
--- a/pkgs/desktops/kde-4.14/kdegames/ksnakeduel.nix
+++ /dev/null
@@ -1,7 +0,0 @@
-{ kde, kdelibs, libkdegames }:
-kde {
- buildInputs = [ kdelibs libkdegames ];
- meta = {
- description = "A simple Tron-Clone";
- };
-}
diff --git a/pkgs/desktops/kde-4.14/kdegames/kspaceduel.nix b/pkgs/desktops/kde-4.14/kdegames/kspaceduel.nix
deleted file mode 100644
index 692eb1c085af..000000000000
--- a/pkgs/desktops/kde-4.14/kdegames/kspaceduel.nix
+++ /dev/null
@@ -1,7 +0,0 @@
-{ 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.14/kdegames/ksquares.nix b/pkgs/desktops/kde-4.14/kdegames/ksquares.nix
deleted file mode 100644
index 7cad6bf0e5ae..000000000000
--- a/pkgs/desktops/kde-4.14/kdegames/ksquares.nix
+++ /dev/null
@@ -1,7 +0,0 @@
-{ 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.14/kdegames/ksudoku.nix b/pkgs/desktops/kde-4.14/kdegames/ksudoku.nix
deleted file mode 100644
index 72a6a72b66d5..000000000000
--- a/pkgs/desktops/kde-4.14/kdegames/ksudoku.nix
+++ /dev/null
@@ -1,7 +0,0 @@
-{ kde, kdelibs, libkdegames }:
-kde {
- buildInputs = [ kdelibs libkdegames ];
- meta = {
- description = "A logic-based symbol placement puzzle";
- };
-}
diff --git a/pkgs/desktops/kde-4.14/kdegames/ktuberling.nix b/pkgs/desktops/kde-4.14/kdegames/ktuberling.nix
deleted file mode 100644
index a4480864fd8b..000000000000
--- a/pkgs/desktops/kde-4.14/kdegames/ktuberling.nix
+++ /dev/null
@@ -1,7 +0,0 @@
-{ 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.14/kdegames/kubrick.nix b/pkgs/desktops/kde-4.14/kdegames/kubrick.nix
deleted file mode 100644
index f80cf4a8b356..000000000000
--- a/pkgs/desktops/kde-4.14/kdegames/kubrick.nix
+++ /dev/null
@@ -1,7 +0,0 @@
-{ 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.14/kdegames/libkdegames.nix b/pkgs/desktops/kde-4.14/kdegames/libkdegames.nix
deleted file mode 100644
index 3819dcdc9ae2..000000000000
--- a/pkgs/desktops/kde-4.14/kdegames/libkdegames.nix
+++ /dev/null
@@ -1,7 +0,0 @@
-{ kde, kdelibs, openal, libsndfile }:
-kde {
- buildInputs = [ kdelibs openal libsndfile ];
- meta = {
- description = "KDE games library";
- };
-}
diff --git a/pkgs/desktops/kde-4.14/kdegames/libkmahjongg.nix b/pkgs/desktops/kde-4.14/kdegames/libkmahjongg.nix
deleted file mode 100644
index d7687c1435f7..000000000000
--- a/pkgs/desktops/kde-4.14/kdegames/libkmahjongg.nix
+++ /dev/null
@@ -1,7 +0,0 @@
-{ kde, kdelibs, libkdegames }:
-kde {
- buildInputs = [ kdelibs libkdegames ];
- meta = {
- description = "A library for KMahjongg game";
- };
-}
diff --git a/pkgs/desktops/kde-4.14/kdegames/lskat.nix b/pkgs/desktops/kde-4.14/kdegames/lskat.nix
deleted file mode 100644
index d3e8268784bb..000000000000
--- a/pkgs/desktops/kde-4.14/kdegames/lskat.nix
+++ /dev/null
@@ -1,7 +0,0 @@
-{ 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.14/kdegames/palapeli.nix b/pkgs/desktops/kde-4.14/kdegames/palapeli.nix
deleted file mode 100644
index a73fcf100eb7..000000000000
--- a/pkgs/desktops/kde-4.14/kdegames/palapeli.nix
+++ /dev/null
@@ -1,13 +0,0 @@
-{ kde, kdelibs, libkdegames, shared_mime_info }:
-kde {
-
-# TODO: package qvoronoi
-
- nativeBuildInputs = [ shared_mime_info ];
-
- buildInputs = [ kdelibs libkdegames ];
-
- meta = {
- description = "A single-player jigsaw puzzle game";
- };
-}
diff --git a/pkgs/desktops/kde-4.14/kdegames/picmi.nix b/pkgs/desktops/kde-4.14/kdegames/picmi.nix
deleted file mode 100644
index 77dcdcf48dce..000000000000
--- a/pkgs/desktops/kde-4.14/kdegames/picmi.nix
+++ /dev/null
@@ -1,7 +0,0 @@
-{ kde, kdelibs, libkdegames }:
-kde {
- buildInputs = [ kdelibs libkdegames ];
- meta = {
- description = "A single player logic-based puzzle game";
- };
-}
diff --git a/pkgs/desktops/kde-4.14/kdegraphics/gwenview.nix b/pkgs/desktops/kde-4.14/kdegraphics/gwenview.nix
deleted file mode 100644
index 66a7c79a42bc..000000000000
--- a/pkgs/desktops/kde-4.14/kdegraphics/gwenview.nix
+++ /dev/null
@@ -1,16 +0,0 @@
-{ stdenv, kde, kdelibs, exiv2, kde_baseapps, libkipi, nepomuk_core
-, libjpeg, pkgconfig, kactivities, lcms2, baloo, kfilemetadata, libkdcraw }:
-
-kde {
-
- buildInputs =
- [ kdelibs exiv2 nepomuk_core kactivities kde_baseapps libkipi libjpeg lcms2
- baloo kfilemetadata libkdcraw ];
-
- nativeBuildInputs = [ pkgconfig ];
-
- meta = {
- description = "Gwenview, the KDE image viewer";
- license = stdenv.lib.licenses.gpl2;
- };
-}
diff --git a/pkgs/desktops/kde-4.14/kdegraphics/kamera.nix b/pkgs/desktops/kde-4.14/kdegraphics/kamera.nix
deleted file mode 100644
index d9aa11c54afa..000000000000
--- a/pkgs/desktops/kde-4.14/kdegraphics/kamera.nix
+++ /dev/null
@@ -1,10 +0,0 @@
-{ stdenv, kde, kdelibs, libgphoto2 }:
-
-kde {
- buildInputs = [ kdelibs libgphoto2 ];
-
- meta = {
- description = "KDE camera interface library";
- license = stdenv.lib.licenses.gpl2;
- };
-}
diff --git a/pkgs/desktops/kde-4.14/kdegraphics/kcolorchooser.nix b/pkgs/desktops/kde-4.14/kdegraphics/kcolorchooser.nix
deleted file mode 100644
index e06c1b5d307c..000000000000
--- a/pkgs/desktops/kde-4.14/kdegraphics/kcolorchooser.nix
+++ /dev/null
@@ -1,10 +0,0 @@
-{ stdenv, kde, kdelibs }:
-
-kde {
- buildInputs = [ kdelibs ];
-
- meta = {
- description = "A small utility to select a color";
- license = stdenv.lib.licenses.gpl2;
- };
-}
diff --git a/pkgs/desktops/kde-4.14/kdegraphics/kdegraphics-mobipocket.nix b/pkgs/desktops/kde-4.14/kdegraphics/kdegraphics-mobipocket.nix
deleted file mode 100644
index e834762feb52..000000000000
--- a/pkgs/desktops/kde-4.14/kdegraphics/kdegraphics-mobipocket.nix
+++ /dev/null
@@ -1,10 +0,0 @@
-{ stdenv, kde, kdelibs, okular }:
-
-kde {
- buildInputs = [ kdelibs okular ];
-
- meta = {
- description = "A collection of plugins to handle mobipocket files";
- license = stdenv.lib.licenses.gpl2;
- };
-}
diff --git a/pkgs/desktops/kde-4.14/kdegraphics/kdegraphics-strigi-analyzer.nix b/pkgs/desktops/kde-4.14/kdegraphics/kdegraphics-strigi-analyzer.nix
deleted file mode 100644
index d9d35808ac50..000000000000
--- a/pkgs/desktops/kde-4.14/kdegraphics/kdegraphics-strigi-analyzer.nix
+++ /dev/null
@@ -1,10 +0,0 @@
-{ stdenv, kde, kdelibs, libtiff }:
-
-kde {
- buildInputs = [ kdelibs libtiff ];
-
- meta = {
- description = "Strigi analyzers for various graphics file formats";
- license = stdenv.lib.licenses.gpl2;
- };
-}
diff --git a/pkgs/desktops/kde-4.14/kdegraphics/kdegraphics-thumbnailers.nix b/pkgs/desktops/kde-4.14/kdegraphics/kdegraphics-thumbnailers.nix
deleted file mode 100644
index d6207689512f..000000000000
--- a/pkgs/desktops/kde-4.14/kdegraphics/kdegraphics-thumbnailers.nix
+++ /dev/null
@@ -1,13 +0,0 @@
-{ stdenv, kde, kdelibs, libkexiv2, libkdcraw, pkgconfig }:
-
-kde {
-
- buildInputs = [ kdelibs libkexiv2 libkdcraw ];
-
- nativeBuildInputs = [ pkgconfig ];
-
- meta = {
- description = "Thumbnailers for various graphics file formats";
- license = stdenv.lib.licenses.gpl2;
- };
-}
diff --git a/pkgs/desktops/kde-4.14/kdegraphics/kgamma.nix b/pkgs/desktops/kde-4.14/kdegraphics/kgamma.nix
deleted file mode 100644
index 016312c199e5..000000000000
--- a/pkgs/desktops/kde-4.14/kdegraphics/kgamma.nix
+++ /dev/null
@@ -1,10 +0,0 @@
-{ stdenv, kde, kdelibs, libXxf86vm }:
-
-kde {
- buildInputs = [ kdelibs libXxf86vm ];
-
- meta = {
- description = "KDE monitor calibration tool";
- license = stdenv.lib.licenses.gpl2;
- };
-}
diff --git a/pkgs/desktops/kde-4.14/kdegraphics/kolourpaint.nix b/pkgs/desktops/kde-4.14/kdegraphics/kolourpaint.nix
deleted file mode 100644
index ecf34e5ae9e5..000000000000
--- a/pkgs/desktops/kde-4.14/kdegraphics/kolourpaint.nix
+++ /dev/null
@@ -1,10 +0,0 @@
-{ stdenv, kde, kdelibs, qimageblitz }:
-
-kde {
- buildInputs = [ kdelibs qimageblitz ];
-
- meta = {
- description = "KDE paint program";
- license = stdenv.lib.licenses.gpl2;
- };
-}
diff --git a/pkgs/desktops/kde-4.14/kdegraphics/kruler.nix b/pkgs/desktops/kde-4.14/kdegraphics/kruler.nix
deleted file mode 100644
index 209331d9e83d..000000000000
--- a/pkgs/desktops/kde-4.14/kdegraphics/kruler.nix
+++ /dev/null
@@ -1,10 +0,0 @@
-{ stdenv, kde, kdelibs }:
-
-kde {
- buildInputs = [ kdelibs ];
-
- meta = {
- description = "KDE screen ruler";
- license = stdenv.lib.licenses.gpl2;
- };
-}
diff --git a/pkgs/desktops/kde-4.14/kdegraphics/ksaneplugin.nix b/pkgs/desktops/kde-4.14/kdegraphics/ksaneplugin.nix
deleted file mode 100644
index f541c4bdb4df..000000000000
--- a/pkgs/desktops/kde-4.14/kdegraphics/ksaneplugin.nix
+++ /dev/null
@@ -1,10 +0,0 @@
-{ stdenv, kde, kdelibs, libksane }:
-
-kde {
- buildInputs = [ kdelibs libksane ];
-
- meta = {
- description = "A KScan plugin that implements the scanning through libksane";
- license = stdenv.lib.licenses.gpl2;
- };
-}
diff --git a/pkgs/desktops/kde-4.14/kdegraphics/ksnapshot.nix b/pkgs/desktops/kde-4.14/kdegraphics/ksnapshot.nix
deleted file mode 100644
index a9897d270bb6..000000000000
--- a/pkgs/desktops/kde-4.14/kdegraphics/ksnapshot.nix
+++ /dev/null
@@ -1,10 +0,0 @@
-{ stdenv, kde, kdelibs, libkipi }:
-
-kde {
- buildInputs = [ kdelibs libkipi ];
-
- meta = {
- description = "KDE screenshot utility";
- license = stdenv.lib.licenses.gpl2;
- };
-}
diff --git a/pkgs/desktops/kde-4.14/kdegraphics/libkipi.nix b/pkgs/desktops/kde-4.14/kdegraphics/libkipi.nix
deleted file mode 100644
index 65e6c52bd44f..000000000000
--- a/pkgs/desktops/kde-4.14/kdegraphics/libkipi.nix
+++ /dev/null
@@ -1,10 +0,0 @@
-{ stdenv, kde, kdelibs }:
-
-kde {
- buildInputs = [ kdelibs ];
-
- meta = {
- description = "Interface library to kipi-plugins";
- license = stdenv.lib.licenses.gpl2;
- };
-}
diff --git a/pkgs/desktops/kde-4.14/kdegraphics/libksane.nix b/pkgs/desktops/kde-4.14/kdegraphics/libksane.nix
deleted file mode 100644
index d55419f02c75..000000000000
--- a/pkgs/desktops/kde-4.14/kdegraphics/libksane.nix
+++ /dev/null
@@ -1,10 +0,0 @@
-{ stdenv, kde, kdelibs, sane-backends }:
-
-kde {
- buildInputs = [ kdelibs sane-backends ];
-
- meta = {
- description = "An image scanning library that provides a QWidget that contains all the logic needed to interface a sacanner";
- license = stdenv.lib.licenses.gpl2;
- };
-}
diff --git a/pkgs/desktops/kde-4.14/kdelibs/baloo-widgets.nix b/pkgs/desktops/kde-4.14/kdelibs/baloo-widgets.nix
deleted file mode 100644
index 46567b5e2a71..000000000000
--- a/pkgs/desktops/kde-4.14/kdelibs/baloo-widgets.nix
+++ /dev/null
@@ -1,11 +0,0 @@
-{ stdenv, kde, kdelibs, baloo, kfilemetadata, pkgconfig }:
-
-kde {
- buildInputs = [ kdelibs baloo kfilemetadata ];
- nativeBuildInputs = [ pkgconfig ];
-
- meta = {
- description = "Baloo Widgets";
- license = stdenv.lib.licenses.gpl2;
- };
-}
diff --git a/pkgs/desktops/kde-4.14/kdelibs/nepomuk-core.nix b/pkgs/desktops/kde-4.14/kdelibs/nepomuk-core.nix
deleted file mode 100644
index b990628889b6..000000000000
--- a/pkgs/desktops/kde-4.14/kdelibs/nepomuk-core.nix
+++ /dev/null
@@ -1,20 +0,0 @@
-{ stdenv, kde, kdelibs, soprano, shared_desktop_ontologies, exiv2, ffmpeg, taglib, poppler_qt4
-, pkgconfig, doxygen, ebook_tools, automoc4, cmake, perl
-}:
-
-kde {
-
-# TODO: qmobipocket
-
- buildInputs = [
- kdelibs soprano shared_desktop_ontologies taglib exiv2 ffmpeg
- poppler_qt4 ebook_tools
- ];
-
- nativeBuildInputs = [ automoc4 cmake perl pkgconfig doxygen ];
-
- meta = {
- description = "NEPOMUK core";
- license = stdenv.lib.licenses.gpl2;
- };
-}
diff --git a/pkgs/desktops/kde-4.14/kdelibs/nepomuk-widgets.nix b/pkgs/desktops/kde-4.14/kdelibs/nepomuk-widgets.nix
deleted file mode 100644
index b0fc5ad8900d..000000000000
--- a/pkgs/desktops/kde-4.14/kdelibs/nepomuk-widgets.nix
+++ /dev/null
@@ -1,11 +0,0 @@
-{ stdenv, kde, kdelibs, nepomuk_core }:
-
-kde {
-
- buildInputs = [ kdelibs nepomuk_core ];
-
- meta = {
- description = "NEPOMUK Widgets";
- license = stdenv.lib.licenses.gpl2;
- };
-}
diff --git a/pkgs/desktops/kde-4.14/kdemultimedia/audiocd-kio.nix b/pkgs/desktops/kde-4.14/kdemultimedia/audiocd-kio.nix
deleted file mode 100644
index 20e63baf723f..000000000000
--- a/pkgs/desktops/kde-4.14/kdemultimedia/audiocd-kio.nix
+++ /dev/null
@@ -1,7 +0,0 @@
-{ 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.14/kdemultimedia/dragon.nix b/pkgs/desktops/kde-4.14/kdemultimedia/dragon.nix
deleted file mode 100644
index bb44c3b7234e..000000000000
--- a/pkgs/desktops/kde-4.14/kdemultimedia/dragon.nix
+++ /dev/null
@@ -1,7 +0,0 @@
-{ kde, kdelibs }:
-kde {
- buildInputs = [ kdelibs ];
- meta = {
- description = "A multimedia player with the focus on simplicity";
- };
-}
diff --git a/pkgs/desktops/kde-4.14/kdemultimedia/ffmpegthumbs.nix b/pkgs/desktops/kde-4.14/kdemultimedia/ffmpegthumbs.nix
deleted file mode 100644
index 2311b1dda589..000000000000
--- a/pkgs/desktops/kde-4.14/kdemultimedia/ffmpegthumbs.nix
+++ /dev/null
@@ -1,7 +0,0 @@
-{ 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.14/kdemultimedia/juk.nix b/pkgs/desktops/kde-4.14/kdemultimedia/juk.nix
deleted file mode 100644
index 1bf5584de2fa..000000000000
--- a/pkgs/desktops/kde-4.14/kdemultimedia/juk.nix
+++ /dev/null
@@ -1,10 +0,0 @@
-{ kde, kdelibs, taglib_1_9, libtunepimp }:
-kde {
-
-# TODO: opusfile
-
- buildInputs = [ kdelibs taglib_1_9 libtunepimp ];
- meta = {
- description = "An audio jukebox application";
- };
-}
diff --git a/pkgs/desktops/kde-4.14/kdemultimedia/kmix.nix b/pkgs/desktops/kde-4.14/kdemultimedia/kmix.nix
deleted file mode 100644
index 4d36aaf4f68a..000000000000
--- a/pkgs/desktops/kde-4.14/kdemultimedia/kmix.nix
+++ /dev/null
@@ -1,7 +0,0 @@
-{ kde, kdelibs, libcanberra, libpulseaudio }:
-kde {
- buildInputs = [ kdelibs libcanberra libpulseaudio ];
- meta = {
- description = "Sound mixer, an application to allow you to change the volume of your sound card";
- };
-}
diff --git a/pkgs/desktops/kde-4.14/kdemultimedia/kscd.nix b/pkgs/desktops/kde-4.14/kdemultimedia/kscd.nix
deleted file mode 100644
index e99ae53935b9..000000000000
--- a/pkgs/desktops/kde-4.14/kdemultimedia/kscd.nix
+++ /dev/null
@@ -1,7 +0,0 @@
-{ kde, kdelibs, libmusicbrainz }:
-kde {
- buildInputs = [ kdelibs libmusicbrainz ];
- meta = {
- description = "KDE CD player";
- };
-}
diff --git a/pkgs/desktops/kde-4.14/kdemultimedia/libkcompactdisc.nix b/pkgs/desktops/kde-4.14/kdemultimedia/libkcompactdisc.nix
deleted file mode 100644
index 6ed08af89f33..000000000000
--- a/pkgs/desktops/kde-4.14/kdemultimedia/libkcompactdisc.nix
+++ /dev/null
@@ -1,7 +0,0 @@
-{ kde, kdelibs }:
-kde {
- buildInputs = [ kdelibs ];
- meta = {
- description = "KDE library for playing & ripping CDs";
- };
-}
diff --git a/pkgs/desktops/kde-4.14/kdemultimedia/mplayerthumbs.nix b/pkgs/desktops/kde-4.14/kdemultimedia/mplayerthumbs.nix
deleted file mode 100644
index c34b849f4c92..000000000000
--- a/pkgs/desktops/kde-4.14/kdemultimedia/mplayerthumbs.nix
+++ /dev/null
@@ -1,7 +0,0 @@
-{ kde, kdelibs }:
-kde {
- buildInputs = [ kdelibs ];
- meta = {
- description = "A video thumbnail generator for KDE";
- };
-}
diff --git a/pkgs/desktops/kde-4.14/kdenetwork/kdenetwork-filesharing.nix b/pkgs/desktops/kde-4.14/kdenetwork/kdenetwork-filesharing.nix
deleted file mode 100644
index 0330511a258b..000000000000
--- a/pkgs/desktops/kde-4.14/kdenetwork/kdenetwork-filesharing.nix
+++ /dev/null
@@ -1,9 +0,0 @@
-{ 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.14/kdenetwork/kdenetwork-strigi-analyzers.nix b/pkgs/desktops/kde-4.14/kdenetwork/kdenetwork-strigi-analyzers.nix
deleted file mode 100644
index e838d84fc5eb..000000000000
--- a/pkgs/desktops/kde-4.14/kdenetwork/kdenetwork-strigi-analyzers.nix
+++ /dev/null
@@ -1,9 +0,0 @@
-{ kde, kdelibs, boost }:
-
-kde {
- buildInputs = [ kdelibs boost ];
-
- meta = {
- description = "Strigi analyzers for various network protocols";
- };
-}
diff --git a/pkgs/desktops/kde-4.14/kdenetwork/kget.nix b/pkgs/desktops/kde-4.14/kdenetwork/kget.nix
deleted file mode 100644
index f986da2de214..000000000000
--- a/pkgs/desktops/kde-4.14/kdenetwork/kget.nix
+++ /dev/null
@@ -1,20 +0,0 @@
-{ 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.14/kdenetwork/kopete.nix b/pkgs/desktops/kde-4.14/kdenetwork/kopete.nix
deleted file mode 100644
index f5750d60045f..000000000000
--- a/pkgs/desktops/kde-4.14/kdenetwork/kopete.nix
+++ /dev/null
@@ -1,34 +0,0 @@
-{ kde, kdelibs, libmsn, libotr, kdepimlibs, qimageblitz, libktorrent,
- jasper, libidn, mediastreamer, pkgconfig, libxslt, giflib,
- libgadu, boost, qca2, sqlite, jsoncpp,
- ortp, srtp, libv4l, fetchurl }:
-
-kde {
-
-# TODO: libmeanwhile, xmms, jsoncpp(not found), kleopatra(from kdepim but doesn't install headers?),
-
- patches = [
- (fetchurl {
- name = "kopete.patch";
- url = "https://bugs.kde.org/attachment.cgi?id=91567";
- sha256 = "0a44rjiqzn6v3sywm17d1741sygbvlfnbqadq7qbdj3amny014m1";
- })
- ];
-
- 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.14/kdenetwork/kppp.nix b/pkgs/desktops/kde-4.14/kdenetwork/kppp.nix
deleted file mode 100644
index 4c6bd65769f7..000000000000
--- a/pkgs/desktops/kde-4.14/kdenetwork/kppp.nix
+++ /dev/null
@@ -1,9 +0,0 @@
-{ kde, kdelibs }:
-
-kde {
- buildInputs = [ kdelibs ];
-
- meta = {
- description = "PPP(Dial-Up) client tool";
- };
-}
diff --git a/pkgs/desktops/kde-4.14/kdenetwork/krdc.nix b/pkgs/desktops/kde-4.14/kdenetwork/krdc.nix
deleted file mode 100644
index 12cdd4a569c3..000000000000
--- a/pkgs/desktops/kde-4.14/kdenetwork/krdc.nix
+++ /dev/null
@@ -1,9 +0,0 @@
-{ kde, kdelibs, libvncserver, freerdp_legacy, telepathy_qt }:
-
-kde {
- buildInputs = [ kdelibs libvncserver freerdp_legacy telepathy_qt ];
-
- meta = {
- description = "KDE remote desktop client";
- };
-}
diff --git a/pkgs/desktops/kde-4.14/kdenetwork/krfb.nix b/pkgs/desktops/kde-4.14/kdenetwork/krfb.nix
deleted file mode 100644
index cb4857965a34..000000000000
--- a/pkgs/desktops/kde-4.14/kdenetwork/krfb.nix
+++ /dev/null
@@ -1,9 +0,0 @@
-{ 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.14/kdenetwork/zeroconf-ioslave.nix b/pkgs/desktops/kde-4.14/kdenetwork/zeroconf-ioslave.nix
deleted file mode 100644
index f65960cc337b..000000000000
--- a/pkgs/desktops/kde-4.14/kdenetwork/zeroconf-ioslave.nix
+++ /dev/null
@@ -1,9 +0,0 @@
-{ kde, kdelibs }:
-
-kde {
- buildInputs = [ kdelibs ];
-
- meta = {
- description = "KDE tool that monitors the network for DNS-SD services";
- };
-}
diff --git a/pkgs/desktops/kde-4.14/kdepim-runtime.nix b/pkgs/desktops/kde-4.14/kdepim-runtime.nix
deleted file mode 100644
index e5061a8790af..000000000000
--- a/pkgs/desktops/kde-4.14/kdepim-runtime.nix
+++ /dev/null
@@ -1,19 +0,0 @@
-{ kde, libxslt, boost, kdepimlibs, akonadi, shared_desktop_ontologies
-, shared_mime_info }:
-
-kde {
-
-# TODO: libkgapi(2), LibKFbAPI,libkolab, libkolabxml
-
- buildInputs = [
- kdepimlibs akonadi boost shared_desktop_ontologies
- libxslt
- ];
-
- nativeBuildInputs = [ shared_mime_info ];
-
- meta = {
- description = "KDE PIM runtime";
- license = "GPL";
- };
-}
diff --git a/pkgs/desktops/kde-4.14/kdepim.nix b/pkgs/desktops/kde-4.14/kdepim.nix
deleted file mode 100644
index df41c85c8ac6..000000000000
--- a/pkgs/desktops/kde-4.14/kdepim.nix
+++ /dev/null
@@ -1,28 +0,0 @@
-{ kde, boost, gpgme, libassuan, libxslt, kdepimlibs, kdepim_runtime
-, akonadi, shared_desktop_ontologies, cyrus_sasl, grantlee, prison
-, nepomuk_widgets, kactivities, libXScrnSaver, qjson, baloo
-, pkgconfig }:
-
-kde {
-
-# TODO: LinkGrammar
-
- buildInputs =
- [ kdepimlibs boost shared_desktop_ontologies akonadi nepomuk_widgets
- libxslt cyrus_sasl gpgme libassuan grantlee prison kactivities
- libXScrnSaver qjson baloo
- ];
-
- nativeBuildInputs = [ pkgconfig ];
-
- propagatedUserEnvPkgs = [ 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.14/kdepimlibs.nix b/pkgs/desktops/kde-4.14/kdepimlibs.nix
index 554d6acd9eb4..5e7643469b64 100644
--- a/pkgs/desktops/kde-4.14/kdepimlibs.nix
+++ b/pkgs/desktops/kde-4.14/kdepimlibs.nix
@@ -1,5 +1,5 @@
{ kde, pkgconfig, boost, cyrus_sasl, gpgme, libical, openldap, prison
-, kdelibs, akonadi, libxslt, nepomuk_core
+, kdelibs, akonadi, libxslt
, shared_mime_info, shared_desktop_ontologies, qjson
, automoc4, cmake, perl
}:
@@ -23,7 +23,7 @@ kde {
shared_mime_info
];
- propagatedBuildInputs = [ kdelibs nepomuk_core ];
+ propagatedBuildInputs = [ kdelibs ];
# Prevent a dependency on boost.dev. FIXME: move this cmake file to .dev.
postInstall = "rm $out/lib/gpgmepp/GpgmeppConfig.cmake";
diff --git a/pkgs/desktops/kde-4.14/kdeplasma-addons.nix b/pkgs/desktops/kde-4.14/kdeplasma-addons.nix
deleted file mode 100644
index b4d24f47e490..000000000000
--- a/pkgs/desktops/kde-4.14/kdeplasma-addons.nix
+++ /dev/null
@@ -1,23 +0,0 @@
-{ kde, kdelibs, marble, shared_desktop_ontologies, pkgconfig
-, boost, eigen2, kde_workspace, attica, qca2, qimageblitz
-, kdepimlibs, libkexiv2, libqalculate, libXtst, libdbusmenu_qt
-, qjson, qoauth, shared_mime_info }:
-
-kde {
-
-# TODO: qwt, scim, ibus
-
- KDEDIRS=marble;
-
- buildInputs = [ kdelibs boost kde_workspace kdepimlibs attica qjson qoauth
- eigen2 qca2 libXtst qimageblitz libqalculate
- shared_desktop_ontologies marble libkexiv2 libdbusmenu_qt
- ];
-
- nativeBuildInputs = [ shared_mime_info ];
-
- meta = {
- description = "KDE Plasma Addons";
- license = "GPL";
- };
-}
diff --git a/pkgs/desktops/kde-4.14/kdesdk/cervisia.nix b/pkgs/desktops/kde-4.14/kdesdk/cervisia.nix
deleted file mode 100644
index 1dabe46cd429..000000000000
--- a/pkgs/desktops/kde-4.14/kdesdk/cervisia.nix
+++ /dev/null
@@ -1,9 +0,0 @@
-{ kde, kdelibs }:
-
-kde {
- buildInputs = [ kdelibs ];
-
- meta = {
- description = "A KDE CVS frontend";
- };
-}
diff --git a/pkgs/desktops/kde-4.14/kdesdk/dolphin-plugins.nix b/pkgs/desktops/kde-4.14/kdesdk/dolphin-plugins.nix
deleted file mode 100644
index ad8132a850e5..000000000000
--- a/pkgs/desktops/kde-4.14/kdesdk/dolphin-plugins.nix
+++ /dev/null
@@ -1,11 +0,0 @@
-{ 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.14/kdesdk/kapptemplate.nix b/pkgs/desktops/kde-4.14/kdesdk/kapptemplate.nix
deleted file mode 100644
index 391536248dd3..000000000000
--- a/pkgs/desktops/kde-4.14/kdesdk/kapptemplate.nix
+++ /dev/null
@@ -1,9 +0,0 @@
-{ kde, kdelibs }:
-
-kde {
- buildInputs = [ kdelibs ];
-
- meta = {
- description = "A KDE 4 project template generator";
- };
-}
diff --git a/pkgs/desktops/kde-4.14/kdesdk/kcachegrind.nix b/pkgs/desktops/kde-4.14/kdesdk/kcachegrind.nix
deleted file mode 100644
index 65d410cca48d..000000000000
--- a/pkgs/desktops/kde-4.14/kdesdk/kcachegrind.nix
+++ /dev/null
@@ -1,9 +0,0 @@
-{ kde, kdelibs }:
-
-kde {
- buildInputs = [ kdelibs ];
-
- meta = {
- description = "KDE Frontend for Callgrind/Cachegrind";
- };
-}
diff --git a/pkgs/desktops/kde-4.14/kdesdk/kde-dev-scripts.nix b/pkgs/desktops/kde-4.14/kdesdk/kde-dev-scripts.nix
deleted file mode 100644
index df81145e5d60..000000000000
--- a/pkgs/desktops/kde-4.14/kdesdk/kde-dev-scripts.nix
+++ /dev/null
@@ -1,9 +0,0 @@
-{ kde, kdelibs }:
-
-kde {
- buildInputs = [ kdelibs ];
-
- meta = {
- description = "Various scripts to ease KDE development";
- };
-}
diff --git a/pkgs/desktops/kde-4.14/kdesdk/kde-dev-utils.nix b/pkgs/desktops/kde-4.14/kdesdk/kde-dev-utils.nix
deleted file mode 100644
index 5d4f83e26562..000000000000
--- a/pkgs/desktops/kde-4.14/kdesdk/kde-dev-utils.nix
+++ /dev/null
@@ -1,11 +0,0 @@
-{ kde, kdelibs, gcc, libtool }:
-
-kde {
- buildInputs = [ kdelibs libtool ];
-
- preConfigure = "export CMAKE_PREFIX_PATH=$CMAKE_PREFIX_PATH:${gcc}:${gcc.cc}";
-
- meta = {
- description = "Various KDE development utilities";
- };
-}
diff --git a/pkgs/desktops/kde-4.14/kdesdk/kdesdk-kioslaves.nix b/pkgs/desktops/kde-4.14/kdesdk/kdesdk-kioslaves.nix
deleted file mode 100644
index 98bbce35a97c..000000000000
--- a/pkgs/desktops/kde-4.14/kdesdk/kdesdk-kioslaves.nix
+++ /dev/null
@@ -1,12 +0,0 @@
-{ 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.14/kdesdk/kdesdk-strigi-analyzers.nix b/pkgs/desktops/kde-4.14/kdesdk/kdesdk-strigi-analyzers.nix
deleted file mode 100644
index 4d579b88ba8a..000000000000
--- a/pkgs/desktops/kde-4.14/kdesdk/kdesdk-strigi-analyzers.nix
+++ /dev/null
@@ -1,9 +0,0 @@
-{ kde, kdelibs }:
-
-kde {
- buildInputs = [ kdelibs ];
-
- meta = {
- description = "Strigi analyzers for diff, po and ts";
- };
-}
diff --git a/pkgs/desktops/kde-4.14/kdesdk/kdesdk-thumbnailers.nix b/pkgs/desktops/kde-4.14/kdesdk/kdesdk-thumbnailers.nix
deleted file mode 100644
index d707fe9038fe..000000000000
--- a/pkgs/desktops/kde-4.14/kdesdk/kdesdk-thumbnailers.nix
+++ /dev/null
@@ -1,10 +0,0 @@
-{ kde, kdelibs, gettext }:
-
-kde {
-
- buildInputs = [ kdelibs gettext ];
-
- meta = {
- description = "PO file format thumbnailer";
- };
-}
diff --git a/pkgs/desktops/kde-4.14/kdesdk/kompare.nix b/pkgs/desktops/kde-4.14/kdesdk/kompare.nix
deleted file mode 100644
index 644c7c48dc97..000000000000
--- a/pkgs/desktops/kde-4.14/kdesdk/kompare.nix
+++ /dev/null
@@ -1,9 +0,0 @@
-{ 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.14/kdesdk/libkomparediff2.nix b/pkgs/desktops/kde-4.14/kdesdk/libkomparediff2.nix
deleted file mode 100644
index 5933682c70a0..000000000000
--- a/pkgs/desktops/kde-4.14/kdesdk/libkomparediff2.nix
+++ /dev/null
@@ -1,9 +0,0 @@
-{ kde, kdelibs }:
-
-kde {
- buildInputs = [ kdelibs ];
-
- meta = {
- description = "A library to compare files and strings";
- };
-}
diff --git a/pkgs/desktops/kde-4.14/kdesdk/lokalize.nix b/pkgs/desktops/kde-4.14/kdesdk/lokalize.nix
deleted file mode 100644
index 1565426eb1fc..000000000000
--- a/pkgs/desktops/kde-4.14/kdesdk/lokalize.nix
+++ /dev/null
@@ -1,13 +0,0 @@
-{ 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.14/kdesdk/okteta.nix b/pkgs/desktops/kde-4.14/kdesdk/okteta.nix
deleted file mode 100644
index 77108c76adc3..000000000000
--- a/pkgs/desktops/kde-4.14/kdesdk/okteta.nix
+++ /dev/null
@@ -1,15 +0,0 @@
-{ kde, kdelibs, qca2, shared_mime_info }:
-
-kde {
- buildInputs = [ kdelibs qca2 ];
-
- nativeBuildInputs = [ shared_mime_info ];
-
-# TODO: Look what does -DBUILD_mobile add
-
- enableParallelBuilding = false;
-
- meta = {
- description = "KDE byte editor";
- };
-}
diff --git a/pkgs/desktops/kde-4.14/kdesdk/poxml.nix b/pkgs/desktops/kde-4.14/kdesdk/poxml.nix
deleted file mode 100644
index 6e46c3e3ab4f..000000000000
--- a/pkgs/desktops/kde-4.14/kdesdk/poxml.nix
+++ /dev/null
@@ -1,9 +0,0 @@
-{ kde, kdelibs, antlr, gettext }:
-
-kde {
- buildInputs = [ kdelibs antlr gettext ];
-
- meta = {
- description = "Po<->xml tools";
- };
-}
diff --git a/pkgs/desktops/kde-4.14/kdesdk/umbrello.nix b/pkgs/desktops/kde-4.14/kdesdk/umbrello.nix
deleted file mode 100644
index e83a2d9a901b..000000000000
--- a/pkgs/desktops/kde-4.14/kdesdk/umbrello.nix
+++ /dev/null
@@ -1,9 +0,0 @@
-{ kde, kdelibs, libxml2, libxslt, boost }:
-
-kde {
- buildInputs = [ kdelibs libxml2 libxslt boost ];
-
- meta = {
- description = "Umbrello UML modeller";
- };
-}
diff --git a/pkgs/desktops/kde-4.14/kdetoys/amor.nix b/pkgs/desktops/kde-4.14/kdetoys/amor.nix
deleted file mode 100644
index 936d63d544a9..000000000000
--- a/pkgs/desktops/kde-4.14/kdetoys/amor.nix
+++ /dev/null
@@ -1,9 +0,0 @@
-{ kde, kdelibs }:
-
-kde {
- buildInputs = [ kdelibs ];
-
- meta = {
- description = "KDE creature for your desktop";
- };
-}
diff --git a/pkgs/desktops/kde-4.14/kdetoys/kteatime.nix b/pkgs/desktops/kde-4.14/kdetoys/kteatime.nix
deleted file mode 100644
index dacf54def4b0..000000000000
--- a/pkgs/desktops/kde-4.14/kdetoys/kteatime.nix
+++ /dev/null
@@ -1,9 +0,0 @@
-{ kde, kdelibs }:
-
-kde {
- buildInputs = [ kdelibs ];
-
- meta = {
- description = "KDE utility for making a fine cup of tea";
- };
-}
diff --git a/pkgs/desktops/kde-4.14/kdetoys/ktux.nix b/pkgs/desktops/kde-4.14/kdetoys/ktux.nix
deleted file mode 100644
index 108f9be7c722..000000000000
--- a/pkgs/desktops/kde-4.14/kdetoys/ktux.nix
+++ /dev/null
@@ -1,9 +0,0 @@
-{ kde, kdelibs, kde_workspace }:
-
-kde {
- buildInputs = [ kdelibs kde_workspace ];
-
- meta = {
- description = "Tux Screen Saver";
- };
-}
diff --git a/pkgs/desktops/kde-4.14/kdeutils/ark.nix b/pkgs/desktops/kde-4.14/kdeutils/ark.nix
deleted file mode 100644
index 99844b909fd7..000000000000
--- a/pkgs/desktops/kde-4.14/kdeutils/ark.nix
+++ /dev/null
@@ -1,17 +0,0 @@
-{ makeWrapper, kde, kdelibs, libarchive, bzip2, kde_baseapps, lzma, qjson
-, unzip }:
-
-kde {
- buildInputs = [
- makeWrapper kdelibs kde_baseapps libarchive bzip2 lzma qjson
- ];
-
- postInstall = ''
- wrapProgram $out/bin/ark \
- --prefix PATH ":" "${unzip}/bin"
- '';
-
- meta = {
- description = "KDE Archiving Tool";
- };
-}
diff --git a/pkgs/desktops/kde-4.14/kdeutils/filelight.nix b/pkgs/desktops/kde-4.14/kdeutils/filelight.nix
deleted file mode 100644
index 25ecabed27ce..000000000000
--- a/pkgs/desktops/kde-4.14/kdeutils/filelight.nix
+++ /dev/null
@@ -1,9 +0,0 @@
-{ kde, kdelibs }:
-
-kde {
- buildInputs = [ kdelibs ];
-
- meta = {
- description = "Tool to visualise file and directory sizes";
- };
-}
diff --git a/pkgs/desktops/kde-4.14/kdeutils/kcalc.nix b/pkgs/desktops/kde-4.14/kdeutils/kcalc.nix
deleted file mode 100644
index 08b202e8f0e8..000000000000
--- a/pkgs/desktops/kde-4.14/kdeutils/kcalc.nix
+++ /dev/null
@@ -1,9 +0,0 @@
-{ kde, kdelibs, gmp }:
-
-kde {
- buildInputs = [ kdelibs gmp ];
-
- meta = {
- description = "KDE Calculator";
- };
-}
diff --git a/pkgs/desktops/kde-4.14/kdeutils/kcharselect.nix b/pkgs/desktops/kde-4.14/kdeutils/kcharselect.nix
deleted file mode 100644
index d4c9c06f483d..000000000000
--- a/pkgs/desktops/kde-4.14/kdeutils/kcharselect.nix
+++ /dev/null
@@ -1,9 +0,0 @@
-{ kde, kdelibs }:
-
-kde {
- buildInputs = [ kdelibs ];
-
- meta = {
- description = "KDE character selection utility";
- };
-}
diff --git a/pkgs/desktops/kde-4.14/kdeutils/kdf.nix b/pkgs/desktops/kde-4.14/kdeutils/kdf.nix
deleted file mode 100644
index 3f9da58d0a62..000000000000
--- a/pkgs/desktops/kde-4.14/kdeutils/kdf.nix
+++ /dev/null
@@ -1,9 +0,0 @@
-{ kde, kdelibs }:
-
-kde {
- buildInputs = [ kdelibs ];
-
- meta = {
- description = "KDE free disk space utility";
- };
-}
diff --git a/pkgs/desktops/kde-4.14/kdeutils/kfloppy.nix b/pkgs/desktops/kde-4.14/kdeutils/kfloppy.nix
deleted file mode 100644
index 2434a4fa671f..000000000000
--- a/pkgs/desktops/kde-4.14/kdeutils/kfloppy.nix
+++ /dev/null
@@ -1,9 +0,0 @@
-{ kde, kdelibs }:
-
-kde {
- buildInputs = [ kdelibs ];
-
- meta = {
- description = "Floppy disk formatting utility";
- };
-}
diff --git a/pkgs/desktops/kde-4.14/kdeutils/kgpg.nix b/pkgs/desktops/kde-4.14/kdeutils/kgpg.nix
deleted file mode 100644
index b3f95356d132..000000000000
--- a/pkgs/desktops/kde-4.14/kdeutils/kgpg.nix
+++ /dev/null
@@ -1,10 +0,0 @@
-{ kde, kdelibs, kdepimlibs, boost, gpgme }:
-
-kde {
-
- buildInputs = [ kdelibs kdepimlibs boost gpgme ];
-
- meta = {
- description = "Simple KDE GUI for GPG";
- };
-}
diff --git a/pkgs/desktops/kde-4.14/kdeutils/kremotecontrol.nix b/pkgs/desktops/kde-4.14/kdeutils/kremotecontrol.nix
deleted file mode 100644
index 70311a789f99..000000000000
--- a/pkgs/desktops/kde-4.14/kdeutils/kremotecontrol.nix
+++ /dev/null
@@ -1,9 +0,0 @@
-{ kde, kdelibs, libXtst }:
-
-kde {
- buildInputs = [ kdelibs libXtst ];
-
- meta = {
- description = "KDE remote control";
- };
-}
diff --git a/pkgs/desktops/kde-4.14/kdeutils/ktimer.nix b/pkgs/desktops/kde-4.14/kdeutils/ktimer.nix
deleted file mode 100644
index 5700977349e3..000000000000
--- a/pkgs/desktops/kde-4.14/kdeutils/ktimer.nix
+++ /dev/null
@@ -1,9 +0,0 @@
-{ kde, kdelibs }:
-
-kde {
- buildInputs = [ kdelibs ];
-
- meta = {
- description = "KDE Timer";
- };
-}
diff --git a/pkgs/desktops/kde-4.14/kdeutils/kwalletmanager.nix b/pkgs/desktops/kde-4.14/kdeutils/kwalletmanager.nix
deleted file mode 100644
index 9ec0e6c0396c..000000000000
--- a/pkgs/desktops/kde-4.14/kdeutils/kwalletmanager.nix
+++ /dev/null
@@ -1,9 +0,0 @@
-{ kde, kdelibs }:
-
-kde {
- buildInputs = [ kdelibs ];
-
- meta = {
- description = "KDE Wallet (password storage) management tool";
- };
-}
diff --git a/pkgs/desktops/kde-4.14/kdeutils/print-manager.nix b/pkgs/desktops/kde-4.14/kdeutils/print-manager.nix
deleted file mode 100644
index b53946fae25d..000000000000
--- a/pkgs/desktops/kde-4.14/kdeutils/print-manager.nix
+++ /dev/null
@@ -1,21 +0,0 @@
-{ kde, kdelibs
-, pythonPackages, cups, pykde4, 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 pythonPackages.pyqt4 pykde4 pythonPackages.pycups s_c_p ];
-
- # system-config-printer supplies some D-Bus policy that we need.
- propagatedUserEnvPkgs = [ s_c_p ];
-
- postInstall = "wrapPythonPrograms";
-
- meta = {
- description = "KDE printer manager";
- longDescription = "Applet to view current print jobs and configure new printers";
- };
-}
diff --git a/pkgs/desktops/kde-4.14/kdeutils/superkaramba.nix b/pkgs/desktops/kde-4.14/kdeutils/superkaramba.nix
deleted file mode 100644
index cbe7a2856062..000000000000
--- a/pkgs/desktops/kde-4.14/kdeutils/superkaramba.nix
+++ /dev/null
@@ -1,11 +0,0 @@
-{ 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.14/kdeutils/sweeper.nix b/pkgs/desktops/kde-4.14/kdeutils/sweeper.nix
deleted file mode 100644
index 78d56c7df30e..000000000000
--- a/pkgs/desktops/kde-4.14/kdeutils/sweeper.nix
+++ /dev/null
@@ -1,9 +0,0 @@
-{ kde, kdelibs }:
-
-kde {
- buildInputs = [ kdelibs ];
-
- meta = {
- description = "Helps clean unwanted traces the user leaves on the system";
- };
-}
diff --git a/pkgs/desktops/kde-4.14/kdewebdev/kfilereplace.nix b/pkgs/desktops/kde-4.14/kdewebdev/kfilereplace.nix
deleted file mode 100644
index 55e37809e07b..000000000000
--- a/pkgs/desktops/kde-4.14/kdewebdev/kfilereplace.nix
+++ /dev/null
@@ -1,10 +0,0 @@
-{ kde, kdelibs }:
-
-kde {
- buildInputs = [ kdelibs ];
-
- meta = {
- description = "Batch search and replace tool";
- homepage = http://www.kdewebdev.org;
- };
-}
diff --git a/pkgs/desktops/kde-4.14/kdewebdev/kimagemapeditor.nix b/pkgs/desktops/kde-4.14/kdewebdev/kimagemapeditor.nix
deleted file mode 100644
index 6d22f72461f9..000000000000
--- a/pkgs/desktops/kde-4.14/kdewebdev/kimagemapeditor.nix
+++ /dev/null
@@ -1,10 +0,0 @@
-{ kde, kdelibs }:
-
-kde {
- buildInputs = [ kdelibs ];
-
- meta = {
- description = "An HTML imagemap editor";
- homepage = http://www.nongnu.org/kimagemap/;
- };
-}
diff --git a/pkgs/desktops/kde-4.14/kdewebdev/klinkstatus.nix b/pkgs/desktops/kde-4.14/kdewebdev/klinkstatus.nix
deleted file mode 100644
index b593c952219c..000000000000
--- a/pkgs/desktops/kde-4.14/kdewebdev/klinkstatus.nix
+++ /dev/null
@@ -1,18 +0,0 @@
-{ kde, kdelibs, libxml2, libxslt, kdepimlibs, html-tidy, boost }:
-
-kde {
-
-# todo: ruby19 is not found by the build system. not linking against ruby18 due to it being too old
-
- postPatch = ''
- substituteInPlace klinkstatus/src/tidy/tidyx.h \
- --replace buffio.h tidybuffio.h
- '';
-
- buildInputs = [ kdelibs kdepimlibs html-tidy boost ];
-
- meta = {
- description = "A KDE link checker";
- homepage = http://klinkstatus.kdewebdev.org;
- };
-}
diff --git a/pkgs/desktops/kde-4.14/kdewebdev/kommander.nix b/pkgs/desktops/kde-4.14/kdewebdev/kommander.nix
deleted file mode 100644
index d5f4337f714d..000000000000
--- a/pkgs/desktops/kde-4.14/kdewebdev/kommander.nix
+++ /dev/null
@@ -1,9 +0,0 @@
-{ kde, kdelibs }:
-
-kde {
- buildInputs = [ kdelibs ];
-
- meta = {
- description = "A graphical editor of scripted dialogs";
- };
-}
diff --git a/pkgs/desktops/kde-4.14/oxygen-icons.nix b/pkgs/desktops/kde-4.14/oxygen-icons.nix
deleted file mode 100644
index 270707f84928..000000000000
--- a/pkgs/desktops/kde-4.14/oxygen-icons.nix
+++ /dev/null
@@ -1,15 +0,0 @@
-{ kde, cmake }:
-
-kde {
- outputHashAlgo = "sha256";
- outputHashMode = "recursive";
- outputHash = "156ghknzdrlf48602lcap5vpp691cyba0igdbw53wfqfpaqkap28";
-
- nativeBuildInputs = [ cmake ];
-
- meta = {
- description = "KDE Oxygen theme icons";
- longDescription = "Icons for KDE's default theme";
- license = "GPL";
- };
-}
diff --git a/pkgs/desktops/kde-4.14/support/akonadi/default.nix b/pkgs/desktops/kde-4.14/support/akonadi/default.nix
index 5238744cc7b9..ecfb4913a429 100644
--- a/pkgs/desktops/kde-4.14/support/akonadi/default.nix
+++ b/pkgs/desktops/kde-4.14/support/akonadi/default.nix
@@ -18,7 +18,7 @@ stdenv.mkDerivation rec {
description = "KDE PIM Storage Service";
license = "LGPL";
homepage = http://pim.kde.org/akonadi;
- maintainers = [ maintainers.sander maintainers.urkud maintainers.phreedom ];
+ maintainers = [ maintainers.sander maintainers.phreedom ];
platforms = platforms.linux;
};
}
diff --git a/pkgs/desktops/kde-5/applications/default.nix b/pkgs/desktops/kde-5/applications/default.nix
deleted file mode 100644
index 228d9443f6de..000000000000
--- a/pkgs/desktops/kde-5/applications/default.nix
+++ /dev/null
@@ -1,92 +0,0 @@
-/*
-
-# New packages
-
-READ THIS FIRST
-
-This module is for official packages in the KDE Applications Bundle. All
-available packages are listed in `./srcs.nix`, although some are not yet
-packaged in Nixpkgs (see below).
-
-IF YOUR PACKAGE IS NOT LISTED IN `./srcs.nix`, IT DOES NOT GO HERE.
-
-Many of the packages released upstream are not yet built in Nixpkgs due to lack
-of demand. To add a Nixpkgs build for an upstream package, copy one of the
-existing packages here and modify it as necessary. A simple example package that
-still shows most of the available features is in `./gwenview.nix`.
-
-# Updates
-
-1. Update the URL in `./fetch.sh`.
-2. Run `./maintainers/scripts/fetch-kde-qt.sh pkgs/desktops/kde-5/applications`
- from the top of the Nixpkgs tree.
-3. Invoke `nix-build -A kde5` and ensure that everything builds.
-4. Commit the changes and open a pull request.
-
-*/
-
-{ pkgs, debug ? false }:
-
-let
-
- inherit (pkgs) lib stdenv;
-
- mirror = "mirror://kde";
- srcs = import ./srcs.nix { inherit (pkgs) fetchurl; inherit mirror; };
-
- packages = self: with self; {
-
- kdeApp = import ./kde-app.nix {
- inherit lib;
- inherit debug srcs;
- inherit kdeDerivation;
- };
-
- kdelibs = callPackage ./kdelibs {
- inherit (srcs.kdelibs) src version;
- inherit (pkgs) attica phonon;
- };
-
- akonadi = callPackage ./akonadi.nix {};
- akonadi-contacts = callPackage ./akonadi-contacts.nix {};
- akonadi-mime = callPackage ./akonadi-mime.nix {};
- ark = callPackage ./ark/default.nix {};
- baloo-widgets = callPackage ./baloo-widgets.nix {};
- dolphin = callPackage ./dolphin.nix {};
- dolphin-plugins = callPackage ./dolphin-plugins.nix {};
- ffmpegthumbs = callPackage ./ffmpegthumbs.nix {
- ffmpeg = pkgs.ffmpeg_2;
- };
- filelight = callPackage ./filelight.nix {};
- gwenview = callPackage ./gwenview.nix {};
- kate = callPackage ./kate.nix {};
- kdenlive = callPackage ./kdenlive.nix {};
- kcalc = callPackage ./kcalc.nix {};
- kcolorchooser = callPackage ./kcolorchooser.nix {};
- kcontacts = callPackage ./kcontacts.nix {};
- kdegraphics-mobipocket = callPackage ./kdegraphics-mobipocket.nix {};
- kdegraphics-thumbnailers = callPackage ./kdegraphics-thumbnailers.nix {};
- kdenetwork-filesharing = callPackage ./kdenetwork-filesharing.nix {};
- kdf = callPackage ./kdf.nix {};
- kgpg = callPackage ./kgpg.nix {};
- khelpcenter = callPackage ./khelpcenter.nix {};
- kio-extras = callPackage ./kio-extras.nix {};
- kmime = callPackage ./kmime.nix {};
- kmix = callPackage ./kmix.nix {};
- kompare = callPackage ./kompare.nix {};
- konsole = callPackage ./konsole.nix {};
- kwalletmanager = callPackage ./kwalletmanager.nix {};
- libkdcraw = callPackage ./libkdcraw.nix {};
- libkexiv2 = callPackage ./libkexiv2.nix {};
- libkipi = callPackage ./libkipi.nix {};
- libkomparediff2 = callPackage ./libkomparediff2.nix {};
- marble = callPackage ./marble.nix {};
- okteta = callPackage ./okteta.nix {};
- okular = callPackage ./okular.nix {};
- print-manager = callPackage ./print-manager.nix {};
- spectacle = callPackage ./spectacle.nix {};
-
- l10n = pkgs.recurseIntoAttrs (import ./l10n.nix { inherit callPackage lib pkgs; });
- };
-
-in packages
diff --git a/pkgs/desktops/kde-5/applications/fetch.sh b/pkgs/desktops/kde-5/applications/fetch.sh
deleted file mode 100644
index 607a16eb45b1..000000000000
--- a/pkgs/desktops/kde-5/applications/fetch.sh
+++ /dev/null
@@ -1 +0,0 @@
-WGET_ARGS=( http://download.kde.org/stable/applications/16.12.2/ -A '*.tar.xz' )
diff --git a/pkgs/desktops/kde-5/applications/libkomparediff2.nix b/pkgs/desktops/kde-5/applications/libkomparediff2.nix
deleted file mode 100644
index 91b469fed3c7..000000000000
--- a/pkgs/desktops/kde-5/applications/libkomparediff2.nix
+++ /dev/null
@@ -1,7 +0,0 @@
-{ kdeApp, lib, ecm, ki18n, kxmlgui, kcodecs, kio }:
-
-kdeApp {
- name = "libkomparediff2";
- nativeBuildInputs = [ ecm ];
- propagatedBuildInputs = [ kcodecs ki18n kxmlgui kio ];
-}
diff --git a/pkgs/desktops/kde-5/applications/srcs.nix b/pkgs/desktops/kde-5/applications/srcs.nix
deleted file mode 100644
index 60c412e55fda..000000000000
--- a/pkgs/desktops/kde-5/applications/srcs.nix
+++ /dev/null
@@ -1,2229 +0,0 @@
-# DO NOT EDIT! This file is generated automatically by fetch-kde-qt.sh
-{ fetchurl, mirror }:
-
-{
- akonadi = {
- version = "16.12.2";
- src = fetchurl {
- url = "${mirror}/stable/applications/16.12.2/src/akonadi-16.12.2.tar.xz";
- sha256 = "1csaa69n65d3cnkajzk5702vxskfaiajvxw724s17a5y6sgk0h5z";
- name = "akonadi-16.12.2.tar.xz";
- };
- };
- akonadi-calendar = {
- version = "16.12.2";
- src = fetchurl {
- url = "${mirror}/stable/applications/16.12.2/src/akonadi-calendar-16.12.2.tar.xz";
- sha256 = "1qfkwmh82l5ahzjpsla9gwwk2kqxv773ddq8f5h52qlxx56agc6k";
- name = "akonadi-calendar-16.12.2.tar.xz";
- };
- };
- akonadi-calendar-tools = {
- version = "16.12.2";
- src = fetchurl {
- url = "${mirror}/stable/applications/16.12.2/src/akonadi-calendar-tools-16.12.2.tar.xz";
- sha256 = "1isjvsas6fnz2v2a8yl6ggkimfknr56a3zydwhq59lzcm15hn0hj";
- name = "akonadi-calendar-tools-16.12.2.tar.xz";
- };
- };
- akonadiconsole = {
- version = "16.12.2";
- src = fetchurl {
- url = "${mirror}/stable/applications/16.12.2/src/akonadiconsole-16.12.2.tar.xz";
- sha256 = "188qb2lc6d0xhvq8n5y7ax13a6wz3agg1mx3j2kphwn8f53grgzb";
- name = "akonadiconsole-16.12.2.tar.xz";
- };
- };
- akonadi-contacts = {
- version = "16.12.2";
- src = fetchurl {
- url = "${mirror}/stable/applications/16.12.2/src/akonadi-contacts-16.12.2.tar.xz";
- sha256 = "1ixd1qzakxhq9qlfr6l8igii2ny8fi8hxasdadq9cyr5jl20rpgp";
- name = "akonadi-contacts-16.12.2.tar.xz";
- };
- };
- akonadi-import-wizard = {
- version = "16.12.2";
- src = fetchurl {
- url = "${mirror}/stable/applications/16.12.2/src/akonadi-import-wizard-16.12.2.tar.xz";
- sha256 = "0xdmcs8l0lqqx2f2yabp1xx60h1jcz05q7lk6zzapzc0xqa8pqnq";
- name = "akonadi-import-wizard-16.12.2.tar.xz";
- };
- };
- akonadi-mime = {
- version = "16.12.2";
- src = fetchurl {
- url = "${mirror}/stable/applications/16.12.2/src/akonadi-mime-16.12.2.tar.xz";
- sha256 = "0w88splvk1ci6l590kybb8dgddhk8q0mqag1xxliws534kl9bd0s";
- name = "akonadi-mime-16.12.2.tar.xz";
- };
- };
- akonadi-notes = {
- version = "16.12.2";
- src = fetchurl {
- url = "${mirror}/stable/applications/16.12.2/src/akonadi-notes-16.12.2.tar.xz";
- sha256 = "181d4sv6vqrx0iy5fwdpd28h78i0jy4bj51jxbdn7fqmx1mavbkl";
- name = "akonadi-notes-16.12.2.tar.xz";
- };
- };
- akonadi-search = {
- version = "16.12.2";
- src = fetchurl {
- url = "${mirror}/stable/applications/16.12.2/src/akonadi-search-16.12.2.tar.xz";
- sha256 = "1jfcpjn45cxxnfg9y15fjkig6nfj6w8ggq3a7339kdhb79lkh1p5";
- name = "akonadi-search-16.12.2.tar.xz";
- };
- };
- akregator = {
- version = "16.12.2";
- src = fetchurl {
- url = "${mirror}/stable/applications/16.12.2/src/akregator-16.12.2.tar.xz";
- sha256 = "0yyjpl6kajy0ip60m6vf0jnm217m5ax34a5y14k1wj7civ4fz9il";
- name = "akregator-16.12.2.tar.xz";
- };
- };
- analitza = {
- version = "16.12.2";
- src = fetchurl {
- url = "${mirror}/stable/applications/16.12.2/src/analitza-16.12.2.tar.xz";
- sha256 = "1jii70a2nppfzqlzwrjvawfq2cfjqrcsj0mbpgahb8zphcfs5xhy";
- name = "analitza-16.12.2.tar.xz";
- };
- };
- ark = {
- version = "16.12.2";
- src = fetchurl {
- url = "${mirror}/stable/applications/16.12.2/src/ark-16.12.2.tar.xz";
- sha256 = "07jp25jqnfcx48x7w0wwyldk56czyx2341yf2k73p3fy67rldlr3";
- name = "ark-16.12.2.tar.xz";
- };
- };
- artikulate = {
- version = "16.12.2";
- src = fetchurl {
- url = "${mirror}/stable/applications/16.12.2/src/artikulate-16.12.2.tar.xz";
- sha256 = "11065zl5gdc1q7rvzmjvbz33k9xhdph7ynqwnv628c6a0478xwc5";
- name = "artikulate-16.12.2.tar.xz";
- };
- };
- audiocd-kio = {
- version = "16.12.2";
- src = fetchurl {
- url = "${mirror}/stable/applications/16.12.2/src/audiocd-kio-16.12.2.tar.xz";
- sha256 = "184grq1nfpv9sfcsk6kcx6bdnbh938jc3qr6n00gnnj509347xga";
- name = "audiocd-kio-16.12.2.tar.xz";
- };
- };
- baloo-widgets = {
- version = "16.12.2";
- src = fetchurl {
- url = "${mirror}/stable/applications/16.12.2/src/baloo-widgets-16.12.2.tar.xz";
- sha256 = "000v5s33j6qsdbxqf856si0z5dmh9dan41kf2lrzc017hj6pr34x";
- name = "baloo-widgets-16.12.2.tar.xz";
- };
- };
- blinken = {
- version = "16.12.2";
- src = fetchurl {
- url = "${mirror}/stable/applications/16.12.2/src/blinken-16.12.2.tar.xz";
- sha256 = "1wcl8199wg74cv9hyrhcpqkf1awpf3q960jzgfv0z0c28xywb76x";
- name = "blinken-16.12.2.tar.xz";
- };
- };
- blogilo = {
- version = "16.12.2";
- src = fetchurl {
- url = "${mirror}/stable/applications/16.12.2/src/blogilo-16.12.2.tar.xz";
- sha256 = "0j5mz8nfndr0g99l84s7n3gxrj6y4jbql1srnyl0yspmcjwmnc09";
- name = "blogilo-16.12.2.tar.xz";
- };
- };
- bomber = {
- version = "16.12.2";
- src = fetchurl {
- url = "${mirror}/stable/applications/16.12.2/src/bomber-16.12.2.tar.xz";
- sha256 = "1fy17y5grir6kbr7xzclslrxyip4favhag6wasg9ah60r6k15cqc";
- name = "bomber-16.12.2.tar.xz";
- };
- };
- bovo = {
- version = "16.12.2";
- src = fetchurl {
- url = "${mirror}/stable/applications/16.12.2/src/bovo-16.12.2.tar.xz";
- sha256 = "0dszbxisq172x5jv10w62wg3kcs1f8wdxgw9pjq423j3jq8rw9zq";
- name = "bovo-16.12.2.tar.xz";
- };
- };
- calendarsupport = {
- version = "16.12.2";
- src = fetchurl {
- url = "${mirror}/stable/applications/16.12.2/src/calendarsupport-16.12.2.tar.xz";
- sha256 = "065h09kq6h2hr4lg34lqckw0g91zkhxpviagdgymx7qpdy36l2sb";
- name = "calendarsupport-16.12.2.tar.xz";
- };
- };
- cantor = {
- version = "16.12.2";
- src = fetchurl {
- url = "${mirror}/stable/applications/16.12.2/src/cantor-16.12.2.tar.xz";
- sha256 = "055sxyl2x2mipnidrsgkmbjy4vw64pf5k0fql64p7pjhknn3i6x4";
- name = "cantor-16.12.2.tar.xz";
- };
- };
- cervisia = {
- version = "16.12.2";
- src = fetchurl {
- url = "${mirror}/stable/applications/16.12.2/src/cervisia-16.12.2.tar.xz";
- sha256 = "1fdnvdp27wa8pni4vq501ajdln6dmg2kc0468x1c375g734npabx";
- name = "cervisia-16.12.2.tar.xz";
- };
- };
- dolphin = {
- version = "16.12.2";
- src = fetchurl {
- url = "${mirror}/stable/applications/16.12.2/src/dolphin-16.12.2.tar.xz";
- sha256 = "1xqkrkhpcxcrrk3msd7fkhqikwrx2mjd0c4cna2iwd0s4h7ahmy6";
- name = "dolphin-16.12.2.tar.xz";
- };
- };
- dolphin-plugins = {
- version = "16.12.2";
- src = fetchurl {
- url = "${mirror}/stable/applications/16.12.2/src/dolphin-plugins-16.12.2.tar.xz";
- sha256 = "07i4w95b20db51bzg0rnx6m3dgk2bz5nwivz6zngfiiksmb39dj3";
- name = "dolphin-plugins-16.12.2.tar.xz";
- };
- };
- dragon = {
- version = "16.12.2";
- src = fetchurl {
- url = "${mirror}/stable/applications/16.12.2/src/dragon-16.12.2.tar.xz";
- sha256 = "07iip379kpwy8yfiwacykkgzj7bfw2nz3vij61q68lr64k5sg4kk";
- name = "dragon-16.12.2.tar.xz";
- };
- };
- eventviews = {
- version = "16.12.2";
- src = fetchurl {
- url = "${mirror}/stable/applications/16.12.2/src/eventviews-16.12.2.tar.xz";
- sha256 = "1hl0adi0ss533mnncyih3y9075i90accklbk8068dvxb7la9b7zd";
- name = "eventviews-16.12.2.tar.xz";
- };
- };
- ffmpegthumbs = {
- version = "16.12.2";
- src = fetchurl {
- url = "${mirror}/stable/applications/16.12.2/src/ffmpegthumbs-16.12.2.tar.xz";
- sha256 = "0p1fqxqcgz3k910acacr86pa66yl5d65wxf93nlg4627dfhmrbkc";
- name = "ffmpegthumbs-16.12.2.tar.xz";
- };
- };
- filelight = {
- version = "16.12.2";
- src = fetchurl {
- url = "${mirror}/stable/applications/16.12.2/src/filelight-16.12.2.tar.xz";
- sha256 = "0ynqnagyrn61gzvi0rl38200yxbxa2zpch3cl917wff527kjd7cw";
- name = "filelight-16.12.2.tar.xz";
- };
- };
- granatier = {
- version = "16.12.2";
- src = fetchurl {
- url = "${mirror}/stable/applications/16.12.2/src/granatier-16.12.2.tar.xz";
- sha256 = "01b0nvfj5v2spaml003bpd4f5snncxsilfplwgb06kf8wwsb9mzd";
- name = "granatier-16.12.2.tar.xz";
- };
- };
- grantlee-editor = {
- version = "16.12.2";
- src = fetchurl {
- url = "${mirror}/stable/applications/16.12.2/src/grantlee-editor-16.12.2.tar.xz";
- sha256 = "16r1f7vwsqfngv3kld4wqmvxn4pnxgcpiaaxa2z9szsjfrz10bp9";
- name = "grantlee-editor-16.12.2.tar.xz";
- };
- };
- grantleetheme = {
- version = "16.12.2";
- src = fetchurl {
- url = "${mirror}/stable/applications/16.12.2/src/grantleetheme-16.12.2.tar.xz";
- sha256 = "09qr7icbkq4my594xkjkydkfwx8sixbc73i3gxjnki64w549gan2";
- name = "grantleetheme-16.12.2.tar.xz";
- };
- };
- gwenview = {
- version = "16.12.2";
- src = fetchurl {
- url = "${mirror}/stable/applications/16.12.2/src/gwenview-16.12.2.tar.xz";
- sha256 = "1ldflh10b34r9xy8a8yh72jcjdxs3ylhyjhs97xcg381q4dyg1dr";
- name = "gwenview-16.12.2.tar.xz";
- };
- };
- incidenceeditor = {
- version = "16.12.2";
- src = fetchurl {
- url = "${mirror}/stable/applications/16.12.2/src/incidenceeditor-16.12.2.tar.xz";
- sha256 = "0z8ysrdkxfkn71anlzifd0dxh6fysl924jh4wjsphb4dnb417rym";
- name = "incidenceeditor-16.12.2.tar.xz";
- };
- };
- jovie = {
- version = "16.12.2";
- src = fetchurl {
- url = "${mirror}/stable/applications/16.12.2/src/jovie-16.12.2.tar.xz";
- sha256 = "19ifp3p02ayka2zqnwfq381mjqpxhm0hydf1yx9lh2p8n6j9s4gy";
- name = "jovie-16.12.2.tar.xz";
- };
- };
- juk = {
- version = "16.12.2";
- src = fetchurl {
- url = "${mirror}/stable/applications/16.12.2/src/juk-16.12.2.tar.xz";
- sha256 = "1453s0zxagqmx91f3x7fqrb6xdlgzr2sqj6hcj2pgl6jaz2x3n1c";
- name = "juk-16.12.2.tar.xz";
- };
- };
- kaccessible = {
- version = "16.12.2";
- src = fetchurl {
- url = "${mirror}/stable/applications/16.12.2/src/kaccessible-16.12.2.tar.xz";
- sha256 = "1ibh2nw4bdnj1ll8qp3d3vkwvzdkv2k53n98p9282w3jhckpiq5r";
- name = "kaccessible-16.12.2.tar.xz";
- };
- };
- kaccounts-integration = {
- version = "16.12.2";
- src = fetchurl {
- url = "${mirror}/stable/applications/16.12.2/src/kaccounts-integration-16.12.2.tar.xz";
- sha256 = "0nx9wlh7arjqz0wf2zyaj3fwzm7sn38hn00m74mj7zvxr1pwcypv";
- name = "kaccounts-integration-16.12.2.tar.xz";
- };
- };
- kaccounts-providers = {
- version = "16.12.2";
- src = fetchurl {
- url = "${mirror}/stable/applications/16.12.2/src/kaccounts-providers-16.12.2.tar.xz";
- sha256 = "0dln1l44bzaw782qjc57w2hgydbqzn4g7xh8d93qq52yz8ph875g";
- name = "kaccounts-providers-16.12.2.tar.xz";
- };
- };
- kaddressbook = {
- version = "16.12.2";
- src = fetchurl {
- url = "${mirror}/stable/applications/16.12.2/src/kaddressbook-16.12.2.tar.xz";
- sha256 = "023mfnin8si234yczhhfm3nk083w8bixg1b3gr8bzc1x92ka93m2";
- name = "kaddressbook-16.12.2.tar.xz";
- };
- };
- kajongg = {
- version = "16.12.2";
- src = fetchurl {
- url = "${mirror}/stable/applications/16.12.2/src/kajongg-16.12.2.tar.xz";
- sha256 = "0909hzwj8yf6sv97r2rgzbp8l7ixlxxy8nwy8dcv471dznlvqznn";
- name = "kajongg-16.12.2.tar.xz";
- };
- };
- kalarm = {
- version = "16.12.2";
- src = fetchurl {
- url = "${mirror}/stable/applications/16.12.2/src/kalarm-16.12.2.tar.xz";
- sha256 = "1znp4lym95jz93wwn1nrw9q8nkbwg7x489iccndrv4pl93jfsnqk";
- name = "kalarm-16.12.2.tar.xz";
- };
- };
- kalarmcal = {
- version = "16.12.2";
- src = fetchurl {
- url = "${mirror}/stable/applications/16.12.2/src/kalarmcal-16.12.2.tar.xz";
- sha256 = "06rx33hdwz940cggr5rg6g1gh84yzz6vrnvk5lrgr8vxqgrssp3s";
- name = "kalarmcal-16.12.2.tar.xz";
- };
- };
- kalgebra = {
- version = "16.12.2";
- src = fetchurl {
- url = "${mirror}/stable/applications/16.12.2/src/kalgebra-16.12.2.tar.xz";
- sha256 = "02yykjrsa01r697bk4jsly7762hvml7f67gy33vgywhh8lz3h3cd";
- name = "kalgebra-16.12.2.tar.xz";
- };
- };
- kalzium = {
- version = "16.12.2";
- src = fetchurl {
- url = "${mirror}/stable/applications/16.12.2/src/kalzium-16.12.2.tar.xz";
- sha256 = "043prql6bwg2ka6y0inh8h46y7d5060b0h2inw0lhm49vizgkmsh";
- name = "kalzium-16.12.2.tar.xz";
- };
- };
- kamera = {
- version = "16.12.2";
- src = fetchurl {
- url = "${mirror}/stable/applications/16.12.2/src/kamera-16.12.2.tar.xz";
- sha256 = "1kxmjpk0vdj9s3kxgcp2vw8dpx4r69j3jwifyvzrh06sg9z0bnqd";
- name = "kamera-16.12.2.tar.xz";
- };
- };
- kanagram = {
- version = "16.12.2";
- src = fetchurl {
- url = "${mirror}/stable/applications/16.12.2/src/kanagram-16.12.2.tar.xz";
- sha256 = "09d20x0z066pgkwp25ig49v78k89nyxs769a3zjmq1y490nm34y1";
- name = "kanagram-16.12.2.tar.xz";
- };
- };
- kapman = {
- version = "16.12.2";
- src = fetchurl {
- url = "${mirror}/stable/applications/16.12.2/src/kapman-16.12.2.tar.xz";
- sha256 = "0g9swdgz8sd49q3sw2107b50ww978nppzp1b7bkv7ygiz49p28bq";
- name = "kapman-16.12.2.tar.xz";
- };
- };
- kapptemplate = {
- version = "16.12.2";
- src = fetchurl {
- url = "${mirror}/stable/applications/16.12.2/src/kapptemplate-16.12.2.tar.xz";
- sha256 = "1agpq16wxbzd7crgbj1cj60alqv090dkvxi2szg054bmks82j6rc";
- name = "kapptemplate-16.12.2.tar.xz";
- };
- };
- kate = {
- version = "16.12.2";
- src = fetchurl {
- url = "${mirror}/stable/applications/16.12.2/src/kate-16.12.2.tar.xz";
- sha256 = "1hkqzidd2cfp3wg7pq47ymsw1dh26qwn4cybnxw23d95ss85wx2p";
- name = "kate-16.12.2.tar.xz";
- };
- };
- katomic = {
- version = "16.12.2";
- src = fetchurl {
- url = "${mirror}/stable/applications/16.12.2/src/katomic-16.12.2.tar.xz";
- sha256 = "1sgi8npzq3p7qwv3c4q8ji83gp33zxb0i19dx2i6rb45lir3lj68";
- name = "katomic-16.12.2.tar.xz";
- };
- };
- kblackbox = {
- version = "16.12.2";
- src = fetchurl {
- url = "${mirror}/stable/applications/16.12.2/src/kblackbox-16.12.2.tar.xz";
- sha256 = "1cv5kqyqspiz0aaamnyq37s683m2iw27ma6yf3blm5f9g1r43n2k";
- name = "kblackbox-16.12.2.tar.xz";
- };
- };
- kblocks = {
- version = "16.12.2";
- src = fetchurl {
- url = "${mirror}/stable/applications/16.12.2/src/kblocks-16.12.2.tar.xz";
- sha256 = "1xd5pxpi97nmrp4xglhm2qfpz8ksv8vyq4wrv25qbgvfc8jis790";
- name = "kblocks-16.12.2.tar.xz";
- };
- };
- kblog = {
- version = "16.12.2";
- src = fetchurl {
- url = "${mirror}/stable/applications/16.12.2/src/kblog-16.12.2.tar.xz";
- sha256 = "001mqvahsmf4amxqmz2ah5chlgpp2zi8g4pcg83qb9d65cvr6877";
- name = "kblog-16.12.2.tar.xz";
- };
- };
- kbounce = {
- version = "16.12.2";
- src = fetchurl {
- url = "${mirror}/stable/applications/16.12.2/src/kbounce-16.12.2.tar.xz";
- sha256 = "1gsrafcjk55lbxi2mx382hj2lahlgnn3pv13ldi7zh6ms4sms1wm";
- name = "kbounce-16.12.2.tar.xz";
- };
- };
- kbreakout = {
- version = "16.12.2";
- src = fetchurl {
- url = "${mirror}/stable/applications/16.12.2/src/kbreakout-16.12.2.tar.xz";
- sha256 = "0lwwz17ynhdi6qw76yih8an6p890w8gwh1khsr8casc1wlm04s0y";
- name = "kbreakout-16.12.2.tar.xz";
- };
- };
- kbruch = {
- version = "16.12.2";
- src = fetchurl {
- url = "${mirror}/stable/applications/16.12.2/src/kbruch-16.12.2.tar.xz";
- sha256 = "1n119nkm0385pv8pngsbwxd56v6y6pwh0rshbk0ryd7974i2z4mi";
- name = "kbruch-16.12.2.tar.xz";
- };
- };
- kcachegrind = {
- version = "16.12.2";
- src = fetchurl {
- url = "${mirror}/stable/applications/16.12.2/src/kcachegrind-16.12.2.tar.xz";
- sha256 = "0wcizav1z3n31n7qcc05mx42vl2rv71c7haaa8vn0ma39rj4iaqv";
- name = "kcachegrind-16.12.2.tar.xz";
- };
- };
- kcalc = {
- version = "16.12.2";
- src = fetchurl {
- url = "${mirror}/stable/applications/16.12.2/src/kcalc-16.12.2.tar.xz";
- sha256 = "07lyssmkq34ym1w3ajm1vf4f57xv2h8y2zb039vj7gdx609syaq0";
- name = "kcalc-16.12.2.tar.xz";
- };
- };
- kcalcore = {
- version = "16.12.2";
- src = fetchurl {
- url = "${mirror}/stable/applications/16.12.2/src/kcalcore-16.12.2.tar.xz";
- sha256 = "1lq5shp8jwy490qx0rnc0sd67976r7j3sblzw0j5hn95k8n23hzd";
- name = "kcalcore-16.12.2.tar.xz";
- };
- };
- kcalutils = {
- version = "16.12.2";
- src = fetchurl {
- url = "${mirror}/stable/applications/16.12.2/src/kcalutils-16.12.2.tar.xz";
- sha256 = "1sf5f8mwjdi2d8lpkrprnqc9jkj72p6mdz3pbczmixgfy7d7y4ci";
- name = "kcalutils-16.12.2.tar.xz";
- };
- };
- kcharselect = {
- version = "16.12.2";
- src = fetchurl {
- url = "${mirror}/stable/applications/16.12.2/src/kcharselect-16.12.2.tar.xz";
- sha256 = "0a5cmc6n9h8h64in68qdi8bmqx341fvm8vf98vcqn5sivwwnflhc";
- name = "kcharselect-16.12.2.tar.xz";
- };
- };
- kcolorchooser = {
- version = "16.12.2";
- src = fetchurl {
- url = "${mirror}/stable/applications/16.12.2/src/kcolorchooser-16.12.2.tar.xz";
- sha256 = "07psjid00bjw0s6xx2hq96f8cj2axdsr7lqvgrclksa07lphzcvm";
- name = "kcolorchooser-16.12.2.tar.xz";
- };
- };
- kcontacts = {
- version = "16.12.2";
- src = fetchurl {
- url = "${mirror}/stable/applications/16.12.2/src/kcontacts-16.12.2.tar.xz";
- sha256 = "18z7894xh1ifkg177xxy41n61djcy07m8a39favbpab0ya1xk81l";
- name = "kcontacts-16.12.2.tar.xz";
- };
- };
- kcron = {
- version = "16.12.2";
- src = fetchurl {
- url = "${mirror}/stable/applications/16.12.2/src/kcron-16.12.2.tar.xz";
- sha256 = "1z72wcrr8ggw89ivq70v98zwg1hw3sn5l5czpq00scqpaf8664g2";
- name = "kcron-16.12.2.tar.xz";
- };
- };
- kdebugsettings = {
- version = "16.12.2";
- src = fetchurl {
- url = "${mirror}/stable/applications/16.12.2/src/kdebugsettings-16.12.2.tar.xz";
- sha256 = "1zbmvn9c1sjjxiskivl0s4mpmh52hqj7921v2bac7bvqd2hkc5cv";
- name = "kdebugsettings-16.12.2.tar.xz";
- };
- };
- kde-dev-scripts = {
- version = "16.12.2";
- src = fetchurl {
- url = "${mirror}/stable/applications/16.12.2/src/kde-dev-scripts-16.12.2.tar.xz";
- sha256 = "0l4sbzpnczixavyppc3swb09jna44rb61awwgh37ngsz97iza3sx";
- name = "kde-dev-scripts-16.12.2.tar.xz";
- };
- };
- kde-dev-utils = {
- version = "16.12.2";
- src = fetchurl {
- url = "${mirror}/stable/applications/16.12.2/src/kde-dev-utils-16.12.2.tar.xz";
- sha256 = "0fhf9w5v355jsrr25yhj612gi0qh8kvrbfdfplns04q7viycn44f";
- name = "kde-dev-utils-16.12.2.tar.xz";
- };
- };
- kdeedu-data = {
- version = "16.12.2";
- src = fetchurl {
- url = "${mirror}/stable/applications/16.12.2/src/kdeedu-data-16.12.2.tar.xz";
- sha256 = "05jhqasi5h5dl4xlydx6jmn1i81qd8q8bzimhc2f9bwakkhqf73b";
- name = "kdeedu-data-16.12.2.tar.xz";
- };
- };
- kdegraphics-mobipocket = {
- version = "16.12.2";
- src = fetchurl {
- url = "${mirror}/stable/applications/16.12.2/src/kdegraphics-mobipocket-16.12.2.tar.xz";
- sha256 = "07mpm55ipdqq6absvhcsrbc3c9xmb3b5bnl5k852mqpp0v36ijs8";
- name = "kdegraphics-mobipocket-16.12.2.tar.xz";
- };
- };
- kdegraphics-thumbnailers = {
- version = "16.12.2";
- src = fetchurl {
- url = "${mirror}/stable/applications/16.12.2/src/kdegraphics-thumbnailers-16.12.2.tar.xz";
- sha256 = "0asv8wjr5nm5i6zylvhn8qgxvpr79yg681rc6mg1liimimwzxia3";
- name = "kdegraphics-thumbnailers-16.12.2.tar.xz";
- };
- };
- kde-l10n-ar = {
- version = "16.12.2";
- src = fetchurl {
- url = "${mirror}/stable/applications/16.12.2/src/kde-l10n/kde-l10n-ar-16.12.2.tar.xz";
- sha256 = "0an0r2l4vc2sdi4lc2p7iks9gnwasgvxnq81vf3qb40q290x4fim";
- name = "kde-l10n-ar-16.12.2.tar.xz";
- };
- };
- kde-l10n-ast = {
- version = "16.12.2";
- src = fetchurl {
- url = "${mirror}/stable/applications/16.12.2/src/kde-l10n/kde-l10n-ast-16.12.2.tar.xz";
- sha256 = "0fjpypz9w1ic9w75gpp1c71l43x3j8nm37h1bgbqkyik3spxin2l";
- name = "kde-l10n-ast-16.12.2.tar.xz";
- };
- };
- kde-l10n-bg = {
- version = "16.12.2";
- src = fetchurl {
- url = "${mirror}/stable/applications/16.12.2/src/kde-l10n/kde-l10n-bg-16.12.2.tar.xz";
- sha256 = "1iwcs8nz2rfi0b05ypl6mydiw02c64hscy3zlz998nww65x3nks0";
- name = "kde-l10n-bg-16.12.2.tar.xz";
- };
- };
- kde-l10n-bs = {
- version = "16.12.2";
- src = fetchurl {
- url = "${mirror}/stable/applications/16.12.2/src/kde-l10n/kde-l10n-bs-16.12.2.tar.xz";
- sha256 = "0kps4paygx10l2nijwd946wns6sxlgn2771fzv1cmn5h1smffhkn";
- name = "kde-l10n-bs-16.12.2.tar.xz";
- };
- };
- kde-l10n-ca = {
- version = "16.12.2";
- src = fetchurl {
- url = "${mirror}/stable/applications/16.12.2/src/kde-l10n/kde-l10n-ca-16.12.2.tar.xz";
- sha256 = "0r6yccw7fdi2dsz9qf9rccgdmznkc66z5c51asdhrmyzq4x7c7r2";
- name = "kde-l10n-ca-16.12.2.tar.xz";
- };
- };
- kde-l10n-ca_valencia = {
- version = "ca_valencia-16.12.2";
- src = fetchurl {
- url = "${mirror}/stable/applications/16.12.2/src/kde-l10n/kde-l10n-ca@valencia-16.12.2.tar.xz";
- sha256 = "15wpsjzk9z61rpai8dzpzi5j9w57nmhm7fx4b6i5hsr9c4ypmi01";
- name = "kde-l10n-ca_valencia-16.12.2.tar.xz";
- };
- };
- kde-l10n-cs = {
- version = "16.12.2";
- src = fetchurl {
- url = "${mirror}/stable/applications/16.12.2/src/kde-l10n/kde-l10n-cs-16.12.2.tar.xz";
- sha256 = "1z6a3rl7p0wmq6zs8fap052dp5hvlpzxf4xvjxk9c75wl2m9nvlg";
- name = "kde-l10n-cs-16.12.2.tar.xz";
- };
- };
- kde-l10n-da = {
- version = "16.12.2";
- src = fetchurl {
- url = "${mirror}/stable/applications/16.12.2/src/kde-l10n/kde-l10n-da-16.12.2.tar.xz";
- sha256 = "0zi7h0cvzza1ly88821fsl2bnr2vn524rrdqsfc9yj3z1jbpnn2h";
- name = "kde-l10n-da-16.12.2.tar.xz";
- };
- };
- kde-l10n-de = {
- version = "16.12.2";
- src = fetchurl {
- url = "${mirror}/stable/applications/16.12.2/src/kde-l10n/kde-l10n-de-16.12.2.tar.xz";
- sha256 = "0s1c22ad1r0qxpkc878gxz2wqkb52qrn1k753kqpn9105p5l92fh";
- name = "kde-l10n-de-16.12.2.tar.xz";
- };
- };
- kde-l10n-el = {
- version = "16.12.2";
- src = fetchurl {
- url = "${mirror}/stable/applications/16.12.2/src/kde-l10n/kde-l10n-el-16.12.2.tar.xz";
- sha256 = "02d4j12yr4v9apa3iziza611v6cgjf6725wgd41g00pj41p61kcq";
- name = "kde-l10n-el-16.12.2.tar.xz";
- };
- };
- kde-l10n-en_GB = {
- version = "en_GB-16.12.2";
- src = fetchurl {
- url = "${mirror}/stable/applications/16.12.2/src/kde-l10n/kde-l10n-en_GB-16.12.2.tar.xz";
- sha256 = "09h3zsq5qhzyagl8xysv74g2iv26739y02xgbwv5dahv0iln99rs";
- name = "kde-l10n-en_GB-16.12.2.tar.xz";
- };
- };
- kde-l10n-eo = {
- version = "16.12.2";
- src = fetchurl {
- url = "${mirror}/stable/applications/16.12.2/src/kde-l10n/kde-l10n-eo-16.12.2.tar.xz";
- sha256 = "1isqdnnj1g9jxagns3yq611pfd6nbanji9a8igfgm55djj5hx527";
- name = "kde-l10n-eo-16.12.2.tar.xz";
- };
- };
- kde-l10n-es = {
- version = "16.12.2";
- src = fetchurl {
- url = "${mirror}/stable/applications/16.12.2/src/kde-l10n/kde-l10n-es-16.12.2.tar.xz";
- sha256 = "0h3c5an1i072rk9mkc9mc6k3bvlk37slhgl6qy3rs2l77mhhnpyi";
- name = "kde-l10n-es-16.12.2.tar.xz";
- };
- };
- kde-l10n-et = {
- version = "16.12.2";
- src = fetchurl {
- url = "${mirror}/stable/applications/16.12.2/src/kde-l10n/kde-l10n-et-16.12.2.tar.xz";
- sha256 = "0dpkxwpl17pgimx94v67wq90fzdayp6p3wcz7y0g8b0hn3bsbidj";
- name = "kde-l10n-et-16.12.2.tar.xz";
- };
- };
- kde-l10n-eu = {
- version = "16.12.2";
- src = fetchurl {
- url = "${mirror}/stable/applications/16.12.2/src/kde-l10n/kde-l10n-eu-16.12.2.tar.xz";
- sha256 = "0q7l5s502ayr2vfa4ysvk4c6k5i8y5ci6yb34mm3lpwlain3bssb";
- name = "kde-l10n-eu-16.12.2.tar.xz";
- };
- };
- kde-l10n-fa = {
- version = "16.12.2";
- src = fetchurl {
- url = "${mirror}/stable/applications/16.12.2/src/kde-l10n/kde-l10n-fa-16.12.2.tar.xz";
- sha256 = "03qvv814kvddf24fjvg55pbxaq58kc936b5qwbddxjr05n1dy964";
- name = "kde-l10n-fa-16.12.2.tar.xz";
- };
- };
- kde-l10n-fi = {
- version = "16.12.2";
- src = fetchurl {
- url = "${mirror}/stable/applications/16.12.2/src/kde-l10n/kde-l10n-fi-16.12.2.tar.xz";
- sha256 = "0902bbyi10vpn0qn0xn46p8fy98kaa4cvlgnn4cb2dgp8q3kni8j";
- name = "kde-l10n-fi-16.12.2.tar.xz";
- };
- };
- kde-l10n-fr = {
- version = "16.12.2";
- src = fetchurl {
- url = "${mirror}/stable/applications/16.12.2/src/kde-l10n/kde-l10n-fr-16.12.2.tar.xz";
- sha256 = "0zjlryvyq8z2llrba4hp3awz5hq74b6z21wp2x86g4k6y154i0as";
- name = "kde-l10n-fr-16.12.2.tar.xz";
- };
- };
- kde-l10n-ga = {
- version = "16.12.2";
- src = fetchurl {
- url = "${mirror}/stable/applications/16.12.2/src/kde-l10n/kde-l10n-ga-16.12.2.tar.xz";
- sha256 = "1gwd4r28qv5sh4r008nq5mdzzb8cwq8dg17r19l3syydxxhjlf86";
- name = "kde-l10n-ga-16.12.2.tar.xz";
- };
- };
- kde-l10n-gl = {
- version = "16.12.2";
- src = fetchurl {
- url = "${mirror}/stable/applications/16.12.2/src/kde-l10n/kde-l10n-gl-16.12.2.tar.xz";
- sha256 = "1jka29dh5aqdzgmqc9rf3lmrq4mm4vahhsk2klhp12ajzp9dgg70";
- name = "kde-l10n-gl-16.12.2.tar.xz";
- };
- };
- kde-l10n-he = {
- version = "16.12.2";
- src = fetchurl {
- url = "${mirror}/stable/applications/16.12.2/src/kde-l10n/kde-l10n-he-16.12.2.tar.xz";
- sha256 = "0g87g0mpa3i59fk4fm5hk2z54s07cy9niy2kal50fbm5lnr7czfk";
- name = "kde-l10n-he-16.12.2.tar.xz";
- };
- };
- kde-l10n-hi = {
- version = "16.12.2";
- src = fetchurl {
- url = "${mirror}/stable/applications/16.12.2/src/kde-l10n/kde-l10n-hi-16.12.2.tar.xz";
- sha256 = "05q608wic0ssx0d14n39s786k8xw86hc560ywfs3k89v973nba5b";
- name = "kde-l10n-hi-16.12.2.tar.xz";
- };
- };
- kde-l10n-hr = {
- version = "16.12.2";
- src = fetchurl {
- url = "${mirror}/stable/applications/16.12.2/src/kde-l10n/kde-l10n-hr-16.12.2.tar.xz";
- sha256 = "0sm7ba6x3hgw1ml6qm00g9dfi56w2kx3pk37944l3r4jx2wdqs4f";
- name = "kde-l10n-hr-16.12.2.tar.xz";
- };
- };
- kde-l10n-hu = {
- version = "16.12.2";
- src = fetchurl {
- url = "${mirror}/stable/applications/16.12.2/src/kde-l10n/kde-l10n-hu-16.12.2.tar.xz";
- sha256 = "1qcdqm6wjcgd5br99mm93lwlaxk5dvrliyj1ff4bxfxx0cabhx2g";
- name = "kde-l10n-hu-16.12.2.tar.xz";
- };
- };
- kde-l10n-ia = {
- version = "16.12.2";
- src = fetchurl {
- url = "${mirror}/stable/applications/16.12.2/src/kde-l10n/kde-l10n-ia-16.12.2.tar.xz";
- sha256 = "0r1fryhi4czgbl1r228zry0msk11s075y15i4flznwdps99s5q8c";
- name = "kde-l10n-ia-16.12.2.tar.xz";
- };
- };
- kde-l10n-id = {
- version = "16.12.2";
- src = fetchurl {
- url = "${mirror}/stable/applications/16.12.2/src/kde-l10n/kde-l10n-id-16.12.2.tar.xz";
- sha256 = "1lz51bilx8dziiff65l91pknif9w7390q3l9amdlcjq86cj44khz";
- name = "kde-l10n-id-16.12.2.tar.xz";
- };
- };
- kde-l10n-is = {
- version = "16.12.2";
- src = fetchurl {
- url = "${mirror}/stable/applications/16.12.2/src/kde-l10n/kde-l10n-is-16.12.2.tar.xz";
- sha256 = "08bqhxppib360ywzmphjqx5yalzr3bgwpqkff79rl5ffq9dd4psv";
- name = "kde-l10n-is-16.12.2.tar.xz";
- };
- };
- kde-l10n-it = {
- version = "16.12.2";
- src = fetchurl {
- url = "${mirror}/stable/applications/16.12.2/src/kde-l10n/kde-l10n-it-16.12.2.tar.xz";
- sha256 = "12k9vqdr2nrcqh535crylxrmznndx7bkwz68vrdvqidlabd0ci7m";
- name = "kde-l10n-it-16.12.2.tar.xz";
- };
- };
- kde-l10n-ja = {
- version = "16.12.2";
- src = fetchurl {
- url = "${mirror}/stable/applications/16.12.2/src/kde-l10n/kde-l10n-ja-16.12.2.tar.xz";
- sha256 = "0i9hc66qlnq0yij9d3754m5wa2wkra95wcdbp6xwk82ws7lkckai";
- name = "kde-l10n-ja-16.12.2.tar.xz";
- };
- };
- kde-l10n-kk = {
- version = "16.12.2";
- src = fetchurl {
- url = "${mirror}/stable/applications/16.12.2/src/kde-l10n/kde-l10n-kk-16.12.2.tar.xz";
- sha256 = "1h9scz1z046szxf54702w3wzlsvzr8016rx9fwg7z5fc1vpkhxxn";
- name = "kde-l10n-kk-16.12.2.tar.xz";
- };
- };
- kde-l10n-km = {
- version = "16.12.2";
- src = fetchurl {
- url = "${mirror}/stable/applications/16.12.2/src/kde-l10n/kde-l10n-km-16.12.2.tar.xz";
- sha256 = "09vw686y9qdx09cz58d11ldqz5bsnch1sx2dsbxvp1drypb1nhxk";
- name = "kde-l10n-km-16.12.2.tar.xz";
- };
- };
- kde-l10n-ko = {
- version = "16.12.2";
- src = fetchurl {
- url = "${mirror}/stable/applications/16.12.2/src/kde-l10n/kde-l10n-ko-16.12.2.tar.xz";
- sha256 = "1q9kla2djqsvkj773wybxb1lds50v0lg3jkfpnrg2pvm49jl2c9g";
- name = "kde-l10n-ko-16.12.2.tar.xz";
- };
- };
- kde-l10n-lt = {
- version = "16.12.2";
- src = fetchurl {
- url = "${mirror}/stable/applications/16.12.2/src/kde-l10n/kde-l10n-lt-16.12.2.tar.xz";
- sha256 = "1i6nzmqm1sl895x7hnsk9snw2ci8cbdvswdfbvllqivcd8l4vmg5";
- name = "kde-l10n-lt-16.12.2.tar.xz";
- };
- };
- kde-l10n-lv = {
- version = "16.12.2";
- src = fetchurl {
- url = "${mirror}/stable/applications/16.12.2/src/kde-l10n/kde-l10n-lv-16.12.2.tar.xz";
- sha256 = "0why1sa09pd7pwwa57c27y969ijgmjsmni8x7n9gxx5w0317kq9d";
- name = "kde-l10n-lv-16.12.2.tar.xz";
- };
- };
- kde-l10n-mr = {
- version = "16.12.2";
- src = fetchurl {
- url = "${mirror}/stable/applications/16.12.2/src/kde-l10n/kde-l10n-mr-16.12.2.tar.xz";
- sha256 = "0wkncbs5di9vlcfqbc8g4msp6kp926049jlkj4jhvgj1in434ay8";
- name = "kde-l10n-mr-16.12.2.tar.xz";
- };
- };
- kde-l10n-nb = {
- version = "16.12.2";
- src = fetchurl {
- url = "${mirror}/stable/applications/16.12.2/src/kde-l10n/kde-l10n-nb-16.12.2.tar.xz";
- sha256 = "0p9yq33jzh83c1471072p94mrx8jazrinb987ifrl5lk8m54k34z";
- name = "kde-l10n-nb-16.12.2.tar.xz";
- };
- };
- kde-l10n-nds = {
- version = "16.12.2";
- src = fetchurl {
- url = "${mirror}/stable/applications/16.12.2/src/kde-l10n/kde-l10n-nds-16.12.2.tar.xz";
- sha256 = "1yb7axm4k1rlfp41s9q8ql7l2mjbyrf7ry1ww7c1rprcb93gm7f8";
- name = "kde-l10n-nds-16.12.2.tar.xz";
- };
- };
- kde-l10n-nl = {
- version = "16.12.2";
- src = fetchurl {
- url = "${mirror}/stable/applications/16.12.2/src/kde-l10n/kde-l10n-nl-16.12.2.tar.xz";
- sha256 = "04d75kfxxijb4a7xk5saxz5vbrwfsl2nx0i4x3d4i2k06wzysvch";
- name = "kde-l10n-nl-16.12.2.tar.xz";
- };
- };
- kde-l10n-nn = {
- version = "16.12.2";
- src = fetchurl {
- url = "${mirror}/stable/applications/16.12.2/src/kde-l10n/kde-l10n-nn-16.12.2.tar.xz";
- sha256 = "09vmvvmakcybgy6zl51xj05wflq88xkbjmns4wv42jf0fn4kipif";
- name = "kde-l10n-nn-16.12.2.tar.xz";
- };
- };
- kde-l10n-pa = {
- version = "16.12.2";
- src = fetchurl {
- url = "${mirror}/stable/applications/16.12.2/src/kde-l10n/kde-l10n-pa-16.12.2.tar.xz";
- sha256 = "0nv9pch0s24aamcz8lgbs26kp343kyw0rnz4a7myzcrb8g8sm0d3";
- name = "kde-l10n-pa-16.12.2.tar.xz";
- };
- };
- kde-l10n-pl = {
- version = "16.12.2";
- src = fetchurl {
- url = "${mirror}/stable/applications/16.12.2/src/kde-l10n/kde-l10n-pl-16.12.2.tar.xz";
- sha256 = "1bxhcqwmcfl2srfrn50ib57890m3m6w4x9vwn24qxwapb9s6nzav";
- name = "kde-l10n-pl-16.12.2.tar.xz";
- };
- };
- kde-l10n-pt = {
- version = "16.12.2";
- src = fetchurl {
- url = "${mirror}/stable/applications/16.12.2/src/kde-l10n/kde-l10n-pt-16.12.2.tar.xz";
- sha256 = "02x96cdvrbdcmrhnn4pamsdnr8m530p047avh82xvjvqywsnqf7z";
- name = "kde-l10n-pt-16.12.2.tar.xz";
- };
- };
- kde-l10n-pt_BR = {
- version = "pt_BR-16.12.2";
- src = fetchurl {
- url = "${mirror}/stable/applications/16.12.2/src/kde-l10n/kde-l10n-pt_BR-16.12.2.tar.xz";
- sha256 = "17155laifayfb5c2hznlpnmaa8kwxzlmk7yb2skrf92fzzqx2379";
- name = "kde-l10n-pt_BR-16.12.2.tar.xz";
- };
- };
- kde-l10n-ro = {
- version = "16.12.2";
- src = fetchurl {
- url = "${mirror}/stable/applications/16.12.2/src/kde-l10n/kde-l10n-ro-16.12.2.tar.xz";
- sha256 = "1zsng3m031cbyz1jl5lv1fjg5vb3ig3pk0gaamvxbs6fxaz14ss3";
- name = "kde-l10n-ro-16.12.2.tar.xz";
- };
- };
- kde-l10n-ru = {
- version = "16.12.2";
- src = fetchurl {
- url = "${mirror}/stable/applications/16.12.2/src/kde-l10n/kde-l10n-ru-16.12.2.tar.xz";
- sha256 = "1shs2j4kqqf2b8jz2691yi45f5bpsr9nx2i5j67mmn94dnds4ps6";
- name = "kde-l10n-ru-16.12.2.tar.xz";
- };
- };
- kde-l10n-sk = {
- version = "16.12.2";
- src = fetchurl {
- url = "${mirror}/stable/applications/16.12.2/src/kde-l10n/kde-l10n-sk-16.12.2.tar.xz";
- sha256 = "1397sxczn9jdxbab3d9296w15swc40a8ypa3f4yhckqm4nmr8xn1";
- name = "kde-l10n-sk-16.12.2.tar.xz";
- };
- };
- kde-l10n-sl = {
- version = "16.12.2";
- src = fetchurl {
- url = "${mirror}/stable/applications/16.12.2/src/kde-l10n/kde-l10n-sl-16.12.2.tar.xz";
- sha256 = "1z14sbdk5zdshn36wija4hkj7l825i336bz92rq42f8by4mha0h4";
- name = "kde-l10n-sl-16.12.2.tar.xz";
- };
- };
- kde-l10n-sr = {
- version = "16.12.2";
- src = fetchurl {
- url = "${mirror}/stable/applications/16.12.2/src/kde-l10n/kde-l10n-sr-16.12.2.tar.xz";
- sha256 = "12v6whnydgxxpx9vl3pimnxqny22kfiv51i1r9dk6vfqik18kxzy";
- name = "kde-l10n-sr-16.12.2.tar.xz";
- };
- };
- kde-l10n-sv = {
- version = "16.12.2";
- src = fetchurl {
- url = "${mirror}/stable/applications/16.12.2/src/kde-l10n/kde-l10n-sv-16.12.2.tar.xz";
- sha256 = "10dzz39779lbb5mcnnmhwm86pkwc2g5qyiqg5jzpf0mg1zbl9y3w";
- name = "kde-l10n-sv-16.12.2.tar.xz";
- };
- };
- kde-l10n-tr = {
- version = "16.12.2";
- src = fetchurl {
- url = "${mirror}/stable/applications/16.12.2/src/kde-l10n/kde-l10n-tr-16.12.2.tar.xz";
- sha256 = "0m4rgz7ha2i9bladavc5g3n94kai82ilx8akd2jcxz6q3wb75r0r";
- name = "kde-l10n-tr-16.12.2.tar.xz";
- };
- };
- kde-l10n-ug = {
- version = "16.12.2";
- src = fetchurl {
- url = "${mirror}/stable/applications/16.12.2/src/kde-l10n/kde-l10n-ug-16.12.2.tar.xz";
- sha256 = "1kjdiy92pi5vdxbfy61ckq8j9pc8kmrccfqnlm7yqvh8p5i28p2x";
- name = "kde-l10n-ug-16.12.2.tar.xz";
- };
- };
- kde-l10n-uk = {
- version = "16.12.2";
- src = fetchurl {
- url = "${mirror}/stable/applications/16.12.2/src/kde-l10n/kde-l10n-uk-16.12.2.tar.xz";
- sha256 = "1nhclnwy5lgkzhs6lm8dkhh4957v78rv2d9ss13a1jn2salz5kfv";
- name = "kde-l10n-uk-16.12.2.tar.xz";
- };
- };
- kde-l10n-wa = {
- version = "16.12.2";
- src = fetchurl {
- url = "${mirror}/stable/applications/16.12.2/src/kde-l10n/kde-l10n-wa-16.12.2.tar.xz";
- sha256 = "12f2kvks21hj5gjqjys7fa295148j0ndhxbzs5jysl0zq9y4909j";
- name = "kde-l10n-wa-16.12.2.tar.xz";
- };
- };
- kde-l10n-zh_CN = {
- version = "zh_CN-16.12.2";
- src = fetchurl {
- url = "${mirror}/stable/applications/16.12.2/src/kde-l10n/kde-l10n-zh_CN-16.12.2.tar.xz";
- sha256 = "1v21kap5lyzgygqv02jjx9yrfnkjkk0qrd85l0pjhqjyycs5r97w";
- name = "kde-l10n-zh_CN-16.12.2.tar.xz";
- };
- };
- kde-l10n-zh_TW = {
- version = "zh_TW-16.12.2";
- src = fetchurl {
- url = "${mirror}/stable/applications/16.12.2/src/kde-l10n/kde-l10n-zh_TW-16.12.2.tar.xz";
- sha256 = "049q9d9ykhxk0dkmm4aw7fx1aa39s5cslk4011335jmg1msmrfna";
- name = "kde-l10n-zh_TW-16.12.2.tar.xz";
- };
- };
- kdelibs = {
- version = "4.14.29";
- src = fetchurl {
- url = "${mirror}/stable/applications/16.12.2/src/kdelibs-4.14.29.tar.xz";
- sha256 = "0xvw0cscvz8arclgfhrrbgdg94mz4h9y33nyndlsw67qrbg8slqv";
- name = "kdelibs-4.14.29.tar.xz";
- };
- };
- kdenetwork-filesharing = {
- version = "16.12.2";
- src = fetchurl {
- url = "${mirror}/stable/applications/16.12.2/src/kdenetwork-filesharing-16.12.2.tar.xz";
- sha256 = "0q43c2xim5ibxyib1xz1wfz6bigkmk97bkvy9wrlk869c0qvrcn5";
- name = "kdenetwork-filesharing-16.12.2.tar.xz";
- };
- };
- kdenlive = {
- version = "16.12.2";
- src = fetchurl {
- url = "${mirror}/stable/applications/16.12.2/src/kdenlive-16.12.2.tar.xz";
- sha256 = "116lk641qlx8jkiaxm54g6svc6adg0bilhf634cyc8c46991a8z7";
- name = "kdenlive-16.12.2.tar.xz";
- };
- };
- kdepim-addons = {
- version = "16.12.2";
- src = fetchurl {
- url = "${mirror}/stable/applications/16.12.2/src/kdepim-addons-16.12.2.tar.xz";
- sha256 = "1gi87bbdkj8cwinhicr5r6qxysc5rmylj8gajn0qh99rsyxy52dn";
- name = "kdepim-addons-16.12.2.tar.xz";
- };
- };
- kdepim-apps-libs = {
- version = "16.12.2";
- src = fetchurl {
- url = "${mirror}/stable/applications/16.12.2/src/kdepim-apps-libs-16.12.2.tar.xz";
- sha256 = "07imq7nb1aqan8pbapvqg9mkzj18pj1v9xah9lpi6k64rhh0bkw9";
- name = "kdepim-apps-libs-16.12.2.tar.xz";
- };
- };
- kdepim-runtime = {
- version = "16.12.2";
- src = fetchurl {
- url = "${mirror}/stable/applications/16.12.2/src/kdepim-runtime-16.12.2.tar.xz";
- sha256 = "0wd04zhc7nq2qf8iyjqf036bjs5by0zl0c58hl8r579b7gp5xljz";
- name = "kdepim-runtime-16.12.2.tar.xz";
- };
- };
- kde-runtime = {
- version = "16.12.2";
- src = fetchurl {
- url = "${mirror}/stable/applications/16.12.2/src/kde-runtime-16.12.2.tar.xz";
- sha256 = "1bsnb7inxqv652vq9izwdj02gi15xxf34my51kdq2xk9dn2kmj8x";
- name = "kde-runtime-16.12.2.tar.xz";
- };
- };
- kdesdk-kioslaves = {
- version = "16.12.2";
- src = fetchurl {
- url = "${mirror}/stable/applications/16.12.2/src/kdesdk-kioslaves-16.12.2.tar.xz";
- sha256 = "18wd4lb3v2br40xclsig718r8mqs5hgl7xw13pq5bfqk5kx11md1";
- name = "kdesdk-kioslaves-16.12.2.tar.xz";
- };
- };
- kdesdk-thumbnailers = {
- version = "16.12.2";
- src = fetchurl {
- url = "${mirror}/stable/applications/16.12.2/src/kdesdk-thumbnailers-16.12.2.tar.xz";
- sha256 = "1jjchrbpyxjzs4zv68av53zhnlj46705261p0ad7x9ayb1mdrr24";
- name = "kdesdk-thumbnailers-16.12.2.tar.xz";
- };
- };
- kdf = {
- version = "16.12.2";
- src = fetchurl {
- url = "${mirror}/stable/applications/16.12.2/src/kdf-16.12.2.tar.xz";
- sha256 = "0zkwqqrcna2f9j4g798lhdi2v5j9p6r3zqkhf7clh4nk2c6f766k";
- name = "kdf-16.12.2.tar.xz";
- };
- };
- kdialog = {
- version = "16.12.2";
- src = fetchurl {
- url = "${mirror}/stable/applications/16.12.2/src/kdialog-16.12.2.tar.xz";
- sha256 = "0jrp06zbdj5c3nigdard0a7whb3lg8j2lgnf3dp2gf7iqj8gb189";
- name = "kdialog-16.12.2.tar.xz";
- };
- };
- kdiamond = {
- version = "16.12.2";
- src = fetchurl {
- url = "${mirror}/stable/applications/16.12.2/src/kdiamond-16.12.2.tar.xz";
- sha256 = "1bflb2lbhahwmcqzck0xbr39rcbyaw4fzjaalbsdf9n5mk5ixmxs";
- name = "kdiamond-16.12.2.tar.xz";
- };
- };
- keditbookmarks = {
- version = "16.12.2";
- src = fetchurl {
- url = "${mirror}/stable/applications/16.12.2/src/keditbookmarks-16.12.2.tar.xz";
- sha256 = "16a2sq92r6nq7ksp905xp9v3fv8ynhfp9hslq4a46v71an06yh4p";
- name = "keditbookmarks-16.12.2.tar.xz";
- };
- };
- kfilereplace = {
- version = "16.12.2";
- src = fetchurl {
- url = "${mirror}/stable/applications/16.12.2/src/kfilereplace-16.12.2.tar.xz";
- sha256 = "086x9k71s2bc80863vlfryblg0cyw1qhk20vwhxmq81xkxsah6ky";
- name = "kfilereplace-16.12.2.tar.xz";
- };
- };
- kfind = {
- version = "16.12.2";
- src = fetchurl {
- url = "${mirror}/stable/applications/16.12.2/src/kfind-16.12.2.tar.xz";
- sha256 = "0jpn75d331qiyhqswflkad5nc5r6c21q1d8236k2qvcm80xp10bm";
- name = "kfind-16.12.2.tar.xz";
- };
- };
- kfloppy = {
- version = "16.12.2";
- src = fetchurl {
- url = "${mirror}/stable/applications/16.12.2/src/kfloppy-16.12.2.tar.xz";
- sha256 = "1q1fh16msixpn59y0yglmjbib6a5c9pb3hpmcd5vsiy2ilpgffbm";
- name = "kfloppy-16.12.2.tar.xz";
- };
- };
- kfourinline = {
- version = "16.12.2";
- src = fetchurl {
- url = "${mirror}/stable/applications/16.12.2/src/kfourinline-16.12.2.tar.xz";
- sha256 = "1df3si16d4ra3x3v9m4kiknlflx1ac10fq3vydcsn4yi89rhx2ix";
- name = "kfourinline-16.12.2.tar.xz";
- };
- };
- kgeography = {
- version = "16.12.2";
- src = fetchurl {
- url = "${mirror}/stable/applications/16.12.2/src/kgeography-16.12.2.tar.xz";
- sha256 = "1sw7blr264p88702718m5ch9qdzyd5krpf5qjvfhypx0fgzr40b6";
- name = "kgeography-16.12.2.tar.xz";
- };
- };
- kget = {
- version = "16.12.2";
- src = fetchurl {
- url = "${mirror}/stable/applications/16.12.2/src/kget-16.12.2.tar.xz";
- sha256 = "1qiwcbdvr9g7cgqm4i3gcc6aw60d36n2m8a7faqa28srrw8f55lj";
- name = "kget-16.12.2.tar.xz";
- };
- };
- kgoldrunner = {
- version = "16.12.2";
- src = fetchurl {
- url = "${mirror}/stable/applications/16.12.2/src/kgoldrunner-16.12.2.tar.xz";
- sha256 = "0sa7yf3656f8mib785xdv7q86gsslx1hwy69vqrnrfwg24vzx3gy";
- name = "kgoldrunner-16.12.2.tar.xz";
- };
- };
- kgpg = {
- version = "16.12.2";
- src = fetchurl {
- url = "${mirror}/stable/applications/16.12.2/src/kgpg-16.12.2.tar.xz";
- sha256 = "082fvxpawhsvfn6c1y32rvgp2qcim6lnk1gpp92cgn6k70dcx4lr";
- name = "kgpg-16.12.2.tar.xz";
- };
- };
- khangman = {
- version = "16.12.2";
- src = fetchurl {
- url = "${mirror}/stable/applications/16.12.2/src/khangman-16.12.2.tar.xz";
- sha256 = "1v57za5bqhppc1fy2xd7d1x1fvanwxgl3xzckfz1k7kbx1kcpn1s";
- name = "khangman-16.12.2.tar.xz";
- };
- };
- khelpcenter = {
- version = "16.12.2";
- src = fetchurl {
- url = "${mirror}/stable/applications/16.12.2/src/khelpcenter-16.12.2.tar.xz";
- sha256 = "1cij7v57zs14ynvmplcgn14m30hdc554kvrsbjgb695kmcvm1jv9";
- name = "khelpcenter-16.12.2.tar.xz";
- };
- };
- kholidays = {
- version = "16.12.2";
- src = fetchurl {
- url = "${mirror}/stable/applications/16.12.2/src/kholidays-16.12.2.tar.xz";
- sha256 = "0pybdq2asx10sxf4kz1p85yfs66dhccz2xvf95n8hky7833kqs1n";
- name = "kholidays-16.12.2.tar.xz";
- };
- };
- kidentitymanagement = {
- version = "16.12.2";
- src = fetchurl {
- url = "${mirror}/stable/applications/16.12.2/src/kidentitymanagement-16.12.2.tar.xz";
- sha256 = "0wv7b3rfysbsj87xgp5ymy5glh9p12i9x8ffv483nm8xqyzwaa9p";
- name = "kidentitymanagement-16.12.2.tar.xz";
- };
- };
- kig = {
- version = "16.12.2";
- src = fetchurl {
- url = "${mirror}/stable/applications/16.12.2/src/kig-16.12.2.tar.xz";
- sha256 = "0v261pb1l7cnjkqcqfg3885wxa2hb2bgdk0a1dcwrg4q6fr9kw1g";
- name = "kig-16.12.2.tar.xz";
- };
- };
- kigo = {
- version = "16.12.2";
- src = fetchurl {
- url = "${mirror}/stable/applications/16.12.2/src/kigo-16.12.2.tar.xz";
- sha256 = "19sns6w32pm12634xqxx53hgpmrb4ggzx2idcx3ldknbixhmqm7c";
- name = "kigo-16.12.2.tar.xz";
- };
- };
- killbots = {
- version = "16.12.2";
- src = fetchurl {
- url = "${mirror}/stable/applications/16.12.2/src/killbots-16.12.2.tar.xz";
- sha256 = "1cc2ddmp7a21yn0aavbh887j4xmzm2a6xlyq71b3msraw3p5vbmy";
- name = "killbots-16.12.2.tar.xz";
- };
- };
- kimagemapeditor = {
- version = "16.12.2";
- src = fetchurl {
- url = "${mirror}/stable/applications/16.12.2/src/kimagemapeditor-16.12.2.tar.xz";
- sha256 = "0n82v73da8hnan2c96g2lxy826dg6xhln28wwr8iib89zd5gmbi6";
- name = "kimagemapeditor-16.12.2.tar.xz";
- };
- };
- kimap = {
- version = "16.12.2";
- src = fetchurl {
- url = "${mirror}/stable/applications/16.12.2/src/kimap-16.12.2.tar.xz";
- sha256 = "04shglmr8rv5r16qb3n9x7vwrsm55121rkj9pz1y7l40kybajl87";
- name = "kimap-16.12.2.tar.xz";
- };
- };
- kio-extras = {
- version = "16.12.2";
- src = fetchurl {
- url = "${mirror}/stable/applications/16.12.2/src/kio-extras-16.12.2.tar.xz";
- sha256 = "0bfjmggyl7x7nmkqq10pmcc2507yfkbv5c5v86225g9mk02frmhp";
- name = "kio-extras-16.12.2.tar.xz";
- };
- };
- kiriki = {
- version = "16.12.2";
- src = fetchurl {
- url = "${mirror}/stable/applications/16.12.2/src/kiriki-16.12.2.tar.xz";
- sha256 = "1fgdw7f4fqdfzsryvd8crdv60j2s2g3cvbibv3g91xkcq6p155wk";
- name = "kiriki-16.12.2.tar.xz";
- };
- };
- kiten = {
- version = "16.12.2";
- src = fetchurl {
- url = "${mirror}/stable/applications/16.12.2/src/kiten-16.12.2.tar.xz";
- sha256 = "1ya1wwgh1x4iap3vs947ln949hjc499aiylg24666ab7vcqkbhh8";
- name = "kiten-16.12.2.tar.xz";
- };
- };
- kjumpingcube = {
- version = "16.12.2";
- src = fetchurl {
- url = "${mirror}/stable/applications/16.12.2/src/kjumpingcube-16.12.2.tar.xz";
- sha256 = "0flx7sxqac763i2nsvyjzjv9aii27hnv51k0yhqcp6pnsjy1fbhh";
- name = "kjumpingcube-16.12.2.tar.xz";
- };
- };
- kldap = {
- version = "16.12.2";
- src = fetchurl {
- url = "${mirror}/stable/applications/16.12.2/src/kldap-16.12.2.tar.xz";
- sha256 = "06ql2d7l22c19gnw6wigym3qpqw22arsmwpnnwz9i76l3wq32s3x";
- name = "kldap-16.12.2.tar.xz";
- };
- };
- kleopatra = {
- version = "16.12.2";
- src = fetchurl {
- url = "${mirror}/stable/applications/16.12.2/src/kleopatra-16.12.2.tar.xz";
- sha256 = "1kh75qjas4x4aqvshdgcryqdrp475lx60gksjfh34ygz03avdssl";
- name = "kleopatra-16.12.2.tar.xz";
- };
- };
- klettres = {
- version = "16.12.2";
- src = fetchurl {
- url = "${mirror}/stable/applications/16.12.2/src/klettres-16.12.2.tar.xz";
- sha256 = "116igb1gbl3dfh5rm4mp0n8krm0d9kpgns63sh355g02wf0cbz3f";
- name = "klettres-16.12.2.tar.xz";
- };
- };
- klickety = {
- version = "16.12.2";
- src = fetchurl {
- url = "${mirror}/stable/applications/16.12.2/src/klickety-16.12.2.tar.xz";
- sha256 = "00fqfnxh8bb069q3a5jszggnwq0z45najd6qg3z9gqb2i6bb4w93";
- name = "klickety-16.12.2.tar.xz";
- };
- };
- klines = {
- version = "16.12.2";
- src = fetchurl {
- url = "${mirror}/stable/applications/16.12.2/src/klines-16.12.2.tar.xz";
- sha256 = "1pr5pvxd6fnybkjqxig9zjiq04d7g6igw24p2j6kfz91ihaf4g6q";
- name = "klines-16.12.2.tar.xz";
- };
- };
- klinkstatus = {
- version = "16.12.2";
- src = fetchurl {
- url = "${mirror}/stable/applications/16.12.2/src/klinkstatus-16.12.2.tar.xz";
- sha256 = "07wmaphs56x0jwgbkdynahwa0hrr3rakkbbfa4w046dga5z6dz60";
- name = "klinkstatus-16.12.2.tar.xz";
- };
- };
- kmag = {
- version = "16.12.2";
- src = fetchurl {
- url = "${mirror}/stable/applications/16.12.2/src/kmag-16.12.2.tar.xz";
- sha256 = "02vjwfh926jvhxn1sw603ijdrayk4jxrw9rl7kv48q00kgk5sr23";
- name = "kmag-16.12.2.tar.xz";
- };
- };
- kmahjongg = {
- version = "16.12.2";
- src = fetchurl {
- url = "${mirror}/stable/applications/16.12.2/src/kmahjongg-16.12.2.tar.xz";
- sha256 = "1rbcbak87jyf6bc8k44xvpcihagwh4i3v20af14hvm52gdvzdhij";
- name = "kmahjongg-16.12.2.tar.xz";
- };
- };
- kmail = {
- version = "16.12.2";
- src = fetchurl {
- url = "${mirror}/stable/applications/16.12.2/src/kmail-16.12.2.tar.xz";
- sha256 = "0a3r6pwm3dvvmljp5grl1mgymp3fb1l3hb8issdqlk4s805q0pql";
- name = "kmail-16.12.2.tar.xz";
- };
- };
- kmail-account-wizard = {
- version = "16.12.2";
- src = fetchurl {
- url = "${mirror}/stable/applications/16.12.2/src/kmail-account-wizard-16.12.2.tar.xz";
- sha256 = "1vm4lx5jwk5kqf3zdfm3zyzhap1dalslwj03gxmif6hh65d2s7h5";
- name = "kmail-account-wizard-16.12.2.tar.xz";
- };
- };
- kmailtransport = {
- version = "16.12.2";
- src = fetchurl {
- url = "${mirror}/stable/applications/16.12.2/src/kmailtransport-16.12.2.tar.xz";
- sha256 = "0g2f25l4l8jlj4d5dcdlbz8rgy4xvm6if2i3qm4naqh35kb4rycn";
- name = "kmailtransport-16.12.2.tar.xz";
- };
- };
- kmbox = {
- version = "16.12.2";
- src = fetchurl {
- url = "${mirror}/stable/applications/16.12.2/src/kmbox-16.12.2.tar.xz";
- sha256 = "1j30kvvlnfbky5x19gxjsbrshrdys6ajdbhpd9fy46jjh2dv3y6j";
- name = "kmbox-16.12.2.tar.xz";
- };
- };
- kmime = {
- version = "16.12.2";
- src = fetchurl {
- url = "${mirror}/stable/applications/16.12.2/src/kmime-16.12.2.tar.xz";
- sha256 = "0sl34qahgvxaw9xi56d0l2a2iim9bpiv8ysf3spsc1m2ribf3400";
- name = "kmime-16.12.2.tar.xz";
- };
- };
- kmines = {
- version = "16.12.2";
- src = fetchurl {
- url = "${mirror}/stable/applications/16.12.2/src/kmines-16.12.2.tar.xz";
- sha256 = "1324j3myr1wds3f6nzw186d1rc2aakxv0mqsx89bdvnky6zq2v5q";
- name = "kmines-16.12.2.tar.xz";
- };
- };
- kmix = {
- version = "16.12.2";
- src = fetchurl {
- url = "${mirror}/stable/applications/16.12.2/src/kmix-16.12.2.tar.xz";
- sha256 = "1s8di3jbgcaamfxfmmwxlajixia9m2ngl4qc1z7rq6a14fk3w5hz";
- name = "kmix-16.12.2.tar.xz";
- };
- };
- kmousetool = {
- version = "16.12.2";
- src = fetchurl {
- url = "${mirror}/stable/applications/16.12.2/src/kmousetool-16.12.2.tar.xz";
- sha256 = "128hp75zyyariflx03ilmvw09jngfy9ylykb73gg7xw2zqnjjw4i";
- name = "kmousetool-16.12.2.tar.xz";
- };
- };
- kmouth = {
- version = "16.12.2";
- src = fetchurl {
- url = "${mirror}/stable/applications/16.12.2/src/kmouth-16.12.2.tar.xz";
- sha256 = "0gk8rdlpwh304k7g85i80rfdjnvj4fcd1nlj89zmq2qh5s9jmqzg";
- name = "kmouth-16.12.2.tar.xz";
- };
- };
- kmplot = {
- version = "16.12.2";
- src = fetchurl {
- url = "${mirror}/stable/applications/16.12.2/src/kmplot-16.12.2.tar.xz";
- sha256 = "0lwx0d1gv6k3nm0nxry6bl282j3vjc0p7rssbvhi5qsc7z9lc8s3";
- name = "kmplot-16.12.2.tar.xz";
- };
- };
- knavalbattle = {
- version = "16.12.2";
- src = fetchurl {
- url = "${mirror}/stable/applications/16.12.2/src/knavalbattle-16.12.2.tar.xz";
- sha256 = "065hyrdqaj0g7kpgxdyjbf2msdxb6w6m2y50bw23p4w69y7fdxgn";
- name = "knavalbattle-16.12.2.tar.xz";
- };
- };
- knetwalk = {
- version = "16.12.2";
- src = fetchurl {
- url = "${mirror}/stable/applications/16.12.2/src/knetwalk-16.12.2.tar.xz";
- sha256 = "1rhmgr2qk8h04y87dviy0yhrv5dg8za5v00csmia3s1jyvz0fbwp";
- name = "knetwalk-16.12.2.tar.xz";
- };
- };
- knotes = {
- version = "16.12.2";
- src = fetchurl {
- url = "${mirror}/stable/applications/16.12.2/src/knotes-16.12.2.tar.xz";
- sha256 = "12bdrw4ikw014phbq9w4q5y9lgjnazhvri7j13ld5r6806bxls04";
- name = "knotes-16.12.2.tar.xz";
- };
- };
- kolf = {
- version = "16.12.2";
- src = fetchurl {
- url = "${mirror}/stable/applications/16.12.2/src/kolf-16.12.2.tar.xz";
- sha256 = "1v9lhir520n7kcc061z3zcc8wxswhnmjv7yifbqvviazl1n0p0vx";
- name = "kolf-16.12.2.tar.xz";
- };
- };
- kollision = {
- version = "16.12.2";
- src = fetchurl {
- url = "${mirror}/stable/applications/16.12.2/src/kollision-16.12.2.tar.xz";
- sha256 = "1dklg0ns3abfxbfr7xrnzkcxxng3v7avzj4bjvsmsbq3lzy3pb8c";
- name = "kollision-16.12.2.tar.xz";
- };
- };
- kolourpaint = {
- version = "16.12.2";
- src = fetchurl {
- url = "${mirror}/stable/applications/16.12.2/src/kolourpaint-16.12.2.tar.xz";
- sha256 = "1himisb1f68pgaz15qam73qv9acqqh8i1jnk9wbsqjyj6z67wvnj";
- name = "kolourpaint-16.12.2.tar.xz";
- };
- };
- kommander = {
- version = "16.12.2";
- src = fetchurl {
- url = "${mirror}/stable/applications/16.12.2/src/kommander-16.12.2.tar.xz";
- sha256 = "140sz82gm5p8f8mhr2kdfy24fr6jjs0l53jcqr9hwdw6vlrm399w";
- name = "kommander-16.12.2.tar.xz";
- };
- };
- kompare = {
- version = "16.12.2";
- src = fetchurl {
- url = "${mirror}/stable/applications/16.12.2/src/kompare-16.12.2.tar.xz";
- sha256 = "1dd4k3rq8wlzsvl5nv5mrd0ddxgwlriik3vxj8xx3b4nqk720lh6";
- name = "kompare-16.12.2.tar.xz";
- };
- };
- konqueror = {
- version = "16.12.2";
- src = fetchurl {
- url = "${mirror}/stable/applications/16.12.2/src/konqueror-16.12.2.tar.xz";
- sha256 = "0md9glzr1br2n5dsfmmv6gxsfhv6jl0r4fa1qgw4d2j2kpm94zw7";
- name = "konqueror-16.12.2.tar.xz";
- };
- };
- konquest = {
- version = "16.12.2";
- src = fetchurl {
- url = "${mirror}/stable/applications/16.12.2/src/konquest-16.12.2.tar.xz";
- sha256 = "0k58adqr20k9wrwbaf1s6lqqgcma08wqnv66zrxbgacgsgx3pnzi";
- name = "konquest-16.12.2.tar.xz";
- };
- };
- konsole = {
- version = "16.12.2";
- src = fetchurl {
- url = "${mirror}/stable/applications/16.12.2/src/konsole-16.12.2.tar.xz";
- sha256 = "1mwfv2hznmd1qml8hq1z81jv9y8jn1ybc69dqgnf1n6ygmz14676";
- name = "konsole-16.12.2.tar.xz";
- };
- };
- kontact = {
- version = "16.12.2";
- src = fetchurl {
- url = "${mirror}/stable/applications/16.12.2/src/kontact-16.12.2.tar.xz";
- sha256 = "1rfqb5a4brbvkhv905lcvc40r0as8zwdm2h67jc96cix358cpshv";
- name = "kontact-16.12.2.tar.xz";
- };
- };
- kontactinterface = {
- version = "16.12.2";
- src = fetchurl {
- url = "${mirror}/stable/applications/16.12.2/src/kontactinterface-16.12.2.tar.xz";
- sha256 = "0z6mjg8sy18jhkfmk9s098851gdqbh03031l92yqzsgsfph9nk77";
- name = "kontactinterface-16.12.2.tar.xz";
- };
- };
- kopete = {
- version = "16.12.2";
- src = fetchurl {
- url = "${mirror}/stable/applications/16.12.2/src/kopete-16.12.2.tar.xz";
- sha256 = "0bf0bffcsyhrj70yb4l5g6n0jr38i5zkcl4hsfi9hac43xvp62ib";
- name = "kopete-16.12.2.tar.xz";
- };
- };
- korganizer = {
- version = "16.12.2";
- src = fetchurl {
- url = "${mirror}/stable/applications/16.12.2/src/korganizer-16.12.2.tar.xz";
- sha256 = "1211rhxvx42lndqv6n23mj6ibhfp09vvmzz59k1j0l9z8y1zyr2g";
- name = "korganizer-16.12.2.tar.xz";
- };
- };
- kpat = {
- version = "16.12.2";
- src = fetchurl {
- url = "${mirror}/stable/applications/16.12.2/src/kpat-16.12.2.tar.xz";
- sha256 = "1yc16yfsq18m5xxm9b17zba3ppw7j5hq82z0ln8sw2yisz59mylr";
- name = "kpat-16.12.2.tar.xz";
- };
- };
- kpimtextedit = {
- version = "16.12.2";
- src = fetchurl {
- url = "${mirror}/stable/applications/16.12.2/src/kpimtextedit-16.12.2.tar.xz";
- sha256 = "0xspr7hip57j8n3mp71x8s908vlj7acl27jwyc33yi4xvlyfcgfy";
- name = "kpimtextedit-16.12.2.tar.xz";
- };
- };
- kppp = {
- version = "16.12.2";
- src = fetchurl {
- url = "${mirror}/stable/applications/16.12.2/src/kppp-16.12.2.tar.xz";
- sha256 = "1gvb3sgxg1ysdrv18rf5kh6znvwlkp673yld6ghj3dcif8w6xq0n";
- name = "kppp-16.12.2.tar.xz";
- };
- };
- kqtquickcharts = {
- version = "16.12.2";
- src = fetchurl {
- url = "${mirror}/stable/applications/16.12.2/src/kqtquickcharts-16.12.2.tar.xz";
- sha256 = "1gh3alqlmj2icd2jblncps4k6kklckbpqv18wplybgaz4h0pi4pi";
- name = "kqtquickcharts-16.12.2.tar.xz";
- };
- };
- krdc = {
- version = "16.12.2";
- src = fetchurl {
- url = "${mirror}/stable/applications/16.12.2/src/krdc-16.12.2.tar.xz";
- sha256 = "1ql2mkx7xc2y0vkxjk3i5scxa6ws5mwz39zynmyx7rmxp9f8frsf";
- name = "krdc-16.12.2.tar.xz";
- };
- };
- kremotecontrol = {
- version = "16.12.2";
- src = fetchurl {
- url = "${mirror}/stable/applications/16.12.2/src/kremotecontrol-16.12.2.tar.xz";
- sha256 = "1c1xx458lchn9b3c9h27zb13m2y6b01sb0g6lf6bpx4skbdwdwma";
- name = "kremotecontrol-16.12.2.tar.xz";
- };
- };
- kreversi = {
- version = "16.12.2";
- src = fetchurl {
- url = "${mirror}/stable/applications/16.12.2/src/kreversi-16.12.2.tar.xz";
- sha256 = "18zfy3dzi9rgwhgvci93iv0gkmvac30rbj4xwpvzr3bc8zwz76df";
- name = "kreversi-16.12.2.tar.xz";
- };
- };
- krfb = {
- version = "16.12.2";
- src = fetchurl {
- url = "${mirror}/stable/applications/16.12.2/src/krfb-16.12.2.tar.xz";
- sha256 = "1sqij11a6pbivf2xbcglxzkfrpqvzcqxb4d85jxrhbp2wljx0xvy";
- name = "krfb-16.12.2.tar.xz";
- };
- };
- kross-interpreters = {
- version = "16.12.2";
- src = fetchurl {
- url = "${mirror}/stable/applications/16.12.2/src/kross-interpreters-16.12.2.tar.xz";
- sha256 = "1cw84z2wdh1kb7fgwmmljmc5d57skh6hlm0p6kzlqdbqknnva8ad";
- name = "kross-interpreters-16.12.2.tar.xz";
- };
- };
- kruler = {
- version = "16.12.2";
- src = fetchurl {
- url = "${mirror}/stable/applications/16.12.2/src/kruler-16.12.2.tar.xz";
- sha256 = "11i7k53kpfampbkzzabp0v97pb22h7sb2i0r6qdx78kyhmkgdrvp";
- name = "kruler-16.12.2.tar.xz";
- };
- };
- ksaneplugin = {
- version = "16.12.2";
- src = fetchurl {
- url = "${mirror}/stable/applications/16.12.2/src/ksaneplugin-16.12.2.tar.xz";
- sha256 = "0ljk7cf4ns39xszn6g1vk8av3dkkgwzj4ry4n56305mqyjgqx258";
- name = "ksaneplugin-16.12.2.tar.xz";
- };
- };
- kscd = {
- version = "16.12.2";
- src = fetchurl {
- url = "${mirror}/stable/applications/16.12.2/src/kscd-16.12.2.tar.xz";
- sha256 = "1w1gcfwp1r18pjfp526pdb837kpd8zj08g1jrjcb3bmvh600apm0";
- name = "kscd-16.12.2.tar.xz";
- };
- };
- kshisen = {
- version = "16.12.2";
- src = fetchurl {
- url = "${mirror}/stable/applications/16.12.2/src/kshisen-16.12.2.tar.xz";
- sha256 = "0sw78qwlpimlhqzlz5migbngrhj7w6gdbqx12q7949paa03ash1b";
- name = "kshisen-16.12.2.tar.xz";
- };
- };
- ksirk = {
- version = "16.12.2";
- src = fetchurl {
- url = "${mirror}/stable/applications/16.12.2/src/ksirk-16.12.2.tar.xz";
- sha256 = "0f9k476wbwx0maf0wsicgipqyv7gccm7ydwvns399iamb6xkiqnn";
- name = "ksirk-16.12.2.tar.xz";
- };
- };
- ksnakeduel = {
- version = "16.12.2";
- src = fetchurl {
- url = "${mirror}/stable/applications/16.12.2/src/ksnakeduel-16.12.2.tar.xz";
- sha256 = "0lhwz1b1v1dir7k1vbkcwb73x7f3h7prb3zv4f8wlh32dj1yg983";
- name = "ksnakeduel-16.12.2.tar.xz";
- };
- };
- kspaceduel = {
- version = "16.12.2";
- src = fetchurl {
- url = "${mirror}/stable/applications/16.12.2/src/kspaceduel-16.12.2.tar.xz";
- sha256 = "0h6m8xnmxx0q2r863ikck0kpyscd8s4iidcjiqz7wqgbsw1dadqb";
- name = "kspaceduel-16.12.2.tar.xz";
- };
- };
- ksquares = {
- version = "16.12.2";
- src = fetchurl {
- url = "${mirror}/stable/applications/16.12.2/src/ksquares-16.12.2.tar.xz";
- sha256 = "14x1d9300wdhrnri5f5n5i31bs83hcbxs5w9cai1m8mlql99vvfy";
- name = "ksquares-16.12.2.tar.xz";
- };
- };
- kstars = {
- version = "16.12.2";
- src = fetchurl {
- url = "${mirror}/stable/applications/16.12.2/src/kstars-16.12.2.tar.xz";
- sha256 = "0acbirhr970fh53hfsbfw9jn4jqlww9zf80jfyg2drixi9d70mpp";
- name = "kstars-16.12.2.tar.xz";
- };
- };
- ksudoku = {
- version = "16.12.2";
- src = fetchurl {
- url = "${mirror}/stable/applications/16.12.2/src/ksudoku-16.12.2.tar.xz";
- sha256 = "1nvk8l6n7sja19s2kazf6xhzqwi9mrjxvz5i0i9nmpwmksii6lbg";
- name = "ksudoku-16.12.2.tar.xz";
- };
- };
- ksystemlog = {
- version = "16.12.2";
- src = fetchurl {
- url = "${mirror}/stable/applications/16.12.2/src/ksystemlog-16.12.2.tar.xz";
- sha256 = "13q2h3yhlpjy8hiiz6vdx5xwniysbmz5agvvn28a469710601154";
- name = "ksystemlog-16.12.2.tar.xz";
- };
- };
- kteatime = {
- version = "16.12.2";
- src = fetchurl {
- url = "${mirror}/stable/applications/16.12.2/src/kteatime-16.12.2.tar.xz";
- sha256 = "0m163a11hp90rqf5170iqapmvn4ym6m2n42da2p1jgyim4877613";
- name = "kteatime-16.12.2.tar.xz";
- };
- };
- ktimer = {
- version = "16.12.2";
- src = fetchurl {
- url = "${mirror}/stable/applications/16.12.2/src/ktimer-16.12.2.tar.xz";
- sha256 = "1l9xwfg3701h1f16ifh74c5hv7j7z0f332izcvfpiccps7gplhvz";
- name = "ktimer-16.12.2.tar.xz";
- };
- };
- ktnef = {
- version = "16.12.2";
- src = fetchurl {
- url = "${mirror}/stable/applications/16.12.2/src/ktnef-16.12.2.tar.xz";
- sha256 = "0id9shripwahgb258hgfpmxyg0z9x2dqpxgyrvb47d44rrcf9dxg";
- name = "ktnef-16.12.2.tar.xz";
- };
- };
- ktouch = {
- version = "16.12.2";
- src = fetchurl {
- url = "${mirror}/stable/applications/16.12.2/src/ktouch-16.12.2.tar.xz";
- sha256 = "08c0g35ypsndh8pj1nbxn8gnzis10a5cxkz175x4asi5lcpw3kc1";
- name = "ktouch-16.12.2.tar.xz";
- };
- };
- ktp-accounts-kcm = {
- version = "16.12.2";
- src = fetchurl {
- url = "${mirror}/stable/applications/16.12.2/src/ktp-accounts-kcm-16.12.2.tar.xz";
- sha256 = "1p3pqvkyhwcqcwgpyfghhii3d5shbfpm8i9vap8vc43clvj9sfah";
- name = "ktp-accounts-kcm-16.12.2.tar.xz";
- };
- };
- ktp-approver = {
- version = "16.12.2";
- src = fetchurl {
- url = "${mirror}/stable/applications/16.12.2/src/ktp-approver-16.12.2.tar.xz";
- sha256 = "1ky4wg8qk4n2qyh5009zz6487pf31jb8w8zmjmck9fypc9rhzw2j";
- name = "ktp-approver-16.12.2.tar.xz";
- };
- };
- ktp-auth-handler = {
- version = "16.12.2";
- src = fetchurl {
- url = "${mirror}/stable/applications/16.12.2/src/ktp-auth-handler-16.12.2.tar.xz";
- sha256 = "05dvbq1q0fbznyj11wkg0ic8svgkqdq8i20xddkkx2jpwhpkmcnl";
- name = "ktp-auth-handler-16.12.2.tar.xz";
- };
- };
- ktp-call-ui = {
- version = "16.12.2";
- src = fetchurl {
- url = "${mirror}/stable/applications/16.12.2/src/ktp-call-ui-16.12.2.tar.xz";
- sha256 = "1czm56vvbjbyyib2wi60f9s2icnyac007zzh2qxsxfnlp52mkzm2";
- name = "ktp-call-ui-16.12.2.tar.xz";
- };
- };
- ktp-common-internals = {
- version = "16.12.2";
- src = fetchurl {
- url = "${mirror}/stable/applications/16.12.2/src/ktp-common-internals-16.12.2.tar.xz";
- sha256 = "0323dhfiddq5yhbp0rpmpw60334z41f45ml8lcada8dv6mbjxlc6";
- name = "ktp-common-internals-16.12.2.tar.xz";
- };
- };
- ktp-contact-list = {
- version = "16.12.2";
- src = fetchurl {
- url = "${mirror}/stable/applications/16.12.2/src/ktp-contact-list-16.12.2.tar.xz";
- sha256 = "0gk0lims3ypjsir9k9a010kylnqzqb2dsh5yfv24a6fb1ix6q4yy";
- name = "ktp-contact-list-16.12.2.tar.xz";
- };
- };
- ktp-contact-runner = {
- version = "16.12.2";
- src = fetchurl {
- url = "${mirror}/stable/applications/16.12.2/src/ktp-contact-runner-16.12.2.tar.xz";
- sha256 = "1bfm4639jshw9ncchcj6m8q6xg49a20z4fzc66vrjkdbha8fwr0g";
- name = "ktp-contact-runner-16.12.2.tar.xz";
- };
- };
- ktp-desktop-applets = {
- version = "16.12.2";
- src = fetchurl {
- url = "${mirror}/stable/applications/16.12.2/src/ktp-desktop-applets-16.12.2.tar.xz";
- sha256 = "1ahm69h309dyg3byv3jxxm3j0c5jphzxng2g87hvjs9dvgx00msv";
- name = "ktp-desktop-applets-16.12.2.tar.xz";
- };
- };
- ktp-filetransfer-handler = {
- version = "16.12.2";
- src = fetchurl {
- url = "${mirror}/stable/applications/16.12.2/src/ktp-filetransfer-handler-16.12.2.tar.xz";
- sha256 = "1j1bmrwabh0mzm51ibb0qyf164g7hznjk2vm2kwkgk5sy8r1a363";
- name = "ktp-filetransfer-handler-16.12.2.tar.xz";
- };
- };
- ktp-kded-module = {
- version = "16.12.2";
- src = fetchurl {
- url = "${mirror}/stable/applications/16.12.2/src/ktp-kded-module-16.12.2.tar.xz";
- sha256 = "1ia62r55my8s6l3am22z6nkvmi2x2gnpbwmmpiv8n2i7j2ysdjp9";
- name = "ktp-kded-module-16.12.2.tar.xz";
- };
- };
- ktp-send-file = {
- version = "16.12.2";
- src = fetchurl {
- url = "${mirror}/stable/applications/16.12.2/src/ktp-send-file-16.12.2.tar.xz";
- sha256 = "0vl00bbnpddq9nczb53apf3sdr1r2hnpa3fa390yx3jrrr4hp3k0";
- name = "ktp-send-file-16.12.2.tar.xz";
- };
- };
- ktp-text-ui = {
- version = "16.12.2";
- src = fetchurl {
- url = "${mirror}/stable/applications/16.12.2/src/ktp-text-ui-16.12.2.tar.xz";
- sha256 = "0c0khkargj4hg2j1va72hp45b3dzwvkvbssq7k309iljxgfi9qry";
- name = "ktp-text-ui-16.12.2.tar.xz";
- };
- };
- ktuberling = {
- version = "16.12.2";
- src = fetchurl {
- url = "${mirror}/stable/applications/16.12.2/src/ktuberling-16.12.2.tar.xz";
- sha256 = "0867ci5bi0phcwwxlqlyn3w1pv5q5wvzyqnzjvywc0bzy2qbpp0p";
- name = "ktuberling-16.12.2.tar.xz";
- };
- };
- kturtle = {
- version = "16.12.2";
- src = fetchurl {
- url = "${mirror}/stable/applications/16.12.2/src/kturtle-16.12.2.tar.xz";
- sha256 = "183glhn0amkcrzylax9cjyj3if9iz3dybmw55ljw003mf1s0sydq";
- name = "kturtle-16.12.2.tar.xz";
- };
- };
- kubrick = {
- version = "16.12.2";
- src = fetchurl {
- url = "${mirror}/stable/applications/16.12.2/src/kubrick-16.12.2.tar.xz";
- sha256 = "10yakz1ffdx33sqgqmlga525r3cnz90m0rm5m2sl3b97ib7r0fxl";
- name = "kubrick-16.12.2.tar.xz";
- };
- };
- kwalletmanager = {
- version = "16.12.2";
- src = fetchurl {
- url = "${mirror}/stable/applications/16.12.2/src/kwalletmanager-16.12.2.tar.xz";
- sha256 = "129q3c805g4jsrws3gvy751y4pdwp9m8yvlc62pkp703xwlnkzj4";
- name = "kwalletmanager-16.12.2.tar.xz";
- };
- };
- kwave = {
- version = "16.12.2";
- src = fetchurl {
- url = "${mirror}/stable/applications/16.12.2/src/kwave-16.12.2.tar.xz";
- sha256 = "0g3n0fm3pyp6sd28qjpadpqs2kqd5gsbicdz1c5jkm8c1bypi0ij";
- name = "kwave-16.12.2.tar.xz";
- };
- };
- kwordquiz = {
- version = "16.12.2";
- src = fetchurl {
- url = "${mirror}/stable/applications/16.12.2/src/kwordquiz-16.12.2.tar.xz";
- sha256 = "1jy9833zrgaddzpfaaps2gcxjnf9mg2yx4w7mfpa3vglsyvhqlzx";
- name = "kwordquiz-16.12.2.tar.xz";
- };
- };
- libgravatar = {
- version = "16.12.2";
- src = fetchurl {
- url = "${mirror}/stable/applications/16.12.2/src/libgravatar-16.12.2.tar.xz";
- sha256 = "0vdryr9q30jkk5b9fa75yiqpspj83wvcy2zry8rsrx7pj21cdlsw";
- name = "libgravatar-16.12.2.tar.xz";
- };
- };
- libkcddb = {
- version = "16.12.2";
- src = fetchurl {
- url = "${mirror}/stable/applications/16.12.2/src/libkcddb-16.12.2.tar.xz";
- sha256 = "0gs0zyisrgbzbcnwp95qi8msj5x2ysmqk9nwja3bwqzbangm0y82";
- name = "libkcddb-16.12.2.tar.xz";
- };
- };
- libkcompactdisc = {
- version = "16.12.2";
- src = fetchurl {
- url = "${mirror}/stable/applications/16.12.2/src/libkcompactdisc-16.12.2.tar.xz";
- sha256 = "1ydhfi3hp30zg9nlmnzd5pslwlq6v6jbim2jda8ciyvniw0pm6va";
- name = "libkcompactdisc-16.12.2.tar.xz";
- };
- };
- libkdcraw = {
- version = "16.12.2";
- src = fetchurl {
- url = "${mirror}/stable/applications/16.12.2/src/libkdcraw-16.12.2.tar.xz";
- sha256 = "0w54h8fa1hgyvqps936annb8dhbrpizv4ifcix0gq714p573l8w3";
- name = "libkdcraw-16.12.2.tar.xz";
- };
- };
- libkdegames = {
- version = "16.12.2";
- src = fetchurl {
- url = "${mirror}/stable/applications/16.12.2/src/libkdegames-16.12.2.tar.xz";
- sha256 = "0lw6v81pr4xq5h58mgkbzlvp5bxic9szfmabgd3nrdijh6mla4ly";
- name = "libkdegames-16.12.2.tar.xz";
- };
- };
- libkdepim = {
- version = "16.12.2";
- src = fetchurl {
- url = "${mirror}/stable/applications/16.12.2/src/libkdepim-16.12.2.tar.xz";
- sha256 = "1xblfj2i205jsm6nl05r3jis4gb4d15naq2mmfgxwy913pjh74jf";
- name = "libkdepim-16.12.2.tar.xz";
- };
- };
- libkeduvocdocument = {
- version = "16.12.2";
- src = fetchurl {
- url = "${mirror}/stable/applications/16.12.2/src/libkeduvocdocument-16.12.2.tar.xz";
- sha256 = "118z200ffqb2rj6yhmqp4b998cq6mlbpzn2gh2pdp70yin9w35qz";
- name = "libkeduvocdocument-16.12.2.tar.xz";
- };
- };
- libkexiv2 = {
- version = "16.12.2";
- src = fetchurl {
- url = "${mirror}/stable/applications/16.12.2/src/libkexiv2-16.12.2.tar.xz";
- sha256 = "1bpk2mwiplk7c5xrdx7nq9fa0g53sgx6f5xa7d4k2i9mzn2s8hyr";
- name = "libkexiv2-16.12.2.tar.xz";
- };
- };
- libkface = {
- version = "16.12.2";
- src = fetchurl {
- url = "${mirror}/stable/applications/16.12.2/src/libkface-16.12.2.tar.xz";
- sha256 = "0jhnx71bnn2f8x5w5iylkk7369fcbx0y793182vc5rdqaax983sc";
- name = "libkface-16.12.2.tar.xz";
- };
- };
- libkgeomap = {
- version = "16.12.2";
- src = fetchurl {
- url = "${mirror}/stable/applications/16.12.2/src/libkgeomap-16.12.2.tar.xz";
- sha256 = "1skmmg3hppzj923nl90r7v26k4fii7h3sr6yxzzvzaakwbil7d9q";
- name = "libkgeomap-16.12.2.tar.xz";
- };
- };
- libkipi = {
- version = "16.12.2";
- src = fetchurl {
- url = "${mirror}/stable/applications/16.12.2/src/libkipi-16.12.2.tar.xz";
- sha256 = "0g1yyd5lhvwwa7q4in1p3q4mwlpp00lbir1a25wanlr6hqr2247w";
- name = "libkipi-16.12.2.tar.xz";
- };
- };
- libkleo = {
- version = "16.12.2";
- src = fetchurl {
- url = "${mirror}/stable/applications/16.12.2/src/libkleo-16.12.2.tar.xz";
- sha256 = "031lfrn48xzi0kxkvg9597nxzharv0s0nxlkbdcr4xx8d8iga2l0";
- name = "libkleo-16.12.2.tar.xz";
- };
- };
- libkmahjongg = {
- version = "16.12.2";
- src = fetchurl {
- url = "${mirror}/stable/applications/16.12.2/src/libkmahjongg-16.12.2.tar.xz";
- sha256 = "0imj2xv6qcf00dx53h37yq84cqrg806qjfmm836hw6wicw24117f";
- name = "libkmahjongg-16.12.2.tar.xz";
- };
- };
- libkomparediff2 = {
- version = "16.12.2";
- src = fetchurl {
- url = "${mirror}/stable/applications/16.12.2/src/libkomparediff2-16.12.2.tar.xz";
- sha256 = "02d3bd7miq1nq81z6b4c8c64wjj2z9shr8y0rd0yqlzmf8ma05p2";
- name = "libkomparediff2-16.12.2.tar.xz";
- };
- };
- libksane = {
- version = "16.12.2";
- src = fetchurl {
- url = "${mirror}/stable/applications/16.12.2/src/libksane-16.12.2.tar.xz";
- sha256 = "0p215qc56ma4laajmql72f8bngi2x88nk1q8ysq0wviadgack885";
- name = "libksane-16.12.2.tar.xz";
- };
- };
- libksieve = {
- version = "16.12.2";
- src = fetchurl {
- url = "${mirror}/stable/applications/16.12.2/src/libksieve-16.12.2.tar.xz";
- sha256 = "1bzd8lfz0d9gnq6kh8k9wrcfbc61mdigy2madn7ywpxpcjp4rp3v";
- name = "libksieve-16.12.2.tar.xz";
- };
- };
- lokalize = {
- version = "16.12.2";
- src = fetchurl {
- url = "${mirror}/stable/applications/16.12.2/src/lokalize-16.12.2.tar.xz";
- sha256 = "03cr89skhwbzq4h6fr78iaziplahpr4i7fvsf8395w6yiwsvcnyk";
- name = "lokalize-16.12.2.tar.xz";
- };
- };
- lskat = {
- version = "16.12.2";
- src = fetchurl {
- url = "${mirror}/stable/applications/16.12.2/src/lskat-16.12.2.tar.xz";
- sha256 = "1jz7bjzw5msz5nyjvr21n3c355598afdnnqc6xzfl9zjkfgx4q9w";
- name = "lskat-16.12.2.tar.xz";
- };
- };
- mailcommon = {
- version = "16.12.2";
- src = fetchurl {
- url = "${mirror}/stable/applications/16.12.2/src/mailcommon-16.12.2.tar.xz";
- sha256 = "0b9qawglc42y4wd98xaaiqdz7586wabj9zabs3dvk9vs10qpb9p0";
- name = "mailcommon-16.12.2.tar.xz";
- };
- };
- mailimporter = {
- version = "16.12.2";
- src = fetchurl {
- url = "${mirror}/stable/applications/16.12.2/src/mailimporter-16.12.2.tar.xz";
- sha256 = "0dvnqqmmxdca7wmsajhzdxgz1k07dfbac0z1paww4d2inr164b8q";
- name = "mailimporter-16.12.2.tar.xz";
- };
- };
- marble = {
- version = "16.12.2";
- src = fetchurl {
- url = "${mirror}/stable/applications/16.12.2/src/marble-16.12.2.tar.xz";
- sha256 = "0p7ka2hl0f9ghpmyh124p57dy1ynhw0dszihg4rbbrjfjj65vig0";
- name = "marble-16.12.2.tar.xz";
- };
- };
- mbox-importer = {
- version = "16.12.2";
- src = fetchurl {
- url = "${mirror}/stable/applications/16.12.2/src/mbox-importer-16.12.2.tar.xz";
- sha256 = "00q7x30bl1fwfgwvqmgbspp74bmjm40d30rykq052v1cp6n0c060";
- name = "mbox-importer-16.12.2.tar.xz";
- };
- };
- messagelib = {
- version = "16.12.2";
- src = fetchurl {
- url = "${mirror}/stable/applications/16.12.2/src/messagelib-16.12.2.tar.xz";
- sha256 = "0b65248mc6qamj1wcpv73v1ywda9gk2s2y20vjf35lmv5xi4cz88";
- name = "messagelib-16.12.2.tar.xz";
- };
- };
- minuet = {
- version = "16.12.2";
- src = fetchurl {
- url = "${mirror}/stable/applications/16.12.2/src/minuet-16.12.2.tar.xz";
- sha256 = "1sv9b1lq2dyvlwq0bmmnxak60nz83wbwnw1d8w3n5xadssarbr1s";
- name = "minuet-16.12.2.tar.xz";
- };
- };
- okteta = {
- version = "16.12.2";
- src = fetchurl {
- url = "${mirror}/stable/applications/16.12.2/src/okteta-16.12.2.tar.xz";
- sha256 = "1xq1bjpy7g8qn9d7dfgy00kf5bdcpvj1489b65yrlmyi382m5k7s";
- name = "okteta-16.12.2.tar.xz";
- };
- };
- okular = {
- version = "16.12.2";
- src = fetchurl {
- url = "${mirror}/stable/applications/16.12.2/src/okular-16.12.2.tar.xz";
- sha256 = "020z6wlycip067j398lznqcspi3b6dx1zds9ibhxw9zzh3ms92kc";
- name = "okular-16.12.2.tar.xz";
- };
- };
- palapeli = {
- version = "16.12.2";
- src = fetchurl {
- url = "${mirror}/stable/applications/16.12.2/src/palapeli-16.12.2.tar.xz";
- sha256 = "1vkkq9r9r85x46xx91gqyhpagx1xscrvlkx4knd72rcxfygipzf9";
- name = "palapeli-16.12.2.tar.xz";
- };
- };
- parley = {
- version = "16.12.2";
- src = fetchurl {
- url = "${mirror}/stable/applications/16.12.2/src/parley-16.12.2.tar.xz";
- sha256 = "0fvkhph41y5ig3nwmb4zfh8n3sip52r5al3vn4yll2ndkbwdkgjb";
- name = "parley-16.12.2.tar.xz";
- };
- };
- picmi = {
- version = "16.12.2";
- src = fetchurl {
- url = "${mirror}/stable/applications/16.12.2/src/picmi-16.12.2.tar.xz";
- sha256 = "0j0jhvw8b18sskvd32snk4g7xpjk3kqfw9kpvfri0qayrshcxk2c";
- name = "picmi-16.12.2.tar.xz";
- };
- };
- pimcommon = {
- version = "16.12.2";
- src = fetchurl {
- url = "${mirror}/stable/applications/16.12.2/src/pimcommon-16.12.2.tar.xz";
- sha256 = "1c4h1g6hpa7hw3ka2r561q813if031vriz646skin840jwdhnv7m";
- name = "pimcommon-16.12.2.tar.xz";
- };
- };
- pim-data-exporter = {
- version = "16.12.2";
- src = fetchurl {
- url = "${mirror}/stable/applications/16.12.2/src/pim-data-exporter-16.12.2.tar.xz";
- sha256 = "14gkkyvcwa7q1yq6qhswq4ch9gcp1ddpjyf46d0550z1rkpws28m";
- name = "pim-data-exporter-16.12.2.tar.xz";
- };
- };
- pim-sieve-editor = {
- version = "16.12.2";
- src = fetchurl {
- url = "${mirror}/stable/applications/16.12.2/src/pim-sieve-editor-16.12.2.tar.xz";
- sha256 = "03a3imm5zs4p6zlp3m0pdc22cii26cnkgl1s1059lhmd3g3dhl85";
- name = "pim-sieve-editor-16.12.2.tar.xz";
- };
- };
- pim-storage-service-manager = {
- version = "16.12.2";
- src = fetchurl {
- url = "${mirror}/stable/applications/16.12.2/src/pim-storage-service-manager-16.12.2.tar.xz";
- sha256 = "1kcbrg9h3c5khyabs5n6adqljj60vks7npb8iy649y0rx2qc2fn9";
- name = "pim-storage-service-manager-16.12.2.tar.xz";
- };
- };
- poxml = {
- version = "16.12.2";
- src = fetchurl {
- url = "${mirror}/stable/applications/16.12.2/src/poxml-16.12.2.tar.xz";
- sha256 = "17sv19rg1d65h6ks11k7f8zx6yliyhk1j2fxnc81l8md1flarfm0";
- name = "poxml-16.12.2.tar.xz";
- };
- };
- print-manager = {
- version = "16.12.2";
- src = fetchurl {
- url = "${mirror}/stable/applications/16.12.2/src/print-manager-16.12.2.tar.xz";
- sha256 = "1amhl13n7i5z1jfhyrhvigk0bhh9myag7kk83bqkxffsx0lzzwbw";
- name = "print-manager-16.12.2.tar.xz";
- };
- };
- rocs = {
- version = "16.12.2";
- src = fetchurl {
- url = "${mirror}/stable/applications/16.12.2/src/rocs-16.12.2.tar.xz";
- sha256 = "1gd0wdvp3c4s8br23fqqa0cp2vwfjp3xqkj1y3xf6pzv01sk7n7g";
- name = "rocs-16.12.2.tar.xz";
- };
- };
- signon-kwallet-extension = {
- version = "16.12.2";
- src = fetchurl {
- url = "${mirror}/stable/applications/16.12.2/src/signon-kwallet-extension-16.12.2.tar.xz";
- sha256 = "187xjbjw9a34p9cjjhijmwg8n7m83qikxa5q8nsffd48pl7pag2i";
- name = "signon-kwallet-extension-16.12.2.tar.xz";
- };
- };
- spectacle = {
- version = "16.12.2";
- src = fetchurl {
- url = "${mirror}/stable/applications/16.12.2/src/spectacle-16.12.2.tar.xz";
- sha256 = "1snz8kgnwm2cbfa6y9awb3d0markfmmbgkjs1k0xs938mqam4507";
- name = "spectacle-16.12.2.tar.xz";
- };
- };
- step = {
- version = "16.12.2";
- src = fetchurl {
- url = "${mirror}/stable/applications/16.12.2/src/step-16.12.2.tar.xz";
- sha256 = "0ghr054c644hvay0k4xsahrl8bwnd9w8yqq3slrdblhs7z3c7iqk";
- name = "step-16.12.2.tar.xz";
- };
- };
- svgpart = {
- version = "16.12.2";
- src = fetchurl {
- url = "${mirror}/stable/applications/16.12.2/src/svgpart-16.12.2.tar.xz";
- sha256 = "0z9a7654f3n5870d02zm8a9dpymc3jxgmf79wavsp8jjr8sdgy6g";
- name = "svgpart-16.12.2.tar.xz";
- };
- };
- sweeper = {
- version = "16.12.2";
- src = fetchurl {
- url = "${mirror}/stable/applications/16.12.2/src/sweeper-16.12.2.tar.xz";
- sha256 = "0g0iw89l27v4ivqzsrv9j1q4dgihk80nvgf2cfagadfd50hmifr4";
- name = "sweeper-16.12.2.tar.xz";
- };
- };
- syndication = {
- version = "16.12.2";
- src = fetchurl {
- url = "${mirror}/stable/applications/16.12.2/src/syndication-16.12.2.tar.xz";
- sha256 = "0vgpbr46ibyb097pbqmvpl934d4zwz3gb0fkyc23gwpxq1fgsizp";
- name = "syndication-16.12.2.tar.xz";
- };
- };
- umbrello = {
- version = "16.12.2";
- src = fetchurl {
- url = "${mirror}/stable/applications/16.12.2/src/umbrello-16.12.2.tar.xz";
- sha256 = "1g4856mvj9vzm3k86nqm9sfynall1wcj3mvnc80jji7aazmpkl6z";
- name = "umbrello-16.12.2.tar.xz";
- };
- };
- zeroconf-ioslave = {
- version = "16.12.2";
- src = fetchurl {
- url = "${mirror}/stable/applications/16.12.2/src/zeroconf-ioslave-16.12.2.tar.xz";
- sha256 = "1wqiakgc82zylvssxrm2askw6rjw89x85dws7q9zw13hdpvh12ss";
- name = "zeroconf-ioslave-16.12.2.tar.xz";
- };
- };
-}
diff --git a/pkgs/desktops/kde-5/plasma/breeze-qt4.nix b/pkgs/desktops/kde-5/plasma/breeze-qt4.nix
deleted file mode 100644
index ad98a41e81dd..000000000000
--- a/pkgs/desktops/kde-5/plasma/breeze-qt4.nix
+++ /dev/null
@@ -1,24 +0,0 @@
-{
- stdenv, lib, src, version,
- automoc4, cmake, perl, pkgconfig,
- kdelibs, qt4, xproto
-}:
-
-stdenv.mkDerivation {
- name = "breeze-qt4-${version}";
- meta = {
- license = with lib.licenses; [
- lgpl21Plus lgpl3Plus bsd2 mit gpl2Plus gpl3Plus fdl12
- ];
- platforms = lib.platforms.linux;
- maintainers = with lib.maintainers; [ ttuegel ];
- homepage = "http://www.kde.org";
- };
- inherit src;
- buildInputs = [ kdelibs qt4 xproto ];
- nativeBuildInputs = [ automoc4 cmake perl pkgconfig ];
- cmakeFlags = [
- "-DUSE_KDE4=ON"
- "-DQT_QMAKE_EXECUTABLE=${qt4}/bin/qmake"
- ];
-}
diff --git a/pkgs/desktops/kde-5/plasma/default.nix b/pkgs/desktops/kde-5/plasma/default.nix
deleted file mode 100644
index 3ac1c51848e9..000000000000
--- a/pkgs/desktops/kde-5/plasma/default.nix
+++ /dev/null
@@ -1,99 +0,0 @@
-/*
-
-# New packages
-
-READ THIS FIRST
-
-This module is for official packages in KDE Plasma 5. All available packages are
-listed in `./srcs.nix`, although a few are not yet packaged in Nixpkgs (see
-below).
-
-IF YOUR PACKAGE IS NOT LISTED IN `./srcs.nix`, IT DOES NOT GO HERE.
-
-Many of the packages released upstream are not yet built in Nixpkgs due to lack
-of demand. To add a Nixpkgs build for an upstream package, copy one of the
-existing packages here and modify it as necessary.
-
-# Updates
-
-1. Update the URL in `./fetch.sh`.
-2. Run `./maintainers/scripts/fetch-kde-qt.sh pkgs/desktops/kde-5/plasma`
- from the top of the Nixpkgs tree.
-3. Invoke `nix-build -A kde5` and ensure that everything builds.
-4. Commit the changes and open a pull request.
-
-*/
-
-{ pkgs, debug ? false }:
-
-let
-
- inherit (pkgs) lib makeSetupHook stdenv symlinkJoin;
-
- mirror = "mirror://kde";
- srcs = import ./srcs.nix { inherit (pkgs) fetchurl; inherit mirror; };
-
- packages = self: with self; {
- plasmaPackage = args:
- let
- inherit (args) name;
- sname = args.sname or name;
- inherit (srcs."${sname}") src version;
- in kdeDerivation (args // {
- name = "${name}-${version}";
- inherit src;
-
- meta = {
- license = with lib.licenses; [
- lgpl21Plus lgpl3Plus bsd2 mit gpl2Plus gpl3Plus fdl12
- ];
- platforms = lib.platforms.linux;
- maintainers = with lib.maintainers; [ ttuegel ];
- homepage = "http://www.kde.org";
- } // (args.meta or {});
- });
-
- bluedevil = callPackage ./bluedevil.nix {};
- breeze-gtk = callPackage ./breeze-gtk.nix {};
- breeze-qt4 = callPackage ./breeze-qt4.nix {
- inherit (srcs.breeze) src version;
- };
- breeze-qt5 = callPackage ./breeze-qt5.nix {};
- breeze-grub = callPackage ./breeze-grub.nix {};
- breeze-plymouth = callPackage ./breeze-plymouth {};
- kactivitymanagerd = callPackage ./kactivitymanagerd.nix {};
- kde-cli-tools = callPackage ./kde-cli-tools.nix {};
- kde-gtk-config = callPackage ./kde-gtk-config {};
- kdecoration = callPackage ./kdecoration.nix {};
- kdeplasma-addons = callPackage ./kdeplasma-addons.nix {};
- kgamma5 = callPackage ./kgamma5.nix {};
- khotkeys = callPackage ./khotkeys.nix {};
- kinfocenter = callPackage ./kinfocenter.nix {};
- kmenuedit = callPackage ./kmenuedit.nix {};
- kscreen = callPackage ./kscreen.nix {};
- kscreenlocker = callPackage ./kscreenlocker.nix {};
- ksshaskpass = callPackage ./ksshaskpass.nix {};
- ksysguard = callPackage ./ksysguard.nix {};
- kwallet-pam = callPackage ./kwallet-pam.nix {};
- kwayland-integration = callPackage ./kwayland-integration.nix {};
- kwin = callPackage ./kwin {};
- kwrited = callPackage ./kwrited.nix {};
- libkscreen = callPackage ./libkscreen.nix {};
- libksysguard = callPackage ./libksysguard {};
- milou = callPackage ./milou.nix {};
- oxygen = callPackage ./oxygen.nix {};
- plasma-desktop = callPackage ./plasma-desktop {};
- plasma-integration = callPackage ./plasma-integration.nix {};
- plasma-nm = callPackage ./plasma-nm {};
- plasma-pa = callPackage ./plasma-pa.nix {
- inherit (pkgs.gnome3) gconf;
- };
- plasma-workspace = callPackage ./plasma-workspace {};
- plasma-workspace-wallpapers = callPackage ./plasma-workspace-wallpapers.nix {};
- polkit-kde-agent = callPackage ./polkit-kde-agent.nix {};
- powerdevil = callPackage ./powerdevil.nix {};
- startkde = callPackage ./startkde {};
- systemsettings = callPackage ./systemsettings.nix {};
- };
-
-in packages
diff --git a/pkgs/desktops/kde-5/plasma/fetch.sh b/pkgs/desktops/kde-5/plasma/fetch.sh
deleted file mode 100644
index 76f05bad0a77..000000000000
--- a/pkgs/desktops/kde-5/plasma/fetch.sh
+++ /dev/null
@@ -1 +0,0 @@
-WGET_ARGS=( http://download.kde.org/stable/plasma/5.8.5/ -A '*.tar.xz' )
diff --git a/pkgs/desktops/kde-5/plasma/kdecoration.nix b/pkgs/desktops/kde-5/plasma/kdecoration.nix
deleted file mode 100644
index a0f9d93e60b0..000000000000
--- a/pkgs/desktops/kde-5/plasma/kdecoration.nix
+++ /dev/null
@@ -1,6 +0,0 @@
-{ plasmaPackage, ecm }:
-
-plasmaPackage {
- name = "kdecoration";
- nativeBuildInputs = [ ecm ];
-}
diff --git a/pkgs/desktops/kde-5/plasma/kgamma5.nix b/pkgs/desktops/kde-5/plasma/kgamma5.nix
deleted file mode 100644
index 70d7cc17a1ca..000000000000
--- a/pkgs/desktops/kde-5/plasma/kgamma5.nix
+++ /dev/null
@@ -1,9 +0,0 @@
-{ plasmaPackage, ecm, kdoctools, kdelibs4support
-, qtx11extras
-}:
-
-plasmaPackage {
- name = "kgamma5";
- nativeBuildInputs = [ ecm kdoctools ];
- propagatedBuildInputs = [ kdelibs4support qtx11extras ];
-}
diff --git a/pkgs/desktops/kde-5/plasma/khotkeys.nix b/pkgs/desktops/kde-5/plasma/khotkeys.nix
deleted file mode 100644
index f23a17e5479e..000000000000
--- a/pkgs/desktops/kde-5/plasma/khotkeys.nix
+++ /dev/null
@@ -1,22 +0,0 @@
-{ plasmaPackage, ecm, kdoctools, kcmutils
-, kdbusaddons, kdelibs4support, kglobalaccel, ki18n, kio, kxmlgui
-, plasma-framework, plasma-workspace, qtx11extras
-, fetchpatch
-}:
-
-plasmaPackage {
- name = "khotkeys";
- nativeBuildInputs = [ ecm kdoctools ];
-
- patches = [
- # Patch is in 5.9 and up.
- (fetchpatch {
- url = "https://cgit.kde.org/khotkeys.git/patch/?id=f8f7eaaf41e2b95ebfa4b2e35c6ee252524a471b";
- sha256 = "1wxx3qv16jd623jh728xcda8i4y1daq25skwilhv4cfvqxyzk7nn";
- })
- ];
- propagatedBuildInputs = [
- kdelibs4support kglobalaccel ki18n kio plasma-framework plasma-workspace
- qtx11extras kcmutils kdbusaddons kxmlgui
- ];
-}
diff --git a/pkgs/desktops/kde-5/plasma/kwallet-pam.nix b/pkgs/desktops/kde-5/plasma/kwallet-pam.nix
deleted file mode 100644
index 86ba52292f9e..000000000000
--- a/pkgs/desktops/kde-5/plasma/kwallet-pam.nix
+++ /dev/null
@@ -1,11 +0,0 @@
-{ plasmaPackage, ecm, pam, socat, libgcrypt
-}:
-
-plasmaPackage {
- name = "kwallet-pam";
-
- nativeBuildInputs = [ ecm ];
-
- buildInputs = [ pam socat libgcrypt ];
-
-}
diff --git a/pkgs/desktops/kde-5/plasma/srcs.nix b/pkgs/desktops/kde-5/plasma/srcs.nix
deleted file mode 100644
index 03ee867453b6..000000000000
--- a/pkgs/desktops/kde-5/plasma/srcs.nix
+++ /dev/null
@@ -1,325 +0,0 @@
-# DO NOT EDIT! This file is generated automatically by fetch-kde-qt.sh
-{ fetchurl, mirror }:
-
-{
- bluedevil = {
- version = "5.8.5";
- src = fetchurl {
- url = "${mirror}/stable/plasma/5.8.5/bluedevil-5.8.5.tar.xz";
- sha256 = "07gj3m5f0rk26n0xm4yddsfny6l2sh0airm45hb33p7m5inaqzgv";
- name = "bluedevil-5.8.5.tar.xz";
- };
- };
- breeze = {
- version = "5.8.5";
- src = fetchurl {
- url = "${mirror}/stable/plasma/5.8.5/breeze-5.8.5.tar.xz";
- sha256 = "1gcns00iq7a5f1a0w6vf8zck669gzcd785fiybnvc6s6q8x4bp61";
- name = "breeze-5.8.5.tar.xz";
- };
- };
- breeze-grub = {
- version = "5.8.5";
- src = fetchurl {
- url = "${mirror}/stable/plasma/5.8.5/breeze-grub-5.8.5.tar.xz";
- sha256 = "12ynrxdfcraphbwv9yrfhvwf3xkzrw0raqvgi7ksz5cvh78kl5qf";
- name = "breeze-grub-5.8.5.tar.xz";
- };
- };
- breeze-gtk = {
- version = "5.8.5";
- src = fetchurl {
- url = "${mirror}/stable/plasma/5.8.5/breeze-gtk-5.8.5.tar.xz";
- sha256 = "15dx5hl9w9fiash30vgkbww6h7hck0dr42hh8gzysn0xyf0fzpgd";
- name = "breeze-gtk-5.8.5.tar.xz";
- };
- };
- breeze-plymouth = {
- version = "5.8.5";
- src = fetchurl {
- url = "${mirror}/stable/plasma/5.8.5/breeze-plymouth-5.8.5.tar.xz";
- sha256 = "1ryb2jrzw0bzpi7ig4h5k0i33d2qviqsjxw7mnqxcb9q49a4ziq1";
- name = "breeze-plymouth-5.8.5.tar.xz";
- };
- };
- discover = {
- version = "5.8.5";
- src = fetchurl {
- url = "${mirror}/stable/plasma/5.8.5/discover-5.8.5.tar.xz";
- sha256 = "0fr6mksqw46aghfzj78nlq3f89xd63vq2hr4c3gb4vkl5y8v08hg";
- name = "discover-5.8.5.tar.xz";
- };
- };
- kactivitymanagerd = {
- version = "5.8.5";
- src = fetchurl {
- url = "${mirror}/stable/plasma/5.8.5/kactivitymanagerd-5.8.5.tar.xz";
- sha256 = "07cqnbyznn5wy7vrqyid8h5ah7h3sb3pb30qlm83b4m29bkhggwh";
- name = "kactivitymanagerd-5.8.5.tar.xz";
- };
- };
- kde-cli-tools = {
- version = "5.8.5";
- src = fetchurl {
- url = "${mirror}/stable/plasma/5.8.5/kde-cli-tools-5.8.5.tar.xz";
- sha256 = "1ig9x5h9xkzis9izggkjpiiy4sm77pk347jdngx01qpacz68iyp7";
- name = "kde-cli-tools-5.8.5.tar.xz";
- };
- };
- kdecoration = {
- version = "5.8.5";
- src = fetchurl {
- url = "${mirror}/stable/plasma/5.8.5/kdecoration-5.8.5.tar.xz";
- sha256 = "1vhw57pj9i5224i9irk4qmingvkg5bip11vsqiwhmn5307bpnfiq";
- name = "kdecoration-5.8.5.tar.xz";
- };
- };
- kde-gtk-config = {
- version = "5.8.5";
- src = fetchurl {
- url = "${mirror}/stable/plasma/5.8.5/kde-gtk-config-5.8.5.tar.xz";
- sha256 = "1j0mzmmdhqd3a8papps6cad0gqn081mc4kqzi2hjai7038l6951r";
- name = "kde-gtk-config-5.8.5.tar.xz";
- };
- };
- kdeplasma-addons = {
- version = "5.8.5";
- src = fetchurl {
- url = "${mirror}/stable/plasma/5.8.5/kdeplasma-addons-5.8.5.tar.xz";
- sha256 = "181kagb4nbl9a7akk79slwkb7m2j4vyhabagih0z8l45wl5wrz9d";
- name = "kdeplasma-addons-5.8.5.tar.xz";
- };
- };
- kgamma5 = {
- version = "5.8.5";
- src = fetchurl {
- url = "${mirror}/stable/plasma/5.8.5/kgamma5-5.8.5.tar.xz";
- sha256 = "073z4w4i2hwsqqgxcfl0w8d57nhzc069h9zwp7fv93aaw4mgzci2";
- name = "kgamma5-5.8.5.tar.xz";
- };
- };
- khotkeys = {
- version = "5.8.5";
- src = fetchurl {
- url = "${mirror}/stable/plasma/5.8.5/khotkeys-5.8.5.tar.xz";
- sha256 = "1fh0z9vfb908nbwj3snkf9z55jbcb5id87k5sa0v8dhazmp91ylh";
- name = "khotkeys-5.8.5.tar.xz";
- };
- };
- kinfocenter = {
- version = "5.8.5";
- src = fetchurl {
- url = "${mirror}/stable/plasma/5.8.5/kinfocenter-5.8.5.tar.xz";
- sha256 = "1fksnb9klbcrr9ly6dd2yx5y1ngcwcln43zykpc76pr4i49jpggp";
- name = "kinfocenter-5.8.5.tar.xz";
- };
- };
- kmenuedit = {
- version = "5.8.5";
- src = fetchurl {
- url = "${mirror}/stable/plasma/5.8.5/kmenuedit-5.8.5.tar.xz";
- sha256 = "1vq5f69w75lj81nz75db88lqxc4zvhicd5w7r6k7amggnwxm9f3m";
- name = "kmenuedit-5.8.5.tar.xz";
- };
- };
- kscreen = {
- version = "5.8.5";
- src = fetchurl {
- url = "${mirror}/stable/plasma/5.8.5/kscreen-5.8.5.tar.xz";
- sha256 = "069x3vsfqirmq8r7yfa68srhjvygdwsxcj0b4vvb7zivs29zn1mh";
- name = "kscreen-5.8.5.tar.xz";
- };
- };
- kscreenlocker = {
- version = "5.8.5";
- src = fetchurl {
- url = "${mirror}/stable/plasma/5.8.5/kscreenlocker-5.8.5.tar.xz";
- sha256 = "11b2v3chhk1ma5kjbmf35qahfr8gbaw78mcqs8vw5m9x74vlimkj";
- name = "kscreenlocker-5.8.5.tar.xz";
- };
- };
- ksshaskpass = {
- version = "5.8.5";
- src = fetchurl {
- url = "${mirror}/stable/plasma/5.8.5/ksshaskpass-5.8.5.tar.xz";
- sha256 = "1gr48f4akrn0yhlnjw4yaas6ah5z40fb8iz06gi1dzry5axfmaxh";
- name = "ksshaskpass-5.8.5.tar.xz";
- };
- };
- ksysguard = {
- version = "5.8.5";
- src = fetchurl {
- url = "${mirror}/stable/plasma/5.8.5/ksysguard-5.8.5.tar.xz";
- sha256 = "1gd81y2a459j5k1mpikfrvwcz7v09m526nrl7kpr4l4a1ps8zfy9";
- name = "ksysguard-5.8.5.tar.xz";
- };
- };
- kwallet-pam = {
- version = "5.8.5";
- src = fetchurl {
- url = "${mirror}/stable/plasma/5.8.5/kwallet-pam-5.8.5.tar.xz";
- sha256 = "0310vr3p9fxl3vwdgklk0acx6w31pcpq8mi9yldahg1mkjqf7l44";
- name = "kwallet-pam-5.8.5.tar.xz";
- };
- };
- kwayland-integration = {
- version = "5.8.5";
- src = fetchurl {
- url = "${mirror}/stable/plasma/5.8.5/kwayland-integration-5.8.5.tar.xz";
- sha256 = "11f63mq7crsbrpdib16q8xg0hk8jr5x1cyv43q8qdqm0591cglli";
- name = "kwayland-integration-5.8.5.tar.xz";
- };
- };
- kwin = {
- version = "5.8.5";
- src = fetchurl {
- url = "${mirror}/stable/plasma/5.8.5/kwin-5.8.5.tar.xz";
- sha256 = "182z17d4sad9j15qagx9yz13wwzcyy6hlgpy5nlx6dlfcb8s00x7";
- name = "kwin-5.8.5.tar.xz";
- };
- };
- kwrited = {
- version = "5.8.5";
- src = fetchurl {
- url = "${mirror}/stable/plasma/5.8.5/kwrited-5.8.5.tar.xz";
- sha256 = "1nsr244niyq2bk29s0cqq1p2qj0h1hx4nl13nc3x3aycfhfkjfkr";
- name = "kwrited-5.8.5.tar.xz";
- };
- };
- libkscreen = {
- version = "5.8.5";
- src = fetchurl {
- url = "${mirror}/stable/plasma/5.8.5/libkscreen-5.8.5.tar.xz";
- sha256 = "1zj2nzyl0nmg5za3iwr4q4nzfv69f35f0394b6k0g3dgh1zxmby9";
- name = "libkscreen-5.8.5.tar.xz";
- };
- };
- libksysguard = {
- version = "5.8.5";
- src = fetchurl {
- url = "${mirror}/stable/plasma/5.8.5/libksysguard-5.8.5.tar.xz";
- sha256 = "1acp4kzdjhipsqw90n3rc1ydbkqhb12afwdsfl25fibv0c39avwp";
- name = "libksysguard-5.8.5.tar.xz";
- };
- };
- milou = {
- version = "5.8.5";
- src = fetchurl {
- url = "${mirror}/stable/plasma/5.8.5/milou-5.8.5.tar.xz";
- sha256 = "0lj5cb43jkqs8qg2acs39dkfwskbw135ap65vxiv27ivxscyvz3d";
- name = "milou-5.8.5.tar.xz";
- };
- };
- oxygen = {
- version = "5.8.5";
- src = fetchurl {
- url = "${mirror}/stable/plasma/5.8.5/oxygen-5.8.5.tar.xz";
- sha256 = "199jcn6qzyihxmw38b1cl0ah0rzn7f574khx72n9x5y9143p9lh7";
- name = "oxygen-5.8.5.tar.xz";
- };
- };
- plasma-desktop = {
- version = "5.8.5";
- src = fetchurl {
- url = "${mirror}/stable/plasma/5.8.5/plasma-desktop-5.8.5.tar.xz";
- sha256 = "045990fvhqpwhfi6jqpkzhgbhc3lwvwhkia1y77m12n1djbynpnr";
- name = "plasma-desktop-5.8.5.tar.xz";
- };
- };
- plasma-integration = {
- version = "5.8.5";
- src = fetchurl {
- url = "${mirror}/stable/plasma/5.8.5/plasma-integration-5.8.5.tar.xz";
- sha256 = "1sm7027ywz8xxqfsjv6jvk8zx11kx83rx88bb8cy31qfjipsakfb";
- name = "plasma-integration-5.8.5.tar.xz";
- };
- };
- plasma-nm = {
- version = "5.8.5";
- src = fetchurl {
- url = "${mirror}/stable/plasma/5.8.5/plasma-nm-5.8.5.tar.xz";
- sha256 = "1g1yyzc8y2hsgycficvavpl5yizd54ns93cdky9cgsrnxlkfwbvc";
- name = "plasma-nm-5.8.5.tar.xz";
- };
- };
- plasma-pa = {
- version = "5.8.5";
- src = fetchurl {
- url = "${mirror}/stable/plasma/5.8.5/plasma-pa-5.8.5.tar.xz";
- sha256 = "0vg1dyxfg8rxzyh0xnk41c95zp8rdbx1w462llrwchzp29p3xg1b";
- name = "plasma-pa-5.8.5.tar.xz";
- };
- };
- plasma-sdk = {
- version = "5.8.5";
- src = fetchurl {
- url = "${mirror}/stable/plasma/5.8.5/plasma-sdk-5.8.5.tar.xz";
- sha256 = "13lyb5x4a8aq4fykvdv1137yvc4s4q31fdxhxppza1wkw8lvbvpd";
- name = "plasma-sdk-5.8.5.tar.xz";
- };
- };
- plasma-tests = {
- version = "5.8.5";
- src = fetchurl {
- url = "${mirror}/stable/plasma/5.8.5/plasma-tests-5.8.5.tar.xz";
- sha256 = "0wgqyqlqygi3z0cccpfrpi259jp4yhh2g4x3mqcxisv58mbjrj1b";
- name = "plasma-tests-5.8.5.tar.xz";
- };
- };
- plasma-workspace = {
- version = "5.8.5";
- src = fetchurl {
- url = "${mirror}/stable/plasma/5.8.5/plasma-workspace-5.8.5.tar.xz";
- sha256 = "18bf5wmyb198jnbpivjjwsk65sksrvzlvykx3mr3wvj30mr0f9bd";
- name = "plasma-workspace-5.8.5.tar.xz";
- };
- };
- plasma-workspace-wallpapers = {
- version = "5.8.5";
- src = fetchurl {
- url = "${mirror}/stable/plasma/5.8.5/plasma-workspace-wallpapers-5.8.5.tar.xz";
- sha256 = "116s9qw888lbgxc9ggxf7fa99vggixr2ig1715xb5zmqm14yznyz";
- name = "plasma-workspace-wallpapers-5.8.5.tar.xz";
- };
- };
- polkit-kde-agent = {
- version = "1-5.8.5";
- src = fetchurl {
- url = "${mirror}/stable/plasma/5.8.5/polkit-kde-agent-1-5.8.5.tar.xz";
- sha256 = "1dwk848wljcd9bi0h58h0ljnjlz1qq50rd7i38f3cb848iipisw7";
- name = "polkit-kde-agent-1-5.8.5.tar.xz";
- };
- };
- powerdevil = {
- version = "5.8.5";
- src = fetchurl {
- url = "${mirror}/stable/plasma/5.8.5/powerdevil-5.8.5.tar.xz";
- sha256 = "0lj7jcaqfsipiwi7x4q684p4pfsqzflvddr7hrhirfl1p62bc704";
- name = "powerdevil-5.8.5.tar.xz";
- };
- };
- sddm-kcm = {
- version = "5.8.5";
- src = fetchurl {
- url = "${mirror}/stable/plasma/5.8.5/sddm-kcm-5.8.5.tar.xz";
- sha256 = "0dcvk3f3cqq4z5hc63ccpxyl3kknjvd8jsnx7r2hfrwsw0y90fqc";
- name = "sddm-kcm-5.8.5.tar.xz";
- };
- };
- systemsettings = {
- version = "5.8.5";
- src = fetchurl {
- url = "${mirror}/stable/plasma/5.8.5/systemsettings-5.8.5.tar.xz";
- sha256 = "0pkwmgbjglbyc8i22hivh5gnaj742df3ff3f998k66k81mfjkwga";
- name = "systemsettings-5.8.5.tar.xz";
- };
- };
- user-manager = {
- version = "5.8.5";
- src = fetchurl {
- url = "${mirror}/stable/plasma/5.8.5/user-manager-5.8.5.tar.xz";
- sha256 = "1ck8x860q3aqgbbgiwfdhs0i0bs2nhqqva19kl9x1b015p64gl5z";
- name = "user-manager-5.8.5.tar.xz";
- };
- };
-}
diff --git a/pkgs/desktops/kde-5/plasma/systemsettings.nix b/pkgs/desktops/kde-5/plasma/systemsettings.nix
deleted file mode 100644
index 407d0e916264..000000000000
--- a/pkgs/desktops/kde-5/plasma/systemsettings.nix
+++ /dev/null
@@ -1,14 +0,0 @@
-{
- plasmaPackage, ecm, kdoctools, makeQtWrapper,
- kcmutils, kconfig, kdbusaddons, khtml, ki18n, kiconthemes, kio, kitemviews,
- kservice, kwindowsystem, kxmlgui, qtquickcontrols
-}:
-
-plasmaPackage {
- name = "systemsettings";
- nativeBuildInputs = [ ecm kdoctools makeQtWrapper ];
- propagatedBuildInputs = [
- kcmutils kconfig kdbusaddons khtml ki18n kiconthemes kio kitemviews kservice
- kwindowsystem kxmlgui qtquickcontrols
- ];
-}
diff --git a/pkgs/desktops/lumina/default.nix b/pkgs/desktops/lumina/default.nix
index f593bd144374..2c80f5157b66 100644
--- a/pkgs/desktops/lumina/default.nix
+++ b/pkgs/desktops/lumina/default.nix
@@ -1,5 +1,5 @@
-{ stdenv, fetchFromGitHub, fluxbox, xscreensaver, desktop_file_utils,
- numlockx, xorg, qt5, kde5
+{ stdenv, fetchFromGitHub, fluxbox, xscreensaver, desktop_file_utils, numlockx,
+ xorg, qtbase, qtsvg, qtmultimedia, qtx11extras, qmakeHook, qttools, oxygen-icons5
}:
stdenv.mkDerivation rec {
@@ -14,19 +14,19 @@ stdenv.mkDerivation rec {
};
nativeBuildInputs = [
- qt5.qmakeHook
- qt5.qttools
+ qmakeHook
+ qttools
];
buildInputs = [
xorg.libxcb
xorg.xcbutilwm
xorg.xcbutilimage
- qt5.qtbase
- qt5.qtsvg
- qt5.qtmultimedia
- qt5.qtx11extras
- kde5.oxygen-icons5
+ qtbase
+ qtsvg
+ qtmultimedia
+ qtx11extras
+ oxygen-icons5
fluxbox
xscreensaver
desktop_file_utils
diff --git a/pkgs/desktops/lxqt/base/liblxqt/default.nix b/pkgs/desktops/lxqt/base/liblxqt/default.nix
index b973940b9b63..9363dba86699 100644
--- a/pkgs/desktops/lxqt/base/liblxqt/default.nix
+++ b/pkgs/desktops/lxqt/base/liblxqt/default.nix
@@ -1,27 +1,29 @@
-{ stdenv, fetchFromGitHub, cmake, qt5, kde5, lxqt, xorg }:
+{ stdenv, fetchFromGitHub, cmake, lxqt-build-tools,
+ qtx11extras, qttools, qtsvg, libqtxdg, kwindowsystem, xorg }:
stdenv.mkDerivation rec {
name = "${pname}-${version}";
pname = "liblxqt";
- version = "0.11.0";
+ version = "0.11.1";
src = fetchFromGitHub {
owner = "lxde";
repo = pname;
rev = version;
- sha256 = "12gla3pdg0n28w15qrmha83xm3021xdby8ydwp1qzcips5pa5zac";
+ sha256 = "0dcsgj0qr4589wsibs6fdza4ncqavrhykd05d25rs78pa94lvvh5";
};
nativeBuildInputs = [
cmake
+ lxqt-build-tools
];
buildInputs = [
- qt5.qtx11extras
- qt5.qttools
- qt5.qtsvg
- kde5.kwindowsystem
- lxqt.libqtxdg
+ qtx11extras
+ qttools
+ qtsvg
+ kwindowsystem
+ libqtxdg
xorg.libXScrnSaver
];
@@ -38,7 +40,7 @@ stdenv.mkDerivation rec {
description = "Core utility library for all LXQt components";
homepage = https://github.com/lxde/liblxqt;
license = licenses.lgpl21Plus;
- maintainers = with maintainers; [ romildo ];
platforms = with platforms; unix;
+ maintainers = with maintainers; [ romildo ];
};
}
diff --git a/pkgs/desktops/lxqt/base/libsysstat/default.nix b/pkgs/desktops/lxqt/base/libsysstat/default.nix
index 363b3d33d141..2776a53fa833 100644
--- a/pkgs/desktops/lxqt/base/libsysstat/default.nix
+++ b/pkgs/desktops/lxqt/base/libsysstat/default.nix
@@ -1,17 +1,17 @@
-{ stdenv, fetchFromGitHub, cmake, qt5 }:
+{ stdenv, fetchFromGitHub, cmake, qt5, lxqt }:
stdenv.mkDerivation rec {
name = "libsysstat-${version}";
- version = "0.3.2";
+ version = "0.3.3";
src = fetchFromGitHub {
owner = "lxde";
repo = "libsysstat";
rev = version;
- sha256 = "1swpnz37daj3njkbqddmhaiipfl335c3g675y9afhabg7l4anf1n";
+ sha256 = "1rkbh6jj69wsf8a7w7cq8psqw08vqf9rq5pdnv4xxqb036r4bi31";
};
- nativeBuildInputs = [ cmake ];
+ nativeBuildInputs = [ cmake lxqt.lxqt-build-tools ];
buildInputs = [ qt5.qtbase ];
@@ -19,7 +19,7 @@ stdenv.mkDerivation rec {
description = "Library used to query system info and statistics";
homepage = https://github.com/lxde/libsysstat;
license = licenses.lgpl21Plus;
- maintainers = with maintainers; [ romildo ];
platforms = with platforms; unix;
+ maintainers = with maintainers; [ romildo ];
};
}
diff --git a/pkgs/desktops/lxqt/base/lxqt-build-tools/default.nix b/pkgs/desktops/lxqt/base/lxqt-build-tools/default.nix
new file mode 100644
index 000000000000..f8db33bc5a4d
--- /dev/null
+++ b/pkgs/desktops/lxqt/base/lxqt-build-tools/default.nix
@@ -0,0 +1,23 @@
+{ stdenv, fetchFromGitHub, cmake, qt5 }:
+
+stdenv.mkDerivation rec {
+ name = "lxqt-build-tools-${version}";
+ version = "0.3.2";
+
+ src = fetchFromGitHub {
+ owner = "lxde";
+ repo = "lxqt-build-tools";
+ rev = version;
+ sha256 = "1awd70ifbbi67pklhldjw968c1fw1lcif9nh4qbrjqmlg1gn3kmv";
+ };
+
+ nativeBuildInputs = [ cmake qt5.qtbase ];
+
+ meta = with stdenv.lib; {
+ description = "Various packaging tools and scripts for LXQt applications";
+ homepage = https://github.com/lxde/lxqt-build-tools;
+ license = licenses.lgpl21;
+ platforms = with platforms; unix;
+ maintainers = with maintainers; [ romildo ];
+ };
+}
diff --git a/pkgs/desktops/lxqt/core/libfm-qt/default.nix b/pkgs/desktops/lxqt/core/libfm-qt/default.nix
index 71b6cff5899e..78c0a926b9c8 100644
--- a/pkgs/desktops/lxqt/core/libfm-qt/default.nix
+++ b/pkgs/desktops/lxqt/core/libfm-qt/default.nix
@@ -1,43 +1,41 @@
-{ stdenv, fetchFromGitHub, cmake, pkgconfig, qt5, kde5, lxqt, xorg,
-libfm, menu-cache }:
+{
+ stdenv, fetchFromGitHub, cmake, pkgconfig, lxqt-build-tools,
+ xorg, libfm, menu-cache,
+ qtx11extras, qttools
+}:
stdenv.mkDerivation rec {
name = "${pname}-${version}";
pname = "libfm-qt";
- version = "0.11.1";
+ version = "0.11.2";
src = fetchFromGitHub {
owner = "lxde";
repo = pname;
rev = version;
- sha256 = "1kgvzjsa4ihlj2clz6y6s95nq0lhg66d1dhkgw3mdqaak7d0pdiz";
+ sha256 = "0k2g6bkz7bvawqkjzykbxi18wqsnhbxklqy6aqqkclpzcw45vk5v";
};
nativeBuildInputs = [
cmake
pkgconfig
- lxqt.liblxqt
- lxqt.libqtxdg
+ lxqt-build-tools
];
buildInputs = [
- qt5.qtx11extras
- qt5.qttools
- qt5.qtsvg
- kde5.kwindowsystem
- xorg.libpthreadstubs
- xorg.libXdmcp
+ qtx11extras
+ qttools
libfm
menu-cache
];
cmakeFlags = [ "-DPULL_TRANSLATIONS=NO" ];
-
+
meta = with stdenv.lib; {
description = "Core library of PCManFM-Qt (Qt binding for libfm)";
homepage = https://github.com/lxde/libfm-qt;
license = licenses.lgpl21;
- maintainers = with maintainers; [ romildo ];
platforms = with platforms; unix;
+ maintainers = with maintainers; [ romildo ];
};
}
diff --git a/pkgs/desktops/lxqt/core/lxqt-about/default.nix b/pkgs/desktops/lxqt/core/lxqt-about/default.nix
index 3e3b047dd4ed..ac81391af1d9 100644
--- a/pkgs/desktops/lxqt/core/lxqt-about/default.nix
+++ b/pkgs/desktops/lxqt/core/lxqt-about/default.nix
@@ -1,37 +1,40 @@
-{ stdenv, fetchFromGitHub, cmake, qt5, kde5, lxqt, xorg }:
+{ stdenv, fetchFromGitHub, cmake, lxqt-build-tools, standardPatch, qtx11extras, qttools, qtsvg, kwindowsystem, liblxqt, libqtxdg }:
stdenv.mkDerivation rec {
name = "${pname}-${version}";
pname = "lxqt-about";
- version = "0.11.0";
+ version = "0.11.1";
srcs = fetchFromGitHub {
owner = "lxde";
repo = pname;
rev = version;
- sha256 = "0739gp3af68cvf8fxqvd203xqzncglmxpklq8mryrs5f1xnqp6gc";
+ sha256 = "1pa68pr0iwvh34lippagc8kxdfd0l2071m0vh7dnvfqbnwly29dk";
};
- nativeBuildInputs = [ cmake ];
+ nativeBuildInputs = [
+ cmake
+ lxqt-build-tools
+ ];
buildInputs = [
- qt5.qtx11extras
- qt5.qttools
- qt5.qtsvg
- kde5.kwindowsystem
- lxqt.liblxqt
- lxqt.libqtxdg
+ qtx11extras
+ qttools
+ qtsvg
+ kwindowsystem
+ liblxqt
+ libqtxdg
];
cmakeFlags = [ "-DPULL_TRANSLATIONS=NO" ];
- postPatch = lxqt.standardPatch;
+ postPatch = standardPatch;
meta = with stdenv.lib; {
description = "Dialogue window providing information about LXQt and the system it's running on";
homepage = https://github.com/lxde/lxqt-about;
license = licenses.lgpl21;
- maintainers = with maintainers; [ romildo ];
platforms = with platforms; unix;
+ maintainers = with maintainers; [ romildo ];
};
}
diff --git a/pkgs/desktops/lxqt/core/lxqt-admin/default.nix b/pkgs/desktops/lxqt/core/lxqt-admin/default.nix
index da47e02dcf1f..23b142f352f0 100644
--- a/pkgs/desktops/lxqt/core/lxqt-admin/default.nix
+++ b/pkgs/desktops/lxqt/core/lxqt-admin/default.nix
@@ -1,40 +1,41 @@
-{ stdenv, fetchFromGitHub, cmake, qt5, kde5, lxqt, xorg, polkit }:
+{ stdenv, fetchFromGitHub, cmake, lxqt-build-tools, standardPatch, qtx11extras, qttools, qtsvg, kwindowsystem, liblxqt, libqtxdg, polkit }:
stdenv.mkDerivation rec {
name = "${pname}-${version}";
pname = "lxqt-admin";
- version = "0.11.0";
+ version = "0.11.1";
srcs = fetchFromGitHub {
owner = "lxde";
repo = pname;
rev = version;
- sha256 = "17g9v6dyqy5pgpqragpf0sgnfxz2ip2g7xix7kmkna3qyym44b23";
+ sha256 = "12c1wdciqgiifsk5aslw3990pk9ylk9jhgwnrxvh798rr48hhflr";
};
nativeBuildInputs = [
cmake
+ lxqt-build-tools
];
buildInputs = [
- qt5.qtx11extras
- qt5.qttools
- qt5.qtsvg
- kde5.kwindowsystem
- lxqt.liblxqt
- lxqt.libqtxdg
+ qtx11extras
+ qttools
+ qtsvg
+ kwindowsystem
+ liblxqt
+ libqtxdg
polkit
];
cmakeFlags = [ "-DPULL_TRANSLATIONS=NO" ];
- postPatch = lxqt.standardPatch;
+ postPatch = standardPatch;
meta = with stdenv.lib; {
description = "LXQt system administration tool";
homepage = https://github.com/lxde/lxqt-admin;
license = licenses.lgpl21;
- maintainers = with maintainers; [ romildo ];
platforms = with platforms; unix;
+ maintainers = with maintainers; [ romildo ];
};
}
diff --git a/pkgs/desktops/lxqt/core/lxqt-common/default.nix b/pkgs/desktops/lxqt/core/lxqt-common/default.nix
index a4b8f000dc7b..cc114c31dfd5 100644
--- a/pkgs/desktops/lxqt/core/lxqt-common/default.nix
+++ b/pkgs/desktops/lxqt/core/lxqt-common/default.nix
@@ -1,26 +1,24 @@
-{ stdenv, fetchFromGitHub, cmake, qt5, kde5, lxqt, xorg, hicolor_icon_theme, xmessage }:
+{ stdenv, fetchFromGitHub, cmake, qt5, lxqt, hicolor_icon_theme, xmessage }:
stdenv.mkDerivation rec {
name = "${pname}-${version}";
pname = "lxqt-common";
- version = "0.11.0";
+ version = "0.11.2";
src = fetchFromGitHub {
owner = "lxde";
repo = pname;
rev = version;
- sha256 = "14nx3zcknwsn713wdnmb2xl15vf21vh13kxscdwmfnd48m5j4m3b";
+ sha256 = "07ih2w9ksbxqwy36xvgb9b31740nhkm7ap70wvv8q6x0wyhn71gn";
};
- nativeBuildInputs = [ cmake ];
+ nativeBuildInputs = [
+ cmake
+ lxqt.lxqt-build-tools
+ ];
buildInputs = [
- qt5.qtx11extras
- qt5.qttools
qt5.qtsvg
- kde5.kwindowsystem
- lxqt.liblxqt
- lxqt.libqtxdg
hicolor_icon_theme
xmessage
];
@@ -36,7 +34,7 @@ stdenv.mkDerivation rec {
description = "Common files for LXQt";
homepage = https://github.com/lxde/lxqt-common;
license = licenses.lgpl21;
- maintainers = with maintainers; [ romildo ];
platforms = with platforms; unix;
+ maintainers = with maintainers; [ romildo ];
};
}
diff --git a/pkgs/desktops/lxqt/core/lxqt-config/default.nix b/pkgs/desktops/lxqt/core/lxqt-config/default.nix
index 66187a0ae6f8..7b38d2eec6fd 100644
--- a/pkgs/desktops/lxqt/core/lxqt-config/default.nix
+++ b/pkgs/desktops/lxqt/core/lxqt-config/default.nix
@@ -1,31 +1,32 @@
-{ stdenv, fetchFromGitHub, cmake, pkgconfig, qt5, kde5, lxqt, xorg }:
+{ stdenv, fetchFromGitHub, cmake, pkgconfig, lxqt-build-tools, standardPatch, qtbase, qtx11extras, qttools, qtsvg, kwindowsystem, libkscreen, liblxqt, libqtxdg, libpthreadstubs, xorg }:
stdenv.mkDerivation rec {
name = "${pname}-${version}";
pname = "lxqt-config";
- version = "0.11.0";
+ version = "0.11.1";
srcs = fetchFromGitHub {
owner = "lxde";
repo = pname;
rev = version;
- sha256 = "187x19s0jw20an37v7svkry6p021ply4i3ngh5w2nx5rlqkf63qw";
+ sha256 = "0mqvv93djsw49n0gxpws3hrwimnyf9kzvc2vhjkzrjfxpabk2axx";
};
nativeBuildInputs = [
cmake
pkgconfig
- ];
+ lxqt-build-tools
+ ];
buildInputs = [
- qt5.qtbase
- qt5.qtx11extras
- qt5.qttools
- qt5.qtsvg
- kde5.kwindowsystem
- kde5.libkscreen
- lxqt.liblxqt
- lxqt.libqtxdg
+ qtbase
+ qtx11extras
+ qttools
+ qtsvg
+ kwindowsystem
+ libkscreen
+ liblxqt
+ libqtxdg
xorg.libpthreadstubs
xorg.libXdmcp
xorg.libXScrnSaver
@@ -35,13 +36,13 @@ stdenv.mkDerivation rec {
cmakeFlags = [ "-DPULL_TRANSLATIONS=NO" ];
- postPatch = lxqt.standardPatch;
+ postPatch = standardPatch;
meta = with stdenv.lib; {
description = "Tools to configure LXQt and the underlying operating system";
homepage = https://github.com/lxde/lxqt-config;
license = licenses.lgpl21;
- maintainers = with maintainers; [ romildo ];
platforms = with platforms; unix;
+ maintainers = with maintainers; [ romildo ];
};
}
diff --git a/pkgs/desktops/lxqt/core/lxqt-globalkeys/default.nix b/pkgs/desktops/lxqt/core/lxqt-globalkeys/default.nix
index 7f1f140653fe..73248da1ef80 100644
--- a/pkgs/desktops/lxqt/core/lxqt-globalkeys/default.nix
+++ b/pkgs/desktops/lxqt/core/lxqt-globalkeys/default.nix
@@ -1,38 +1,41 @@
-{ stdenv, fetchFromGitHub, cmake, qt5, kde5, lxqt }:
+{ stdenv, fetchFromGitHub, cmake, lxqt-build-tools, standardPatch, qtbase, qttools, qtx11extras, qtsvg, kwindowsystem, liblxqt, libqtxdg }:
stdenv.mkDerivation rec {
name = "${pname}-${version}";
pname = "lxqt-globalkeys";
- version = "0.11.0";
+ version = "0.11.1";
srcs = fetchFromGitHub {
owner = "lxde";
repo = pname;
rev = version;
- sha256 = "05kcq21fyz7vnhh9k4nzhskgbghp1slsz14gh9anhya4a567xx0y";
+ sha256 = "1kwibll2azi4pafk7crfgibk5a54rnsia3c4cz680iny7xz1wy6h";
};
- nativeBuildInputs = [ cmake ];
+ nativeBuildInputs = [
+ cmake
+ lxqt-build-tools
+ ];
buildInputs = [
- qt5.qtbase
- qt5.qttools
- qt5.qtx11extras
- qt5.qtsvg
- kde5.kwindowsystem
- lxqt.liblxqt
- lxqt.libqtxdg
+ qtbase
+ qttools
+ qtx11extras
+ qtsvg
+ kwindowsystem
+ liblxqt
+ libqtxdg
];
cmakeFlags = [ "-DPULL_TRANSLATIONS=NO" ];
- postPatch = lxqt.standardPatch;
+ postPatch = standardPatch;
meta = with stdenv.lib; {
description = "Daemon used to register global keyboard shortcuts";
homepage = https://github.com/lxde/lxqt-globalkeys;
license = licenses.lgpl21;
- maintainers = with maintainers; [ romildo ];
platforms = with platforms; unix;
+ maintainers = with maintainers; [ romildo ];
};
}
diff --git a/pkgs/desktops/lxqt/core/lxqt-l10n/default.nix b/pkgs/desktops/lxqt/core/lxqt-l10n/default.nix
index 477575289bb1..b836b9776e65 100644
--- a/pkgs/desktops/lxqt/core/lxqt-l10n/default.nix
+++ b/pkgs/desktops/lxqt/core/lxqt-l10n/default.nix
@@ -1,25 +1,20 @@
-{ stdenv, fetchFromGitHub, cmake, qt5, kde5, lxqt }:
+{ stdenv, fetchFromGitHub, cmake, qt5, lxqt }:
stdenv.mkDerivation rec {
name = "lxqt-l10n-${version}";
- version = "0.11.0";
+ version = "0.11.2";
src = fetchFromGitHub {
owner = "lxde";
repo = "lxqt-l10n";
rev = version;
- sha256 = "1gwismyjfdd7lwlgfl5jvbxmkbq9v9ia0shm4f7hkkvlpc2y24gk";
+ sha256 = "1vk4q98kraq0lba50n9z6jwiapc7nz2b143b4ldlmrz4wscd867h";
};
nativeBuildInputs = [
cmake
- qt5.qtbase
- qt5.qtx11extras
qt5.qttools
- qt5.qtsvg
- kde5.kwindowsystem
- lxqt.liblxqt
- lxqt.libqtxdg
+ lxqt.lxqt-build-tools
];
postPatch = ''
@@ -31,7 +26,7 @@ stdenv.mkDerivation rec {
description = "Translations of LXQt";
homepage = https://github.com/lxde/lxqt-l10n;
license = licenses.lgpl21Plus;
- maintainers = with maintainers; [ romildo ];
platforms = with platforms; unix;
+ maintainers = with maintainers; [ romildo ];
};
}
diff --git a/pkgs/desktops/lxqt/core/lxqt-notificationd/default.nix b/pkgs/desktops/lxqt/core/lxqt-notificationd/default.nix
index 1ecef6334946..cb10df5a1b72 100644
--- a/pkgs/desktops/lxqt/core/lxqt-notificationd/default.nix
+++ b/pkgs/desktops/lxqt/core/lxqt-notificationd/default.nix
@@ -1,26 +1,30 @@
-{ stdenv, fetchFromGitHub, cmake, qt5, kde5, lxqt }:
+{ stdenv, fetchFromGitHub, cmake, lxqt-build-tools, qtbase, qttools, qtsvg, kwindowsystem, liblxqt, libqtxdg, lxqt-common }:
stdenv.mkDerivation rec {
name = "${pname}-${version}";
pname = "lxqt-notificationd";
- version = "0.11.0";
+ version = "0.11.1";
srcs = fetchFromGitHub {
owner = "lxde";
repo = pname;
rev = version;
- sha256 = "001xcvmg7ap5pbssc9pqp4jshgq2h4zxk9rra76xnrby6k8n6p3x";
+ sha256 = "1n39zjczzhqn73vfyjngybmk9w8j1z3vjkaq80rf2hk89vwsm0wc";
};
- nativeBuildInputs = [ cmake ];
+ nativeBuildInputs = [
+ cmake
+ lxqt-build-tools
+ ];
buildInputs = [
- qt5.qtbase
- qt5.qttools
- qt5.qtsvg
- kde5.kwindowsystem
- lxqt.liblxqt
- lxqt.libqtxdg
+ qtbase
+ qttools
+ qtsvg
+ kwindowsystem
+ liblxqt
+ libqtxdg
+ lxqt-common
];
cmakeFlags = [ "-DPULL_TRANSLATIONS=NO" ];
@@ -29,7 +33,7 @@ stdenv.mkDerivation rec {
description = "The LXQt notification daemon";
homepage = https://github.com/lxde/lxqt-notificationd;
license = licenses.lgpl21;
- maintainers = with maintainers; [ romildo ];
platforms = with platforms; unix;
+ maintainers = with maintainers; [ romildo ];
};
}
diff --git a/pkgs/desktops/lxqt/core/lxqt-openssh-askpass/default.nix b/pkgs/desktops/lxqt/core/lxqt-openssh-askpass/default.nix
index 202231fbdea9..a52ce02cd14b 100644
--- a/pkgs/desktops/lxqt/core/lxqt-openssh-askpass/default.nix
+++ b/pkgs/desktops/lxqt/core/lxqt-openssh-askpass/default.nix
@@ -1,27 +1,30 @@
-{ stdenv, fetchFromGitHub, cmake, qt5, kde5, lxqt }:
+{ stdenv, fetchFromGitHub, cmake, lxqt-build-tools, qtbase, qttools, qtsvg, qtx11extras, kwindowsystem, liblxqt, libqtxdg }:
stdenv.mkDerivation rec {
name = "${pname}-${version}";
pname = "lxqt-openssh-askpass";
- version = "0.11.0";
+ version = "0.11.1";
srcs = fetchFromGitHub {
owner = "lxde";
repo = pname;
rev = version;
- sha256 = "0nz8sv3yrqbzgmd6jahaqaa71axy5x06k091splp9cmab0vzng7c";
+ sha256 = "030pzys86s7rpgl35kl4b3y7gmv9982j3blmg8927nq4pw61gfj9";
};
- nativeBuildInputs = [ cmake ];
+ nativeBuildInputs = [
+ cmake
+ lxqt-build-tools
+ ];
buildInputs = [
- qt5.qtbase
- qt5.qttools
- qt5.qtx11extras
- qt5.qtsvg
- kde5.kwindowsystem
- lxqt.liblxqt
- lxqt.libqtxdg
+ qtbase
+ qttools
+ qtx11extras
+ qtsvg
+ kwindowsystem
+ liblxqt
+ libqtxdg
];
cmakeFlags = [ "-DPULL_TRANSLATIONS=NO" ];
@@ -30,7 +33,7 @@ stdenv.mkDerivation rec {
description = "GUI to query passwords on behalf of SSH agents";
homepage = https://github.com/lxde/lxqt-openssh-askpass;
license = licenses.lgpl21;
- maintainers = with maintainers; [ romildo ];
platforms = with platforms; unix;
+ maintainers = with maintainers; [ romildo ];
};
}
diff --git a/pkgs/desktops/lxqt/core/lxqt-panel/default.nix b/pkgs/desktops/lxqt/core/lxqt-panel/default.nix
index d5786444fadb..d2faf9c0eee4 100644
--- a/pkgs/desktops/lxqt/core/lxqt-panel/default.nix
+++ b/pkgs/desktops/lxqt/core/lxqt-panel/default.nix
@@ -1,34 +1,44 @@
-{ stdenv, fetchFromGitHub, cmake, pkgconfig, qt5, kde5, lxqt, xorg,
-libstatgrab, lm_sensors, libpulseaudio, alsaLib, menu-cache,
-lxmenu-data }:
+{
+ stdenv, fetchFromGitHub, fetchurl, standardPatch,
+ cmake, pkgconfig, lxqt-build-tools,
+ qtbase, qttools, qtx11extras, qtsvg, libdbusmenu, kwindowsystem, solid,
+ kguiaddons, liblxqt, libqtxdg, lxqt-common, lxqt-globalkeys, libsysstat,
+ xorg, libstatgrab, lm_sensors, libpulseaudio, alsaLib, menu-cache,
+ lxmenu-data
+}:
stdenv.mkDerivation rec {
name = "${pname}-${version}";
pname = "lxqt-panel";
- version = "0.11.0";
+ version = "0.11.1";
srcs = fetchFromGitHub {
owner = "lxde";
repo = pname;
rev = version;
- sha256 = "0lwgz6nir4cd50xbmc3arngnw38rb5kqgcsgp3dlq6gpncg45hdq";
+ sha256 = "097rivly61i99v0w9a3dgbwbc4c5x9nh3jl0n94dix1qgd4w983y";
};
- nativeBuildInputs = [ cmake pkgconfig ];
+ nativeBuildInputs = [
+ cmake
+ pkgconfig
+ lxqt-build-tools
+ ];
buildInputs = [
- qt5.qtbase
- qt5.qttools
- qt5.qtx11extras
- qt5.qtsvg
- qt5.libdbusmenu
- kde5.kwindowsystem
- kde5.solid
- kde5.kguiaddons
- lxqt.liblxqt
- lxqt.libqtxdg
- lxqt.lxqt-globalkeys
- lxqt.libsysstat
+ qtbase
+ qttools
+ qtx11extras
+ qtsvg
+ libdbusmenu
+ kwindowsystem
+ solid
+ kguiaddons
+ liblxqt
+ libqtxdg
+ lxqt-common
+ lxqt-globalkeys
+ libsysstat
xorg.libpthreadstubs
xorg.libXdmcp
libstatgrab
@@ -39,15 +49,22 @@ stdenv.mkDerivation rec {
lxmenu-data
];
+ patches = [
+ (fetchurl {
+ url = https://github.com/lxde/lxqt-panel/commit/ec62109e0fa678875a9b10fc6f1975267432712d.patch;
+ sha256 = "1ywwk8gb6gbvs8z9gwgsnb13z1jvyvjij349nq7ij6iyhyld0jlr";
+ })
+ ];
+
cmakeFlags = [ "-DPULL_TRANSLATIONS=NO" ];
- postPatch = lxqt.standardPatch;
+ postPatch = standardPatch;
meta = with stdenv.lib; {
description = "The LXQt desktop panel";
homepage = https://github.com/lxde/lxqt-panel;
license = licenses.lgpl21;
- maintainers = with maintainers; [ romildo ];
platforms = with platforms; unix;
+ maintainers = with maintainers; [ romildo ];
};
}
diff --git a/pkgs/desktops/lxqt/core/lxqt-policykit/default.nix b/pkgs/desktops/lxqt/core/lxqt-policykit/default.nix
index 627f43f8be60..bdcc0a4d606e 100644
--- a/pkgs/desktops/lxqt/core/lxqt-policykit/default.nix
+++ b/pkgs/desktops/lxqt/core/lxqt-policykit/default.nix
@@ -1,28 +1,36 @@
-{ stdenv, fetchFromGitHub, cmake, pkgconfig, qt5, kde5, lxqt }:
+{
+ stdenv, fetchFromGitHub, cmake, pkgconfig, lxqt-build-tools,
+ qtbase, qttools, qtx11extras, qtsvg, polkit-qt, kwindowsystem, liblxqt,
+ libqtxdg,
+}:
stdenv.mkDerivation rec {
name = "${pname}-${version}";
pname = "lxqt-policykit";
- version = "0.11.0";
+ version = "0.11.1";
srcs = fetchFromGitHub {
owner = "lxde";
repo = pname;
rev = version;
- sha256 = "0rbqzh8r259cc44f1cb236p9c3lp195zjdsw3w1nz7j7gzv9yjnd";
+ sha256 = "0sf8wj152z1xid1i2x5g1zpgh7lwq8f0rbrk3r9shyksxqcj2d8p";
};
- nativeBuildInputs = [ cmake pkgconfig ];
+ nativeBuildInputs = [
+ cmake
+ pkgconfig
+ lxqt-build-tools
+ ];
buildInputs = [
- qt5.qtbase
- qt5.qttools
- qt5.qtx11extras
- qt5.qtsvg
- qt5.polkit-qt
- kde5.kwindowsystem
- lxqt.liblxqt
- lxqt.libqtxdg
+ qtbase
+ qttools
+ qtx11extras
+ qtsvg
+ polkit-qt
+ kwindowsystem
+ liblxqt
+ libqtxdg
];
cmakeFlags = [ "-DPULL_TRANSLATIONS=NO" ];
@@ -31,7 +39,7 @@ stdenv.mkDerivation rec {
description = "The LXQt PolicyKit agent";
homepage = https://github.com/lxde/lxqt-policykit;
license = licenses.lgpl21;
- maintainers = with maintainers; [ romildo ];
platforms = with platforms; unix;
+ maintainers = with maintainers; [ romildo ];
};
}
diff --git a/pkgs/desktops/lxqt/core/lxqt-powermanagement/default.nix b/pkgs/desktops/lxqt/core/lxqt-powermanagement/default.nix
index aabce857edd5..d3793a9d9286 100644
--- a/pkgs/desktops/lxqt/core/lxqt-powermanagement/default.nix
+++ b/pkgs/desktops/lxqt/core/lxqt-powermanagement/default.nix
@@ -1,29 +1,32 @@
-{ stdenv, fetchFromGitHub, cmake, qt5, kde5, lxqt }:
+{ stdenv, fetchFromGitHub, cmake, lxqt-build-tools, qtbase, qttools, qtx11extras, qtsvg, kwindowsystem, solid, kidletime, liblxqt, libqtxdg }:
stdenv.mkDerivation rec {
name = "${pname}-${version}";
pname = "lxqt-powermanagement";
- version = "0.11.0";
+ version = "0.11.1";
srcs = fetchFromGitHub {
owner = "lxde";
repo = pname;
rev = version;
- sha256 = "10myxrhlhvr9cmcqv67skzd11c40bgqgf6qdvm5smww2il1mzfwa";
+ sha256 = "0rcjq20ap6kc3m1f2glb8c62qhsx8qh0rkzlj3rykdj6n4hc0x79";
};
- nativeBuildInputs = [ cmake ];
+ nativeBuildInputs = [
+ cmake
+ lxqt-build-tools
+ ];
buildInputs = [
- qt5.qtbase
- qt5.qttools
- qt5.qtx11extras
- qt5.qtsvg
- kde5.kwindowsystem
- kde5.solid
- kde5.kidletime
- lxqt.liblxqt
- lxqt.libqtxdg
+ qtbase
+ qttools
+ qtx11extras
+ qtsvg
+ kwindowsystem
+ solid
+ kidletime
+ liblxqt
+ libqtxdg
];
cmakeFlags = [ "-DPULL_TRANSLATIONS=NO" ];
@@ -32,7 +35,7 @@ stdenv.mkDerivation rec {
description = "Power management module for LXQt";
homepage = https://github.com/lxde/lxqt-powermanagement;
license = licenses.lgpl21;
- maintainers = with maintainers; [ romildo ];
platforms = with platforms; unix;
+ maintainers = with maintainers; [ romildo ];
};
}
diff --git a/pkgs/desktops/lxqt/core/lxqt-qtplugin/default.nix b/pkgs/desktops/lxqt/core/lxqt-qtplugin/default.nix
index e0a95d23c4e1..d5b8987bbb82 100644
--- a/pkgs/desktops/lxqt/core/lxqt-qtplugin/default.nix
+++ b/pkgs/desktops/lxqt/core/lxqt-qtplugin/default.nix
@@ -1,39 +1,44 @@
-{ stdenv, fetchFromGitHub, cmake, qt5, kde5, lxqt }:
+{
+ stdenv, fetchFromGitHub, standardPatch,
+ cmake, lxqt-build-tools,
+ qtbase, qtx11extras, qttools, qtsvg, libdbusmenu, libqtxdg,
+}:
stdenv.mkDerivation rec {
name = "${pname}-${version}";
pname = "lxqt-qtplugin";
- version = "0.11.0";
+ version = "0.11.1";
srcs = fetchFromGitHub {
owner = "lxde";
repo = pname;
rev = version;
- sha256 = "14bwi1c078arin025jcygz0db9nfr8qla9071ls17bbp4dh14vhx";
+ sha256 = "12hyw7rk3zx51n6g2bazlqv70xap0lygm9v21ibxgy1aw0j6iy02";
};
- nativeBuildInputs = [ cmake ];
+ nativeBuildInputs = [
+ cmake
+ lxqt-build-tools
+ ];
buildInputs = [
- qt5.qtbase
- qt5.qtx11extras
- qt5.qttools
- qt5.qtsvg
- qt5.libdbusmenu
- kde5.kwindowsystem
- lxqt.liblxqt
- lxqt.libqtxdg
+ qtbase
+ qtx11extras
+ qttools
+ qtsvg
+ libdbusmenu
+ libqtxdg
];
cmakeFlags = [ "-DPULL_TRANSLATIONS=NO" ];
- postPatch = lxqt.standardPatch;
+ postPatch = standardPatch;
meta = with stdenv.lib; {
description = "LXQt Qt platform integration plugin";
homepage = https://github.com/lxde/lxqt-qtplugin;
license = licenses.lgpl21;
- maintainers = with maintainers; [ romildo ];
platforms = with platforms; unix;
+ maintainers = with maintainers; [ romildo ];
};
}
diff --git a/pkgs/desktops/lxqt/core/lxqt-runner/default.nix b/pkgs/desktops/lxqt/core/lxqt-runner/default.nix
index 02d6f90397ac..550025f8e87b 100644
--- a/pkgs/desktops/lxqt/core/lxqt-runner/default.nix
+++ b/pkgs/desktops/lxqt/core/lxqt-runner/default.nix
@@ -1,28 +1,33 @@
-{ stdenv, fetchFromGitHub, cmake, pkgconfig, qt5, kde5, lxqt,
+{ stdenv, fetchFromGitHub, cmake, pkgconfig, lxqt-build-tools, qtbase, qttools, qtsvg, kwindowsystem, liblxqt, libqtxdg, lxqt-common, lxqt-globalkeys,
menu-cache, muparser }:
stdenv.mkDerivation rec {
name = "${pname}-${version}";
pname = "lxqt-runner";
- version = "0.11.0";
+ version = "0.11.1";
srcs = fetchFromGitHub {
owner = "lxde";
repo = pname;
rev = version;
- sha256 = "1gqs1b90km39dbg49g80x770i9jknni4h8y6ka2r1fga35amllkc";
+ sha256 = "1nsxm0fplwrzz3vccd5fm82lpl4fqss6kv558zj44vzpsl13l954";
};
- nativeBuildInputs = [ cmake pkgconfig ];
+ nativeBuildInputs = [
+ cmake
+ pkgconfig
+ lxqt-build-tools
+ ];
buildInputs = [
- qt5.qtbase
- qt5.qttools
- qt5.qtsvg
- kde5.kwindowsystem
- lxqt.liblxqt
- lxqt.libqtxdg
- lxqt.lxqt-globalkeys
+ qtbase
+ qttools
+ qtsvg
+ kwindowsystem
+ liblxqt
+ libqtxdg
+ lxqt-common
+ lxqt-globalkeys
menu-cache
muparser
];
@@ -33,7 +38,7 @@ stdenv.mkDerivation rec {
description = "Tool used to launch programs quickly by typing their names";
homepage = https://github.com/lxde/lxqt-runner;
license = licenses.lgpl21;
- maintainers = with maintainers; [ romildo ];
platforms = with platforms; unix;
+ maintainers = with maintainers; [ romildo ];
};
}
diff --git a/pkgs/desktops/lxqt/core/lxqt-session/default.nix b/pkgs/desktops/lxqt/core/lxqt-session/default.nix
index a226169b21a9..35879af28e88 100644
--- a/pkgs/desktops/lxqt/core/lxqt-session/default.nix
+++ b/pkgs/desktops/lxqt/core/lxqt-session/default.nix
@@ -1,26 +1,31 @@
-{ stdenv, fetchFromGitHub, cmake, pkgconfig, qt5, kde5, lxqt, xorg, xdg-user-dirs }:
+{ stdenv, fetchFromGitHub, cmake, pkgconfig, lxqt-build-tools, qtbase, qttools, qtsvg, kwindowsystem, liblxqt, libqtxdg, lxqt-common, xorg, xdg-user-dirs }:
stdenv.mkDerivation rec {
name = "${pname}-${version}";
pname = "lxqt-session";
- version = "0.11.0";
+ version = "0.11.1";
srcs = fetchFromGitHub {
owner = "lxde";
repo = pname;
rev = version;
- sha256 = "1vb8mcy6z1irnd977x5425mbp4c7yc9dhk5552isqss1qb44hpn4";
+ sha256 = "14ahgix5jsv7fkmvz1imw9a12ygxccqrdxp9yfbpin1az9q1n1qv";
};
- nativeBuildInputs = [ cmake pkgconfig ];
+ nativeBuildInputs = [
+ cmake
+ pkgconfig
+ lxqt-build-tools
+ ];
buildInputs = [
- qt5.qtbase
- qt5.qttools
- qt5.qtsvg
- kde5.kwindowsystem
- lxqt.liblxqt
- lxqt.libqtxdg
+ qtbase
+ qttools
+ qtsvg
+ kwindowsystem
+ liblxqt
+ libqtxdg
+ lxqt-common
xorg.libpthreadstubs
xorg.libXdmcp
xdg-user-dirs
@@ -32,7 +37,7 @@ stdenv.mkDerivation rec {
description = "An alternative session manager ported from the original razor-session";
homepage = https://github.com/lxde/lxqt-session;
license = licenses.lgpl21;
- maintainers = with maintainers; [ romildo ];
platforms = with platforms; unix;
+ maintainers = with maintainers; [ romildo ];
};
}
diff --git a/pkgs/desktops/lxqt/core/lxqt-sudo/default.nix b/pkgs/desktops/lxqt/core/lxqt-sudo/default.nix
index ad0885917aed..1e235af3c900 100644
--- a/pkgs/desktops/lxqt/core/lxqt-sudo/default.nix
+++ b/pkgs/desktops/lxqt/core/lxqt-sudo/default.nix
@@ -1,27 +1,30 @@
-{ stdenv, fetchFromGitHub, cmake, qt5, kde5, lxqt, sudo }:
+{ stdenv, fetchFromGitHub, cmake, lxqt-build-tools, qtbase, qttools, qtx11extras, qtsvg, kwindowsystem, liblxqt, libqtxdg, sudo }:
stdenv.mkDerivation rec {
name = "${pname}-${version}";
pname = "lxqt-sudo";
- version = "0.11.0";
+ version = "0.11.1";
srcs = fetchFromGitHub {
owner = "lxde";
repo = pname;
rev = version;
- sha256 = "0nmn0j5qvqpkhlq8yvl8ycn3hijbnwxd32hhmxhcnaq07cmzbg1j";
+ sha256 = "0imy4cs51im81rd0wa03wy418cdv9gqqgmwkc7v58cip7h665pyk";
};
- nativeBuildInputs = [ cmake ];
+ nativeBuildInputs = [
+ cmake
+ lxqt-build-tools
+ ];
buildInputs = [
- qt5.qtbase
- qt5.qttools
- qt5.qtx11extras
- qt5.qtsvg
- kde5.kwindowsystem
- lxqt.liblxqt
- lxqt.libqtxdg
+ qtbase
+ qttools
+ qtx11extras
+ qtsvg
+ kwindowsystem
+ liblxqt
+ libqtxdg
sudo
];
@@ -31,7 +34,7 @@ stdenv.mkDerivation rec {
description = "GUI frontend for sudo/su";
homepage = https://github.com/lxde/lxqt-sudo;
license = licenses.lgpl21;
- maintainers = with maintainers; [ romildo ];
platforms = with platforms; unix;
+ maintainers = with maintainers; [ romildo ];
};
}
diff --git a/pkgs/desktops/lxqt/core/pavucontrol-qt/default.nix b/pkgs/desktops/lxqt/core/pavucontrol-qt/default.nix
index ea2f24d6cf1f..b8421d062021 100644
--- a/pkgs/desktops/lxqt/core/pavucontrol-qt/default.nix
+++ b/pkgs/desktops/lxqt/core/pavucontrol-qt/default.nix
@@ -1,29 +1,27 @@
-{ stdenv, fetchFromGitHub, cmake, pkgconfig, qt5, kde5, lxqt,
-xdg-user-dirs, libpulseaudio }:
+{ stdenv, fetchFromGitHub, cmake, pkgconfig, qt5, lxqt, libpulseaudio }:
stdenv.mkDerivation rec {
name = "${pname}-${version}";
pname = "pavucontrol-qt";
- version = "0.1.0";
+ version = "0.2.0";
srcs = fetchFromGitHub {
owner = "lxde";
repo = pname;
rev = version;
- sha256 = "1bis88ykasrnk9a55nnbn832acjz2h76h6i3lbxnb36yq71wan7j";
+ sha256 = "0k7sg4dxr48nk15gpqlnkjr9gbh7r5gs0s0ydifcmw281khrzlzj";
};
- nativeBuildInputs = [ cmake pkgconfig ];
+ nativeBuildInputs = [
+ cmake
+ pkgconfig
+ lxqt.lxqt-build-tools
+ ];
buildInputs = [
qt5.qtbase
qt5.qttools
qt5.qtx11extras
- qt5.qtsvg
- kde5.kwindowsystem
- lxqt.liblxqt
- lxqt.libqtxdg
- xdg-user-dirs
libpulseaudio
];
@@ -33,7 +31,7 @@ stdenv.mkDerivation rec {
description = "A Pulseaudio mixer in Qt (port of pavucontrol)";
homepage = https://github.com/lxde/pavucontrol-qt;
license = licenses.gpl2;
- maintainers = with maintainers; [ romildo ];
platforms = with platforms; unix;
+ maintainers = with maintainers; [ romildo ];
};
}
diff --git a/pkgs/desktops/lxqt/core/pcmanfm-qt/default.nix b/pkgs/desktops/lxqt/core/pcmanfm-qt/default.nix
index bc9cf774017f..7c115c2ca27f 100644
--- a/pkgs/desktops/lxqt/core/pcmanfm-qt/default.nix
+++ b/pkgs/desktops/lxqt/core/pcmanfm-qt/default.nix
@@ -1,31 +1,28 @@
-{ stdenv, fetchFromGitHub, cmake, pkgconfig, qt5, kde5, lxqt, xorg, libfm,
-menu-cache, lxmenu-data }:
+{ stdenv, fetchFromGitHub, cmake, pkgconfig, qt5, lxqt, libfm, menu-cache, lxmenu-data }:
stdenv.mkDerivation rec {
name = "${pname}-${version}";
pname = "pcmanfm-qt";
- version = "0.11.1";
+ version = "0.11.3";
srcs = fetchFromGitHub {
owner = "lxde";
repo = pname;
rev = version;
- sha256 = "04fv23glcnfiszam90iy3gvn2sigyk8zj8a1s43wz8fgjijnws32";
+ sha256 = "04vhfhjmz1a4rhkpb6y35hwg565047rp53rcxf4pdn0i9f6zhr4f";
};
- nativeBuildInputs = [ cmake pkgconfig ];
+ nativeBuildInputs = [
+ cmake
+ pkgconfig
+ lxqt.lxqt-build-tools
+ ];
buildInputs = [
qt5.qtbase
qt5.qttools
qt5.qtx11extras
- qt5.qtsvg
- kde5.kwindowsystem
- lxqt.liblxqt
- lxqt.libqtxdg
lxqt.libfm-qt
- xorg.libpthreadstubs
- xorg.libXdmcp
libfm
menu-cache
lxmenu-data
@@ -37,7 +34,7 @@ stdenv.mkDerivation rec {
description = "File manager and desktop icon manager (Qt port of PCManFM and libfm)";
homepage = https://github.com/lxde/pcmanfm-qt;
license = licenses.gpl2;
- maintainers = with maintainers; [ romildo ];
platforms = with platforms; unix;
+ maintainers = with maintainers; [ romildo ];
};
}
diff --git a/pkgs/desktops/lxqt/core/qtermwidget/default.nix b/pkgs/desktops/lxqt/core/qtermwidget/default.nix
index 33f3cc19cf67..66620e195ec0 100644
--- a/pkgs/desktops/lxqt/core/qtermwidget/default.nix
+++ b/pkgs/desktops/lxqt/core/qtermwidget/default.nix
@@ -3,13 +3,13 @@
stdenv.mkDerivation rec {
name = "${pname}-${version}";
pname = "qtermwidget";
- version = "0.7.0";
+ version = "0.7.1";
srcs = fetchFromGitHub {
owner = "lxde";
repo = pname;
rev = version;
- sha256 = "18dnrzpbijh0xdgx83zs8nlbxk0d7hgzib54fqqvxyrjjy4g9scz";
+ sha256 = "0awp33cnkpi9brpx01mz5hwj7j2lq1wdi8cabk3wassd99vvxdxz";
};
nativeBuildInputs = [ cmake ];
@@ -20,7 +20,7 @@ stdenv.mkDerivation rec {
description = "A terminal emulator widget for Qt 5";
homepage = https://github.com/lxde/qtermwidget;
license = licenses.gpl2;
- maintainers = with maintainers; [ romildo ];
platforms = with platforms; unix;
+ maintainers = with maintainers; [ romildo ];
};
}
diff --git a/pkgs/desktops/lxqt/default.nix b/pkgs/desktops/lxqt/default.nix
index d5f5194c48e4..fbcb286f5b24 100644
--- a/pkgs/desktops/lxqt/default.nix
+++ b/pkgs/desktops/lxqt/default.nix
@@ -1,13 +1,11 @@
-{ pkgs, newScope, fetchFromGitHub }:
+{ pkgs, makeScope, libsForQt5, fetchFromGitHub }:
let
- callPackage = newScope self;
-
- self = rec {
+ packages = self: with self; {
# For compiling information, see:
# - https://github.com/lxde/lxqt/wiki/Building-from-source
-
+
standardPatch = ''
for file in $(find . -name CMakeLists.txt); do
substituteInPlace $file \
@@ -28,6 +26,7 @@ let
### BASE
libqtxdg = callPackage ./base/libqtxdg { };
+ lxqt-build-tools = callPackage ./base/lxqt-build-tools { };
libsysstat = callPackage ./base/libsysstat { };
liblxqt = callPackage ./base/liblxqt { };
@@ -56,7 +55,7 @@ let
### OPTIONAL
qterminal = callPackage ./optional/qterminal { };
- compton-conf = callPackage ./optional/compton-conf { };
+ compton-conf = pkgs.qt5.callPackage ./optional/compton-conf { };
obconf-qt = callPackage ./optional/obconf-qt { };
lximage-qt = callPackage ./optional/lximage-qt { };
qps = callPackage ./optional/qps { };
@@ -65,8 +64,8 @@ let
preRequisitePackages = [
pkgs.gvfs # virtual file systems support for PCManFM-QT
- pkgs.kde5.kwindowsystem # provides some QT5 plugins needed by lxqt-panel
- pkgs.kde5.libkscreen # provides plugins for screen management software
+ pkgs.libsForQt5.kwindowsystem # provides some QT5 plugins needed by lxqt-panel
+ pkgs.libsForQt5.libkscreen # provides plugins for screen management software
pkgs.libfm
pkgs.libfm-extra
pkgs.lxmenu-data
@@ -119,7 +118,7 @@ let
qlipper
### Default icon theme
- pkgs.kde5.oxygen-icons5
+ pkgs.oxygen-icons5
### Screen saver
pkgs.xscreensaver
@@ -127,4 +126,4 @@ let
};
-in self
+in makeScope libsForQt5.newScope packages
diff --git a/pkgs/desktops/lxqt/optional/compton-conf/default.nix b/pkgs/desktops/lxqt/optional/compton-conf/default.nix
index 45717fe31e20..6e1ea1288539 100644
--- a/pkgs/desktops/lxqt/optional/compton-conf/default.nix
+++ b/pkgs/desktops/lxqt/optional/compton-conf/default.nix
@@ -1,27 +1,26 @@
-{ stdenv, fetchFromGitHub, cmake, pkgconfig, qt5, kde5, lxqt, libconfig }:
+{ stdenv, fetchFromGitHub, cmake, pkgconfig, qtbase, qttools, lxqt, libconfig }:
stdenv.mkDerivation rec {
name = "${pname}-${version}";
pname = "compton-conf";
- version = "0.2.0";
+ version = "0.2.1";
srcs = fetchFromGitHub {
owner = "lxde";
repo = pname;
rev = version;
- sha256 = "04svxawa8l0ciflrspkzi13nnl7bljmfwwrgxn5lb3sw6qdcmdlk";
+ sha256 = "1hmirhsz010h6a6k7my1krh5nw5ds4x00c5fq6apamrdd8d4zrmq";
};
- nativeBuildInputs = [ cmake pkgconfig ];
+ nativeBuildInputs = [
+ cmake
+ pkgconfig
+ lxqt.lxqt-build-tools
+ ];
buildInputs = [
- qt5.qtbase
- qt5.qttools
- qt5.qtx11extras
- qt5.qtsvg
- kde5.kwindowsystem
- lxqt.liblxqt
- lxqt.libqtxdg
+ qtbase
+ qttools
libconfig
];
@@ -31,7 +30,7 @@ stdenv.mkDerivation rec {
description = "GUI configuration tool for compton X composite manager";
homepage = https://github.com/lxde/compton-conf;
license = licenses.lgpl21;
- maintainers = with maintainers; [ romildo ];
platforms = with platforms; unix;
+ maintainers = with maintainers; [ romildo ];
};
}
diff --git a/pkgs/desktops/lxqt/optional/lximage-qt/default.nix b/pkgs/desktops/lxqt/optional/lximage-qt/default.nix
index ac7055924c42..3308f0e412bd 100644
--- a/pkgs/desktops/lxqt/optional/lximage-qt/default.nix
+++ b/pkgs/desktops/lxqt/optional/lximage-qt/default.nix
@@ -1,33 +1,33 @@
-{ stdenv, fetchFromGitHub, cmake, pkgconfig, qt5, kde5, xorg, lxqt,
- libfm, menu-cache, libexif }:
+{ stdenv, fetchFromGitHub, cmake, pkgconfig, qt5, xorg, lxqt, libfm, libexif }:
stdenv.mkDerivation rec {
name = "${pname}-${version}";
pname = "lximage-qt";
- version = "0.5.0";
+ version = "0.5.1";
srcs = fetchFromGitHub {
owner = "lxde";
repo = pname;
rev = version;
- sha256 = "0c5s0c2y73hp7mcxwg31bpn0kmjyhv519d0dxzp3na56n0xk9vl0";
+ sha256 = "0hyiarjjxjwvzinlfnfxbqx40dhgydd3ccv3xqwvj7yni1nfx7pb";
};
- nativeBuildInputs = [ cmake pkgconfig ];
+
+ nativeBuildInputs = [
+ cmake
+ pkgconfig
+ lxqt.lxqt-build-tools
+ ];
buildInputs = [
qt5.qtbase
qt5.qttools
qt5.qtx11extras
qt5.qtsvg
- kde5.kwindowsystem
- lxqt.liblxqt
- lxqt.libqtxdg
lxqt.libfm-qt
xorg.libpthreadstubs
xorg.libXdmcp
libfm
- menu-cache
libexif
];
@@ -37,7 +37,7 @@ stdenv.mkDerivation rec {
description = "The image viewer and screenshot tool for lxqt";
homepage = https://github.com/lxde/lximage-qt;
license = licenses.gpl2;
- maintainers = with maintainers; [ romildo ];
platforms = with platforms; unix;
+ maintainers = with maintainers; [ romildo ];
};
}
diff --git a/pkgs/desktops/lxqt/optional/obconf-qt/default.nix b/pkgs/desktops/lxqt/optional/obconf-qt/default.nix
index 381c998616f5..36490b726e0f 100644
--- a/pkgs/desktops/lxqt/optional/obconf-qt/default.nix
+++ b/pkgs/desktops/lxqt/optional/obconf-qt/default.nix
@@ -1,30 +1,30 @@
-{ stdenv, fetchFromGitHub, cmake, pkgconfig, qt5, kde5, xorg, lxqt,
-openbox, hicolor_icon_theme }:
+{ stdenv, fetchFromGitHub, cmake, pkgconfig, qt5, xorg, lxqt, openbox, hicolor_icon_theme }:
stdenv.mkDerivation rec {
name = "${pname}-${version}";
pname = "obconf-qt";
- version = "0.11.0";
+ version = "0.11.1";
srcs = fetchFromGitHub {
owner = "lxde";
repo = pname;
rev = version;
- sha256 = "1q3y4sc1kg3hw4869rx4g08y85rnvnxgk8rf8h6amkf5r5561iyk";
+ sha256 = "1w94g8jk2j9qrkwg3i6qwgai2sj1m657bbk2zlk9bc3qvzmwxwrc";
};
- nativeBuildInputs = [ cmake pkgconfig ];
+ nativeBuildInputs = [
+ cmake
+ pkgconfig
+ lxqt.lxqt-build-tools
+ ];
buildInputs = [
qt5.qtbase
qt5.qttools
qt5.qtx11extras
- qt5.qtsvg
- kde5.kwindowsystem
- lxqt.liblxqt
- lxqt.libqtxdg
xorg.libpthreadstubs
xorg.libXdmcp
+ xorg.libSM
openbox
hicolor_icon_theme
];
@@ -35,7 +35,7 @@ stdenv.mkDerivation rec {
description = "The Qt port of obconf, the Openbox configuration tool";
homepage = https://github.com/lxde/obconf-qt;
license = licenses.gpl2;
- maintainers = with maintainers; [ romildo ];
platforms = with platforms; unix;
+ maintainers = with maintainers; [ romildo ];
};
}
diff --git a/pkgs/desktops/lxqt/optional/qlipper/default.nix b/pkgs/desktops/lxqt/optional/qlipper/default.nix
index 551259ac3a05..376b8fb0190d 100644
--- a/pkgs/desktops/lxqt/optional/qlipper/default.nix
+++ b/pkgs/desktops/lxqt/optional/qlipper/default.nix
@@ -3,13 +3,13 @@
stdenv.mkDerivation rec {
name = "${pname}-${version}";
pname = "qlipper";
- version = "2016-09-26";
+ version = "5.0.0";
srcs = fetchFromGitHub {
owner = "pvanek";
repo = pname;
- rev = "48754f28fe1050df58f2d9f7cd2becc019e2f486";
- sha256 = "0s35c08rlfnhp6j1hx5f19034q84ac56cs90wcb3p4spavdnzy2k";
+ rev = version;
+ sha256 = "1y34vadxxjg2l7021y1rpvb8x6pzhk2sk9p35wfm9inilwi8bg8j";
};
nativeBuildInputs = [ cmake ];
@@ -20,7 +20,7 @@ stdenv.mkDerivation rec {
description = "Cross-platform clipboard history applet";
homepage = https://github.com/pvanek/qlipper;
license = licenses.gpl2Plus;
- maintainers = with maintainers; [ romildo ];
platforms = with platforms; unix;
+ maintainers = with maintainers; [ romildo ];
};
}
diff --git a/pkgs/desktops/lxqt/optional/qterminal/default.nix b/pkgs/desktops/lxqt/optional/qterminal/default.nix
index 7f0f66c6fbe4..ff59a2d893c6 100644
--- a/pkgs/desktops/lxqt/optional/qterminal/default.nix
+++ b/pkgs/desktops/lxqt/optional/qterminal/default.nix
@@ -1,27 +1,26 @@
-{ stdenv, fetchFromGitHub, cmake, qt5, kde5, lxqt }:
+{ stdenv, fetchFromGitHub, cmake, qt5, lxqt }:
stdenv.mkDerivation rec {
name = "${pname}-${version}";
pname = "qterminal";
- version = "0.7.0";
+ version = "0.7.1";
srcs = fetchFromGitHub {
owner = "lxde";
repo = pname;
rev = version;
- sha256 = "1g8d66h8avk094wvgqw0mgl9caamdig6bnn4vawshn4j7y8g4n7v";
+ sha256 = "14pfwii8axyswrkwvfmc2i0a07fjnhpyk3hh06qkbj2w3r00xhyb";
};
- nativeBuildInputs = [ cmake ];
+ nativeBuildInputs = [
+ cmake
+ lxqt.lxqt-build-tools
+ ];
buildInputs = [
qt5.qtbase
qt5.qttools
qt5.qtx11extras
- qt5.qtsvg
- kde5.kwindowsystem
- lxqt.liblxqt
- lxqt.libqtxdg
lxqt.qtermwidget
];
@@ -31,7 +30,7 @@ stdenv.mkDerivation rec {
description = "A lightweight Qt-based terminal emulator";
homepage = https://github.com/lxde/qterminal;
license = licenses.gpl2;
- maintainers = with maintainers; [ romildo ];
platforms = with platforms; unix;
+ maintainers = with maintainers; [ romildo ];
};
}
diff --git a/pkgs/desktops/lxqt/optional/screengrab/default.nix b/pkgs/desktops/lxqt/optional/screengrab/default.nix
index 2ef1c7532a5a..e8cc7c30fa15 100644
--- a/pkgs/desktops/lxqt/optional/screengrab/default.nix
+++ b/pkgs/desktops/lxqt/optional/screengrab/default.nix
@@ -1,24 +1,24 @@
-{ stdenv, fetchFromGitHub, cmake, pkgconfig, qt5, kde5, lxqt, xorg }:
+{ stdenv, fetchFromGitHub, cmake, pkgconfig, qtbase, qttools, qtx11extras, qtsvg, kwindowsystem, libqtxdg, xorg }:
stdenv.mkDerivation rec {
- name = "screengrab-unstable-2016-09-12";
+ name = "screengrab-unstable-2017-02-18";
srcs = fetchFromGitHub {
owner = "QtDesktop";
repo = "screengrab";
- rev = "3dbacb9d6f52825689846c798a6c4c95e3815bf6";
- sha256 = "0rflb1q5b1mik8sm1wm63hwpyaah8liizxq1f5q33zapl1qafzi5";
+ rev = "6fc03c70fe132b89f35d4cef2f62c9d804de3b64";
+ sha256 = "1h3rlpmaqxzysaibcw7s5msbrwaxkg6sz7a8xv6cqzjvggv09my0";
};
nativeBuildInputs = [ cmake pkgconfig ];
buildInputs = [
- qt5.qtbase
- qt5.qttools
- qt5.qtx11extras
- qt5.qtsvg
- kde5.kwindowsystem
- lxqt.libqtxdg
+ qtbase
+ qttools
+ qtx11extras
+ qtsvg
+ kwindowsystem
+ libqtxdg
xorg.libpthreadstubs
xorg.libXdmcp
];
diff --git a/pkgs/desktops/mate/caja/default.nix b/pkgs/desktops/mate/caja/default.nix
new file mode 100644
index 000000000000..aea006fc4867
--- /dev/null
+++ b/pkgs/desktops/mate/caja/default.nix
@@ -0,0 +1,38 @@
+{ stdenv, fetchurl, pkgconfig, intltool, gtk3, libnotify, libxml2, libexif, exempi, mate, wrapGAppsHook }:
+
+stdenv.mkDerivation rec {
+ name = "caja-${version}";
+ version = "${major-ver}.${minor-ver}";
+ major-ver = "1.18";
+ minor-ver = "0";
+
+ src = fetchurl {
+ url = "http://pub.mate-desktop.org/releases/${major-ver}/${name}.tar.xz";
+ sha256 = "1fc7dxj9hw8fffrcnwxbj8pq7gl08il68rkpk92rv3qm7siv1606";
+ };
+
+ nativeBuildInputs = [
+ pkgconfig
+ intltool
+ wrapGAppsHook
+ ];
+
+ buildInputs = [
+ gtk3
+ libnotify
+ libxml2
+ libexif
+ exempi
+ mate.mate-desktop
+ ];
+
+ configureFlags = [ "--disable-update-mimedb" ];
+
+ meta = {
+ description = "File manager for the MATE desktop";
+ homepage = "http://mate-desktop.org";
+ license = with stdenv.lib.licenses; [ gpl2 lgpl2 ];
+ platforms = stdenv.lib.platforms.unix;
+ maintainers = [ stdenv.lib.maintainers.romildo ];
+ };
+}
diff --git a/pkgs/desktops/mate/default.nix b/pkgs/desktops/mate/default.nix
index c3a49011c1d9..d9565e8f4d1a 100644
--- a/pkgs/desktops/mate/default.nix
+++ b/pkgs/desktops/mate/default.nix
@@ -1,7 +1,10 @@
{ callPackage, pkgs }:
rec {
+ caja = callPackage ./caja { };
mate-common = callPackage ./mate-common { };
+ mate-desktop = callPackage ./mate-desktop { };
mate-icon-theme = callPackage ./mate-icon-theme { };
mate-icon-theme-faenza = callPackage ./mate-icon-theme-faenza { };
+ mate-terminal = callPackage ./mate-terminal { };
mate-themes = callPackage ./mate-themes { };
}
diff --git a/pkgs/desktops/mate/mate-common/default.nix b/pkgs/desktops/mate/mate-common/default.nix
index 7a7ad23c6bdd..7bd7a3f27701 100644
--- a/pkgs/desktops/mate/mate-common/default.nix
+++ b/pkgs/desktops/mate/mate-common/default.nix
@@ -3,12 +3,12 @@
stdenv.mkDerivation rec {
name = "mate-common-${version}";
version = "${major-ver}.${minor-ver}";
- major-ver = "1.16";
+ major-ver = "1.18";
minor-ver = "0";
src = fetchurl {
url = "http://pub.mate-desktop.org/releases/${major-ver}/${name}.tar.xz";
- sha256 = "02pj5ry3c7p5sd2mp9dsshy0ij0xgv00bxr4vvmnm027hv2silrl";
+ sha256 = "1005laf3z1h8qczm7pmwr40r842665cv6ykhjg7r93vldra48z6p";
};
meta = {
diff --git a/pkgs/desktops/mate/mate-desktop/default.nix b/pkgs/desktops/mate/mate-desktop/default.nix
new file mode 100644
index 000000000000..2afd700d9333
--- /dev/null
+++ b/pkgs/desktops/mate/mate-desktop/default.nix
@@ -0,0 +1,36 @@
+{ stdenv, fetchurl, pkgconfig, intltool, gnome3, wrapGAppsHook }:
+
+stdenv.mkDerivation rec {
+ name = "mate-desktop-${version}";
+ version = "${major-ver}.${minor-ver}";
+ major-ver = "1.18";
+ minor-ver = "0";
+
+ src = fetchurl {
+ url = "http://pub.mate-desktop.org/releases/${major-ver}/${name}.tar.xz";
+ sha256 = "12iv2y4dan962fs7vkkxbjkp77pbvjnwfa43ggr0zkdsc3ydjbbg";
+ };
+
+ propagatedUserEnvPkgs = [
+ gnome3.gnome_themes_standard
+ ];
+
+ buildInputs = [
+ gnome3.dconf
+ gnome3.gtk
+ gnome3.defaultIconTheme
+ ];
+
+ nativeBuildInputs = [
+ pkgconfig
+ intltool
+ wrapGAppsHook
+ ];
+
+ meta = with stdenv.lib; {
+ description = "Library with common API for various MATE modules";
+ homepage = "http://mate-desktop.org";
+ license = licenses.gpl2;
+ platforms = platforms.unix;
+ };
+}
diff --git a/pkgs/desktops/mate/mate-icon-theme-faenza/default.nix b/pkgs/desktops/mate/mate-icon-theme-faenza/default.nix
index d9370f318d72..3d820553b4ac 100644
--- a/pkgs/desktops/mate/mate-icon-theme-faenza/default.nix
+++ b/pkgs/desktops/mate/mate-icon-theme-faenza/default.nix
@@ -3,12 +3,12 @@
stdenv.mkDerivation rec {
name = "mate-icon-theme-faenza-${version}";
version = "${major-ver}.${minor-ver}";
- major-ver = "1.16";
+ major-ver = "1.18";
minor-ver = "0";
src = fetchurl {
url = "http://pub.mate-desktop.org/releases/${major-ver}/${name}.tar.xz";
- sha256 = "0p3z3qarbvrhzj2sdw3f8dp0c7wwjkk9a749bq8rh5gm9m66hibg";
+ sha256 = "1crfv6s3ljbc7a7m229bvs3qbjzlp8cgvyhqmdaa9npd5lxmk88v";
};
nativeBuildInputs = [ autoreconfHook ];
diff --git a/pkgs/desktops/mate/mate-icon-theme/default.nix b/pkgs/desktops/mate/mate-icon-theme/default.nix
index 8acef0338715..e41a1c217105 100644
--- a/pkgs/desktops/mate/mate-icon-theme/default.nix
+++ b/pkgs/desktops/mate/mate-icon-theme/default.nix
@@ -3,12 +3,12 @@
stdenv.mkDerivation rec {
name = "mate-icon-theme-${version}";
version = "${major-ver}.${minor-ver}";
- major-ver = "1.16";
+ major-ver = "1.18";
minor-ver = "0";
src = fetchurl {
url = "http://pub.mate-desktop.org/releases/${major-ver}/${name}.tar.xz";
- sha256 = "1zldw22p1i76iss8car39pmfagpfxxlfk1fdhvr4x5r6gf36gv7d";
+ sha256 = "19bd9zlfc1jfdl7imvfy1vq35a0jvxq5fldmr2c5bq0kyasvww6i";
};
nativeBuildInputs = [ pkgconfig intltool iconnamingutils ];
diff --git a/pkgs/desktops/mate/mate-terminal/default.nix b/pkgs/desktops/mate/mate-terminal/default.nix
new file mode 100644
index 000000000000..fd907c562806
--- /dev/null
+++ b/pkgs/desktops/mate/mate-terminal/default.nix
@@ -0,0 +1,38 @@
+{ stdenv, fetchurl, pkgconfig, intltool, glib, itstool, libxml2, mate, gnome3, wrapGAppsHook }:
+
+stdenv.mkDerivation rec {
+ name = "mate-terminal-${version}";
+ version = "${major-ver}.${minor-ver}";
+ major-ver = "1.18";
+ minor-ver = "0";
+
+ src = fetchurl {
+ url = "http://pub.mate-desktop.org/releases/${major-ver}/${name}.tar.xz";
+ sha256 = "07z8g8zkc8k6d7xqdlg18cjnwg7zzv5hbgwma5y9mh8zx9xsqz92";
+ };
+
+ buildInputs = [
+ glib
+ itstool
+ libxml2
+
+ mate.mate-desktop
+
+ gnome3.vte
+ gnome3.gtk
+ gnome3.dconf
+ ];
+
+ nativeBuildInputs = [
+ pkgconfig
+ intltool
+ wrapGAppsHook
+ ];
+
+ meta = with stdenv.lib; {
+ description = "The MATE Terminal Emulator";
+ homepage = "http://mate-desktop.org";
+ license = licenses.gpl3;
+ platforms = platforms.unix;
+ };
+}
diff --git a/pkgs/desktops/mate/mate-themes/default.nix b/pkgs/desktops/mate/mate-themes/default.nix
index 343148da0bc8..cf78009708b2 100644
--- a/pkgs/desktops/mate/mate-themes/default.nix
+++ b/pkgs/desktops/mate/mate-themes/default.nix
@@ -6,17 +6,15 @@ stdenv.mkDerivation rec {
version = "${major-ver}.${minor-ver}";
major-ver = gnome3.version;
minor-ver = {
- "3.18" = "4";
- "3.20" = "12";
- "3.22" = "3";
+ "3.20" = "16";
+ "3.22" = "7";
}."${major-ver}";
src = fetchurl {
url = "http://pub.mate-desktop.org/releases/themes/${major-ver}/${name}.tar.xz";
sha256 = {
- "3.18" = "1h3z705jrg7gng5glf51ksszjz6v81qq83qvmfpv1v69bwn6fy4b";
- "3.20" = "15s2xp2cq9x8iikvbywr5gl8l33i57i1xvbv4jc2qipnkn3c4yca";
- "3.22" = "0p1rf5q2nr1vsab3pljwycclbrnwylvp88d0dhk8as0d6n6fp85k";
+ "3.20" = "1dvzljpq6cscr82gnsqagf23inb039q84fnawraj0nhfjif11r7v";
+ "3.22" = "1kjchqkds0zj32x7cjfcq96zakcmhva1yg0nxfd6369a5nwkp5k0";
}."${major-ver}";
};
diff --git a/pkgs/desktops/kde-5/plasma/bluedevil.nix b/pkgs/desktops/plasma-5/bluedevil.nix
similarity index 84%
rename from pkgs/desktops/kde-5/plasma/bluedevil.nix
rename to pkgs/desktops/plasma-5/bluedevil.nix
index 1deef241a62f..d0e784998132 100644
--- a/pkgs/desktops/kde-5/plasma/bluedevil.nix
+++ b/pkgs/desktops/plasma-5/bluedevil.nix
@@ -1,12 +1,12 @@
{
- plasmaPackage, ecm, shared_mime_info,
+ plasmaPackage, extra-cmake-modules, shared_mime_info,
bluez-qt, kcoreaddons, kdbusaddons, kded, ki18n, kiconthemes, kio,
knotifications, kwidgetsaddons, kwindowsystem, plasma-framework, qtdeclarative
}:
plasmaPackage {
name = "bluedevil";
- nativeBuildInputs = [ ecm shared_mime_info ];
+ nativeBuildInputs = [ extra-cmake-modules shared_mime_info ];
propagatedBuildInputs = [
bluez-qt ki18n kio kwindowsystem plasma-framework qtdeclarative kcoreaddons
kdbusaddons kded kiconthemes knotifications kwidgetsaddons
diff --git a/pkgs/desktops/kde-5/plasma/breeze-grub.nix b/pkgs/desktops/plasma-5/breeze-grub.nix
similarity index 100%
rename from pkgs/desktops/kde-5/plasma/breeze-grub.nix
rename to pkgs/desktops/plasma-5/breeze-grub.nix
diff --git a/pkgs/desktops/kde-5/plasma/breeze-gtk.nix b/pkgs/desktops/plasma-5/breeze-gtk.nix
similarity index 50%
rename from pkgs/desktops/kde-5/plasma/breeze-gtk.nix
rename to pkgs/desktops/plasma-5/breeze-gtk.nix
index 57de2fa2d474..4048d98431db 100644
--- a/pkgs/desktops/kde-5/plasma/breeze-gtk.nix
+++ b/pkgs/desktops/plasma-5/breeze-gtk.nix
@@ -1,9 +1,11 @@
{ plasmaPackage
-, ecm
+, extra-cmake-modules
+, qtbase
}:
plasmaPackage {
name = "breeze-gtk";
- nativeBuildInputs = [ ecm ];
+ nativeBuildInputs = [ extra-cmake-modules ];
cmakeFlags = [ "-DWITH_GTK3_VERSION=3.20" ];
+ buildInputs = [ qtbase ];
}
diff --git a/pkgs/desktops/kde-5/plasma/breeze-plymouth/default.nix b/pkgs/desktops/plasma-5/breeze-plymouth/default.nix
similarity index 81%
rename from pkgs/desktops/kde-5/plasma/breeze-plymouth/default.nix
rename to pkgs/desktops/plasma-5/breeze-plymouth/default.nix
index 0de1ca1f6802..dfbdf48165aa 100644
--- a/pkgs/desktops/kde-5/plasma/breeze-plymouth/default.nix
+++ b/pkgs/desktops/plasma-5/breeze-plymouth/default.nix
@@ -1,12 +1,12 @@
{
plasmaPackage, lib, copyPathsToStore,
- ecm,
+ extra-cmake-modules,
plymouth
}:
plasmaPackage {
name = "breeze-plymouth";
- nativeBuildInputs = [ ecm ];
+ nativeBuildInputs = [ extra-cmake-modules ];
buildInputs = [ plymouth ];
outputs = [ "out" ];
patches = copyPathsToStore (lib.readPathsFromFile ./. ./series);
diff --git a/pkgs/desktops/kde-5/plasma/breeze-plymouth/install-paths.patch b/pkgs/desktops/plasma-5/breeze-plymouth/install-paths.patch
similarity index 100%
rename from pkgs/desktops/kde-5/plasma/breeze-plymouth/install-paths.patch
rename to pkgs/desktops/plasma-5/breeze-plymouth/install-paths.patch
diff --git a/pkgs/desktops/kde-5/plasma/breeze-plymouth/series b/pkgs/desktops/plasma-5/breeze-plymouth/series
similarity index 100%
rename from pkgs/desktops/kde-5/plasma/breeze-plymouth/series
rename to pkgs/desktops/plasma-5/breeze-plymouth/series
diff --git a/pkgs/desktops/plasma-5/breeze-qt4.nix b/pkgs/desktops/plasma-5/breeze-qt4.nix
new file mode 100644
index 000000000000..adcc6110c4d7
--- /dev/null
+++ b/pkgs/desktops/plasma-5/breeze-qt4.nix
@@ -0,0 +1,16 @@
+{
+ plasmaPackage, lib,
+ automoc4, cmake, perl, pkgconfig,
+ kdelibs4, qt4, xproto
+}:
+
+plasmaPackage {
+ name = "breeze-qt4";
+ sname = "breeze";
+ buildInputs = [ kdelibs4 qt4 xproto ];
+ nativeBuildInputs = [ automoc4 cmake perl pkgconfig ];
+ cmakeFlags = [
+ "-DUSE_KDE4=ON"
+ "-DQT_QMAKE_EXECUTABLE=${qt4}/bin/qmake"
+ ];
+}
diff --git a/pkgs/desktops/kde-5/plasma/breeze-qt5.nix b/pkgs/desktops/plasma-5/breeze-qt5.nix
similarity index 86%
rename from pkgs/desktops/kde-5/plasma/breeze-qt5.nix
rename to pkgs/desktops/plasma-5/breeze-qt5.nix
index ea2776a13c59..a1b64a4656cb 100644
--- a/pkgs/desktops/kde-5/plasma/breeze-qt5.nix
+++ b/pkgs/desktops/plasma-5/breeze-qt5.nix
@@ -1,6 +1,6 @@
{
plasmaPackage,
- ecm,
+ extra-cmake-modules,
frameworkintegration, kcmutils, kconfigwidgets, kcoreaddons, kdecoration,
kguiaddons, ki18n, kwayland, kwindowsystem, plasma-framework, qtx11extras
}:
@@ -8,7 +8,7 @@
plasmaPackage {
name = "breeze-qt5";
sname = "breeze";
- nativeBuildInputs = [ ecm ];
+ nativeBuildInputs = [ extra-cmake-modules ];
propagatedBuildInputs = [
frameworkintegration kcmutils kconfigwidgets kcoreaddons kdecoration
kguiaddons ki18n kwayland kwindowsystem plasma-framework qtx11extras
diff --git a/pkgs/desktops/plasma-5/build-support/package.nix b/pkgs/desktops/plasma-5/build-support/package.nix
new file mode 100644
index 000000000000..1e9ba016c471
--- /dev/null
+++ b/pkgs/desktops/plasma-5/build-support/package.nix
@@ -0,0 +1,27 @@
+{ kdeDerivation, lib, fetchurl }:
+
+let
+ mirror = "mirror://kde";
+ srcs = import ../srcs.nix { inherit fetchurl mirror; };
+in
+
+args:
+
+let
+ inherit (args) name;
+ sname = args.sname or name;
+ inherit (srcs."${sname}") src version;
+in
+kdeDerivation (args // {
+ name = "${name}-${version}";
+ inherit src;
+
+ meta = {
+ license = with lib.licenses; [
+ lgpl21Plus lgpl3Plus bsd2 mit gpl2Plus gpl3Plus fdl12
+ ];
+ platforms = lib.platforms.linux;
+ maintainers = with lib.maintainers; [ ttuegel ];
+ homepage = "http://www.kde.org";
+ } // (args.meta or {});
+})
diff --git a/pkgs/desktops/plasma-5/default.nix b/pkgs/desktops/plasma-5/default.nix
new file mode 100644
index 000000000000..0cb25a315d6e
--- /dev/null
+++ b/pkgs/desktops/plasma-5/default.nix
@@ -0,0 +1,81 @@
+/*
+
+# New packages
+
+READ THIS FIRST
+
+This module is for official packages in KDE Plasma 5. All available packages are
+listed in `./srcs.nix`, although a few are not yet packaged in Nixpkgs (see
+below).
+
+IF YOUR PACKAGE IS NOT LISTED IN `./srcs.nix`, IT DOES NOT GO HERE.
+
+Many of the packages released upstream are not yet built in Nixpkgs due to lack
+of demand. To add a Nixpkgs build for an upstream package, copy one of the
+existing packages here and modify it as necessary.
+
+# Updates
+
+1. Update the URL in `./fetch.sh`.
+2. Run `./maintainers/scripts/fetch-kde-qt.sh pkgs/desktops/plasma-5`
+ from the top of the Nixpkgs tree.
+3. Use `nox-review wip` to check that everything builds.
+4. Commit the changes and open a pull request.
+
+*/
+
+{
+ libsForQt5, kdeDerivation, lib, fetchurl,
+ gconf,
+ debug ? false,
+}:
+
+let
+ packages = self: with self;
+ let
+ callPackage = self.newScope {
+ plasmaPackage = import ./build-support/package.nix {
+ inherit kdeDerivation lib fetchurl;
+ };
+ };
+ in {
+ bluedevil = callPackage ./bluedevil.nix {};
+ breeze-gtk = callPackage ./breeze-gtk.nix {};
+ breeze-qt4 = callPackage ./breeze-qt4.nix {};
+ breeze-qt5 = callPackage ./breeze-qt5.nix {};
+ breeze-grub = callPackage ./breeze-grub.nix {};
+ breeze-plymouth = callPackage ./breeze-plymouth {};
+ kactivitymanagerd = callPackage ./kactivitymanagerd.nix {};
+ kde-cli-tools = callPackage ./kde-cli-tools.nix {};
+ kde-gtk-config = callPackage ./kde-gtk-config {};
+ kdecoration = callPackage ./kdecoration.nix {};
+ kdeplasma-addons = callPackage ./kdeplasma-addons.nix {};
+ kgamma5 = callPackage ./kgamma5.nix {};
+ khotkeys = callPackage ./khotkeys.nix {};
+ kinfocenter = callPackage ./kinfocenter.nix {};
+ kmenuedit = callPackage ./kmenuedit.nix {};
+ kscreen = callPackage ./kscreen.nix {};
+ kscreenlocker = callPackage ./kscreenlocker.nix {};
+ ksshaskpass = callPackage ./ksshaskpass.nix {};
+ ksysguard = callPackage ./ksysguard.nix {};
+ kwallet-pam = callPackage ./kwallet-pam.nix {};
+ kwayland-integration = callPackage ./kwayland-integration.nix {};
+ kwin = callPackage ./kwin {};
+ kwrited = callPackage ./kwrited.nix {};
+ libkscreen = callPackage ./libkscreen.nix {};
+ libksysguard = callPackage ./libksysguard {};
+ milou = callPackage ./milou.nix {};
+ oxygen = callPackage ./oxygen.nix {};
+ plasma-desktop = callPackage ./plasma-desktop {};
+ plasma-integration = callPackage ./plasma-integration.nix {};
+ plasma-nm = callPackage ./plasma-nm {};
+ plasma-pa = callPackage ./plasma-pa.nix { inherit gconf; };
+ plasma-workspace = callPackage ./plasma-workspace {};
+ plasma-workspace-wallpapers = callPackage ./plasma-workspace-wallpapers.nix {};
+ polkit-kde-agent = callPackage ./polkit-kde-agent.nix {};
+ powerdevil = callPackage ./powerdevil.nix {};
+ startkde = callPackage ./startkde {};
+ systemsettings = callPackage ./systemsettings.nix {};
+ };
+in
+lib.makeScope libsForQt5.newScope packages
diff --git a/pkgs/desktops/plasma-5/fetch.sh b/pkgs/desktops/plasma-5/fetch.sh
new file mode 100644
index 000000000000..cf9327d7a60d
--- /dev/null
+++ b/pkgs/desktops/plasma-5/fetch.sh
@@ -0,0 +1 @@
+WGET_ARGS=( http://download.kde.org/stable/plasma/5.9.4/ -A '*.tar.xz' )
diff --git a/pkgs/desktops/kde-5/plasma/kactivitymanagerd.nix b/pkgs/desktops/plasma-5/kactivitymanagerd.nix
similarity index 80%
rename from pkgs/desktops/kde-5/plasma/kactivitymanagerd.nix
rename to pkgs/desktops/plasma-5/kactivitymanagerd.nix
index bb90fd6d3ab0..282e58ecf9e6 100644
--- a/pkgs/desktops/kde-5/plasma/kactivitymanagerd.nix
+++ b/pkgs/desktops/plasma-5/kactivitymanagerd.nix
@@ -1,12 +1,12 @@
{ plasmaPackage
-, ecm
+, extra-cmake-modules
, boost, kconfig, kcoreaddons, kdbusaddons, ki18n, kio, kglobalaccel
, kwindowsystem, kxmlgui
}:
plasmaPackage {
name = "kactivitymanagerd";
- nativeBuildInputs = [ ecm ];
+ nativeBuildInputs = [ extra-cmake-modules ];
propagatedBuildInputs = [
boost kconfig kcoreaddons kdbusaddons kglobalaccel ki18n kio kwindowsystem
kxmlgui
diff --git a/pkgs/desktops/kde-5/plasma/kde-cli-tools.nix b/pkgs/desktops/plasma-5/kde-cli-tools.nix
similarity index 75%
rename from pkgs/desktops/kde-5/plasma/kde-cli-tools.nix
rename to pkgs/desktops/plasma-5/kde-cli-tools.nix
index 33a7340cb85f..87a46703997a 100644
--- a/pkgs/desktops/kde-5/plasma/kde-cli-tools.nix
+++ b/pkgs/desktops/plasma-5/kde-cli-tools.nix
@@ -1,12 +1,12 @@
{
- plasmaPackage, ecm,
+ plasmaPackage, extra-cmake-modules,
kcmutils, kconfig, kdelibs4support, kdesu, kdoctools, ki18n, kiconthemes,
kwindowsystem, qtsvg, qtx11extras
}:
plasmaPackage {
name = "kde-cli-tools";
- nativeBuildInputs = [ ecm kdoctools ];
+ nativeBuildInputs = [ extra-cmake-modules kdoctools ];
propagatedBuildInputs = [
kcmutils kconfig kdesu kdelibs4support ki18n kiconthemes kwindowsystem qtsvg
qtx11extras
diff --git a/pkgs/desktops/kde-5/plasma/kde-gtk-config/0001-follow-symlinks.patch b/pkgs/desktops/plasma-5/kde-gtk-config/0001-follow-symlinks.patch
similarity index 100%
rename from pkgs/desktops/kde-5/plasma/kde-gtk-config/0001-follow-symlinks.patch
rename to pkgs/desktops/plasma-5/kde-gtk-config/0001-follow-symlinks.patch
diff --git a/pkgs/desktops/kde-5/plasma/kde-gtk-config/default.nix b/pkgs/desktops/plasma-5/kde-gtk-config/default.nix
similarity index 87%
rename from pkgs/desktops/kde-5/plasma/kde-gtk-config/default.nix
rename to pkgs/desktops/plasma-5/kde-gtk-config/default.nix
index 10e55f0d6980..f482f2a6a3f3 100644
--- a/pkgs/desktops/kde-5/plasma/kde-gtk-config/default.nix
+++ b/pkgs/desktops/plasma-5/kde-gtk-config/default.nix
@@ -1,5 +1,5 @@
{ plasmaPackage
-, ecm
+, extra-cmake-modules
, glib
, gtk2
, gtk3
@@ -15,7 +15,7 @@
plasmaPackage {
name = "kde-gtk-config";
patches = [ ./0001-follow-symlinks.patch ];
- nativeBuildInputs = [ ecm ];
+ nativeBuildInputs = [ extra-cmake-modules ];
propagatedBuildInputs = [
ki18n kio glib gtk2 gtk3 karchive kcmutils kconfigwidgets kiconthemes
knewstuff
diff --git a/pkgs/desktops/plasma-5/kdecoration.nix b/pkgs/desktops/plasma-5/kdecoration.nix
new file mode 100644
index 000000000000..546f72c3f384
--- /dev/null
+++ b/pkgs/desktops/plasma-5/kdecoration.nix
@@ -0,0 +1,7 @@
+{ plasmaPackage, extra-cmake-modules, qtbase }:
+
+plasmaPackage {
+ name = "kdecoration";
+ nativeBuildInputs = [ extra-cmake-modules ];
+ buildInputs = [ qtbase ];
+}
diff --git a/pkgs/desktops/kde-5/plasma/kdeplasma-addons.nix b/pkgs/desktops/plasma-5/kdeplasma-addons.nix
similarity index 88%
rename from pkgs/desktops/kde-5/plasma/kdeplasma-addons.nix
rename to pkgs/desktops/plasma-5/kdeplasma-addons.nix
index a2805f5d804b..3371e17beaf8 100644
--- a/pkgs/desktops/kde-5/plasma/kdeplasma-addons.nix
+++ b/pkgs/desktops/plasma-5/kdeplasma-addons.nix
@@ -1,4 +1,4 @@
-{ plasmaPackage, ecm, kdoctools
+{ plasmaPackage, extra-cmake-modules, kdoctools
, kconfig, kconfigwidgets, kcoreaddons, kcmutils, kdelibs4support, ki18n
, kio, knewstuff, kross, krunner, kservice, ksysguard, kunitconversion
, plasma-framework, plasma-workspace, qtdeclarative, qtx11extras
@@ -8,7 +8,7 @@
plasmaPackage {
name = "kdeplasma-addons";
nativeBuildInputs = [
- ecm
+ extra-cmake-modules
kdoctools
];
propagatedBuildInputs = [
diff --git a/pkgs/desktops/plasma-5/kgamma5.nix b/pkgs/desktops/plasma-5/kgamma5.nix
new file mode 100644
index 000000000000..965c33e6eef8
--- /dev/null
+++ b/pkgs/desktops/plasma-5/kgamma5.nix
@@ -0,0 +1,9 @@
+{ plasmaPackage, extra-cmake-modules, kdoctools, kdelibs4support
+, qtx11extras
+}:
+
+plasmaPackage {
+ name = "kgamma5";
+ nativeBuildInputs = [ extra-cmake-modules kdoctools ];
+ propagatedBuildInputs = [ kdelibs4support qtx11extras ];
+}
diff --git a/pkgs/desktops/plasma-5/khotkeys.nix b/pkgs/desktops/plasma-5/khotkeys.nix
new file mode 100644
index 000000000000..2b02e5916b9f
--- /dev/null
+++ b/pkgs/desktops/plasma-5/khotkeys.nix
@@ -0,0 +1,14 @@
+{ plasmaPackage, extra-cmake-modules, kdoctools, kcmutils
+, kdbusaddons, kdelibs4support, kglobalaccel, ki18n, kio, kxmlgui
+, plasma-framework, plasma-workspace, qtx11extras
+, fetchpatch
+}:
+
+plasmaPackage {
+ name = "khotkeys";
+ nativeBuildInputs = [ extra-cmake-modules kdoctools ];
+ propagatedBuildInputs = [
+ kdelibs4support kglobalaccel ki18n kio plasma-framework plasma-workspace
+ qtx11extras kcmutils kdbusaddons kxmlgui
+ ];
+}
diff --git a/pkgs/desktops/kde-5/plasma/kinfocenter.nix b/pkgs/desktops/plasma-5/kinfocenter.nix
similarity index 85%
rename from pkgs/desktops/kde-5/plasma/kinfocenter.nix
rename to pkgs/desktops/plasma-5/kinfocenter.nix
index 939e4fa62a9c..b4c8dc99adcb 100644
--- a/pkgs/desktops/kde-5/plasma/kinfocenter.nix
+++ b/pkgs/desktops/plasma-5/kinfocenter.nix
@@ -1,6 +1,6 @@
{
plasmaPackage,
- ecm, kdoctools,
+ extra-cmake-modules, kdoctools,
kcmutils, kcompletion, kconfig, kconfigwidgets, kcoreaddons, kdbusaddons,
kdeclarative, kdelibs4support, ki18n, kiconthemes, kio, kpackage, kservice,
kwayland, kwidgetsaddons, kxmlgui, libraw1394, mesa_glu, pciutils, solid
@@ -8,7 +8,7 @@
plasmaPackage {
name = "kinfocenter";
- nativeBuildInputs = [ ecm kdoctools ];
+ nativeBuildInputs = [ extra-cmake-modules kdoctools ];
propagatedBuildInputs = [
kcmutils kcompletion kconfig kconfigwidgets kcoreaddons kdbusaddons
kdeclarative kdelibs4support ki18n kiconthemes kio kpackage kservice
diff --git a/pkgs/desktops/kde-5/plasma/kmenuedit.nix b/pkgs/desktops/plasma-5/kmenuedit.nix
similarity index 74%
rename from pkgs/desktops/kde-5/plasma/kmenuedit.nix
rename to pkgs/desktops/plasma-5/kmenuedit.nix
index f10bf6bb3cdd..a27dc5dd92a8 100644
--- a/pkgs/desktops/kde-5/plasma/kmenuedit.nix
+++ b/pkgs/desktops/plasma-5/kmenuedit.nix
@@ -1,13 +1,13 @@
{
plasmaPackage,
- ecm, kdoctools,
+ extra-cmake-modules, kdoctools,
kdbusaddons, kdelibs4support, khotkeys, ki18n, kiconthemes, kio, kxmlgui,
sonnet
}:
plasmaPackage {
name = "kmenuedit";
- nativeBuildInputs = [ ecm kdoctools ];
+ nativeBuildInputs = [ extra-cmake-modules kdoctools ];
propagatedBuildInputs = [
kdbusaddons kdelibs4support khotkeys ki18n kiconthemes kio kxmlgui sonnet
];
diff --git a/pkgs/desktops/kde-5/plasma/kscreen.nix b/pkgs/desktops/plasma-5/kscreen.nix
similarity index 74%
rename from pkgs/desktops/kde-5/plasma/kscreen.nix
rename to pkgs/desktops/plasma-5/kscreen.nix
index ecbd88c2146d..e0fbea5d7467 100644
--- a/pkgs/desktops/kde-5/plasma/kscreen.nix
+++ b/pkgs/desktops/plasma-5/kscreen.nix
@@ -1,11 +1,11 @@
-{ plasmaPackage, ecm, kconfig, kconfigwidgets
+{ plasmaPackage, extra-cmake-modules, kconfig, kconfigwidgets
, kdbusaddons, kglobalaccel, ki18n, kwidgetsaddons, kxmlgui
, libkscreen, qtdeclarative, qtgraphicaleffects
}:
plasmaPackage {
name = "kscreen";
- nativeBuildInputs = [ ecm ];
+ nativeBuildInputs = [ extra-cmake-modules ];
propagatedBuildInputs = [
kglobalaccel ki18n libkscreen qtdeclarative qtgraphicaleffects kconfig
kconfigwidgets kdbusaddons kwidgetsaddons kxmlgui
diff --git a/pkgs/desktops/kde-5/plasma/kscreenlocker.nix b/pkgs/desktops/plasma-5/kscreenlocker.nix
similarity index 80%
rename from pkgs/desktops/kde-5/plasma/kscreenlocker.nix
rename to pkgs/desktops/plasma-5/kscreenlocker.nix
index 3c5d7b374724..3551feab76fc 100644
--- a/pkgs/desktops/kde-5/plasma/kscreenlocker.nix
+++ b/pkgs/desktops/plasma-5/kscreenlocker.nix
@@ -1,13 +1,13 @@
{
plasmaPackage,
- ecm, kdoctools,
+ extra-cmake-modules, kdoctools,
kcmutils, kcrash, kdeclarative, kdelibs4support, kglobalaccel, kidletime,
kwayland, libXcursor, pam, plasma-framework, qtdeclarative, wayland
}:
plasmaPackage {
name = "kscreenlocker";
- nativeBuildInputs = [ ecm kdoctools ];
+ nativeBuildInputs = [ extra-cmake-modules kdoctools ];
propagatedBuildInputs = [
kcmutils kcrash kdeclarative kdelibs4support kglobalaccel kidletime kwayland
libXcursor pam plasma-framework qtdeclarative wayland
diff --git a/pkgs/desktops/kde-5/plasma/ksshaskpass.nix b/pkgs/desktops/plasma-5/ksshaskpass.nix
similarity index 56%
rename from pkgs/desktops/kde-5/plasma/ksshaskpass.nix
rename to pkgs/desktops/plasma-5/ksshaskpass.nix
index 80b529a66685..f1a6b82ae93c 100644
--- a/pkgs/desktops/kde-5/plasma/ksshaskpass.nix
+++ b/pkgs/desktops/plasma-5/ksshaskpass.nix
@@ -1,9 +1,9 @@
-{ plasmaPackage, ecm, kdoctools, kcoreaddons
+{ plasmaPackage, extra-cmake-modules, kdoctools, kcoreaddons
, ki18n, kwallet, kwidgetsaddons
}:
plasmaPackage {
name = "ksshaskpass";
- nativeBuildInputs = [ ecm kdoctools ];
+ nativeBuildInputs = [ extra-cmake-modules kdoctools ];
propagatedBuildInputs = [ kcoreaddons ki18n kwallet kwidgetsaddons ];
}
diff --git a/pkgs/desktops/kde-5/plasma/ksysguard.nix b/pkgs/desktops/plasma-5/ksysguard.nix
similarity index 79%
rename from pkgs/desktops/kde-5/plasma/ksysguard.nix
rename to pkgs/desktops/plasma-5/ksysguard.nix
index f7e5cced708a..366b154cae70 100644
--- a/pkgs/desktops/kde-5/plasma/ksysguard.nix
+++ b/pkgs/desktops/plasma-5/ksysguard.nix
@@ -1,6 +1,6 @@
{
plasmaPackage,
- ecm, kdoctools,
+ extra-cmake-modules, kdoctools,
lm_sensors,
kconfig, kcoreaddons, kdelibs4support, ki18n, kiconthemes, kitemviews,
knewstuff, libksysguard, qtwebkit
@@ -8,7 +8,7 @@
plasmaPackage {
name = "ksysguard";
- nativeBuildInputs = [ ecm kdoctools ];
+ nativeBuildInputs = [ extra-cmake-modules kdoctools ];
buildInputs = [ lm_sensors ];
propagatedBuildInputs = [
kconfig kcoreaddons kitemviews knewstuff kiconthemes libksysguard
diff --git a/pkgs/desktops/plasma-5/kwallet-pam.nix b/pkgs/desktops/plasma-5/kwallet-pam.nix
new file mode 100644
index 000000000000..2789499c50a2
--- /dev/null
+++ b/pkgs/desktops/plasma-5/kwallet-pam.nix
@@ -0,0 +1,11 @@
+{ plasmaPackage, extra-cmake-modules, pam, socat, libgcrypt
+}:
+
+plasmaPackage {
+ name = "kwallet-pam";
+
+ nativeBuildInputs = [ extra-cmake-modules ];
+
+ buildInputs = [ pam socat libgcrypt ];
+
+}
diff --git a/pkgs/desktops/kde-5/plasma/kwayland-integration.nix b/pkgs/desktops/plasma-5/kwayland-integration.nix
similarity index 81%
rename from pkgs/desktops/kde-5/plasma/kwayland-integration.nix
rename to pkgs/desktops/plasma-5/kwayland-integration.nix
index 376e8ed7cbda..9045227a51a9 100644
--- a/pkgs/desktops/kde-5/plasma/kwayland-integration.nix
+++ b/pkgs/desktops/plasma-5/kwayland-integration.nix
@@ -1,5 +1,5 @@
{ plasmaPackage
-, ecm
+, extra-cmake-modules
, kidletime
, kwayland
, kwindowsystem
@@ -8,7 +8,7 @@
plasmaPackage {
name = "kwayland-integration";
nativeBuildInputs = [
- ecm
+ extra-cmake-modules
];
propagatedBuildInputs = [
kidletime kwindowsystem kwayland
diff --git a/pkgs/desktops/kde-5/plasma/kwin/default.nix b/pkgs/desktops/plasma-5/kwin/default.nix
similarity index 69%
rename from pkgs/desktops/kde-5/plasma/kwin/default.nix
rename to pkgs/desktops/plasma-5/kwin/default.nix
index 73e40cdb114c..01f90664276e 100644
--- a/pkgs/desktops/kde-5/plasma/kwin/default.nix
+++ b/pkgs/desktops/plasma-5/kwin/default.nix
@@ -1,27 +1,28 @@
{
plasmaPackage, lib, copyPathsToStore,
- ecm, kdoctools,
+ extra-cmake-modules, kdoctools,
breeze-qt5, epoxy, kactivities, kcompletion, kcmutils, kconfig,
kconfigwidgets, kcoreaddons, kcrash, kdeclarative, kdecoration, kglobalaccel,
ki18n, kiconthemes, kidletime, kinit, kio, knewstuff, knotifications,
kpackage, kscreenlocker, kservice, kwayland, kwidgetsaddons, kwindowsystem,
- kxmlgui, libinput, libICE, libSM, plasma-framework, qtdeclarative,
- qtmultimedia, qtscript, qtx11extras, udev, wayland, xcb-util-cursor, xwayland
+ kxmlgui, libICE, libSM, libinput, libxkbcommon, plasma-framework,
+ qtdeclarative, qtmultimedia, qtscript, qtx11extras, udev, wayland,
+ xcb-util-cursor, xwayland
}:
plasmaPackage {
name = "kwin";
nativeBuildInputs = [
- ecm
+ extra-cmake-modules
kdoctools
];
propagatedBuildInputs = [
breeze-qt5 epoxy kactivities kcmutils kcompletion kconfig kconfigwidgets
kcoreaddons kcrash kdeclarative kdecoration kglobalaccel ki18n kiconthemes
kidletime kinit kio knewstuff knotifications kpackage kscreenlocker kservice
- kwayland kwidgetsaddons kwindowsystem kxmlgui libinput libICE libSM
- plasma-framework qtdeclarative qtmultimedia qtscript qtx11extras udev
- wayland xcb-util-cursor xwayland
+ kwayland kwidgetsaddons kwindowsystem kxmlgui libICE libSM libxkbcommon
+ libinput plasma-framework qtdeclarative qtmultimedia qtscript qtx11extras
+ udev wayland xcb-util-cursor xwayland
];
patches = copyPathsToStore (lib.readPathsFromFile ./. ./series);
postPatch = ''
diff --git a/pkgs/desktops/kde-5/plasma/kwin/follow-symlinks.patch b/pkgs/desktops/plasma-5/kwin/follow-symlinks.patch
similarity index 100%
rename from pkgs/desktops/kde-5/plasma/kwin/follow-symlinks.patch
rename to pkgs/desktops/plasma-5/kwin/follow-symlinks.patch
diff --git a/pkgs/desktops/kde-5/plasma/kwin/series b/pkgs/desktops/plasma-5/kwin/series
similarity index 100%
rename from pkgs/desktops/kde-5/plasma/kwin/series
rename to pkgs/desktops/plasma-5/kwin/series
diff --git a/pkgs/desktops/kde-5/plasma/kwin/xwayland.patch b/pkgs/desktops/plasma-5/kwin/xwayland.patch
similarity index 100%
rename from pkgs/desktops/kde-5/plasma/kwin/xwayland.patch
rename to pkgs/desktops/plasma-5/kwin/xwayland.patch
diff --git a/pkgs/desktops/kde-5/plasma/kwrited.nix b/pkgs/desktops/plasma-5/kwrited.nix
similarity index 58%
rename from pkgs/desktops/kde-5/plasma/kwrited.nix
rename to pkgs/desktops/plasma-5/kwrited.nix
index 8dd814f783d0..29498e93404d 100644
--- a/pkgs/desktops/kde-5/plasma/kwrited.nix
+++ b/pkgs/desktops/plasma-5/kwrited.nix
@@ -1,9 +1,9 @@
-{ plasmaPackage, ecm, kcoreaddons, ki18n, kpty
+{ plasmaPackage, extra-cmake-modules, kcoreaddons, ki18n, kpty
, knotifications, kdbusaddons
}:
plasmaPackage {
name = "kwrited";
- nativeBuildInputs = [ ecm ];
+ nativeBuildInputs = [ extra-cmake-modules ];
propagatedBuildInputs = [ kcoreaddons ki18n kpty knotifications kdbusaddons ];
}
diff --git a/pkgs/desktops/kde-5/plasma/libkscreen.nix b/pkgs/desktops/plasma-5/libkscreen.nix
similarity index 80%
rename from pkgs/desktops/kde-5/plasma/libkscreen.nix
rename to pkgs/desktops/plasma-5/libkscreen.nix
index 838ab6ef0e5c..4e04fd5ed1d9 100644
--- a/pkgs/desktops/kde-5/plasma/libkscreen.nix
+++ b/pkgs/desktops/plasma-5/libkscreen.nix
@@ -1,5 +1,5 @@
{ plasmaPackage
-, ecm
+, extra-cmake-modules
, kwayland, libXrandr
, qtx11extras
}:
@@ -7,7 +7,7 @@
plasmaPackage {
name = "libkscreen";
nativeBuildInputs = [
- ecm
+ extra-cmake-modules
];
propagatedBuildInputs = [
kwayland libXrandr qtx11extras
diff --git a/pkgs/desktops/kde-5/plasma/libksysguard/0001-qdiriterator-follow-symlinks.patch b/pkgs/desktops/plasma-5/libksysguard/0001-qdiriterator-follow-symlinks.patch
similarity index 100%
rename from pkgs/desktops/kde-5/plasma/libksysguard/0001-qdiriterator-follow-symlinks.patch
rename to pkgs/desktops/plasma-5/libksysguard/0001-qdiriterator-follow-symlinks.patch
diff --git a/pkgs/desktops/kde-5/plasma/libksysguard/default.nix b/pkgs/desktops/plasma-5/libksysguard/default.nix
similarity index 87%
rename from pkgs/desktops/kde-5/plasma/libksysguard/default.nix
rename to pkgs/desktops/plasma-5/libksysguard/default.nix
index 2d81d061f4c7..b67e041a7821 100644
--- a/pkgs/desktops/kde-5/plasma/libksysguard/default.nix
+++ b/pkgs/desktops/plasma-5/libksysguard/default.nix
@@ -1,6 +1,6 @@
{
plasmaPackage,
- ecm,
+ extra-cmake-modules,
kauth, kcompletion, kconfig, kconfigwidgets, kcoreaddons, ki18n, kiconthemes,
kservice, kwidgetsaddons, kwindowsystem, plasma-framework, qtscript, qtwebkit,
qtx11extras
@@ -11,7 +11,7 @@ plasmaPackage {
patches = [
./0001-qdiriterator-follow-symlinks.patch
];
- nativeBuildInputs = [ ecm ];
+ nativeBuildInputs = [ extra-cmake-modules ];
propagatedBuildInputs = [
kauth kconfig ki18n kiconthemes kwindowsystem kcompletion kconfigwidgets
kcoreaddons kservice kwidgetsaddons plasma-framework qtscript qtx11extras
diff --git a/pkgs/desktops/kde-5/plasma/milou.nix b/pkgs/desktops/plasma-5/milou.nix
similarity index 75%
rename from pkgs/desktops/kde-5/plasma/milou.nix
rename to pkgs/desktops/plasma-5/milou.nix
index dbf9d0b9e537..43f78d9e2a97 100644
--- a/pkgs/desktops/kde-5/plasma/milou.nix
+++ b/pkgs/desktops/plasma-5/milou.nix
@@ -1,4 +1,4 @@
-{ plasmaPackage, ecm, qtscript, qtdeclarative
+{ plasmaPackage, extra-cmake-modules, qtscript, qtdeclarative
, kcoreaddons, ki18n, kdeclarative, kservice, plasma-framework
, krunner
}:
@@ -6,7 +6,7 @@
plasmaPackage {
name = "milou";
nativeBuildInputs = [
- ecm
+ extra-cmake-modules
];
propagatedBuildInputs = [
kdeclarative ki18n krunner plasma-framework qtdeclarative qtscript
diff --git a/pkgs/desktops/kde-5/plasma/oxygen.nix b/pkgs/desktops/plasma-5/oxygen.nix
similarity index 88%
rename from pkgs/desktops/kde-5/plasma/oxygen.nix
rename to pkgs/desktops/plasma-5/oxygen.nix
index ca63c8d7a377..b4ff775264f8 100644
--- a/pkgs/desktops/kde-5/plasma/oxygen.nix
+++ b/pkgs/desktops/plasma-5/oxygen.nix
@@ -1,6 +1,6 @@
{
plasmaPackage, kdeWrapper,
- ecm,
+ extra-cmake-modules,
frameworkintegration, kcmutils, kcompletion, kconfig, kdecoration, kguiaddons,
ki18n, kwidgetsaddons, kservice, kwayland, kwindowsystem, qtx11extras
}:
@@ -8,7 +8,7 @@
let
unwrapped = plasmaPackage {
name = "oxygen";
- nativeBuildInputs = [ ecm ];
+ nativeBuildInputs = [ extra-cmake-modules ];
propagatedBuildInputs = [
frameworkintegration kcmutils kcompletion kconfig kdecoration kguiaddons
ki18n kservice kwayland kwidgetsaddons kwindowsystem qtx11extras
diff --git a/pkgs/desktops/kde-5/plasma/plasma-desktop/default.nix b/pkgs/desktops/plasma-5/plasma-desktop/default.nix
similarity index 84%
rename from pkgs/desktops/kde-5/plasma/plasma-desktop/default.nix
rename to pkgs/desktops/plasma-5/plasma-desktop/default.nix
index 21ceec25d53f..1c152500b6a0 100644
--- a/pkgs/desktops/kde-5/plasma/plasma-desktop/default.nix
+++ b/pkgs/desktops/plasma-5/plasma-desktop/default.nix
@@ -1,19 +1,20 @@
{
plasmaPackage, lib, copyPathsToStore,
- ecm, kdoctools,
+ extra-cmake-modules, kdoctools,
attica, baloo, boost, fontconfig, ibus, kactivities, kactivities-stats, kauth,
kcmutils, kdbusaddons, kdeclarative, kded, kdelibs4support, kemoticons,
kglobalaccel, ki18n, kitemmodels, knewstuff, knotifications, knotifyconfig,
kpeople, krunner, ksysguard, kwallet, kwin, libXcursor, libXft,
libcanberra_kde, libpulseaudio, libxkbfile, phonon, plasma-framework,
- plasma-workspace, qtdeclarative, qtquickcontrols, qtsvg, qtx11extras,
- xf86inputevdev, xf86inputsynaptics, xinput, xkeyboard_config, xorgserver,
+ plasma-workspace, qtdeclarative, qtquickcontrols, qtquickcontrols2, qtsvg,
+ qtx11extras, xf86inputevdev, xf86inputsynaptics, xinput, xkeyboard_config,
+ xorgserver,
utillinux
}:
plasmaPackage rec {
name = "plasma-desktop";
- nativeBuildInputs = [ ecm kdoctools ];
+ nativeBuildInputs = [ extra-cmake-modules kdoctools ];
buildInputs = [
attica boost fontconfig ibus kcmutils kdbusaddons kded kitemmodels knewstuff
knotifications knotifyconfig kwallet libcanberra_kde libXcursor
@@ -21,7 +22,7 @@ plasmaPackage rec {
xf86inputsynaptics xkeyboard_config xinput baloo kactivities
kactivities-stats kauth kdeclarative kdelibs4support kemoticons kglobalaccel
ki18n kpeople krunner kwin plasma-framework plasma-workspace qtdeclarative
- qtquickcontrols qtx11extras ksysguard
+ qtquickcontrols qtquickcontrols2 qtx11extras ksysguard
];
patches = copyPathsToStore (lib.readPathsFromFile ./. ./series);
diff --git a/pkgs/desktops/kde-5/plasma/plasma-desktop/hwclock-path.patch b/pkgs/desktops/plasma-5/plasma-desktop/hwclock-path.patch
similarity index 100%
rename from pkgs/desktops/kde-5/plasma/plasma-desktop/hwclock-path.patch
rename to pkgs/desktops/plasma-5/plasma-desktop/hwclock-path.patch
diff --git a/pkgs/desktops/kde-5/plasma/plasma-desktop/ibus.patch b/pkgs/desktops/plasma-5/plasma-desktop/ibus.patch
similarity index 100%
rename from pkgs/desktops/kde-5/plasma/plasma-desktop/ibus.patch
rename to pkgs/desktops/plasma-5/plasma-desktop/ibus.patch
diff --git a/pkgs/desktops/kde-5/plasma/plasma-desktop/qml-import-paths.patch b/pkgs/desktops/plasma-5/plasma-desktop/qml-import-paths.patch
similarity index 100%
rename from pkgs/desktops/kde-5/plasma/plasma-desktop/qml-import-paths.patch
rename to pkgs/desktops/plasma-5/plasma-desktop/qml-import-paths.patch
diff --git a/pkgs/desktops/kde-5/plasma/plasma-desktop/series b/pkgs/desktops/plasma-5/plasma-desktop/series
similarity index 100%
rename from pkgs/desktops/kde-5/plasma/plasma-desktop/series
rename to pkgs/desktops/plasma-5/plasma-desktop/series
diff --git a/pkgs/desktops/kde-5/plasma/plasma-desktop/tzdir.patch b/pkgs/desktops/plasma-5/plasma-desktop/tzdir.patch
similarity index 100%
rename from pkgs/desktops/kde-5/plasma/plasma-desktop/tzdir.patch
rename to pkgs/desktops/plasma-5/plasma-desktop/tzdir.patch
diff --git a/pkgs/desktops/kde-5/plasma/plasma-integration.nix b/pkgs/desktops/plasma-5/plasma-integration.nix
similarity index 84%
rename from pkgs/desktops/kde-5/plasma/plasma-integration.nix
rename to pkgs/desktops/plasma-5/plasma-integration.nix
index e8680fea930a..97d30dcd7732 100644
--- a/pkgs/desktops/kde-5/plasma/plasma-integration.nix
+++ b/pkgs/desktops/plasma-5/plasma-integration.nix
@@ -1,4 +1,4 @@
-{ plasmaPackage, ecm
+{ plasmaPackage, extra-cmake-modules
, breeze-qt5, kconfig, kconfigwidgets, kiconthemes, kio, kwayland
, libXcursor
}:
@@ -8,7 +8,7 @@
plasmaPackage {
name = "plasma-integration";
nativeBuildInputs = [
- ecm
+ extra-cmake-modules
];
buildInputs = [
breeze-qt5 kconfig kconfigwidgets kiconthemes kio kwayland
diff --git a/pkgs/desktops/kde-5/plasma/plasma-nm/0001-mobile-broadband-provider-info-path.patch b/pkgs/desktops/plasma-5/plasma-nm/0001-mobile-broadband-provider-info-path.patch
similarity index 100%
rename from pkgs/desktops/kde-5/plasma/plasma-nm/0001-mobile-broadband-provider-info-path.patch
rename to pkgs/desktops/plasma-5/plasma-nm/0001-mobile-broadband-provider-info-path.patch
diff --git a/pkgs/desktops/kde-5/plasma/plasma-nm/default.nix b/pkgs/desktops/plasma-5/plasma-nm/default.nix
similarity index 88%
rename from pkgs/desktops/kde-5/plasma/plasma-nm/default.nix
rename to pkgs/desktops/plasma-5/plasma-nm/default.nix
index b6d18dbf91d9..da57653bb083 100644
--- a/pkgs/desktops/kde-5/plasma/plasma-nm/default.nix
+++ b/pkgs/desktops/plasma-5/plasma-nm/default.nix
@@ -1,4 +1,4 @@
-{ plasmaPackage, substituteAll, ecm, kdoctools
+{ plasmaPackage, substituteAll, extra-cmake-modules, kdoctools
, kcompletion, kconfigwidgets, kcoreaddons, kdbusaddons, kdeclarative
, kdelibs4support, ki18n, kiconthemes, kinit, kio, kitemviews
, knotifications, kservice, kwallet, kwidgetsaddons, kwindowsystem
@@ -15,7 +15,7 @@ plasmaPackage {
inherit mobile_broadband_provider_info;
})
];
- nativeBuildInputs = [ ecm kdoctools ];
+ nativeBuildInputs = [ extra-cmake-modules kdoctools ];
propagatedBuildInputs = [
kdeclarative kdelibs4support ki18n kio kwindowsystem plasma-framework
qtdeclarative kcompletion kconfigwidgets kcoreaddons kdbusaddons kiconthemes
diff --git a/pkgs/desktops/kde-5/plasma/plasma-pa.nix b/pkgs/desktops/plasma-5/plasma-pa.nix
similarity index 87%
rename from pkgs/desktops/kde-5/plasma/plasma-pa.nix
rename to pkgs/desktops/plasma-5/plasma-pa.nix
index 7bf97d745fe4..f398e1a9efc0 100644
--- a/pkgs/desktops/kde-5/plasma/plasma-pa.nix
+++ b/pkgs/desktops/plasma-5/plasma-pa.nix
@@ -1,6 +1,6 @@
{
plasmaPackage,
- ecm,
+ extra-cmake-modules,
gconf, glib, kdoctools, kconfigwidgets, kcoreaddons, kdeclarative, kglobalaccel,
ki18n, libcanberra_gtk3, libpulseaudio, plasma-framework
}:
@@ -8,7 +8,7 @@
plasmaPackage {
name = "plasma-pa";
nativeBuildInputs = [
- ecm kdoctools
+ extra-cmake-modules kdoctools
];
propagatedBuildInputs = [
gconf glib kconfigwidgets kcoreaddons kdeclarative
diff --git a/pkgs/desktops/kde-5/plasma/plasma-workspace-wallpapers.nix b/pkgs/desktops/plasma-5/plasma-workspace-wallpapers.nix
similarity index 73%
rename from pkgs/desktops/kde-5/plasma/plasma-workspace-wallpapers.nix
rename to pkgs/desktops/plasma-5/plasma-workspace-wallpapers.nix
index 6ffdb17cbeab..8af9caaa5795 100644
--- a/pkgs/desktops/kde-5/plasma/plasma-workspace-wallpapers.nix
+++ b/pkgs/desktops/plasma-5/plasma-workspace-wallpapers.nix
@@ -1,11 +1,11 @@
{ plasmaPackage
-, ecm
+, extra-cmake-modules
}:
plasmaPackage {
name = "plasma-workspace-wallpapers";
outputs = [ "out" ];
nativeBuildInputs = [
- ecm
+ extra-cmake-modules
];
}
diff --git a/pkgs/desktops/kde-5/plasma/plasma-workspace/default.nix b/pkgs/desktops/plasma-5/plasma-workspace/default.nix
similarity index 74%
rename from pkgs/desktops/kde-5/plasma/plasma-workspace/default.nix
rename to pkgs/desktops/plasma-5/plasma-workspace/default.nix
index 1e38c0c74dd4..8759c7d8c1e7 100644
--- a/pkgs/desktops/kde-5/plasma/plasma-workspace/default.nix
+++ b/pkgs/desktops/plasma-5/plasma-workspace/default.nix
@@ -1,27 +1,31 @@
{
plasmaPackage, lib, copyPathsToStore,
- ecm, kdoctools,
+ extra-cmake-modules, kdoctools,
baloo, kactivities, kcmutils, kconfig, kcrash, kdbusaddons, kdeclarative,
kdelibs4support, kdesu, kglobalaccel, kidletime, kjsembed, knewstuff,
knotifyconfig, kpackage, krunner, ktexteditor, ktextwidgets, kwallet,
kwayland, kwin, kxmlrpcclient, libkscreen, libksysguard, networkmanager-qt,
- phonon, plasma-framework, qtgraphicaleffects, qtquickcontrols, qtscript,
- qtx11extras, solid, isocodes, libdbusmenu, libSM, libXcursor, pam, wayland
+ phonon, plasma-framework, qtgraphicaleffects, qtquickcontrols,
+ qtquickcontrols2, qtscript, qtx11extras, solid, isocodes, libdbusmenu, libSM,
+ libXcursor, pam, wayland
}:
plasmaPackage {
name = "plasma-workspace";
- nativeBuildInputs = [ ecm kdoctools ];
+ nativeBuildInputs = [ extra-cmake-modules kdoctools ];
buildInputs = [
+ isocodes libdbusmenu libSM libXcursor pam wayland
+ ];
+ propagatedBuildInputs = [
baloo kactivities kcmutils kconfig kcrash kdbusaddons kdeclarative
kdelibs4support kdesu kglobalaccel kidletime kjsembed knewstuff
knotifyconfig kpackage krunner ktexteditor ktextwidgets kwallet kwayland
kwin kxmlrpcclient libkscreen libksysguard networkmanager-qt phonon
- plasma-framework qtgraphicaleffects qtquickcontrols qtscript qtx11extras
- solid isocodes libdbusmenu libSM libXcursor pam wayland
+ plasma-framework solid qtgraphicaleffects qtquickcontrols qtquickcontrols2
+ qtscript qtx11extras
];
patches = copyPathsToStore (lib.readPathsFromFile ./. ./series);
diff --git a/pkgs/desktops/kde-5/plasma/plasma-workspace/qml-import-path.patch b/pkgs/desktops/plasma-5/plasma-workspace/qml-import-path.patch
similarity index 100%
rename from pkgs/desktops/kde-5/plasma/plasma-workspace/qml-import-path.patch
rename to pkgs/desktops/plasma-5/plasma-workspace/qml-import-path.patch
diff --git a/pkgs/desktops/kde-5/plasma/plasma-workspace/series b/pkgs/desktops/plasma-5/plasma-workspace/series
similarity index 100%
rename from pkgs/desktops/kde-5/plasma/plasma-workspace/series
rename to pkgs/desktops/plasma-5/plasma-workspace/series
diff --git a/pkgs/desktops/kde-5/plasma/polkit-kde-agent.nix b/pkgs/desktops/plasma-5/polkit-kde-agent.nix
similarity index 79%
rename from pkgs/desktops/kde-5/plasma/polkit-kde-agent.nix
rename to pkgs/desktops/plasma-5/polkit-kde-agent.nix
index 002c2bb10ff3..1d7d20a7ffbf 100644
--- a/pkgs/desktops/kde-5/plasma/polkit-kde-agent.nix
+++ b/pkgs/desktops/plasma-5/polkit-kde-agent.nix
@@ -1,12 +1,12 @@
{
- plasmaPackage, ecm,
+ plasmaPackage, extra-cmake-modules,
kcoreaddons, kconfig, kcrash, kdbusaddons, ki18n, kiconthemes, knotifications,
kwidgetsaddons, kwindowsystem, polkit-qt
}:
plasmaPackage {
name = "polkit-kde-agent";
- nativeBuildInputs = [ ecm ];
+ nativeBuildInputs = [ extra-cmake-modules ];
propagatedBuildInputs = [
kdbusaddons kwidgetsaddons kcoreaddons kcrash kconfig ki18n kiconthemes
knotifications kwindowsystem polkit-qt
diff --git a/pkgs/desktops/kde-5/plasma/powerdevil.nix b/pkgs/desktops/plasma-5/powerdevil.nix
similarity index 78%
rename from pkgs/desktops/kde-5/plasma/powerdevil.nix
rename to pkgs/desktops/plasma-5/powerdevil.nix
index c0c18a6eae6c..c3469cc2ebc8 100644
--- a/pkgs/desktops/kde-5/plasma/powerdevil.nix
+++ b/pkgs/desktops/plasma-5/powerdevil.nix
@@ -1,4 +1,4 @@
-{ plasmaPackage, ecm, kdoctools, bluez-qt, kactivities
+{ plasmaPackage, extra-cmake-modules, kdoctools, bluez-qt, kactivities
, kauth, kconfig, kdbusaddons, kdelibs4support, kglobalaccel, ki18n
, kidletime, kio, knotifyconfig, kwayland, libkscreen, networkmanager-qt
, plasma-workspace, qtx11extras, solid, udev
@@ -6,7 +6,7 @@
plasmaPackage {
name = "powerdevil";
- nativeBuildInputs = [ ecm kdoctools ];
+ nativeBuildInputs = [ extra-cmake-modules kdoctools ];
propagatedBuildInputs = [
kconfig kdbusaddons knotifyconfig solid udev bluez-qt kactivities kauth
kdelibs4support kglobalaccel ki18n kio kidletime kwayland libkscreen
diff --git a/pkgs/desktops/plasma-5/srcs.nix b/pkgs/desktops/plasma-5/srcs.nix
new file mode 100644
index 000000000000..c156de40caed
--- /dev/null
+++ b/pkgs/desktops/plasma-5/srcs.nix
@@ -0,0 +1,325 @@
+# DO NOT EDIT! This file is generated automatically by fetch-kde-qt.sh
+{ fetchurl, mirror }:
+
+{
+ bluedevil = {
+ version = "5.9.4";
+ src = fetchurl {
+ url = "${mirror}/stable/plasma/5.9.4/bluedevil-5.9.4.tar.xz";
+ sha256 = "1a31vsaiy7kzbw79kjiia5a966xc9ba3phxhyqmdzvllf9jw5xdc";
+ name = "bluedevil-5.9.4.tar.xz";
+ };
+ };
+ breeze = {
+ version = "5.9.4";
+ src = fetchurl {
+ url = "${mirror}/stable/plasma/5.9.4/breeze-5.9.4.tar.xz";
+ sha256 = "07i13g9iyq9j2vx22z7krnkahil3qljxpzgmqai8m67gwhgvn1zj";
+ name = "breeze-5.9.4.tar.xz";
+ };
+ };
+ breeze-grub = {
+ version = "5.9.4";
+ src = fetchurl {
+ url = "${mirror}/stable/plasma/5.9.4/breeze-grub-5.9.4.tar.xz";
+ sha256 = "0rn7dgmw495575lcsnlgvx8r8sjjaaw3b1s0l43d2r186zay0nkr";
+ name = "breeze-grub-5.9.4.tar.xz";
+ };
+ };
+ breeze-gtk = {
+ version = "5.9.4";
+ src = fetchurl {
+ url = "${mirror}/stable/plasma/5.9.4/breeze-gtk-5.9.4.tar.xz";
+ sha256 = "1xjrhi6cq5dd5qslphdjrg018ni1z9xdac7cg33wl8bsvzcl0xgl";
+ name = "breeze-gtk-5.9.4.tar.xz";
+ };
+ };
+ breeze-plymouth = {
+ version = "5.9.4";
+ src = fetchurl {
+ url = "${mirror}/stable/plasma/5.9.4/breeze-plymouth-5.9.4.tar.xz";
+ sha256 = "1vwlvnbsc67xzqvrpgkva1rlim075x9ffjlsxfk38gmq00b7s88g";
+ name = "breeze-plymouth-5.9.4.tar.xz";
+ };
+ };
+ discover = {
+ version = "5.9.4";
+ src = fetchurl {
+ url = "${mirror}/stable/plasma/5.9.4/discover-5.9.4.tar.xz";
+ sha256 = "1pf2qawa32x94ljqscfbpmkbxk5awlqbf9jw9w7rfqwd5z9cgzzf";
+ name = "discover-5.9.4.tar.xz";
+ };
+ };
+ kactivitymanagerd = {
+ version = "5.9.4";
+ src = fetchurl {
+ url = "${mirror}/stable/plasma/5.9.4/kactivitymanagerd-5.9.4.tar.xz";
+ sha256 = "04i4zmbblsx3xz3vq4m88qd3ky0r5v26ivjchzpcpgkczqv85x1j";
+ name = "kactivitymanagerd-5.9.4.tar.xz";
+ };
+ };
+ kde-cli-tools = {
+ version = "5.9.4";
+ src = fetchurl {
+ url = "${mirror}/stable/plasma/5.9.4/kde-cli-tools-5.9.4.tar.xz";
+ sha256 = "1a2ssv7mphqnzwphd8nkh0g0g4w9b2r0ah0a9wd5ssnr5xg3izm8";
+ name = "kde-cli-tools-5.9.4.tar.xz";
+ };
+ };
+ kdecoration = {
+ version = "5.9.4";
+ src = fetchurl {
+ url = "${mirror}/stable/plasma/5.9.4/kdecoration-5.9.4.tar.xz";
+ sha256 = "12cfp4svhxfygbjhymnmwyryx6r117mkdy2iq9adbq5af3gak972";
+ name = "kdecoration-5.9.4.tar.xz";
+ };
+ };
+ kde-gtk-config = {
+ version = "5.9.4";
+ src = fetchurl {
+ url = "${mirror}/stable/plasma/5.9.4/kde-gtk-config-5.9.4.tar.xz";
+ sha256 = "0cg3myr3jr9i4vxpqbd8gs7yrscxn15a96zqvgsbjczlfmxanq86";
+ name = "kde-gtk-config-5.9.4.tar.xz";
+ };
+ };
+ kdeplasma-addons = {
+ version = "5.9.4";
+ src = fetchurl {
+ url = "${mirror}/stable/plasma/5.9.4/kdeplasma-addons-5.9.4.tar.xz";
+ sha256 = "019d3d3pkw1c6l7dggasr7g7yj9kl3xd2hsawch1s9ba420fd6fp";
+ name = "kdeplasma-addons-5.9.4.tar.xz";
+ };
+ };
+ kgamma5 = {
+ version = "5.9.4";
+ src = fetchurl {
+ url = "${mirror}/stable/plasma/5.9.4/kgamma5-5.9.4.tar.xz";
+ sha256 = "0qwgjdrjfc48d8j62iwz6d61nxd7ddcsxn7wmxgbgl3l36p5j0jv";
+ name = "kgamma5-5.9.4.tar.xz";
+ };
+ };
+ khotkeys = {
+ version = "5.9.4";
+ src = fetchurl {
+ url = "${mirror}/stable/plasma/5.9.4/khotkeys-5.9.4.tar.xz";
+ sha256 = "0lhgkvnrzsxpw6vpn0xam1a4dgkfb0k9h3nchaf93fyl8745j4q0";
+ name = "khotkeys-5.9.4.tar.xz";
+ };
+ };
+ kinfocenter = {
+ version = "5.9.4";
+ src = fetchurl {
+ url = "${mirror}/stable/plasma/5.9.4/kinfocenter-5.9.4.tar.xz";
+ sha256 = "14vf27s501r6ac2gxashwi3ynlcncjp03rahz61wry1dsm9wsc4x";
+ name = "kinfocenter-5.9.4.tar.xz";
+ };
+ };
+ kmenuedit = {
+ version = "5.9.4";
+ src = fetchurl {
+ url = "${mirror}/stable/plasma/5.9.4/kmenuedit-5.9.4.tar.xz";
+ sha256 = "1lx7g67qc7amx8jsna7b13hhq85pv4969d9824qfciwywj19sx4x";
+ name = "kmenuedit-5.9.4.tar.xz";
+ };
+ };
+ kscreen = {
+ version = "5.9.4";
+ src = fetchurl {
+ url = "${mirror}/stable/plasma/5.9.4/kscreen-5.9.4.tar.xz";
+ sha256 = "1g4i4rwnmni3q3crbywkp0s199bp0bl8cx97d37cp9qh6drsgrxx";
+ name = "kscreen-5.9.4.tar.xz";
+ };
+ };
+ kscreenlocker = {
+ version = "5.9.4";
+ src = fetchurl {
+ url = "${mirror}/stable/plasma/5.9.4/kscreenlocker-5.9.4.tar.xz";
+ sha256 = "0cn194bmab7qgv1x7gg81l0mj3k9x1is9whn8h7g02pzn5c6gqlj";
+ name = "kscreenlocker-5.9.4.tar.xz";
+ };
+ };
+ ksshaskpass = {
+ version = "5.9.4";
+ src = fetchurl {
+ url = "${mirror}/stable/plasma/5.9.4/ksshaskpass-5.9.4.tar.xz";
+ sha256 = "1w1m55i8i9f3npcczqiy1knarbh2j4cp8ispif1s4j6k3vixqnka";
+ name = "ksshaskpass-5.9.4.tar.xz";
+ };
+ };
+ ksysguard = {
+ version = "5.9.4";
+ src = fetchurl {
+ url = "${mirror}/stable/plasma/5.9.4/ksysguard-5.9.4.tar.xz";
+ sha256 = "04hzqkna22vsa12z04cy50s2jzglllfhd5vz33vk2wj6zgghwd0h";
+ name = "ksysguard-5.9.4.tar.xz";
+ };
+ };
+ kwallet-pam = {
+ version = "5.9.4";
+ src = fetchurl {
+ url = "${mirror}/stable/plasma/5.9.4/kwallet-pam-5.9.4.tar.xz";
+ sha256 = "0l6ganmp2ml0icfkrqcq4vngm8f4pl76p6w13a3m8x2k2wrsbynw";
+ name = "kwallet-pam-5.9.4.tar.xz";
+ };
+ };
+ kwayland-integration = {
+ version = "5.9.4";
+ src = fetchurl {
+ url = "${mirror}/stable/plasma/5.9.4/kwayland-integration-5.9.4.tar.xz";
+ sha256 = "11vqi293azv5cpz2rrngxsqqaj7swcmxivgm688yz6wzbm8gyd1x";
+ name = "kwayland-integration-5.9.4.tar.xz";
+ };
+ };
+ kwin = {
+ version = "5.9.4";
+ src = fetchurl {
+ url = "${mirror}/stable/plasma/5.9.4/kwin-5.9.4.tar.xz";
+ sha256 = "0qckhk6vd31mwhawb0i636l4vx99v0v84nam2dhpd0rcdk2b0dm1";
+ name = "kwin-5.9.4.tar.xz";
+ };
+ };
+ kwrited = {
+ version = "5.9.4";
+ src = fetchurl {
+ url = "${mirror}/stable/plasma/5.9.4/kwrited-5.9.4.tar.xz";
+ sha256 = "1prbn0f6a1cywn2ivzv39bxfc5nxmgxp7gqlxqg87ajig43gvdb7";
+ name = "kwrited-5.9.4.tar.xz";
+ };
+ };
+ libkscreen = {
+ version = "5.9.4";
+ src = fetchurl {
+ url = "${mirror}/stable/plasma/5.9.4/libkscreen-5.9.4.tar.xz";
+ sha256 = "1h39910ry59wd179fk02ck10ydaby3il4q3rnxlnn9qph0kiy3pv";
+ name = "libkscreen-5.9.4.tar.xz";
+ };
+ };
+ libksysguard = {
+ version = "5.9.4";
+ src = fetchurl {
+ url = "${mirror}/stable/plasma/5.9.4/libksysguard-5.9.4.tar.xz";
+ sha256 = "1gpfqr8prk96vwy9dkxlgf4lc3ck04a31src9mix8a6wrr01ppqm";
+ name = "libksysguard-5.9.4.tar.xz";
+ };
+ };
+ milou = {
+ version = "5.9.4";
+ src = fetchurl {
+ url = "${mirror}/stable/plasma/5.9.4/milou-5.9.4.tar.xz";
+ sha256 = "18xzx99ml6gcglly9p98rscs6dxhdgn9pkc5mn7apwnp7865kbfw";
+ name = "milou-5.9.4.tar.xz";
+ };
+ };
+ oxygen = {
+ version = "5.9.4";
+ src = fetchurl {
+ url = "${mirror}/stable/plasma/5.9.4/oxygen-5.9.4.tar.xz";
+ sha256 = "0fmysq3j0v18hz6hfp7qgrj3ghmaf3c1gam9c9263sf9q1dghk0q";
+ name = "oxygen-5.9.4.tar.xz";
+ };
+ };
+ plasma-desktop = {
+ version = "5.9.4";
+ src = fetchurl {
+ url = "${mirror}/stable/plasma/5.9.4/plasma-desktop-5.9.4.tar.xz";
+ sha256 = "1p3iq5rmfznsi4174zjavs945wysf763ha46vd83mz0w7583j6cd";
+ name = "plasma-desktop-5.9.4.tar.xz";
+ };
+ };
+ plasma-integration = {
+ version = "5.9.4";
+ src = fetchurl {
+ url = "${mirror}/stable/plasma/5.9.4/plasma-integration-5.9.4.tar.xz";
+ sha256 = "1mk59p214184m2q8wfik8gkfxxikrvric0v8c09lamybg15pas8m";
+ name = "plasma-integration-5.9.4.tar.xz";
+ };
+ };
+ plasma-nm = {
+ version = "5.9.4";
+ src = fetchurl {
+ url = "${mirror}/stable/plasma/5.9.4/plasma-nm-5.9.4.tar.xz";
+ sha256 = "0sbvyyhx7gxg1li5y1h7jv1s3krp2ch6zzhm9ad1l17w589kij9x";
+ name = "plasma-nm-5.9.4.tar.xz";
+ };
+ };
+ plasma-pa = {
+ version = "5.9.4";
+ src = fetchurl {
+ url = "${mirror}/stable/plasma/5.9.4/plasma-pa-5.9.4.tar.xz";
+ sha256 = "0hincgm6x613sw3mywq64i27laahqzy7qjiv24g8h3ppw75a32i8";
+ name = "plasma-pa-5.9.4.tar.xz";
+ };
+ };
+ plasma-sdk = {
+ version = "5.9.4";
+ src = fetchurl {
+ url = "${mirror}/stable/plasma/5.9.4/plasma-sdk-5.9.4.tar.xz";
+ sha256 = "0nw49kaw7323dmaq8hh4zrhvy6ga6svg2g0zhxj0cjjwgbk31pfw";
+ name = "plasma-sdk-5.9.4.tar.xz";
+ };
+ };
+ plasma-tests = {
+ version = "5.9.4";
+ src = fetchurl {
+ url = "${mirror}/stable/plasma/5.9.4/plasma-tests-5.9.4.tar.xz";
+ sha256 = "0m6dlx29785kh1pxm0xyym85k475s8gdjds6ywgpblj9lh5rm4v5";
+ name = "plasma-tests-5.9.4.tar.xz";
+ };
+ };
+ plasma-workspace = {
+ version = "5.9.4";
+ src = fetchurl {
+ url = "${mirror}/stable/plasma/5.9.4/plasma-workspace-5.9.4.tar.xz";
+ sha256 = "0pazgn45a445wknd3xp7jnsg6k5ddqv4pjrz2ggkbaz9mrllgbqm";
+ name = "plasma-workspace-5.9.4.tar.xz";
+ };
+ };
+ plasma-workspace-wallpapers = {
+ version = "5.9.4";
+ src = fetchurl {
+ url = "${mirror}/stable/plasma/5.9.4/plasma-workspace-wallpapers-5.9.4.tar.xz";
+ sha256 = "0jngl7a86xr09g87iydw8fi4ggh6hmz5vaznx4xqh403xf9pl281";
+ name = "plasma-workspace-wallpapers-5.9.4.tar.xz";
+ };
+ };
+ polkit-kde-agent = {
+ version = "1-5.9.4";
+ src = fetchurl {
+ url = "${mirror}/stable/plasma/5.9.4/polkit-kde-agent-1-5.9.4.tar.xz";
+ sha256 = "10x3vgdjkvzmnv5zl65q0mj6gxlcl620kyva1cx3qhq93w68jfjc";
+ name = "polkit-kde-agent-1-5.9.4.tar.xz";
+ };
+ };
+ powerdevil = {
+ version = "5.9.4";
+ src = fetchurl {
+ url = "${mirror}/stable/plasma/5.9.4/powerdevil-5.9.4.tar.xz";
+ sha256 = "1fpp06criw51lpg21f3xm4gd9yzjj08lr5j8908qz2dywqlp91rv";
+ name = "powerdevil-5.9.4.tar.xz";
+ };
+ };
+ sddm-kcm = {
+ version = "5.9.4";
+ src = fetchurl {
+ url = "${mirror}/stable/plasma/5.9.4/sddm-kcm-5.9.4.tar.xz";
+ sha256 = "1zrda4vzvqh6vs93yl2g4b63siqb5cqhrp4kknzm571djiar26ll";
+ name = "sddm-kcm-5.9.4.tar.xz";
+ };
+ };
+ systemsettings = {
+ version = "5.9.4";
+ src = fetchurl {
+ url = "${mirror}/stable/plasma/5.9.4/systemsettings-5.9.4.tar.xz";
+ sha256 = "03h5dagghjg6qhjbf0fnlhwh2v1nh7w22g00g1qzi8yrads1icy1";
+ name = "systemsettings-5.9.4.tar.xz";
+ };
+ };
+ user-manager = {
+ version = "5.9.4";
+ src = fetchurl {
+ url = "${mirror}/stable/plasma/5.9.4/user-manager-5.9.4.tar.xz";
+ sha256 = "1cjwkxb5qzj8sbkhcyyzw1axzddb2pwbd16wmaqpiz9qh2k4mr64";
+ name = "user-manager-5.9.4.tar.xz";
+ };
+ };
+}
diff --git a/pkgs/desktops/kde-5/plasma/startkde/default.nix b/pkgs/desktops/plasma-5/startkde/default.nix
similarity index 86%
rename from pkgs/desktops/kde-5/plasma/startkde/default.nix
rename to pkgs/desktops/plasma-5/startkde/default.nix
index 516d651cec25..87c72fdc5995 100644
--- a/pkgs/desktops/kde-5/plasma/startkde/default.nix
+++ b/pkgs/desktops/plasma-5/startkde/default.nix
@@ -1,8 +1,8 @@
{
stdenv, lib, runCommand, dbus, qttools, socat, gnugrep, gnused, kconfig,
kinit, kservice, plasma-workspace, xmessage, xprop, xsetroot, qtbase,
- qtdeclarative, qtgraphicaleffects, qtquickcontrols, qtscript, qtsvg,
- qtx11extras, qtxmlpatterns
+ qtdeclarative, qtgraphicaleffects, qtquickcontrols, qtquickcontrols2,
+ qtscript, qtsvg, qtx11extras, qtxmlpatterns
}:
let
@@ -19,7 +19,7 @@ let
];
libs = builtins.map (pkg: pkg.out or pkg)
[
- qtbase qtdeclarative qtgraphicaleffects qtquickcontrols
+ qtbase qtdeclarative qtgraphicaleffects qtquickcontrols qtquickcontrols2
qtscript qtsvg qtx11extras qtxmlpatterns
];
};
diff --git a/pkgs/desktops/kde-5/plasma/startkde/startkde.sh b/pkgs/desktops/plasma-5/startkde/startkde.sh
similarity index 95%
rename from pkgs/desktops/kde-5/plasma/startkde/startkde.sh
rename to pkgs/desktops/plasma-5/startkde/startkde.sh
index a403e8e05e6e..c38450516e91 100755
--- a/pkgs/desktops/kde-5/plasma/startkde/startkde.sh
+++ b/pkgs/desktops/plasma-5/startkde/startkde.sh
@@ -14,6 +14,12 @@ if ! [ -e $HOME/.gtkrc-2.0 ] \
cat >$HOME/.gtkrc-2.0 <$HOME/.config/gtk-3.0/settings.ini <$kdeglobalsfile <
+
+---
+
+--- gcc-armel-4.9.1.orig/libstdc++-v3/configure
++++ gcc-armel-4.9.1/libstdc++-v3/configure
+@@ -10698,7 +10698,7 @@ gnu*)
+ need_lib_prefix=no
+ need_version=no
+ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}${major} ${libname}${shared_ext}'
+- soname_spec='${libname}${release}${shared_ext}$major'
++ soname_spec='${libname}${release}${shared_ext}$versuffix'
+ shlibpath_var=LD_LIBRARY_PATH
+ hardcode_into_libs=yes
+ ;;
+@@ -10824,7 +10824,7 @@ linux* | k*bsd*-gnu | kopensolaris*-gnu)
+ need_lib_prefix=no
+ need_version=no
+ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
+- soname_spec='${libname}${release}${shared_ext}$major'
++ soname_spec='${libname}${release}${shared_ext}$versuffix'
+ finish_cmds='PATH="\$PATH:/sbin" ldconfig -n $libdir'
+ shlibpath_var=LD_LIBRARY_PATH
+ shlibpath_overrides_runpath=no
+@@ -14382,7 +14382,7 @@ gnu*)
+ need_lib_prefix=no
+ need_version=no
+ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}${major} ${libname}${shared_ext}'
+- soname_spec='${libname}${release}${shared_ext}$major'
++ soname_spec='${libname}${release}${shared_ext}$versuffix'
+ shlibpath_var=LD_LIBRARY_PATH
+ hardcode_into_libs=yes
+ ;;
+@@ -14508,7 +14508,7 @@ linux* | k*bsd*-gnu | kopensolaris*-gnu)
+ need_lib_prefix=no
+ need_version=no
+ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
+- soname_spec='${libname}${release}${shared_ext}$major'
++ soname_spec='${libname}${release}${shared_ext}$versuffix'
+ finish_cmds='PATH="\$PATH:/sbin" ldconfig -n $libdir'
+ shlibpath_var=LD_LIBRARY_PATH
+ shlibpath_overrides_runpath=no
diff --git a/pkgs/development/compilers/arm-frc-linux-gnueabi-gcc/no-nested-deprecated-warnings.patch b/pkgs/development/compilers/arm-frc-linux-gnueabi-gcc/no-nested-deprecated-warnings.patch
new file mode 100755
index 000000000000..050a63e92fd6
--- /dev/null
+++ b/pkgs/development/compilers/arm-frc-linux-gnueabi-gcc/no-nested-deprecated-warnings.patch
@@ -0,0 +1,22 @@
+Description: Get rid of recursive deprecated warnings.
+ As is, gcc gives warnings when a function with the
+ deprecated attribute calls another function with
+ the deprecated attribute.
+ See http://stackoverflow.com/questions/13459602/how-can-i-get-rid-of-deprecated-warnings-in-deprecated-functions-in-gcc
+
+Author: James Kuszmaul
+
+--
+
+--- gcc-armel-4.9.1.orig/gcc/tree.c
++++ gcc-armel-4.9.1/gcc/tree.c
+@@ -12063,6 +12063,9 @@ warn_deprecated_use (tree node, tree attr)
+ if (node == 0 || !warn_deprecated_decl)
+ return;
+
++ if (current_function_decl && TREE_DEPRECATED(current_function_decl))
++ return;
++
+ if (!attr)
+ {
+ if (DECL_P (node))
diff --git a/pkgs/development/compilers/closure/default.nix b/pkgs/development/compilers/closure/default.nix
index 949008d990f8..86e04b491e57 100644
--- a/pkgs/development/compilers/closure/default.nix
+++ b/pkgs/development/compilers/closure/default.nix
@@ -2,11 +2,11 @@
stdenv.mkDerivation rec {
name = "closure-compiler-${version}";
- version = "20160208";
+ version = "20170218";
src = fetchurl {
url = "http://dl.google.com/closure-compiler/compiler-${version}.tar.gz";
- sha256 = "19v9z8lfxfmhc4cl9fys7vnaslqiznjy1jpk5mcv468p7vysg46p";
+ sha256 = "06snabmpy07x4xm8d1xgq5dfzbjli10xkxk3nx9jms39zkj493cd";
};
phases = [ "installPhase" ];
@@ -16,9 +16,9 @@ stdenv.mkDerivation rec {
installPhase = ''
mkdir -p $out/share/java $out/bin
tar -xzf $src
- cp -r compiler.jar $out/share/java/
+ cp -r closure-compiler-v${version}.jar $out/share/java/
echo "#!${bash}/bin/bash" > $out/bin/closure-compiler
- echo "${jre}/bin/java -jar $out/share/java/compiler.jar \"\$@\"" >> $out/bin/closure-compiler
+ echo "${jre}/bin/java -jar $out/share/java/closure-compiler-v${version}.jar \"\$@\"" >> $out/bin/closure-compiler
chmod +x $out/bin/closure-compiler
'';
diff --git a/pkgs/development/compilers/compcert/default.nix b/pkgs/development/compilers/compcert/default.nix
index 20d4a430ac4b..8086a9f97495 100644
--- a/pkgs/development/compilers/compcert/default.nix
+++ b/pkgs/development/compilers/compcert/default.nix
@@ -1,25 +1,25 @@
{ stdenv, lib, fetchurl
-, coq, ocaml, findlib, menhir
+, coq, ocamlPackages
, tools ? stdenv.cc
}:
-assert lib.versionAtLeast ocaml.version "4.02";
+assert lib.versionAtLeast ocamlPackages.ocaml.version "4.02";
stdenv.mkDerivation rec {
name = "compcert-${version}";
- version = "2.7.1";
+ version = "3.0.1";
src = fetchurl {
url = "http://compcert.inria.fr/release/${name}.tgz";
- sha256 = "1vhbs1fmr9x2imqyd6yfvkbz763jhjfm9wk4nizf9rn1cvxrjqa4";
+ sha256 = "0dgrj26dzdy4n3s9b5hwc6lm54vans1v4qx9hdp1q8w1qqcdriq9";
};
- buildInputs = [ coq ocaml findlib menhir ];
+ buildInputs = [ coq ]
+ ++ (with ocamlPackages; [ ocaml findlib menhir ]);
enableParallelBuilding = true;
configurePhase = ''
- substituteInPlace ./configure --replace pl2 pl3
substituteInPlace ./configure --replace '{toolprefix}gcc' '{toolprefix}cc'
./configure -clightgen -prefix $out -toolprefix ${tools}/bin/ '' +
(if stdenv.isDarwin then "ia32-macosx" else "ia32-linux");
@@ -30,7 +30,7 @@ stdenv.mkDerivation rec {
mkdir -p $lib/share/doc/compcert
mv doc/html $lib/share/doc/compcert/
mkdir -p $lib/lib/coq/${coq.coq-version}/user-contrib/compcert/
- mv backend cfrontend common cparser driver flocq ia32 lib \
+ mv backend cfrontend common cparser driver flocq x86 x86_32 lib \
$lib/lib/coq/${coq.coq-version}/user-contrib/compcert/
'';
diff --git a/pkgs/development/compilers/coreclr/default.nix b/pkgs/development/compilers/coreclr/default.nix
index 558cfa35adad..b619bf6ce208 100644
--- a/pkgs/development/compilers/coreclr/default.nix
+++ b/pkgs/development/compilers/coreclr/default.nix
@@ -102,5 +102,6 @@ stdenv.mkDerivation rec {
platforms = [ "x86_64-linux" ];
maintainers = with stdenv.lib.maintainers; [ obadz ];
license = stdenv.lib.licenses.mit;
+ broken = true; # CoreCLR has proven to be very difficult to package. PRs welcome if someone wants to shave that yak.
};
}
diff --git a/pkgs/development/compilers/crystal/default.nix b/pkgs/development/compilers/crystal/default.nix
index 6202a8e968b3..b8cbceb97678 100644
--- a/pkgs/development/compilers/crystal/default.nix
+++ b/pkgs/development/compilers/crystal/default.nix
@@ -1,7 +1,7 @@
{ stdenv, fetchurl, boehmgc, libatomic_ops, pcre, libevent, libiconv, llvm_39, makeWrapper }:
stdenv.mkDerivation rec {
- version = "0.20.5";
+ version = "0.21.0";
name = "crystal-${version}-1";
arch =
{
@@ -14,15 +14,15 @@ stdenv.mkDerivation rec {
url = "https://github.com/crystal-lang/crystal/releases/download/${version}/crystal-${version}-1-${arch}.tar.gz";
sha256 =
{
- "x86_64-linux" = "fd077c0a727419e131b1be6198a5aa5820ecbdaafd2d2bb38be5716ba75b5100";
- "i686-linux" = "e3a890f11833c57c9004655d108f981c7c630cd7a939f828d9a6c571705bc3e7";
- "x86_64-darwin" = "79462c8ff994b36cff219c356967844a17e8cb2817bb24a196a960a08b8c9e47";
+ "x86_64-linux" = "0a44539df3813baea4381c314ad5f782b13cf1596e478851c52cd84193cc7a1f";
+ "i686-linux" = "9a45287f94d329f5ebe77f5a0d71cd0e09c3db79b0b56f6fe4a5166beed707ef";
+ "x86_64-darwin" = "e92abb33a9a592febb4e629ad68375b2577acd791a71220b8dc407904be469ee";
}."${stdenv.system}" or (throw "system ${stdenv.system} not supported");
};
src = fetchurl {
url = "https://github.com/crystal-lang/crystal/archive/${version}.tar.gz";
- sha256 = "ee1e5948c6e662ccb1e62671cf2c91458775b559b23d74ab226dc2a2d23f7707";
+ sha256 = "4dd01703f5304a0eda7f02fc362fba27ba069666097c0f921f8a3ee58808779c";
};
# crystal on Darwin needs libiconv to build
diff --git a/pkgs/development/compilers/cudatoolkit/default.nix b/pkgs/development/compilers/cudatoolkit/default.nix
index 927a1bcdf0b0..17965e20d24a 100644
--- a/pkgs/development/compilers/cudatoolkit/default.nix
+++ b/pkgs/development/compilers/cudatoolkit/default.nix
@@ -22,7 +22,7 @@ let
}
else throw "cudatoolkit does not support platform ${stdenv.system}";
- outputs = [ "out" "sdk" ];
+ outputs = [ "out" "doc" ];
buildInputs = [ perl ];
@@ -43,24 +43,31 @@ let
'';
buildPhase = ''
- find . -type f -executable -exec patchelf \
- --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \
- '{}' \; || true
- find . -type f -exec patchelf \
- --set-rpath $rpath:$out/jre/lib/amd64/jli:$out/lib:$out/lib64:$out/nvvm/lib:$out/nvvm/lib64:$(cat $NIX_CC/nix-support/orig-cc)/lib \
- --force-rpath \
- '{}' \; || true
+ chmod -R u+w .
+ while IFS= read -r -d ''$'\0' i; do
+ if ! isELF "$i"; then continue; fi
+ echo "patching $i..."
+ if [[ ! $i =~ \.so ]]; then
+ patchelf \
+ --set-interpreter "''$(cat $NIX_CC/nix-support/dynamic-linker)" $i
+ fi
+ rpath2=$rpath:$lib/lib:$out/jre/lib/amd64/jli:$out/lib:$out/lib64:$out/nvvm/lib:$out/nvvm/lib64
+ patchelf --set-rpath $rpath2 --force-rpath $i
+ done < <(find . -type f -print0)
'';
installPhase = ''
- mkdir $out $sdk
+ mkdir $out
perl ./install-linux.pl --prefix="$out"
- rm $out/tools/CUDA_Occupancy_Calculator.xls
- perl ./install-sdk-linux.pl --prefix="$sdk" --cudaprefix="$out"
+
+ rm $out/tools/CUDA_Occupancy_Calculator.xls # FIXME: why?
# let's remove the 32-bit libraries, they confuse the lib64->lib mover
rm -rf $out/lib
+ # Remove some cruft.
+ rm $out/bin/uninstall*
+
# Fixup path to samples (needed for cuda 6.5 or else nsight will not find them)
if [ -d "$out"/cuda-samples ]; then
mv "$out"/cuda-samples "$out"/samples
@@ -73,13 +80,19 @@ let
mkdir -p $out/nix-support
echo "cmakeFlags+=' -DCUDA_TOOLKIT_ROOT_DIR=$out'" >> $out/nix-support/setup-hook
+ # Remove OpenCL libraries as they are provided by ocl-icd and driver.
+ rm -f $out/lib64/libOpenCL*
+
'' + lib.optionalString (lib.versionOlder version "8.0") ''
# Hack to fix building against recent Glibc/GCC.
echo "NIX_CFLAGS_COMPILE+=' -D_FORCE_INLINES'" >> $out/nix-support/setup-hook
'';
- meta = {
- license = lib.licenses.unfree;
+ meta = with stdenv.lib; {
+ description = "A compiler for NVIDIA GPUs, math libraries, and tools";
+ homepage = "https://developer.nvidia.com/cuda-toolkit";
+ platforms = platforms.linux;
+ license = licenses.unfree;
};
};
@@ -110,9 +123,9 @@ in {
};
cudatoolkit8 = common {
- version = "8.0.44";
- url = https://developer.nvidia.com/compute/cuda/8.0/prod/local_installers/cuda_8.0.44_linux-run;
- sha256 = "1w5xmjf40kkis42dqs8dva4xjq7wr5y6vi1m0xlhs6i6cyw4mp34";
+ version = "8.0.61";
+ url = https://developer.nvidia.com/compute/cuda/8.0/Prod2/local_installers/cuda_8.0.61_375.26_linux-run;
+ sha256 = "1i4xrsqbad283qffvysn88w2pmxzxbbby41lw0j1113z771akv4w";
};
}
diff --git a/pkgs/development/compilers/dmd/2.067.1.nix b/pkgs/development/compilers/dmd/2.067.1.nix
index 66264346102c..4dbe922ce811 100644
--- a/pkgs/development/compilers/dmd/2.067.1.nix
+++ b/pkgs/development/compilers/dmd/2.067.1.nix
@@ -19,7 +19,11 @@ stdenv.mkDerivation {
# Was not able to compile on darwin due to "__inline_isnanl"
# being undefined.
substituteInPlace src/dmd/root/port.c --replace __inline_isnanl __inline_isnan
- '';
+ ''
+ + stdenv.lib.optionalString stdenv.isLinux ''
+ substituteInPlace src/dmd/root/port.c \
+ --replace "#include " "#include "
+ '';
# Buid and install are based on http://wiki.dlang.org/Building_DMD
buildPhase = ''
diff --git a/pkgs/development/compilers/dtc/default.nix b/pkgs/development/compilers/dtc/default.nix
index ac7a275d66ae..e8c36dc7a037 100644
--- a/pkgs/development/compilers/dtc/default.nix
+++ b/pkgs/development/compilers/dtc/default.nix
@@ -2,12 +2,12 @@
stdenv.mkDerivation rec {
name = "dtc-${version}";
- version = "1.4.2";
+ version = "1.4.4";
src = fetchgit {
url = "git://git.kernel.org/pub/scm/utils/dtc/dtc.git";
rev = "refs/tags/v${version}";
- sha256 = "0pwhbw930pnksrmkimqqwp4nqj9mmh06bs5b8p5l2cnhnh8lxn3j";
+ sha256 = "1pxp7700b3za7q4fnsnxx6i8v66rnr8p6lyi7jf684y1hq5ynlnf";
};
nativeBuildInputs = [ flex bison ];
diff --git a/pkgs/development/compilers/elm/default.nix b/pkgs/development/compilers/elm/default.nix
index e125a050b249..7cba0cab351f 100644
--- a/pkgs/development/compilers/elm/default.nix
+++ b/pkgs/development/compilers/elm/default.nix
@@ -40,7 +40,7 @@ let
EOF
'' + lib.concatStrings cmds;
- hsPkgs = haskell.packages.ghc801.override {
+ hsPkgs = haskell.packages.ghc802.override {
overrides = self: super:
let hlib = haskell.lib;
elmRelease = import ./packages/release.nix { inherit (self) callPackage; };
@@ -77,6 +77,21 @@ let
in elmPkgs // {
inherit elmPkgs;
elmVersion = elmRelease.version;
+ # needed for elm-package
+ http-client = hlib.overrideCabal super.http-client (drv: {
+ version = "0.4.31.2";
+ sha256 = "12yq2l6bvmxg5w6cw5ravdh39g8smwn1j44mv36pfmkhm5402h8n";
+ });
+ http-client-tls = hlib.overrideCabal super.http-client-tls (drv: {
+ version = "0.2.4.1";
+ sha256 = "18wbca7jg15p0ds3339f435nqv2ng0fqc4bylicjzlsww625ij4d";
+ });
+ # https://github.com/elm-lang/elm-compiler/issues/1566
+ indents = hlib.overrideCabal super.indents (drv: {
+ version = "0.3.3";
+ sha256 = "16lz21bp9j14xilnq8yym22p3saxvc9fsgfcf5awn2a6i6n527xn";
+ libraryHaskellDepends = drv.libraryHaskellDepends ++ [super.concatenative];
+ });
};
};
in hsPkgs.elmPkgs // {
diff --git a/pkgs/development/compilers/emscripten-fastcomp/default.nix b/pkgs/development/compilers/emscripten-fastcomp/default.nix
index c457ae158389..b5d2ba66e752 100644
--- a/pkgs/development/compilers/emscripten-fastcomp/default.nix
+++ b/pkgs/development/compilers/emscripten-fastcomp/default.nix
@@ -1,7 +1,7 @@
{ stdenv, fetchFromGitHub, cmake, python, ... }:
let
- rev = "1.37.1";
+ rev = "1.37.3";
gcc = if stdenv.cc.isGNU then stdenv.cc.cc else stdenv.cc.cc.gcc;
in
stdenv.mkDerivation rec {
@@ -10,14 +10,14 @@ stdenv.mkDerivation rec {
src = fetchFromGitHub {
owner = "kripken";
repo = "emscripten-fastcomp";
- sha256 = "08jci6h73j4pcd6iq5r4zn8c6qpd6qxc7xivxh3iama9hghmxyk9";
+ sha256 = "0s5156g6576hm31628c2wbqwl9r6vn10z5ry59psl565zz3lpg8x";
inherit rev;
};
srcFL = fetchFromGitHub {
owner = "kripken";
repo = "emscripten-fastcomp-clang";
- sha256 = "053svm8vnsma61jzzr8n1224brmjw4pzvklh572bm1p7yg32chaw";
+ sha256 = "0jhk20wb7275n5m9niqkzmvrr8hh5v26glkmsfmng4p66cs7jkil";
inherit rev;
};
diff --git a/pkgs/development/compilers/emscripten/default.nix b/pkgs/development/compilers/emscripten/default.nix
index f94e826defbb..05df6e9359a0 100644
--- a/pkgs/development/compilers/emscripten/default.nix
+++ b/pkgs/development/compilers/emscripten/default.nix
@@ -1,7 +1,7 @@
{ stdenv, fetchFromGitHub, emscriptenfastcomp, python, nodejs, closurecompiler, jre }:
let
- rev = "1.37.1";
+ rev = "1.37.3";
appdir = "share/emscripten";
in
@@ -11,7 +11,7 @@ stdenv.mkDerivation {
src = fetchFromGitHub {
owner = "kripken";
repo = "emscripten";
- sha256 = "0xl8lv0ihxsnwnhma3i34pkbz0v1yyc93ac6mdqmzv6fx2wczm04";
+ sha256 = "0pkxm8nd2zv57f2xm0c3n4xsdh2scliyy3zx04xk2bpkvskyzl7x";
inherit rev;
};
diff --git a/pkgs/development/compilers/fsharp/default.nix b/pkgs/development/compilers/fsharp/default.nix
index c00cea0029e1..2971fd8a98b0 100644
--- a/pkgs/development/compilers/fsharp/default.nix
+++ b/pkgs/development/compilers/fsharp/default.nix
@@ -42,6 +42,6 @@ stdenv.mkDerivation rec {
homepage = "http://fsharp.org/";
license = stdenv.lib.licenses.asl20;
maintainers = with stdenv.lib.maintainers; [ thoughtpolice raskin ];
- platforms = with stdenv.lib.platforms; linux;
+ platforms = with stdenv.lib.platforms; unix;
};
}
diff --git a/pkgs/development/compilers/gcc/5/default.nix b/pkgs/development/compilers/gcc/5/default.nix
index 1721eba325bf..3e9104a82fbc 100644
--- a/pkgs/development/compilers/gcc/5/default.nix
+++ b/pkgs/development/compilers/gcc/5/default.nix
@@ -74,7 +74,11 @@ let version = "5.4.0";
# The GNAT Makefiles did not pay attention to CFLAGS_FOR_TARGET for its
# target libraries and tools.
++ optional langAda ../gnat-cflags.patch
- ++ optional langFortran ../gfortran-driving.patch;
+ ++ optional langFortran ../gfortran-driving.patch
+
+ # This could be applied unconditionally but I don't want to cause a full
+ # Linux rebuild.
+ ++ optional stdenv.cc.isClang ./libcxx38-and-above.patch;
javaEcj = fetchurl {
# The `$(top_srcdir)/ecj.jar' file is automatically picked up at
@@ -231,6 +235,13 @@ stdenv.mkDerivation ({
libc_dev = stdenv.cc.libc_dev;
+ # This should kill all the stdinc frameworks that gcc and friends like to
+ # insert into default search paths.
+ prePatch = if stdenv.isDarwin then ''
+ substituteInPlace gcc/config/darwin-c.c \
+ --replace 'if (stdinc)' 'if (0)'
+ '' else null;
+
postPatch =
if (stdenv.isGNU
|| (libcCross != null # e.g., building `gcc.crossDrv'
diff --git a/pkgs/development/compilers/gcc/5/libcxx38-and-above.patch b/pkgs/development/compilers/gcc/5/libcxx38-and-above.patch
new file mode 100644
index 000000000000..ee48901a6d0c
--- /dev/null
+++ b/pkgs/development/compilers/gcc/5/libcxx38-and-above.patch
@@ -0,0 +1,46 @@
+This is a slightly modified version of https://svnweb.freebsd.org/ports/head/lang/gcc5/files/patch-libc%2B%2B?revision=432958&view=co&pathrev=432958,
+which doesn't apply cleanly due to them using a slightly different format of patch from us. I just replaced the .orig file references with a/b paths.
+
+--- a/gcc/auto-profile.c 2015-01-18 02:25:42 UTC
++++ b/gcc/auto-profile.c
+@@ -19,11 +19,9 @@ along with GCC; see the file COPYING3.
+ . */
+
+ #include "config.h"
+-#include "system.h"
+-
+-#include
+ #include